diff --git a/.gitignore b/.gitignore index 2d54e9a7..2e1f6981 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,9 @@ src_products src_install .cproject .project +.settings +Debug +docs +axis.sublime-project +axis.sublime-workspace *~ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..0181a62c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "tools/copyrightcons"] + path = tools/copyrightcons + url = https://github.com/ivilink/copyrightcons.git +[submodule "www"] + path = www + url = https://github.com/ivilink/ivilink.github.com.git +[submodule "3rd_party/log4cplus/log4cplus"] + path = 3rd_party/log4cplus/log4cplus + url = https://github.com/ivilink/log4cplus.git +[submodule "3rd_party/cryptopp/cryptopp"] + path = 3rd_party/cryptopp/cryptopp + url = https://github.com/ivilink/cryptopp.git +[submodule "3rd_party/cppunit/cppunit"] + path = 3rd_party/cppunit/cppunit + url = https://github.com/ivilink/cppunit.git diff --git a/src/3rd_party/Makefile b/3rd_party/Makefile similarity index 100% rename from src/3rd_party/Makefile rename to 3rd_party/Makefile diff --git a/src/3rd_party/cppunit/.gitignore b/3rd_party/cppunit/.gitignore similarity index 100% rename from src/3rd_party/cppunit/.gitignore rename to 3rd_party/cppunit/.gitignore diff --git a/src/3rd_party/cppunit/Makefile b/3rd_party/cppunit/Makefile similarity index 97% rename from src/3rd_party/cppunit/Makefile rename to 3rd_party/cppunit/Makefile index ed770982..067c304c 100644 --- a/src/3rd_party/cppunit/Makefile +++ b/3rd_party/cppunit/Makefile @@ -17,7 +17,7 @@ include $(COMMON_MK) PKGNAME :=cppunit PKGVER :=1.12.1 -SOURCE_DIR :=$(PKGNAME)-$(PKGVER) +SOURCE_DIR :=$(PKGNAME)/$(PKGNAME) INSTALL_DIR :=$(3RD_PARTY_DIR) ############################################################################### diff --git a/3rd_party/cppunit/cppunit b/3rd_party/cppunit/cppunit new file mode 160000 index 00000000..b9e30a19 --- /dev/null +++ b/3rd_party/cppunit/cppunit @@ -0,0 +1 @@ +Subproject commit b9e30a19c0e96c2c377b006f37c3dce96c0c9d75 diff --git a/src/3rd_party/cryptopp/.gitignore b/3rd_party/cryptopp/.gitignore similarity index 100% rename from src/3rd_party/cryptopp/.gitignore rename to 3rd_party/cryptopp/.gitignore diff --git a/src/3rd_party/cryptopp/Makefile b/3rd_party/cryptopp/Makefile similarity index 97% rename from src/3rd_party/cryptopp/Makefile rename to 3rd_party/cryptopp/Makefile index f51ab783..c82e5eed 100644 --- a/src/3rd_party/cryptopp/Makefile +++ b/3rd_party/cryptopp/Makefile @@ -17,7 +17,7 @@ include $(COMMON_MK) PKGNAME :=cryptopp PKGVER :=5.6.1 -SOURCE_DIR :=$(PKGNAME)-$(PKGVER) +SOURCE_DIR :=$(PKGNAME) INSTALL_DIR :=$(3RD_PARTY_DIR) #LIB_NAME := libcryptopp.a diff --git a/3rd_party/cryptopp/cryptopp b/3rd_party/cryptopp/cryptopp new file mode 160000 index 00000000..1ff2e284 --- /dev/null +++ b/3rd_party/cryptopp/cryptopp @@ -0,0 +1 @@ +Subproject commit 1ff2e284c5f30cb3a1b222c57e6c785afa3952bc diff --git a/src/3rd_party/log4cplus/.gitignore b/3rd_party/log4cplus/.gitignore similarity index 100% rename from src/3rd_party/log4cplus/.gitignore rename to 3rd_party/log4cplus/.gitignore diff --git a/src/3rd_party/log4cplus/Makefile b/3rd_party/log4cplus/Makefile similarity index 97% rename from src/3rd_party/log4cplus/Makefile rename to 3rd_party/log4cplus/Makefile index 49096605..49103062 100644 --- a/src/3rd_party/log4cplus/Makefile +++ b/3rd_party/log4cplus/Makefile @@ -17,7 +17,7 @@ include $(COMMON_MK) PKGNAME :=log4cplus PKGVER :=1.0.4 -SOURCE_DIR :=$(PKGNAME)-$(PKGVER) +SOURCE_DIR :=$(PKGNAME) INSTALL_DIR :=$(3RD_PARTY_DIR) LIB_NAME := liblog4cplus.a diff --git a/3rd_party/log4cplus/log4cplus b/3rd_party/log4cplus/log4cplus new file mode 160000 index 00000000..d32b8fb3 --- /dev/null +++ b/3rd_party/log4cplus/log4cplus @@ -0,0 +1 @@ +Subproject commit d32b8fb3761afb6f462eab2f8c40f2a8e09da8c9 diff --git a/src/Doxyfile b/Doxyfile similarity index 100% rename from src/Doxyfile rename to Doxyfile diff --git a/src/INSTALL.txt b/INSTALL.txt similarity index 100% rename from src/INSTALL.txt rename to INSTALL.txt diff --git a/src/LICENSE.txt b/LICENSE.txt similarity index 100% rename from src/LICENSE.txt rename to LICENSE.txt diff --git a/src/Makefile b/Makefile similarity index 100% rename from src/Makefile rename to Makefile diff --git a/src/OpenedIssues.txt b/OpenedIssues.txt similarity index 100% rename from src/OpenedIssues.txt rename to OpenedIssues.txt diff --git a/src/WhatsNew.txt b/WhatsNew.txt similarity index 100% rename from src/WhatsNew.txt rename to WhatsNew.txt diff --git a/src/common.mk b/common.mk similarity index 100% rename from src/common.mk rename to common.mk diff --git a/src/config.mk b/config.mk similarity index 100% rename from src/config.mk rename to config.mk diff --git a/doc/general/iviLINK.General.Description.pdf b/doc/general/iviLINK.General.Description.pdf deleted file mode 100644 index aa972fd1..00000000 Binary files a/doc/general/iviLINK.General.Description.pdf and /dev/null differ diff --git a/doc/general/iviLINK.pdf b/doc/general/iviLINK.pdf deleted file mode 100644 index 575a06e6..00000000 Binary files a/doc/general/iviLINK.pdf and /dev/null differ diff --git a/doc/technical/appLib/doxygen.log b/doc/technical/appLib/doxygen.log deleted file mode 100644 index 356f2380..00000000 --- a/doc/technical/appLib/doxygen.log +++ /dev/null @@ -1,7 +0,0 @@ -/home/build/AXIS/src/framework/appLib/appLib/CProfileApiBase.hpp:62: warning: Compound iviLink::Profile::IProfileCallbackProxy is not documented. -/home/build/AXIS/src/framework/appLib/appLib/CProfileProxy.hpp:50: warning: Compound iviLink::App::CProfileGetter is not documented. -/home/build/AXIS/src/framework/appLib/appLib/common.hpp:74: warning: Member ListOfUids (typedef) of namespace iviLink::Service is not documented. -/home/build/AXIS/src/framework/appLib/appLib/CProfileApiBase.hpp:150: warning: Member setError(const CError &error) const (function) of class iviLink::CProfileApiBase is not documented. -/home/build/AXIS/src/framework/appLib/appLib/CProfileProxy.hpp:72: warning: Member CProfileProxy(const Service::Uid &service, const Profile::ApiUid &api) (function) of class iviLink::App::CProfileProxy is not documented. -/home/build/AXIS/src/framework/appLib/appLib/CProfileProxy.hpp:80: warning: Member getProfile() const (function) of class iviLink::App::CProfileProxy is not documented. -/home/build/AXIS/src/framework/appLib/appLib/CProfileProxy.hpp:85: warning: Member releaseProfile() const (function) of class iviLink::App::CProfileProxy is not documented. diff --git a/doc/technical/appLib/html/annotated.html b/doc/technical/appLib/html/annotated.html deleted file mode 100644 index 92b6f302..00000000 --- a/doc/technical/appLib/html/annotated.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - -iviLink: Class List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Class List
-
-
-
Here are the classes, structs, unions and interfaces with brief descriptions:
- - - -
iviLink::CAppThis class is used to initialize application in iviLink and use general iviLink functionality - load/unload services and get profiles
iviLink::CProfileApiBaseA base class for all profile API classes
iviLink::App::CProfileProxy< ProfileApi >A base class for all profile proxies
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/bc_s.png b/doc/technical/appLib/html/bc_s.png deleted file mode 100644 index e4018628..00000000 Binary files a/doc/technical/appLib/html/bc_s.png and /dev/null differ diff --git a/doc/technical/appLib/html/classes.html b/doc/technical/appLib/html/classes.html deleted file mode 100644 index fb92e1f2..00000000 --- a/doc/technical/appLib/html/classes.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - -iviLink: Class Index - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Class Index
-
-
-
C
- -
  C  
-		CApp (iviLink)   CProfileApiBase (iviLink)   CProfileProxy (iviLink::App)   
C
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/closed.png b/doc/technical/appLib/html/closed.png deleted file mode 100644 index b7d4bd9f..00000000 Binary files a/doc/technical/appLib/html/closed.png and /dev/null differ diff --git a/doc/technical/appLib/html/d0/d65/namespaceivi_link_1_1_app.html b/doc/technical/appLib/html/d0/d65/namespaceivi_link_1_1_app.html deleted file mode 100644 index 34062120..00000000 --- a/doc/technical/appLib/html/d0/d65/namespaceivi_link_1_1_app.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - -iviLink: iviLink::App Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes | -Typedefs | -Enumerations
-
-
iviLink::App Namespace Reference
-
-
- - - - - - - - - - - - -

-Classes

class  CProfileGetter
class  CProfileProxy
 A base class for all profile proxies. More...
class  CAppManProxy
class  CLogger
class  CServManProxy

-Typedefs

typedef std::list< std::pair
-< Service::Uid, bool > > 		tUseServiceList

-Enumerations

enum  EInitStatus { NOT_INITED, -INITED, -HAS_INIT_REQUEST - }
-

Typedef Documentation

- -
-
- - - - -
typedef std::list<std::pair<Service::Uid, bool> > iviLink::App::tUseServiceList
-
-
- -

Definition at line 49 of file CAppManProxy.hpp.

- -
-
-

Enumeration Type Documentation

- -
-
- - - - -
enum iviLink::App::EInitStatus
-
-
-
Enumerator:
- - - -
NOT_INITED  -
INITED  -
HAS_INIT_REQUEST  -
-
-
- -

Definition at line 42 of file CAppManProxy.hpp.

- -
-
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d0/d87/_c_app_8hpp.html b/doc/technical/appLib/html/d0/d87/_c_app_8hpp.html deleted file mode 100644 index 7290a2a8..00000000 --- a/doc/technical/appLib/html/d0/d87/_c_app_8hpp.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - -iviLink: CApp.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces
-
-
CApp.hpp File Reference
-
-
- -

This header contains base class for all applications using iviLink functionality. -More...

-
#include "common.hpp"
-
-

Go to the source code of this file.

- - - - - - - -

-

-

-Classes

class  iviLink::CApp
 This class is used to initialize application in iviLink and use general iviLink functionality - load/unload services and get profiles. More...

-Namespaces

namespace  iviLink
 

This namespace is a basic namespace for all framework's components and libraries.

-
-

Detailed Description

-

This header contains base class for all applications using iviLink functionality.

- -

Definition in file CApp.hpp.

-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d0/d87/_c_app_8hpp_source.html b/doc/technical/appLib/html/d0/d87/_c_app_8hpp_source.html deleted file mode 100644 index 7262df20..00000000 --- a/doc/technical/appLib/html/d0/d87/_c_app_8hpp_source.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - -iviLink: CApp.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
CApp.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00033 #ifndef CAPP_HPP_
-00034 #define CAPP_HPP_
-00035 
-00036 #include "common.hpp"
-00037 
-00038 namespace iviLink
-00039 {
-00040    namespace App
-00041    {
-00042       class CAppManProxy;
-00043       class CServManProxy;
-00044    }
-00045    
-00051    class CApp
-00052    {
-00053    public:
-00057       CApp();
-00058       
-00059       
-00064       CApp(const Service::Uid &service);
-00065       
-00066       
-00071       CApp(const Service::ListOfUids &services);
-00072 
-00073       virtual ~CApp();
-00074 
-00075 
-00081       void setEnabled(const Service::Uid &service, bool enable);
-00082       
-00088       void setEnabled(const Service::ListOfUids &services, bool enable);
-00089 
-00096       ELaunchInfo getLaunchInfo();
-00097 
-00103       void registerProfileCallbacks(const Profile::ApiUid &profileApi, Profile::IProfileCallbackProxy* pCallbacks);
-00104 
-00105 
-00114       bool loadService(const Service::Uid &service);
-00115 
-00120       void unloadService(const Service::Uid &service);
-00121 
-00126       Service::ListOfUids getActiveServices();
-00127 
-00133       bool isActive(const Service::Uid &service);
-00134 
-00135 
-00136       /* The following functions are callbacks invoked after events occurred. 
-00137        * In order to hadnle either of conditions described below,
-00138        * appropriate callbacks should be implemented in a derived class.
-00139        */
-00140 
-00149       virtual void initDone(ELaunchInfo launcher);
-00150 
-00155       virtual void incomingServiceBeforeLoading(const Service::Uid &service);
-00156 
-00161       virtual void incomingServiceAfterLoading(const Service::Uid &service);
-00162 
-00167        virtual void serviceLoadError(const Service::Uid &service);
-00168 
-00173       virtual void serviceDropped(const Service::Uid &service);
-00174 
-00175    private:
-00176 
-00177       App::CAppManProxy * mpAppManProxy;
-00178       App::CServManProxy * mpServManProxy;
-00179    };
-00180 
-00181 }
-00182 #endif
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp.html b/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp.html deleted file mode 100644 index c4f2aa5f..00000000 --- a/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - -iviLink: CProfileApiBase.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces | -Defines
-
-
CProfileApiBase.hpp File Reference
-
-
- -

This header contains declaration of a base class for all profile API classes. -More...

-
#include "utils/misc/UID.hpp"
-#include "utils/misc/CError.hpp"
-
-

Go to the source code of this file.

- - - - - - - -

-

- - - -

-Classes

class  iviLink::CProfileApiBase
 A base class for all profile API classes. More...

-Namespaces

namespace  iviLink
 

This namespace is a basic namespace for all framework's components and libraries.

-

-Defines

#define IVILINK_PROFILE_API_UID(PROFILE_API_UID)
 This macro should be placed in every profile API implementation.
-

Detailed Description

-

This header contains declaration of a base class for all profile API classes.

- -

Definition in file CProfileApiBase.hpp.

-

Define Documentation

- -
-
- - - - - - - - -
#define IVILINK_PROFILE_API_UID( PROFILE_API_UID)
-
-
-Value:
iviLink::Profile::ApiUid getProfileApiUid() const \
-   { return iviLink::Profile::ApiUid(#PROFILE_API_UID ); }
-
-

This macro should be placed in every profile API implementation.

-
Parameters:
- - -
PROFILE_API_UIDUID of a profile API
-
-
- -

Definition at line 52 of file CProfileApiBase.hpp.

- -
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp_source.html b/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp_source.html deleted file mode 100644 index 239b4d6a..00000000 --- a/doc/technical/appLib/html/d1/d2b/_c_profile_api_base_8hpp_source.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - -iviLink: CProfileApiBase.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
CProfileApiBase.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025  
-00040 #ifndef CPROFILEAPIBASE_HPP_
-00041 #define CPROFILEAPIBASE_HPP_
-00042 
-00043 #include "utils/misc/UID.hpp"
-00044 #include "utils/misc/CError.hpp"
-00045 
-00052 #define IVILINK_PROFILE_API_UID(PROFILE_API_UID) \
-00053    iviLink::Profile::ApiUid getProfileApiUid() const \
-00054    { return iviLink::Profile::ApiUid(#PROFILE_API_UID ); }
-00055 
-00056 namespace iviLink
-00057 {
-00058    namespace Profile
-00059    {
-00060       class CProfileInternal;
-00061       class IProfileCallbackProxy: public IErrorHandler
-00062       {
-00063       public:
-00064          virtual ~IProfileCallbackProxy()
-00065          {
-00066          }
-00067       };
-00068    }
-00069    
-00075    class CProfileApiBase
-00076    {
-00077       friend class Profile::CProfileInternal;
-00078 
-00079    public:
-00080 
-00088       virtual std::string getName() const = 0;
-00089 
-00095       virtual UInt32 getVersion() const = 0;
-00096 
-00102       virtual Profile::Uid getUid() const = 0;
-00103 
-00109       virtual Profile::ApiUid getProfileApiUid() const = 0;
-00110 
-00115       CError getError() const
-00116       {
-00117          return mError;
-00118       }
-00119 
-00123       virtual void onEnable()
-00124       {
-00125       }
-00126 
-00130       virtual void onDisable()
-00131       {
-00132       }
-00133       
-00138       bool isEnabled() const
-00139       {
-00140          return mEnabled;
-00141       }
-00142 
-00143    protected:
-00144       CProfileApiBase()
-00145          : mEnabled(false)
-00146          , mError(CError::NoError("CProfileApiBase", "getError - no error"))
-00147       { }
-00148       virtual ~CProfileApiBase() {}
-00149       void setError(const CError & error) const
-00150       {
-00151          mError = error;
-00152       }
-00153 
-00154    private:
-00155       bool mEnabled; 
-00156       mutable CError mError; 
-00157    };
-00158 }
-00159 
-00160 
-00161 #endif /* CPROFILEAPIBASE_HPP_ */
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d1/dfe/classivi_link_1_1_c_profile_api_base.html b/doc/technical/appLib/html/d1/dfe/classivi_link_1_1_c_profile_api_base.html deleted file mode 100644 index 06db2c29..00000000 --- a/doc/technical/appLib/html/d1/dfe/classivi_link_1_1_c_profile_api_base.html +++ /dev/null @@ -1,185 +0,0 @@ - - - - -iviLink: iviLink::CProfileApiBase Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions | -Protected Member Functions | -Friends
-
-
iviLink::CProfileApiBase Class Reference
-
-
- -

A base class for all profile API classes. - More...

- -

#include <CProfileApiBase.hpp>

- -

List of all members.

- - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

-virtual std::string getName () const =0
 Get profile name Macro IVILINK_PROFILE_NAME(NAME) should be used in class declaration instead of this method implementation (see framework/libraries/profileLib/defines.hpp and BasicSample for example)
-virtual UInt32 getVersion () const =0
 Get profile version Macro IVILINK_PROFILE_VERSION(VERSION) should be used in class declaration instead of this method implementation.
-virtual Profile::Uid getUid () const =0
 Returns Profile UID Macro IVILINK_PROFILE_UID(PROFILE_UID) should be used in class declaration instead of this method implementation.
-virtual Profile::ApiUid getProfileApiUid () const =0
 Get profileApi UID Macroacro IVILINK_PROFILE_API_UID(PROFILE_API_UID) in class declaration instead of this method implementation.
CError getError () const
 Get latest error.
-virtual void onEnable ()
 Called when the profile is loading.
-virtual void onDisable ()
 Called when the profile is unloading.
bool isEnabled () const
 Check whether the profile is enabled.

-Protected Member Functions

-void setError (const CError &error) const

-Friends

-class Profile::CProfileInternal
-

Detailed Description

-

A base class for all profile API classes.

- -

Definition at line 75 of file CProfileApiBase.hpp.

-

Member Function Documentation

- -
-
- - - - - - - -
CError iviLink::CProfileApiBase::getError () const [inline]
-
-
- -

Get latest error.

-
Returns:
in case wasError() returned true getError returns more details about the error
- -

Definition at line 115 of file CProfileApiBase.hpp.

- -
-
- -
-
- - - - - - - -
bool iviLink::CProfileApiBase::isEnabled () const [inline]
-
-
- -

Check whether the profile is enabled.

-
Returns:
true if enabled, otherwise false
- -

Definition at line 138 of file CProfileApiBase.hpp.

- -
-
-
The documentation for this class was generated from the following file: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d2/d54/classivi_link_1_1_app_1_1_c_profile_proxy-members.html b/doc/technical/appLib/html/d2/d54/classivi_link_1_1_app_1_1_c_profile_proxy-members.html deleted file mode 100644 index 648a4de6..00000000 --- a/doc/technical/appLib/html/d2/d54/classivi_link_1_1_app_1_1_c_profile_proxy-members.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::App::CProfileProxy< ProfileApi > Member List
-
-
-This is the complete list of members for iviLink::App::CProfileProxy< ProfileApi >, including all inherited members. - - - - -
CProfileProxy(const Service::Uid &service, const Profile::ApiUid &api) (defined in iviLink::App::CProfileProxy< ProfileApi >)iviLink::App::CProfileProxy< ProfileApi > [inline]
getProfile() const (defined in iviLink::App::CProfileProxy< ProfileApi >)iviLink::App::CProfileProxy< ProfileApi > [inline, protected]
releaseProfile() const (defined in iviLink::App::CProfileProxy< ProfileApi >)iviLink::App::CProfileProxy< ProfileApi > [inline, protected]
~CProfileProxy() (defined in iviLink::App::CProfileProxy< ProfileApi >)iviLink::App::CProfileProxy< ProfileApi > [inline, virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d2/d5c/classivi_link_1_1_c_profile_api_base-members.html b/doc/technical/appLib/html/d2/d5c/classivi_link_1_1_c_profile_api_base-members.html deleted file mode 100644 index fb709c36..00000000 --- a/doc/technical/appLib/html/d2/d5c/classivi_link_1_1_c_profile_api_base-members.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::CProfileApiBase Member List
-
-
-This is the complete list of members for iviLink::CProfileApiBase, including all inherited members. - - - - - - - - - - - - -
CProfileApiBase() (defined in iviLink::CProfileApiBase)iviLink::CProfileApiBase [inline, protected]
getError() const iviLink::CProfileApiBase [inline]
getName() const =0iviLink::CProfileApiBase [pure virtual]
getProfileApiUid() const =0iviLink::CProfileApiBase [pure virtual]
getUid() const =0iviLink::CProfileApiBase [pure virtual]
getVersion() const =0iviLink::CProfileApiBase [pure virtual]
isEnabled() const iviLink::CProfileApiBase [inline]
onDisable()iviLink::CProfileApiBase [inline, virtual]
onEnable()iviLink::CProfileApiBase [inline, virtual]
Profile::CProfileInternal (defined in iviLink::CProfileApiBase)iviLink::CProfileApiBase [friend]
setError(const CError &error) const (defined in iviLink::CProfileApiBase)iviLink::CProfileApiBase [inline, protected]
~CProfileApiBase() (defined in iviLink::CProfileApiBase)iviLink::CProfileApiBase [inline, protected, virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp.html b/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp.html deleted file mode 100644 index a19f76f6..00000000 --- a/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - -iviLink: private/CAppManProxy.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces | -Typedefs | -Enumerations
-
-
private/CAppManProxy.hpp File Reference
-
-
-
#include "framework/appLib/appLib/CApp.hpp"
-#include "framework/appLib/ApplicationManager/IAppManHandler.hpp"
-#include "utils/threads/CThread.hpp"
-#include "utils/threads/CSignalSemaphore.hpp"
-
-

Go to the source code of this file.

- - - - - - - - - - -

-Classes

class  iviLink::App::CAppManProxy

-Namespaces

namespace  iviLink
namespace  iviLink::App

-Typedefs

typedef std::list< std::pair
-< Service::Uid, bool > > 		iviLink::App::tUseServiceList

-Enumerations

enum  iviLink::App::EInitStatus { iviLink::App::NOT_INITED, -iviLink::App::INITED, -iviLink::App::HAS_INIT_REQUEST - }
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp_source.html b/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp_source.html deleted file mode 100644 index e48da799..00000000 --- a/doc/technical/appLib/html/d3/da7/_c_app_man_proxy_8hpp_source.html +++ /dev/null @@ -1,166 +0,0 @@ - - - - -iviLink: private/CAppManProxy.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CAppManProxy.hpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #ifndef IVI_LINK_APP_CCORE_HPP_
-00028 #define IVI_LINK_APP_CCORE_HPP_
-00029 
-00030 #include "framework/appLib/appLib/CApp.hpp"
-00031 #include "framework/appLib/ApplicationManager/IAppManHandler.hpp"
-00032 #include "utils/threads/CThread.hpp"
-00033 #include "utils/threads/CSignalSemaphore.hpp"
-00034 
-00035 class CMutex;
-00036 
-00037 namespace iviLink
-00038 {
-00039    namespace App
-00040    {
-00041 
-00042       enum EInitStatus
-00043       {
-00044          NOT_INITED,
-00045          INITED,
-00046          HAS_INIT_REQUEST
-00047       };
-00048 
-00049       typedef std::list<std::pair<Service::Uid, bool> > tUseServiceList;
-00050 
-00051       class CAppManProxy : public CThread
-00052       {
-00053       public:
-00054          CAppManProxy(CApp * pApp);
-00055          virtual ~CAppManProxy();
-00056 
-00057          void finish();
-00058          void init(const Service::ListOfUids &services);
-00059          void useService(const Service::Uid& service, bool use);
-00060          ELaunchInfo launcher() const;
-00061 
-00062       private:
-00063          // from CThread
-00064          virtual void threadFunc();
-00065 
-00066          void handleInit();
-00067          void handleUseService();
-00068          bool hasRequests();
-00069 
-00070          CApp * mpApp;
-00071          EInitStatus mInitStatus;
-00072          Service::ListOfUids mInitedServices;
-00073          CMutex * mpInitMutex;
-00074          bool mBe;
-00075          ELaunchInfo mLauncher;
-00076          CSignalSemaphore * mpRequestSemaphore;
-00077          tUseServiceList mUseList;
-00078          CMutex * mpUseListMutex;
-00079       };
-00080 
-00081    }
-00082 }
-00083 #endif
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d3/dfb/namespaceivi_link.html b/doc/technical/appLib/html/d3/dfb/namespaceivi_link.html deleted file mode 100644 index ecbdc5ed..00000000 --- a/doc/technical/appLib/html/d3/dfb/namespaceivi_link.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - -iviLink: iviLink Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Enumerations
-
-
iviLink Namespace Reference
-
-
- -

This namespace is a basic namespace for all framework's components and libraries. -More...

- - - - - - - - - - - -

-Classes

class  CApp
 This class is used to initialize application in iviLink and use general iviLink functionality - load/unload services and get profiles. More...
class  CProfileApiBase
 A base class for all profile API classes. More...

-Enumerations

enum  ELaunchInfo { LAUNCHED_BY_IVILINK, -LAUNCHED_BY_USER, -ERROR_APP_NOT_INITED_IN_IVILINK - }
 ELaunchInfo is used to pass information about application's launch (is a parameter in CApp's callback initDone()). More...
enum  ELoadServiceResult { LOAD_OK, -LOAD_ERROR_APP_NOT_INITED, -LOAD_ERROR_UNKNOWN_SERVICE, -LOAD_ERROR_OTHER - }
 ELoadServiceResult is supposed to represent results of loading a service (currently it is not used). More...
-

Detailed Description

-

This namespace is a basic namespace for all framework's components and libraries.

-

Enumeration Type Documentation

- -
-
- - - - -
enum iviLink::ELaunchInfo
-
-
- -

ELaunchInfo is used to pass information about application's launch (is a parameter in CApp's callback initDone()).

-
Enumerator:
- - - -
LAUNCHED_BY_IVILINK  -

application was launched by Application Manager after a request from the other side

-
LAUNCHED_BY_USER  -

application was launched by user

-
ERROR_APP_NOT_INITED_IN_IVILINK  -

error code

-
-
-
- -

Definition at line 52 of file common.hpp.

- -
-
- -
-
- - - - -
enum iviLink::ELoadServiceResult
-
-
- -

ELoadServiceResult is supposed to represent results of loading a service (currently it is not used).

-
Enumerator:
- - - - -
LOAD_OK  -

service was successfully loaded

-
LOAD_ERROR_APP_NOT_INITED  -

error code: tried to load service from a not initialized application

-
LOAD_ERROR_UNKNOWN_SERVICE  -

error code: requested service was not found by Service Manager

-
LOAD_ERROR_OTHER  -

error code: unknown error

-
-
-
- -

Definition at line 64 of file common.hpp.

- -
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d4/d34/classivi_link_1_1_c_app-members.html b/doc/technical/appLib/html/d4/d34/classivi_link_1_1_c_app-members.html deleted file mode 100644 index dfbfe619..00000000 --- a/doc/technical/appLib/html/d4/d34/classivi_link_1_1_c_app-members.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::CApp Member List
-
-
-This is the complete list of members for iviLink::CApp, including all inherited members. - - - - - - - - - - - - - - - - - -
CApp()iviLink::CApp
CApp(const Service::Uid &service)iviLink::CApp
CApp(const Service::ListOfUids &services)iviLink::CApp
getActiveServices()iviLink::CApp
getLaunchInfo()iviLink::CApp
incomingServiceAfterLoading(const Service::Uid &service)iviLink::CApp [virtual]
incomingServiceBeforeLoading(const Service::Uid &service)iviLink::CApp [virtual]
initDone(ELaunchInfo launcher)iviLink::CApp [virtual]
isActive(const Service::Uid &service)iviLink::CApp
loadService(const Service::Uid &service)iviLink::CApp
registerProfileCallbacks(const Profile::ApiUid &profileApi, Profile::IProfileCallbackProxy *pCallbacks)iviLink::CApp
serviceDropped(const Service::Uid &service)iviLink::CApp [virtual]
serviceLoadError(const Service::Uid &service)iviLink::CApp [virtual]
setEnabled(const Service::Uid &service, bool enable)iviLink::CApp
setEnabled(const Service::ListOfUids &services, bool enable)iviLink::CApp
unloadService(const Service::Uid &service)iviLink::CApp
~CApp() (defined in iviLink::CApp)iviLink::CApp [virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d4/dc3/macro_8hpp.html b/doc/technical/appLib/html/d4/dc3/macro_8hpp.html deleted file mode 100644 index bb224676..00000000 --- a/doc/technical/appLib/html/d4/dc3/macro_8hpp.html +++ /dev/null @@ -1,333 +0,0 @@ - - - - -iviLink: macro.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Defines
-
-
macro.hpp File Reference
-
-
- -

This header contains macros definitions for implementing profile proxies (please see samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp). -More...

- -

Go to the source code of this file.

- - - - - - - - - - - - -

-Defines

#define IVILINK_PROXY_VOID_FUNCTION(API_CLASS, FUNC,...)
 This macro should be put inside a void method declaration (instead of function body).
#define IVILINK_PROXY_FUNCTION(API_CLASS, FUNC, RET_TYPE,...)
 This macro should be put inside a non-void method declaration (instead of function body).
#define IVILINK_PROXY_FUNCTION_CONST(API_CLASS, FUNC, RET_TYPE,...)
 This macro is for internal use only, please use IVILINK_PROXY_FUNCTION instead.
#define IVILINK_PROFILE_PROXY_BEGIN(PROFILE_PROXY, PROFILE_API, PROFILE_API_UID)
 This macro should be put at the beginning of a profile proxy declaration.
-#define IVILINK_PROFILE_PROXY_END   };
 This macro should be put at the end of a profile proxy declaration.
-

Detailed Description

-

This header contains macros definitions for implementing profile proxies (please see samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp).

- -

Definition in file macro.hpp.

-

Define Documentation

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
#define IVILINK_PROFILE_PROXY_BEGIN( PROFILE_PROXY,
 PROFILE_API,
 PROFILE_API_UID 
)
-
-
-Value:
class PROFILE_PROXY : public iviLink::App::CProfileProxy<PROFILE_API>, public PROFILE_API \
-{ \
-public: \
-   PROFILE_PROXY(const iviLink::Service::Uid & service) \
-      : iviLink::App::CProfileProxy<PROFILE_API>(service, \
-            iviLink::Profile::ApiUid(PROFILE_API_UID)) \
-   { } \
-   virtual std::string getName() const \
-   { \
-      IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getName,std::string) \
-   } \
-   virtual UInt32 getVersion() const \
-   { \
-      IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getVersion,UInt32) \
-   } \
-   virtual iviLink::Profile::Uid getUid() const \
-   { \
-      IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getUid,iviLink::Profile::Uid) \
-   }
-
-

This macro should be put at the beginning of a profile proxy declaration.

-
Parameters:
- - - - -
PROFILE_PROXYname of profile proxy class
PROFILE_APIname of a profile API class
PROFILE_API_UIDUID of the profile API
-
-
- -

Definition at line 87 of file macro.hpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#define IVILINK_PROXY_FUNCTION( API_CLASS,
 FUNC,
 RET_TYPE,
 ... 
)
-
-
-Value:
API_CLASS * pInstance = getProfile(); \
-      RET_TYPE res; \
-      if (!pInstance) \
-      { res = pInstance->FUNC(__VA_ARGS__); } \
-      else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-      releaseProfile(); \
-      return res;
-
-

This macro should be put inside a non-void method declaration (instead of function body).

-
Parameters:
- - - - - -
API_CLASSprofile API class that was used in IVILINK_PROFILE_PROXY_BEGIN
FUNCname of a profile API function that should be called
RET_TYPEtype of return value of the profile API function
...list of arguments
-
-
- -

Definition at line 57 of file macro.hpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#define IVILINK_PROXY_FUNCTION_CONST( API_CLASS,
 FUNC,
 RET_TYPE,
 ... 
)
-
-
-Value:
const API_CLASS * pInstance = getProfile(); \
-      RET_TYPE res; \
-      if (!pInstance) \
-      { res = pInstance->FUNC(__VA_ARGS__); } \
-      else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-      releaseProfile(); \
-      return res;
-
-

This macro is for internal use only, please use IVILINK_PROXY_FUNCTION instead.

- -

Definition at line 70 of file macro.hpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
#define IVILINK_PROXY_VOID_FUNCTION( API_CLASS,
 FUNC,
 ... 
)
-
-
-Value:
API_CLASS * pInstance = getProfile(); \
-      if (pInstance) \
-      { pInstance->FUNC(__VA_ARGS__); } \
-      else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-      releaseProfile();
-
-

This macro should be put inside a void method declaration (instead of function body).

-
Parameters:
- - - - -
API_CLASSprofile API class that was used in IVILINK_PROFILE_PROXY_BEGIN
FUNCname of a profile API function that should be called
...list of arguments for the profile API function
-
-
- -

Definition at line 42 of file macro.hpp.

- -
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d4/dc3/macro_8hpp_source.html b/doc/technical/appLib/html/d4/dc3/macro_8hpp_source.html deleted file mode 100644 index db6cff3b..00000000 --- a/doc/technical/appLib/html/d4/dc3/macro_8hpp_source.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - -iviLink: macro.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
macro.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025  
-00032 #ifndef MACRO_HPP_
-00033 #define MACRO_HPP_
-00034 
-00042 #define IVILINK_PROXY_VOID_FUNCTION(API_CLASS,FUNC, ...) \
-00043                 API_CLASS * pInstance = getProfile(); \
-00044       if (pInstance) \
-00045       { pInstance->FUNC(__VA_ARGS__); } \
-00046       else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-00047       releaseProfile();
-00048       
-00057 #define IVILINK_PROXY_FUNCTION(API_CLASS,FUNC,RET_TYPE, ...) \
-00058       API_CLASS * pInstance = getProfile(); \
-00059       RET_TYPE res; \
-00060       if (!pInstance) \
-00061       { res = pInstance->FUNC(__VA_ARGS__); } \
-00062       else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-00063       releaseProfile(); \
-00064       return res;
-00065 
-00070 #define IVILINK_PROXY_FUNCTION_CONST(API_CLASS,FUNC,RET_TYPE, ...) \
-00071       const API_CLASS * pInstance = getProfile(); \
-00072       RET_TYPE res; \
-00073       if (!pInstance) \
-00074       { res = pInstance->FUNC(__VA_ARGS__); } \
-00075       else { setError(CError(1,"ProfileProxy",CError::ERROR, "No profile instance")); } \
-00076       releaseProfile(); \
-00077       return res;
-00078 
-00087 #define IVILINK_PROFILE_PROXY_BEGIN(PROFILE_PROXY, PROFILE_API, PROFILE_API_UID) \
-00088 class PROFILE_PROXY : public iviLink::App::CProfileProxy<PROFILE_API>, public PROFILE_API \
-00089 { \
-00090 public: \
-00091    PROFILE_PROXY(const iviLink::Service::Uid & service) \
-00092       : iviLink::App::CProfileProxy<PROFILE_API>(service, \
-00093             iviLink::Profile::ApiUid(PROFILE_API_UID)) \
-00094    { } \
-00095    virtual std::string getName() const \
-00096    { \
-00097       IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getName,std::string) \
-00098    } \
-00099    virtual UInt32 getVersion() const \
-00100    { \
-00101       IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getVersion,UInt32) \
-00102    } \
-00103    virtual iviLink::Profile::Uid getUid() const \
-00104    { \
-00105       IVILINK_PROXY_FUNCTION_CONST(PROFILE_API,getUid,iviLink::Profile::Uid) \
-00106    }
-00107    
-00113 #define IVILINK_PROFILE_PROXY_END };
-00114 
-00115 #endif /* MACRO_HPP_ */
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp.html b/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp.html deleted file mode 100644 index 4cdf41ec..00000000 --- a/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: private/CServManProxy.cpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces
-
-
private/CServManProxy.cpp File Reference
-
-
-
#include "CServManProxy.hpp"
-#include "framework/appLib/appLib/CApp.hpp"
-
-

Go to the source code of this file.

- - - - -

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp_source.html b/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp_source.html deleted file mode 100644 index 012dadb0..00000000 --- a/doc/technical/appLib/html/d4/dc4/_c_serv_man_proxy_8cpp_source.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - -iviLink: private/CServManProxy.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CServManProxy.cpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform CApplication Communication Stack for In-Vehicle CApplications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 #include "CServManProxy.hpp"
-00027 #include "framework/appLib/appLib/CApp.hpp"
-00028 
-00029 namespace iviLink
-00030 {
-00031    namespace App
-00032    {
-00033 
-00034       using Service::CServiceManager;
-00035 
-00036       CServManProxy::CServManProxy(CApp * pApp)
-00037          : mpApp(pApp)
-00038       {
-00039       }
-00040 
-00041       CServManProxy::~CServManProxy()
-00042       {
-00043       }
-00044 
-00045       void CServManProxy::serviceRequestCallback(iviLink::Service::Uid const& serviceUID)
-00046       {
-00047          if (mpApp)
-00048          {
-00049             mpApp->incomingServiceBeforeLoading(serviceUID);
-00050          }
-00051       }
-00052 
-00053       void CServManProxy::serviceDropped(iviLink::Service::Uid const& serviceUID)
-00054       {
-00055          if (mpApp)
-00056          {
-00057             mpApp->serviceDropped(serviceUID);
-00058          }
-00059       }
-00060 
-00061       void CServManProxy::serviceLoaded(const Service::Uid &serviceUID)
-00062       {
-00063          if (mpApp)
-00064          {
-00065             mpApp->incomingServiceAfterLoading(serviceUID);
-00066          }
-00067       }
-00068 
-00069       void CServManProxy::serviceLoadError(const Service::Uid & service)
-00070       {
-00071          if (mpApp)
-00072          {
-00073             mpApp->ServiceLoadError(service);
-00074          }
-00075       }
-00076    }
-00077 }
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d5/dad/_c_app_8cpp.html b/doc/technical/appLib/html/d5/dad/_c_app_8cpp.html deleted file mode 100644 index b7fd1e1f..00000000 --- a/doc/technical/appLib/html/d5/dad/_c_app_8cpp.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - -iviLink: private/CApp.cpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces
-
-
private/CApp.cpp File Reference
-
-
-
#include <cassert>
-#include "CAppManProxy.hpp"
-#include "CServManProxy.hpp"
-#include "framework/appLib/appLib/CApp.hpp"
-#include "framework/appLib/ServiceManager/CServiceManager.hpp"
-#include "CLogger.hpp"
-
-

Go to the source code of this file.

- - - -

-Namespaces

namespace  iviLink
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d5/dad/_c_app_8cpp_source.html b/doc/technical/appLib/html/d5/dad/_c_app_8cpp_source.html deleted file mode 100644 index e27679da..00000000 --- a/doc/technical/appLib/html/d5/dad/_c_app_8cpp_source.html +++ /dev/null @@ -1,244 +0,0 @@ - - - - -iviLink: private/CApp.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CApp.cpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform CApplication Communication Stack for In-Vehicle CApplications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #include <cassert>
-00028 
-00029 #include "CAppManProxy.hpp"
-00030 #include "CServManProxy.hpp"
-00031 
-00032 #include "framework/appLib/appLib/CApp.hpp"
-00033 #include "framework/appLib/ServiceManager/CServiceManager.hpp"
-00034 #include "CLogger.hpp"
-00035 
-00036 namespace iviLink
-00037 {
-00038    using Service::CServiceManager;
-00039 
-00040    CApp::CApp()
-00041       : mpAppManProxy(new App::CAppManProxy(this))
-00042       , mpServManProxy(new App::CServManProxy(this))
-00043    {
-00044       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00045       CServiceManager::getInstance()->registerClient(mpServManProxy);
-00046       mpAppManProxy->start();
-00047       Service::ListOfUids services;
-00048       mpAppManProxy->init(services);
-00049    }
-00050 
-00051    CApp::CApp(const Service::Uid &service)
-00052       : mpAppManProxy(new App::CAppManProxy(this))
-00053       , mpServManProxy(new App::CServManProxy(this))
-00054    {
-00055       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00056       CServiceManager::getInstance()->registerClient(mpServManProxy);
-00057       mpAppManProxy->start();
-00058       Service::ListOfUids services;
-00059       services.push_back(service);
-00060       mpAppManProxy->init(services);
-00061    }
-00062 
-00063    CApp::CApp(const Service::ListOfUids &services)
-00064       : mpAppManProxy(new App::CAppManProxy(this))
-00065       , mpServManProxy(new App::CServManProxy(this))
-00066    {
-00067       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00068       CServiceManager::getInstance()->registerClient(mpServManProxy);
-00069       mpAppManProxy->start();
-00070       mpAppManProxy->init(services);
-00071    }
-00072 
-00073    CApp::~CApp()
-00074    {
-00075       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00076       CServiceManager::getInstance()->deleteInstance();
-00077       mpAppManProxy->finish();
-00078       delete mpServManProxy;
-00079       delete mpAppManProxy;
-00080    }
-00081 
-00082    void CApp::setEnabled(const Service::Uid &service, bool enable)
-00083    {
-00084       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00085       mpAppManProxy->useService(service, enable);
-00086    }
-00087 
-00088    void CApp::setEnabled(const Service::ListOfUids &services, bool enable)
-00089    {
-00090       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00091       for (Service::ListOfUids::const_iterator it = services.begin();
-00092             services.end() != it; ++it)
-00093       {
-00094          mpAppManProxy->useService(*it, enable);
-00095       }
-00096    }
-00097 
-00098    ELaunchInfo CApp::getLaunchInfo()
-00099    {
-00100       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00101       return mpAppManProxy->launcher();
-00102    }
-00103 
-00104    void CApp::registerProfileCallbacks(const Profile::ApiUid &profileApi, Profile::IProfileCallbackProxy* pCallbacks)
-00105    {
-00106       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00107       CServiceManager::getInstance()->registerProfileCallbacks(profileApi, pCallbacks);
-00108    }
-00109 
-00110    bool CApp::loadService(const Service::Uid &service)
-00111    {
-00112       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00113       return CServiceManager::getInstance()->load(service);
-00114    }
-00115 
-00116    void CApp::unloadService(const Service::Uid &service)
-00117    {
-00118       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00119       CServiceManager::getInstance()->unload(service);
-00120    }
-00121 
-00122    Service::ListOfUids CApp::getActiveServices()
-00123    {
-00124       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00125       Service::ListOfUids list;
-00126       CServiceManager::getInstance()->getActive(list);
-00127       return list;
-00128    }
-00129 
-00130    bool CApp::isActive(const Service::Uid &service)
-00131    {
-00132       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00133       return CServiceManager::getInstance()->isActive(service);
-00134    }
-00135 
-00136    void CApp::initDone(ELaunchInfo /*launcher*/)
-00137    {
-00138       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00139    }
-00140 
-00141    void CApp::incomingServiceBeforeLoading(const Service::Uid &/*service*/)
-00142    {
-00143       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00144    }
-00145 
-00146    void CApp::incomingServiceAfterLoading(const Service::Uid &/*service*/)
-00147    {
-00148       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00149    }
-00150 
-00151    void CApp::ServiceLoadError(const Service::Uid &/*service*/)
-00152    {
-00153       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00154    }
-00155 
-00156    void CApp::serviceDropped(const Service::Uid &/*service*/)
-00157    {
-00158       LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00159    }
-00160 
-00161 }
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d5/dd8/classivi_link_1_1_app_1_1_c_app_man_proxy-members.html b/doc/technical/appLib/html/d5/dd8/classivi_link_1_1_app_1_1_c_app_man_proxy-members.html deleted file mode 100644 index 65d47305..00000000 --- a/doc/technical/appLib/html/d5/dd8/classivi_link_1_1_app_1_1_c_app_man_proxy-members.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::App::CAppManProxy Member List
-
-
-This is the complete list of members for iviLink::App::CAppManProxy, including all inherited members. - - - - - - -
CAppManProxy(CApp *pApp) (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy
finish() (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy
init(const Service::ListOfUids &services) (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy
launcher() const (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy
useService(const Service::Uid &service, bool use) (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy
~CAppManProxy() (defined in iviLink::App::CAppManProxy)iviLink::App::CAppManProxy [virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:11:31 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d6/dbe/classivi_link_1_1_profile_1_1_i_profile_callback_proxy.html b/doc/technical/appLib/html/d6/dbe/classivi_link_1_1_profile_1_1_i_profile_callback_proxy.html deleted file mode 100644 index 0aa535b0..00000000 --- a/doc/technical/appLib/html/d6/dbe/classivi_link_1_1_profile_1_1_i_profile_callback_proxy.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - -iviLink: iviLink::Profile::IProfileCallbackProxy Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::Profile::IProfileCallbackProxy Class Reference
-
-
- -

List of all members.

- -
-

Detailed Description

-
-

Definition at line 61 of file CProfileApiBase.hpp.

-
The documentation for this class was generated from the following file: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/d04/namespaceivi_link_1_1_service.html b/doc/technical/appLib/html/d8/d04/namespaceivi_link_1_1_service.html deleted file mode 100644 index b4e2360c..00000000 --- a/doc/technical/appLib/html/d8/d04/namespaceivi_link_1_1_service.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - -iviLink: iviLink::Service Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Typedefs
-
-
iviLink::Service Namespace Reference
-
-
- - - -

-Typedefs

typedef std::list< Uid > ListOfUids
-

Typedef Documentation

- -
-
- - - - -
typedef std::list<Uid> iviLink::Service::ListOfUids
-
-
- -

Definition at line 74 of file common.hpp.

- -
-
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp.html b/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp.html deleted file mode 100644 index 7582aff2..00000000 --- a/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - -iviLink: private/CProfileProxy.cpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces
-
-
private/CProfileProxy.cpp File Reference
-
-
-
#include "framework/appLib/appLib/CProfileProxy.hpp"
-#include "framework/appLib/ServiceManager/CServiceManager.hpp"
-#include "CLogger.hpp"
-
-

Go to the source code of this file.

- - - - -

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp_source.html b/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp_source.html deleted file mode 100644 index ca56df09..00000000 --- a/doc/technical/appLib/html/d8/d1f/_c_profile_proxy_8cpp_source.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - -iviLink: private/CProfileProxy.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CProfileProxy.cpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #include "framework/appLib/appLib/CProfileProxy.hpp"
-00028 #include "framework/appLib/ServiceManager/CServiceManager.hpp"
-00029 #include "CLogger.hpp"
-00030 
-00031 namespace iviLink
-00032 {
-00033    namespace App
-00034    {
-00035       CProfileApiBase * CProfileGetter::getBaseProfile(const Service::Uid & service, const Profile::ApiUid & api)
-00036       {
-00037          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00038          return Service::CServiceManager::getInstance()->getProfile(service, api);
-00039       }
-00040 
-00041       void CProfileGetter::releaseProfile(const Service::Uid & service, const Profile::ApiUid & api)
-00042       {
-00043          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00044          Service::CServiceManager::getInstance()->releaseProfile(service, api);
-00045       }
-00046 
-00047    }
-00048 }
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/d20/classivi_link_1_1_profile_1_1_i_profile_callback_proxy-members.html b/doc/technical/appLib/html/d8/d20/classivi_link_1_1_profile_1_1_i_profile_callback_proxy-members.html deleted file mode 100644 index f35affcf..00000000 --- a/doc/technical/appLib/html/d8/d20/classivi_link_1_1_profile_1_1_i_profile_callback_proxy-members.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::Profile::IProfileCallbackProxy Member List
-
-
-This is the complete list of members for iviLink::Profile::IProfileCallbackProxy, including all inherited members. - -
~IProfileCallbackProxy() (defined in iviLink::Profile::IProfileCallbackProxy)iviLink::Profile::IProfileCallbackProxy [inline, virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/db4/classivi_link_1_1_app_1_1_c_profile_proxy.html b/doc/technical/appLib/html/d8/db4/classivi_link_1_1_app_1_1_c_profile_proxy.html deleted file mode 100644 index 43268a82..00000000 --- a/doc/technical/appLib/html/d8/db4/classivi_link_1_1_app_1_1_c_profile_proxy.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - -iviLink: iviLink::App::CProfileProxy< ProfileApi > Class Template Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions | -Protected Member Functions
-
-
iviLink::App::CProfileProxy< ProfileApi > Class Template Reference
-
-
- -

A base class for all profile proxies. - More...

- -

#include <CProfileProxy.hpp>

- -

List of all members.

- - - - - - -

-Public Member Functions

- CProfileProxy (const Service::Uid &service, const Profile::ApiUid &api)

-Protected Member Functions

-ProfileApi * getProfile () const
-void releaseProfile () const
-

Detailed Description

-

template<typename ProfileApi>
-class iviLink::App::CProfileProxy< ProfileApi >

- -

A base class for all profile proxies.

-

The class shoudln't be inherited directly, macros from macro.hpp should be used instead. (see samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp).

- -

Definition at line 66 of file CProfileProxy.hpp.

-
The documentation for this class was generated from the following file: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp.html b/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp.html deleted file mode 100644 index ff573fe1..00000000 --- a/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - -iviLink: private/CServManProxy.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces
-
-
private/CServManProxy.hpp File Reference
-
-
-
#include "framework/appLib/ServiceManager/CServiceManager.hpp"
-#include "framework/appLib/appLib/common.hpp"
-#include "framework/appLib/ServiceManager/common.hpp"
-
-

Go to the source code of this file.

- - - - - - -

-Classes

class  iviLink::App::CServManProxy

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp_source.html b/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp_source.html deleted file mode 100644 index dab6c9f7..00000000 --- a/doc/technical/appLib/html/d8/df0/_c_serv_man_proxy_8hpp_source.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - -iviLink: private/CServManProxy.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CServManProxy.hpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform CApplication Communication Stack for In-Vehicle CApplications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 #ifndef CSERVMANPROXY_HPP_
-00027 #define CSERVMANPROXY_HPP_
-00028 
-00029 #include "framework/appLib/ServiceManager/CServiceManager.hpp"
-00030 #include "framework/appLib/appLib/common.hpp"
-00031 #include "framework/appLib/ServiceManager/common.hpp"
-00032 
-00033 namespace iviLink
-00034 {
-00035    class CApp;
-00036    namespace App
-00037    {
-00038 
-00039       class CServManProxy  : public Service::CServiceManager::IClientCallbacks
-00040       {
-00041       public:
-00042          CServManProxy(CApp * pApp);
-00043          virtual ~CServManProxy();
-00044 
-00045       private:
-00046 
-00047          //from IClientCallbacks
-00048          virtual void serviceRequestCallback(iviLink::Service::Uid const& serviceUID);
-00049          virtual void serviceDropped(iviLink::Service::Uid const& serviceUID);
-00050          virtual void serviceLoadError(const Service::Uid & service);
-00051          virtual void serviceLoaded(const Service::Uid & service);
-00052 
-00053          CApp * mpApp;
-00054       };
-00055 
-00056    }
-00057 }
-00058 #endif
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d9/de9/_c_logger_8hpp.html b/doc/technical/appLib/html/d9/de9/_c_logger_8hpp.html deleted file mode 100644 index 0aefbe13..00000000 --- a/doc/technical/appLib/html/d9/de9/_c_logger_8hpp.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - -iviLink: private/CLogger.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces
-
-
private/CLogger.hpp File Reference
-
-
- -

Go to the source code of this file.

- - - - - - -

-Classes

class  iviLink::App::CLogger

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/d9/de9/_c_logger_8hpp_source.html b/doc/technical/appLib/html/d9/de9/_c_logger_8hpp_source.html deleted file mode 100644 index af34e7a2..00000000 --- a/doc/technical/appLib/html/d9/de9/_c_logger_8hpp_source.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - -iviLink: private/CLogger.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CLogger.hpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #ifndef CLOGGER_HPP_
-00028 #define CLOGGER_HPP_
-00029 
-00030 namespace iviLink
-00031 {
-00032    namespace App
-00033    {
-00034 
-00035       class CLogger
-00036       {
-00037       public:
-00038          static Logger * logger();
-00039 
-00040       private:
-00041          CLogger();
-00042          ~CLogger();
-00043 
-00044          Logger * mpLogger;
-00045       };
-00046 
-00047    }
-00048 }
-00049 #endif
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/da/d44/classivi_link_1_1_app_1_1_c_profile_getter-members.html b/doc/technical/appLib/html/da/d44/classivi_link_1_1_app_1_1_c_profile_getter-members.html deleted file mode 100644 index 87810ce4..00000000 --- a/doc/technical/appLib/html/da/d44/classivi_link_1_1_app_1_1_c_profile_getter-members.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::App::CProfileGetter Member List
-
-
-This is the complete list of members for iviLink::App::CProfileGetter, including all inherited members. - -
CProfileProxy (defined in iviLink::App::CProfileGetter)iviLink::App::CProfileGetter [friend]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/da/d47/_c_logger_8cpp.html b/doc/technical/appLib/html/da/d47/_c_logger_8cpp.html deleted file mode 100644 index 35365a1b..00000000 --- a/doc/technical/appLib/html/da/d47/_c_logger_8cpp.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: private/CLogger.cpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces
-
-
private/CLogger.cpp File Reference
-
-
-
#include "utils/misc/Logger.hpp"
-#include "CLogger.hpp"
-
-

Go to the source code of this file.

- - - - -

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/da/d47/_c_logger_8cpp_source.html b/doc/technical/appLib/html/da/d47/_c_logger_8cpp_source.html deleted file mode 100644 index 7deae357..00000000 --- a/doc/technical/appLib/html/da/d47/_c_logger_8cpp_source.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - -iviLink: private/CLogger.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CLogger.cpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #include "utils/misc/Logger.hpp"
-00028 #include "CLogger.hpp"
-00029 
-00030 namespace iviLink
-00031 {
-00032    namespace App
-00033    {
-00034 
-00035       CLogger::CLogger()
-00036          : mpLogger(0)
-00037       {
-00038          PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties"));
-00039          mpLogger = new Logger(Logger::getInstance(LOG4CPLUS_TEXT("appLib")));
-00040       }
-00041 
-00042       CLogger::~CLogger()
-00043       {
-00044          delete mpLogger;
-00045       }
-00046 
-00047       Logger * CLogger::logger()
-00048       {
-00049          static CLogger sInstance;
-00050          return sInstance.mpLogger;
-00051       }
-00052    }
-00053 }
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/db/d10/classivi_link_1_1_c_app.html b/doc/technical/appLib/html/db/d10/classivi_link_1_1_c_app.html deleted file mode 100644 index dc6c5a60..00000000 --- a/doc/technical/appLib/html/db/d10/classivi_link_1_1_c_app.html +++ /dev/null @@ -1,572 +0,0 @@ - - - - -iviLink: iviLink::CApp Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions
-
-
iviLink::CApp Class Reference
-
-
- -

This class is used to initialize application in iviLink and use general iviLink functionality - load/unload services and get profiles. - More...

- -

#include <CApp.hpp>

- -

List of all members.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CApp ()
 Constructor.
 CApp (const Service::Uid &service)
 Constructor.
 CApp (const Service::ListOfUids &services)
 Constructor.
void setEnabled (const Service::Uid &service, bool enable)
 Enable/disable loading a service.
void setEnabled (const Service::ListOfUids &services, bool enable)
 Enable/disable loading number of services.
ELaunchInfo getLaunchInfo ()
 Get information on how the application was launched.
void registerProfileCallbacks (const Profile::ApiUid &profileApi, Profile::IProfileCallbackProxy *pCallbacks)
 Register callbacks for given profile API.
bool loadService (const Service::Uid &service)
 Load a service.
void unloadService (const Service::Uid &service)
 Unload a service.
Service::ListOfUids getActiveServices ()
 Obtain list of loaded services.
bool isActive (const Service::Uid &service)
 Check whether a service is loaded.
virtual void initDone (ELaunchInfo launcher)
 Called after the initialization of this application.
virtual void incomingServiceBeforeLoading (const Service::Uid &service)
 Called before loading an incoming service.
virtual void incomingServiceAfterLoading (const Service::Uid &service)
 Called after loading an incoming service.
virtual void serviceLoadError (const Service::Uid &service)
 Called if an error has occurred during service loading.
virtual void serviceDropped (const Service::Uid &service)
 Called when a service session ends.
-

Detailed Description

-

This class is used to initialize application in iviLink and use general iviLink functionality - load/unload services and get profiles.

-

CApp should be inherited it to receive callbacks.

- -

Definition at line 51 of file CApp.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
iviLink::CApp::CApp ()
-
-
- -

Constructor.

-

No information on supported services is passed to iviLink. In order to enable services or disable any of them in run-time setEnabled() method should be used

- -
-
- -
-
- - - - - - - - -
iviLink::CApp::CApp (const Service::Uid & service)
-
-
- -

Constructor.

-

Information on one supported service is passed to iviLink. In order to enable addtitional services or disable any of them in run-time setEnabled() method should be used

-
Parameters:
- - -
serviceUID of the service to be supported by the Application
-
-
- -
-
- -
-
- - - - - - - - -
iviLink::CApp::CApp (const Service::ListOfUids & services)
-
-
- -

Constructor.

-

Information on multiple supported services is passed to iviLink. In order to enable addtitional services or disable any of them in run-time setEnabled() method should be used

-
Parameters:
- - -
serviceslist of the services UIDs to be supported by the Application
-
-
- -
-
-

Member Function Documentation

- -
-
- - - - - - - -
Service::ListOfUids iviLink::CApp::getActiveServices ()
-
-
- -

Obtain list of loaded services.

-
Returns:
list of loaded services (see loadService())
- -
-
- -
-
- - - - - - - -
ELaunchInfo iviLink::CApp::getLaunchInfo ()
-
-
- -

Get information on how the application was launched.

-
Return values:
- - - - -
ERROR_APP_NOT_INITED_IN_IVILINKan error occurred during application's initialization
LAUNCHED_BY_USERapplication was launched by user
LAUNCHED_BY_IVILINKapplication was launched by Application Manager after a request from the other side
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::CApp::incomingServiceAfterLoading (const Service::Uid & service) [virtual]
-
-
- -

Called after loading an incoming service.

-
Parameters:
- - -
serviceUID of a loaded incoming service
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::CApp::incomingServiceBeforeLoading (const Service::Uid & service) [virtual]
-
-
- -

Called before loading an incoming service.

-
Parameters:
- - -
serviceUID of an incoming service
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::CApp::initDone (ELaunchInfo launcher) [virtual]
-
-
- -

Called after the initialization of this application.

-
Parameters:
- - -
launcheris the output parameter providing information on how the application was launched: app may be launched either by user (in this case services should be loaded with loadService() method call ,and then proxies for profiles may be obtained), or by Application Manager (after request from the other side - then proxies may be used).
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CApp::isActive (const Service::Uid & service)
-
-
- -

Check whether a service is loaded.

-
Parameters:
- - -
serviceUID of a service
-
-
-
Returns:
true if the service is active, otherwise false
- -
-
- -
-
- - - - - - - - -
bool iviLink::CApp::loadService (const Service::Uid & service)
-
-
- -

Load a service.

-

This method should be called to load a service in case the Application is started by user (see the initDone() callback. loadService method causes execution of the Application and loading of the appropriate service on the other side After a service loaded successfully it is possible to obtain a profile proxy of a profile associated with the service and use profile functionality from the application.

-
Parameters:
- - -
serviceUID of a service to load
-
-
-
Returns:
true if success, otherwise false
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void iviLink::CApp::registerProfileCallbacks (const Profile::ApiUid & profileApi,
Profile::IProfileCallbackProxy * pCallbacks 
)
-
-
- -

Register callbacks for given profile API.

-
Parameters:
- - - -
profileApiUID of a Profile API
pCallbackspointer to a handler of this profile's callbacks
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::CApp::serviceDropped (const Service::Uid & service) [virtual]
-
-
- -

Called when a service session ends.

-
Parameters:
- - -
serviceUID of a service whose session has ended
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::CApp::serviceLoadError (const Service::Uid & service) [virtual]
-
-
- -

Called if an error has occurred during service loading.

-
Parameters:
- - -
serviceUID of an incoming service that caused the error
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void iviLink::CApp::setEnabled (const Service::ListOfUids & services,
bool enable 
)
-
-
- -

Enable/disable loading number of services.

-
Parameters:
- - - -
serviceslist of services UIDs
enabletrue enables list of services, false disables them
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void iviLink::CApp::setEnabled (const Service::Uid & service,
bool enable 
)
-
-
- -

Enable/disable loading a service.

-
Parameters:
- - - -
serviceUID of a service
enabletrue enables service, false disables it
-
-
- -
-
- -
-
- - - - - - - - -
void iviLink::CApp::unloadService (const Service::Uid & service)
-
-
- -

Unload a service.

-
Parameters:
- - -
serviceUID of a service to be unloaded
-
-
- -
-
-
The documentation for this class was generated from the following file: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/db/d9c/classivi_link_1_1_app_1_1_c_serv_man_proxy.html b/doc/technical/appLib/html/db/d9c/classivi_link_1_1_app_1_1_c_serv_man_proxy.html deleted file mode 100644 index d5d814f3..00000000 --- a/doc/technical/appLib/html/db/d9c/classivi_link_1_1_app_1_1_c_serv_man_proxy.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - -iviLink: iviLink::App::CServManProxy Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions
-
-
iviLink::App::CServManProxy Class Reference
-
-
- -

List of all members.

- - - -

-Public Member Functions

- CServManProxy (CApp *pApp)
-

Detailed Description

-
-

Definition at line 39 of file CServManProxy.hpp.

-
The documentation for this class was generated from the following files: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp.html b/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp.html deleted file mode 100644 index 55aefb97..00000000 --- a/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - -iviLink: private/CAppManProxy.cpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces
-
-
private/CAppManProxy.cpp File Reference
-
-
-
#include "CAppManProxy.hpp"
-#include "utils/threads/CMutex.hpp"
-#include "framework/appLib/ApplicationManager/CAppManConnectController.hpp"
-#include "framework/appLib/ApplicationManager/IAppMan.hpp"
-#include "CLogger.hpp"
-
-

Go to the source code of this file.

- - - - -

-Namespaces

namespace  iviLink
namespace  iviLink::App
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp_source.html b/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp_source.html deleted file mode 100644 index 68f1d329..00000000 --- a/doc/technical/appLib/html/dc/d4a/_c_app_man_proxy_8cpp_source.html +++ /dev/null @@ -1,258 +0,0 @@ - - - - -iviLink: private/CAppManProxy.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
private/CAppManProxy.cpp
-
-
-
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025 
-00026 
-00027 #include "CAppManProxy.hpp"
-00028 #include "utils/threads/CMutex.hpp"
-00029 #include "framework/appLib/ApplicationManager/CAppManConnectController.hpp"
-00030 #include "framework/appLib/ApplicationManager/IAppMan.hpp"
-00031 #include "CLogger.hpp"
-00032 
-00033 namespace iviLink
-00034 {
-00035    namespace App
-00036    {
-00037 
-00038       CAppManProxy::CAppManProxy(CApp * pApp)
-00039          : CThread("iviLinkAppCoreThread")
-00040          , mpApp(pApp)
-00041          , mInitStatus(NOT_INITED)
-00042          , mpInitMutex(new CMutex())
-00043          , mBe(true)
-00044          , mLauncher(ERROR_APP_NOT_INITED_IN_IVILINK)
-00045          , mpRequestSemaphore(new CSignalSemaphore())
-00046          , mpUseListMutex(new CMutex())
-00047       {
-00048          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00049       }
-00050 
-00051       CAppManProxy::~CAppManProxy()
-00052       {
-00053          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00054          AppMan::CAppManConnectController::deleteInstance();
-00055          delete mpInitMutex;
-00056          delete mpRequestSemaphore;
-00057          delete mpUseListMutex;
-00058       }
-00059 
-00060       void CAppManProxy::threadFunc()
-00061       {
-00062          mpRequestSemaphore->wait();
-00063          while (mBe)
-00064          {
-00065             handleInit();
-00066             handleUseService();
-00067             if (!hasRequests() && mBe)
-00068             {
-00069                mpRequestSemaphore->wait();
-00070             }
-00071          }
-00072       }
-00073 
-00074       void CAppManProxy::init(const Service::ListOfUids &services)
-00075       {
-00076          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00077          mpInitMutex->lock();
-00078          if (NOT_INITED == mInitStatus)
-00079          {
-00080             mInitStatus = HAS_INIT_REQUEST;
-00081             mInitedServices = services;
-00082          }
-00083          mpInitMutex->unlock();
-00084          mpRequestSemaphore->signal();
-00085       }
-00086 
-00087       void CAppManProxy::handleInit()
-00088       {
-00089          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00090          mpInitMutex->lock();
-00091          bool compareRes = HAS_INIT_REQUEST == mInitStatus;
-00092          mpInitMutex->unlock();
-00093          if (compareRes)
-00094          {
-00095             AppMan::EInitResult initRes;
-00096             do
-00097             {
-00098                initRes = AppMan::CAppManConnectController::instance()->applicationManager()
-00099                      ->initApplication(mInitedServices);
-00100                if (AppMan::STARTED_BY_APPMAN == initRes)
-00101                {
-00102                   mLauncher = LAUNCHED_BY_IVILINK;
-00103                   mpApp->initDone(mLauncher);
-00104                   break;
-00105                }
-00106                else if (AppMan::STARTED_BY_USER == initRes)
-00107                {
-00108                   mLauncher = LAUNCHED_BY_USER;
-00109                   mpApp->initDone(mLauncher);
-00110                   break;
-00111                }
-00112                usleep(250000);
-00113             }
-00114             while(mBe);
-00115          }
-00116       }
-00117 
-00118 
-00119       void CAppManProxy::handleUseService()
-00120       {
-00121          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00122          mpUseListMutex->lock();
-00123          if (mUseList.empty())
-00124          {
-00125             mpUseListMutex->unlock();
-00126             return;
-00127          }
-00128          bool use = mUseList.front().second;
-00129          Service::Uid service = mUseList.front().first;
-00130          mpUseListMutex->unlock();
-00131 
-00132          CError err = AppMan::CAppManConnectController::instance()->applicationManager()
-00133                ->useService(service, use);
-00134 
-00135          if (err.isNoError())
-00136          {
-00137             mpUseListMutex->lock();
-00138             mUseList.erase(mUseList.begin());
-00139             mpUseListMutex->unlock();
-00140          }
-00141       }
-00142 
-00143       bool CAppManProxy::hasRequests()
-00144       {
-00145          mpUseListMutex->lock();
-00146          bool res = !mUseList.empty();
-00147          mpUseListMutex->unlock();
-00148          return res;
-00149       }
-00150 
-00151       void CAppManProxy::finish()
-00152       {
-00153          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00154          mBe = false;
-00155          mpRequestSemaphore->signal();
-00156          stop();
-00157       }
-00158 
-00159 
-00160       void CAppManProxy::useService(const Service::Uid& service, bool use)
-00161       {
-00162          LOG4CPLUS_TRACE_METHOD(*App::CLogger::logger(),__PRETTY_FUNCTION__);
-00163          mpUseListMutex->lock();
-00164          mUseList.push_back(make_pair(service,use));
-00165          mpUseListMutex->unlock();
-00166          mpRequestSemaphore->signal();
-00167       }
-00168 
-00169       ELaunchInfo CAppManProxy::launcher() const
-00170       {
-00171          return mLauncher;
-00172       }
-00173 
-00174    }
-00175 }
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:12:06 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp.html b/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp.html deleted file mode 100644 index 4b8cfd93..00000000 --- a/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - -iviLink: CProfileProxy.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces
-
-
CProfileProxy.hpp File Reference
-
-
- -

This header contains declaration of the base class for all profile proxies. -More...

-
#include "utils/misc/UID.hpp"
-#include "macro.hpp"
-#include "framework/appLib/appLib/CProfileApiBase.hpp"
-
-

Go to the source code of this file.

- - - - - - - -

-

-

-Classes

class  iviLink::App::CProfileProxy< ProfileApi >
 A base class for all profile proxies. More...

-Namespaces

namespace  iviLink
 

This namespace is a basic namespace for all framework's components and libraries.

-
-

Detailed Description

-

This header contains declaration of the base class for all profile proxies.

-

The class shoudln't be inherited directly, macros from macro.hpp should be used instead. (see samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp)

- -

Definition in file CProfileProxy.hpp.

-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp_source.html b/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp_source.html deleted file mode 100644 index fa95c350..00000000 --- a/doc/technical/appLib/html/dc/dab/_c_profile_proxy_8hpp_source.html +++ /dev/null @@ -1,163 +0,0 @@ - - - - -iviLink: CProfileProxy.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
CProfileProxy.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025  
-00035 #ifndef CPROFILEHANDLER_HPP_
-00036 #define CPROFILEHANDLER_HPP_
-00037 
-00038 #include "utils/misc/UID.hpp"
-00039 #include "macro.hpp"
-00040 #include "framework/appLib/appLib/CProfileApiBase.hpp"
-00041 
-00042 namespace iviLink
-00043 {
-00044    namespace App
-00045    {
-00046       template <typename ProfileApi>
-00047       class CProfileProxy;
-00048 
-00049       class CProfileGetter
-00050       {
-00051          template <typename ProfileApi> friend class CProfileProxy;
-00052          static CProfileApiBase * getBaseProfile(const Service::Uid & service, const Profile::ApiUid & api);
-00053          static void releaseProfile(const Service::Uid & service, const Profile::ApiUid & api);
-00054       };
-00055       
-00056       
-00065       template <typename ProfileApi>
-00066       class CProfileProxy
-00067       {
-00068       public:
-00069          CProfileProxy(const Service::Uid & service, const Profile::ApiUid & api)
-00070             : mService(service)
-00071             , mApi(api)
-00072          {
-00073          }
-00074          virtual ~CProfileProxy()
-00075          {
-00076          }
-00077 
-00078       protected:
-00079          ProfileApi * getProfile() const
-00080          {
-00081             return static_cast<ProfileApi*>(CProfileGetter::getBaseProfile(mService,mApi));
-00082          }
-00083 
-00084          void releaseProfile() const
-00085          {
-00086             CProfileGetter::releaseProfile(mService, mApi);
-00087          }
-00088 
-00089       private:
-00090 
-00091          Service::Uid mService;
-00092          Profile::ApiUid mApi;
-00093       };
-00094    }
-00095 
-00096 } /* namespace iviLink */
-00097 #endif /* CPROFILEHANDLER_HPP_ */
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dd/d3a/common_8hpp.html b/doc/technical/appLib/html/dd/d3a/common_8hpp.html deleted file mode 100644 index 6b2641b2..00000000 --- a/doc/technical/appLib/html/dd/d3a/common_8hpp.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - -iviLink: common.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Namespaces | -Typedefs | -Enumerations
-
-
common.hpp File Reference
-
-
- -

This file contains enum declarations. -More...

-
#include <list>
-#include "utils/misc/UID.hpp"
-#include "framework/components/ProfileManager/PMAL/CProfile.hpp"
-
-

Go to the source code of this file.

- - - - -

-

- - - - - - - -

-Namespaces

namespace  iviLink
 

This namespace is a basic namespace for all framework's components and libraries.

-

-Typedefs

-typedef std::list< Uid > iviLink::Service::ListOfUids

-Enumerations

enum  iviLink::ELaunchInfo { iviLink::LAUNCHED_BY_IVILINK, -iviLink::LAUNCHED_BY_USER, -iviLink::ERROR_APP_NOT_INITED_IN_IVILINK - }
 ELaunchInfo is used to pass information about application's launch (is a parameter in CApp's callback initDone()). More...
enum  iviLink::ELoadServiceResult { iviLink::LOAD_OK, -iviLink::LOAD_ERROR_APP_NOT_INITED, -iviLink::LOAD_ERROR_UNKNOWN_SERVICE, -iviLink::LOAD_ERROR_OTHER - }
 ELoadServiceResult is supposed to represent results of loading a service (currently it is not used). More...
-

Detailed Description

-

This file contains enum declarations.

- -

Definition in file common.hpp.

-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dd/d3a/common_8hpp_source.html b/doc/technical/appLib/html/dd/d3a/common_8hpp_source.html deleted file mode 100644 index d6ab1239..00000000 --- a/doc/technical/appLib/html/dd/d3a/common_8hpp_source.html +++ /dev/null @@ -1,140 +0,0 @@ - - - - -iviLink: common.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
common.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025  
-00032 #ifndef IVILINK_SERVICE_COMMON_HPP_
-00033 #define IVILINK_SERVICE_COMMON_HPP_
-00034 
-00035 #include <list>
-00036 
-00037 #include "utils/misc/UID.hpp"
-00038 #include "framework/components/ProfileManager/PMAL/CProfile.hpp"
-00039 
-00045 namespace iviLink
-00046 {
-00052    enum ELaunchInfo
-00053    {
-00054       LAUNCHED_BY_IVILINK, 
-00055       LAUNCHED_BY_USER, 
-00056       ERROR_APP_NOT_INITED_IN_IVILINK 
-00057    };
-00058 
-00064    enum ELoadServiceResult
-00065    {
-00066       LOAD_OK,    
-00067       LOAD_ERROR_APP_NOT_INITED, 
-00068       LOAD_ERROR_UNKNOWN_SERVICE, 
-00069       LOAD_ERROR_OTHER 
-00070    };
-00071 
-00072    namespace Service
-00073    {
-00074       typedef std::list<Uid> ListOfUids;
-00075    }
-00076 }
-00077 
-00078 #endif
-
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/dd/ddf/classivi_link_1_1_app_1_1_c_profile_getter.html b/doc/technical/appLib/html/dd/ddf/classivi_link_1_1_app_1_1_c_profile_getter.html deleted file mode 100644 index 67e27885..00000000 --- a/doc/technical/appLib/html/dd/ddf/classivi_link_1_1_app_1_1_c_profile_getter.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - -iviLink: iviLink::App::CProfileGetter Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Friends
-
-
iviLink::App::CProfileGetter Class Reference
-
-
- -

List of all members.

- - - -

-Friends

-class CProfileProxy
-

Detailed Description

-
-

Definition at line 49 of file CProfileProxy.hpp.

-
The documentation for this class was generated from the following files: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/de/dbe/classivi_link_1_1_app_1_1_c_logger-members.html b/doc/technical/appLib/html/de/dbe/classivi_link_1_1_app_1_1_c_logger-members.html deleted file mode 100644 index b3d65e59..00000000 --- a/doc/technical/appLib/html/de/dbe/classivi_link_1_1_app_1_1_c_logger-members.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::App::CLogger Member List
-
-
-This is the complete list of members for iviLink::App::CLogger, including all inherited members. - -
logger() (defined in iviLink::App::CLogger)iviLink::App::CLogger [static]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/df/d1f/classivi_link_1_1_app_1_1_c_app_man_proxy.html b/doc/technical/appLib/html/df/d1f/classivi_link_1_1_app_1_1_c_app_man_proxy.html deleted file mode 100644 index 5dfaa88b..00000000 --- a/doc/technical/appLib/html/df/d1f/classivi_link_1_1_app_1_1_c_app_man_proxy.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - -iviLink: iviLink::App::CAppManProxy Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions
-
-
iviLink::App::CAppManProxy Class Reference
-
-
- -

List of all members.

- - - - - - - -

-Public Member Functions

- CAppManProxy (CApp *pApp)
-void finish ()
-void init (const Service::ListOfUids &services)
-void useService (const Service::Uid &service, bool use)
-ELaunchInfo launcher () const
-

Detailed Description

-
-

Definition at line 51 of file CAppManProxy.hpp.

-
The documentation for this class was generated from the following files: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:11:31 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/df/d3e/classivi_link_1_1_app_1_1_c_serv_man_proxy-members.html b/doc/technical/appLib/html/df/d3e/classivi_link_1_1_app_1_1_c_serv_man_proxy-members.html deleted file mode 100644 index 1f3ddd6e..00000000 --- a/doc/technical/appLib/html/df/d3e/classivi_link_1_1_app_1_1_c_serv_man_proxy-members.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::App::CServManProxy Member List
-
-
-This is the complete list of members for iviLink::App::CServManProxy, including all inherited members. - - -
CServManProxy(CApp *pApp) (defined in iviLink::App::CServManProxy)iviLink::App::CServManProxy
~CServManProxy() (defined in iviLink::App::CServManProxy)iviLink::App::CServManProxy [virtual]
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/df/dec/classivi_link_1_1_app_1_1_c_logger.html b/doc/technical/appLib/html/df/dec/classivi_link_1_1_app_1_1_c_logger.html deleted file mode 100644 index 38d007d2..00000000 --- a/doc/technical/appLib/html/df/dec/classivi_link_1_1_app_1_1_c_logger.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - -iviLink: iviLink::App::CLogger Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Static Public Member Functions
-
-
iviLink::App::CLogger Class Reference
-
-
- -

List of all members.

- - - -

-Static Public Member Functions

-static Logger * logger ()
-

Detailed Description

-
-

Definition at line 35 of file CLogger.hpp.

-
The documentation for this class was generated from the following files: -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:07:56 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/df/dfc/namespaceivi_link_1_1_profile.html b/doc/technical/appLib/html/df/dfc/namespaceivi_link_1_1_profile.html deleted file mode 100644 index 410ee8f9..00000000 --- a/doc/technical/appLib/html/df/dfc/namespaceivi_link_1_1_profile.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - -iviLink: iviLink::Profile Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes
-
-
iviLink::Profile Namespace Reference
-
-
- - - -

-Classes

class  IProfileCallbackProxy
-
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/doxygen.css b/doc/technical/appLib/html/doxygen.css deleted file mode 100644 index 74445fe1..00000000 --- a/doc/technical/appLib/html/doxygen.css +++ /dev/null @@ -1,835 +0,0 @@ -/* The standard CSS for doxygen */ - -body, table, div, p, dl { - font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; - font-size: 12px; -} - -/* @group Heading Levels */ - -h1 { - font-size: 150%; -} - -.title { - font-size: 150%; - font-weight: bold; - margin: 10px 2px; -} - -h2 { - font-size: 120%; -} - -h3 { - font-size: 100%; -} - -dt { - font-weight: bold; -} - -div.multicol { - -moz-column-gap: 1em; - -webkit-column-gap: 1em; - -moz-column-count: 3; - -webkit-column-count: 3; -} - -p.startli, p.startdd, p.starttd { - margin-top: 2px; -} - -p.endli { - margin-bottom: 0px; -} - -p.enddd { - margin-bottom: 4px; -} - -p.endtd { - margin-bottom: 2px; -} - -/* @end */ - -caption { - font-weight: bold; -} - -span.legend { - font-size: 70%; - text-align: center; -} - -h3.version { - font-size: 90%; - text-align: center; -} - -div.qindex, div.navtab{ - background-color: #EBEFF6; - border: 1px solid #A3B4D7; - text-align: center; - margin: 2px; - padding: 2px; -} - -div.qindex, div.navpath { - width: 100%; - line-height: 140%; -} - -div.navtab { - margin-right: 15px; -} - -/* @group Link Styling */ - -a { - color: #3D578C; - font-weight: normal; - text-decoration: none; -} - -.contents a:visited { - color: #4665A2; -} - -a:hover { - text-decoration: underline; -} - -a.qindex { - font-weight: bold; -} - -a.qindexHL { - font-weight: bold; - background-color: #9CAFD4; - color: #ffffff; - border: 1px double #869DCA; -} - -.contents a.qindexHL:visited { - color: #ffffff; -} - -a.el { - font-weight: bold; -} - -a.elRef { -} - -a.code { - color: #4665A2; -} - -a.codeRef { - color: #4665A2; -} - -/* @end */ - -dl.el { - margin-left: -1cm; -} - -.fragment { - font-family: monospace, fixed; - font-size: 105%; -} - -pre.fragment { - border: 1px solid #C4CFE5; - background-color: #FBFCFD; - padding: 4px 6px; - margin: 4px 8px 4px 2px; - overflow: auto; - word-wrap: break-word; - font-size: 9pt; - line-height: 125%; -} - -div.ah { - background-color: black; - font-weight: bold; - color: #ffffff; - margin-bottom: 3px; - margin-top: 3px; - padding: 0.2em; - border: solid thin #333; - border-radius: 0.5em; - -webkit-border-radius: .5em; - -moz-border-radius: .5em; - box-shadow: 2px 2px 3px #999; - -webkit-box-shadow: 2px 2px 3px #999; - -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); - background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); -} - -div.groupHeader { - margin-left: 16px; - margin-top: 12px; - font-weight: bold; -} - -div.groupText { - margin-left: 16px; - font-style: italic; -} - -body { - background: white; - color: black; - margin: 0; -} - -div.contents { - margin-top: 10px; - margin-left: 10px; - margin-right: 5px; -} - -td.indexkey { - background-color: #EBEFF6; - font-weight: bold; - border: 1px solid #C4CFE5; - margin: 2px 0px 2px 0; - padding: 2px 10px; -} - -td.indexvalue { - background-color: #EBEFF6; - border: 1px solid #C4CFE5; - padding: 2px 10px; - margin: 2px 0px; -} - -tr.memlist { - background-color: #EEF1F7; -} - -p.formulaDsp { - text-align: center; -} - -img.formulaDsp { - -} - -img.formulaInl { - vertical-align: middle; -} - -div.center { - text-align: center; - margin-top: 0px; - margin-bottom: 0px; - padding: 0px; -} - -div.center img { - border: 0px; -} - -address.footer { - text-align: right; - padding-right: 12px; -} - -img.footer { - border: 0px; - vertical-align: middle; -} - -/* @group Code Colorization */ - -span.keyword { - color: #008000 -} - -span.keywordtype { - color: #604020 -} - -span.keywordflow { - color: #e08000 -} - -span.comment { - color: #800000 -} - -span.preprocessor { - color: #806020 -} - -span.stringliteral { - color: #002080 -} - -span.charliteral { - color: #008080 -} - -span.vhdldigit { - color: #ff00ff -} - -span.vhdlchar { - color: #000000 -} - -span.vhdlkeyword { - color: #700070 -} - -span.vhdllogic { - color: #ff0000 -} - -/* @end */ - -/* -.search { - color: #003399; - font-weight: bold; -} - -form.search { - margin-bottom: 0px; - margin-top: 0px; -} - -input.search { - font-size: 75%; - color: #000080; - font-weight: normal; - background-color: #e8eef2; -} -*/ - -td.tiny { - font-size: 75%; -} - -.dirtab { - padding: 4px; - border-collapse: collapse; - border: 1px solid #A3B4D7; -} - -th.dirtab { - background: #EBEFF6; - font-weight: bold; -} - -hr { - height: 0px; - border: none; - border-top: 1px solid #4A6AAA; -} - -hr.footer { - height: 1px; -} - -/* @group Member Descriptions */ - -table.memberdecls { - border-spacing: 0px; - padding: 0px; -} - -.mdescLeft, .mdescRight, -.memItemLeft, .memItemRight, -.memTemplItemLeft, .memTemplItemRight, .memTemplParams { - background-color: #F9FAFC; - border: none; - margin: 4px; - padding: 1px 0 0 8px; -} - -.mdescLeft, .mdescRight { - padding: 0px 8px 4px 8px; - color: #555; -} - -.memItemLeft, .memItemRight, .memTemplParams { - border-top: 1px solid #C4CFE5; -} - -.memItemLeft, .memTemplItemLeft { - white-space: nowrap; -} - -.memItemRight { - width: 100%; -} - -.memTemplParams { - color: #4665A2; - white-space: nowrap; -} - -/* @end */ - -/* @group Member Details */ - -/* Styles for detailed member documentation */ - -.memtemplate { - font-size: 80%; - color: #4665A2; - font-weight: normal; - margin-left: 9px; -} - -.memnav { - background-color: #EBEFF6; - border: 1px solid #A3B4D7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; -} - -.mempage { - width: 100%; -} - -.memitem { - padding: 0; - margin-bottom: 10px; - margin-right: 5px; -} - -.memname { - white-space: nowrap; - font-weight: bold; - margin-left: 6px; -} - -.memproto { - border-top: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; - padding: 6px 0px 6px 0px; - color: #253555; - font-weight: bold; - text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - /* opera specific markup */ - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - border-top-right-radius: 8px; - border-top-left-radius: 8px; - /* firefox specific markup */ - -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; - -moz-border-radius-topright: 8px; - -moz-border-radius-topleft: 8px; - /* webkit specific markup */ - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - -webkit-border-top-right-radius: 8px; - -webkit-border-top-left-radius: 8px; - background-image:url('nav_f.png'); - background-repeat:repeat-x; - background-color: #E2E8F2; - -} - -.memdoc { - border-bottom: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; - padding: 2px 5px; - background-color: #FBFCFD; - border-top-width: 0; - /* opera specific markup */ - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - /* firefox specific markup */ - -moz-border-radius-bottomleft: 8px; - -moz-border-radius-bottomright: 8px; - -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; - background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); - /* webkit specific markup */ - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); -} - -.paramkey { - text-align: right; -} - -.paramtype { - white-space: nowrap; -} - -.paramname { - color: #602020; - white-space: nowrap; -} -.paramname em { - font-style: normal; -} - -.params, .retval, .exception, .tparams { - border-spacing: 6px 2px; -} - -.params .paramname, .retval .paramname { - font-weight: bold; - vertical-align: top; -} - -.params .paramtype { - font-style: italic; - vertical-align: top; -} - -.params .paramdir { - font-family: "courier new",courier,monospace; - vertical-align: top; -} - - - - -/* @end */ - -/* @group Directory (tree) */ - -/* for the tree view */ - -.ftvtree { - font-family: sans-serif; - margin: 0px; -} - -/* these are for tree view when used as main index */ - -.directory { - font-size: 9pt; - font-weight: bold; - margin: 5px; -} - -.directory h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} - -/* -The following two styles can be used to replace the root node title -with an image of your choice. Simply uncomment the next two styles, -specify the name of your image and be sure to set 'height' to the -proper pixel height of your image. -*/ - -/* -.directory h3.swap { - height: 61px; - background-repeat: no-repeat; - background-image: url("yourimage.gif"); -} -.directory h3.swap span { - display: none; -} -*/ - -.directory > h3 { - margin-top: 0; -} - -.directory p { - margin: 0px; - white-space: nowrap; -} - -.directory div { - display: none; - margin: 0px; -} - -.directory img { - vertical-align: -30%; -} - -/* these are for tree view when not used as main index */ - -.directory-alt { - font-size: 100%; - font-weight: bold; -} - -.directory-alt h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} - -.directory-alt > h3 { - margin-top: 0; -} - -.directory-alt p { - margin: 0px; - white-space: nowrap; -} - -.directory-alt div { - display: none; - margin: 0px; -} - -.directory-alt img { - vertical-align: -30%; -} - -/* @end */ - -div.dynheader { - margin-top: 8px; -} - -address { - font-style: normal; - color: #2A3D61; -} - -table.doxtable { - border-collapse:collapse; -} - -table.doxtable td, table.doxtable th { - border: 1px solid #2D4068; - padding: 3px 7px 2px; -} - -table.doxtable th { - background-color: #374F7F; - color: #FFFFFF; - font-size: 110%; - padding-bottom: 4px; - padding-top: 5px; - text-align:left; -} - -.tabsearch { - top: 0px; - left: 10px; - height: 36px; - background-image: url('tab_b.png'); - z-index: 101; - overflow: hidden; - font-size: 13px; -} - -.navpath ul -{ - font-size: 11px; - background-image:url('tab_b.png'); - background-repeat:repeat-x; - height:30px; - line-height:30px; - color:#8AA0CC; - border:solid 1px #C2CDE4; - overflow:hidden; - margin:0px; - padding:0px; -} - -.navpath li -{ - list-style-type:none; - float:left; - padding-left:10px; - padding-right:15px; - background-image:url('bc_s.png'); - background-repeat:no-repeat; - background-position:right; - color:#364D7C; -} - -.navpath li.navelem a -{ - height:32px; - display:block; - text-decoration: none; - outline: none; -} - -.navpath li.navelem a:hover -{ - color:#6884BD; -} - -.navpath li.footer -{ - list-style-type:none; - float:right; - padding-left:10px; - padding-right:15px; - background-image:none; - background-repeat:no-repeat; - background-position:right; - color:#364D7C; - font-size: 8pt; -} - - -div.summary -{ - float: right; - font-size: 8pt; - padding-right: 5px; - width: 50%; - text-align: right; -} - -div.summary a -{ - white-space: nowrap; -} - -div.ingroups -{ - font-size: 8pt; - padding-left: 5px; - width: 50%; - text-align: left; -} - -div.ingroups a -{ - white-space: nowrap; -} - -div.header -{ - background-image:url('nav_h.png'); - background-repeat:repeat-x; - background-color: #F9FAFC; - margin: 0px; - border-bottom: 1px solid #C4CFE5; -} - -div.headertitle -{ - padding: 5px 5px 5px 10px; -} - -dl -{ - padding: 0 0 0 10px; -} - -dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug -{ - border-left:4px solid; - padding: 0 0 0 6px; -} - -dl.note -{ - border-color: #D0C000; -} - -dl.warning, dl.attention -{ - border-color: #FF0000; -} - -dl.pre, dl.post, dl.invariant -{ - border-color: #00D000; -} - -dl.deprecated -{ - border-color: #505050; -} - -dl.todo -{ - border-color: #00C0E0; -} - -dl.test -{ - border-color: #3030E0; -} - -dl.bug -{ - border-color: #C08050; -} - -#projectlogo -{ - text-align: center; - vertical-align: bottom; - border-collapse: separate; -} - -#projectlogo img -{ - border: 0px none; -} - -#projectname -{ - font: 300% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 2px 0px; -} - -#projectbrief -{ - font: 120% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 0px; -} - -#projectnumber -{ - font: 50% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 0px; -} - -#titlearea -{ - padding: 0px; - margin: 0px; - width: 100%; - border-bottom: 1px solid #5373B4; -} - -.image -{ - text-align: center; -} - -.dotgraph -{ - text-align: center; -} - -.mscgraph -{ - text-align: center; -} - -.caption -{ - font-weight: bold; -} - diff --git a/doc/technical/appLib/html/doxygen.png b/doc/technical/appLib/html/doxygen.png deleted file mode 100644 index 635ed52f..00000000 Binary files a/doc/technical/appLib/html/doxygen.png and /dev/null differ diff --git a/doc/technical/appLib/html/files.html b/doc/technical/appLib/html/files.html deleted file mode 100644 index 0d0bb96f..00000000 --- a/doc/technical/appLib/html/files.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - -iviLink: File List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
File List
-
-
-
Here is a list of all documented files with brief descriptions:
- - - - - -
CApp.hpp [code]This header contains base class for all applications using iviLink functionality
common.hpp [code]This file contains enum declarations
CProfileApiBase.hpp [code]This header contains declaration of a base class for all profile API classes
CProfileProxy.hpp [code]This header contains declaration of the base class for all profile proxies
macro.hpp [code]This header contains macros definitions for implementing profile proxies (please see samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp)
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/functions.html b/doc/technical/appLib/html/functions.html deleted file mode 100644 index 05bbdbda..00000000 --- a/doc/technical/appLib/html/functions.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - -iviLink: Class Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
Here is a list of all documented class members with links to the class documentation for each member:
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/functions_func.html b/doc/technical/appLib/html/functions_func.html deleted file mode 100644 index 8c1c76b1..00000000 --- a/doc/technical/appLib/html/functions_func.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - -iviLink: Class Members - Functions - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/functions_rela.html b/doc/technical/appLib/html/functions_rela.html deleted file mode 100644 index 7151d5a0..00000000 --- a/doc/technical/appLib/html/functions_rela.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: Class Members - Related Functions - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- -
- All Classes Namespaces Files Functions Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/functions_vars.html b/doc/technical/appLib/html/functions_vars.html deleted file mode 100644 index 6fe2c24a..00000000 --- a/doc/technical/appLib/html/functions_vars.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - -iviLink: Class Members - Variables - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- -
- All Classes Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Defines
- - -
- -
- -
Generated on Tue Jul 31 2012 19:03:51 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/globals.html b/doc/technical/appLib/html/globals.html deleted file mode 100644 index bb45b527..00000000 --- a/doc/technical/appLib/html/globals.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - -iviLink: File Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
Here is a list of all documented file members with links to the documentation:
-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/globals_defs.html b/doc/technical/appLib/html/globals_defs.html deleted file mode 100644 index fb0afa07..00000000 --- a/doc/technical/appLib/html/globals_defs.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - -iviLink: File Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/index.html b/doc/technical/appLib/html/index.html deleted file mode 100644 index a5608fff..00000000 --- a/doc/technical/appLib/html/index.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - -iviLink: APPLICATION LIBRARY - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- -
-
-
-
APPLICATION LIBRARY
-
-
-

Application Library (AppLib) provides APIs required for using iviLink functionality in applications. This library communicates with Service Manager and Application Manager and provides simple API for application initialization in iviLink system and for iviLink services using.

-
- -
- All Classes Namespaces Files Functions Enumerations Enumerator Defines
- - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/installdox b/doc/technical/appLib/html/installdox deleted file mode 100644 index edf5bbfe..00000000 --- a/doc/technical/appLib/html/installdox +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/perl - -%subst = ( ); -$quiet = 0; - -while ( @ARGV ) { - $_ = shift @ARGV; - if ( s/^-// ) { - if ( /^l(.*)/ ) { - $v = ($1 eq "") ? shift @ARGV : $1; - ($v =~ /\/$/) || ($v .= "/"); - $_ = $v; - if ( /(.+)\@(.+)/ ) { - if ( exists $subst{$1} ) { - $subst{$1} = $2; - } else { - print STDERR "Unknown tag file $1 given with option -l\n"; - &usage(); - } - } else { - print STDERR "Argument $_ is invalid for option -l\n"; - &usage(); - } - } - elsif ( /^q/ ) { - $quiet = 1; - } - elsif ( /^\?|^h/ ) { - &usage(); - } - else { - print STDERR "Illegal option -$_\n"; - &usage(); - } - } - else { - push (@files, $_ ); - } -} - -foreach $sub (keys %subst) -{ - if ( $subst{$sub} eq "" ) - { - print STDERR "No substitute given for tag file `$sub'\n"; - &usage(); - } - elsif ( ! $quiet && $sub ne "_doc" && $sub ne "_cgi" ) - { - print "Substituting $subst{$sub} for each occurrence of tag file $sub\n"; - } -} - -if ( ! @files ) { - if (opendir(D,".")) { - foreach $file ( readdir(D) ) { - $match = ".html"; - next if ( $file =~ /^\.\.?$/ ); - ($file =~ /$match/) && (push @files, $file); - ($file =~ /\.svg/) && (push @files, $file); - ($file =~ "navtree.js") && (push @files, $file); - } - closedir(D); - } -} - -if ( ! @files ) { - print STDERR "Warning: No input files given and none found!\n"; -} - -foreach $f (@files) -{ - if ( ! $quiet ) { - print "Editing: $f...\n"; - } - $oldf = $f; - $f .= ".bak"; - unless (rename $oldf,$f) { - print STDERR "Error: cannot rename file $oldf\n"; - exit 1; - } - if (open(F,"<$f")) { - unless (open(G,">$oldf")) { - print STDERR "Error: opening file $oldf for writing\n"; - exit 1; - } - if ($oldf ne "tree.js") { - while () { - s/doxygen\=\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\" (xlink:href|href|src)=\"\2/doxygen\=\"$1:$subst{$1}\" \3=\"$subst{$1}/g; - print G "$_"; - } - } - else { - while () { - s/\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\", \"\2/\"$1:$subst{$1}\" ,\"$subst{$1}/g; - print G "$_"; - } - } - } - else { - print STDERR "Warning file $f does not exist\n"; - } - unlink $f; -} - -sub usage { - print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n"; - print STDERR "Options:\n"; - print STDERR " -l tagfile\@linkName tag file + URL or directory \n"; - print STDERR " -q Quiet mode\n\n"; - exit 1; -} diff --git a/doc/technical/appLib/html/jquery.js b/doc/technical/appLib/html/jquery.js deleted file mode 100644 index c052173a..00000000 --- a/doc/technical/appLib/html/jquery.js +++ /dev/null @@ -1,54 +0,0 @@ -/* - * jQuery JavaScript Library v1.3.2 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) - * Revision: 6246 - */ -(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0) -{I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function() -{G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); -/* - * jQuery UI 1.7.2 - * - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://docs.jquery.com/UI - */ -jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.2",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/* * jQuery UI Resizable 1.7.2 - * - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://docs.jquery.com/UI/Resizables - * - * Depends: - * ui.core.js - */ -(function(c){c.widget("ui.resizable",c.extend({},c.ui.mouse,{_init:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('
').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f
');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.parent().append(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).end().remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement)},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return this.options.disabled||!!f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidthk.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));c.extend(c.ui.resizable,{version:"1.7.2",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000}});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),g=d.options;_store=function(h){c(h).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(g.alsoResize)=="object"&&!g.alsoResize.parentNode){if(g.alsoResize.length){g.alsoResize=g.alsoResize[0];_store(g.alsoResize)}else{c.each(g.alsoResize,function(h,i){_store(h)})}}else{_store(g.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0)) -{s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);; -/** - * jQuery.ScrollTo - Easy element scrolling using jQuery. - * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com - * Licensed under GPL license (http://www.opensource.org/licenses/gpl-license.php). - * Date: 2/8/2008 - * @author Ariel Flesler - * @version 1.3.2 - */ -;(function($){var o=$.scrollTo=function(a,b,c){o.window().scrollTo(a,b,c)};o.defaults={axis:'y',duration:1};o.window=function(){return $($.browser.safari?'body':'html')};$.fn.scrollTo=function(l,m,n){if(typeof m=='object'){n=m;m=0}n=$.extend({},o.defaults,n);m=m||n.speed||n.duration;n.queue=n.queue&&n.axis.length>1;if(n.queue)m/=2;n.offset=j(n.offset);n.over=j(n.over);return this.each(function(){var a=this,b=$(a),t=l,c,d={},w=b.is('html,body');switch(typeof t){case'number':case'string':if(/^([+-]=)?\d+(px)?$/.test(t)){t=j(t);break}t=$(t,this);case'object':if(t.is||t.style)c=(t=$(t)).offset()}$.each(n.axis.split(''),function(i,f){var P=f=='x'?'Left':'Top',p=P.toLowerCase(),k='scroll'+P,e=a[k],D=f=='x'?'Width':'Height';if(c){d[k]=c[p]+(w?0:e-b.offset()[p]);if(n.margin){d[k]-=parseInt(t.css('margin'+P))||0;d[k]-=parseInt(t.css('border'+P+'Width'))||0}d[k]+=n.offset[p]||0;if(n.over[p])d[k]+=t[D.toLowerCase()]()*n.over[p]}else d[k]=t[p];if(/^\d+$/.test(d[k]))d[k]=d[k]<=0?0:Math.min(d[k],h(D));if(!i&&n.queue){if(e!=d[k])g(n.onAfterFirst);delete d[k]}});g(n.onAfter);function g(a){b.animate(d,m,n.easing,a&&function(){a.call(this,l)})};function h(D){var b=w?$.browser.opera?document.body:document.documentElement:a;return b['scroll'+D]-b['client'+D]}})};function j(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery); - diff --git a/doc/technical/appLib/html/namespacemembers.html b/doc/technical/appLib/html/namespacemembers.html deleted file mode 100644 index cad676d1..00000000 --- a/doc/technical/appLib/html/namespacemembers.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
Here is a list of all documented namespace members with links to the namespaces they belong to:
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/namespacemembers_enum.html b/doc/technical/appLib/html/namespacemembers_enum.html deleted file mode 100644 index 032f5fc8..00000000 --- a/doc/technical/appLib/html/namespacemembers_enum.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/namespacemembers_eval.html b/doc/technical/appLib/html/namespacemembers_eval.html deleted file mode 100644 index de333b98..00000000 --- a/doc/technical/appLib/html/namespacemembers_eval.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
- 
    -
  • ERROR_APP_NOT_INITED_IN_IVILINK -: iviLink -
    • -
  • LAUNCHED_BY_IVILINK -: iviLink -
    • -
  • LAUNCHED_BY_USER -: iviLink -
    • -
  • LOAD_ERROR_APP_NOT_INITED -: iviLink -
    • -
  • LOAD_ERROR_OTHER -: iviLink -
    • -
  • LOAD_ERROR_UNKNOWN_SERVICE -: iviLink -
    • -
  • LOAD_OK -: iviLink -
    • -
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/namespacemembers_type.html b/doc/technical/appLib/html/namespacemembers_type.html deleted file mode 100644 index bc34f26e..00000000 --- a/doc/technical/appLib/html/namespacemembers_type.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- - - - -
- -
- -
Generated on Tue Jul 31 2012 19:05:26 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/namespaces.html b/doc/technical/appLib/html/namespaces.html deleted file mode 100644 index 70773a19..00000000 --- a/doc/technical/appLib/html/namespaces.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - -iviLink: Namespace List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Namespace List
-
-
-
Here is a list of all documented namespaces with brief descriptions:
- -
iviLinkThis namespace is a basic namespace for all framework's components and libraries
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:10:00 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/appLib/html/nav_f.png b/doc/technical/appLib/html/nav_f.png deleted file mode 100644 index 1b07a162..00000000 Binary files a/doc/technical/appLib/html/nav_f.png and /dev/null differ diff --git a/doc/technical/appLib/html/nav_h.png b/doc/technical/appLib/html/nav_h.png deleted file mode 100644 index 01f5fa6a..00000000 Binary files a/doc/technical/appLib/html/nav_h.png and /dev/null differ diff --git a/doc/technical/appLib/html/open.png b/doc/technical/appLib/html/open.png deleted file mode 100644 index 7b35d2c2..00000000 Binary files a/doc/technical/appLib/html/open.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/all_63.html b/doc/technical/appLib/html/search/all_63.html deleted file mode 100644 index ec38d880..00000000 --- a/doc/technical/appLib/html/search/all_63.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CApp - iviLink -
-
- -
-
- CApp.hpp -
-
-
-
- common.hpp -
-
-
-
- CProfileApiBase - iviLink -
-
- -
-
- CProfileProxy - iviLink::App -
-
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_65.html b/doc/technical/appLib/html/search/all_65.html deleted file mode 100644 index 0ffed24b..00000000 --- a/doc/technical/appLib/html/search/all_65.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- ELaunchInfo - iviLink -
-
-
-
- ELoadServiceResult - iviLink -
-
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_66.html b/doc/technical/appLib/html/search/all_66.html deleted file mode 100644 index 9ed8b7d6..00000000 --- a/doc/technical/appLib/html/search/all_66.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- finish - iviLink::App::CAppManProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_67.html b/doc/technical/appLib/html/search/all_67.html deleted file mode 100644 index 18fef1bc..00000000 --- a/doc/technical/appLib/html/search/all_67.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- getActiveServices - iviLink::CApp -
-
-
-
- getError - iviLink::CProfileApiBase -
-
-
-
- getLaunchInfo - iviLink::CApp -
-
-
-
- getName - iviLink::CProfileApiBase -
-
-
-
- getProfileApiUid - iviLink::CProfileApiBase -
-
-
-
- getUid - iviLink::CProfileApiBase -
-
-
-
- getVersion - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_68.html b/doc/technical/appLib/html/search/all_68.html deleted file mode 100644 index 46ae66f8..00000000 --- a/doc/technical/appLib/html/search/all_68.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- HAS_INIT_REQUEST - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_69.html b/doc/technical/appLib/html/search/all_69.html deleted file mode 100644 index 83ca1dc3..00000000 --- a/doc/technical/appLib/html/search/all_69.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- incomingServiceAfterLoading - iviLink::CApp -
-
-
-
- incomingServiceBeforeLoading - iviLink::CApp -
-
-
-
- initDone - iviLink::CApp -
-
-
-
- isActive - iviLink::CApp -
-
-
-
- isEnabled - iviLink::CProfileApiBase -
-
- - - - - - - -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_6c.html b/doc/technical/appLib/html/search/all_6c.html deleted file mode 100644 index 7795ac9f..00000000 --- a/doc/technical/appLib/html/search/all_6c.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - -
-
Loading...
- -
-
- LAUNCHED_BY_USER - iviLink -
-
-
-
- LOAD_ERROR_APP_NOT_INITED - iviLink -
-
-
-
- LOAD_ERROR_OTHER - iviLink -
-
-
-
- LOAD_ERROR_UNKNOWN_SERVICE - iviLink -
-
-
-
- LOAD_OK - iviLink -
-
-
-
- loadService - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_6d.html b/doc/technical/appLib/html/search/all_6d.html deleted file mode 100644 index 3f9ad5d7..00000000 --- a/doc/technical/appLib/html/search/all_6d.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- macro.hpp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_6e.html b/doc/technical/appLib/html/search/all_6e.html deleted file mode 100644 index babbbc51..00000000 --- a/doc/technical/appLib/html/search/all_6e.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- NOT_INITED - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_6f.html b/doc/technical/appLib/html/search/all_6f.html deleted file mode 100644 index f09ba147..00000000 --- a/doc/technical/appLib/html/search/all_6f.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- onDisable - iviLink::CProfileApiBase -
-
-
-
- onEnable - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_70.html b/doc/technical/appLib/html/search/all_70.html deleted file mode 100644 index 5524b4f7..00000000 --- a/doc/technical/appLib/html/search/all_70.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CProfileInternal - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_72.html b/doc/technical/appLib/html/search/all_72.html deleted file mode 100644 index b1d13bee..00000000 --- a/doc/technical/appLib/html/search/all_72.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- registerProfileCallbacks - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_73.html b/doc/technical/appLib/html/search/all_73.html deleted file mode 100644 index 9e85fa4e..00000000 --- a/doc/technical/appLib/html/search/all_73.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- serviceDropped - iviLink::CApp -
-
-
-
- serviceLoadError - iviLink::CApp -
-
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_74.html b/doc/technical/appLib/html/search/all_74.html deleted file mode 100644 index a7255528..00000000 --- a/doc/technical/appLib/html/search/all_74.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- tUseServiceList - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_75.html b/doc/technical/appLib/html/search/all_75.html deleted file mode 100644 index 16e7b8ef..00000000 --- a/doc/technical/appLib/html/search/all_75.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- unloadService - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/all_7e.html b/doc/technical/appLib/html/search/all_7e.html deleted file mode 100644 index 680dbbf2..00000000 --- a/doc/technical/appLib/html/search/all_7e.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- ~CApp - iviLink::CApp -
-
-
-
- ~CAppManProxy - iviLink::App::CAppManProxy -
-
-
-
- ~CProfileApiBase - iviLink::CProfileApiBase -
-
-
-
- ~CProfileProxy - iviLink::App::CProfileProxy -
-
-
-
- ~CServManProxy - iviLink::App::CServManProxy -
-
-
-
- ~IProfileCallbackProxy - iviLink::Profile::IProfileCallbackProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/classes_63.html b/doc/technical/appLib/html/search/classes_63.html deleted file mode 100644 index c119dc72..00000000 --- a/doc/technical/appLib/html/search/classes_63.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CApp - iviLink -
-
-
-
- CProfileApiBase - iviLink -
-
-
-
- CProfileProxy - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/classes_69.html b/doc/technical/appLib/html/search/classes_69.html deleted file mode 100644 index e9fe56fe..00000000 --- a/doc/technical/appLib/html/search/classes_69.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- IProfileCallbackProxy - iviLink::Profile -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/close.png b/doc/technical/appLib/html/search/close.png deleted file mode 100644 index 9342d3df..00000000 Binary files a/doc/technical/appLib/html/search/close.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/defines_69.html b/doc/technical/appLib/html/search/defines_69.html deleted file mode 100644 index b9375598..00000000 --- a/doc/technical/appLib/html/search/defines_69.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - -
-
Loading...
- - - - - - -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enums_65.html b/doc/technical/appLib/html/search/enums_65.html deleted file mode 100644 index 2a312ea7..00000000 --- a/doc/technical/appLib/html/search/enums_65.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- ELaunchInfo - iviLink -
-
-
-
- ELoadServiceResult - iviLink -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enumvalues_65.html b/doc/technical/appLib/html/search/enumvalues_65.html deleted file mode 100644 index 9cb17c01..00000000 --- a/doc/technical/appLib/html/search/enumvalues_65.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enumvalues_68.html b/doc/technical/appLib/html/search/enumvalues_68.html deleted file mode 100644 index 46ae66f8..00000000 --- a/doc/technical/appLib/html/search/enumvalues_68.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- HAS_INIT_REQUEST - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enumvalues_69.html b/doc/technical/appLib/html/search/enumvalues_69.html deleted file mode 100644 index d55af7b7..00000000 --- a/doc/technical/appLib/html/search/enumvalues_69.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- INITED - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enumvalues_6c.html b/doc/technical/appLib/html/search/enumvalues_6c.html deleted file mode 100644 index e969bb2b..00000000 --- a/doc/technical/appLib/html/search/enumvalues_6c.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - -
-
Loading...
- -
-
- LAUNCHED_BY_USER - iviLink -
-
-
-
- LOAD_ERROR_APP_NOT_INITED - iviLink -
-
-
-
- LOAD_ERROR_OTHER - iviLink -
-
-
-
- LOAD_ERROR_UNKNOWN_SERVICE - iviLink -
-
-
-
- LOAD_OK - iviLink -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/enumvalues_6e.html b/doc/technical/appLib/html/search/enumvalues_6e.html deleted file mode 100644 index babbbc51..00000000 --- a/doc/technical/appLib/html/search/enumvalues_6e.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- NOT_INITED - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/files_63.html b/doc/technical/appLib/html/search/files_63.html deleted file mode 100644 index a18f76bf..00000000 --- a/doc/technical/appLib/html/search/files_63.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CApp.hpp -
-
-
-
- common.hpp -
-
- - -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/files_6d.html b/doc/technical/appLib/html/search/files_6d.html deleted file mode 100644 index 3f9ad5d7..00000000 --- a/doc/technical/appLib/html/search/files_6d.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- macro.hpp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_63.html b/doc/technical/appLib/html/search/functions_63.html deleted file mode 100644 index aab9b35a..00000000 --- a/doc/technical/appLib/html/search/functions_63.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -
-
Loading...
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_66.html b/doc/technical/appLib/html/search/functions_66.html deleted file mode 100644 index 9ed8b7d6..00000000 --- a/doc/technical/appLib/html/search/functions_66.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- finish - iviLink::App::CAppManProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_67.html b/doc/technical/appLib/html/search/functions_67.html deleted file mode 100644 index 18fef1bc..00000000 --- a/doc/technical/appLib/html/search/functions_67.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- getActiveServices - iviLink::CApp -
-
-
-
- getError - iviLink::CProfileApiBase -
-
-
-
- getLaunchInfo - iviLink::CApp -
-
-
-
- getName - iviLink::CProfileApiBase -
-
-
-
- getProfileApiUid - iviLink::CProfileApiBase -
-
-
-
- getUid - iviLink::CProfileApiBase -
-
-
-
- getVersion - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_68.html b/doc/technical/appLib/html/search/functions_68.html deleted file mode 100644 index 414ce598..00000000 --- a/doc/technical/appLib/html/search/functions_68.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- handleInit - iviLink::App::CAppManProxy -
-
-
-
- handleUseService - iviLink::App::CAppManProxy -
-
-
-
- hasRequests - iviLink::App::CAppManProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_69.html b/doc/technical/appLib/html/search/functions_69.html deleted file mode 100644 index e0aeaeb6..00000000 --- a/doc/technical/appLib/html/search/functions_69.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- incomingServiceAfterLoading - iviLink::CApp -
-
-
-
- incomingServiceBeforeLoading - iviLink::CApp -
-
-
-
- initDone - iviLink::CApp -
-
-
-
- isActive - iviLink::CApp -
-
-
-
- isEnabled - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_6c.html b/doc/technical/appLib/html/search/functions_6c.html deleted file mode 100644 index 6a34382c..00000000 --- a/doc/technical/appLib/html/search/functions_6c.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- loadService - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_6f.html b/doc/technical/appLib/html/search/functions_6f.html deleted file mode 100644 index f09ba147..00000000 --- a/doc/technical/appLib/html/search/functions_6f.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- onDisable - iviLink::CProfileApiBase -
-
-
-
- onEnable - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_72.html b/doc/technical/appLib/html/search/functions_72.html deleted file mode 100644 index b1d13bee..00000000 --- a/doc/technical/appLib/html/search/functions_72.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- registerProfileCallbacks - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_73.html b/doc/technical/appLib/html/search/functions_73.html deleted file mode 100644 index 9e85fa4e..00000000 --- a/doc/technical/appLib/html/search/functions_73.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- serviceDropped - iviLink::CApp -
-
-
-
- serviceLoadError - iviLink::CApp -
-
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_74.html b/doc/technical/appLib/html/search/functions_74.html deleted file mode 100644 index aa057587..00000000 --- a/doc/technical/appLib/html/search/functions_74.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- threadFunc - iviLink::App::CAppManProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_75.html b/doc/technical/appLib/html/search/functions_75.html deleted file mode 100644 index 16e7b8ef..00000000 --- a/doc/technical/appLib/html/search/functions_75.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- unloadService - iviLink::CApp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/functions_7e.html b/doc/technical/appLib/html/search/functions_7e.html deleted file mode 100644 index 680dbbf2..00000000 --- a/doc/technical/appLib/html/search/functions_7e.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- ~CApp - iviLink::CApp -
-
-
-
- ~CAppManProxy - iviLink::App::CAppManProxy -
-
-
-
- ~CProfileApiBase - iviLink::CProfileApiBase -
-
-
-
- ~CProfileProxy - iviLink::App::CProfileProxy -
-
-
-
- ~CServManProxy - iviLink::App::CServManProxy -
-
-
-
- ~IProfileCallbackProxy - iviLink::Profile::IProfileCallbackProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/mag_sel.png b/doc/technical/appLib/html/search/mag_sel.png deleted file mode 100644 index 81f6040a..00000000 Binary files a/doc/technical/appLib/html/search/mag_sel.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/namespaces_69.html b/doc/technical/appLib/html/search/namespaces_69.html deleted file mode 100644 index 4254f4bc..00000000 --- a/doc/technical/appLib/html/search/namespaces_69.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/nomatches.html b/doc/technical/appLib/html/search/nomatches.html deleted file mode 100644 index b1ded27e..00000000 --- a/doc/technical/appLib/html/search/nomatches.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -
-
No Matches
-
- - diff --git a/doc/technical/appLib/html/search/related_63.html b/doc/technical/appLib/html/search/related_63.html deleted file mode 100644 index c27ac3d0..00000000 --- a/doc/technical/appLib/html/search/related_63.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CProfileProxy - iviLink::App::CProfileGetter -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/related_70.html b/doc/technical/appLib/html/search/related_70.html deleted file mode 100644 index 5524b4f7..00000000 --- a/doc/technical/appLib/html/search/related_70.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CProfileInternal - iviLink::CProfileApiBase -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/search.css b/doc/technical/appLib/html/search/search.css deleted file mode 100644 index 50249e56..00000000 --- a/doc/technical/appLib/html/search/search.css +++ /dev/null @@ -1,240 +0,0 @@ -/*---------------- Search Box */ - -#FSearchBox { - float: left; -} - -#searchli { - float: right; - display: block; - width: 170px; - height: 36px; -} - -#MSearchBox { - white-space : nowrap; - position: absolute; - float: none; - display: inline; - margin-top: 8px; - right: 0px; - width: 170px; - z-index: 102; -} - -#MSearchBox .left -{ - display:block; - position:absolute; - left:10px; - width:20px; - height:19px; - background:url('search_l.png') no-repeat; - background-position:right; -} - -#MSearchSelect { - display:block; - position:absolute; - width:20px; - height:19px; -} - -.left #MSearchSelect { - left:4px; -} - -.right #MSearchSelect { - right:5px; -} - -#MSearchField { - display:block; - position:absolute; - height:19px; - background:url('search_m.png') repeat-x; - border:none; - width:116px; - margin-left:20px; - padding-left:4px; - color: #909090; - outline: none; - font: 9pt Arial, Verdana, sans-serif; -} - -#FSearchBox #MSearchField { - margin-left:15px; -} - -#MSearchBox .right { - display:block; - position:absolute; - right:10px; - top:0px; - width:20px; - height:19px; - background:url('search_r.png') no-repeat; - background-position:left; -} - -#MSearchClose { - display: none; - position: absolute; - top: 4px; - background : none; - border: none; - margin: 0px 4px 0px 0px; - padding: 0px 0px; - outline: none; -} - -.left #MSearchClose { - left: 6px; -} - -.right #MSearchClose { - right: 2px; -} - -.MSearchBoxActive #MSearchField { - color: #000000; -} - -/*---------------- Search filter selection */ - -#MSearchSelectWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #90A5CE; - background-color: #F9FAFC; - z-index: 1; - padding-top: 4px; - padding-bottom: 4px; - -moz-border-radius: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); -} - -.SelectItem { - font: 8pt Arial, Verdana, sans-serif; - padding-left: 2px; - padding-right: 12px; - border: 0px; -} - -span.SelectionMark { - margin-right: 4px; - font-family: monospace; - outline-style: none; - text-decoration: none; -} - -a.SelectItem { - display: block; - outline-style: none; - color: #000000; - text-decoration: none; - padding-left: 6px; - padding-right: 12px; -} - -a.SelectItem:focus, -a.SelectItem:active { - color: #000000; - outline-style: none; - text-decoration: none; -} - -a.SelectItem:hover { - color: #FFFFFF; - background-color: #3D578C; - outline-style: none; - text-decoration: none; - cursor: pointer; - display: block; -} - -/*---------------- Search results window */ - -iframe#MSearchResults { - width: 60ex; - height: 15em; -} - -#MSearchResultsWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #000; - background-color: #EEF1F7; -} - -/* ----------------------------------- */ - - -#SRIndex { - clear:both; - padding-bottom: 15px; -} - -.SREntry { - font-size: 10pt; - padding-left: 1ex; -} - -.SRPage .SREntry { - font-size: 8pt; - padding: 1px 5px; -} - -body.SRPage { - margin: 5px 2px; -} - -.SRChildren { - padding-left: 3ex; padding-bottom: .5em -} - -.SRPage .SRChildren { - display: none; -} - -.SRSymbol { - font-weight: bold; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRScope { - display: block; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRSymbol:focus, a.SRSymbol:active, -a.SRScope:focus, a.SRScope:active { - text-decoration: underline; -} - -.SRPage .SRStatus { - padding: 2px 5px; - font-size: 8pt; - font-style: italic; -} - -.SRResult { - display: none; -} - -DIV.searchresults { - margin-left: 10px; - margin-right: 10px; -} diff --git a/doc/technical/appLib/html/search/search.js b/doc/technical/appLib/html/search/search.js deleted file mode 100644 index fb93cd91..00000000 --- a/doc/technical/appLib/html/search/search.js +++ /dev/null @@ -1,740 +0,0 @@ -// Search script generated by doxygen -// Copyright (C) 2009 by Dimitri van Heesch. - -// The code in this file is loosly based on main.js, part of Natural Docs, -// which is Copyright (C) 2003-2008 Greg Valure -// Natural Docs is licensed under the GPL. - -var indexSectionsWithContent = -{ - 0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010101001101001101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 1: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000101001001001101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 6: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 7: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -}; - -var indexSectionNames = -{ - 0: "all", - 1: "classes", - 2: "namespaces", - 3: "files", - 4: "functions", - 5: "enums", - 6: "enumvalues", - 7: "defines" -}; - -function convertToId(search) -{ - var result = ''; - for (i=0;i do a search - { - this.Search(); - } - } - - this.OnSearchSelectKey = function(evt) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==40 && this.searchIndex0) // Up - { - this.searchIndex--; - this.OnSelectItem(this.searchIndex); - } - else if (e.keyCode==13 || e.keyCode==27) - { - this.OnSelectItem(this.searchIndex); - this.CloseSelectionWindow(); - this.DOMSearchField().focus(); - } - return false; - } - - // --------- Actions - - // Closes the results window. - this.CloseResultsWindow = function() - { - this.DOMPopupSearchResultsWindow().style.display = 'none'; - this.DOMSearchClose().style.display = 'none'; - this.Activate(false); - } - - this.CloseSelectionWindow = function() - { - this.DOMSearchSelectWindow().style.display = 'none'; - } - - // Performs a search. - this.Search = function() - { - this.keyTimeout = 0; - - // strip leading whitespace - var searchValue = this.DOMSearchField().value.replace(/^ +/, ""); - - var code = searchValue.toLowerCase().charCodeAt(0); - var hexCode; - if (code<16) - { - hexCode="0"+code.toString(16); - } - else - { - hexCode=code.toString(16); - } - - var resultsPage; - var resultsPageWithSearch; - var hasResultsPage; - - if (indexSectionsWithContent[this.searchIndex].charAt(code) == '1') - { - resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html'; - resultsPageWithSearch = resultsPage+'?'+escape(searchValue); - hasResultsPage = true; - } - else // nothing available for this search term - { - resultsPage = this.resultsPath + '/nomatches.html'; - resultsPageWithSearch = resultsPage; - hasResultsPage = false; - } - - window.frames.MSearchResults.location.href = resultsPageWithSearch; - var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow(); - - if (domPopupSearchResultsWindow.style.display!='block') - { - var domSearchBox = this.DOMSearchBox(); - this.DOMSearchClose().style.display = 'inline'; - if (this.insideFrame) - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - domPopupSearchResultsWindow.style.position = 'relative'; - domPopupSearchResultsWindow.style.display = 'block'; - var width = document.body.clientWidth - 8; // the -8 is for IE :-( - domPopupSearchResultsWindow.style.width = width + 'px'; - domPopupSearchResults.style.width = width + 'px'; - } - else - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth; - var top = getYPos(domSearchBox) + 20; // domSearchBox.offsetHeight + 1; - domPopupSearchResultsWindow.style.display = 'block'; - left -= domPopupSearchResults.offsetWidth; - domPopupSearchResultsWindow.style.top = top + 'px'; - domPopupSearchResultsWindow.style.left = left + 'px'; - } - } - - this.lastSearchValue = searchValue; - this.lastResultsPage = resultsPage; - } - - // -------- Activation Functions - - // Activates or deactivates the search panel, resetting things to - // their default values if necessary. - this.Activate = function(isActive) - { - if (isActive || // open it - this.DOMPopupSearchResultsWindow().style.display == 'block' - ) - { - this.DOMSearchBox().className = 'MSearchBoxActive'; - - var searchField = this.DOMSearchField(); - - if (searchField.value == this.searchLabel) // clear "Search" term upon entry - { - searchField.value = ''; - this.searchActive = true; - } - } - else if (!isActive) // directly remove the panel - { - this.DOMSearchBox().className = 'MSearchBoxInactive'; - this.DOMSearchField().value = this.searchLabel; - this.searchActive = false; - this.lastSearchValue = '' - this.lastResultsPage = ''; - } - } -} - -// ----------------------------------------------------------------------- - -// The class that handles everything on the search results page. -function SearchResults(name) -{ - // The number of matches from the last run of . - this.lastMatchCount = 0; - this.lastKey = 0; - this.repeatOn = false; - - // Toggles the visibility of the passed element ID. - this.FindChildElement = function(id) - { - var parentElement = document.getElementById(id); - var element = parentElement.firstChild; - - while (element && element!=parentElement) - { - if (element.nodeName == 'DIV' && element.className == 'SRChildren') - { - return element; - } - - if (element.nodeName == 'DIV' && element.hasChildNodes()) - { - element = element.firstChild; - } - else if (element.nextSibling) - { - element = element.nextSibling; - } - else - { - do - { - element = element.parentNode; - } - while (element && element!=parentElement && !element.nextSibling); - - if (element && element!=parentElement) - { - element = element.nextSibling; - } - } - } - } - - this.Toggle = function(id) - { - var element = this.FindChildElement(id); - if (element) - { - if (element.style.display == 'block') - { - element.style.display = 'none'; - } - else - { - element.style.display = 'block'; - } - } - } - - // Searches for the passed string. If there is no parameter, - // it takes it from the URL query. - // - // Always returns true, since other documents may try to call it - // and that may or may not be possible. - this.Search = function(search) - { - if (!search) // get search word from URL - { - search = window.location.search; - search = search.substring(1); // Remove the leading '?' - search = unescape(search); - } - - search = search.replace(/^ +/, ""); // strip leading spaces - search = search.replace(/ +$/, ""); // strip trailing spaces - search = search.toLowerCase(); - search = convertToId(search); - - var resultRows = document.getElementsByTagName("div"); - var matches = 0; - - var i = 0; - while (i < resultRows.length) - { - var row = resultRows.item(i); - if (row.className == "SRResult") - { - var rowMatchName = row.id.toLowerCase(); - rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_' - - if (search.length<=rowMatchName.length && - rowMatchName.substr(0, search.length)==search) - { - row.style.display = 'block'; - matches++; - } - else - { - row.style.display = 'none'; - } - } - i++; - } - document.getElementById("Searching").style.display='none'; - if (matches == 0) // no results - { - document.getElementById("NoMatches").style.display='block'; - } - else // at least one result - { - document.getElementById("NoMatches").style.display='none'; - } - this.lastMatchCount = matches; - return true; - } - - // return the first item with index index or higher that is visible - this.NavNext = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index++; - } - return focusItem; - } - - this.NavPrev = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index--; - } - return focusItem; - } - - this.ProcessKeys = function(e) - { - if (e.type == "keydown") - { - this.repeatOn = false; - this.lastKey = e.keyCode; - } - else if (e.type == "keypress") - { - if (!this.repeatOn) - { - if (this.lastKey) this.repeatOn = true; - return false; // ignore first keypress after keydown - } - } - else if (e.type == "keyup") - { - this.lastKey = 0; - this.repeatOn = false; - } - return this.lastKey!=0; - } - - this.Nav = function(evt,itemIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - var newIndex = itemIndex-1; - var focusItem = this.NavPrev(newIndex); - if (focusItem) - { - var child = this.FindChildElement(focusItem.parentNode.parentNode.id); - if (child && child.style.display == 'block') // children visible - { - var n=0; - var tmpElem; - while (1) // search for last child - { - tmpElem = document.getElementById('Item'+newIndex+'_c'+n); - if (tmpElem) - { - focusItem = tmpElem; - } - else // found it! - { - break; - } - n++; - } - } - } - if (focusItem) - { - focusItem.focus(); - } - else // return focus to search field - { - parent.document.getElementById("MSearchField").focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = itemIndex+1; - var focusItem; - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem && elem.style.display == 'block') // children visible - { - focusItem = document.getElementById('Item'+itemIndex+'_c0'); - } - if (!focusItem) focusItem = this.NavNext(newIndex); - if (focusItem) focusItem.focus(); - } - else if (this.lastKey==39) // Right - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'block'; - } - else if (this.lastKey==37) // Left - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'none'; - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } - - this.NavChild = function(evt,itemIndex,childIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - if (childIndex>0) - { - var newIndex = childIndex-1; - document.getElementById('Item'+itemIndex+'_c'+newIndex).focus(); - } - else // already at first child, jump to parent - { - document.getElementById('Item'+itemIndex).focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = childIndex+1; - var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex); - if (!elem) // last child, jump to parent next parent - { - elem = this.NavNext(itemIndex+1); - } - if (elem) - { - elem.focus(); - } - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } -} diff --git a/doc/technical/appLib/html/search/search_l.png b/doc/technical/appLib/html/search/search_l.png deleted file mode 100644 index c872f4da..00000000 Binary files a/doc/technical/appLib/html/search/search_l.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/search_m.png b/doc/technical/appLib/html/search/search_m.png deleted file mode 100644 index b429a16b..00000000 Binary files a/doc/technical/appLib/html/search/search_m.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/search_r.png b/doc/technical/appLib/html/search/search_r.png deleted file mode 100644 index 97ee8b43..00000000 Binary files a/doc/technical/appLib/html/search/search_r.png and /dev/null differ diff --git a/doc/technical/appLib/html/search/typedefs_6c.html b/doc/technical/appLib/html/search/typedefs_6c.html deleted file mode 100644 index c387fc52..00000000 --- a/doc/technical/appLib/html/search/typedefs_6c.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- ListOfUids - iviLink::Service -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/typedefs_74.html b/doc/technical/appLib/html/search/typedefs_74.html deleted file mode 100644 index a7255528..00000000 --- a/doc/technical/appLib/html/search/typedefs_74.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- tUseServiceList - iviLink::App -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/search/variables_6d.html b/doc/technical/appLib/html/search/variables_6d.html deleted file mode 100644 index 1fda705c..00000000 --- a/doc/technical/appLib/html/search/variables_6d.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- mApi - iviLink::App::CProfileProxy -
-
-
-
- mBe - iviLink::App::CAppManProxy -
-
-
-
- mEnabled - iviLink::CProfileApiBase -
-
-
-
- mError - iviLink::CProfileApiBase -
-
-
-
- mInitedServices - iviLink::App::CAppManProxy -
-
-
-
- mInitStatus - iviLink::App::CAppManProxy -
-
-
-
- mLauncher - iviLink::App::CAppManProxy -
-
- -
-
- mpAppManProxy - iviLink::CApp -
-
-
-
- mpInitMutex - iviLink::App::CAppManProxy -
-
-
-
- mpLogger - iviLink::App::CLogger -
-
-
-
- mpRequestSemaphore - iviLink::App::CAppManProxy -
-
-
-
- mpServManProxy - iviLink::CApp -
-
-
-
- mpUseListMutex - iviLink::App::CAppManProxy -
-
-
-
- mService - iviLink::App::CProfileProxy -
-
-
-
- mUseList - iviLink::App::CAppManProxy -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/appLib/html/tab_a.png b/doc/technical/appLib/html/tab_a.png deleted file mode 100644 index 2d99ef23..00000000 Binary files a/doc/technical/appLib/html/tab_a.png and /dev/null differ diff --git a/doc/technical/appLib/html/tab_b.png b/doc/technical/appLib/html/tab_b.png deleted file mode 100644 index b2c3d2be..00000000 Binary files a/doc/technical/appLib/html/tab_b.png and /dev/null differ diff --git a/doc/technical/appLib/html/tab_h.png b/doc/technical/appLib/html/tab_h.png deleted file mode 100644 index c11f48f1..00000000 Binary files a/doc/technical/appLib/html/tab_h.png and /dev/null differ diff --git a/doc/technical/appLib/html/tab_s.png b/doc/technical/appLib/html/tab_s.png deleted file mode 100644 index 978943ac..00000000 Binary files a/doc/technical/appLib/html/tab_s.png and /dev/null differ diff --git a/doc/technical/appLib/html/tabs.css b/doc/technical/appLib/html/tabs.css deleted file mode 100644 index 21920562..00000000 --- a/doc/technical/appLib/html/tabs.css +++ /dev/null @@ -1,59 +0,0 @@ -.tabs, .tabs2, .tabs3 { - background-image: url('tab_b.png'); - width: 100%; - z-index: 101; - font-size: 13px; -} - -.tabs2 { - font-size: 10px; -} -.tabs3 { - font-size: 9px; -} - -.tablist { - margin: 0; - padding: 0; - display: table; -} - -.tablist li { - float: left; - display: table-cell; - background-image: url('tab_b.png'); - line-height: 36px; - list-style: none; -} - -.tablist a { - display: block; - padding: 0 20px; - font-weight: bold; - background-image:url('tab_s.png'); - background-repeat:no-repeat; - background-position:right; - color: #283A5D; - text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - text-decoration: none; - outline: none; -} - -.tabs3 .tablist a { - padding: 0 10px; -} - -.tablist a:hover { - background-image: url('tab_h.png'); - background-repeat:repeat-x; - color: #fff; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); - text-decoration: none; -} - -.tablist li.current a { - background-image: url('tab_a.png'); - background-repeat:repeat-x; - color: #fff; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); -} diff --git a/doc/technical/profileLib/doxygen.log b/doc/technical/profileLib/doxygen.log deleted file mode 100644 index 5ba9985c..00000000 --- a/doc/technical/profileLib/doxygen.log +++ /dev/null @@ -1,32 +0,0 @@ -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:63: warning: Compound iviLink::TypeTraits::SFINAE::__two is not documented. -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:51: warning: Member tChannelId (typedef) of namespace iviLink::Channel is not documented. -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:121: warning: argument 'CBuffer' of command @param is not found in the argument list of iviLink::CBuffer::CBuffer(CBuffer const &) -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:131: warning: return type of member iviLink::CBuffer::operator= is not documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:310: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:317: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:324: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:331: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:338: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:345: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:296: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:378: warning: argument 'value' of command @param is not found in the argument list of iviLink::CBuffer::read(std::pair< K, V > &val) const -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:378: warning: The following parameters of iviLink::CBuffer::read(std::pair< K, V > &val) const are not documented: - parameter 'val' -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:303: warning: parameters of member iviLink::CBuffer::read are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:180: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:148: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:140: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:188: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:196: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:164: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:172: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:156: warning: parameters of member iviLink::CBuffer::write are not (all) documented -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:51: warning: Member tChannelId (typedef) of namespace iviLink::Channel is not documented. -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:137: warning: argument 'buferSize' of command @param is not found in the argument list of iviLink::Channel::sendBuffer(iviLink::Channel::tChannelId channel, void const *pBuffer, UInt32 bufferSize) -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:137: warning: The following parameters of iviLink::Channel::sendBuffer(iviLink::Channel::tChannelId channel, void const *pBuffer, UInt32 bufferSize) are not documented: - parameter 'bufferSize' -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:90: warning: argument 'channelID' of command @param is not found in the argument list of iviLink::Channel::CChannelHandler::channelDeletedCallback(const iviLink::Channel::tChannelId channelId) -/home/build/AXIS/src/framework/libraries/profileLib/Channel.hpp:90: warning: The following parameters of iviLink::Channel::CChannelHandler::channelDeletedCallback(const iviLink::Channel::tChannelId channelId) are not documented: - parameter 'channelId' -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:62: warning: Member __one (typedef) of class iviLink::TypeTraits::SFINAE is not documented. -/home/build/AXIS/src/framework/libraries/profileLib/CBuffer.hpp:63: warning: Member __arr[2] (variable) of class iviLink::TypeTraits::SFINAE::__two is not documented. diff --git a/doc/technical/profileLib/html/annotated.html b/doc/technical/profileLib/html/annotated.html deleted file mode 100644 index e4534734..00000000 --- a/doc/technical/profileLib/html/annotated.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - -iviLink: Class List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Class List
-
-
-
Here are the classes, structs, unions and interfaces with brief descriptions:
- - - - - -
iviLink::TypeTraits::SFINAE::__two
iviLink::CBufferClass is used to organize data buffers to send through iviLink
iviLink::Channel::CChannelHandlerCChannelHandler is an abstract class for handling channel callbacks
iviLink::TypeTraits::has_mapped_type< T >
iviLink::TypeTraits::SFINAEType is used to hold SFINAE-types with different size
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/bc_s.png b/doc/technical/profileLib/html/bc_s.png deleted file mode 100644 index e4018628..00000000 Binary files a/doc/technical/profileLib/html/bc_s.png and /dev/null differ diff --git a/doc/technical/profileLib/html/classes.html b/doc/technical/profileLib/html/classes.html deleted file mode 100644 index d83b2735..00000000 --- a/doc/technical/profileLib/html/classes.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - -iviLink: Class Index - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Class Index
-
-
-
C | H | S | _
- -
  C  
-		CChannelHandler (iviLink::Channel)   has_mapped_type (iviLink::TypeTraits)   SFINAE (iviLink::TypeTraits)   SFINAE::__two (iviLink::TypeTraits)   
CBuffer (iviLink)   
  H  
-
  S  
-
  _  
-
C | H | S | _
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/closed.png b/doc/technical/profileLib/html/closed.png deleted file mode 100644 index b7d4bd9f..00000000 Binary files a/doc/technical/profileLib/html/closed.png and /dev/null differ diff --git a/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp.html b/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp.html deleted file mode 100644 index 18cc1569..00000000 --- a/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - -iviLink: CBuffer.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces
-
-
CBuffer.hpp File Reference
-
-
- -

This file contains declarations of the CBuffer class (used in sending data to the other side) and some helper classes and functions. -More...

-
#include "utils/misc/Types.hpp"
-#include "utils/misc/CError.hpp"
-
-

Go to the source code of this file.

- - - - - - - - - - - - - - - -

-

-

-Classes

struct  iviLink::TypeTraits::SFINAE
 Type is used to hold SFINAE-types with different size. More...
struct  iviLink::TypeTraits::SFINAE::__two
class  iviLink::TypeTraits::has_mapped_type< T >
class  iviLink::CBuffer
 Class is used to organize data buffers to send through iviLink. More...
struct  iviLink::CBuffer::_readContainerSelector< InsertIter, true >
 Will be used to read into std::map, e.t.c.
struct  iviLink::CBuffer::_readContainerSelector< InsertIter, false >
 Will be used to read into std::vector, std::list, std::set, e.t.c.

-Namespaces

namespace  iviLink::TypeTraits
 

Types in this namespace are used to detect std::map-like types at compile time and select appropriate method to fill collection with data.

-
-

Detailed Description

-

This file contains declarations of the CBuffer class (used in sending data to the other side) and some helper classes and functions.

- -

Definition in file CBuffer.hpp.

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp_source.html b/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp_source.html deleted file mode 100644 index 421659fb..00000000 --- a/doc/technical/profileLib/html/d2/d66/_c_buffer_8hpp_source.html +++ /dev/null @@ -1,349 +0,0 @@ - - - - -iviLink: CBuffer.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
CBuffer.hpp
-
-
-Go to the documentation of this file.
00001 /* 
-00002  *  iviLINK SDK, version 0.9 (for preview only)                                      
-00003  *    http://www.ivilink.net                                                         
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications       
-00005  *                                                                                   
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group               
-00007  *                                                                                   
-00008  *  This library is free software; you can redistribute it and/or                    
-00009  *  modify it under the terms of the GNU Lesser General Public                       
-00010  *  License as published by the Free Software Foundation; version 2.1.               
-00011  *                                                                                   
-00012  *  This library is distributed in the hope that it will be useful,                  
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of                   
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU                
-00015  *  Lesser General Public License for more details.                                  
-00016  *                                                                                   
-00017  *  You should have received a copy of the GNU Lesser General Public                 
-00018  *  License along with this library; if not, write to the Free Software              
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA   
-00020  * 
-00021  * 
-00022  * 
-00023  * 
-00024  */
-00025  
-00032 #ifndef CBUFFER_HPP__
-00033 #define CBUFFER_HPP__
-00034 
-00035 #include "utils/misc/Types.hpp"
-00036 #include "utils/misc/CError.hpp"
-00037 
-00038 namespace iviLink
-00039 {
-00040 
-00041 namespace TypeTraits
-00042 {
-00043 
-00060 struct SFINAE
-00061 {
-00062    typedef char __one;
-00063    typedef struct { char __arr[2]; } __two;
-00064 };
-00065 
-00072 template <typename T> 
-00073 class has_mapped_type : public SFINAE
-00074 {
-00075    template <typename C> static __one test(typename C::mapped_type *);
-00076    template <typename C> static __two test(...);
-00077 public:
-00078    enum { value = (sizeof(test<T>(0)) == sizeof(__one)) };
-00079 };
-00080 
-00081 
-00082 
-00083 }
-00084 
-00106 class CBuffer
-00107 {
-00108 public:
-00109 
-00117    CBuffer(UInt8* pBuffer, UInt32 size, bool endianConvert = true);
-00118 
-00119    ~CBuffer();
-00120 
-00129    CBuffer(CBuffer const&);
-00130 
-00138    CBuffer& operator=(CBuffer const&);
-00139 
-00146    bool write( Int8  value);
-00147    
-00154    bool write(UInt8  value);
-00155    
-00162    bool write( Int16 value);
-00163    
-00170    bool write(UInt16 value);
-00171    
-00178    bool write( Int32 value);
-00179    
-00186    bool write(UInt32 value);
-00187    
-00194    bool write( Int64 value);
-00195    
-00202    bool write(UInt64 value);
-00203    
-00216    bool write(void const* pBuffer, UInt32 size);
-00217 
-00227    bool write(std::string const& value);
-00228    
-00239    template <typename K, typename V>
-00240    bool write(std::pair<K, V> const& value)
-00241    {
-00242       if (!write(value.first))
-00243          return false;
-00244       if (!write(value.second))
-00245          return false;
-00246       return true;
-00247    }
-00248 
-00269    template <typename InputIter>
-00270    bool write(InputIter first, InputIter last)
-00271    {
-00272       UInt32 savedPos1 = getWritePosition();
-00273       UInt32 size = 0;
-00274 
-00275       // Sort of hack - we reserve memory for size, but write real value
-00276       // only after writing all elements. It allows to use input iterators 
-00277       // for containers with unknown size.
-00278       if (!write(size))
-00279          return false;
-00280 
-00281       for (; first != last; ++first, ++size)
-00282       {
-00283          if (!write(*first))
-00284             return false;
-00285       }
-00286 
-00287       UInt32 savedPos2 = getWritePosition();
-00288       setWritePosition(savedPos1);
-00289       if (!write(size))
-00290          return false;
-00291       setWritePosition(savedPos2);
-00292       return true;
-00293    }
-00294 
-00295 
-00302    bool read( Int8  & value) const;
-00309    bool read(UInt8  & value) const;
-00316    bool read( Int16 & value) const;
-00323    bool read(UInt16 & value) const;
-00330    bool read( Int32 & value) const;
-00337    bool read(UInt32 & value) const;
-00344    bool read( Int64 & value) const;
-00351    bool read(UInt64 & value) const;
-00352 
-00365    bool read(UInt32 size, void * pBuffer) const;
-00366 
-00376    bool read(std::string & value) const;
-00377 
-00388    template <typename K, typename V>
-00389    bool read(std::pair<K, V> & val) const
-00390    {
-00391       if (!read(val.first))
-00392          return false;
-00393       if (!read(val.second))
-00394          return false;
-00395       return true;
-00396    }
-00397 
-00415    template <typename InsertIter>
-00416    bool read(InsertIter result) const
-00417    {
-00418       // Here we using _readContainerSelector to determine if container is
-00419       // std::map-like or not and select appropriate read() method.
-00420       return _readContainerSelector< InsertIter, 
-00421          TypeTraits::has_mapped_type<typename InsertIter::container_type>::value
-00422          > ::read(result, *this);
-00423    }
-00424 
-00429    UInt32 getSize() const;
-00430 
-00437    UInt32 getReadPosition() const;
-00438 
-00449    bool setReadPosition(UInt32 pos) const;
-00450 
-00457    UInt32 getWritePosition() const;
-00458 
-00469    bool setWritePosition(UInt32 pos);
-00470 
-00475    UInt8* getBuffer() const;
-00476 
-00477 private:
-00478  
-00485    template <typename T> bool write_internal(T val);
-00486 
-00493    template <typename T> bool read_internal(T& val) const;
-00494 
-00499    template <typename InsertIter, bool isMapType>
-00500    struct _readContainerSelector;
-00501 
-00505    template <typename InsertIter>
-00506    struct _readContainerSelector<InsertIter, true>
-00507    {
-00508       static bool read(InsertIter result, CBuffer const& buf)
-00509       {
-00510          return buf._readMap(result);
-00511       }
-00512    };
-00513 
-00517    template <typename InsertIter>
-00518    struct _readContainerSelector<InsertIter, false>
-00519    {
-00520       static bool read(InsertIter result, CBuffer const& buf)
-00521       {
-00522          return buf._readContainer(result);
-00523       }
-00524    };
-00525 
-00532    template <typename InsertIter>
-00533    bool _readContainer(InsertIter result) const
-00534    {
-00535       typedef typename InsertIter::container_type::value_type tVal;
-00536       UInt32 size = 0;
-00537 
-00538       if (!read(size))
-00539          return false;
-00540 
-00541       for (UInt32 i = 0; i < size; ++i)
-00542       {
-00543          tVal val;
-00544          if (!read(val))
-00545             return false;
-00546          *result++ = val;
-00547       }
-00548       return true;
-00549    }
-00550 
-00557    template <typename InsertIter>
-00558    bool _readMap(InsertIter result) const
-00559    {
-00560       typedef typename InsertIter::container_type::key_type tKey;
-00561       typedef typename InsertIter::container_type::mapped_type tVal;
-00562       UInt32 size = 0;
-00563 
-00564       if (!read(size))
-00565          return false;
-00566 
-00567       for (UInt32 i = 0; i < size; ++i)
-00568       {
-00569          std::pair<tKey, tVal> pair;
-00570          if (!read(pair))
-00571             return false;
-00572          *result++ = pair;
-00573       }
-00574       return true;
-00575    }
-00576 
-00577 private:
-00578 
-00580    UInt32 mSize;
-00581 
-00583    mutable UInt32 mReadPos;
-00584 
-00586    UInt32 mWritePos;
-00587 
-00589    UInt8* mpBuffer;
-00590 
-00592    bool mEndianConvert;
-00593 };
-00594 
-00595 
-00600 template <size_t SIZE>
-00601 class CSBuffer : public CBuffer
-00602 {
-00603 public:
-00604    CSBuffer() :
-00605       CBuffer(mBuffer, SIZE)
-00606    {}
-00607 
-00608 private:
-00609    UInt8 mBuffer[SIZE];
-00610 };
-00611 
-00612 }  // namespace iviLink
-00613 
-00614 
-00615 #endif //  CBUFFER_HPP__
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d2/d71/classivi_link_1_1_c_buffer-members.html b/doc/technical/profileLib/html/d2/d71/classivi_link_1_1_c_buffer-members.html deleted file mode 100644 index b48153d0..00000000 --- a/doc/technical/profileLib/html/d2/d71/classivi_link_1_1_c_buffer-members.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::CBuffer Member List
-
-
-This is the complete list of members for iviLink::CBuffer, including all inherited members. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CBuffer(UInt8 *pBuffer, UInt32 size, bool endianConvert=true)iviLink::CBuffer
CBuffer(CBuffer const &)iviLink::CBuffer
getBuffer() const iviLink::CBuffer
getReadPosition() const iviLink::CBuffer
getSize() const iviLink::CBuffer
getWritePosition() const iviLink::CBuffer
operator=(CBuffer const &)iviLink::CBuffer
read(Int8 &value) const iviLink::CBuffer
read(UInt8 &value) const iviLink::CBuffer
read(Int16 &value) const iviLink::CBuffer
read(UInt16 &value) const iviLink::CBuffer
read(Int32 &value) const iviLink::CBuffer
read(UInt32 &value) const iviLink::CBuffer
read(Int64 &value) const iviLink::CBuffer
read(UInt64 &value) const iviLink::CBuffer
read(UInt32 size, void *pBuffer) const iviLink::CBuffer
read(std::string &value) const iviLink::CBuffer
read(std::pair< K, V > &val) const iviLink::CBuffer [inline]
read(InsertIter result) const iviLink::CBuffer [inline]
setReadPosition(UInt32 pos) const iviLink::CBuffer
setWritePosition(UInt32 pos)iviLink::CBuffer
write(Int8 value)iviLink::CBuffer
write(UInt8 value)iviLink::CBuffer
write(Int16 value)iviLink::CBuffer
write(UInt16 value)iviLink::CBuffer
write(Int32 value)iviLink::CBuffer
write(UInt32 value)iviLink::CBuffer
write(Int64 value)iviLink::CBuffer
write(UInt64 value)iviLink::CBuffer
write(void const *pBuffer, UInt32 size)iviLink::CBuffer
write(std::string const &value)iviLink::CBuffer
write(std::pair< K, V > const &value)iviLink::CBuffer [inline]
write(InputIter first, InputIter last)iviLink::CBuffer [inline]
~CBuffer() (defined in iviLink::CBuffer)iviLink::CBuffer
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.html b/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.html deleted file mode 100644 index ca5e892f..00000000 --- a/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.html +++ /dev/null @@ -1,1187 +0,0 @@ - - - - -iviLink: iviLink::CBuffer Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes | -Public Member Functions
-
-
iviLink::CBuffer Class Reference
-
-
- -

Class is used to organize data buffers to send through iviLink. - More...

- -

#include <CBuffer.hpp>

- -

Inherited by iviLink::CSBuffer< SIZE >.

- -

List of all members.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Classes

struct  _readContainerSelector< InsertIter, false >
 Will be used to read into std::vector, std::list, std::set, e.t.c.
struct  _readContainerSelector< InsertIter, true >
 Will be used to read into std::map, e.t.c.

-Public Member Functions

 CBuffer (UInt8 *pBuffer, UInt32 size, bool endianConvert=true)
 Create a new CBuffer with the data from given byte array inside.
 CBuffer (CBuffer const &)
 Copy constructor creates shallow copy of passed instance.
CBuffer & operator= (CBuffer const &)
 Assign operator creates a shallow copy of passed object to this object.
bool write (Int8 value)
 Save numeric data in buffer.
bool write (UInt8 value)
 Save numeric data in buffer.
bool write (Int16 value)
 Save numeric data in buffer.
bool write (UInt16 value)
 Save numeric data in buffer.
bool write (Int32 value)
 Save numeric data in buffer.
bool write (UInt32 value)
 Save numeric data in buffer.
bool write (Int64 value)
 Save numeric data in buffer.
bool write (UInt64 value)
 Save numeric data in buffer.
bool write (void const *pBuffer, UInt32 size)
 Copy raw data into buffer.
bool write (std::string const &value)
 Write the std::string value into buffer.
template<typename K , typename V >
bool write (std::pair< K, V > const &value)
 Write the content of std::pair into buffer.
template<typename InputIter >
bool write (InputIter first, InputIter last)
 Write range of values to buffer.
bool read (Int8 &value) const
 Obtain numeric data from buffer.
bool read (UInt8 &value) const
 Obtain numeric data from buffer.
bool read (Int16 &value) const
 Obtain numeric data from buffer.
bool read (UInt16 &value) const
 Obtain numeric data from buffer.
bool read (Int32 &value) const
 Obtain numeric data from buffer.
bool read (UInt32 &value) const
 Obtain numeric data from buffer.
bool read (Int64 &value) const
 Obtain numeric data from buffer.
bool read (UInt64 &value) const
 Obtain numeric data from buffer.
bool read (UInt32 size, void *pBuffer) const
 Copy raw data from CBuffer.
bool read (std::string &value) const
 Read the std::string value from buffer.
template<typename K , typename V >
bool read (std::pair< K, V > &val) const
 Read the contents of a std::pair from buffer.
template<typename InsertIter >
bool read (InsertIter result) const
 Read the range of values from buffer.
UInt32 getSize () const
 Get buffer's capacity (maximum reading/writing position)
UInt32 getReadPosition () const
 Get buffer's read position as an offset in bytes from the beginning of the buffer.
bool setReadPosition (UInt32 pos) const
 Set read position as an offset in bytes from the beginning of the buffer.
UInt32 getWritePosition () const
 Get write position as an offset in bytes from the beginning of the buffer.
bool setWritePosition (UInt32 pos)
 Set write position as an offset in bytes from the beginning of the buffer.
UInt8 * getBuffer () const
 Get raw data stored in buffer.
-

Detailed Description

-

Class is used to organize data buffers to send through iviLink.

-

Class provides methods for simple reading and writing of many standard data types. Internal counters prevent buffer overflow or reading the buffer after its end. Example:

-
 bool result = true;
- result = result && buf.write(1);
- result = result && buf.write(2);
- result = result && buf.write(std::string("hello, world!"));
- if (!result) std::cerr << "buffer was too small";
-

All write() and read() methods don't store any information about type, so the order of write() and read() calls with specific type must be the same.

-

The set of types supported by read() and write() is limited intentionally. It is possible (and much preferable in terms of C++) to write just function templates. But we wanted to provide support only for tested basic types.

- -

Definition at line 106 of file CBuffer.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
iviLink::CBuffer::CBuffer (UInt8 * pBuffer,
UInt32 size,
bool endianConvert = true 
)
-
-
- -

Create a new CBuffer with the data from given byte array inside.

-
Parameters:
- - - - -
pBufferpointer to an array with data to be stored inside this CBuffer
sizenumber of bytes from the array to be stored inside the newly created CBuffer
endianConvertif true - numeric data will be prepared for transfer through network. Otherwise, it will be saved in buffer intact.
-
-
- -
-
- -
-
- - - - - - - - -
iviLink::CBuffer::CBuffer (CBuffer const & )
-
-
- -

Copy constructor creates shallow copy of passed instance.

-

Take into account that copied object will have its own set of read and write positions, but will use the same underling memory buffer as the original. This can lead to rewriting data in case of simultanious access from both objects.

-
Parameters:
- - -
CBufferinstance of CBuffer to be copied
-
-
- -
-
-

Member Function Documentation

- -
-
- - - - - - - -
UInt8* iviLink::CBuffer::getBuffer () const
-
-
- -

Get raw data stored in buffer.

-
Returns:
pointer to array with data
- -
-
- -
-
- - - - - - - -
UInt32 iviLink::CBuffer::getReadPosition () const
-
-
- -

Get buffer's read position as an offset in bytes from the beginning of the buffer.

-

This position is used by all read() methods.

-
Returns:
position in bytes
- -
-
- -
-
- - - - - - - -
UInt32 iviLink::CBuffer::getSize () const
-
-
- -

Get buffer's capacity (maximum reading/writing position)

-
Returns:
size of buffer in bytes.
- -
-
- -
-
- - - - - - - -
UInt32 iviLink::CBuffer::getWritePosition () const
-
-
- -

Get write position as an offset in bytes from the beginning of the buffer.

-

This position is used by all write() methods.

-
Returns:
position in bytes
- -
-
- -
-
- - - - - - - - -
CBuffer& iviLink::CBuffer::operator= (CBuffer const & )
-
-
- -

Assign operator creates a shallow copy of passed object to this object.

-

Take into account that copied object will have its own set of read and write positions but will use the same underling memory buffer as the original. This can lead to rewriting data in case of simultanious access from both objects.

- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (Int16 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (UInt16 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (Int32 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (UInt32 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (std::string & value) const
-
-
- -

Read the std::string value from buffer.

-

Size of string is read from buffer with the string value. The string is changed using assign() method.

-
Parameters:
- - -
valuestring to be read
-
-
-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (Int64 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (UInt64 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool iviLink::CBuffer::read (UInt32 size,
void * pBuffer 
) const
-
-
- -

Copy raw data from CBuffer.

-

Analog of std::copy() or memcpy().

-
Parameters:
- - - -
sizesize in bytes of raw data to be read
pBufferpointer to place where raw data will be saved. Be aware about possible buffer overflow. If pBuffer points to somewhere in the memory that was used to initialize this instance of CBuffer, behavior is undefined.
-
-
-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
-
-template<typename InsertIter >
- - - - - - - - -
bool iviLink::CBuffer::read (InsertIter result) const [inline]
-
-
- -

Read the range of values from buffer.

-

Passed InsertIterator is used to save data. Insert iterator for given collection type can be obtained using std::inserter(). Currently, only std::list, std::vector, std::set, std::map are tested.

-

Example:

-
 std::list<std::string> stringList;
- buffer.read(std::inserter(stringList, stringList.begin()));
-
Parameters:
- - -
resultinsert iterator used to save data
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -

Definition at line 416 of file CBuffer.hpp.

- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (Int8 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
-
-template<typename K , typename V >
- - - - - - - - -
bool iviLink::CBuffer::read (std::pair< K, V > & val) const [inline]
-
-
- -

Read the contents of a std::pair from buffer.

-

Types K and V must be readable using the appropriate read() method, i.e. there must be a read() method for given type.

-
Parameters:
- - -
valueof pair
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -

Definition at line 389 of file CBuffer.hpp.

- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::read (UInt8 & value) const
-
-
- -

Obtain numeric data from buffer.

-

Will change internal read counter, see getReadPosition().

-
Return values:
- - - -
trueread is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::setReadPosition (UInt32 pos) const
-
-
- -

Set read position as an offset in bytes from the beginning of the buffer.

-

This position is used by all read() methods.

-
Parameters:
- - -
posnew read position.
-
-
-
Return values:
- - - -
truesuccess
falsebuffer size is less than or equal to given position, position is left unchanged
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::setWritePosition (UInt32 pos)
-
-
- -

Set write position as an offset in bytes from the beginning of the buffer.

-

This position is used by all write() methods.

-
Parameters:
- - -
posnew write position.
-
-
-
Return values:
- - - -
truesuccess
falsebuffer size is less than or equal to given position, position is left unchanged
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (UInt32 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (UInt8 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (std::string const & value)
-
-
- -

Write the std::string value into buffer.

-

Size of string is written into buffer with the string value.

-
Parameters:
- - -
valuestring to be written
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
-
-template<typename K , typename V >
- - - - - - - - -
bool iviLink::CBuffer::write (std::pair< K, V > const & value) [inline]
-
-
- -

Write the content of std::pair into buffer.

-

Types K and V must be writable using appropriate write() method, i.e. there must be write() method for given type.

-
Parameters:
- - -
valueof pair
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -

Definition at line 240 of file CBuffer.hpp.

- -
-
- -
-
-
-template<typename InputIter >
- - - - - - - - - - - - - - - - - - -
bool iviLink::CBuffer::write (InputIter first,
InputIter last 
) [inline]
-
-
- -

Write range of values to buffer.

-

Range [first, last) is specified by input iterators.

-

Only std::list, std::vector, std::set, std::map have been tested.

-

Example:

-
 std::list<std::string> stringList;
- stringList.push_back("hello");
- stringList.push_back("world");
- buffer.write(stringList.begin(), stringList.end());
-
Parameters:
- - - -
firststart of the range
lastend of the range
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -

Definition at line 270 of file CBuffer.hpp.

- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (Int8 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (Int64 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (UInt64 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (UInt16 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (Int32 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - -
bool iviLink::CBuffer::write (Int16 value)
-
-
- -

Save numeric data in buffer.

-

Will change internal write counter, see getWritePosition().

-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool iviLink::CBuffer::write (void const * pBuffer,
UInt32 size 
)
-
-
- -

Copy raw data into buffer.

-

Analog of std::copy() or memcpy(). Size of pointed raw data is not written to buffer.

-
Parameters:
- - - -
pBufferpointer to raw data. If pBuffer points to somewhere in the memory that was used to initialize this instance of CBuffer, behavior is undefined.
sizesize of raw data in bytes
-
-
-
Return values:
- - - -
truewrite is successful
falsenot enough space in buffer
-
-
- -
-
-
The documentation for this class was generated from the following file: -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.png b/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.png deleted file mode 100644 index 20effd93..00000000 Binary files a/doc/technical/profileLib/html/d2/d8b/classivi_link_1_1_c_buffer.png and /dev/null differ diff --git a/doc/technical/profileLib/html/d4/d1e/namespaceivi_link_1_1_type_traits.html b/doc/technical/profileLib/html/d4/d1e/namespaceivi_link_1_1_type_traits.html deleted file mode 100644 index 4ca3806f..00000000 --- a/doc/technical/profileLib/html/d4/d1e/namespaceivi_link_1_1_type_traits.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - -iviLink: iviLink::TypeTraits Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes
-
-
iviLink::TypeTraits Namespace Reference
-
-
- -

Types in this namespace are used to detect std::map-like types at compile time and select appropriate method to fill collection with data. -More...

- - - - - -

-Classes

struct  SFINAE
 Type is used to hold SFINAE-types with different size. More...
class  has_mapped_type
-

Detailed Description

-

Types in this namespace are used to detect std::map-like types at compile time and select appropriate method to fill collection with data.

-

Description of the technique used here: http://en.wikipedia.org/wiki/Substitution_failure_is_not_an_error

-

This code was a great help: http://nicola-bonelli-repo.googlecode.com/svn-history/r728/trunk/codes.cpp0x/type_traits.hpp

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d4/d22/classivi_link_1_1_type_traits_1_1has__mapped__type-members.html b/doc/technical/profileLib/html/d4/d22/classivi_link_1_1_type_traits_1_1has__mapped__type-members.html deleted file mode 100644 index 6995faad..00000000 --- a/doc/technical/profileLib/html/d4/d22/classivi_link_1_1_type_traits_1_1has__mapped__type-members.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::TypeTraits::has_mapped_type< T > Member List
-
-
-This is the complete list of members for iviLink::TypeTraits::has_mapped_type< T >, including all inherited members. - - -
__one typedef (defined in iviLink::TypeTraits::SFINAE)iviLink::TypeTraits::SFINAE
value enum value (defined in iviLink::TypeTraits::has_mapped_type< T >)iviLink::TypeTraits::has_mapped_type< T >
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d5/d8f/_channel_8hpp.html b/doc/technical/profileLib/html/d5/d8f/_channel_8hpp.html deleted file mode 100644 index fd05c2b9..00000000 --- a/doc/technical/profileLib/html/d5/d8f/_channel_8hpp.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - -iviLink: Channel.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Classes | -Namespaces | -Typedefs | -Functions
-
-
Channel.hpp File Reference
-
-
- -

This file contains declarations of convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a declaration of a base class for channel callbacks (such as receiving data). -More...

-
#include "utils/misc/CError.hpp"
-#include "framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp"
-#include "CBuffer.hpp"
-
-

Go to the source code of this file.

- - - - - - - -

-

- - - - - - - - - - - -

-Classes

class  iviLink::Channel::CChannelHandler
 CChannelHandler is an abstract class for handling channel callbacks. More...

-Namespaces

namespace  iviLink::Channel
 

This namespace contains convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a base class for channel callbacks (such as receiving data).

-

-Typedefs

-typedef UInt32 iviLink::Channel::tChannelId

-Functions

tChannelId iviLink::Channel::allocateChannel (std::string const &tag, iviLink::Channel::CChannelHandler *pHandler)
 Allocate a channel identified with given tag.
CError iviLink::Channel::deallocateChannel (iviLink::Channel::tChannelId channel)
 Deallocate previously allocated channel.
CError iviLink::Channel::sendBuffer (iviLink::Channel::tChannelId channel, iviLink::CBuffer const &buffer)
 Send a buffer to the other side.
CError iviLink::Channel::sendBuffer (iviLink::Channel::tChannelId channel, void const *pBuffer, UInt32 bufferSize)
 Send a buffer to the other side.
-

Detailed Description

-

This file contains declarations of convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a declaration of a base class for channel callbacks (such as receiving data).

- -

Definition in file Channel.hpp.

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d5/d8f/_channel_8hpp_source.html b/doc/technical/profileLib/html/d5/d8f/_channel_8hpp_source.html deleted file mode 100644 index edd5f1cc..00000000 --- a/doc/technical/profileLib/html/d5/d8f/_channel_8hpp_source.html +++ /dev/null @@ -1,158 +0,0 @@ - - - - -iviLink: Channel.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
Channel.hpp
-
-
-Go to the documentation of this file.
00001 /* 
-00002  *  iviLINK SDK, version 0.9 (for preview only)                                      
-00003  *    http://www.ivilink.net                                                         
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications       
-00005  *                                                                                   
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group               
-00007  *                                                                                   
-00008  *  This library is free software; you can redistribute it and/or                    
-00009  *  modify it under the terms of the GNU Lesser General Public                       
-00010  *  License as published by the Free Software Foundation; version 2.1.               
-00011  *                                                                                   
-00012  *  This library is distributed in the hope that it will be useful,                  
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of                   
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU                
-00015  *  Lesser General Public License for more details.                                  
-00016  *                                                                                   
-00017  *  You should have received a copy of the GNU Lesser General Public                 
-00018  *  License along with this library; if not, write to the Free Software              
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA   
-00020  * 
-00021  * 
-00022  * 
-00023  * 
-00024  */
-00025  
-00034 #ifndef CHANNEL_HPP_
-00035 #define CHANNEL_HPP_
-00036 
-00037 #include "utils/misc/CError.hpp"
-00038 #include "framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp"
-00039 
-00040 #include "CBuffer.hpp"
-00041 
-00042 namespace iviLink {
-00043 namespace Channel {
-00051 typedef UInt32 tChannelId;
-00052 
-00059 class CChannelHandler : public iviLink::ChannelSupervisor::IChannelSupervisorTubeObserver
-00060 {
-00061 public:
-00067    virtual void bufferReceived(const iviLink::Channel::tChannelId channel, iviLink::CBuffer const& buffer) = 0;
-00068 
-00069 public:
-00070    // The following methods are inherited from iviLink::ChannelSupervisor::IChannelSupervisorTubeObserver
-00071 
-00080    virtual void dataReceivedCallback(const unsigned int channelId, const unsigned int readSize);
-00081 
-00088    virtual void bufferOverflowCallback(const iviLink::Channel::tChannelId channelId);
-00089 
-00097    virtual void channelDeletedCallback(const iviLink::Channel::tChannelId channelId) = 0;
-00098 
-00102    virtual void connectionLostCallback() = 0;
-00103 
-00104 protected:
-00105 
-00106    virtual ~CChannelHandler() {}
-00107 
-00108 protected:
-00109 
-00110 };
-00111 
-00112 
-00119 tChannelId allocateChannel(std::string const& tag, iviLink::Channel::CChannelHandler * pHandler);
-00120 
-00126 CError deallocateChannel (iviLink::Channel::tChannelId channel);
-00127 
-00135 CError sendBuffer(iviLink::Channel::tChannelId channel, iviLink::CBuffer const& buffer);
-00136 
-00144 CError sendBuffer(iviLink::Channel::tChannelId channel, void const* pBuffer, UInt32 bufferSize);
-00145 
-00146 }  // namespace Channel
-00147 }  // namespace iviLink
-00148 
-00149 
-00150 #endif /* CHANNEL_HPP_ */
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d6/daa/namespaceivi_link_1_1_channel.html b/doc/technical/profileLib/html/d6/daa/namespaceivi_link_1_1_channel.html deleted file mode 100644 index c13f6faf..00000000 --- a/doc/technical/profileLib/html/d6/daa/namespaceivi_link_1_1_channel.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - -iviLink: iviLink::Channel Namespace Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes | -Typedefs | -Functions
-
-
iviLink::Channel Namespace Reference
-
-
- -

This namespace contains convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a base class for channel callbacks (such as receiving data). -More...

- - - - - - - - - - - - - - - -

-Classes

class  CChannelHandler
 CChannelHandler is an abstract class for handling channel callbacks. More...

-Typedefs

-typedef UInt32 tChannelId

-Functions

tChannelId allocateChannel (std::string const &tag, iviLink::Channel::CChannelHandler *pHandler)
 Allocate a channel identified with given tag.
CError deallocateChannel (iviLink::Channel::tChannelId channel)
 Deallocate previously allocated channel.
CError sendBuffer (iviLink::Channel::tChannelId channel, iviLink::CBuffer const &buffer)
 Send a buffer to the other side.
CError sendBuffer (iviLink::Channel::tChannelId channel, void const *pBuffer, UInt32 bufferSize)
 Send a buffer to the other side.
-

Detailed Description

-

This namespace contains convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a base class for channel callbacks (such as receiving data).

-

Function Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
tChannelId iviLink::Channel::allocateChannel (std::string const & tag,
iviLink::Channel::CChannelHandler * pHandler 
)
-
-
- -

Allocate a channel identified with given tag.

-
Parameters:
- - - -
tagis used to find channel with identical tag on the other side to connect with
pHandlerpointer to a callbacks handler
-
-
-
Returns:
channel ID of a newly allocated channel in case of success, otherwise 0
- -
-
- -
-
- - - - - - - - -
CError iviLink::Channel::deallocateChannel (iviLink::Channel::tChannelId channel)
-
-
- -

Deallocate previously allocated channel.

-
Parameters:
- - -
channelID of a channel to be deallocated
-
-
-
Returns:
error code
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
CError iviLink::Channel::sendBuffer (iviLink::Channel::tChannelId channel,
iviLink::CBuffer const & buffer 
)
-
-
- -

Send a buffer to the other side.

-

Uses buffer's write position to get the size of data to send.

-
Parameters:
- - - -
channelID of channel
bufferCBuffer with data to send
-
-
-
Returns:
error code
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
CError iviLink::Channel::sendBuffer (iviLink::Channel::tChannelId channel,
void const * pBuffer,
UInt32 bufferSize 
)
-
-
- -

Send a buffer to the other side.

-
Parameters:
- - - - -
channelID of a channel the buffer will be sent to
pBufferpointer to an array of bytes with data to send
buferSizesize of pBuffer
-
-
-
Returns:
error code
- -
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d7/d2a/classivi_link_1_1_channel_1_1_c_channel_handler-members.html b/doc/technical/profileLib/html/d7/d2a/classivi_link_1_1_channel_1_1_c_channel_handler-members.html deleted file mode 100644 index fd891517..00000000 --- a/doc/technical/profileLib/html/d7/d2a/classivi_link_1_1_channel_1_1_c_channel_handler-members.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::Channel::CChannelHandler Member List
-
-
-This is the complete list of members for iviLink::Channel::CChannelHandler, including all inherited members. - - - - - - -
bufferOverflowCallback(const iviLink::Channel::tChannelId channelId)iviLink::Channel::CChannelHandler [virtual]
bufferReceived(const iviLink::Channel::tChannelId channel, iviLink::CBuffer const &buffer)=0iviLink::Channel::CChannelHandler [pure virtual]
channelDeletedCallback(const iviLink::Channel::tChannelId channelId)=0iviLink::Channel::CChannelHandler [pure virtual]
connectionLostCallback()=0iviLink::Channel::CChannelHandler [pure virtual]
dataReceivedCallback(const unsigned int channelId, const unsigned int readSize)iviLink::Channel::CChannelHandler [virtual]
~CChannelHandler() (defined in iviLink::Channel::CChannelHandler)iviLink::Channel::CChannelHandler [inline, protected, virtual]
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.html b/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.html deleted file mode 100644 index 238cb55f..00000000 --- a/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - -iviLink: iviLink::TypeTraits::has_mapped_type< T > Class Template Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Types
-
-
iviLink::TypeTraits::has_mapped_type< T > Class Template Reference
-
-
- -

#include <CBuffer.hpp>

-
-Inheritance diagram for iviLink::TypeTraits::has_mapped_type< T >:
-
-
- - -iviLink::TypeTraits::SFINAE - -
- -

List of all members.

- - - -

-Public Types

enum  { value = (sizeof(test<T>(0)) == sizeof(__one)) - }
-

Detailed Description

-

template<typename T>
-class iviLink::TypeTraits::has_mapped_type< T >

- -
Template Parameters:
- - -
typefor checking This trait is used to determine if type T has T::mapped_type type member. This member is used in std::map, std::multimap.
-
-
- -

Definition at line 73 of file CBuffer.hpp.

-
The documentation for this class was generated from the following file: -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.png b/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.png deleted file mode 100644 index ca60d358..00000000 Binary files a/doc/technical/profileLib/html/d7/d58/classivi_link_1_1_type_traits_1_1has__mapped__type.png and /dev/null differ diff --git a/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.html b/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.html deleted file mode 100644 index f14a7994..00000000 --- a/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - -iviLink: iviLink::CSBuffer< SIZE > Class Template Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::CSBuffer< SIZE > Class Template Reference
-
-
- -

Version of class CBuffer with memory buffer contained inside instance. - More...

- -

#include <CBuffer.hpp>

-
-Inheritance diagram for iviLink::CSBuffer< SIZE >:
-
-
- - -iviLink::CBuffer - -
- -

List of all members.

- -
-

Detailed Description

-

template<size_t SIZE>
-class iviLink::CSBuffer< SIZE >

- -

Version of class CBuffer with memory buffer contained inside instance.

-

Size of the buffer is set by SIZE value.

- -

Definition at line 601 of file CBuffer.hpp.

-
The documentation for this class was generated from the following file: -
- - - - -
- -
- -
Generated on Tue Jul 31 2012 19:46:19 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.png b/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.png deleted file mode 100644 index dc427b7e..00000000 Binary files a/doc/technical/profileLib/html/d8/d5d/classivi_link_1_1_c_s_buffer.png and /dev/null differ diff --git a/doc/technical/profileLib/html/d8/dca/classivi_link_1_1_c_s_buffer-members.html b/doc/technical/profileLib/html/d8/dca/classivi_link_1_1_c_s_buffer-members.html deleted file mode 100644 index 61fe0d76..00000000 --- a/doc/technical/profileLib/html/d8/dca/classivi_link_1_1_c_s_buffer-members.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::CSBuffer< SIZE > Member List
-
-
-This is the complete list of members for iviLink::CSBuffer< SIZE >, including all inherited members. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CBuffer(UInt8 *pBuffer, UInt32 size, bool endianConvert=true)iviLink::CBuffer
CBuffer(CBuffer const &)iviLink::CBuffer
CSBuffer() (defined in iviLink::CSBuffer< SIZE >)iviLink::CSBuffer< SIZE > [inline]
getBuffer() const iviLink::CBuffer
getReadPosition() const iviLink::CBuffer
getSize() const iviLink::CBuffer
getWritePosition() const iviLink::CBuffer
operator=(CBuffer const &)iviLink::CBuffer
read(Int8 &value) const iviLink::CBuffer
read(UInt8 &value) const iviLink::CBuffer
read(Int16 &value) const iviLink::CBuffer
read(UInt16 &value) const iviLink::CBuffer
read(Int32 &value) const iviLink::CBuffer
read(UInt32 &value) const iviLink::CBuffer
read(Int64 &value) const iviLink::CBuffer
read(UInt64 &value) const iviLink::CBuffer
read(UInt32 size, void *pBuffer) const iviLink::CBuffer
read(std::string &value) const iviLink::CBuffer
read(std::pair< K, V > &val) const iviLink::CBuffer [inline]
read(InsertIter result) const iviLink::CBuffer [inline]
setReadPosition(UInt32 pos) const iviLink::CBuffer
setWritePosition(UInt32 pos)iviLink::CBuffer
write(Int8 value)iviLink::CBuffer
write(UInt8 value)iviLink::CBuffer
write(Int16 value)iviLink::CBuffer
write(UInt16 value)iviLink::CBuffer
write(Int32 value)iviLink::CBuffer
write(UInt32 value)iviLink::CBuffer
write(Int64 value)iviLink::CBuffer
write(UInt64 value)iviLink::CBuffer
write(void const *pBuffer, UInt32 size)iviLink::CBuffer
write(std::string const &value)iviLink::CBuffer
write(std::pair< K, V > const &value)iviLink::CBuffer [inline]
write(InputIter first, InputIter last)iviLink::CBuffer [inline]
~CBuffer() (defined in iviLink::CBuffer)iviLink::CBuffer
- - - - -
- -
- -
Generated on Tue Jul 31 2012 19:46:19 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d9/d6f/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two.html b/doc/technical/profileLib/html/d9/d6f/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two.html deleted file mode 100644 index 2b53c510..00000000 --- a/doc/technical/profileLib/html/d9/d6f/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - -iviLink: iviLink::TypeTraits::SFINAE::__two Struct Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Attributes
-
-
iviLink::TypeTraits::SFINAE::__two Struct Reference
-
-
- -

List of all members.

- - - -

-Public Attributes

-char __arr [2]
-

Detailed Description

-
-

Definition at line 63 of file CBuffer.hpp.

-
The documentation for this struct was generated from the following file: -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.html b/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.html deleted file mode 100644 index 0b60e28f..00000000 --- a/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - -iviLink: iviLink::TypeTraits::SFINAE Struct Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Classes | -Public Types
-
-
iviLink::TypeTraits::SFINAE Struct Reference
-
-
- -

Type is used to hold SFINAE-types with different size. - More...

- -

#include <CBuffer.hpp>

-
-Inheritance diagram for iviLink::TypeTraits::SFINAE:
-
-
- - -iviLink::TypeTraits::has_mapped_type< T > - -
- -

List of all members.

- - - - - -

-Classes

struct  __two

-Public Types

-typedef char __one
-

Detailed Description

-

Type is used to hold SFINAE-types with different size.

- -

Definition at line 60 of file CBuffer.hpp.

-
The documentation for this struct was generated from the following file: -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.png b/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.png deleted file mode 100644 index 0f2e9902..00000000 Binary files a/doc/technical/profileLib/html/d9/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e.png and /dev/null differ diff --git a/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp.html b/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp.html deleted file mode 100644 index 7a45a400..00000000 --- a/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - -iviLink: profileLib.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
profileLib.hpp File Reference
-
-
- -

This is an aggregate of Profile Library - it contains everything needed for profile creation. -More...

-
#include "CBuffer.hpp"
-#include "Channel.hpp"
-#include "framework/components/ProfileManager/PMAL/CProfile.hpp"
-#include "defines.hpp"
-
-

Go to the source code of this file.

- -
-

Detailed Description

-

This is an aggregate of Profile Library - it contains everything needed for profile creation.

-

This header should be included into any profile implementation.

- -

Definition in file profileLib.hpp.

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp_source.html b/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp_source.html deleted file mode 100644 index fb8fc1c7..00000000 --- a/doc/technical/profileLib/html/da/d3d/profile_lib_8hpp_source.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - -iviLink: profileLib.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
profileLib.hpp
-
-
-Go to the documentation of this file.
00001 /* 
-00002  *  iviLINK SDK, version 0.9 (for preview only)                                      
-00003  *    http://www.ivilink.net                                                         
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications       
-00005  *                                                                                   
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group               
-00007  *                                                                                   
-00008  *  This library is free software; you can redistribute it and/or                    
-00009  *  modify it under the terms of the GNU Lesser General Public                       
-00010  *  License as published by the Free Software Foundation; version 2.1.               
-00011  *                                                                                   
-00012  *  This library is distributed in the hope that it will be useful,                  
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of                   
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU                
-00015  *  Lesser General Public License for more details.                                  
-00016  *                                                                                   
-00017  *  You should have received a copy of the GNU Lesser General Public                 
-00018  *  License along with this library; if not, write to the Free Software              
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA   
-00020  * 
-00021  * 
-00022  * 
-00023  * 
-00024  */
-00025 
-00039 #ifndef PROFILE_LIB_HPP__
-00040 #define PROFILE_LIB_HPP__
-00041 
-00042 #include "CBuffer.hpp"
-00043 #include "Channel.hpp"
-00044 #include "framework/components/ProfileManager/PMAL/CProfile.hpp"
-00045 #include "defines.hpp"
-00046 
-00047 #endif // PROFILE_LIB_HPP__
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/db/df8/defines_8hpp.html b/doc/technical/profileLib/html/db/df8/defines_8hpp.html deleted file mode 100644 index 65df3fba..00000000 --- a/doc/technical/profileLib/html/db/df8/defines_8hpp.html +++ /dev/null @@ -1,269 +0,0 @@ - - - - -iviLink: defines.hpp File Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-Defines
-
-
defines.hpp File Reference
-
-
- -

This file contains useful macros for creating profiles. -More...

- -

Go to the source code of this file.

- - - - - - - - - - - - - - -

-Defines

#define IVILINK_PROFILE_BEGIN
 This macro should be put into the beginning of a header with profile implementation declaration.
#define IVILINK_PROFILE_END(PROFILE_CLASS)
 This macro should be put into the end of a header with profile implementation declaration.
#define IVILINK_PROFILE_DECLARE
 This macro should be put into the beginning of a profile implementation declaration.
#define IVILINK_PROFILE_NAME(PROFILE_NAME)
 This macro should be put into a profile implementation declaration.
#define IVILINK_PROFILE_VERSION(VERSION)
 This macro should be put into a profile implementation declaration.
#define IVILINK_PROFILE_UID(PROFILE_UID)
 This macro should be put into a profile implementation declaration.
-

Detailed Description

-

This file contains useful macros for creating profiles.

-

See samples/linux/Profiles/BasicSampleProfile for examples.

- -

Definition in file defines.hpp.

-

Define Documentation

- -
-
- - - - -
#define IVILINK_PROFILE_BEGIN
-
-
-Value:
extern "C" iviLink::Profile::CProfile* createProfile \
-   (iviLink::Profile::IUid const& id, iviLink::Service::Uid const& sid, \
-         iviLink::Profile::IProfileCallbackProxy* pCbProxy);
-
-

This macro should be put into the beginning of a header with profile implementation declaration.

- -

Definition at line 39 of file defines.hpp.

- -
-
- -
-
- - - - -
#define IVILINK_PROFILE_DECLARE
-
-
-Value:
friend iviLink::Profile::CProfile* createProfile(iviLink::Profile::IUid const& id, \
-         iviLink::Service::Uid const& sid, iviLink::Profile::IProfileCallbackProxy*);
-
-

This macro should be put into the beginning of a profile implementation declaration.

- -

Definition at line 61 of file defines.hpp.

- -
-
- -
-
- - - - - - - - -
#define IVILINK_PROFILE_END( PROFILE_CLASS)
-
-
-Value:
extern "C" iviLink::Profile::CProfile* createProfile \
-         (iviLink::Profile::IUid const& id, iviLink::Service::Uid const& sid, \
-               iviLink::Profile::IProfileCallbackProxy* pCbProxy) \
-{ return new iviLink::Profile::CProfile(id, sid, new PROFILE_CLASS(pCbProxy)); }
-
-

This macro should be put into the end of a header with profile implementation declaration.

-
Parameters:
- - -
PROFILE_CLASSprofile implementation class name
-
-
- -

Definition at line 50 of file defines.hpp.

- -
-
- -
-
- - - - - - - - -
#define IVILINK_PROFILE_NAME( PROFILE_NAME)
-
-
-Value:
virtual std::string getName() const \
-   { return std::string(#PROFILE_NAME ); }
-
-

This macro should be put into a profile implementation declaration.

-
Parameters:
- - -
PROFILE_NAMEname of the profile implementation (see samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml)
-
-
- -

Definition at line 71 of file defines.hpp.

- -
-
- -
-
- - - - - - - - -
#define IVILINK_PROFILE_UID( PROFILE_UID)
-
-
-Value:
virtual iviLink::Profile::Uid getUid() const \
-   { return iviLink::Profile::Uid(#PROFILE_UID ); }
-
-

This macro should be put into a profile implementation declaration.

-
Parameters:
- - -
PROFILE_UIDUID of the profile implementation (see samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml)
-
-
- -

Definition at line 90 of file defines.hpp.

- -
-
- -
-
- - - - - - - - -
#define IVILINK_PROFILE_VERSION( VERSION)
-
-
-Value:
virtual UInt32 getVersion() const \
-   { return 3; }
-
-

This macro should be put into a profile implementation declaration.

-
Parameters:
- - -
VERSIONprofile implementation version (see samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml)
-
-
- -

Definition at line 81 of file defines.hpp.

- -
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/db/df8/defines_8hpp_source.html b/doc/technical/profileLib/html/db/df8/defines_8hpp_source.html deleted file mode 100644 index f0f8fc11..00000000 --- a/doc/technical/profileLib/html/db/df8/defines_8hpp_source.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - -iviLink: defines.hpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
defines.hpp
-
-
-Go to the documentation of this file.
00001 /*
-00002  *  iviLINK SDK, version 0.9 (for preview only)
-00003  *    http://www.ivilink.net
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications
-00005  *
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group
-00007  *
-00008  *  This library is free software; you can redistribute it and/or
-00009  *  modify it under the terms of the GNU Lesser General Public
-00010  *  License as published by the Free Software Foundation; version 2.1.
-00011  *
-00012  *  This library is distributed in the hope that it will be useful,
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-00015  *  Lesser General Public License for more details.
-00016  *
-00017  *  You should have received a copy of the GNU Lesser General Public
-00018  *  License along with this library; if not, write to the Free Software
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-00020  *
-00021  *
-00022  *
-00023  *
-00024  */
-00025  
-00032 #ifndef DEFINES_HPP_
-00033 #define DEFINES_HPP_
-00034 
-00039 #define IVILINK_PROFILE_BEGIN \
-00040    extern "C" iviLink::Profile::CProfile* createProfile \
-00041    (iviLink::Profile::IUid const& id, iviLink::Service::Uid const& sid, \
-00042          iviLink::Profile::IProfileCallbackProxy* pCbProxy);
-00043          
-00044          
-00050 #define IVILINK_PROFILE_END(PROFILE_CLASS) \
-00051    extern "C" iviLink::Profile::CProfile* createProfile \
-00052          (iviLink::Profile::IUid const& id, iviLink::Service::Uid const& sid, \
-00053                iviLink::Profile::IProfileCallbackProxy* pCbProxy) \
-00054 { return new iviLink::Profile::CProfile(id, sid, new PROFILE_CLASS(pCbProxy)); }
-00055 
-00056 
-00061 #define IVILINK_PROFILE_DECLARE \
-00062    friend iviLink::Profile::CProfile* createProfile(iviLink::Profile::IUid const& id, \
-00063          iviLink::Service::Uid const& sid, iviLink::Profile::IProfileCallbackProxy*);
-00064          
-00071 #define IVILINK_PROFILE_NAME(PROFILE_NAME) \
-00072    virtual std::string getName() const \
-00073    { return std::string(#PROFILE_NAME ); }
-00074    
-00081 #define IVILINK_PROFILE_VERSION(VERSION) \
-00082    virtual UInt32 getVersion() const \
-00083    { return 3; }
-00084    
-00090 #define IVILINK_PROFILE_UID(PROFILE_UID) \
-00091    virtual iviLink::Profile::Uid getUid() const \
-00092    { return iviLink::Profile::Uid(#PROFILE_UID ); }
-00093 
-00094 #endif /* DEFINES_HPP_ */
-
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/dc/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two-members.html b/doc/technical/profileLib/html/dc/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two-members.html deleted file mode 100644 index 7cb48462..00000000 --- a/doc/technical/profileLib/html/dc/d79/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e_1_1____two-members.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::TypeTraits::SFINAE::__two Member List
-
-
-This is the complete list of members for iviLink::TypeTraits::SFINAE::__two, including all inherited members. - -
__arr (defined in iviLink::TypeTraits::SFINAE::__two)iviLink::TypeTraits::SFINAE::__two
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/dd/d60/classivi_link_1_1_channel_1_1_c_channel_handler.html b/doc/technical/profileLib/html/dd/d60/classivi_link_1_1_channel_1_1_c_channel_handler.html deleted file mode 100644 index 67bbc86b..00000000 --- a/doc/technical/profileLib/html/dd/d60/classivi_link_1_1_channel_1_1_c_channel_handler.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - -iviLink: iviLink::Channel::CChannelHandler Class Reference - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-Public Member Functions
-
-
iviLink::Channel::CChannelHandler Class Reference
-
-
- -

CChannelHandler is an abstract class for handling channel callbacks. - More...

- -

#include <Channel.hpp>

- -

List of all members.

- - - - - - - - - - - - -

-Public Member Functions

virtual void bufferReceived (const iviLink::Channel::tChannelId channel, iviLink::CBuffer const &buffer)=0
 Called from dataReceivedCallback.
virtual void dataReceivedCallback (const unsigned int channelId, const unsigned int readSize)
 Called when data is avaliable in channel.
virtual void bufferOverflowCallback (const iviLink::Channel::tChannelId channelId)
 Called on channel buffer overflow.
virtual void channelDeletedCallback (const iviLink::Channel::tChannelId channelId)=0
 Called when a previously allocated channel is deallocated on the other side (this method will be called from the object registered as a channel handler in allocateChannel()).
-virtual void connectionLostCallback ()=0
 Called when connection with the other side is lost.
-

Detailed Description

-

CChannelHandler is an abstract class for handling channel callbacks.

-

Your profile should either inherit it, or contain an instance of a derived class to be able to receive data from the other side.

- -

Definition at line 59 of file Channel.hpp.

-

Member Function Documentation

- -
-
- - - - - - - - -
virtual void iviLink::Channel::CChannelHandler::bufferOverflowCallback (const iviLink::Channel::tChannelId channelId) [virtual]
-
-
- -

Called on channel buffer overflow.

-

This implementation will do nothing

-
Parameters:
- - -
channelIdID of a channel where buffer overflow has happenned
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
virtual void iviLink::Channel::CChannelHandler::bufferReceived (const iviLink::Channel::tChannelId channel,
iviLink::CBuffer const & buffer 
) [pure virtual]
-
-
- -

Called from dataReceivedCallback.

-
Parameters:
- - - -
channelID of a channel that has received data
bufferCBuffer object with received data
-
-
- -
-
- -
-
- - - - - - - - -
virtual void iviLink::Channel::CChannelHandler::channelDeletedCallback (const iviLink::Channel::tChannelId channelId) [pure virtual]
-
-
- -

Called when a previously allocated channel is deallocated on the other side (this method will be called from the object registered as a channel handler in allocateChannel()).

-

At present, classes derived from CChannelHandler should call deallocateChannel(channelId) in their implementation of this method.

-
Parameters:
- - -
channelIDID of the deleted channel
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
virtual void iviLink::Channel::CChannelHandler::dataReceivedCallback (const unsigned int channelId,
const unsigned int readSize 
) [virtual]
-
-
- -

Called when data is avaliable in channel.

-

This implementation will receive data and pack it into a dynamically allocated CBuffer and then call bufferReceived()

-
Parameters:
- - - -
channelIdID of the channel that has received data
readSizetotal size of data avaliable in the channel
-
-
- -
-
-
The documentation for this class was generated from the following file: -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/de/d69/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e-members.html b/doc/technical/profileLib/html/de/d69/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e-members.html deleted file mode 100644 index c03e0bf1..00000000 --- a/doc/technical/profileLib/html/de/d69/structivi_link_1_1_type_traits_1_1_s_f_i_n_a_e-members.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -iviLink: Member List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
-
iviLink::TypeTraits::SFINAE Member List
-
-
-This is the complete list of members for iviLink::TypeTraits::SFINAE, including all inherited members. - -
__one typedef (defined in iviLink::TypeTraits::SFINAE)iviLink::TypeTraits::SFINAE
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/df/d0a/main_8cpp_source.html b/doc/technical/profileLib/html/df/d0a/main_8cpp_source.html deleted file mode 100644 index d8717df5..00000000 --- a/doc/technical/profileLib/html/df/d0a/main_8cpp_source.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - -iviLink: test/main.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
test/main.cpp
-
-
-
00001 /* 
-00002  *  iviLINK SDK, version 0.9 (for preview only)                                      
-00003  *    http://www.ivilink.net                                                         
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications       
-00005  *                                                                                   
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group               
-00007  *                                                                                   
-00008  *  This library is free software; you can redistribute it and/or                    
-00009  *  modify it under the terms of the GNU Lesser General Public                       
-00010  *  License as published by the Free Software Foundation; version 2.1.               
-00011  *                                                                                   
-00012  *  This library is distributed in the hope that it will be useful,                  
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of                   
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU                
-00015  *  Lesser General Public License for more details.                                  
-00016  *                                                                                   
-00017  *  You should have received a copy of the GNU Lesser General Public                 
-00018  *  License along with this library; if not, write to the Free Software              
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA   
-00020  * 
-00021  * 
-00022  * 
-00023  * 
-00024  */
-00025 
-00026 
-00027 #include <cppunit/extensions/TestFactoryRegistry.h>
-00028 #include <cppunit/ui/text/TestRunner.h>
-00029 
-00030 #include "utils/misc/Logger.hpp"
-00031 
-00032 int main( int argc, char **argv)
-00033 {
-00034    Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("profileLib.test.main"));
-00035    PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties"));
-00036 
-00037    CppUnit::TextUi::TestRunner runner;
-00038    CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
-00039    runner.addTest( registry.makeTest() );
-00040    bool wasSucessful = runner.run( "", false );
-00041    return wasSucessful ? 0 : 1;
-00042 }
-
-
- - - - -
- -
- -
Generated on Tue Jul 31 2012 19:42:23 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/df/dac/test_8cpp_source.html b/doc/technical/profileLib/html/df/dac/test_8cpp_source.html deleted file mode 100644 index d2b298b3..00000000 --- a/doc/technical/profileLib/html/df/dac/test_8cpp_source.html +++ /dev/null @@ -1,547 +0,0 @@ - - - - -iviLink: test/test.cpp Source File - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
test/test.cpp
-
-
-
00001 /* 
-00002  *  iviLINK SDK, version 0.9 (for preview only)                                      
-00003  *    http://www.ivilink.net                                                         
-00004  *  Cross Platform Application Communication Stack for In-Vehicle Applications       
-00005  *                                                                                   
-00006  *  Copyright (C) 2012, Luxoft Professional Corp., member of IBS group               
-00007  *                                                                                   
-00008  *  This library is free software; you can redistribute it and/or                    
-00009  *  modify it under the terms of the GNU Lesser General Public                       
-00010  *  License as published by the Free Software Foundation; version 2.1.               
-00011  *                                                                                   
-00012  *  This library is distributed in the hope that it will be useful,                  
-00013  *  but WITHOUT ANY WARRANTY; without even the implied warranty of                   
-00014  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU                
-00015  *  Lesser General Public License for more details.                                  
-00016  *                                                                                   
-00017  *  You should have received a copy of the GNU Lesser General Public                 
-00018  *  License along with this library; if not, write to the Free Software              
-00019  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA   
-00020  * 
-00021  * 
-00022  * 
-00023  * 
-00024  */
-00025 
-00026 #include <list>
-00027 #include <map>
-00028 #include <set>
-00029 #include <string>
-00030 #include <vector>
-00031 #include <unistd.h>
-00032 
-00033 
-00034 #include <cppunit/extensions/HelperMacros.h>
-00035 #include <cppunit/TestAssert.h>
-00036 
-00037 #include "../CBuffer.hpp"
-00038 
-00039 using namespace iviLink;
-00040 
-00041 template <typename T>
-00042 void checkRead( T const& expected, CBuffer& buffer, CppUnit::SourceLine sourceLine)
-00043 {
-00044    T actual;
-00045    CPPUNIT_NS::Asserter::failIf(false == buffer.read(actual), 
-00046       CPPUNIT_NS::Message( "assertion failed, buffer read error" ),
-00047       sourceLine );  
-00048 
-00049    using CPPUNIT_NS::assertion_traits;
-00050    if ( !assertion_traits<T>::equal(expected,actual) )
-00051    {
-00052       ::CppUnit::Asserter::failNotEqual( assertion_traits<T>::toString(expected),
-00053                                          assertion_traits<T>::toString(actual),
-00054                                          sourceLine );
-00055    }
-00056 }
-00057 
-00058 #define ASSERT_READ( expected, buffer ) \
-00059    checkRead( (expected), buffer, CPPUNIT_SOURCELINE() )
-00060 
-00061 template <typename T>
-00062 void checkReadContainer( T const& expected, CBuffer& buffer, CppUnit::SourceLine sourceLine)
-00063 {
-00064    T actual;
-00065    CPPUNIT_NS::Asserter::failIf(false == buffer.read(std::inserter(actual, actual.begin())), 
-00066       CPPUNIT_NS::Message( "assertion failed, buffer.readContainer() error" ),
-00067       sourceLine );
-00068 
-00069    using CPPUNIT_NS::assertion_traits;
-00070 
-00071    if ( !assertion_traits<size_t>::equal(expected.size(), actual.size() ))
-00072    {
-00073       CPPUNIT_NS::Asserter::failNotEqual( assertion_traits<size_t>::toString(expected.size()),
-00074                                          assertion_traits<size_t>::toString(actual.size()),
-00075                                          sourceLine,
-00076                                          "Size mistatch" );
-00077    }
-00078 
-00079    if (!std::equal(expected.begin(), expected.end(), actual.begin()))
-00080    {
-00081       CPPUNIT_NS::Asserter::failNotEqual( "", "",
-00082                                    sourceLine,
-00083                                    "Sequnces are not equal" );
-00084    }
-00085 }
-00086 
-00087 #define ASSERT_CONTAINER_READ( expected, buffer ) \
-00088    checkReadContainer( (expected), buffer, CPPUNIT_SOURCELINE() )
-00089 
-00090 class CBufferTest : public CppUnit::TestFixture
-00091 {
-00092    CPPUNIT_TEST_SUITE(CBufferTest);
-00093    CPPUNIT_TEST(testGetBuffer);
-00094    CPPUNIT_TEST(testReadWriteNumbers);
-00095    CPPUNIT_TEST(testGetSetPos);
-00096    CPPUNIT_TEST(testReadWriteRaw);
-00097    CPPUNIT_TEST(testReadWriteManyRaw);
-00098    CPPUNIT_TEST(testReadWriteString);
-00099    CPPUNIT_TEST(testStdList);
-00100    CPPUNIT_TEST(testStdVector);
-00101    CPPUNIT_TEST(testStdSet);
-00102    CPPUNIT_TEST(testStdMap);
-00103    CPPUNIT_TEST(testCSBuffer);
-00104    CPPUNIT_TEST(testCopyBuffer);
-00105    CPPUNIT_TEST_SUITE_END();
-00106 
-00107 public:
-00108 
-00109    void testGetBuffer()
-00110    {
-00111       // set up
-00112       UInt8 buf[3];
-00113       UInt8* pBuf = buf;
-00114       CBuffer b(buf, 3);
-00115 
-00116       // test
-00117       CPPUNIT_ASSERT_EQUAL(pBuf, b.getBuffer());
-00118    }
-00119 
-00120    void testReadWriteNumbers()
-00121    {
-00122       // set up
-00123       UInt8 buf[100];
-00124       CBuffer b(buf, sizeof(buf));
-00125 
-00126       const  Int8   i8  = -116;
-00127       const UInt8  ui8  = 234;
-00128       const  Int16  i16 = -12312;
-00129       const UInt16 ui16 = 45678;
-00130       const  Int32  i32 = -9239882;
-00131       const UInt32 ui32 = 239492392;
-00132       const  Int64  i64 = -9223372036854775807;
-00133       const UInt64 ui64 = 18446744073709551615u;
-00134 
-00135       const UInt32 dataSize = 2*1 + 2*2 + 2*4 + 2*8;
-00136 
-00137       // test
-00138 
-00139       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00140       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00141 
-00142       CPPUNIT_ASSERT(b.write( i8 ));
-00143       CPPUNIT_ASSERT(b.write(ui8 ));
-00144       CPPUNIT_ASSERT(b.write( i16));
-00145       CPPUNIT_ASSERT(b.write(ui16));
-00146       CPPUNIT_ASSERT(b.write( i32));
-00147       CPPUNIT_ASSERT(b.write(ui32));
-00148       CPPUNIT_ASSERT(b.write( i64));
-00149       CPPUNIT_ASSERT(b.write(ui64));
-00150 
-00151       CPPUNIT_ASSERT_EQUAL(dataSize, b.getWritePosition());
-00152       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00153 
-00154       ASSERT_READ( i8 , b);
-00155       ASSERT_READ(ui8 , b);
-00156       ASSERT_READ( i16, b);
-00157       ASSERT_READ(ui16, b);
-00158       ASSERT_READ( i32, b);
-00159       ASSERT_READ(ui32, b);
-00160       ASSERT_READ( i64, b);
-00161       ASSERT_READ(ui64, b);
-00162 
-00163       CPPUNIT_ASSERT_EQUAL(dataSize, b.getWritePosition());
-00164       CPPUNIT_ASSERT_EQUAL(dataSize, b.getReadPosition());
-00165    }
-00166 
-00167    void testGetSetPos()
-00168    {
-00169       // set up
-00170       const UInt32 size = 10;
-00171       UInt8 buf[size];
-00172       CBuffer b(buf, size);
-00173 
-00174       // test
-00175 
-00176       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00177       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00178 
-00179       CPPUNIT_ASSERT(b.setWritePosition(3));
-00180       CPPUNIT_ASSERT(b.setReadPosition(8));
-00181 
-00182       CPPUNIT_ASSERT_EQUAL(3u, b.getWritePosition());
-00183       CPPUNIT_ASSERT_EQUAL(8u, b.getReadPosition());
-00184 
-00185       CPPUNIT_ASSERT(false == b.setWritePosition(10));
-00186       CPPUNIT_ASSERT(false == b.setReadPosition(11));
-00187 
-00188       CPPUNIT_ASSERT_EQUAL(3u, b.getWritePosition());
-00189       CPPUNIT_ASSERT_EQUAL(8u, b.getReadPosition());
-00190 
-00191       CPPUNIT_ASSERT(b.setWritePosition(9));
-00192       CPPUNIT_ASSERT(b.setReadPosition(9));
-00193 
-00194       CPPUNIT_ASSERT_EQUAL(9u, b.getWritePosition());
-00195       CPPUNIT_ASSERT_EQUAL(9u, b.getReadPosition());
-00196    }
-00197 
-00198    void testReadWriteRaw()
-00199    {
-00200       // set up
-00201       const char smallStr[]  = "small string";
-00202       const char mediumStr[] = "buffer size equals the size of this string";
-00203       const char largeStr[]  = "this string is larger than buffer size. what a pity!";
-00204 
-00205       const UInt32 smallStrSize = sizeof(smallStr);
-00206       const UInt32 mediumStrSize = sizeof(mediumStr);
-00207       const UInt32 largeStrSize = sizeof(largeStr);
-00208 
-00209       char tmpStr[largeStrSize + 10];
-00210 
-00211       const UInt32 bufSize = mediumStrSize;
-00212       UInt8 buf[bufSize];
-00213       CBuffer b(buf, bufSize);
-00214 
-00215       // test small str
-00216       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00217       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00218 
-00219       CPPUNIT_ASSERT(b.write(smallStr, smallStrSize));
-00220 
-00221       CPPUNIT_ASSERT_EQUAL(smallStrSize, b.getWritePosition());
-00222       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00223 
-00224       CPPUNIT_ASSERT(0 == memcmp(b.getBuffer(), smallStr, smallStrSize));
-00225 
-00226       CPPUNIT_ASSERT(b.read(smallStrSize, tmpStr));
-00227       CPPUNIT_ASSERT_EQUAL(smallStrSize, b.getWritePosition());
-00228       CPPUNIT_ASSERT_EQUAL(smallStrSize, b.getReadPosition());
-00229       CPPUNIT_ASSERT(0 == memcmp(tmpStr, smallStr, smallStrSize));
-00230 
-00231       // test medium str
-00232       b.setWritePosition(0);
-00233       b.setReadPosition(0);
-00234       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00235       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00236 
-00237       CPPUNIT_ASSERT(b.write(mediumStr, mediumStrSize));
-00238 
-00239       CPPUNIT_ASSERT_EQUAL(mediumStrSize, b.getWritePosition());
-00240       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00241 
-00242       CPPUNIT_ASSERT(0 == memcmp(b.getBuffer(), mediumStr, mediumStrSize));
-00243 
-00244       CPPUNIT_ASSERT(b.read(mediumStrSize, tmpStr));
-00245       CPPUNIT_ASSERT_EQUAL(mediumStrSize, b.getWritePosition());
-00246       CPPUNIT_ASSERT_EQUAL(mediumStrSize, b.getReadPosition());
-00247       CPPUNIT_ASSERT(0 == memcmp(tmpStr, mediumStr, mediumStrSize));
-00248 
-00249       // test large str
-00250       b.setWritePosition(0);
-00251       b.setReadPosition(0);
-00252       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00253       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00254 
-00255       CPPUNIT_ASSERT(false == b.write(largeStr, largeStrSize));
-00256 
-00257       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00258       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00259    }
-00260 
-00261    void testReadWriteManyRaw()
-00262    {
-00263       const char raw1[] = "asdf";
-00264       const char raw2[] = "qwerty";
-00265       const char raw3[] = "zxcvbnm,.";
-00266 
-00267       char tmp[40];
-00268 
-00269       const UInt32 size = 40;
-00270       UInt8 buf[size];
-00271       CBuffer b(buf, size);
-00272 
-00273       // test
-00274       CPPUNIT_ASSERT(b.write(raw1, sizeof(raw1)));
-00275       CPPUNIT_ASSERT(b.write(raw2, sizeof(raw2)));
-00276       CPPUNIT_ASSERT(b.write(raw3, sizeof(raw3)));
-00277 
-00278       CPPUNIT_ASSERT(b.read(sizeof(raw1), tmp));
-00279       CPPUNIT_ASSERT(0 == memcmp(tmp, raw1, sizeof(raw1)));
-00280 
-00281       CPPUNIT_ASSERT(b.read(sizeof(raw2), tmp));
-00282       CPPUNIT_ASSERT(0 == memcmp(tmp, raw2, sizeof(raw2)));
-00283 
-00284       CPPUNIT_ASSERT(b.read(sizeof(raw3), tmp));
-00285       CPPUNIT_ASSERT(0 == memcmp(tmp, raw3, sizeof(raw3)));
-00286    }
-00287 
-00288    void testReadWriteString()
-00289    {
-00290       // set up
-00291       const std::string small  = "small string";
-00292       const std::string medium = "buffer size equals the size of this string";
-00293       const std::string large  = "this string is larger than buffer size. what a pity!";
-00294 
-00295       const UInt32 smallSize = small.size() + sizeof(UInt32);
-00296       const UInt32 mediumSize = medium.size() + sizeof(UInt32);
-00297       // const UInt32 largeSize = large.size() + sizeof(UInt32);
-00298 
-00299       std::string tmp;
-00300 
-00301       const UInt32 bufSize = mediumSize;
-00302       UInt8 buf[bufSize];
-00303       CBuffer b(buf, bufSize);
-00304 
-00305       // test small str
-00306       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00307       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00308 
-00309       CPPUNIT_ASSERT(b.write(small));
-00310 
-00311       CPPUNIT_ASSERT_EQUAL(smallSize, b.getWritePosition());
-00312       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00313 
-00314       CPPUNIT_ASSERT(b.read(tmp));
-00315       CPPUNIT_ASSERT_EQUAL(smallSize, b.getWritePosition());
-00316       CPPUNIT_ASSERT_EQUAL(smallSize, b.getReadPosition());
-00317       CPPUNIT_ASSERT_EQUAL(small, tmp);
-00318 
-00319       // test medium str
-00320       b.setWritePosition(0);
-00321       b.setReadPosition(0);
-00322       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00323       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00324 
-00325       CPPUNIT_ASSERT(b.write(medium));
-00326 
-00327       CPPUNIT_ASSERT_EQUAL(mediumSize, b.getWritePosition());
-00328       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00329 
-00330       CPPUNIT_ASSERT(b.read(tmp));
-00331       CPPUNIT_ASSERT_EQUAL(mediumSize, b.getWritePosition());
-00332       CPPUNIT_ASSERT_EQUAL(mediumSize, b.getReadPosition());
-00333       CPPUNIT_ASSERT_EQUAL(medium, tmp);
-00334 
-00335       // test large str
-00336       b.setWritePosition(0);
-00337       b.setReadPosition(0);
-00338       CPPUNIT_ASSERT_EQUAL(0u, b.getWritePosition());
-00339       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00340 
-00341       CPPUNIT_ASSERT(false == b.write(large));
-00342 
-00343       CPPUNIT_ASSERT_EQUAL(4u, b.getWritePosition());
-00344       CPPUNIT_ASSERT_EQUAL(0u, b.getReadPosition());
-00345    }
-00346 
-00347    void testStdList()
-00348    {
-00349       UInt8 buf[100];
-00350       CBuffer b(buf, sizeof(buf));
-00351 
-00352       std::list<int> list;
-00353       for (int i = -10; i < 10; ++i)
-00354          list.push_back(i);
-00355 
-00356       CPPUNIT_ASSERT(b.write(list.begin(), list.end()));
-00357       ASSERT_CONTAINER_READ(list, b);
-00358    }
-00359 
-00360    void testStdVector()
-00361    {
-00362       UInt8 buf[100];
-00363       CBuffer b(buf, sizeof(buf));
-00364 
-00365       std::vector<int> vec;
-00366       for (int i = -10; i < 10; ++i)
-00367          vec.push_back(i);
-00368 
-00369       CPPUNIT_ASSERT(b.write(vec.begin(), vec.end()));
-00370       ASSERT_CONTAINER_READ(vec, b);
-00371    }
-00372 
-00373    void testStdSet()
-00374    {
-00375       UInt8 buf[100];
-00376       CBuffer b(buf, sizeof(buf));
-00377 
-00378       std::set<std::string> set;
-00379       set.insert("asdf");
-00380       set.insert("zcxv");
-00381       set.insert("aqwersdf");
-00382       set.insert("ayuyu");
-00383 
-00384       CPPUNIT_ASSERT(b.write(set.begin(), set.end()));
-00385       ASSERT_CONTAINER_READ(set, b);
-00386    }
-00387 
-00388    void testStdMap()
-00389    {
-00390       UInt8 buf[100];
-00391       CBuffer b(buf, sizeof(buf));
-00392 
-00393       std::map<std::string, int> map;
-00394       map["asdf"] = 1;
-00395       map["zcxv"] = 2;
-00396       map["aqwersdf"] = 3;
-00397       map["ayuyu"] = 4;
-00398 
-00399       CPPUNIT_ASSERT(b.write(map.begin(), map.end()));
-00400       ASSERT_CONTAINER_READ(map, b);
-00401 
-00402 
-00403       std::map< std::string, int> tmp;
-00404       std::copy(map.begin(), map.end(), std::inserter(map, map.begin()));
-00405    }
-00406 
-00407    void testCSBuffer()
-00408    {
-00409       const UInt32 size = 5;
-00410       CSBuffer<size> buf;
-00411 
-00412       CPPUNIT_ASSERT_EQUAL(size, buf.getSize());
-00413       CPPUNIT_ASSERT_EQUAL(0u, buf.getReadPosition());
-00414       CPPUNIT_ASSERT_EQUAL(0u, buf.getWritePosition());
-00415 
-00416       Int32 v1 = 12341234;
-00417       Int8  v2 = 127;
-00418       Int8  v3 = 1;
-00419 
-00420       CPPUNIT_ASSERT(buf.write(v1));
-00421       CPPUNIT_ASSERT(buf.write(v2));
-00422       CPPUNIT_ASSERT(false == buf.write(v3));
-00423 
-00424       CPPUNIT_ASSERT_EQUAL(0u, buf.getReadPosition());
-00425       CPPUNIT_ASSERT_EQUAL(5u, buf.getWritePosition());
-00426 
-00427       ASSERT_READ(v1, buf);
-00428       ASSERT_READ(v2, buf);
-00429       Int8 tmp;
-00430       CPPUNIT_ASSERT(false == buf.read(tmp));
-00431 
-00432       CPPUNIT_ASSERT_EQUAL(5u, buf.getReadPosition());
-00433       CPPUNIT_ASSERT_EQUAL(5u, buf.getWritePosition());
-00434    }
-00435 
-00436    void testCopyBuffer()
-00437    {
-00438       const UInt32 size = 10;
-00439       UInt8 arr[size];
-00440       CBuffer buf(arr, size);
-00441       buf.setReadPosition(2);
-00442       buf.setWritePosition(3);
-00443 
-00444       #define CHECK(b)                                                  \
-00445          CPPUNIT_ASSERT_EQUAL(size, b.getSize());                       \
-00446          CPPUNIT_ASSERT_EQUAL((intptr_t)arr, (intptr_t)b.getBuffer());  \
-00447          CPPUNIT_ASSERT_EQUAL(2u, b.getReadPosition());                 \
-00448          CPPUNIT_ASSERT_EQUAL(3u, b.getWritePosition());
-00449 
-00450       CHECK(buf);
-00451 
-00452       CBuffer copy(buf);
-00453       CHECK(copy);
-00454 
-00455       CBuffer assigned(NULL, 0);
-00456       assigned = buf;
-00457       CHECK(assigned);
-00458    }
-00459 
-00460 };
-00461 
-00462 
-00463 CPPUNIT_TEST_SUITE_REGISTRATION( CBufferTest );
-00464 
-
-
- - - - -
- -
- -
Generated on Tue Jul 31 2012 19:42:23 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/doxygen.css b/doc/technical/profileLib/html/doxygen.css deleted file mode 100644 index 74445fe1..00000000 --- a/doc/technical/profileLib/html/doxygen.css +++ /dev/null @@ -1,835 +0,0 @@ -/* The standard CSS for doxygen */ - -body, table, div, p, dl { - font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; - font-size: 12px; -} - -/* @group Heading Levels */ - -h1 { - font-size: 150%; -} - -.title { - font-size: 150%; - font-weight: bold; - margin: 10px 2px; -} - -h2 { - font-size: 120%; -} - -h3 { - font-size: 100%; -} - -dt { - font-weight: bold; -} - -div.multicol { - -moz-column-gap: 1em; - -webkit-column-gap: 1em; - -moz-column-count: 3; - -webkit-column-count: 3; -} - -p.startli, p.startdd, p.starttd { - margin-top: 2px; -} - -p.endli { - margin-bottom: 0px; -} - -p.enddd { - margin-bottom: 4px; -} - -p.endtd { - margin-bottom: 2px; -} - -/* @end */ - -caption { - font-weight: bold; -} - -span.legend { - font-size: 70%; - text-align: center; -} - -h3.version { - font-size: 90%; - text-align: center; -} - -div.qindex, div.navtab{ - background-color: #EBEFF6; - border: 1px solid #A3B4D7; - text-align: center; - margin: 2px; - padding: 2px; -} - -div.qindex, div.navpath { - width: 100%; - line-height: 140%; -} - -div.navtab { - margin-right: 15px; -} - -/* @group Link Styling */ - -a { - color: #3D578C; - font-weight: normal; - text-decoration: none; -} - -.contents a:visited { - color: #4665A2; -} - -a:hover { - text-decoration: underline; -} - -a.qindex { - font-weight: bold; -} - -a.qindexHL { - font-weight: bold; - background-color: #9CAFD4; - color: #ffffff; - border: 1px double #869DCA; -} - -.contents a.qindexHL:visited { - color: #ffffff; -} - -a.el { - font-weight: bold; -} - -a.elRef { -} - -a.code { - color: #4665A2; -} - -a.codeRef { - color: #4665A2; -} - -/* @end */ - -dl.el { - margin-left: -1cm; -} - -.fragment { - font-family: monospace, fixed; - font-size: 105%; -} - -pre.fragment { - border: 1px solid #C4CFE5; - background-color: #FBFCFD; - padding: 4px 6px; - margin: 4px 8px 4px 2px; - overflow: auto; - word-wrap: break-word; - font-size: 9pt; - line-height: 125%; -} - -div.ah { - background-color: black; - font-weight: bold; - color: #ffffff; - margin-bottom: 3px; - margin-top: 3px; - padding: 0.2em; - border: solid thin #333; - border-radius: 0.5em; - -webkit-border-radius: .5em; - -moz-border-radius: .5em; - box-shadow: 2px 2px 3px #999; - -webkit-box-shadow: 2px 2px 3px #999; - -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); - background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); -} - -div.groupHeader { - margin-left: 16px; - margin-top: 12px; - font-weight: bold; -} - -div.groupText { - margin-left: 16px; - font-style: italic; -} - -body { - background: white; - color: black; - margin: 0; -} - -div.contents { - margin-top: 10px; - margin-left: 10px; - margin-right: 5px; -} - -td.indexkey { - background-color: #EBEFF6; - font-weight: bold; - border: 1px solid #C4CFE5; - margin: 2px 0px 2px 0; - padding: 2px 10px; -} - -td.indexvalue { - background-color: #EBEFF6; - border: 1px solid #C4CFE5; - padding: 2px 10px; - margin: 2px 0px; -} - -tr.memlist { - background-color: #EEF1F7; -} - -p.formulaDsp { - text-align: center; -} - -img.formulaDsp { - -} - -img.formulaInl { - vertical-align: middle; -} - -div.center { - text-align: center; - margin-top: 0px; - margin-bottom: 0px; - padding: 0px; -} - -div.center img { - border: 0px; -} - -address.footer { - text-align: right; - padding-right: 12px; -} - -img.footer { - border: 0px; - vertical-align: middle; -} - -/* @group Code Colorization */ - -span.keyword { - color: #008000 -} - -span.keywordtype { - color: #604020 -} - -span.keywordflow { - color: #e08000 -} - -span.comment { - color: #800000 -} - -span.preprocessor { - color: #806020 -} - -span.stringliteral { - color: #002080 -} - -span.charliteral { - color: #008080 -} - -span.vhdldigit { - color: #ff00ff -} - -span.vhdlchar { - color: #000000 -} - -span.vhdlkeyword { - color: #700070 -} - -span.vhdllogic { - color: #ff0000 -} - -/* @end */ - -/* -.search { - color: #003399; - font-weight: bold; -} - -form.search { - margin-bottom: 0px; - margin-top: 0px; -} - -input.search { - font-size: 75%; - color: #000080; - font-weight: normal; - background-color: #e8eef2; -} -*/ - -td.tiny { - font-size: 75%; -} - -.dirtab { - padding: 4px; - border-collapse: collapse; - border: 1px solid #A3B4D7; -} - -th.dirtab { - background: #EBEFF6; - font-weight: bold; -} - -hr { - height: 0px; - border: none; - border-top: 1px solid #4A6AAA; -} - -hr.footer { - height: 1px; -} - -/* @group Member Descriptions */ - -table.memberdecls { - border-spacing: 0px; - padding: 0px; -} - -.mdescLeft, .mdescRight, -.memItemLeft, .memItemRight, -.memTemplItemLeft, .memTemplItemRight, .memTemplParams { - background-color: #F9FAFC; - border: none; - margin: 4px; - padding: 1px 0 0 8px; -} - -.mdescLeft, .mdescRight { - padding: 0px 8px 4px 8px; - color: #555; -} - -.memItemLeft, .memItemRight, .memTemplParams { - border-top: 1px solid #C4CFE5; -} - -.memItemLeft, .memTemplItemLeft { - white-space: nowrap; -} - -.memItemRight { - width: 100%; -} - -.memTemplParams { - color: #4665A2; - white-space: nowrap; -} - -/* @end */ - -/* @group Member Details */ - -/* Styles for detailed member documentation */ - -.memtemplate { - font-size: 80%; - color: #4665A2; - font-weight: normal; - margin-left: 9px; -} - -.memnav { - background-color: #EBEFF6; - border: 1px solid #A3B4D7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; -} - -.mempage { - width: 100%; -} - -.memitem { - padding: 0; - margin-bottom: 10px; - margin-right: 5px; -} - -.memname { - white-space: nowrap; - font-weight: bold; - margin-left: 6px; -} - -.memproto { - border-top: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; - padding: 6px 0px 6px 0px; - color: #253555; - font-weight: bold; - text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - /* opera specific markup */ - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - border-top-right-radius: 8px; - border-top-left-radius: 8px; - /* firefox specific markup */ - -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; - -moz-border-radius-topright: 8px; - -moz-border-radius-topleft: 8px; - /* webkit specific markup */ - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - -webkit-border-top-right-radius: 8px; - -webkit-border-top-left-radius: 8px; - background-image:url('nav_f.png'); - background-repeat:repeat-x; - background-color: #E2E8F2; - -} - -.memdoc { - border-bottom: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; - padding: 2px 5px; - background-color: #FBFCFD; - border-top-width: 0; - /* opera specific markup */ - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - /* firefox specific markup */ - -moz-border-radius-bottomleft: 8px; - -moz-border-radius-bottomright: 8px; - -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; - background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); - /* webkit specific markup */ - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); - background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); -} - -.paramkey { - text-align: right; -} - -.paramtype { - white-space: nowrap; -} - -.paramname { - color: #602020; - white-space: nowrap; -} -.paramname em { - font-style: normal; -} - -.params, .retval, .exception, .tparams { - border-spacing: 6px 2px; -} - -.params .paramname, .retval .paramname { - font-weight: bold; - vertical-align: top; -} - -.params .paramtype { - font-style: italic; - vertical-align: top; -} - -.params .paramdir { - font-family: "courier new",courier,monospace; - vertical-align: top; -} - - - - -/* @end */ - -/* @group Directory (tree) */ - -/* for the tree view */ - -.ftvtree { - font-family: sans-serif; - margin: 0px; -} - -/* these are for tree view when used as main index */ - -.directory { - font-size: 9pt; - font-weight: bold; - margin: 5px; -} - -.directory h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} - -/* -The following two styles can be used to replace the root node title -with an image of your choice. Simply uncomment the next two styles, -specify the name of your image and be sure to set 'height' to the -proper pixel height of your image. -*/ - -/* -.directory h3.swap { - height: 61px; - background-repeat: no-repeat; - background-image: url("yourimage.gif"); -} -.directory h3.swap span { - display: none; -} -*/ - -.directory > h3 { - margin-top: 0; -} - -.directory p { - margin: 0px; - white-space: nowrap; -} - -.directory div { - display: none; - margin: 0px; -} - -.directory img { - vertical-align: -30%; -} - -/* these are for tree view when not used as main index */ - -.directory-alt { - font-size: 100%; - font-weight: bold; -} - -.directory-alt h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} - -.directory-alt > h3 { - margin-top: 0; -} - -.directory-alt p { - margin: 0px; - white-space: nowrap; -} - -.directory-alt div { - display: none; - margin: 0px; -} - -.directory-alt img { - vertical-align: -30%; -} - -/* @end */ - -div.dynheader { - margin-top: 8px; -} - -address { - font-style: normal; - color: #2A3D61; -} - -table.doxtable { - border-collapse:collapse; -} - -table.doxtable td, table.doxtable th { - border: 1px solid #2D4068; - padding: 3px 7px 2px; -} - -table.doxtable th { - background-color: #374F7F; - color: #FFFFFF; - font-size: 110%; - padding-bottom: 4px; - padding-top: 5px; - text-align:left; -} - -.tabsearch { - top: 0px; - left: 10px; - height: 36px; - background-image: url('tab_b.png'); - z-index: 101; - overflow: hidden; - font-size: 13px; -} - -.navpath ul -{ - font-size: 11px; - background-image:url('tab_b.png'); - background-repeat:repeat-x; - height:30px; - line-height:30px; - color:#8AA0CC; - border:solid 1px #C2CDE4; - overflow:hidden; - margin:0px; - padding:0px; -} - -.navpath li -{ - list-style-type:none; - float:left; - padding-left:10px; - padding-right:15px; - background-image:url('bc_s.png'); - background-repeat:no-repeat; - background-position:right; - color:#364D7C; -} - -.navpath li.navelem a -{ - height:32px; - display:block; - text-decoration: none; - outline: none; -} - -.navpath li.navelem a:hover -{ - color:#6884BD; -} - -.navpath li.footer -{ - list-style-type:none; - float:right; - padding-left:10px; - padding-right:15px; - background-image:none; - background-repeat:no-repeat; - background-position:right; - color:#364D7C; - font-size: 8pt; -} - - -div.summary -{ - float: right; - font-size: 8pt; - padding-right: 5px; - width: 50%; - text-align: right; -} - -div.summary a -{ - white-space: nowrap; -} - -div.ingroups -{ - font-size: 8pt; - padding-left: 5px; - width: 50%; - text-align: left; -} - -div.ingroups a -{ - white-space: nowrap; -} - -div.header -{ - background-image:url('nav_h.png'); - background-repeat:repeat-x; - background-color: #F9FAFC; - margin: 0px; - border-bottom: 1px solid #C4CFE5; -} - -div.headertitle -{ - padding: 5px 5px 5px 10px; -} - -dl -{ - padding: 0 0 0 10px; -} - -dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug -{ - border-left:4px solid; - padding: 0 0 0 6px; -} - -dl.note -{ - border-color: #D0C000; -} - -dl.warning, dl.attention -{ - border-color: #FF0000; -} - -dl.pre, dl.post, dl.invariant -{ - border-color: #00D000; -} - -dl.deprecated -{ - border-color: #505050; -} - -dl.todo -{ - border-color: #00C0E0; -} - -dl.test -{ - border-color: #3030E0; -} - -dl.bug -{ - border-color: #C08050; -} - -#projectlogo -{ - text-align: center; - vertical-align: bottom; - border-collapse: separate; -} - -#projectlogo img -{ - border: 0px none; -} - -#projectname -{ - font: 300% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 2px 0px; -} - -#projectbrief -{ - font: 120% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 0px; -} - -#projectnumber -{ - font: 50% Tahoma, Arial,sans-serif; - margin: 0px; - padding: 0px; -} - -#titlearea -{ - padding: 0px; - margin: 0px; - width: 100%; - border-bottom: 1px solid #5373B4; -} - -.image -{ - text-align: center; -} - -.dotgraph -{ - text-align: center; -} - -.mscgraph -{ - text-align: center; -} - -.caption -{ - font-weight: bold; -} - diff --git a/doc/technical/profileLib/html/doxygen.png b/doc/technical/profileLib/html/doxygen.png deleted file mode 100644 index 635ed52f..00000000 Binary files a/doc/technical/profileLib/html/doxygen.png and /dev/null differ diff --git a/doc/technical/profileLib/html/files.html b/doc/technical/profileLib/html/files.html deleted file mode 100644 index d9e30d4c..00000000 --- a/doc/technical/profileLib/html/files.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - -iviLink: File List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
File List
-
-
-
Here is a list of all documented files with brief descriptions:
- - - - -
CBuffer.hpp [code]This file contains declarations of the CBuffer class (used in sending data to the other side) and some helper classes and functions
Channel.hpp [code]This file contains declarations of convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a declaration of a base class for channel callbacks (such as receiving data)
defines.hpp [code]This file contains useful macros for creating profiles
profileLib.hpp [code]This is an aggregate of Profile Library - it contains everything needed for profile creation
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/functions.html b/doc/technical/profileLib/html/functions.html deleted file mode 100644 index 4f0d3401..00000000 --- a/doc/technical/profileLib/html/functions.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - -iviLink: Class Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - - -
-
-
Here is a list of all documented class members with links to the class documentation for each member:
- -

- b -

- - -

- c -

- - -

- d -

- - -

- g -

- - -

- o -

- - -

- r -

- - -

- s -

- - -

- w -

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/functions_func.html b/doc/technical/profileLib/html/functions_func.html deleted file mode 100644 index f85ec14c..00000000 --- a/doc/technical/profileLib/html/functions_func.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - -iviLink: Class Members - Functions - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - - -
-
-  - -

- b -

- - -

- c -

- - -

- d -

- - -

- g -

- - -

- o -

- - -

- r -

- - -

- s -

- - -

- w -

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/globals.html b/doc/technical/profileLib/html/globals.html deleted file mode 100644 index f16ff6d5..00000000 --- a/doc/technical/profileLib/html/globals.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - -iviLink: File Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
Here is a list of all documented file members with links to the documentation:
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/globals_defs.html b/doc/technical/profileLib/html/globals_defs.html deleted file mode 100644 index c3baa0d9..00000000 --- a/doc/technical/profileLib/html/globals_defs.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - -iviLink: File Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/hierarchy.html b/doc/technical/profileLib/html/hierarchy.html deleted file mode 100644 index 2cc76aa3..00000000 --- a/doc/technical/profileLib/html/hierarchy.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -iviLink: Class Hierarchy - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Class Hierarchy
-
-
-
This inheritance list is sorted roughly, but not completely, alphabetically:
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/index.html b/doc/technical/profileLib/html/index.html deleted file mode 100644 index 05aabc37..00000000 --- a/doc/technical/profileLib/html/index.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - -iviLink: PROFILE LIBRARY - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- -
-
-
-
PROFILE LIBRARY
-
-
-

Profile Library is used for creating profiles and using iviLink's intercommunication functionality. Contains all header and source files needed for creating profiles and a static lib that is linked to profiles.

-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/installdox b/doc/technical/profileLib/html/installdox deleted file mode 100644 index edf5bbfe..00000000 --- a/doc/technical/profileLib/html/installdox +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/perl - -%subst = ( ); -$quiet = 0; - -while ( @ARGV ) { - $_ = shift @ARGV; - if ( s/^-// ) { - if ( /^l(.*)/ ) { - $v = ($1 eq "") ? shift @ARGV : $1; - ($v =~ /\/$/) || ($v .= "/"); - $_ = $v; - if ( /(.+)\@(.+)/ ) { - if ( exists $subst{$1} ) { - $subst{$1} = $2; - } else { - print STDERR "Unknown tag file $1 given with option -l\n"; - &usage(); - } - } else { - print STDERR "Argument $_ is invalid for option -l\n"; - &usage(); - } - } - elsif ( /^q/ ) { - $quiet = 1; - } - elsif ( /^\?|^h/ ) { - &usage(); - } - else { - print STDERR "Illegal option -$_\n"; - &usage(); - } - } - else { - push (@files, $_ ); - } -} - -foreach $sub (keys %subst) -{ - if ( $subst{$sub} eq "" ) - { - print STDERR "No substitute given for tag file `$sub'\n"; - &usage(); - } - elsif ( ! $quiet && $sub ne "_doc" && $sub ne "_cgi" ) - { - print "Substituting $subst{$sub} for each occurrence of tag file $sub\n"; - } -} - -if ( ! @files ) { - if (opendir(D,".")) { - foreach $file ( readdir(D) ) { - $match = ".html"; - next if ( $file =~ /^\.\.?$/ ); - ($file =~ /$match/) && (push @files, $file); - ($file =~ /\.svg/) && (push @files, $file); - ($file =~ "navtree.js") && (push @files, $file); - } - closedir(D); - } -} - -if ( ! @files ) { - print STDERR "Warning: No input files given and none found!\n"; -} - -foreach $f (@files) -{ - if ( ! $quiet ) { - print "Editing: $f...\n"; - } - $oldf = $f; - $f .= ".bak"; - unless (rename $oldf,$f) { - print STDERR "Error: cannot rename file $oldf\n"; - exit 1; - } - if (open(F,"<$f")) { - unless (open(G,">$oldf")) { - print STDERR "Error: opening file $oldf for writing\n"; - exit 1; - } - if ($oldf ne "tree.js") { - while () { - s/doxygen\=\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\" (xlink:href|href|src)=\"\2/doxygen\=\"$1:$subst{$1}\" \3=\"$subst{$1}/g; - print G "$_"; - } - } - else { - while () { - s/\"([^ \"\:\t\>\<]*)\:([^ \"\t\>\<]*)\", \"\2/\"$1:$subst{$1}\" ,\"$subst{$1}/g; - print G "$_"; - } - } - } - else { - print STDERR "Warning file $f does not exist\n"; - } - unlink $f; -} - -sub usage { - print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n"; - print STDERR "Options:\n"; - print STDERR " -l tagfile\@linkName tag file + URL or directory \n"; - print STDERR " -q Quiet mode\n\n"; - exit 1; -} diff --git a/doc/technical/profileLib/html/jquery.js b/doc/technical/profileLib/html/jquery.js deleted file mode 100644 index c052173a..00000000 --- a/doc/technical/profileLib/html/jquery.js +++ /dev/null @@ -1,54 +0,0 @@ -/* - * jQuery JavaScript Library v1.3.2 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) - * Revision: 6246 - */ -(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0) -{I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function() -{G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); -/* - * jQuery UI 1.7.2 - * - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://docs.jquery.com/UI - */ -jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.2",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/* * jQuery UI Resizable 1.7.2 - * - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://docs.jquery.com/UI/Resizables - * - * Depends: - * ui.core.js - */ -(function(c){c.widget("ui.resizable",c.extend({},c.ui.mouse,{_init:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('
').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f
');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.parent().append(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).end().remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement)},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return this.options.disabled||!!f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidthk.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));c.extend(c.ui.resizable,{version:"1.7.2",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000}});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),g=d.options;_store=function(h){c(h).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(g.alsoResize)=="object"&&!g.alsoResize.parentNode){if(g.alsoResize.length){g.alsoResize=g.alsoResize[0];_store(g.alsoResize)}else{c.each(g.alsoResize,function(h,i){_store(h)})}}else{_store(g.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0)) -{s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);; -/** - * jQuery.ScrollTo - Easy element scrolling using jQuery. - * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com - * Licensed under GPL license (http://www.opensource.org/licenses/gpl-license.php). - * Date: 2/8/2008 - * @author Ariel Flesler - * @version 1.3.2 - */ -;(function($){var o=$.scrollTo=function(a,b,c){o.window().scrollTo(a,b,c)};o.defaults={axis:'y',duration:1};o.window=function(){return $($.browser.safari?'body':'html')};$.fn.scrollTo=function(l,m,n){if(typeof m=='object'){n=m;m=0}n=$.extend({},o.defaults,n);m=m||n.speed||n.duration;n.queue=n.queue&&n.axis.length>1;if(n.queue)m/=2;n.offset=j(n.offset);n.over=j(n.over);return this.each(function(){var a=this,b=$(a),t=l,c,d={},w=b.is('html,body');switch(typeof t){case'number':case'string':if(/^([+-]=)?\d+(px)?$/.test(t)){t=j(t);break}t=$(t,this);case'object':if(t.is||t.style)c=(t=$(t)).offset()}$.each(n.axis.split(''),function(i,f){var P=f=='x'?'Left':'Top',p=P.toLowerCase(),k='scroll'+P,e=a[k],D=f=='x'?'Width':'Height';if(c){d[k]=c[p]+(w?0:e-b.offset()[p]);if(n.margin){d[k]-=parseInt(t.css('margin'+P))||0;d[k]-=parseInt(t.css('border'+P+'Width'))||0}d[k]+=n.offset[p]||0;if(n.over[p])d[k]+=t[D.toLowerCase()]()*n.over[p]}else d[k]=t[p];if(/^\d+$/.test(d[k]))d[k]=d[k]<=0?0:Math.min(d[k],h(D));if(!i&&n.queue){if(e!=d[k])g(n.onAfterFirst);delete d[k]}});g(n.onAfter);function g(a){b.animate(d,m,n.easing,a&&function(){a.call(this,l)})};function h(D){var b=w?$.browser.opera?document.body:document.documentElement:a;return b['scroll'+D]-b['client'+D]}})};function j(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery); - diff --git a/doc/technical/profileLib/html/namespacemembers.html b/doc/technical/profileLib/html/namespacemembers.html deleted file mode 100644 index bd308dce..00000000 --- a/doc/technical/profileLib/html/namespacemembers.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-
Here is a list of all documented namespace members with links to the namespaces they belong to:
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/namespacemembers_func.html b/doc/technical/profileLib/html/namespacemembers_func.html deleted file mode 100644 index 125f5ee0..00000000 --- a/doc/technical/profileLib/html/namespacemembers_func.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - -iviLink: Namespace Members - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - - -
-
-  -
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:17 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/namespaces.html b/doc/technical/profileLib/html/namespaces.html deleted file mode 100644 index f4209519..00000000 --- a/doc/technical/profileLib/html/namespaces.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - -iviLink: Namespace List - - - - - - - - -
-
- - - - - - -
-
iviLink
-
-
- - -
-
-
-
Namespace List
-
-
-
Here is a list of all documented namespaces with brief descriptions:
- - -
iviLink::ChannelThis namespace contains convenience methods for communication with other side (such as allocate/deallocate channel for communication and send data to the other side) and a base class for channel callbacks (such as receiving data)
iviLink::TypeTraitsTypes in this namespace are used to detect std::map-like types at compile time and select appropriate method to fill collection with data
-
- - - - -
- -
- -
Generated on Wed Aug 1 2012 17:09:16 for iviLink by  - -doxygen 1.7.4
- - diff --git a/doc/technical/profileLib/html/nav_f.png b/doc/technical/profileLib/html/nav_f.png deleted file mode 100644 index 1b07a162..00000000 Binary files a/doc/technical/profileLib/html/nav_f.png and /dev/null differ diff --git a/doc/technical/profileLib/html/nav_h.png b/doc/technical/profileLib/html/nav_h.png deleted file mode 100644 index 01f5fa6a..00000000 Binary files a/doc/technical/profileLib/html/nav_h.png and /dev/null differ diff --git a/doc/technical/profileLib/html/open.png b/doc/technical/profileLib/html/open.png deleted file mode 100644 index 7b35d2c2..00000000 Binary files a/doc/technical/profileLib/html/open.png and /dev/null differ diff --git a/doc/technical/profileLib/html/search/all_5f.html b/doc/technical/profileLib/html/search/all_5f.html deleted file mode 100644 index b7a446f9..00000000 --- a/doc/technical/profileLib/html/search/all_5f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- __two - iviLink::TypeTraits::SFINAE -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_61.html b/doc/technical/profileLib/html/search/all_61.html deleted file mode 100644 index 95535e1c..00000000 --- a/doc/technical/profileLib/html/search/all_61.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- allocateChannel - iviLink::Channel -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_62.html b/doc/technical/profileLib/html/search/all_62.html deleted file mode 100644 index fb728963..00000000 --- a/doc/technical/profileLib/html/search/all_62.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- bufferOverflowCallback - iviLink::Channel::CChannelHandler -
-
-
-
- bufferReceived - iviLink::Channel::CChannelHandler -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_63.html b/doc/technical/profileLib/html/search/all_63.html deleted file mode 100644 index 13ba2351..00000000 --- a/doc/technical/profileLib/html/search/all_63.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CBuffer - iviLink -
-
- -
-
- CBuffer.hpp -
-
-
-
- CChannelHandler - iviLink::Channel -
-
-
-
- Channel.hpp -
-
-
-
- channelDeletedCallback - iviLink::Channel::CChannelHandler -
-
-
-
- connectionLostCallback - iviLink::Channel::CChannelHandler -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_64.html b/doc/technical/profileLib/html/search/all_64.html deleted file mode 100644 index b2f61a76..00000000 --- a/doc/technical/profileLib/html/search/all_64.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- dataReceivedCallback - iviLink::Channel::CChannelHandler -
-
-
-
- deallocateChannel - iviLink::Channel -
-
-
-
- defines.hpp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_67.html b/doc/technical/profileLib/html/search/all_67.html deleted file mode 100644 index ebc20f7e..00000000 --- a/doc/technical/profileLib/html/search/all_67.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- getBuffer - iviLink::CBuffer -
-
-
-
- getReadPosition - iviLink::CBuffer -
-
-
-
- getSize - iviLink::CBuffer -
-
-
-
- getWritePosition - iviLink::CBuffer -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_68.html b/doc/technical/profileLib/html/search/all_68.html deleted file mode 100644 index a9cf901f..00000000 --- a/doc/technical/profileLib/html/search/all_68.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- has_mapped_type - iviLink::TypeTraits -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_69.html b/doc/technical/profileLib/html/search/all_69.html deleted file mode 100644 index 0bd5ba99..00000000 --- a/doc/technical/profileLib/html/search/all_69.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- Channel - iviLink -
-
- - - - - - -
-
- TypeTraits - iviLink -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_6f.html b/doc/technical/profileLib/html/search/all_6f.html deleted file mode 100644 index b6c42a9c..00000000 --- a/doc/technical/profileLib/html/search/all_6f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- operator= - iviLink::CBuffer -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_70.html b/doc/technical/profileLib/html/search/all_70.html deleted file mode 100644 index aa112361..00000000 --- a/doc/technical/profileLib/html/search/all_70.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_72.html b/doc/technical/profileLib/html/search/all_72.html deleted file mode 100644 index eadfd922..00000000 --- a/doc/technical/profileLib/html/search/all_72.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/doc/technical/profileLib/html/search/all_73.html b/doc/technical/profileLib/html/search/all_73.html deleted file mode 100644 index 886d47e5..00000000 --- a/doc/technical/profileLib/html/search/all_73.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - -
-
Loading...
- -
-
- setReadPosition - iviLink::CBuffer -
-
-
-
- setWritePosition - iviLink::CBuffer -
-
-
-
- SFINAE - iviLink::TypeTraits -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/all_77.html b/doc/technical/profileLib/html/search/all_77.html deleted file mode 100644 index efe84654..00000000 --- a/doc/technical/profileLib/html/search/all_77.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/doc/technical/profileLib/html/search/classes_5f.html b/doc/technical/profileLib/html/search/classes_5f.html deleted file mode 100644 index b7a446f9..00000000 --- a/doc/technical/profileLib/html/search/classes_5f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- __two - iviLink::TypeTraits::SFINAE -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/classes_63.html b/doc/technical/profileLib/html/search/classes_63.html deleted file mode 100644 index 213b0453..00000000 --- a/doc/technical/profileLib/html/search/classes_63.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CBuffer - iviLink -
-
-
-
- CChannelHandler - iviLink::Channel -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/classes_68.html b/doc/technical/profileLib/html/search/classes_68.html deleted file mode 100644 index a9cf901f..00000000 --- a/doc/technical/profileLib/html/search/classes_68.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- has_mapped_type - iviLink::TypeTraits -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/classes_73.html b/doc/technical/profileLib/html/search/classes_73.html deleted file mode 100644 index a0f43c2e..00000000 --- a/doc/technical/profileLib/html/search/classes_73.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- SFINAE - iviLink::TypeTraits -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/close.png b/doc/technical/profileLib/html/search/close.png deleted file mode 100644 index 9342d3df..00000000 Binary files a/doc/technical/profileLib/html/search/close.png and /dev/null differ diff --git a/doc/technical/profileLib/html/search/defines_69.html b/doc/technical/profileLib/html/search/defines_69.html deleted file mode 100644 index 0574a901..00000000 --- a/doc/technical/profileLib/html/search/defines_69.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - -
-
Loading...
- - - - - - -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/files_63.html b/doc/technical/profileLib/html/search/files_63.html deleted file mode 100644 index 4276fe78..00000000 --- a/doc/technical/profileLib/html/search/files_63.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- CBuffer.hpp -
-
-
-
- Channel.hpp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/files_64.html b/doc/technical/profileLib/html/search/files_64.html deleted file mode 100644 index c296f46c..00000000 --- a/doc/technical/profileLib/html/search/files_64.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- defines.hpp -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/files_70.html b/doc/technical/profileLib/html/search/files_70.html deleted file mode 100644 index aa112361..00000000 --- a/doc/technical/profileLib/html/search/files_70.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - -
-
Loading...
- -
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_61.html b/doc/technical/profileLib/html/search/functions_61.html deleted file mode 100644 index 95535e1c..00000000 --- a/doc/technical/profileLib/html/search/functions_61.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- allocateChannel - iviLink::Channel -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_62.html b/doc/technical/profileLib/html/search/functions_62.html deleted file mode 100644 index fb728963..00000000 --- a/doc/technical/profileLib/html/search/functions_62.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- bufferOverflowCallback - iviLink::Channel::CChannelHandler -
-
-
-
- bufferReceived - iviLink::Channel::CChannelHandler -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_63.html b/doc/technical/profileLib/html/search/functions_63.html deleted file mode 100644 index d0b02ce8..00000000 --- a/doc/technical/profileLib/html/search/functions_63.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - -
-
Loading...
- -
-
- channelDeletedCallback - iviLink::Channel::CChannelHandler -
-
-
-
- connectionLostCallback - iviLink::Channel::CChannelHandler -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_64.html b/doc/technical/profileLib/html/search/functions_64.html deleted file mode 100644 index 0e1008ea..00000000 --- a/doc/technical/profileLib/html/search/functions_64.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- dataReceivedCallback - iviLink::Channel::CChannelHandler -
-
-
-
- deallocateChannel - iviLink::Channel -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_67.html b/doc/technical/profileLib/html/search/functions_67.html deleted file mode 100644 index ebc20f7e..00000000 --- a/doc/technical/profileLib/html/search/functions_67.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- getBuffer - iviLink::CBuffer -
-
-
-
- getReadPosition - iviLink::CBuffer -
-
-
-
- getSize - iviLink::CBuffer -
-
-
-
- getWritePosition - iviLink::CBuffer -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_6f.html b/doc/technical/profileLib/html/search/functions_6f.html deleted file mode 100644 index b6c42a9c..00000000 --- a/doc/technical/profileLib/html/search/functions_6f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- operator= - iviLink::CBuffer -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_72.html b/doc/technical/profileLib/html/search/functions_72.html deleted file mode 100644 index eadfd922..00000000 --- a/doc/technical/profileLib/html/search/functions_72.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/doc/technical/profileLib/html/search/functions_73.html b/doc/technical/profileLib/html/search/functions_73.html deleted file mode 100644 index 51953532..00000000 --- a/doc/technical/profileLib/html/search/functions_73.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - -
-
Loading...
- -
-
- setReadPosition - iviLink::CBuffer -
-
-
-
- setWritePosition - iviLink::CBuffer -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/functions_77.html b/doc/technical/profileLib/html/search/functions_77.html deleted file mode 100644 index efe84654..00000000 --- a/doc/technical/profileLib/html/search/functions_77.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/doc/technical/profileLib/html/search/mag_sel.png b/doc/technical/profileLib/html/search/mag_sel.png deleted file mode 100644 index 81f6040a..00000000 Binary files a/doc/technical/profileLib/html/search/mag_sel.png and /dev/null differ diff --git a/doc/technical/profileLib/html/search/namespaces_69.html b/doc/technical/profileLib/html/search/namespaces_69.html deleted file mode 100644 index 4bb8f65c..00000000 --- a/doc/technical/profileLib/html/search/namespaces_69.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -
-
Loading...
-
-
- Channel - iviLink -
-
-
-
- TypeTraits - iviLink -
-
-
Searching...
-
No Matches
- -
- - diff --git a/doc/technical/profileLib/html/search/nomatches.html b/doc/technical/profileLib/html/search/nomatches.html deleted file mode 100644 index b1ded27e..00000000 --- a/doc/technical/profileLib/html/search/nomatches.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -
-
No Matches
-
- - diff --git a/doc/technical/profileLib/html/search/search.css b/doc/technical/profileLib/html/search/search.css deleted file mode 100644 index 50249e56..00000000 --- a/doc/technical/profileLib/html/search/search.css +++ /dev/null @@ -1,240 +0,0 @@ -/*---------------- Search Box */ - -#FSearchBox { - float: left; -} - -#searchli { - float: right; - display: block; - width: 170px; - height: 36px; -} - -#MSearchBox { - white-space : nowrap; - position: absolute; - float: none; - display: inline; - margin-top: 8px; - right: 0px; - width: 170px; - z-index: 102; -} - -#MSearchBox .left -{ - display:block; - position:absolute; - left:10px; - width:20px; - height:19px; - background:url('search_l.png') no-repeat; - background-position:right; -} - -#MSearchSelect { - display:block; - position:absolute; - width:20px; - height:19px; -} - -.left #MSearchSelect { - left:4px; -} - -.right #MSearchSelect { - right:5px; -} - -#MSearchField { - display:block; - position:absolute; - height:19px; - background:url('search_m.png') repeat-x; - border:none; - width:116px; - margin-left:20px; - padding-left:4px; - color: #909090; - outline: none; - font: 9pt Arial, Verdana, sans-serif; -} - -#FSearchBox #MSearchField { - margin-left:15px; -} - -#MSearchBox .right { - display:block; - position:absolute; - right:10px; - top:0px; - width:20px; - height:19px; - background:url('search_r.png') no-repeat; - background-position:left; -} - -#MSearchClose { - display: none; - position: absolute; - top: 4px; - background : none; - border: none; - margin: 0px 4px 0px 0px; - padding: 0px 0px; - outline: none; -} - -.left #MSearchClose { - left: 6px; -} - -.right #MSearchClose { - right: 2px; -} - -.MSearchBoxActive #MSearchField { - color: #000000; -} - -/*---------------- Search filter selection */ - -#MSearchSelectWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #90A5CE; - background-color: #F9FAFC; - z-index: 1; - padding-top: 4px; - padding-bottom: 4px; - -moz-border-radius: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); -} - -.SelectItem { - font: 8pt Arial, Verdana, sans-serif; - padding-left: 2px; - padding-right: 12px; - border: 0px; -} - -span.SelectionMark { - margin-right: 4px; - font-family: monospace; - outline-style: none; - text-decoration: none; -} - -a.SelectItem { - display: block; - outline-style: none; - color: #000000; - text-decoration: none; - padding-left: 6px; - padding-right: 12px; -} - -a.SelectItem:focus, -a.SelectItem:active { - color: #000000; - outline-style: none; - text-decoration: none; -} - -a.SelectItem:hover { - color: #FFFFFF; - background-color: #3D578C; - outline-style: none; - text-decoration: none; - cursor: pointer; - display: block; -} - -/*---------------- Search results window */ - -iframe#MSearchResults { - width: 60ex; - height: 15em; -} - -#MSearchResultsWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #000; - background-color: #EEF1F7; -} - -/* ----------------------------------- */ - - -#SRIndex { - clear:both; - padding-bottom: 15px; -} - -.SREntry { - font-size: 10pt; - padding-left: 1ex; -} - -.SRPage .SREntry { - font-size: 8pt; - padding: 1px 5px; -} - -body.SRPage { - margin: 5px 2px; -} - -.SRChildren { - padding-left: 3ex; padding-bottom: .5em -} - -.SRPage .SRChildren { - display: none; -} - -.SRSymbol { - font-weight: bold; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRScope { - display: block; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRSymbol:focus, a.SRSymbol:active, -a.SRScope:focus, a.SRScope:active { - text-decoration: underline; -} - -.SRPage .SRStatus { - padding: 2px 5px; - font-size: 8pt; - font-style: italic; -} - -.SRResult { - display: none; -} - -DIV.searchresults { - margin-left: 10px; - margin-right: 10px; -} diff --git a/doc/technical/profileLib/html/search/search.js b/doc/technical/profileLib/html/search/search.js deleted file mode 100644 index 58d4cb3f..00000000 --- a/doc/technical/profileLib/html/search/search.js +++ /dev/null @@ -1,736 +0,0 @@ -// Search script generated by doxygen -// Copyright (C) 2009 by Dimitri van Heesch. - -// The code in this file is loosly based on main.js, part of Natural Docs, -// which is Copyright (C) 2003-2008 Greg Valure -// Natural Docs is licensed under the GPL. - -var indexSectionsWithContent = -{ - 0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010111100111000001101100010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 1: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001000010000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111100100000001001100010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -}; - -var indexSectionNames = -{ - 0: "all", - 1: "classes", - 2: "namespaces", - 3: "files", - 4: "functions", - 5: "defines" -}; - -function convertToId(search) -{ - var result = ''; - for (i=0;i do a search - { - this.Search(); - } - } - - this.OnSearchSelectKey = function(evt) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==40 && this.searchIndex0) // Up - { - this.searchIndex--; - this.OnSelectItem(this.searchIndex); - } - else if (e.keyCode==13 || e.keyCode==27) - { - this.OnSelectItem(this.searchIndex); - this.CloseSelectionWindow(); - this.DOMSearchField().focus(); - } - return false; - } - - // --------- Actions - - // Closes the results window. - this.CloseResultsWindow = function() - { - this.DOMPopupSearchResultsWindow().style.display = 'none'; - this.DOMSearchClose().style.display = 'none'; - this.Activate(false); - } - - this.CloseSelectionWindow = function() - { - this.DOMSearchSelectWindow().style.display = 'none'; - } - - // Performs a search. - this.Search = function() - { - this.keyTimeout = 0; - - // strip leading whitespace - var searchValue = this.DOMSearchField().value.replace(/^ +/, ""); - - var code = searchValue.toLowerCase().charCodeAt(0); - var hexCode; - if (code<16) - { - hexCode="0"+code.toString(16); - } - else - { - hexCode=code.toString(16); - } - - var resultsPage; - var resultsPageWithSearch; - var hasResultsPage; - - if (indexSectionsWithContent[this.searchIndex].charAt(code) == '1') - { - resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html'; - resultsPageWithSearch = resultsPage+'?'+escape(searchValue); - hasResultsPage = true; - } - else // nothing available for this search term - { - resultsPage = this.resultsPath + '/nomatches.html'; - resultsPageWithSearch = resultsPage; - hasResultsPage = false; - } - - window.frames.MSearchResults.location.href = resultsPageWithSearch; - var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow(); - - if (domPopupSearchResultsWindow.style.display!='block') - { - var domSearchBox = this.DOMSearchBox(); - this.DOMSearchClose().style.display = 'inline'; - if (this.insideFrame) - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - domPopupSearchResultsWindow.style.position = 'relative'; - domPopupSearchResultsWindow.style.display = 'block'; - var width = document.body.clientWidth - 8; // the -8 is for IE :-( - domPopupSearchResultsWindow.style.width = width + 'px'; - domPopupSearchResults.style.width = width + 'px'; - } - else - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth; - var top = getYPos(domSearchBox) + 20; // domSearchBox.offsetHeight + 1; - domPopupSearchResultsWindow.style.display = 'block'; - left -= domPopupSearchResults.offsetWidth; - domPopupSearchResultsWindow.style.top = top + 'px'; - domPopupSearchResultsWindow.style.left = left + 'px'; - } - } - - this.lastSearchValue = searchValue; - this.lastResultsPage = resultsPage; - } - - // -------- Activation Functions - - // Activates or deactivates the search panel, resetting things to - // their default values if necessary. - this.Activate = function(isActive) - { - if (isActive || // open it - this.DOMPopupSearchResultsWindow().style.display == 'block' - ) - { - this.DOMSearchBox().className = 'MSearchBoxActive'; - - var searchField = this.DOMSearchField(); - - if (searchField.value == this.searchLabel) // clear "Search" term upon entry - { - searchField.value = ''; - this.searchActive = true; - } - } - else if (!isActive) // directly remove the panel - { - this.DOMSearchBox().className = 'MSearchBoxInactive'; - this.DOMSearchField().value = this.searchLabel; - this.searchActive = false; - this.lastSearchValue = '' - this.lastResultsPage = ''; - } - } -} - -// ----------------------------------------------------------------------- - -// The class that handles everything on the search results page. -function SearchResults(name) -{ - // The number of matches from the last run of . - this.lastMatchCount = 0; - this.lastKey = 0; - this.repeatOn = false; - - // Toggles the visibility of the passed element ID. - this.FindChildElement = function(id) - { - var parentElement = document.getElementById(id); - var element = parentElement.firstChild; - - while (element && element!=parentElement) - { - if (element.nodeName == 'DIV' && element.className == 'SRChildren') - { - return element; - } - - if (element.nodeName == 'DIV' && element.hasChildNodes()) - { - element = element.firstChild; - } - else if (element.nextSibling) - { - element = element.nextSibling; - } - else - { - do - { - element = element.parentNode; - } - while (element && element!=parentElement && !element.nextSibling); - - if (element && element!=parentElement) - { - element = element.nextSibling; - } - } - } - } - - this.Toggle = function(id) - { - var element = this.FindChildElement(id); - if (element) - { - if (element.style.display == 'block') - { - element.style.display = 'none'; - } - else - { - element.style.display = 'block'; - } - } - } - - // Searches for the passed string. If there is no parameter, - // it takes it from the URL query. - // - // Always returns true, since other documents may try to call it - // and that may or may not be possible. - this.Search = function(search) - { - if (!search) // get search word from URL - { - search = window.location.search; - search = search.substring(1); // Remove the leading '?' - search = unescape(search); - } - - search = search.replace(/^ +/, ""); // strip leading spaces - search = search.replace(/ +$/, ""); // strip trailing spaces - search = search.toLowerCase(); - search = convertToId(search); - - var resultRows = document.getElementsByTagName("div"); - var matches = 0; - - var i = 0; - while (i < resultRows.length) - { - var row = resultRows.item(i); - if (row.className == "SRResult") - { - var rowMatchName = row.id.toLowerCase(); - rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_' - - if (search.length<=rowMatchName.length && - rowMatchName.substr(0, search.length)==search) - { - row.style.display = 'block'; - matches++; - } - else - { - row.style.display = 'none'; - } - } - i++; - } - document.getElementById("Searching").style.display='none'; - if (matches == 0) // no results - { - document.getElementById("NoMatches").style.display='block'; - } - else // at least one result - { - document.getElementById("NoMatches").style.display='none'; - } - this.lastMatchCount = matches; - return true; - } - - // return the first item with index index or higher that is visible - this.NavNext = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index++; - } - return focusItem; - } - - this.NavPrev = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index--; - } - return focusItem; - } - - this.ProcessKeys = function(e) - { - if (e.type == "keydown") - { - this.repeatOn = false; - this.lastKey = e.keyCode; - } - else if (e.type == "keypress") - { - if (!this.repeatOn) - { - if (this.lastKey) this.repeatOn = true; - return false; // ignore first keypress after keydown - } - } - else if (e.type == "keyup") - { - this.lastKey = 0; - this.repeatOn = false; - } - return this.lastKey!=0; - } - - this.Nav = function(evt,itemIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - var newIndex = itemIndex-1; - var focusItem = this.NavPrev(newIndex); - if (focusItem) - { - var child = this.FindChildElement(focusItem.parentNode.parentNode.id); - if (child && child.style.display == 'block') // children visible - { - var n=0; - var tmpElem; - while (1) // search for last child - { - tmpElem = document.getElementById('Item'+newIndex+'_c'+n); - if (tmpElem) - { - focusItem = tmpElem; - } - else // found it! - { - break; - } - n++; - } - } - } - if (focusItem) - { - focusItem.focus(); - } - else // return focus to search field - { - parent.document.getElementById("MSearchField").focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = itemIndex+1; - var focusItem; - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem && elem.style.display == 'block') // children visible - { - focusItem = document.getElementById('Item'+itemIndex+'_c0'); - } - if (!focusItem) focusItem = this.NavNext(newIndex); - if (focusItem) focusItem.focus(); - } - else if (this.lastKey==39) // Right - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'block'; - } - else if (this.lastKey==37) // Left - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'none'; - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } - - this.NavChild = function(evt,itemIndex,childIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - if (childIndex>0) - { - var newIndex = childIndex-1; - document.getElementById('Item'+itemIndex+'_c'+newIndex).focus(); - } - else // already at first child, jump to parent - { - document.getElementById('Item'+itemIndex).focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = childIndex+1; - var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex); - if (!elem) // last child, jump to parent next parent - { - elem = this.NavNext(itemIndex+1); - } - if (elem) - { - elem.focus(); - } - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } -} diff --git a/doc/technical/profileLib/html/search/search_l.png b/doc/technical/profileLib/html/search/search_l.png deleted file mode 100644 index c872f4da..00000000 Binary files a/doc/technical/profileLib/html/search/search_l.png and /dev/null differ diff --git a/doc/technical/profileLib/html/search/search_m.png b/doc/technical/profileLib/html/search/search_m.png deleted file mode 100644 index b429a16b..00000000 Binary files a/doc/technical/profileLib/html/search/search_m.png and /dev/null differ diff --git a/doc/technical/profileLib/html/search/search_r.png b/doc/technical/profileLib/html/search/search_r.png deleted file mode 100644 index 97ee8b43..00000000 Binary files a/doc/technical/profileLib/html/search/search_r.png and /dev/null differ diff --git a/doc/technical/profileLib/html/tab_a.png b/doc/technical/profileLib/html/tab_a.png deleted file mode 100644 index 2d99ef23..00000000 Binary files a/doc/technical/profileLib/html/tab_a.png and /dev/null differ diff --git a/doc/technical/profileLib/html/tab_b.png b/doc/technical/profileLib/html/tab_b.png deleted file mode 100644 index b2c3d2be..00000000 Binary files a/doc/technical/profileLib/html/tab_b.png and /dev/null differ diff --git a/doc/technical/profileLib/html/tab_h.png b/doc/technical/profileLib/html/tab_h.png deleted file mode 100644 index c11f48f1..00000000 Binary files a/doc/technical/profileLib/html/tab_h.png and /dev/null differ diff --git a/doc/technical/profileLib/html/tab_s.png b/doc/technical/profileLib/html/tab_s.png deleted file mode 100644 index 978943ac..00000000 Binary files a/doc/technical/profileLib/html/tab_s.png and /dev/null differ diff --git a/doc/technical/profileLib/html/tabs.css b/doc/technical/profileLib/html/tabs.css deleted file mode 100644 index 21920562..00000000 --- a/doc/technical/profileLib/html/tabs.css +++ /dev/null @@ -1,59 +0,0 @@ -.tabs, .tabs2, .tabs3 { - background-image: url('tab_b.png'); - width: 100%; - z-index: 101; - font-size: 13px; -} - -.tabs2 { - font-size: 10px; -} -.tabs3 { - font-size: 9px; -} - -.tablist { - margin: 0; - padding: 0; - display: table; -} - -.tablist li { - float: left; - display: table-cell; - background-image: url('tab_b.png'); - line-height: 36px; - list-style: none; -} - -.tablist a { - display: block; - padding: 0 20px; - font-weight: bold; - background-image:url('tab_s.png'); - background-repeat:no-repeat; - background-position:right; - color: #283A5D; - text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - text-decoration: none; - outline: none; -} - -.tabs3 .tablist a { - padding: 0 10px; -} - -.tablist a:hover { - background-image: url('tab_h.png'); - background-repeat:repeat-x; - color: #fff; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); - text-decoration: none; -} - -.tablist li.current a { - background-image: url('tab_a.png'); - background-repeat:repeat-x; - color: #fff; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); -} diff --git a/src/framework/LICENSE.txt b/framework/LICENSE.txt similarity index 100% rename from src/framework/LICENSE.txt rename to framework/LICENSE.txt diff --git a/src/framework/Makefile b/framework/Makefile similarity index 100% rename from src/framework/Makefile rename to framework/Makefile diff --git a/src/framework/components/AppMan/Makefile b/framework/components/AppMan/Makefile similarity index 100% rename from src/framework/components/AppMan/Makefile rename to framework/components/AppMan/Makefile diff --git a/src/framework/components/AppMan/controller/CController.hpp b/framework/components/AppMan/controller/CController.hpp similarity index 100% rename from src/framework/components/AppMan/controller/CController.hpp rename to framework/components/AppMan/controller/CController.hpp diff --git a/src/framework/components/AppMan/controller/Makefile b/framework/components/AppMan/controller/Makefile similarity index 100% rename from src/framework/components/AppMan/controller/Makefile rename to framework/components/AppMan/controller/Makefile diff --git a/src/framework/components/AppMan/controller/private/CController.cpp b/framework/components/AppMan/controller/private/CController.cpp similarity index 100% rename from src/framework/components/AppMan/controller/private/CController.cpp rename to framework/components/AppMan/controller/private/CController.cpp diff --git a/src/framework/components/AppMan/database/CApplication.hpp b/framework/components/AppMan/database/CApplication.hpp similarity index 100% rename from src/framework/components/AppMan/database/CApplication.hpp rename to framework/components/AppMan/database/CApplication.hpp diff --git a/src/framework/components/AppMan/database/CDatabase.hpp b/framework/components/AppMan/database/CDatabase.hpp similarity index 100% rename from src/framework/components/AppMan/database/CDatabase.hpp rename to framework/components/AppMan/database/CDatabase.hpp diff --git a/src/framework/components/AppMan/database/IDatabase.hpp b/framework/components/AppMan/database/IDatabase.hpp similarity index 100% rename from src/framework/components/AppMan/database/IDatabase.hpp rename to framework/components/AppMan/database/IDatabase.hpp diff --git a/src/framework/components/AppMan/database/Makefile b/framework/components/AppMan/database/Makefile similarity index 100% rename from src/framework/components/AppMan/database/Makefile rename to framework/components/AppMan/database/Makefile diff --git a/src/framework/components/AppMan/database/private/CApplication.cpp b/framework/components/AppMan/database/private/CApplication.cpp similarity index 100% rename from src/framework/components/AppMan/database/private/CApplication.cpp rename to framework/components/AppMan/database/private/CApplication.cpp diff --git a/src/framework/components/AppMan/database/private/CDatabase.cpp b/framework/components/AppMan/database/private/CDatabase.cpp similarity index 100% rename from src/framework/components/AppMan/database/private/CDatabase.cpp rename to framework/components/AppMan/database/private/CDatabase.cpp diff --git a/src/framework/components/AppMan/launcher/CLauncher.hpp b/framework/components/AppMan/launcher/CLauncher.hpp similarity index 100% rename from src/framework/components/AppMan/launcher/CLauncher.hpp rename to framework/components/AppMan/launcher/CLauncher.hpp diff --git a/src/framework/components/AppMan/launcher/ILauncher.hpp b/framework/components/AppMan/launcher/ILauncher.hpp similarity index 100% rename from src/framework/components/AppMan/launcher/ILauncher.hpp rename to framework/components/AppMan/launcher/ILauncher.hpp diff --git a/src/framework/components/AppMan/launcher/ILauncherHandler.hpp b/framework/components/AppMan/launcher/ILauncherHandler.hpp similarity index 100% rename from src/framework/components/AppMan/launcher/ILauncherHandler.hpp rename to framework/components/AppMan/launcher/ILauncherHandler.hpp diff --git a/src/framework/components/AppMan/launcher/Makefile b/framework/components/AppMan/launcher/Makefile similarity index 100% rename from src/framework/components/AppMan/launcher/Makefile rename to framework/components/AppMan/launcher/Makefile diff --git a/src/framework/components/AppMan/launcher/private/CLauncher.cpp b/framework/components/AppMan/launcher/private/CLauncher.cpp similarity index 100% rename from src/framework/components/AppMan/launcher/private/CLauncher.cpp rename to framework/components/AppMan/launcher/private/CLauncher.cpp diff --git a/src/framework/components/AppMan/process/Makefile b/framework/components/AppMan/process/Makefile similarity index 100% rename from src/framework/components/AppMan/process/Makefile rename to framework/components/AppMan/process/Makefile diff --git a/src/framework/components/AppMan/process/SystemControllerMsg.cpp b/framework/components/AppMan/process/SystemControllerMsg.cpp similarity index 100% rename from src/framework/components/AppMan/process/SystemControllerMsg.cpp rename to framework/components/AppMan/process/SystemControllerMsg.cpp diff --git a/src/framework/components/AppMan/process/SystemControllerMsg.hpp b/framework/components/AppMan/process/SystemControllerMsg.hpp similarity index 100% rename from src/framework/components/AppMan/process/SystemControllerMsg.hpp rename to framework/components/AppMan/process/SystemControllerMsg.hpp diff --git a/src/framework/components/AppMan/process/main.cpp b/framework/components/AppMan/process/main.cpp similarity index 100% rename from src/framework/components/AppMan/process/main.cpp rename to framework/components/AppMan/process/main.cpp diff --git a/src/framework/components/AppMan/requestHandler/CAppComThread.hpp b/framework/components/AppMan/requestHandler/CAppComThread.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/CAppComThread.hpp rename to framework/components/AppMan/requestHandler/CAppComThread.hpp diff --git a/src/framework/components/AppMan/requestHandler/CLaunchThread.hpp b/framework/components/AppMan/requestHandler/CLaunchThread.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/CLaunchThread.hpp rename to framework/components/AppMan/requestHandler/CLaunchThread.hpp diff --git a/src/framework/components/AppMan/requestHandler/CRequestHandler.hpp b/framework/components/AppMan/requestHandler/CRequestHandler.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/CRequestHandler.hpp rename to framework/components/AppMan/requestHandler/CRequestHandler.hpp diff --git a/src/framework/components/AppMan/requestHandler/CRunApp.hpp b/framework/components/AppMan/requestHandler/CRunApp.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/CRunApp.hpp rename to framework/components/AppMan/requestHandler/CRunApp.hpp diff --git a/src/framework/components/AppMan/requestHandler/IAppComThread.hpp b/framework/components/AppMan/requestHandler/IAppComThread.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/IAppComThread.hpp rename to framework/components/AppMan/requestHandler/IAppComThread.hpp diff --git a/src/framework/components/AppMan/requestHandler/ILaunchThread.hpp b/framework/components/AppMan/requestHandler/ILaunchThread.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/ILaunchThread.hpp rename to framework/components/AppMan/requestHandler/ILaunchThread.hpp diff --git a/src/framework/components/AppMan/requestHandler/IReqHandlerForAppCom.hpp b/framework/components/AppMan/requestHandler/IReqHandlerForAppCom.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/IReqHandlerForAppCom.hpp rename to framework/components/AppMan/requestHandler/IReqHandlerForAppCom.hpp diff --git a/src/framework/components/AppMan/requestHandler/IReqHandlerForLaunch.hpp b/framework/components/AppMan/requestHandler/IReqHandlerForLaunch.hpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/IReqHandlerForLaunch.hpp rename to framework/components/AppMan/requestHandler/IReqHandlerForLaunch.hpp diff --git a/src/framework/components/AppMan/requestHandler/Makefile b/framework/components/AppMan/requestHandler/Makefile similarity index 100% rename from src/framework/components/AppMan/requestHandler/Makefile rename to framework/components/AppMan/requestHandler/Makefile diff --git a/src/framework/components/AppMan/requestHandler/private/CAppComThread.cpp b/framework/components/AppMan/requestHandler/private/CAppComThread.cpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/private/CAppComThread.cpp rename to framework/components/AppMan/requestHandler/private/CAppComThread.cpp diff --git a/src/framework/components/AppMan/requestHandler/private/CLaunchThread.cpp b/framework/components/AppMan/requestHandler/private/CLaunchThread.cpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/private/CLaunchThread.cpp rename to framework/components/AppMan/requestHandler/private/CLaunchThread.cpp diff --git a/src/framework/components/AppMan/requestHandler/private/CRequestHandler.cpp b/framework/components/AppMan/requestHandler/private/CRequestHandler.cpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/private/CRequestHandler.cpp rename to framework/components/AppMan/requestHandler/private/CRequestHandler.cpp diff --git a/src/framework/components/AppMan/requestHandler/private/CRunApp.cpp b/framework/components/AppMan/requestHandler/private/CRunApp.cpp similarity index 100% rename from src/framework/components/AppMan/requestHandler/private/CRunApp.cpp rename to framework/components/AppMan/requestHandler/private/CRunApp.cpp diff --git a/src/framework/components/ChannelSupervisor/ChannelLib/Makefile b/framework/components/ChannelSupervisor/ChannelLib/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/ChannelLib/Makefile rename to framework/components/ChannelSupervisor/ChannelLib/Makefile diff --git a/src/framework/components/ChannelSupervisor/Makefile b/framework/components/ChannelSupervisor/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/Makefile rename to framework/components/ChannelSupervisor/Makefile diff --git a/src/framework/components/ChannelSupervisor/Map/Makefile b/framework/components/ChannelSupervisor/Map/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/Map/Makefile rename to framework/components/ChannelSupervisor/Map/Makefile diff --git a/src/framework/components/ChannelSupervisor/Map/Map.hpp b/framework/components/ChannelSupervisor/Map/Map.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Map/Map.hpp rename to framework/components/ChannelSupervisor/Map/Map.hpp diff --git a/src/framework/components/ChannelSupervisor/Map/private/Map.cpp b/framework/components/ChannelSupervisor/Map/private/Map.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Map/private/Map.cpp rename to framework/components/ChannelSupervisor/Map/private/Map.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorClient/Makefile b/framework/components/ChannelSupervisor/NegotiatorClient/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorClient/Makefile rename to framework/components/ChannelSupervisor/NegotiatorClient/Makefile diff --git a/src/framework/components/ChannelSupervisor/NegotiatorClient/NegotiatorClient.hpp b/framework/components/ChannelSupervisor/NegotiatorClient/NegotiatorClient.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorClient/NegotiatorClient.hpp rename to framework/components/ChannelSupervisor/NegotiatorClient/NegotiatorClient.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorClient/private/NegotiatorClient.cpp b/framework/components/ChannelSupervisor/NegotiatorClient/private/NegotiatorClient.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorClient/private/NegotiatorClient.cpp rename to framework/components/ChannelSupervisor/NegotiatorClient/private/NegotiatorClient.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/Makefile b/framework/components/ChannelSupervisor/NegotiatorProcess/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/Makefile rename to framework/components/ChannelSupervisor/NegotiatorProcess/Makefile diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/NegotiatorIPCHandler.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/NegotiatorIPCHandler.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/NegotiatorIPCHandler.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/NegotiatorIPCHandler.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/CNegotiatorToSysCtrlProxy.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/Negotiator.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorIPCHandler.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorIPCHandler.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorIPCHandler.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorIPCHandler.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorProcess.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorStates.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.cpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.cpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.cpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/NegotiatorTube.hpp diff --git a/src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Queue.hpp b/framework/components/ChannelSupervisor/NegotiatorProcess/private/Queue.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/NegotiatorProcess/private/Queue.hpp rename to framework/components/ChannelSupervisor/NegotiatorProcess/private/Queue.hpp diff --git a/src/framework/components/ChannelSupervisor/Tube/ChannelSupervisorTube.hpp b/framework/components/ChannelSupervisor/Tube/ChannelSupervisorTube.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Tube/ChannelSupervisorTube.hpp rename to framework/components/ChannelSupervisor/Tube/ChannelSupervisorTube.hpp diff --git a/src/framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp b/framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp rename to framework/components/ChannelSupervisor/Tube/IChannelSupervisorObserver.hpp diff --git a/src/framework/components/ChannelSupervisor/Tube/Makefile b/framework/components/ChannelSupervisor/Tube/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/Tube/Makefile rename to framework/components/ChannelSupervisor/Tube/Makefile diff --git a/src/framework/components/ChannelSupervisor/Tube/private/ChannelObserver.hpp b/framework/components/ChannelSupervisor/Tube/private/ChannelObserver.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Tube/private/ChannelObserver.hpp rename to framework/components/ChannelSupervisor/Tube/private/ChannelObserver.hpp diff --git a/src/framework/components/ChannelSupervisor/Tube/private/ChannelSupervisorTube.cpp b/framework/components/ChannelSupervisor/Tube/private/ChannelSupervisorTube.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/Tube/private/ChannelSupervisorTube.cpp rename to framework/components/ChannelSupervisor/Tube/private/ChannelSupervisorTube.cpp diff --git a/src/framework/components/ChannelSupervisor/common/CSError.hpp b/framework/components/ChannelSupervisor/common/CSError.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/CSError.hpp rename to framework/components/ChannelSupervisor/common/CSError.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Common.hpp b/framework/components/ChannelSupervisor/common/Common.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Common.hpp rename to framework/components/ChannelSupervisor/common/Common.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Makefile b/framework/components/ChannelSupervisor/common/Makefile similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Makefile rename to framework/components/ChannelSupervisor/common/Makefile diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.cpp b/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.cpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.hpp b/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.hpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateChannelRequest.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateChannelResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.cpp b/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.cpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateNotification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.hpp b/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateNotification.hpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateNotification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.cpp b/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.cpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateRequest.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.hpp b/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateRequest.hpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateRequest.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/AllocateResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/AllocateResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.cpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.cpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.hpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.hpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocDoneRequest.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocDoneResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.cpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.cpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.hpp b/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.hpp rename to framework/components/ChannelSupervisor/common/Messages/CAAllocationNotification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/CommandRejectResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/CommandTimeoutResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.cpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.cpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.hpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.hpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateChannelRequest.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateChannelResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.cpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.cpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.hpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.hpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateNotification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.cpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.cpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.hpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.hpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateRequest.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.cpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.cpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.hpp b/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.hpp rename to framework/components/ChannelSupervisor/common/Messages/DeallocateResponse.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/ErrorCode.hpp b/framework/components/ChannelSupervisor/common/Messages/ErrorCode.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/ErrorCode.hpp rename to framework/components/ChannelSupervisor/common/Messages/ErrorCode.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.cpp b/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.cpp rename to framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.hpp b/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.hpp rename to framework/components/ChannelSupervisor/common/Messages/MapCheckNotification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Message.cpp b/framework/components/ChannelSupervisor/common/Messages/Message.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Message.cpp rename to framework/components/ChannelSupervisor/common/Messages/Message.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Message.hpp b/framework/components/ChannelSupervisor/common/Messages/Message.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Message.hpp rename to framework/components/ChannelSupervisor/common/Messages/Message.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/NegotiatorMessage.hpp b/framework/components/ChannelSupervisor/common/Messages/NegotiatorMessage.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/NegotiatorMessage.hpp rename to framework/components/ChannelSupervisor/common/Messages/NegotiatorMessage.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Notification.cpp b/framework/components/ChannelSupervisor/common/Messages/Notification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Notification.cpp rename to framework/components/ChannelSupervisor/common/Messages/Notification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Notification.hpp b/framework/components/ChannelSupervisor/common/Messages/Notification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Notification.hpp rename to framework/components/ChannelSupervisor/common/Messages/Notification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Request.cpp b/framework/components/ChannelSupervisor/common/Messages/Request.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Request.cpp rename to framework/components/ChannelSupervisor/common/Messages/Request.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Request.hpp b/framework/components/ChannelSupervisor/common/Messages/Request.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Request.hpp rename to framework/components/ChannelSupervisor/common/Messages/Request.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Response.cpp b/framework/components/ChannelSupervisor/common/Messages/Response.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Response.cpp rename to framework/components/ChannelSupervisor/common/Messages/Response.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/Response.hpp b/framework/components/ChannelSupervisor/common/Messages/Response.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/Response.hpp rename to framework/components/ChannelSupervisor/common/Messages/Response.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.cpp b/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.cpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.cpp rename to framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.cpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.hpp b/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.hpp rename to framework/components/ChannelSupervisor/common/Messages/UpdateMapNotification.hpp diff --git a/src/framework/components/ChannelSupervisor/common/Messages/pugiconfig.hpp b/framework/components/ChannelSupervisor/common/Messages/pugiconfig.hpp similarity index 100% rename from src/framework/components/ChannelSupervisor/common/Messages/pugiconfig.hpp rename to framework/components/ChannelSupervisor/common/Messages/pugiconfig.hpp diff --git a/src/framework/components/ConnectivityAgent/Makefile b/framework/components/ConnectivityAgent/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/Makefile rename to framework/components/ConnectivityAgent/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/Android.mk b/framework/components/ConnectivityAgent/generic/HAL/Android.mk similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/Android.mk rename to framework/components/ConnectivityAgent/generic/HAL/Android.mk diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/CCarrierAdapter.hpp b/framework/components/ConnectivityAgent/generic/HAL/CCarrierAdapter.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/CCarrierAdapter.hpp rename to framework/components/ConnectivityAgent/generic/HAL/CCarrierAdapter.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/CConnectivityAgent.hpp b/framework/components/ConnectivityAgent/generic/HAL/CConnectivityAgent.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/CConnectivityAgent.hpp rename to framework/components/ConnectivityAgent/generic/HAL/CConnectivityAgent.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/EGenderType.hpp b/framework/components/ConnectivityAgent/generic/HAL/EGenderType.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/EGenderType.hpp rename to framework/components/ConnectivityAgent/generic/HAL/EGenderType.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/Frame.hpp b/framework/components/ConnectivityAgent/generic/HAL/Frame.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/Frame.hpp rename to framework/components/ConnectivityAgent/generic/HAL/Frame.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/IFoundConnectionHandler.hpp b/framework/components/ConnectivityAgent/generic/HAL/IFoundConnectionHandler.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/IFoundConnectionHandler.hpp rename to framework/components/ConnectivityAgent/generic/HAL/IFoundConnectionHandler.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/Makefile b/framework/components/ConnectivityAgent/generic/HAL/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/Makefile rename to framework/components/ConnectivityAgent/generic/HAL/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CAdapterFactory.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CCarrierAdapter.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CCarrierAdapter.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CCarrierAdapter.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CCarrierAdapter.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CConnectionFinder.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectivityAgent.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CConnectivityAgent.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CConnectivityAgent.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CConnectivityAgent.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CDummyConnectionFinder.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CNetlinkSocket.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CTcpAutoConnectionFinder.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CTcpCarrierAdapter.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpConnectionFinder.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/CTcpConnectionFinder.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/CTcpConnectionFinder.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/CTcpConnectionFinder.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/ConnectionInfo.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/ConnectionInfo.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/ConnectionInfo.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/ConnectionInfo.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/ICarrierInfo.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/ICarrierInfo.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/ICarrierInfo.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/ICarrierInfo.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.cpp b/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.cpp rename to framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.hpp b/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.hpp rename to framework/components/ConnectivityAgent/generic/HAL/private/SocketUtils.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/Android.mk b/framework/components/ConnectivityAgent/generic/L0/Android.mk similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/Android.mk rename to framework/components/ConnectivityAgent/generic/L0/Android.mk diff --git a/src/framework/components/ConnectivityAgent/generic/L0/CConnectivityManager.hpp b/framework/components/ConnectivityAgent/generic/L0/CConnectivityManager.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/CConnectivityManager.hpp rename to framework/components/ConnectivityAgent/generic/L0/CConnectivityManager.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/IBufferConsumer.hpp b/framework/components/ConnectivityAgent/generic/L0/IBufferConsumer.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/IBufferConsumer.hpp rename to framework/components/ConnectivityAgent/generic/L0/IBufferConsumer.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/IFrameReceiver.hpp b/framework/components/ConnectivityAgent/generic/L0/IFrameReceiver.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/IFrameReceiver.hpp rename to framework/components/ConnectivityAgent/generic/L0/IFrameReceiver.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/ITransmitter.hpp b/framework/components/ConnectivityAgent/generic/L0/ITransmitter.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/ITransmitter.hpp rename to framework/components/ConnectivityAgent/generic/L0/ITransmitter.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/L0Interface.hpp b/framework/components/ConnectivityAgent/generic/L0/L0Interface.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/L0Interface.hpp rename to framework/components/ConnectivityAgent/generic/L0/L0Interface.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/Makefile b/framework/components/ConnectivityAgent/generic/L0/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/Makefile rename to framework/components/ConnectivityAgent/generic/L0/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CConnectivityManager.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CConnectivityManager.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CConnectivityManager.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CConnectivityManager.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CIncomeDispatcher.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CQoS.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CQoS.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CQoS.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CQoS.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CQoS.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CQoS.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CQoS.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CQoS.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CSource.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CSource.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CSource.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CSource.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CSource.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CSource.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CSource.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CSource.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTarget.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CTarget.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTarget.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTarget.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTarget.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CTarget.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTarget.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTarget.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTransmitDispatcher.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.cpp b/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.hpp b/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.hpp rename to framework/components/ConnectivityAgent/generic/L0/private/CTransmittedFramesQueue.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L0/private/L0Interface.cpp b/framework/components/ConnectivityAgent/generic/L0/private/L0Interface.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L0/private/L0Interface.cpp rename to framework/components/ConnectivityAgent/generic/L0/private/L0Interface.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/Android.mk b/framework/components/ConnectivityAgent/generic/L1/Android.mk similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/Android.mk rename to framework/components/ConnectivityAgent/generic/L1/Android.mk diff --git a/src/framework/components/ConnectivityAgent/generic/L1/CChannelAllocator.hpp b/framework/components/ConnectivityAgent/generic/L1/CChannelAllocator.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/CChannelAllocator.hpp rename to framework/components/ConnectivityAgent/generic/L1/CChannelAllocator.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/CSystemControllerProtocol.hpp b/framework/components/ConnectivityAgent/generic/L1/CSystemControllerProtocol.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/CSystemControllerProtocol.hpp rename to framework/components/ConnectivityAgent/generic/L1/CSystemControllerProtocol.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/IBufferProducer.hpp b/framework/components/ConnectivityAgent/generic/L1/IBufferProducer.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/IBufferProducer.hpp rename to framework/components/ConnectivityAgent/generic/L1/IBufferProducer.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/L1InterfaceStub.hpp b/framework/components/ConnectivityAgent/generic/L1/L1InterfaceStub.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/L1InterfaceStub.hpp rename to framework/components/ConnectivityAgent/generic/L1/L1InterfaceStub.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/Makefile b/framework/components/ConnectivityAgent/generic/L1/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/Makefile rename to framework/components/ConnectivityAgent/generic/L1/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CChannelAllocator.cpp b/framework/components/ConnectivityAgent/generic/L1/private/CChannelAllocator.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CChannelAllocator.cpp rename to framework/components/ConnectivityAgent/generic/L1/private/CChannelAllocator.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.cpp b/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.cpp rename to framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.hpp b/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.hpp rename to framework/components/ConnectivityAgent/generic/L1/private/CSourceAgent.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CSystemConrollerProtocol.cpp b/framework/components/ConnectivityAgent/generic/L1/private/CSystemConrollerProtocol.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CSystemConrollerProtocol.cpp rename to framework/components/ConnectivityAgent/generic/L1/private/CSystemConrollerProtocol.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.cpp b/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.cpp rename to framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.hpp b/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.hpp rename to framework/components/ConnectivityAgent/generic/L1/private/CTargetAgent.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/L1/private/L1InterfaceStub.cpp b/framework/components/ConnectivityAgent/generic/L1/private/L1InterfaceStub.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/L1/private/L1InterfaceStub.cpp rename to framework/components/ConnectivityAgent/generic/L1/private/L1InterfaceStub.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/Makefile b/framework/components/ConnectivityAgent/generic/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/Makefile rename to framework/components/ConnectivityAgent/generic/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/common/API.hpp b/framework/components/ConnectivityAgent/generic/common/API.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/API.hpp rename to framework/components/ConnectivityAgent/generic/common/API.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/Buffer.hpp b/framework/components/ConnectivityAgent/generic/common/Buffer.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/Buffer.hpp rename to framework/components/ConnectivityAgent/generic/common/Buffer.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/CDataAccessor.hpp b/framework/components/ConnectivityAgent/generic/common/CDataAccessor.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/CDataAccessor.hpp rename to framework/components/ConnectivityAgent/generic/common/CDataAccessor.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/IChannelObserver.hpp b/framework/components/ConnectivityAgent/generic/common/IChannelObserver.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/IChannelObserver.hpp rename to framework/components/ConnectivityAgent/generic/common/IChannelObserver.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/Makefile b/framework/components/ConnectivityAgent/generic/common/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/Makefile rename to framework/components/ConnectivityAgent/generic/common/Makefile diff --git a/src/framework/components/ConnectivityAgent/generic/common/private/API.cpp b/framework/components/ConnectivityAgent/generic/common/private/API.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/private/API.cpp rename to framework/components/ConnectivityAgent/generic/common/private/API.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.cpp b/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.cpp rename to framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.hpp b/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.hpp rename to framework/components/ConnectivityAgent/generic/common/private/CConnectivityAgentProxy.hpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/private/CDataAccessor.cpp b/framework/components/ConnectivityAgent/generic/common/private/CDataAccessor.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/private/CDataAccessor.cpp rename to framework/components/ConnectivityAgent/generic/common/private/CDataAccessor.cpp diff --git a/src/framework/components/ConnectivityAgent/generic/common/private/CallbackWrappers.hpp b/framework/components/ConnectivityAgent/generic/common/private/CallbackWrappers.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/generic/common/private/CallbackWrappers.hpp rename to framework/components/ConnectivityAgent/generic/common/private/CallbackWrappers.hpp diff --git a/src/framework/components/ConnectivityAgent/linux/ConnectivityAgentMain.cpp b/framework/components/ConnectivityAgent/linux/ConnectivityAgentMain.cpp similarity index 100% rename from src/framework/components/ConnectivityAgent/linux/ConnectivityAgentMain.cpp rename to framework/components/ConnectivityAgent/linux/ConnectivityAgentMain.cpp diff --git a/src/framework/components/ConnectivityAgent/linux/Makefile b/framework/components/ConnectivityAgent/linux/Makefile similarity index 100% rename from src/framework/components/ConnectivityAgent/linux/Makefile rename to framework/components/ConnectivityAgent/linux/Makefile diff --git a/src/framework/components/ConnectivityAgent/linux/config.hpp b/framework/components/ConnectivityAgent/linux/config.hpp similarity index 100% rename from src/framework/components/ConnectivityAgent/linux/config.hpp rename to framework/components/ConnectivityAgent/linux/config.hpp diff --git a/src/framework/components/Makefile b/framework/components/Makefile similarity index 100% rename from src/framework/components/Makefile rename to framework/components/Makefile diff --git a/src/framework/components/ProfileManager/IpcProtocol/Makefile b/framework/components/ProfileManager/IpcProtocol/Makefile similarity index 100% rename from src/framework/components/ProfileManager/IpcProtocol/Makefile rename to framework/components/ProfileManager/IpcProtocol/Makefile diff --git a/src/framework/components/ProfileManager/IpcProtocol/common.hpp b/framework/components/ProfileManager/IpcProtocol/common.hpp similarity index 100% rename from src/framework/components/ProfileManager/IpcProtocol/common.hpp rename to framework/components/ProfileManager/IpcProtocol/common.hpp diff --git a/src/framework/components/ProfileManager/IpcProtocol/message.hpp b/framework/components/ProfileManager/IpcProtocol/message.hpp similarity index 100% rename from src/framework/components/ProfileManager/IpcProtocol/message.hpp rename to framework/components/ProfileManager/IpcProtocol/message.hpp diff --git a/src/framework/components/ProfileManager/Makefile b/framework/components/ProfileManager/Makefile similarity index 100% rename from src/framework/components/ProfileManager/Makefile rename to framework/components/ProfileManager/Makefile diff --git a/src/framework/components/ProfileManager/PMAL/CComponentMgr.hpp b/framework/components/ProfileManager/PMAL/CComponentMgr.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/CComponentMgr.hpp rename to framework/components/ProfileManager/PMAL/CComponentMgr.hpp diff --git a/src/framework/components/ProfileManager/PMAL/CPMALError.hpp b/framework/components/ProfileManager/PMAL/CPMALError.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/CPMALError.hpp rename to framework/components/ProfileManager/PMAL/CPMALError.hpp diff --git a/src/framework/components/ProfileManager/PMAL/CProfile.hpp b/framework/components/ProfileManager/PMAL/CProfile.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/CProfile.hpp rename to framework/components/ProfileManager/PMAL/CProfile.hpp diff --git a/src/framework/components/ProfileManager/PMAL/IPIM.hpp b/framework/components/ProfileManager/PMAL/IPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/IPIM.hpp rename to framework/components/ProfileManager/PMAL/IPIM.hpp diff --git a/src/framework/components/ProfileManager/PMAL/IPMALCore.hpp b/framework/components/ProfileManager/PMAL/IPMALCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/IPMALCore.hpp rename to framework/components/ProfileManager/PMAL/IPMALCore.hpp diff --git a/src/framework/components/ProfileManager/PMAL/IPMALPIM.hpp b/framework/components/ProfileManager/PMAL/IPMALPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/IPMALPIM.hpp rename to framework/components/ProfileManager/PMAL/IPMALPIM.hpp diff --git a/src/framework/components/ProfileManager/PMAL/IProfileManagersCallbacks.hpp b/framework/components/ProfileManager/PMAL/IProfileManagersCallbacks.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/IProfileManagersCallbacks.hpp rename to framework/components/ProfileManager/PMAL/IProfileManagersCallbacks.hpp diff --git a/src/framework/components/ProfileManager/PMAL/Makefile b/framework/components/ProfileManager/PMAL/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMAL/Makefile rename to framework/components/ProfileManager/PMAL/Makefile diff --git a/src/framework/components/ProfileManager/PMAL/PIM/.gitignore b/framework/components/ProfileManager/PMAL/PIM/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/.gitignore rename to framework/components/ProfileManager/PMAL/PIM/.gitignore diff --git a/src/framework/components/ProfileManager/PMAL/PIM/CPIM.hpp b/framework/components/ProfileManager/PMAL/PIM/CPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/CPIM.hpp rename to framework/components/ProfileManager/PMAL/PIM/CPIM.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/IPIMToIpc.hpp b/framework/components/ProfileManager/PMAL/PIM/IPIMToIpc.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/IPIMToIpc.hpp rename to framework/components/ProfileManager/PMAL/PIM/IPIMToIpc.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/IPMALPIMToIpc.hpp b/framework/components/ProfileManager/PMAL/PIM/IPMALPIMToIpc.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/IPMALPIMToIpc.hpp rename to framework/components/ProfileManager/PMAL/PIM/IPMALPIMToIpc.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/Makefile b/framework/components/ProfileManager/PMAL/PIM/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/Makefile rename to framework/components/ProfileManager/PMAL/PIM/Makefile diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/.gitignore b/framework/components/ProfileManager/PMAL/PIM/private/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/.gitignore rename to framework/components/ProfileManager/PMAL/PIM/private/.gitignore diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/CPIM.cpp b/framework/components/ProfileManager/PMAL/PIM/private/CPIM.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/CPIM.cpp rename to framework/components/ProfileManager/PMAL/PIM/private/CPIM.cpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.cpp b/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.cpp rename to framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.cpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.hpp b/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.hpp rename to framework/components/ProfileManager/PMAL/PIM/private/CProfileInstanceMap.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInternal.hpp b/framework/components/ProfileManager/PMAL/PIM/private/CProfileInternal.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/CProfileInternal.hpp rename to framework/components/ProfileManager/PMAL/PIM/private/CProfileInternal.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.cpp b/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.cpp rename to framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.cpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.hpp b/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.hpp rename to framework/components/ProfileManager/PMAL/PIM/private/PIUIDGenerator.hpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.cpp b/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.cpp rename to framework/components/ProfileManager/PMAL/PIM/private/profileFactory.cpp diff --git a/src/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.hpp b/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/PIM/private/profileFactory.hpp rename to framework/components/ProfileManager/PMAL/PIM/private/profileFactory.hpp diff --git a/src/framework/components/ProfileManager/PMAL/core/.gitignore b/framework/components/ProfileManager/PMAL/core/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/.gitignore rename to framework/components/ProfileManager/PMAL/core/.gitignore diff --git a/src/framework/components/ProfileManager/PMAL/core/CPmalCore.hpp b/framework/components/ProfileManager/PMAL/core/CPmalCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/CPmalCore.hpp rename to framework/components/ProfileManager/PMAL/core/CPmalCore.hpp diff --git a/src/framework/components/ProfileManager/PMAL/core/IPMALCoreToPIM.hpp b/framework/components/ProfileManager/PMAL/core/IPMALCoreToPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/IPMALCoreToPIM.hpp rename to framework/components/ProfileManager/PMAL/core/IPMALCoreToPIM.hpp diff --git a/src/framework/components/ProfileManager/PMAL/core/Makefile b/framework/components/ProfileManager/PMAL/core/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/Makefile rename to framework/components/ProfileManager/PMAL/core/Makefile diff --git a/src/framework/components/ProfileManager/PMAL/core/private/.gitignore b/framework/components/ProfileManager/PMAL/core/private/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/private/.gitignore rename to framework/components/ProfileManager/PMAL/core/private/.gitignore diff --git a/src/framework/components/ProfileManager/PMAL/core/private/CPmalCore.cpp b/framework/components/ProfileManager/PMAL/core/private/CPmalCore.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/core/private/CPmalCore.cpp rename to framework/components/ProfileManager/PMAL/core/private/CPmalCore.cpp diff --git a/src/framework/components/ProfileManager/PMAL/ipc_protocol/CIpcProtocol.hpp b/framework/components/ProfileManager/PMAL/ipc_protocol/CIpcProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/ipc_protocol/CIpcProtocol.hpp rename to framework/components/ProfileManager/PMAL/ipc_protocol/CIpcProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToCore.hpp b/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToCore.hpp rename to framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToCore.hpp diff --git a/src/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToPIM.hpp b/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToPIM.hpp rename to framework/components/ProfileManager/PMAL/ipc_protocol/IPMALIpcToPIM.hpp diff --git a/src/framework/components/ProfileManager/PMAL/ipc_protocol/Makefile b/framework/components/ProfileManager/PMAL/ipc_protocol/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMAL/ipc_protocol/Makefile rename to framework/components/ProfileManager/PMAL/ipc_protocol/Makefile diff --git a/src/framework/components/ProfileManager/PMAL/ipc_protocol/private/CIpcProtocol.cpp b/framework/components/ProfileManager/PMAL/ipc_protocol/private/CIpcProtocol.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/ipc_protocol/private/CIpcProtocol.cpp rename to framework/components/ProfileManager/PMAL/ipc_protocol/private/CIpcProtocol.cpp diff --git a/src/framework/components/ProfileManager/PMAL/private/CComponentMgr.cpp b/framework/components/ProfileManager/PMAL/private/CComponentMgr.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMAL/private/CComponentMgr.cpp rename to framework/components/ProfileManager/PMAL/private/CComponentMgr.cpp diff --git a/src/framework/components/ProfileManager/PMP/CPmpError.hpp b/framework/components/ProfileManager/PMP/CPmpError.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/CPmpError.hpp rename to framework/components/ProfileManager/PMP/CPmpError.hpp diff --git a/src/framework/components/ProfileManager/PMP/Makefile b/framework/components/ProfileManager/PMP/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/Makefile rename to framework/components/ProfileManager/PMP/Makefile diff --git a/src/framework/components/ProfileManager/PMP/PIM/CPmpPim.hpp b/framework/components/ProfileManager/PMP/PIM/CPmpPim.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/CPmpPim.hpp rename to framework/components/ProfileManager/PMP/PIM/CPmpPim.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/IPMPPIMToIpc.hpp b/framework/components/ProfileManager/PMP/PIM/IPMPPIMToIpc.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/IPMPPIMToIpc.hpp rename to framework/components/ProfileManager/PMP/PIM/IPMPPIMToIpc.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/IPmpPimToCore.hpp b/framework/components/ProfileManager/PMP/PIM/IPmpPimToCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/IPmpPimToCore.hpp rename to framework/components/ProfileManager/PMP/PIM/IPmpPimToCore.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/Makefile b/framework/components/ProfileManager/PMP/PIM/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/Makefile rename to framework/components/ProfileManager/PMP/PIM/Makefile diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CAppData.cpp b/framework/components/ProfileManager/PMP/PIM/private/CAppData.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CAppData.cpp rename to framework/components/ProfileManager/PMP/PIM/private/CAppData.cpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CAppData.hpp b/framework/components/ProfileManager/PMP/PIM/private/CAppData.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CAppData.hpp rename to framework/components/ProfileManager/PMP/PIM/private/CAppData.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.cpp b/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.cpp rename to framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.cpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.hpp b/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.hpp rename to framework/components/ProfileManager/PMP/PIM/private/CClientAppRegistry.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CPmpPim.cpp b/framework/components/ProfileManager/PMP/PIM/private/CPmpPim.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CPmpPim.cpp rename to framework/components/ProfileManager/PMP/PIM/private/CPmpPim.cpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CProfileData.hpp b/framework/components/ProfileManager/PMP/PIM/private/CProfileData.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CProfileData.hpp rename to framework/components/ProfileManager/PMP/PIM/private/CProfileData.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/CProfileInstanceData.hpp b/framework/components/ProfileManager/PMP/PIM/private/CProfileInstanceData.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/CProfileInstanceData.hpp rename to framework/components/ProfileManager/PMP/PIM/private/CProfileInstanceData.hpp diff --git a/src/framework/components/ProfileManager/PMP/PIM/private/helpers.hpp b/framework/components/ProfileManager/PMP/PIM/private/helpers.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/PIM/private/helpers.hpp rename to framework/components/ProfileManager/PMP/PIM/private/helpers.hpp diff --git a/src/framework/components/ProfileManager/PMP/componentManager/CPmpComponentManager.hpp b/framework/components/ProfileManager/PMP/componentManager/CPmpComponentManager.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/componentManager/CPmpComponentManager.hpp rename to framework/components/ProfileManager/PMP/componentManager/CPmpComponentManager.hpp diff --git a/src/framework/components/ProfileManager/PMP/componentManager/Makefile b/framework/components/ProfileManager/PMP/componentManager/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/componentManager/Makefile rename to framework/components/ProfileManager/PMP/componentManager/Makefile diff --git a/src/framework/components/ProfileManager/PMP/componentManager/private/CPmpComponentManager.cpp b/framework/components/ProfileManager/PMP/componentManager/private/CPmpComponentManager.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/componentManager/private/CPmpComponentManager.cpp rename to framework/components/ProfileManager/PMP/componentManager/private/CPmpComponentManager.cpp diff --git a/src/framework/components/ProfileManager/PMP/core/.gitignore b/framework/components/ProfileManager/PMP/core/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/.gitignore rename to framework/components/ProfileManager/PMP/core/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/core/CPmpCore.hpp b/framework/components/ProfileManager/PMP/core/CPmpCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/CPmpCore.hpp rename to framework/components/ProfileManager/PMP/core/CPmpCore.hpp diff --git a/src/framework/components/ProfileManager/PMP/core/IPmpCoreToIpc.hpp b/framework/components/ProfileManager/PMP/core/IPmpCoreToIpc.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/IPmpCoreToIpc.hpp rename to framework/components/ProfileManager/PMP/core/IPmpCoreToIpc.hpp diff --git a/src/framework/components/ProfileManager/PMP/core/IPmpCoreToPim.hpp b/framework/components/ProfileManager/PMP/core/IPmpCoreToPim.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/IPmpCoreToPim.hpp rename to framework/components/ProfileManager/PMP/core/IPmpCoreToPim.hpp diff --git a/src/framework/components/ProfileManager/PMP/core/IPmpCoreToSysCtrl.hpp b/framework/components/ProfileManager/PMP/core/IPmpCoreToSysCtrl.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/IPmpCoreToSysCtrl.hpp rename to framework/components/ProfileManager/PMP/core/IPmpCoreToSysCtrl.hpp diff --git a/src/framework/components/ProfileManager/PMP/core/Makefile b/framework/components/ProfileManager/PMP/core/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/Makefile rename to framework/components/ProfileManager/PMP/core/Makefile diff --git a/src/framework/components/ProfileManager/PMP/core/private/.gitignore b/framework/components/ProfileManager/PMP/core/private/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/private/.gitignore rename to framework/components/ProfileManager/PMP/core/private/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/core/private/CPmpCore.cpp b/framework/components/ProfileManager/PMP/core/private/CPmpCore.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/private/CPmpCore.cpp rename to framework/components/ProfileManager/PMP/core/private/CPmpCore.cpp diff --git a/src/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.cpp b/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.cpp rename to framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.cpp diff --git a/src/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.hpp b/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.hpp rename to framework/components/ProfileManager/PMP/core/private/CPmpCoreProfileInfo.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/.gitignore b/framework/components/ProfileManager/PMP/interaction/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/.gitignore rename to framework/components/ProfileManager/PMP/interaction/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/interaction/CPmpCoreProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/CPmpCoreProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/CPmpCoreProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/CPmpCoreProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/CPmpPimProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/CPmpPimProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/CPmpPimProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/CPmpPimProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/CPmpProtoController.hpp b/framework/components/ProfileManager/PMP/interaction/CPmpProtoController.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/CPmpProtoController.hpp rename to framework/components/ProfileManager/PMP/interaction/CPmpProtoController.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/IPmpCoreClb.hpp b/framework/components/ProfileManager/PMP/interaction/IPmpCoreClb.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/IPmpCoreClb.hpp rename to framework/components/ProfileManager/PMP/interaction/IPmpCoreClb.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/IPmpCoreProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/IPmpCoreProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/IPmpCoreProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/IPmpCoreProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/IPmpPimClb.hpp b/framework/components/ProfileManager/PMP/interaction/IPmpPimClb.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/IPmpPimClb.hpp rename to framework/components/ProfileManager/PMP/interaction/IPmpPimClb.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/IPmpPimProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/IPmpPimProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/IPmpPimProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/IPmpPimProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/IPmpProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/IPmpProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/IPmpProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/IPmpProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/Makefile b/framework/components/ProfileManager/PMP/interaction/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/Makefile rename to framework/components/ProfileManager/PMP/interaction/Makefile diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/.gitignore b/framework/components/ProfileManager/PMP/interaction/private/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/.gitignore rename to framework/components/ProfileManager/PMP/interaction/private/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.hpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.hpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpCoreClbCtrl.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreProtocol.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreProtocol.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpCoreProtocol.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpCoreProtocol.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.hpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.hpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpPimClbCtrl.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimProtocol.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpPimProtocol.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpPimProtocol.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpPimProtocol.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoController.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoController.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoController.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpProtoController.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.hpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.hpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpProtoThread.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.cpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.cpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.cpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.hpp b/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.hpp rename to framework/components/ProfileManager/PMP/interaction/private/CPmpProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/interaction/private/PmpRequestFrame.hpp b/framework/components/ProfileManager/PMP/interaction/private/PmpRequestFrame.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/interaction/private/PmpRequestFrame.hpp rename to framework/components/ProfileManager/PMP/interaction/private/PmpRequestFrame.hpp diff --git a/src/framework/components/ProfileManager/PMP/ipc_protocol/CIpcProtocol.hpp b/framework/components/ProfileManager/PMP/ipc_protocol/CIpcProtocol.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/ipc_protocol/CIpcProtocol.hpp rename to framework/components/ProfileManager/PMP/ipc_protocol/CIpcProtocol.hpp diff --git a/src/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToCore.hpp b/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToCore.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToCore.hpp rename to framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToCore.hpp diff --git a/src/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToPIM.hpp b/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToPIM.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToPIM.hpp rename to framework/components/ProfileManager/PMP/ipc_protocol/IPMPIpcToPIM.hpp diff --git a/src/framework/components/ProfileManager/PMP/ipc_protocol/Makefile b/framework/components/ProfileManager/PMP/ipc_protocol/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/ipc_protocol/Makefile rename to framework/components/ProfileManager/PMP/ipc_protocol/Makefile diff --git a/src/framework/components/ProfileManager/PMP/ipc_protocol/private/CIpcProtocol.cpp b/framework/components/ProfileManager/PMP/ipc_protocol/private/CIpcProtocol.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/ipc_protocol/private/CIpcProtocol.cpp rename to framework/components/ProfileManager/PMP/ipc_protocol/private/CIpcProtocol.cpp diff --git a/src/framework/components/ProfileManager/PMP/process/.gitignore b/framework/components/ProfileManager/PMP/process/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/process/.gitignore rename to framework/components/ProfileManager/PMP/process/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/process/Makefile b/framework/components/ProfileManager/PMP/process/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/process/Makefile rename to framework/components/ProfileManager/PMP/process/Makefile diff --git a/src/framework/components/ProfileManager/PMP/process/SystemControllerMsg.cpp b/framework/components/ProfileManager/PMP/process/SystemControllerMsg.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/process/SystemControllerMsg.cpp rename to framework/components/ProfileManager/PMP/process/SystemControllerMsg.cpp diff --git a/src/framework/components/ProfileManager/PMP/process/SystemControllerMsg.hpp b/framework/components/ProfileManager/PMP/process/SystemControllerMsg.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/process/SystemControllerMsg.hpp rename to framework/components/ProfileManager/PMP/process/SystemControllerMsg.hpp diff --git a/src/framework/components/ProfileManager/PMP/process/main.cpp b/framework/components/ProfileManager/PMP/process/main.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/process/main.cpp rename to framework/components/ProfileManager/PMP/process/main.cpp diff --git a/src/framework/components/ProfileManager/PMP/repository/.gitignore b/framework/components/ProfileManager/PMP/repository/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/.gitignore rename to framework/components/ProfileManager/PMP/repository/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/repository/CProfileRepoConnection.hpp b/framework/components/ProfileManager/PMP/repository/CProfileRepoConnection.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/CProfileRepoConnection.hpp rename to framework/components/ProfileManager/PMP/repository/CProfileRepoConnection.hpp diff --git a/src/framework/components/ProfileManager/PMP/repository/CRepoController.hpp b/framework/components/ProfileManager/PMP/repository/CRepoController.hpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/CRepoController.hpp rename to framework/components/ProfileManager/PMP/repository/CRepoController.hpp diff --git a/src/framework/components/ProfileManager/PMP/repository/Makefile b/framework/components/ProfileManager/PMP/repository/Makefile similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/Makefile rename to framework/components/ProfileManager/PMP/repository/Makefile diff --git a/src/framework/components/ProfileManager/PMP/repository/private/.gitignore b/framework/components/ProfileManager/PMP/repository/private/.gitignore similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/private/.gitignore rename to framework/components/ProfileManager/PMP/repository/private/.gitignore diff --git a/src/framework/components/ProfileManager/PMP/repository/private/CProfileRepoConnection.cpp b/framework/components/ProfileManager/PMP/repository/private/CProfileRepoConnection.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/private/CProfileRepoConnection.cpp rename to framework/components/ProfileManager/PMP/repository/private/CProfileRepoConnection.cpp diff --git a/src/framework/components/ProfileManager/PMP/repository/private/CRepoController.cpp b/framework/components/ProfileManager/PMP/repository/private/CRepoController.cpp similarity index 100% rename from src/framework/components/ProfileManager/PMP/repository/private/CRepoController.cpp rename to framework/components/ProfileManager/PMP/repository/private/CRepoController.cpp diff --git a/src/framework/components/ProfileRepository/CProfileRepoClient.hpp b/framework/components/ProfileRepository/CProfileRepoClient.hpp similarity index 100% rename from src/framework/components/ProfileRepository/CProfileRepoClient.hpp rename to framework/components/ProfileRepository/CProfileRepoClient.hpp diff --git a/src/framework/components/ProfileRepository/CProfileRepoError.hpp b/framework/components/ProfileRepository/CProfileRepoError.hpp similarity index 100% rename from src/framework/components/ProfileRepository/CProfileRepoError.hpp rename to framework/components/ProfileRepository/CProfileRepoError.hpp diff --git a/src/framework/components/ProfileRepository/IProfileRepoClient.hpp b/framework/components/ProfileRepository/IProfileRepoClient.hpp similarity index 100% rename from src/framework/components/ProfileRepository/IProfileRepoClient.hpp rename to framework/components/ProfileRepository/IProfileRepoClient.hpp diff --git a/src/framework/components/ProfileRepository/Makefile b/framework/components/ProfileRepository/Makefile similarity index 100% rename from src/framework/components/ProfileRepository/Makefile rename to framework/components/ProfileRepository/Makefile diff --git a/src/framework/components/ProfileRepository/ProfileRepoInternalTypes.hpp b/framework/components/ProfileRepository/ProfileRepoInternalTypes.hpp similarity index 100% rename from src/framework/components/ProfileRepository/ProfileRepoInternalTypes.hpp rename to framework/components/ProfileRepository/ProfileRepoInternalTypes.hpp diff --git a/src/framework/components/ProfileRepository/RepoTypes.hpp b/framework/components/ProfileRepository/RepoTypes.hpp similarity index 100% rename from src/framework/components/ProfileRepository/RepoTypes.hpp rename to framework/components/ProfileRepository/RepoTypes.hpp diff --git a/src/framework/components/ProfileRepository/private/CProfileRepoClient.cpp b/framework/components/ProfileRepository/private/CProfileRepoClient.cpp similarity index 100% rename from src/framework/components/ProfileRepository/private/CProfileRepoClient.cpp rename to framework/components/ProfileRepository/private/CProfileRepoClient.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileApiDatabase.cpp b/framework/components/ProfileRepository/process/CProfileApiDatabase.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileApiDatabase.cpp rename to framework/components/ProfileRepository/process/CProfileApiDatabase.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileApiDatabase.hpp b/framework/components/ProfileRepository/process/CProfileApiDatabase.hpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileApiDatabase.hpp rename to framework/components/ProfileRepository/process/CProfileApiDatabase.hpp diff --git a/src/framework/components/ProfileRepository/process/CProfileApiInfo.cpp b/framework/components/ProfileRepository/process/CProfileApiInfo.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileApiInfo.cpp rename to framework/components/ProfileRepository/process/CProfileApiInfo.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileApiInfo.hpp b/framework/components/ProfileRepository/process/CProfileApiInfo.hpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileApiInfo.hpp rename to framework/components/ProfileRepository/process/CProfileApiInfo.hpp diff --git a/src/framework/components/ProfileRepository/process/CProfileDatabase.cpp b/framework/components/ProfileRepository/process/CProfileDatabase.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileDatabase.cpp rename to framework/components/ProfileRepository/process/CProfileDatabase.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileDatabase.hpp b/framework/components/ProfileRepository/process/CProfileDatabase.hpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileDatabase.hpp rename to framework/components/ProfileRepository/process/CProfileDatabase.hpp diff --git a/src/framework/components/ProfileRepository/process/CProfileInfo.cpp b/framework/components/ProfileRepository/process/CProfileInfo.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileInfo.cpp rename to framework/components/ProfileRepository/process/CProfileInfo.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileInfo.hpp b/framework/components/ProfileRepository/process/CProfileInfo.hpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileInfo.hpp rename to framework/components/ProfileRepository/process/CProfileInfo.hpp diff --git a/src/framework/components/ProfileRepository/process/CProfileRepoServerClb.cpp b/framework/components/ProfileRepository/process/CProfileRepoServerClb.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileRepoServerClb.cpp rename to framework/components/ProfileRepository/process/CProfileRepoServerClb.cpp diff --git a/src/framework/components/ProfileRepository/process/CProfileRepoServerClb.hpp b/framework/components/ProfileRepository/process/CProfileRepoServerClb.hpp similarity index 100% rename from src/framework/components/ProfileRepository/process/CProfileRepoServerClb.hpp rename to framework/components/ProfileRepository/process/CProfileRepoServerClb.hpp diff --git a/src/framework/components/ProfileRepository/process/Makefile b/framework/components/ProfileRepository/process/Makefile similarity index 100% rename from src/framework/components/ProfileRepository/process/Makefile rename to framework/components/ProfileRepository/process/Makefile diff --git a/src/framework/components/ProfileRepository/process/main.cpp b/framework/components/ProfileRepository/process/main.cpp similarity index 100% rename from src/framework/components/ProfileRepository/process/main.cpp rename to framework/components/ProfileRepository/process/main.cpp diff --git a/src/framework/components/SystemController/Makefile b/framework/components/SystemController/Makefile similarity index 100% rename from src/framework/components/SystemController/Makefile rename to framework/components/SystemController/Makefile diff --git a/src/framework/components/SystemController/componentLauncher/CComponentLauncher.hpp b/framework/components/SystemController/componentLauncher/CComponentLauncher.hpp similarity index 100% rename from src/framework/components/SystemController/componentLauncher/CComponentLauncher.hpp rename to framework/components/SystemController/componentLauncher/CComponentLauncher.hpp diff --git a/src/framework/components/SystemController/componentLauncher/Makefile b/framework/components/SystemController/componentLauncher/Makefile similarity index 100% rename from src/framework/components/SystemController/componentLauncher/Makefile rename to framework/components/SystemController/componentLauncher/Makefile diff --git a/src/framework/components/SystemController/componentLauncher/private/CComponentLauncher.cpp b/framework/components/SystemController/componentLauncher/private/CComponentLauncher.cpp similarity index 100% rename from src/framework/components/SystemController/componentLauncher/private/CComponentLauncher.cpp rename to framework/components/SystemController/componentLauncher/private/CComponentLauncher.cpp diff --git a/src/framework/components/SystemController/processEntryPoint/Makefile b/framework/components/SystemController/processEntryPoint/Makefile similarity index 100% rename from src/framework/components/SystemController/processEntryPoint/Makefile rename to framework/components/SystemController/processEntryPoint/Makefile diff --git a/src/framework/components/SystemController/processEntryPoint/SystemControllerProcess.cpp b/framework/components/SystemController/processEntryPoint/SystemControllerProcess.cpp similarity index 100% rename from src/framework/components/SystemController/processEntryPoint/SystemControllerProcess.cpp rename to framework/components/SystemController/processEntryPoint/SystemControllerProcess.cpp diff --git a/src/framework/components/SystemController/processEntryPoint/reset.cpp b/framework/components/SystemController/processEntryPoint/reset.cpp similarity index 100% rename from src/framework/components/SystemController/processEntryPoint/reset.cpp rename to framework/components/SystemController/processEntryPoint/reset.cpp diff --git a/src/framework/components/SystemController/processEntryPoint/reset.hpp b/framework/components/SystemController/processEntryPoint/reset.hpp similarity index 100% rename from src/framework/components/SystemController/processEntryPoint/reset.hpp rename to framework/components/SystemController/processEntryPoint/reset.hpp diff --git a/src/framework/components/SystemController/ssm/Makefile b/framework/components/SystemController/ssm/Makefile similarity index 100% rename from src/framework/components/SystemController/ssm/Makefile rename to framework/components/SystemController/ssm/Makefile diff --git a/src/framework/components/SystemController/ssm/stateMachine/CSystemStateMachine.hpp b/framework/components/SystemController/ssm/stateMachine/CSystemStateMachine.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/CSystemStateMachine.hpp rename to framework/components/SystemController/ssm/stateMachine/CSystemStateMachine.hpp diff --git a/src/framework/components/SystemController/ssm/stateMachine/CTriggerQueue.hpp b/framework/components/SystemController/ssm/stateMachine/CTriggerQueue.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/CTriggerQueue.hpp rename to framework/components/SystemController/ssm/stateMachine/CTriggerQueue.hpp diff --git a/src/framework/components/SystemController/ssm/stateMachine/Makefile b/framework/components/SystemController/ssm/stateMachine/Makefile similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/Makefile rename to framework/components/SystemController/ssm/stateMachine/Makefile diff --git a/src/framework/components/SystemController/ssm/stateMachine/SSMTriggers.hpp b/framework/components/SystemController/ssm/stateMachine/SSMTriggers.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/SSMTriggers.hpp rename to framework/components/SystemController/ssm/stateMachine/SSMTriggers.hpp diff --git a/src/framework/components/SystemController/ssm/stateMachine/private/CSystemStateMachine.cpp b/framework/components/SystemController/ssm/stateMachine/private/CSystemStateMachine.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/private/CSystemStateMachine.cpp rename to framework/components/SystemController/ssm/stateMachine/private/CSystemStateMachine.cpp diff --git a/src/framework/components/SystemController/ssm/stateMachine/private/CTriggerQueue.cpp b/framework/components/SystemController/ssm/stateMachine/private/CTriggerQueue.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/stateMachine/private/CTriggerQueue.cpp rename to framework/components/SystemController/ssm/stateMachine/private/CTriggerQueue.cpp diff --git a/src/framework/components/SystemController/ssm/states/CApplicationManagerReady.hpp b/framework/components/SystemController/ssm/states/CApplicationManagerReady.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CApplicationManagerReady.hpp rename to framework/components/SystemController/ssm/states/CApplicationManagerReady.hpp diff --git a/src/framework/components/SystemController/ssm/states/CAuthenticateState.hpp b/framework/components/SystemController/ssm/states/CAuthenticateState.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CAuthenticateState.hpp rename to framework/components/SystemController/ssm/states/CAuthenticateState.hpp diff --git a/src/framework/components/SystemController/ssm/states/CChannelLayerHandshakeDone.hpp b/framework/components/SystemController/ssm/states/CChannelLayerHandshakeDone.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CChannelLayerHandshakeDone.hpp rename to framework/components/SystemController/ssm/states/CChannelLayerHandshakeDone.hpp diff --git a/src/framework/components/SystemController/ssm/states/CChannelLayerReady.hpp b/framework/components/SystemController/ssm/states/CChannelLayerReady.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CChannelLayerReady.hpp rename to framework/components/SystemController/ssm/states/CChannelLayerReady.hpp diff --git a/src/framework/components/SystemController/ssm/states/CIdleState.hpp b/framework/components/SystemController/ssm/states/CIdleState.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CIdleState.hpp rename to framework/components/SystemController/ssm/states/CIdleState.hpp diff --git a/src/framework/components/SystemController/ssm/states/CInitialState.hpp b/framework/components/SystemController/ssm/states/CInitialState.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CInitialState.hpp rename to framework/components/SystemController/ssm/states/CInitialState.hpp diff --git a/src/framework/components/SystemController/ssm/states/CPhysicalLayerHandshakeDone.hpp b/framework/components/SystemController/ssm/states/CPhysicalLayerHandshakeDone.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CPhysicalLayerHandshakeDone.hpp rename to framework/components/SystemController/ssm/states/CPhysicalLayerHandshakeDone.hpp diff --git a/src/framework/components/SystemController/ssm/states/CPhysicalLayerReady.hpp b/framework/components/SystemController/ssm/states/CPhysicalLayerReady.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CPhysicalLayerReady.hpp rename to framework/components/SystemController/ssm/states/CPhysicalLayerReady.hpp diff --git a/src/framework/components/SystemController/ssm/states/CProfileManagerHandshakeDone.hpp b/framework/components/SystemController/ssm/states/CProfileManagerHandshakeDone.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CProfileManagerHandshakeDone.hpp rename to framework/components/SystemController/ssm/states/CProfileManagerHandshakeDone.hpp diff --git a/src/framework/components/SystemController/ssm/states/CProfileManagerReady.hpp b/framework/components/SystemController/ssm/states/CProfileManagerReady.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CProfileManagerReady.hpp rename to framework/components/SystemController/ssm/states/CProfileManagerReady.hpp diff --git a/src/framework/components/SystemController/ssm/states/CSuccessfulAuth.hpp b/framework/components/SystemController/ssm/states/CSuccessfulAuth.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CSuccessfulAuth.hpp rename to framework/components/SystemController/ssm/states/CSuccessfulAuth.hpp diff --git a/src/framework/components/SystemController/ssm/states/CSystemState.hpp b/framework/components/SystemController/ssm/states/CSystemState.hpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/CSystemState.hpp rename to framework/components/SystemController/ssm/states/CSystemState.hpp diff --git a/src/framework/components/SystemController/ssm/states/Makefile b/framework/components/SystemController/ssm/states/Makefile similarity index 100% rename from src/framework/components/SystemController/ssm/states/Makefile rename to framework/components/SystemController/ssm/states/Makefile diff --git a/src/framework/components/SystemController/ssm/states/private/CApplicationManagerReady.cpp b/framework/components/SystemController/ssm/states/private/CApplicationManagerReady.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CApplicationManagerReady.cpp rename to framework/components/SystemController/ssm/states/private/CApplicationManagerReady.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CAuthenticateState.cpp b/framework/components/SystemController/ssm/states/private/CAuthenticateState.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CAuthenticateState.cpp rename to framework/components/SystemController/ssm/states/private/CAuthenticateState.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CChannelLayerHandshakeDone.cpp b/framework/components/SystemController/ssm/states/private/CChannelLayerHandshakeDone.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CChannelLayerHandshakeDone.cpp rename to framework/components/SystemController/ssm/states/private/CChannelLayerHandshakeDone.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CChannelLayerReady.cpp b/framework/components/SystemController/ssm/states/private/CChannelLayerReady.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CChannelLayerReady.cpp rename to framework/components/SystemController/ssm/states/private/CChannelLayerReady.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CIdleState.cpp b/framework/components/SystemController/ssm/states/private/CIdleState.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CIdleState.cpp rename to framework/components/SystemController/ssm/states/private/CIdleState.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CInitialState.cpp b/framework/components/SystemController/ssm/states/private/CInitialState.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CInitialState.cpp rename to framework/components/SystemController/ssm/states/private/CInitialState.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CPhysicalLayerHandshakeDone.cpp b/framework/components/SystemController/ssm/states/private/CPhysicalLayerHandshakeDone.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CPhysicalLayerHandshakeDone.cpp rename to framework/components/SystemController/ssm/states/private/CPhysicalLayerHandshakeDone.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CPhysicalLayerReady.cpp b/framework/components/SystemController/ssm/states/private/CPhysicalLayerReady.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CPhysicalLayerReady.cpp rename to framework/components/SystemController/ssm/states/private/CPhysicalLayerReady.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CProfileManagerHandshakeDone.cpp b/framework/components/SystemController/ssm/states/private/CProfileManagerHandshakeDone.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CProfileManagerHandshakeDone.cpp rename to framework/components/SystemController/ssm/states/private/CProfileManagerHandshakeDone.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CProfileManagerReady.cpp b/framework/components/SystemController/ssm/states/private/CProfileManagerReady.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CProfileManagerReady.cpp rename to framework/components/SystemController/ssm/states/private/CProfileManagerReady.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CSuccessfulAuth.cpp b/framework/components/SystemController/ssm/states/private/CSuccessfulAuth.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CSuccessfulAuth.cpp rename to framework/components/SystemController/ssm/states/private/CSuccessfulAuth.cpp diff --git a/src/framework/components/SystemController/ssm/states/private/CSystemState.cpp b/framework/components/SystemController/ssm/states/private/CSystemState.cpp similarity index 100% rename from src/framework/components/SystemController/ssm/states/private/CSystemState.cpp rename to framework/components/SystemController/ssm/states/private/CSystemState.cpp diff --git a/src/framework/libraries/AppMan/AmpForApp/CAppManProtoServer.hpp b/framework/libraries/AppMan/AmpForApp/CAppManProtoServer.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/CAppManProtoServer.hpp rename to framework/libraries/AppMan/AmpForApp/CAppManProtoServer.hpp diff --git a/src/framework/libraries/AppMan/AmpForApp/IAppManProto.hpp b/framework/libraries/AppMan/AmpForApp/IAppManProto.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/IAppManProto.hpp rename to framework/libraries/AppMan/AmpForApp/IAppManProto.hpp diff --git a/src/framework/libraries/AppMan/AmpForApp/IAppManProtoAmpToApp.hpp b/framework/libraries/AppMan/AmpForApp/IAppManProtoAmpToApp.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/IAppManProtoAmpToApp.hpp rename to framework/libraries/AppMan/AmpForApp/IAppManProtoAmpToApp.hpp diff --git a/src/framework/libraries/AppMan/AmpForApp/IConnection.hpp b/framework/libraries/AppMan/AmpForApp/IConnection.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/IConnection.hpp rename to framework/libraries/AppMan/AmpForApp/IConnection.hpp diff --git a/src/framework/libraries/AppMan/AmpForApp/IConnectionHandler.hpp b/framework/libraries/AppMan/AmpForApp/IConnectionHandler.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/IConnectionHandler.hpp rename to framework/libraries/AppMan/AmpForApp/IConnectionHandler.hpp diff --git a/src/framework/libraries/AppMan/AmpForApp/Makefile b/framework/libraries/AppMan/AmpForApp/Makefile similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/Makefile rename to framework/libraries/AppMan/AmpForApp/Makefile diff --git a/src/framework/libraries/AppMan/AmpForApp/private/CAppManProtoServer.cpp b/framework/libraries/AppMan/AmpForApp/private/CAppManProtoServer.cpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForApp/private/CAppManProtoServer.cpp rename to framework/libraries/AppMan/AmpForApp/private/CAppManProtoServer.cpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/CAppManPmpIpcServer.hpp b/framework/libraries/AppMan/AmpForPmp/CAppManPmpIpcServer.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/CAppManPmpIpcServer.hpp rename to framework/libraries/AppMan/AmpForPmp/CAppManPmpIpcServer.hpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/CPmpConnection.hpp b/framework/libraries/AppMan/AmpForPmp/CPmpConnection.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/CPmpConnection.hpp rename to framework/libraries/AppMan/AmpForPmp/CPmpConnection.hpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/CPmpController.hpp b/framework/libraries/AppMan/AmpForPmp/CPmpController.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/CPmpController.hpp rename to framework/libraries/AppMan/AmpForPmp/CPmpController.hpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/IPmpConnectionStatus.hpp b/framework/libraries/AppMan/AmpForPmp/IPmpConnectionStatus.hpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/IPmpConnectionStatus.hpp rename to framework/libraries/AppMan/AmpForPmp/IPmpConnectionStatus.hpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/Makefile b/framework/libraries/AppMan/AmpForPmp/Makefile similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/Makefile rename to framework/libraries/AppMan/AmpForPmp/Makefile diff --git a/src/framework/libraries/AppMan/AmpForPmp/private/CAppManPmpIpcServer.cpp b/framework/libraries/AppMan/AmpForPmp/private/CAppManPmpIpcServer.cpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/private/CAppManPmpIpcServer.cpp rename to framework/libraries/AppMan/AmpForPmp/private/CAppManPmpIpcServer.cpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/private/CPmpConnection.cpp b/framework/libraries/AppMan/AmpForPmp/private/CPmpConnection.cpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/private/CPmpConnection.cpp rename to framework/libraries/AppMan/AmpForPmp/private/CPmpConnection.cpp diff --git a/src/framework/libraries/AppMan/AmpForPmp/private/CPmpController.cpp b/framework/libraries/AppMan/AmpForPmp/private/CPmpController.cpp similarity index 100% rename from src/framework/libraries/AppMan/AmpForPmp/private/CPmpController.cpp rename to framework/libraries/AppMan/AmpForPmp/private/CPmpController.cpp diff --git a/src/framework/libraries/AppMan/App/CAppManConnectController.hpp b/framework/libraries/AppMan/App/CAppManConnectController.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/CAppManConnectController.hpp rename to framework/libraries/AppMan/App/CAppManConnectController.hpp diff --git a/src/framework/libraries/AppMan/App/IAppMan.hpp b/framework/libraries/AppMan/App/IAppMan.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/IAppMan.hpp rename to framework/libraries/AppMan/App/IAppMan.hpp diff --git a/src/framework/libraries/AppMan/App/IAppManHandler.hpp b/framework/libraries/AppMan/App/IAppManHandler.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/IAppManHandler.hpp rename to framework/libraries/AppMan/App/IAppManHandler.hpp diff --git a/src/framework/libraries/AppMan/App/Makefile b/framework/libraries/AppMan/App/Makefile similarity index 100% rename from src/framework/libraries/AppMan/App/Makefile rename to framework/libraries/AppMan/App/Makefile diff --git a/src/framework/libraries/AppMan/App/private/CAppManConnect.cpp b/framework/libraries/AppMan/App/private/CAppManConnect.cpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CAppManConnect.cpp rename to framework/libraries/AppMan/App/private/CAppManConnect.cpp diff --git a/src/framework/libraries/AppMan/App/private/CAppManConnect.hpp b/framework/libraries/AppMan/App/private/CAppManConnect.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CAppManConnect.hpp rename to framework/libraries/AppMan/App/private/CAppManConnect.hpp diff --git a/src/framework/libraries/AppMan/App/private/CAppManConnectController.cpp b/framework/libraries/AppMan/App/private/CAppManConnectController.cpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CAppManConnectController.cpp rename to framework/libraries/AppMan/App/private/CAppManConnectController.cpp diff --git a/src/framework/libraries/AppMan/App/private/CAppManProtoClient.cpp b/framework/libraries/AppMan/App/private/CAppManProtoClient.cpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CAppManProtoClient.cpp rename to framework/libraries/AppMan/App/private/CAppManProtoClient.cpp diff --git a/src/framework/libraries/AppMan/App/private/CAppManProtoClient.hpp b/framework/libraries/AppMan/App/private/CAppManProtoClient.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CAppManProtoClient.hpp rename to framework/libraries/AppMan/App/private/CAppManProtoClient.hpp diff --git a/src/framework/libraries/AppMan/App/private/CCore.cpp b/framework/libraries/AppMan/App/private/CCore.cpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CCore.cpp rename to framework/libraries/AppMan/App/private/CCore.cpp diff --git a/src/framework/libraries/AppMan/App/private/CCore.hpp b/framework/libraries/AppMan/App/private/CCore.hpp similarity index 100% rename from src/framework/libraries/AppMan/App/private/CCore.hpp rename to framework/libraries/AppMan/App/private/CCore.hpp diff --git a/src/framework/libraries/AppMan/Makefile b/framework/libraries/AppMan/Makefile similarity index 100% rename from src/framework/libraries/AppMan/Makefile rename to framework/libraries/AppMan/Makefile diff --git a/src/framework/libraries/AppMan/Pmp/CAppManPmpConnection.hpp b/framework/libraries/AppMan/Pmp/CAppManPmpConnection.hpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/CAppManPmpConnection.hpp rename to framework/libraries/AppMan/Pmp/CAppManPmpConnection.hpp diff --git a/src/framework/libraries/AppMan/Pmp/CAppManPmpController.hpp b/framework/libraries/AppMan/Pmp/CAppManPmpController.hpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/CAppManPmpController.hpp rename to framework/libraries/AppMan/Pmp/CAppManPmpController.hpp diff --git a/src/framework/libraries/AppMan/Pmp/CAppManPmpIpcClient.hpp b/framework/libraries/AppMan/Pmp/CAppManPmpIpcClient.hpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/CAppManPmpIpcClient.hpp rename to framework/libraries/AppMan/Pmp/CAppManPmpIpcClient.hpp diff --git a/src/framework/libraries/AppMan/Pmp/IPmpHandler.hpp b/framework/libraries/AppMan/Pmp/IPmpHandler.hpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/IPmpHandler.hpp rename to framework/libraries/AppMan/Pmp/IPmpHandler.hpp diff --git a/src/framework/libraries/AppMan/Pmp/IPmpRequest.hpp b/framework/libraries/AppMan/Pmp/IPmpRequest.hpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/IPmpRequest.hpp rename to framework/libraries/AppMan/Pmp/IPmpRequest.hpp diff --git a/src/framework/libraries/AppMan/Pmp/Makefile b/framework/libraries/AppMan/Pmp/Makefile similarity index 100% rename from src/framework/libraries/AppMan/Pmp/Makefile rename to framework/libraries/AppMan/Pmp/Makefile diff --git a/src/framework/libraries/AppMan/Pmp/private/CAppManPmpConnection.cpp b/framework/libraries/AppMan/Pmp/private/CAppManPmpConnection.cpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/private/CAppManPmpConnection.cpp rename to framework/libraries/AppMan/Pmp/private/CAppManPmpConnection.cpp diff --git a/src/framework/libraries/AppMan/Pmp/private/CAppManPmpController.cpp b/framework/libraries/AppMan/Pmp/private/CAppManPmpController.cpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/private/CAppManPmpController.cpp rename to framework/libraries/AppMan/Pmp/private/CAppManPmpController.cpp diff --git a/src/framework/libraries/AppMan/Pmp/private/CAppManPmpIpcClient.cpp b/framework/libraries/AppMan/Pmp/private/CAppManPmpIpcClient.cpp similarity index 100% rename from src/framework/libraries/AppMan/Pmp/private/CAppManPmpIpcClient.cpp rename to framework/libraries/AppMan/Pmp/private/CAppManPmpIpcClient.cpp diff --git a/src/framework/libraries/Makefile b/framework/libraries/Makefile similarity index 100% rename from src/framework/libraries/Makefile rename to framework/libraries/Makefile diff --git a/src/framework/libraries/ServiceManager/CServiceManager.hpp b/framework/libraries/ServiceManager/CServiceManager.hpp similarity index 100% rename from src/framework/libraries/ServiceManager/CServiceManager.hpp rename to framework/libraries/ServiceManager/CServiceManager.hpp diff --git a/src/framework/libraries/ServiceManager/Makefile b/framework/libraries/ServiceManager/Makefile similarity index 100% rename from src/framework/libraries/ServiceManager/Makefile rename to framework/libraries/ServiceManager/Makefile diff --git a/src/framework/libraries/ServiceManager/common.hpp b/framework/libraries/ServiceManager/common.hpp similarity index 100% rename from src/framework/libraries/ServiceManager/common.hpp rename to framework/libraries/ServiceManager/common.hpp diff --git a/src/framework/libraries/ServiceManager/private/CService.cpp b/framework/libraries/ServiceManager/private/CService.cpp similarity index 100% rename from src/framework/libraries/ServiceManager/private/CService.cpp rename to framework/libraries/ServiceManager/private/CService.cpp diff --git a/src/framework/libraries/ServiceManager/private/CService.hpp b/framework/libraries/ServiceManager/private/CService.hpp similarity index 100% rename from src/framework/libraries/ServiceManager/private/CService.hpp rename to framework/libraries/ServiceManager/private/CService.hpp diff --git a/src/framework/libraries/ServiceManager/private/CServiceManager.cpp b/framework/libraries/ServiceManager/private/CServiceManager.cpp similarity index 100% rename from src/framework/libraries/ServiceManager/private/CServiceManager.cpp rename to framework/libraries/ServiceManager/private/CServiceManager.cpp diff --git a/src/framework/libraries/ServiceManager/xml/AuthenticationService.xml b/framework/libraries/ServiceManager/xml/AuthenticationService.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/AuthenticationService.xml rename to framework/libraries/ServiceManager/xml/AuthenticationService.xml diff --git a/src/framework/libraries/ServiceManager/xml/BasicSampleServiceClient.xml b/framework/libraries/ServiceManager/xml/BasicSampleServiceClient.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/BasicSampleServiceClient.xml rename to framework/libraries/ServiceManager/xml/BasicSampleServiceClient.xml diff --git a/src/framework/libraries/ServiceManager/xml/BasicSampleServiceHUI.xml b/framework/libraries/ServiceManager/xml/BasicSampleServiceHUI.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/BasicSampleServiceHUI.xml rename to framework/libraries/ServiceManager/xml/BasicSampleServiceHUI.xml diff --git a/src/framework/libraries/ServiceManager/xml/ClimateClientService.xml b/framework/libraries/ServiceManager/xml/ClimateClientService.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/ClimateClientService.xml rename to framework/libraries/ServiceManager/xml/ClimateClientService.xml diff --git a/src/framework/libraries/ServiceManager/xml/ClimateHUService.xml b/framework/libraries/ServiceManager/xml/ClimateHUService.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/ClimateHUService.xml rename to framework/libraries/ServiceManager/xml/ClimateHUService.xml diff --git a/src/framework/libraries/ServiceManager/xml/ClimateServiceClient.xml b/framework/libraries/ServiceManager/xml/ClimateServiceClient.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/ClimateServiceClient.xml rename to framework/libraries/ServiceManager/xml/ClimateServiceClient.xml diff --git a/src/framework/libraries/ServiceManager/xml/ClimateServiceHUI.xml b/framework/libraries/ServiceManager/xml/ClimateServiceHUI.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/ClimateServiceHUI.xml rename to framework/libraries/ServiceManager/xml/ClimateServiceHUI.xml diff --git a/src/framework/libraries/ServiceManager/xml/HeadUnitServices.xml b/framework/libraries/ServiceManager/xml/HeadUnitServices.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/HeadUnitServices.xml rename to framework/libraries/ServiceManager/xml/HeadUnitServices.xml diff --git a/src/framework/libraries/ServiceManager/xml/SeatClientService.xml b/framework/libraries/ServiceManager/xml/SeatClientService.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/SeatClientService.xml rename to framework/libraries/ServiceManager/xml/SeatClientService.xml diff --git a/src/framework/libraries/ServiceManager/xml/SeatHUService.xml b/framework/libraries/ServiceManager/xml/SeatHUService.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/SeatHUService.xml rename to framework/libraries/ServiceManager/xml/SeatHUService.xml diff --git a/src/framework/libraries/ServiceManager/xml/VehicleSystemClient.xml b/framework/libraries/ServiceManager/xml/VehicleSystemClient.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/VehicleSystemClient.xml rename to framework/libraries/ServiceManager/xml/VehicleSystemClient.xml diff --git a/src/framework/libraries/ServiceManager/xml/VehicleSystemHUI.xml b/framework/libraries/ServiceManager/xml/VehicleSystemHUI.xml similarity index 100% rename from src/framework/libraries/ServiceManager/xml/VehicleSystemHUI.xml rename to framework/libraries/ServiceManager/xml/VehicleSystemHUI.xml diff --git a/src/framework/libraries/trust_list/CTrustList.hpp b/framework/libraries/trust_list/CTrustList.hpp similarity index 100% rename from src/framework/libraries/trust_list/CTrustList.hpp rename to framework/libraries/trust_list/CTrustList.hpp diff --git a/src/framework/libraries/trust_list/CTrustListError.hpp b/framework/libraries/trust_list/CTrustListError.hpp similarity index 100% rename from src/framework/libraries/trust_list/CTrustListError.hpp rename to framework/libraries/trust_list/CTrustListError.hpp diff --git a/src/framework/libraries/trust_list/Makefile b/framework/libraries/trust_list/Makefile similarity index 100% rename from src/framework/libraries/trust_list/Makefile rename to framework/libraries/trust_list/Makefile diff --git a/src/framework/libraries/trust_list/private/CFileStorage.cpp b/framework/libraries/trust_list/private/CFileStorage.cpp similarity index 100% rename from src/framework/libraries/trust_list/private/CFileStorage.cpp rename to framework/libraries/trust_list/private/CFileStorage.cpp diff --git a/src/framework/libraries/trust_list/private/CFileStorage.hpp b/framework/libraries/trust_list/private/CFileStorage.hpp similarity index 100% rename from src/framework/libraries/trust_list/private/CFileStorage.hpp rename to framework/libraries/trust_list/private/CFileStorage.hpp diff --git a/src/framework/libraries/trust_list/private/CTrustList.cpp b/framework/libraries/trust_list/private/CTrustList.cpp similarity index 100% rename from src/framework/libraries/trust_list/private/CTrustList.cpp rename to framework/libraries/trust_list/private/CTrustList.cpp diff --git a/src/framework/libraries/trust_list/private/ITrustListStorage.hpp b/framework/libraries/trust_list/private/ITrustListStorage.hpp similarity index 100% rename from src/framework/libraries/trust_list/private/ITrustListStorage.hpp rename to framework/libraries/trust_list/private/ITrustListStorage.hpp diff --git a/src/framework/libraries/trust_list/private/get_mac.cpp b/framework/libraries/trust_list/private/get_mac.cpp similarity index 100% rename from src/framework/libraries/trust_list/private/get_mac.cpp rename to framework/libraries/trust_list/private/get_mac.cpp diff --git a/src/framework/libraries/trust_list/private/get_mac.hpp b/framework/libraries/trust_list/private/get_mac.hpp similarity index 100% rename from src/framework/libraries/trust_list/private/get_mac.hpp rename to framework/libraries/trust_list/private/get_mac.hpp diff --git a/src/framework/log4cplus.properties b/framework/log4cplus.properties similarity index 100% rename from src/framework/log4cplus.properties rename to framework/log4cplus.properties diff --git a/src/framework/messageProtocol/Makefile b/framework/messageProtocol/Makefile similarity index 100% rename from src/framework/messageProtocol/Makefile rename to framework/messageProtocol/Makefile diff --git a/src/framework/messageProtocol/SystemController_AppMan/AppMan/Makefile b/framework/messageProtocol/SystemController_AppMan/AppMan/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/AppMan/Makefile rename to framework/messageProtocol/SystemController_AppMan/AppMan/Makefile diff --git a/src/framework/messageProtocol/SystemController_AppMan/AppMan/SystemControllerMsgProxy.hpp b/framework/messageProtocol/SystemController_AppMan/AppMan/SystemControllerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/AppMan/SystemControllerMsgProxy.hpp rename to framework/messageProtocol/SystemController_AppMan/AppMan/SystemControllerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_AppMan/AppMan/private/SystemControllerMsgProxy.cpp b/framework/messageProtocol/SystemController_AppMan/AppMan/private/SystemControllerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/AppMan/private/SystemControllerMsgProxy.cpp rename to framework/messageProtocol/SystemController_AppMan/AppMan/private/SystemControllerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_AppMan/Makefile b/framework/messageProtocol/SystemController_AppMan/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/Makefile rename to framework/messageProtocol/SystemController_AppMan/Makefile diff --git a/src/framework/messageProtocol/SystemController_AppMan/SystemController/AppManMsgProxy.hpp b/framework/messageProtocol/SystemController_AppMan/SystemController/AppManMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/SystemController/AppManMsgProxy.hpp rename to framework/messageProtocol/SystemController_AppMan/SystemController/AppManMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_AppMan/SystemController/Makefile b/framework/messageProtocol/SystemController_AppMan/SystemController/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/SystemController/Makefile rename to framework/messageProtocol/SystemController_AppMan/SystemController/Makefile diff --git a/src/framework/messageProtocol/SystemController_AppMan/SystemController/private/AppManMsgProxy.cpp b/framework/messageProtocol/SystemController_AppMan/SystemController/private/AppManMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/SystemController/private/AppManMsgProxy.cpp rename to framework/messageProtocol/SystemController_AppMan/SystemController/private/AppManMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_AppMan/messages.hpp b/framework/messageProtocol/SystemController_AppMan/messages.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_AppMan/messages.hpp rename to framework/messageProtocol/SystemController_AppMan/messages.hpp diff --git a/src/framework/messageProtocol/SystemController_Authentication/Authentication/Makefile b/framework/messageProtocol/SystemController_Authentication/Authentication/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/Authentication/Makefile rename to framework/messageProtocol/SystemController_Authentication/Authentication/Makefile diff --git a/src/framework/messageProtocol/SystemController_Authentication/Authentication/SystemControllerMsgProxy.hpp b/framework/messageProtocol/SystemController_Authentication/Authentication/SystemControllerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/Authentication/SystemControllerMsgProxy.hpp rename to framework/messageProtocol/SystemController_Authentication/Authentication/SystemControllerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_Authentication/Authentication/private/SystemControllerMsgProxy.cpp b/framework/messageProtocol/SystemController_Authentication/Authentication/private/SystemControllerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/Authentication/private/SystemControllerMsgProxy.cpp rename to framework/messageProtocol/SystemController_Authentication/Authentication/private/SystemControllerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_Authentication/Makefile b/framework/messageProtocol/SystemController_Authentication/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/Makefile rename to framework/messageProtocol/SystemController_Authentication/Makefile diff --git a/src/framework/messageProtocol/SystemController_Authentication/SystemController/AuthenticationAppMsgProxy.hpp b/framework/messageProtocol/SystemController_Authentication/SystemController/AuthenticationAppMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/SystemController/AuthenticationAppMsgProxy.hpp rename to framework/messageProtocol/SystemController_Authentication/SystemController/AuthenticationAppMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_Authentication/SystemController/Makefile b/framework/messageProtocol/SystemController_Authentication/SystemController/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/SystemController/Makefile rename to framework/messageProtocol/SystemController_Authentication/SystemController/Makefile diff --git a/src/framework/messageProtocol/SystemController_Authentication/SystemController/private/AuthenticationAppMsgProxy.cpp b/framework/messageProtocol/SystemController_Authentication/SystemController/private/AuthenticationAppMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/SystemController/private/AuthenticationAppMsgProxy.cpp rename to framework/messageProtocol/SystemController_Authentication/SystemController/private/AuthenticationAppMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_Authentication/messages.hpp b/framework/messageProtocol/SystemController_Authentication/messages.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_Authentication/messages.hpp rename to framework/messageProtocol/SystemController_Authentication/messages.hpp diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/Makefile b/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/Makefile rename to framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/Makefile diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/SystemControllerMsgProxy.hpp b/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/SystemControllerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/SystemControllerMsgProxy.hpp rename to framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/SystemControllerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/private/SystemControllerMsgProxy.cpp b/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/private/SystemControllerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/private/SystemControllerMsgProxy.cpp rename to framework/messageProtocol/SystemController_ChannelSupervisor/ChannelSupervisor/private/SystemControllerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/Makefile b/framework/messageProtocol/SystemController_ChannelSupervisor/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/Makefile rename to framework/messageProtocol/SystemController_ChannelSupervisor/Makefile diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/ChannelSupervisorMsgProxy.hpp b/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/ChannelSupervisorMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/ChannelSupervisorMsgProxy.hpp rename to framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/ChannelSupervisorMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/Makefile b/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/Makefile rename to framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/Makefile diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/private/ChannelSupervisorMsgProxy.cpp b/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/private/ChannelSupervisorMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/private/ChannelSupervisorMsgProxy.cpp rename to framework/messageProtocol/SystemController_ChannelSupervisor/SystemController/private/ChannelSupervisorMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ChannelSupervisor/messages.hpp b/framework/messageProtocol/SystemController_ChannelSupervisor/messages.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ChannelSupervisor/messages.hpp rename to framework/messageProtocol/SystemController_ChannelSupervisor/messages.hpp diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/Makefile b/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/Makefile rename to framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/Makefile diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/SystemControllerMsgProxy.hpp b/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/SystemControllerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/SystemControllerMsgProxy.hpp rename to framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/SystemControllerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/private/SystemControllerMsgProxy.cpp b/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/private/SystemControllerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/private/SystemControllerMsgProxy.cpp rename to framework/messageProtocol/SystemController_ConnectivityAgent/ConnectivityAgent/private/SystemControllerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/Makefile b/framework/messageProtocol/SystemController_ConnectivityAgent/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/Makefile rename to framework/messageProtocol/SystemController_ConnectivityAgent/Makefile diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/ConnectivityAgentMsgProxy.hpp b/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/ConnectivityAgentMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/ConnectivityAgentMsgProxy.hpp rename to framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/ConnectivityAgentMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/Makefile b/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/Makefile rename to framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/Makefile diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/private/ConnectivityAgentMsgProxy.cpp b/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/private/ConnectivityAgentMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/private/ConnectivityAgentMsgProxy.cpp rename to framework/messageProtocol/SystemController_ConnectivityAgent/SystemController/private/ConnectivityAgentMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ConnectivityAgent/messages.hpp b/framework/messageProtocol/SystemController_ConnectivityAgent/messages.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ConnectivityAgent/messages.hpp rename to framework/messageProtocol/SystemController_ConnectivityAgent/messages.hpp diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/Makefile b/framework/messageProtocol/SystemController_ProfileManager/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/Makefile rename to framework/messageProtocol/SystemController_ProfileManager/Makefile diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/Makefile b/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/Makefile rename to framework/messageProtocol/SystemController_ProfileManager/ProfileManager/Makefile diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/SystemControllerMsgProxy.hpp b/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/SystemControllerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/SystemControllerMsgProxy.hpp rename to framework/messageProtocol/SystemController_ProfileManager/ProfileManager/SystemControllerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/private/SystemControllerMsgProxy.cpp b/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/private/SystemControllerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/ProfileManager/private/SystemControllerMsgProxy.cpp rename to framework/messageProtocol/SystemController_ProfileManager/ProfileManager/private/SystemControllerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/SystemController/Makefile b/framework/messageProtocol/SystemController_ProfileManager/SystemController/Makefile similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/SystemController/Makefile rename to framework/messageProtocol/SystemController_ProfileManager/SystemController/Makefile diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/SystemController/ProfileManagerMsgProxy.hpp b/framework/messageProtocol/SystemController_ProfileManager/SystemController/ProfileManagerMsgProxy.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/SystemController/ProfileManagerMsgProxy.hpp rename to framework/messageProtocol/SystemController_ProfileManager/SystemController/ProfileManagerMsgProxy.hpp diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/SystemController/private/ProfileManagerMsgProxy.cpp b/framework/messageProtocol/SystemController_ProfileManager/SystemController/private/ProfileManagerMsgProxy.cpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/SystemController/private/ProfileManagerMsgProxy.cpp rename to framework/messageProtocol/SystemController_ProfileManager/SystemController/private/ProfileManagerMsgProxy.cpp diff --git a/src/framework/messageProtocol/SystemController_ProfileManager/messages.hpp b/framework/messageProtocol/SystemController_ProfileManager/messages.hpp similarity index 100% rename from src/framework/messageProtocol/SystemController_ProfileManager/messages.hpp rename to framework/messageProtocol/SystemController_ProfileManager/messages.hpp diff --git a/src/framework/public/Makefile b/framework/public/Makefile similarity index 100% rename from src/framework/public/Makefile rename to framework/public/Makefile diff --git a/src/framework/public/appLib/CApp.hpp b/framework/public/appLib/CApp.hpp similarity index 100% rename from src/framework/public/appLib/CApp.hpp rename to framework/public/appLib/CApp.hpp diff --git a/src/framework/public/appLib/CProfileApiBase.hpp b/framework/public/appLib/CProfileApiBase.hpp similarity index 100% rename from src/framework/public/appLib/CProfileApiBase.hpp rename to framework/public/appLib/CProfileApiBase.hpp diff --git a/src/framework/public/appLib/CProfileProxy.hpp b/framework/public/appLib/CProfileProxy.hpp similarity index 100% rename from src/framework/public/appLib/CProfileProxy.hpp rename to framework/public/appLib/CProfileProxy.hpp diff --git a/src/framework/public/appLib/Doxyfile b/framework/public/appLib/Doxyfile similarity index 100% rename from src/framework/public/appLib/Doxyfile rename to framework/public/appLib/Doxyfile diff --git a/src/framework/public/appLib/Makefile b/framework/public/appLib/Makefile similarity index 100% rename from src/framework/public/appLib/Makefile rename to framework/public/appLib/Makefile diff --git a/src/framework/public/appLib/common.hpp b/framework/public/appLib/common.hpp similarity index 100% rename from src/framework/public/appLib/common.hpp rename to framework/public/appLib/common.hpp diff --git a/src/framework/public/appLib/macro.hpp b/framework/public/appLib/macro.hpp similarity index 100% rename from src/framework/public/appLib/macro.hpp rename to framework/public/appLib/macro.hpp diff --git a/src/framework/public/appLib/private/CApp.cpp b/framework/public/appLib/private/CApp.cpp similarity index 100% rename from src/framework/public/appLib/private/CApp.cpp rename to framework/public/appLib/private/CApp.cpp diff --git a/src/framework/public/appLib/private/CAppManProxy.cpp b/framework/public/appLib/private/CAppManProxy.cpp similarity index 100% rename from src/framework/public/appLib/private/CAppManProxy.cpp rename to framework/public/appLib/private/CAppManProxy.cpp diff --git a/src/framework/public/appLib/private/CAppManProxy.hpp b/framework/public/appLib/private/CAppManProxy.hpp similarity index 100% rename from src/framework/public/appLib/private/CAppManProxy.hpp rename to framework/public/appLib/private/CAppManProxy.hpp diff --git a/src/framework/public/appLib/private/CLogger.cpp b/framework/public/appLib/private/CLogger.cpp similarity index 100% rename from src/framework/public/appLib/private/CLogger.cpp rename to framework/public/appLib/private/CLogger.cpp diff --git a/src/framework/public/appLib/private/CLogger.hpp b/framework/public/appLib/private/CLogger.hpp similarity index 100% rename from src/framework/public/appLib/private/CLogger.hpp rename to framework/public/appLib/private/CLogger.hpp diff --git a/src/framework/public/appLib/private/CProfileProxy.cpp b/framework/public/appLib/private/CProfileProxy.cpp similarity index 100% rename from src/framework/public/appLib/private/CProfileProxy.cpp rename to framework/public/appLib/private/CProfileProxy.cpp diff --git a/src/framework/public/appLib/private/CServManProxy.cpp b/framework/public/appLib/private/CServManProxy.cpp similarity index 100% rename from src/framework/public/appLib/private/CServManProxy.cpp rename to framework/public/appLib/private/CServManProxy.cpp diff --git a/src/framework/public/appLib/private/CServManProxy.hpp b/framework/public/appLib/private/CServManProxy.hpp similarity index 100% rename from src/framework/public/appLib/private/CServManProxy.hpp rename to framework/public/appLib/private/CServManProxy.hpp diff --git a/src/framework/public/appLib/sharedLib/Makefile b/framework/public/appLib/sharedLib/Makefile similarity index 100% rename from src/framework/public/appLib/sharedLib/Makefile rename to framework/public/appLib/sharedLib/Makefile diff --git a/src/framework/public/appLib/staticLib/Makefile b/framework/public/appLib/staticLib/Makefile similarity index 100% rename from src/framework/public/appLib/staticLib/Makefile rename to framework/public/appLib/staticLib/Makefile diff --git a/src/framework/public/profileLib/CBuffer.hpp b/framework/public/profileLib/CBuffer.hpp similarity index 100% rename from src/framework/public/profileLib/CBuffer.hpp rename to framework/public/profileLib/CBuffer.hpp diff --git a/src/framework/public/profileLib/Channel.hpp b/framework/public/profileLib/Channel.hpp similarity index 100% rename from src/framework/public/profileLib/Channel.hpp rename to framework/public/profileLib/Channel.hpp diff --git a/src/framework/public/profileLib/Doxyfile b/framework/public/profileLib/Doxyfile similarity index 100% rename from src/framework/public/profileLib/Doxyfile rename to framework/public/profileLib/Doxyfile diff --git a/src/framework/public/profileLib/Makefile b/framework/public/profileLib/Makefile similarity index 100% rename from src/framework/public/profileLib/Makefile rename to framework/public/profileLib/Makefile diff --git a/src/framework/public/profileLib/defines.hpp b/framework/public/profileLib/defines.hpp similarity index 100% rename from src/framework/public/profileLib/defines.hpp rename to framework/public/profileLib/defines.hpp diff --git a/src/framework/public/profileLib/private/CBuffer.cpp b/framework/public/profileLib/private/CBuffer.cpp similarity index 100% rename from src/framework/public/profileLib/private/CBuffer.cpp rename to framework/public/profileLib/private/CBuffer.cpp diff --git a/src/framework/public/profileLib/private/Channel.cpp b/framework/public/profileLib/private/Channel.cpp similarity index 100% rename from src/framework/public/profileLib/private/Channel.cpp rename to framework/public/profileLib/private/Channel.cpp diff --git a/src/framework/public/profileLib/profileLib.hpp b/framework/public/profileLib/profileLib.hpp similarity index 100% rename from src/framework/public/profileLib/profileLib.hpp rename to framework/public/profileLib/profileLib.hpp diff --git a/src/samples/LICENSE.txt b/samples/LICENSE.txt similarity index 100% rename from src/samples/LICENSE.txt rename to samples/LICENSE.txt diff --git a/src/samples/Makefile b/samples/Makefile similarity index 100% rename from src/samples/Makefile rename to samples/Makefile diff --git a/src/samples/linux/AppManDatabase.xml b/samples/linux/AppManDatabase.xml similarity index 100% rename from src/samples/linux/AppManDatabase.xml rename to samples/linux/AppManDatabase.xml diff --git a/src/samples/linux/AuthenticationApplication/AuthenticationApplication.pro b/samples/linux/AuthenticationApplication/AuthenticationApplication.pro similarity index 100% rename from src/samples/linux/AuthenticationApplication/AuthenticationApplication.pro rename to samples/linux/AuthenticationApplication/AuthenticationApplication.pro diff --git a/src/samples/linux/AuthenticationApplication/AuthenticationDialog.cpp b/samples/linux/AuthenticationApplication/AuthenticationDialog.cpp similarity index 100% rename from src/samples/linux/AuthenticationApplication/AuthenticationDialog.cpp rename to samples/linux/AuthenticationApplication/AuthenticationDialog.cpp diff --git a/src/samples/linux/AuthenticationApplication/AuthenticationDialog.hpp b/samples/linux/AuthenticationApplication/AuthenticationDialog.hpp similarity index 100% rename from src/samples/linux/AuthenticationApplication/AuthenticationDialog.hpp rename to samples/linux/AuthenticationApplication/AuthenticationDialog.hpp diff --git a/src/samples/linux/AuthenticationApplication/CPINCode.cpp b/samples/linux/AuthenticationApplication/CPINCode.cpp similarity index 100% rename from src/samples/linux/AuthenticationApplication/CPINCode.cpp rename to samples/linux/AuthenticationApplication/CPINCode.cpp diff --git a/src/samples/linux/AuthenticationApplication/CPINCode.hpp b/samples/linux/AuthenticationApplication/CPINCode.hpp similarity index 100% rename from src/samples/linux/AuthenticationApplication/CPINCode.hpp rename to samples/linux/AuthenticationApplication/CPINCode.hpp diff --git a/src/samples/linux/AuthenticationApplication/Makefile b/samples/linux/AuthenticationApplication/Makefile similarity index 100% rename from src/samples/linux/AuthenticationApplication/Makefile rename to samples/linux/AuthenticationApplication/Makefile diff --git a/src/samples/linux/AuthenticationApplication/auth.ui b/samples/linux/AuthenticationApplication/auth.ui similarity index 100% rename from src/samples/linux/AuthenticationApplication/auth.ui rename to samples/linux/AuthenticationApplication/auth.ui diff --git a/src/samples/linux/AuthenticationApplication/auth_style_sheet.qrc b/samples/linux/AuthenticationApplication/auth_style_sheet.qrc similarity index 100% rename from src/samples/linux/AuthenticationApplication/auth_style_sheet.qrc rename to samples/linux/AuthenticationApplication/auth_style_sheet.qrc diff --git a/src/samples/linux/AuthenticationApplication/images/pin/0-01.png b/samples/linux/AuthenticationApplication/images/pin/0-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/0-01.png rename to samples/linux/AuthenticationApplication/images/pin/0-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/00-01.png b/samples/linux/AuthenticationApplication/images/pin/00-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/00-01.png rename to samples/linux/AuthenticationApplication/images/pin/00-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/1-01.png b/samples/linux/AuthenticationApplication/images/pin/1-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/1-01.png rename to samples/linux/AuthenticationApplication/images/pin/1-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/2-01.png b/samples/linux/AuthenticationApplication/images/pin/2-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/2-01.png rename to samples/linux/AuthenticationApplication/images/pin/2-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/3-01.png b/samples/linux/AuthenticationApplication/images/pin/3-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/3-01.png rename to samples/linux/AuthenticationApplication/images/pin/3-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/4-01.png b/samples/linux/AuthenticationApplication/images/pin/4-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/4-01.png rename to samples/linux/AuthenticationApplication/images/pin/4-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/5-01.png b/samples/linux/AuthenticationApplication/images/pin/5-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/5-01.png rename to samples/linux/AuthenticationApplication/images/pin/5-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/6-01.png b/samples/linux/AuthenticationApplication/images/pin/6-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/6-01.png rename to samples/linux/AuthenticationApplication/images/pin/6-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/7-01.png b/samples/linux/AuthenticationApplication/images/pin/7-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/7-01.png rename to samples/linux/AuthenticationApplication/images/pin/7-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/8-01.png b/samples/linux/AuthenticationApplication/images/pin/8-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/8-01.png rename to samples/linux/AuthenticationApplication/images/pin/8-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/9-01.png b/samples/linux/AuthenticationApplication/images/pin/9-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/9-01.png rename to samples/linux/AuthenticationApplication/images/pin/9-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/can-01.png b/samples/linux/AuthenticationApplication/images/pin/can-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/can-01.png rename to samples/linux/AuthenticationApplication/images/pin/can-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/enter_4_digits_msg.png b/samples/linux/AuthenticationApplication/images/pin/enter_4_digits_msg.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/enter_4_digits_msg.png rename to samples/linux/AuthenticationApplication/images/pin/enter_4_digits_msg.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/ok-01.png b/samples/linux/AuthenticationApplication/images/pin/ok-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/ok-01.png rename to samples/linux/AuthenticationApplication/images/pin/ok-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/pin-b-01.png b/samples/linux/AuthenticationApplication/images/pin/pin-b-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/pin-b-01.png rename to samples/linux/AuthenticationApplication/images/pin/pin-b-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/pol-01.png b/samples/linux/AuthenticationApplication/images/pin/pol-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/pol-01.png rename to samples/linux/AuthenticationApplication/images/pin/pol-01.png diff --git a/src/samples/linux/AuthenticationApplication/images/pin/str-01.png b/samples/linux/AuthenticationApplication/images/pin/str-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/images/pin/str-01.png rename to samples/linux/AuthenticationApplication/images/pin/str-01.png diff --git a/src/samples/linux/AuthenticationApplication/main.cpp b/samples/linux/AuthenticationApplication/main.cpp similarity index 100% rename from src/samples/linux/AuthenticationApplication/main.cpp rename to samples/linux/AuthenticationApplication/main.cpp diff --git a/src/samples/linux/AuthenticationApplication/pin/0-01.png b/samples/linux/AuthenticationApplication/pin/0-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/0-01.png rename to samples/linux/AuthenticationApplication/pin/0-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/00-01.png b/samples/linux/AuthenticationApplication/pin/00-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/00-01.png rename to samples/linux/AuthenticationApplication/pin/00-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/1-01.png b/samples/linux/AuthenticationApplication/pin/1-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/1-01.png rename to samples/linux/AuthenticationApplication/pin/1-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/2-01.png b/samples/linux/AuthenticationApplication/pin/2-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/2-01.png rename to samples/linux/AuthenticationApplication/pin/2-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/3-01.png b/samples/linux/AuthenticationApplication/pin/3-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/3-01.png rename to samples/linux/AuthenticationApplication/pin/3-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/4-01.png b/samples/linux/AuthenticationApplication/pin/4-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/4-01.png rename to samples/linux/AuthenticationApplication/pin/4-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/5-01.png b/samples/linux/AuthenticationApplication/pin/5-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/5-01.png rename to samples/linux/AuthenticationApplication/pin/5-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/6-01.png b/samples/linux/AuthenticationApplication/pin/6-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/6-01.png rename to samples/linux/AuthenticationApplication/pin/6-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/7-01.png b/samples/linux/AuthenticationApplication/pin/7-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/7-01.png rename to samples/linux/AuthenticationApplication/pin/7-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/8-01.png b/samples/linux/AuthenticationApplication/pin/8-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/8-01.png rename to samples/linux/AuthenticationApplication/pin/8-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/9-01.png b/samples/linux/AuthenticationApplication/pin/9-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/9-01.png rename to samples/linux/AuthenticationApplication/pin/9-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/auth_failed.png b/samples/linux/AuthenticationApplication/pin/auth_failed.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/auth_failed.png rename to samples/linux/AuthenticationApplication/pin/auth_failed.png diff --git a/src/samples/linux/AuthenticationApplication/pin/can-01.png b/samples/linux/AuthenticationApplication/pin/can-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/can-01.png rename to samples/linux/AuthenticationApplication/pin/can-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/enter_4_digits_msg.png b/samples/linux/AuthenticationApplication/pin/enter_4_digits_msg.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/enter_4_digits_msg.png rename to samples/linux/AuthenticationApplication/pin/enter_4_digits_msg.png diff --git a/src/samples/linux/AuthenticationApplication/pin/ok-01.png b/samples/linux/AuthenticationApplication/pin/ok-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/ok-01.png rename to samples/linux/AuthenticationApplication/pin/ok-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/pin-b-01.png b/samples/linux/AuthenticationApplication/pin/pin-b-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/pin-b-01.png rename to samples/linux/AuthenticationApplication/pin/pin-b-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/pol-01.png b/samples/linux/AuthenticationApplication/pin/pol-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/pol-01.png rename to samples/linux/AuthenticationApplication/pin/pol-01.png diff --git a/src/samples/linux/AuthenticationApplication/pin/str-01.png b/samples/linux/AuthenticationApplication/pin/str-01.png similarity index 100% rename from src/samples/linux/AuthenticationApplication/pin/str-01.png rename to samples/linux/AuthenticationApplication/pin/str-01.png diff --git a/src/samples/linux/BasicSample/CBasicSample.cpp b/samples/linux/BasicSample/CBasicSample.cpp similarity index 100% rename from src/samples/linux/BasicSample/CBasicSample.cpp rename to samples/linux/BasicSample/CBasicSample.cpp diff --git a/src/samples/linux/BasicSample/CBasicSample.hpp b/samples/linux/BasicSample/CBasicSample.hpp similarity index 100% rename from src/samples/linux/BasicSample/CBasicSample.hpp rename to samples/linux/BasicSample/CBasicSample.hpp diff --git a/src/samples/linux/BasicSample/Makefile b/samples/linux/BasicSample/Makefile similarity index 100% rename from src/samples/linux/BasicSample/Makefile rename to samples/linux/BasicSample/Makefile diff --git a/src/samples/linux/BasicSample/main.cpp b/samples/linux/BasicSample/main.cpp similarity index 100% rename from src/samples/linux/BasicSample/main.cpp rename to samples/linux/BasicSample/main.cpp diff --git a/src/samples/linux/ClimateClient_App/ClimateClient_App.pro b/samples/linux/ClimateClient_App/ClimateClient_App.pro similarity index 100% rename from src/samples/linux/ClimateClient_App/ClimateClient_App.pro rename to samples/linux/ClimateClient_App/ClimateClient_App.pro diff --git a/src/samples/linux/ClimateClient_App/IProfileObserver.hpp b/samples/linux/ClimateClient_App/IProfileObserver.hpp similarity index 100% rename from src/samples/linux/ClimateClient_App/IProfileObserver.hpp rename to samples/linux/ClimateClient_App/IProfileObserver.hpp diff --git a/src/samples/linux/ClimateClient_App/Makefile b/samples/linux/ClimateClient_App/Makefile similarity index 100% rename from src/samples/linux/ClimateClient_App/Makefile rename to samples/linux/ClimateClient_App/Makefile diff --git a/src/samples/linux/ClimateClient_App/cclimateclientprofilecallbacks.hpp b/samples/linux/ClimateClient_App/cclimateclientprofilecallbacks.hpp similarity index 100% rename from src/samples/linux/ClimateClient_App/cclimateclientprofilecallbacks.hpp rename to samples/linux/ClimateClient_App/cclimateclientprofilecallbacks.hpp diff --git a/src/samples/linux/ClimateClient_App/common.hpp b/samples/linux/ClimateClient_App/common.hpp similarity index 100% rename from src/samples/linux/ClimateClient_App/common.hpp rename to samples/linux/ClimateClient_App/common.hpp diff --git a/src/samples/linux/ClimateClient_App/crequestprocessor.cpp b/samples/linux/ClimateClient_App/crequestprocessor.cpp similarity index 100% rename from src/samples/linux/ClimateClient_App/crequestprocessor.cpp rename to samples/linux/ClimateClient_App/crequestprocessor.cpp diff --git a/src/samples/linux/ClimateClient_App/crequestprocessor.h b/samples/linux/ClimateClient_App/crequestprocessor.h similarity index 100% rename from src/samples/linux/ClimateClient_App/crequestprocessor.h rename to samples/linux/ClimateClient_App/crequestprocessor.h diff --git a/src/samples/linux/ClimateClient_App/cstateupdater.cpp b/samples/linux/ClimateClient_App/cstateupdater.cpp similarity index 100% rename from src/samples/linux/ClimateClient_App/cstateupdater.cpp rename to samples/linux/ClimateClient_App/cstateupdater.cpp diff --git a/src/samples/linux/ClimateClient_App/cstateupdater.h b/samples/linux/ClimateClient_App/cstateupdater.h similarity index 100% rename from src/samples/linux/ClimateClient_App/cstateupdater.h rename to samples/linux/ClimateClient_App/cstateupdater.h diff --git a/src/samples/linux/ClimateClient_App/main.cpp b/samples/linux/ClimateClient_App/main.cpp similarity index 100% rename from src/samples/linux/ClimateClient_App/main.cpp rename to samples/linux/ClimateClient_App/main.cpp diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/ac-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/auto-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/b-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/b-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/b-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/b-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/border-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/border-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/border-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/border-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/dug-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/dug-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/dug-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/dug-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/f-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/f-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/f-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/front-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/front-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/front-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/g-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/g-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/g-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/h-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/h-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/h-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/in-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/in-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/in-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/kl-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/kl-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/kl-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/kl-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/main.qml b/samples/linux/ClimateClient_App/qml/ClimateClient_App/main.qml similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/main.qml rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/main.qml diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/min-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/min-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/min-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/off-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-03.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-03.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/off-03.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/off-03.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/pl-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/rear-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/str-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-a-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-a-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/str-a-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/str-a-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-03.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-03.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-03.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/sync-03.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v0-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v0-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v0-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v0-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v1-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v1-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v1-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v1-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v2-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v2-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v2-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v2-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v3-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v3-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v3-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v3-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v4-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v4-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v4-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v4-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v5-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v5-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v5-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v5-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v6-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v6-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v6-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v6-01.png diff --git a/src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v7-01.png b/samples/linux/ClimateClient_App/qml/ClimateClient_App/v7-01.png similarity index 100% rename from src/samples/linux/ClimateClient_App/qml/ClimateClient_App/v7-01.png rename to samples/linux/ClimateClient_App/qml/ClimateClient_App/v7-01.png diff --git a/src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp b/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp rename to samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.h b/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.h rename to samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.pri b/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from src/samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.pri rename to samples/linux/ClimateClient_App/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/src/samples/linux/ClimateHU_App/ClimateHU_App.pro b/samples/linux/ClimateHU_App/ClimateHU_App.pro similarity index 100% rename from src/samples/linux/ClimateHU_App/ClimateHU_App.pro rename to samples/linux/ClimateHU_App/ClimateHU_App.pro diff --git a/src/samples/linux/ClimateHU_App/IProfileObserver.hpp b/samples/linux/ClimateHU_App/IProfileObserver.hpp similarity index 100% rename from src/samples/linux/ClimateHU_App/IProfileObserver.hpp rename to samples/linux/ClimateHU_App/IProfileObserver.hpp diff --git a/src/samples/linux/ClimateHU_App/Makefile b/samples/linux/ClimateHU_App/Makefile similarity index 100% rename from src/samples/linux/ClimateHU_App/Makefile rename to samples/linux/ClimateHU_App/Makefile diff --git a/src/samples/linux/ClimateHU_App/cclimatecond.cpp b/samples/linux/ClimateHU_App/cclimatecond.cpp similarity index 100% rename from src/samples/linux/ClimateHU_App/cclimatecond.cpp rename to samples/linux/ClimateHU_App/cclimatecond.cpp diff --git a/src/samples/linux/ClimateHU_App/cclimatecond.h b/samples/linux/ClimateHU_App/cclimatecond.h similarity index 100% rename from src/samples/linux/ClimateHU_App/cclimatecond.h rename to samples/linux/ClimateHU_App/cclimatecond.h diff --git a/src/samples/linux/ClimateHU_App/cclimatehuprofilecallbacks.hpp b/samples/linux/ClimateHU_App/cclimatehuprofilecallbacks.hpp similarity index 100% rename from src/samples/linux/ClimateHU_App/cclimatehuprofilecallbacks.hpp rename to samples/linux/ClimateHU_App/cclimatehuprofilecallbacks.hpp diff --git a/src/samples/linux/ClimateHU_App/common.hpp b/samples/linux/ClimateHU_App/common.hpp similarity index 100% rename from src/samples/linux/ClimateHU_App/common.hpp rename to samples/linux/ClimateHU_App/common.hpp diff --git a/src/samples/linux/ClimateHU_App/condcommon.h b/samples/linux/ClimateHU_App/condcommon.h similarity index 100% rename from src/samples/linux/ClimateHU_App/condcommon.h rename to samples/linux/ClimateHU_App/condcommon.h diff --git a/src/samples/linux/ClimateHU_App/crequestprocessor.cpp b/samples/linux/ClimateHU_App/crequestprocessor.cpp similarity index 100% rename from src/samples/linux/ClimateHU_App/crequestprocessor.cpp rename to samples/linux/ClimateHU_App/crequestprocessor.cpp diff --git a/src/samples/linux/ClimateHU_App/crequestprocessor.h b/samples/linux/ClimateHU_App/crequestprocessor.h similarity index 100% rename from src/samples/linux/ClimateHU_App/crequestprocessor.h rename to samples/linux/ClimateHU_App/crequestprocessor.h diff --git a/src/samples/linux/ClimateHU_App/cstateupdater.cpp b/samples/linux/ClimateHU_App/cstateupdater.cpp similarity index 100% rename from src/samples/linux/ClimateHU_App/cstateupdater.cpp rename to samples/linux/ClimateHU_App/cstateupdater.cpp diff --git a/src/samples/linux/ClimateHU_App/cstateupdater.h b/samples/linux/ClimateHU_App/cstateupdater.h similarity index 100% rename from src/samples/linux/ClimateHU_App/cstateupdater.h rename to samples/linux/ClimateHU_App/cstateupdater.h diff --git a/src/samples/linux/ClimateHU_App/main.cpp b/samples/linux/ClimateHU_App/main.cpp similarity index 100% rename from src/samples/linux/ClimateHU_App/main.cpp rename to samples/linux/ClimateHU_App/main.cpp diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/ac-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/auto-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/b-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/b-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/b-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/b-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/border-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/border-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/border-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/border-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/dug-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/dug-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/dug-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/dug-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/f-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/f-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/f-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/front-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/front-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/front-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/g-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/g-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/g-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/h-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/h-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/h-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/in-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/in-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/in-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/kl-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/kl-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/kl-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/kl-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/main.qml b/samples/linux/ClimateHU_App/qml/ClimateHU_App/main.qml similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/main.qml rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/main.qml diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/min-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/min-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/min-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/off-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-03.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-03.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/off-03.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/off-03.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/pl-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/rear-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/str-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-a-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-a-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/str-a-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/str-a-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-03.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-03.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-03.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/sync-03.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v0-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v0-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v0-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v0-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v1-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v1-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v1-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v1-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v2-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v2-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v2-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v2-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v3-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v3-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v3-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v3-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v4-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v4-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v4-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v4-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v5-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v5-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v5-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v5-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v6-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v6-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v6-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v6-01.png diff --git a/src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v7-01.png b/samples/linux/ClimateHU_App/qml/ClimateHU_App/v7-01.png similarity index 100% rename from src/samples/linux/ClimateHU_App/qml/ClimateHU_App/v7-01.png rename to samples/linux/ClimateHU_App/qml/ClimateHU_App/v7-01.png diff --git a/src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp b/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp rename to samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.h b/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.h rename to samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.pri b/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from src/samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.pri rename to samples/linux/ClimateHU_App/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/src/samples/linux/Makefile b/samples/linux/Makefile similarity index 100% rename from src/samples/linux/Makefile rename to samples/linux/Makefile diff --git a/src/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp b/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp similarity index 99% rename from src/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp rename to samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp index d7a29a5b..f99fce7e 100644 --- a/src/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp +++ b/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.cpp @@ -31,7 +31,7 @@ #include #include -#include "3rd_party/cryptopp/cryptopp-5.6.1/queue.h" +#include "3rd_party/cryptopp/cryptopp/queue.h" #include "CAuthenticationProfileImpl.hpp" #include "CRSAEncryptDecrypt.hpp" diff --git a/src/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.hpp b/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.hpp similarity index 100% rename from src/samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.hpp rename to samples/linux/Profiles/AuthenticationProfileImpl/CAuthenticationProfileImpl.hpp diff --git a/src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp b/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp similarity index 96% rename from src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp rename to samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp index 8205152e..1ceb3b81 100644 --- a/src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp +++ b/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.cpp @@ -28,13 +28,13 @@ #include "CRSAEncryptDecrypt.hpp" -#include "3rd_party/cryptopp/cryptopp-5.6.1/filters.h" +#include "3rd_party/cryptopp/cryptopp/filters.h" using CryptoPP::PK_EncryptorFilter; using CryptoPP::PK_DecryptorFilter; using CryptoPP::StringSink; using CryptoPP::StringSource; -#include "3rd_party/cryptopp/cryptopp-5.6.1/osrng.h" +#include "3rd_party/cryptopp/cryptopp/osrng.h" using CryptoPP::AutoSeededRandomPool; using CryptoPP::RSAES_OAEP_SHA_Encryptor; diff --git a/src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp b/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp similarity index 96% rename from src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp rename to samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp index d3a11aba..8b1ae4ff 100644 --- a/src/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp +++ b/samples/linux/Profiles/AuthenticationProfileImpl/CRSAEncryptDecrypt.hpp @@ -31,8 +31,8 @@ #include #include "utils/misc/Logger.hpp" -#include "3rd_party/cryptopp/cryptopp-5.6.1/rsa.h" -#include "3rd_party/cryptopp/cryptopp-5.6.1/integer.h" +#include "3rd_party/cryptopp/cryptopp/rsa.h" +#include "3rd_party/cryptopp/cryptopp/integer.h" using CryptoPP::Integer; using CryptoPP::RSA; diff --git a/src/samples/linux/Profiles/AuthenticationProfileImpl/Makefile b/samples/linux/Profiles/AuthenticationProfileImpl/Makefile similarity index 100% rename from src/samples/linux/Profiles/AuthenticationProfileImpl/Makefile rename to samples/linux/Profiles/AuthenticationProfileImpl/Makefile diff --git a/src/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.cpp b/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.cpp similarity index 100% rename from src/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.cpp rename to samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.cpp diff --git a/src/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.hpp b/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.hpp similarity index 100% rename from src/samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.hpp rename to samples/linux/Profiles/BasicSampleProfileImpl/CBasicSampleProfileImpl.hpp diff --git a/src/samples/linux/Profiles/BasicSampleProfileImpl/Makefile b/samples/linux/Profiles/BasicSampleProfileImpl/Makefile similarity index 100% rename from src/samples/linux/Profiles/BasicSampleProfileImpl/Makefile rename to samples/linux/Profiles/BasicSampleProfileImpl/Makefile diff --git a/src/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.cpp b/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.cpp similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.cpp rename to samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.cpp diff --git a/src/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.hpp b/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.hpp rename to samples/linux/Profiles/ClimateClientProfile/CClimateClientProfile.hpp diff --git a/src/samples/linux/Profiles/ClimateClientProfile/CSenderThread.cpp b/samples/linux/Profiles/ClimateClientProfile/CSenderThread.cpp similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/CSenderThread.cpp rename to samples/linux/Profiles/ClimateClientProfile/CSenderThread.cpp diff --git a/src/samples/linux/Profiles/ClimateClientProfile/CSenderThread.hpp b/samples/linux/Profiles/ClimateClientProfile/CSenderThread.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/CSenderThread.hpp rename to samples/linux/Profiles/ClimateClientProfile/CSenderThread.hpp diff --git a/src/samples/linux/Profiles/ClimateClientProfile/ISender.hpp b/samples/linux/Profiles/ClimateClientProfile/ISender.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/ISender.hpp rename to samples/linux/Profiles/ClimateClientProfile/ISender.hpp diff --git a/src/samples/linux/Profiles/ClimateClientProfile/Makefile b/samples/linux/Profiles/ClimateClientProfile/Makefile similarity index 100% rename from src/samples/linux/Profiles/ClimateClientProfile/Makefile rename to samples/linux/Profiles/ClimateClientProfile/Makefile diff --git a/src/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.cpp b/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.cpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.cpp rename to samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.cpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.hpp b/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.hpp rename to samples/linux/Profiles/ClimateHUProfile/CClimateHUProfile.hpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/CSenderThread.cpp b/samples/linux/Profiles/ClimateHUProfile/CSenderThread.cpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/CSenderThread.cpp rename to samples/linux/Profiles/ClimateHUProfile/CSenderThread.cpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/CSenderThread.hpp b/samples/linux/Profiles/ClimateHUProfile/CSenderThread.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/CSenderThread.hpp rename to samples/linux/Profiles/ClimateHUProfile/CSenderThread.hpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/EReqType.hpp b/samples/linux/Profiles/ClimateHUProfile/EReqType.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/EReqType.hpp rename to samples/linux/Profiles/ClimateHUProfile/EReqType.hpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/ISender.hpp b/samples/linux/Profiles/ClimateHUProfile/ISender.hpp similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/ISender.hpp rename to samples/linux/Profiles/ClimateHUProfile/ISender.hpp diff --git a/src/samples/linux/Profiles/ClimateHUProfile/Makefile b/samples/linux/Profiles/ClimateHUProfile/Makefile similarity index 100% rename from src/samples/linux/Profiles/ClimateHUProfile/Makefile rename to samples/linux/Profiles/ClimateHUProfile/Makefile diff --git a/src/samples/linux/Profiles/Makefile b/samples/linux/Profiles/Makefile similarity index 100% rename from src/samples/linux/Profiles/Makefile rename to samples/linux/Profiles/Makefile diff --git a/src/samples/linux/Profiles/ProfileAPI/EClimateRequests.hpp b/samples/linux/Profiles/ProfileAPI/EClimateRequests.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/EClimateRequests.hpp rename to samples/linux/Profiles/ProfileAPI/EClimateRequests.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/ESeatRequests.hpp b/samples/linux/Profiles/ProfileAPI/ESeatRequests.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/ESeatRequests.hpp rename to samples/linux/Profiles/ProfileAPI/ESeatRequests.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/IAuthenticationProfileAPI.hpp b/samples/linux/Profiles/ProfileAPI/IAuthenticationProfileAPI.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/IAuthenticationProfileAPI.hpp rename to samples/linux/Profiles/ProfileAPI/IAuthenticationProfileAPI.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/IBasicSampleProfileAPI.hpp b/samples/linux/Profiles/ProfileAPI/IBasicSampleProfileAPI.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/IBasicSampleProfileAPI.hpp rename to samples/linux/Profiles/ProfileAPI/IBasicSampleProfileAPI.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/IClimateClientProfile.hpp b/samples/linux/Profiles/ProfileAPI/IClimateClientProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/IClimateClientProfile.hpp rename to samples/linux/Profiles/ProfileAPI/IClimateClientProfile.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/IClimateHUProfile.hpp b/samples/linux/Profiles/ProfileAPI/IClimateHUProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/IClimateHUProfile.hpp rename to samples/linux/Profiles/ProfileAPI/IClimateHUProfile.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/ISeatClientProfile.hpp b/samples/linux/Profiles/ProfileAPI/ISeatClientProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/ISeatClientProfile.hpp rename to samples/linux/Profiles/ProfileAPI/ISeatClientProfile.hpp diff --git a/src/samples/linux/Profiles/ProfileAPI/ISeatHUProfile.hpp b/samples/linux/Profiles/ProfileAPI/ISeatHUProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileAPI/ISeatHUProfile.hpp rename to samples/linux/Profiles/ProfileAPI/ISeatHUProfile.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CAuthenticationProxy.hpp b/samples/linux/Profiles/ProfileProxy/CAuthenticationProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CAuthenticationProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CAuthenticationProxy.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp b/samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CBasicSampleProfileProxy.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CClimateClientProxy.hpp b/samples/linux/Profiles/ProfileProxy/CClimateClientProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CClimateClientProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CClimateClientProxy.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CClimateHUProxy.hpp b/samples/linux/Profiles/ProfileProxy/CClimateHUProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CClimateHUProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CClimateHUProxy.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CSeatClientProxy.hpp b/samples/linux/Profiles/ProfileProxy/CSeatClientProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CSeatClientProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CSeatClientProxy.hpp diff --git a/src/samples/linux/Profiles/ProfileProxy/CSeatHUProxy.hpp b/samples/linux/Profiles/ProfileProxy/CSeatHUProxy.hpp similarity index 100% rename from src/samples/linux/Profiles/ProfileProxy/CSeatHUProxy.hpp rename to samples/linux/Profiles/ProfileProxy/CSeatHUProxy.hpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.cpp b/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.cpp similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.cpp rename to samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.cpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.hpp b/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.hpp rename to samples/linux/Profiles/SeatClientProfile/CSeatClientProfile.hpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/CSenderThread.cpp b/samples/linux/Profiles/SeatClientProfile/CSenderThread.cpp similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/CSenderThread.cpp rename to samples/linux/Profiles/SeatClientProfile/CSenderThread.cpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/CSenderThread.hpp b/samples/linux/Profiles/SeatClientProfile/CSenderThread.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/CSenderThread.hpp rename to samples/linux/Profiles/SeatClientProfile/CSenderThread.hpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/ISender.hpp b/samples/linux/Profiles/SeatClientProfile/ISender.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/ISender.hpp rename to samples/linux/Profiles/SeatClientProfile/ISender.hpp diff --git a/src/samples/linux/Profiles/SeatClientProfile/Makefile b/samples/linux/Profiles/SeatClientProfile/Makefile similarity index 100% rename from src/samples/linux/Profiles/SeatClientProfile/Makefile rename to samples/linux/Profiles/SeatClientProfile/Makefile diff --git a/src/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.cpp b/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.cpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.cpp rename to samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.cpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.hpp b/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.hpp rename to samples/linux/Profiles/SeatHUProfile/CSeatHUProfile.hpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/CSenderThread.cpp b/samples/linux/Profiles/SeatHUProfile/CSenderThread.cpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/CSenderThread.cpp rename to samples/linux/Profiles/SeatHUProfile/CSenderThread.cpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/CSenderThread.hpp b/samples/linux/Profiles/SeatHUProfile/CSenderThread.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/CSenderThread.hpp rename to samples/linux/Profiles/SeatHUProfile/CSenderThread.hpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/EReqType.hpp b/samples/linux/Profiles/SeatHUProfile/EReqType.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/EReqType.hpp rename to samples/linux/Profiles/SeatHUProfile/EReqType.hpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/ISender.hpp b/samples/linux/Profiles/SeatHUProfile/ISender.hpp similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/ISender.hpp rename to samples/linux/Profiles/SeatHUProfile/ISender.hpp diff --git a/src/samples/linux/Profiles/SeatHUProfile/Makefile b/samples/linux/Profiles/SeatHUProfile/Makefile similarity index 100% rename from src/samples/linux/Profiles/SeatHUProfile/Makefile rename to samples/linux/Profiles/SeatHUProfile/Makefile diff --git a/src/samples/linux/Profiles/xml/AuthenticationProfile_API.xml b/samples/linux/Profiles/xml/AuthenticationProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/AuthenticationProfile_API.xml rename to samples/linux/Profiles/xml/AuthenticationProfile_API.xml diff --git a/src/samples/linux/Profiles/xml/AuthenticationProfile_Impl.xml b/samples/linux/Profiles/xml/AuthenticationProfile_Impl.xml similarity index 100% rename from src/samples/linux/Profiles/xml/AuthenticationProfile_Impl.xml rename to samples/linux/Profiles/xml/AuthenticationProfile_Impl.xml diff --git a/src/samples/linux/Profiles/xml/BasicSampleProfile_API.xml b/samples/linux/Profiles/xml/BasicSampleProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/BasicSampleProfile_API.xml rename to samples/linux/Profiles/xml/BasicSampleProfile_API.xml diff --git a/src/samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml b/samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml similarity index 100% rename from src/samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml rename to samples/linux/Profiles/xml/BasicSampleProfile_Impl.xml diff --git a/src/samples/linux/Profiles/xml/ClimateClientProfile.xml b/samples/linux/Profiles/xml/ClimateClientProfile.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ClimateClientProfile.xml rename to samples/linux/Profiles/xml/ClimateClientProfile.xml diff --git a/src/samples/linux/Profiles/xml/ClimateClientProfile_API.xml b/samples/linux/Profiles/xml/ClimateClientProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ClimateClientProfile_API.xml rename to samples/linux/Profiles/xml/ClimateClientProfile_API.xml diff --git a/src/samples/linux/Profiles/xml/ClimateHUProfile.xml b/samples/linux/Profiles/xml/ClimateHUProfile.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ClimateHUProfile.xml rename to samples/linux/Profiles/xml/ClimateHUProfile.xml diff --git a/src/samples/linux/Profiles/xml/ClimateHUProfile_API.xml b/samples/linux/Profiles/xml/ClimateHUProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ClimateHUProfile_API.xml rename to samples/linux/Profiles/xml/ClimateHUProfile_API.xml diff --git a/src/samples/linux/Profiles/xml/ProfileApiDatabase.xml b/samples/linux/Profiles/xml/ProfileApiDatabase.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ProfileApiDatabase.xml rename to samples/linux/Profiles/xml/ProfileApiDatabase.xml diff --git a/src/samples/linux/Profiles/xml/ProfileDatabase.xml b/samples/linux/Profiles/xml/ProfileDatabase.xml similarity index 100% rename from src/samples/linux/Profiles/xml/ProfileDatabase.xml rename to samples/linux/Profiles/xml/ProfileDatabase.xml diff --git a/src/samples/linux/Profiles/xml/SeatClientProfile.xml b/samples/linux/Profiles/xml/SeatClientProfile.xml similarity index 100% rename from src/samples/linux/Profiles/xml/SeatClientProfile.xml rename to samples/linux/Profiles/xml/SeatClientProfile.xml diff --git a/src/samples/linux/Profiles/xml/SeatClientProfile_API.xml b/samples/linux/Profiles/xml/SeatClientProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/SeatClientProfile_API.xml rename to samples/linux/Profiles/xml/SeatClientProfile_API.xml diff --git a/src/samples/linux/Profiles/xml/SeatHUProfile.xml b/samples/linux/Profiles/xml/SeatHUProfile.xml similarity index 100% rename from src/samples/linux/Profiles/xml/SeatHUProfile.xml rename to samples/linux/Profiles/xml/SeatHUProfile.xml diff --git a/src/samples/linux/Profiles/xml/SeatHUProfile_API.xml b/samples/linux/Profiles/xml/SeatHUProfile_API.xml similarity index 100% rename from src/samples/linux/Profiles/xml/SeatHUProfile_API.xml rename to samples/linux/Profiles/xml/SeatHUProfile_API.xml diff --git a/src/samples/linux/SeatClient_App/IProfileObserver.hpp b/samples/linux/SeatClient_App/IProfileObserver.hpp similarity index 100% rename from src/samples/linux/SeatClient_App/IProfileObserver.hpp rename to samples/linux/SeatClient_App/IProfileObserver.hpp diff --git a/src/samples/linux/SeatClient_App/Makefile b/samples/linux/SeatClient_App/Makefile similarity index 100% rename from src/samples/linux/SeatClient_App/Makefile rename to samples/linux/SeatClient_App/Makefile diff --git a/src/samples/linux/SeatClient_App/SeatClient_App.pro b/samples/linux/SeatClient_App/SeatClient_App.pro similarity index 100% rename from src/samples/linux/SeatClient_App/SeatClient_App.pro rename to samples/linux/SeatClient_App/SeatClient_App.pro diff --git a/src/samples/linux/SeatClient_App/crequestprocessor.cpp b/samples/linux/SeatClient_App/crequestprocessor.cpp similarity index 100% rename from src/samples/linux/SeatClient_App/crequestprocessor.cpp rename to samples/linux/SeatClient_App/crequestprocessor.cpp diff --git a/src/samples/linux/SeatClient_App/crequestprocessor.h b/samples/linux/SeatClient_App/crequestprocessor.h similarity index 100% rename from src/samples/linux/SeatClient_App/crequestprocessor.h rename to samples/linux/SeatClient_App/crequestprocessor.h diff --git a/src/samples/linux/SeatClient_App/cseatclientprofilecallbacks.hpp b/samples/linux/SeatClient_App/cseatclientprofilecallbacks.hpp similarity index 100% rename from src/samples/linux/SeatClient_App/cseatclientprofilecallbacks.hpp rename to samples/linux/SeatClient_App/cseatclientprofilecallbacks.hpp diff --git a/src/samples/linux/SeatClient_App/cstateupdater.cpp b/samples/linux/SeatClient_App/cstateupdater.cpp similarity index 100% rename from src/samples/linux/SeatClient_App/cstateupdater.cpp rename to samples/linux/SeatClient_App/cstateupdater.cpp diff --git a/src/samples/linux/SeatClient_App/cstateupdater.h b/samples/linux/SeatClient_App/cstateupdater.h similarity index 100% rename from src/samples/linux/SeatClient_App/cstateupdater.h rename to samples/linux/SeatClient_App/cstateupdater.h diff --git a/src/samples/linux/SeatClient_App/main.cpp b/samples/linux/SeatClient_App/main.cpp similarity index 100% rename from src/samples/linux/SeatClient_App/main.cpp rename to samples/linux/SeatClient_App/main.cpp diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/b-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/b-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/b-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/b-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/dr-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/dr-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/dr-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/dr-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/dr-a-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/dr-a-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/dr-a-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/dr-a-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/main.qml b/samples/linux/SeatClient_App/qml/SeatClient_App/main.qml similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/main.qml rename to samples/linux/SeatClient_App/qml/SeatClient_App/main.qml diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/pass-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/pass-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/pass-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/pass-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/pass-a-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/pass-a-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/pass-a-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/pass-a-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_1.png b/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_1.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_1.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_1.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_2_big.png b/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_2_big.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_2_big.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_2_big.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_gray.png b/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_gray.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_gray.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/seat_back_gray.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_1.png b/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_1.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_1.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_1.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_gray.png b/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_gray.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_gray.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/seat_bottom_gray.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/str-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/str-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/str-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/str-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/str-a-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/str-a-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/str-a-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/str-a-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/t-1-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/t-1-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/t-1-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/t-1-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/t-2-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/t-2-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/t-2-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/t-2-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/t-3-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/t-3-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/t-3-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/t-3-01.png diff --git a/src/samples/linux/SeatClient_App/qml/SeatClient_App/t-4-01.png b/samples/linux/SeatClient_App/qml/SeatClient_App/t-4-01.png similarity index 100% rename from src/samples/linux/SeatClient_App/qml/SeatClient_App/t-4-01.png rename to samples/linux/SeatClient_App/qml/SeatClient_App/t-4-01.png diff --git a/src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp b/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp rename to samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.h b/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.h rename to samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.pri b/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from src/samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.pri rename to samples/linux/SeatClient_App/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/src/samples/linux/SeatHU_App/IProfileObserver.hpp b/samples/linux/SeatHU_App/IProfileObserver.hpp similarity index 100% rename from src/samples/linux/SeatHU_App/IProfileObserver.hpp rename to samples/linux/SeatHU_App/IProfileObserver.hpp diff --git a/src/samples/linux/SeatHU_App/Makefile b/samples/linux/SeatHU_App/Makefile similarity index 100% rename from src/samples/linux/SeatHU_App/Makefile rename to samples/linux/SeatHU_App/Makefile diff --git a/src/samples/linux/SeatHU_App/SeatHU_App.pro b/samples/linux/SeatHU_App/SeatHU_App.pro similarity index 100% rename from src/samples/linux/SeatHU_App/SeatHU_App.pro rename to samples/linux/SeatHU_App/SeatHU_App.pro diff --git a/src/samples/linux/SeatHU_App/crequestprocessor.cpp b/samples/linux/SeatHU_App/crequestprocessor.cpp similarity index 100% rename from src/samples/linux/SeatHU_App/crequestprocessor.cpp rename to samples/linux/SeatHU_App/crequestprocessor.cpp diff --git a/src/samples/linux/SeatHU_App/crequestprocessor.h b/samples/linux/SeatHU_App/crequestprocessor.h similarity index 100% rename from src/samples/linux/SeatHU_App/crequestprocessor.h rename to samples/linux/SeatHU_App/crequestprocessor.h diff --git a/src/samples/linux/SeatHU_App/cseathuprofilecallbacks.hpp b/samples/linux/SeatHU_App/cseathuprofilecallbacks.hpp similarity index 100% rename from src/samples/linux/SeatHU_App/cseathuprofilecallbacks.hpp rename to samples/linux/SeatHU_App/cseathuprofilecallbacks.hpp diff --git a/src/samples/linux/SeatHU_App/cseatstate.cpp b/samples/linux/SeatHU_App/cseatstate.cpp similarity index 100% rename from src/samples/linux/SeatHU_App/cseatstate.cpp rename to samples/linux/SeatHU_App/cseatstate.cpp diff --git a/src/samples/linux/SeatHU_App/cseatstate.h b/samples/linux/SeatHU_App/cseatstate.h similarity index 100% rename from src/samples/linux/SeatHU_App/cseatstate.h rename to samples/linux/SeatHU_App/cseatstate.h diff --git a/src/samples/linux/SeatHU_App/cstateupdater.cpp b/samples/linux/SeatHU_App/cstateupdater.cpp similarity index 100% rename from src/samples/linux/SeatHU_App/cstateupdater.cpp rename to samples/linux/SeatHU_App/cstateupdater.cpp diff --git a/src/samples/linux/SeatHU_App/cstateupdater.h b/samples/linux/SeatHU_App/cstateupdater.h similarity index 100% rename from src/samples/linux/SeatHU_App/cstateupdater.h rename to samples/linux/SeatHU_App/cstateupdater.h diff --git a/src/samples/linux/SeatHU_App/main.cpp b/samples/linux/SeatHU_App/main.cpp similarity index 100% rename from src/samples/linux/SeatHU_App/main.cpp rename to samples/linux/SeatHU_App/main.cpp diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/b-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/b-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/b-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/b-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/dr-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/dr-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/dr-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/dr-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/dr-a-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/dr-a-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/dr-a-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/dr-a-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/main.qml b/samples/linux/SeatHU_App/qml/SeatHU_App/main.qml similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/main.qml rename to samples/linux/SeatHU_App/qml/SeatHU_App/main.qml diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/pass-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/pass-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/pass-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/pass-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/pass-a-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/pass-a-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/pass-a-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/pass-a-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_1.png b/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_1.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_1.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_1.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_2_big.png b/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_2_big.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_2_big.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_2_big.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_gray.png b/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_gray.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_gray.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/seat_back_gray.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_1.png b/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_1.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_1.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_1.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_gray.png b/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_gray.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_gray.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/seat_bottom_gray.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/str-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/str-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/str-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/str-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/str-a-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/str-a-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/str-a-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/str-a-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/t-1-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/t-1-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/t-1-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/t-1-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/t-2-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/t-2-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/t-2-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/t-2-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/t-3-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/t-3-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/t-3-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/t-3-01.png diff --git a/src/samples/linux/SeatHU_App/qml/SeatHU_App/t-4-01.png b/samples/linux/SeatHU_App/qml/SeatHU_App/t-4-01.png similarity index 100% rename from src/samples/linux/SeatHU_App/qml/SeatHU_App/t-4-01.png rename to samples/linux/SeatHU_App/qml/SeatHU_App/t-4-01.png diff --git a/src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp b/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp rename to samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.h b/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.h rename to samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.pri b/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from src/samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.pri rename to samples/linux/SeatHU_App/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/src/samples/linux/SeatHU_App/seatcommon.h b/samples/linux/SeatHU_App/seatcommon.h similarity index 100% rename from src/samples/linux/SeatHU_App/seatcommon.h rename to samples/linux/SeatHU_App/seatcommon.h diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 77771ea3..00000000 --- a/src/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Debug -docs -.project -.settings -axis.sublime-project -axis.sublime-workspace -*~ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/.gitignore b/src/3rd_party/cppunit/cppunit-1.12.1/.gitignore deleted file mode 100644 index 9d1220b2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# this will prevent anyting to be commited from this folder and its subfolders -* diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/AUTHORS b/src/3rd_party/cppunit/cppunit-1.12.1/AUTHORS deleted file mode 100644 index b600073c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/AUTHORS +++ /dev/null @@ -1,6 +0,0 @@ -Michael Feathers -Jerome Lacoste -E. Sommerlade -Baptiste Lepilleur -Bastiaan Bakker -Steve Robbins diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/BUGS b/src/3rd_party/cppunit/cppunit-1.12.1/BUGS deleted file mode 100644 index 64fb00f9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/BUGS +++ /dev/null @@ -1,6 +0,0 @@ - KNOWN BUGS - ---------- - -The handling of html and man pages in doc/Makefile.am is -flawed. It will not pass "make distcheck". - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/COPYING b/src/3rd_party/cppunit/cppunit-1.12.1/COPYING deleted file mode 100644 index b1e3f5a2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/COPYING +++ /dev/null @@ -1,504 +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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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 - - 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/3rd_party/cppunit/cppunit-1.12.1/ChangeLog b/src/3rd_party/cppunit/cppunit-1.12.1/ChangeLog deleted file mode 100644 index 21637bc1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/ChangeLog +++ /dev/null @@ -1,3664 +0,0 @@ -2008-02-07 Steve M. Robbins - - * src/qttestrunner/MostRecentTests.h: - * src/qttestrunner/TestRunnerModel.h: Change from to - replacment ; avoids use of compatibility headers. - -2007-03-04 Steve M. Robbins - - * include/cppunit/portability/FloatingPoint.h (floatingPointIsFinite): Change - return type to int, following the convention of isfinite(), finite(), etc. - -2007-02-25 Baptiste Lepilleur - - * doc/cookbook.dox: changed suite() to return a TestSuite instead - of a Test to avoid introducing unnecessary complexity. - -2007-02-24 Steve M. Robbins - - * include/cppunit/portability/FloatingPoint.h: Include Portability.h. - -2007-02-24 Baptiste Lepilleur - - * src/cppunit/TestAssert.cpp (assertDoubleEquals): Moved finite & NaN - tests to include/cppunit/portability/FloatingPoint.h. Changed - implementation assertDoubleEquals to explicitly test for NaN - in case of non-finite values to force equality failure in the - presence of NaN. Previous implementation failed on Microsoft - Visual Studio 6 (on this platform: NaN == NaN). - * examples/cppunittest/TestAssertTest.cpp: Add more unit tests to - test the portable floating-point primitive. Added missing - include . - - * include/cppunit/portability/Makefile.am: - * include/cppunit/portability/FloatingPoint.h: Added file. Extracted - isfinite() from TestAssert.cpp. - - * include/cppunit/config-evc4: - * include/cppunit/config-msvc6: Added support for _finite(). - -2007-01-30 Steve M. Robbins - - * examples/cppunittest/assertion_traitsTest.h: - * examples/cppunittest/assertion_traitsTest.cpp: New. Test - assertion_traits<>. - - * examples/cppunittest/Makefile.am: Add - assertion_traitsTest.{h,cpp}. - - * examples/cppunittest/TestAssertTest.h: - * examples/cppunittest/TestAssertTest.cpp: Add - testAssertDoubleEqualsPrecision() to test precision of failure - message. - -2007-01-27 Steve M. Robbins - - * examples/cppunittest/TestAssertTest.cpp: - * examples/cppunittest/TestAssertTest.h: Remove declaration of - unimplemented functions testAssertDoubleNotEquals1 and - testAssertDoubleNotEquals2. Factor new method - testAssertDoubleNonFinite out of existing testAssertDoubleEquals. - - * src/cppunit/Win32DynamicLibraryManager.cpp (doLoadLibrary): - Unconditionally use ANSI version of LoadLibrary() and other - functions with string arguments. - -2007-01-26 Steve M. Robbins - - * config/ax_cxx_have_isfinite.m4: New. Autoconf macro that tests - for finite() in C++ mode. - * configure.in: Check for isfinite() and finite(). - - * examples/cppunittest/TestAssertTest.cpp (testAssertDoubleEquals): - * src/cppunit/TestAssert.cpp (assertDoubleEquals): Account for - non-finite values. - -2007-01-11 Steve M. Robbins - - * examples/cppunittest/MockFunctor.h: - * examples/cppunittest/MockProtector.h: - * examples/cppunittest/XmlOutputterTest.cpp: - * examples/cppunittest/XmlUniformiser.cpp: - * src/DllPlugInTester/CommandLineParser.cpp: - * src/cppunit/DynamicLibraryManagerException.cpp: - * src/cppunit/TestCaseDecorator.cpp: - * src/cppunit/TextTestRunner.cpp: - * src/cppunit/XmlDocument.cpp: Arrange field initializers in - correct order. - - * include/cppunit/plugin/TestPlugIn.h (struct CppUnitTestPlugIn): - * include/cppunit/extensions/TestFixtureFactory.h (class TestFixtureFactory): - * include/cppunit/XmlOutputterHook.h (XmlOutputterHook): Add - virtual destructor to virtual class. - - * examples/cppunittest/TestAssertTest.cpp: Put a C++ statement in - the first argument of CPPUNIT_ASSERT_THROW() and - CPPUNIT_ASSERT_NO_THROW(). - - * examples/hierarchy/main.cpp (main): Return value now reflects - whether tests passed. - * examples/hierarchy/Makefile.am (XFAIL_TESTS): New. Mark hierachy - test program as an expected failure. - - * Makefile.am (dist-hook): Don't fail if $(distdir)/lib already - exists. - - * config/bb_enable_doxygen.m4 (BB_ENABLE_DOXYGEN): Add quotes - around function name, BB_ENABLE_DOXYGEN. - -2006-10-26 Baptiste Lepilleur - * include/cppunit/TestResult.h: - * include/cppunit/ui/Config.h: fixed compilation issues with QtTestRunner. - -2006-06-29 Baptiste Lepilleur - * Makefile.am: - * lib/.keepme: added dummy file to prevent lib/ removal by some - unzip clients. Fixed bug #1527877 . - - * src/msvc6/TesRunner/TestRunner.rc: - * src/msvc6/testpluginrunner/TestPlugInRunner.rc: Fixed bug #1528212 - (some resources wrongly tagged as French). - -2006-06-29 Baptiste Lepilleur - * include/cppunit/ui/text/TextTestRunner.h - * src/cppunit/TextTestRunner.cpp: applied patch #1210013 to remove - hidden virtual function warning. - - * autogen.sh: applied patch #1449380 contributed by Sander Temme - to allow running autogen on Mac OS X. - - * doc/header.html: updated to handle new tabs css required for - html doc generated with doxygen 1.4.7. - - * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: applied correction - provided to fix bug #1498175 (double click on failure does not - goto failure). - -2006-03-04 Baptiste Lepilleur - * contrib/xml-xsl/report.xsl: reported correction posted on the wiki. - - * removed debian/ directory. An up to date patch can be found at: - packages.debian.org. - - * cppunit.spec.in: applied patch #1242905 partially (%post and %postun). - - * cppunit.pc.in: - * configure.in: - * Makefile.am: integrated patch from Robert Leight to generate pkg-config. - -2006-02-04 Baptiste Lepilleur - * include/cppunit/TestListener.h: - * src/qttestrunner/TestRunnerModel.cpp: removed compilation warning. - -2006-02-01 Baptiste Lepilleur - * examples/qt: integrated Ernst patch from qt examples. - -2005-12-12 Baptiste Lepilleur - * src/qttestrunner: integrated Ernst patch for QtTestRunner and Qt 3.x. - Enhanced qmake project files to handle multiple build configuration - -2005-11-27 Baptiste Lepilleur - * doc/cookbook.dox: fixed type (patch #1334567) - -2005-11-06 Baptiste Lepilleur - * include/cppunit/config/SourcePrefix.h: disable warning #4996 - (sprintf is deprecated) for visual studio 2005. - - * include/cppunit/TestAssert.h: use sprintf_s instead of sprintf for - visual studio 2005. - - * examples/ClockerPlugIn/ClockerPlugIn.cpp - * examples/DumperPlugIn/DumperPlugIn.cpp: use SourcePrefix.h. Fixed - wrong macro usage to implement DllMain. - - * examples/msvc6/HostApp/ExamplesTestCase.h - * examples/msvc6/HostApp/ExamplesTestCase.cpp - * examples/simple/ExamplesTestCase.h - * examples/simple/ExamplesTestCase.cpp: removed divideByZero test case - as it cause some crash on some platforms. - - -2005-10-27 Baptiste Lepilleur - * include/cppunit/TestAssert.h: added missing #include - -2005-07-30 Baptiste Lepilleur - * include/cppunit/config/SourcePrefix.h: added, prefix added at begining of sources - to remove warning. Removed most warning when compiling with VC++ 6sp6. - - * examples/money/Money.h: - * examples/money/MoneyTest.cpp: added assert equal usage. - -2005-07-30 Baptiste Lepilleur - - * include/cppunit/config/config-msvc6.h: auto-detect if RTTI are enabled - the _CPPRTTI macro (defined by the compiler when enabling RTTI). - - * include/cppunit/config/config-msvc6.h: added missing macro definition - CPPUNIT_HAVE_CPP_CAST. - - * src/cppunit/TestResultCollector.cpp: fixed memory leak in destructor. - -2005-07-15 Baptiste Lepilleur - - * config/bb_enable_doxygen.m4: Rolled back Brad Hards patch as it break - generation of doc/Makefile.am. - - * cppunit.spec.in: Applied patch #1232555 from Patrice Dumas. This file is - use for RPM packaging. - - * development snapshot release 1.11.0. - -2005-07-09 Baptiste Lepilleur - - * doc/Money.dox: - * include/cppunit/TestSuite.h: - * include/cppunit/XmlOutputterHook.h: applied Brad Hards patch - that correct miscellaneous doc generation issues (unescaped <>, \...). - - * include/cppunit/plugin/TestPlugIn.h: - * include/cppunit/CompilerOutputter.h: - * doc/CppUnit-win.dox: removed a few documentation generation warnings. - - * config/bb_enable_doxygen.m4: applied Brad Hards patch to remove warning - when running ./autogen.sh or aclocal. - - * doc/money.dox: fixed bad usage of CPPUNIT_ASSERT_EQUALS. - -2005-07-05 Baptiste Lepilleur - - * Examples/simple/Makefile.am: do not install 'simple' programm - (patch #1230784). - -2005-07-05 Baptiste Lepilleur - - * include/cppunit/TestResultCollector.h - * src/cppunit/TestResultCollector.cpp: fixed memory leak - occuring when calling reset(). - - * src/cppunit/DllMain.cpp: added work-around for mingw compilation - for BLENDFUNCTION macro issue when including windows.h. - - * src/qttestrunner/TestRunnerDlgImpl.cpp: fixed display of multiline - messages. - - * include/cppunit/Portability.h: better integration of compiler output - for gcc on Mac OS X with Xcode (contributed by Claus Broch). - -2005-06-14 Baptiste Lepilleur - * src/msvc6/testrunner/ProgressBar.cpp: applied patch from bug #1165875, - (use system color for border instead of hard-coded color). - - * src/cppunit/Makefile.am: - * configure.in: MinGW, cygwin: enable build of shared library when using - libtool. patch #1194394 contributed by Stéphane Fillod. - - * cppunit.m4: applied patch #1076398 contributed by Henner Sudek. Fix - version number comparison in AM_PATH_CPPUNIT. - - * contrib/xml-xsl/cppunit2junit.txt - * contrib/xml-xsl/cppunit2junit.xsl - * contrib/readme.txt: XSLT for compatibility with Ant junit xml formatter. - Patch #1112053 contributed by Norbert Barbosa. - -2005-02-23 Baptiste Lepilleur - - * examples/hierarchy/BoardGameTest.h: - * examples/hierarchy/ChessTest.h: fixed compilation issue, prefixed access - to class member with 'this' (inheriting from template parameter - dependent class). - -2004-11-19 Baptiste Lepilleur - - * include/cppunit/Message.h - * include/cppunit/SourceLine.h: - * src/cppunit/Message.cpp: - * src/cppunit/SourceLine.cpp: provided thread-safe copy constructor on - platform that do not provide thread-safe copy constructor for std::string. - -2004-11-08 Baptiste Lepilleur - - * include/cppunit/TestAssert.h: fixed portability bug pointed out by - Neil Ferguson. - -2004-11-06 Baptiste Lepilleur - - * include/cppunit/TestAssert.h: integrated Neil Ferguson patch for high - precision conversion to string for double number. Modified the patch - to works even if DBL_DIG C99 macro is not defined. - - * include/cppunit/Portability.h: fixed EVC++ 4 detection. - - * src/cppunit/Win32DynamicLibraryManager.cpp: integrated patch #1024428, - MinGW compilation under Windows XP. - -2004-11-05 Baptiste Lepilleur - - * include/cppunit/TestAssert.h: - * src/cppunit/TestAssert.cpp: integrated Neil Ferguson patch for missing - _MESSAGE assertion variants. Also enhanced the failure message of a - few assertions. - -2004-09-10 Baptiste Lepilleur - - * src/msvc6/DSPlugIn/StdAfx.h: add #error to prevent compilation on VC 7. - - * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: - * src/msvc6/testrunner/MsDevCallerListCtrl.h: integrated go to source line - features on double click contributed by Max Quatember and - Andreas Pfaffenbichler. - -2004-08-01 Baptiste Lepilleur - - * include/cppunit/XmlOutputter.h: - * include/cppunit/tools/XmlDocument.h: - * src/cppunit/XmlDocument.cpp: - * src/cppunit/XmlOutputter.cpp: integrated patch #997006 from Akos Maroy. - This patch makes the 'standalone' attribute in XML header optional. - -2004-06-25 Baptiste Lepilleur - - * include/cppunit/Portability.h: moved OStringStream alias definition to - portability/Stream.h. User need to define EVC4 to indicate that - config-evc4.h should be used. (how to we detect this automatically ?). - Notes that this means it might be needed to add #include to some - headers since its no longer included by Portability.h. - - * include/cppunit/portability/Stream.h: define alias OStringStream, stdCOut(), - and OFileStream. If CPPUNIT_NO_STREAM is defined (evc4 config), then provides - our own implementation (based on sprintf and fwrite). - - * include/cppunit/config/config-evc4.h: config file for embedded visual c++ 4. - Still need to detect for this platform in Portability.h (currently relying on - EVC4 being defined...) - - * *.[cpp/h]: most source files have been impacted with the following change: - #include -> #include - std::ostream -> CPPUNIT_NS::OStream - std::ofstream -> CPPUNIT_NS::OFileStream - std::cout -> CPPUNIT_NS::stdCOut() - std::endl -> "\n" - Also, code using std::cin as been defined out if CPPUNIT_NO_STREAM was defined. - The exact list of impact files can be obtain in CVS using tags: - TG_CPPUNIT_NO_STREAM_BEFORE & TG_CPPUNIT_NO_STREAM_AFTER. - -2004-06-19 Baptiste Lepilleur - - * cppunit.m4: patch #946302, AM_PATH_CPPUNIT doesn't report result - if CppUnit is missing. - - -2004-06-18 Baptiste Lepilleur - - * Release 10.0.2 - - * include/cppunit/extension/TestSuiteBuilderContext.h: - * src/cppunit/TestSuiteBuilderContext.cpp: fixed bug #921843. This bug - was caused by a known STL bug in VC++ 6. - See http://www.dinkumware.com/vc_fixes.html issue with shared - std::map in dll. As a work-around the map has been replaced by a vector. - - * src/DllPlugInTester/*.cpp: bug #941625, string literal using char * - instead of const char *. Patch contributed by Curt Arnold has been - applied. - - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testpluginrunner/TestPlugIn.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerModel.h: bug #952912, - memory leaks when loading/reloading plug-ins. - -2004-06-17 Baptiste Lepilleur - - * include/cppunit/Portability.h: - * include/cppunit/plugin/TestPlugIn.h: fixed report compilation issue - with mingw & cygwin. WIN32 is now always defined if _WIN32 is defined. - Bug #945737 & #930338. - - * doc/Makefile.am: fixed bug #940650 => cp -dpR, removed option -p since - there is no link to preserve anyway (does not exist on SunOs). - - * src/cppunit/TestPath.cpp: bug #938753, array bound read in - splitPathString() with substr if an empty string is passed. - - * src/*/*.dsp: bug #933154, post build fail in directory with spaces. - - -2004-06-16 Baptiste Lepilleur - - * release 1.10.0 - - * install-UNIX.txt: added some notes concerning Sun CC 5.5 & AIX. - - * examples/*/*.dsp: fixed project settings (rtti not enabled). - -2004-03-13 Baptiste Lepilleur - - * release 1.9.14 - -2004-03-13 Baptiste Lepilleur - - * cppunit-config.in: bug #903363, missing -ldl from the output of - cppunit-config --libs. Fixed thanks Eric Blossom patch. - - * examples/qt/Main.cpp: - * examples/qt/ExampleTestCase.h: fixed bug #789672: QT example should - use CPPUNIT_NS macro. - - * src/cppunit/UnixDynamicLibraryManager.cpp: applied patch #816563 - from Gareth Sylvester. Adding RTLD_GLOBAL allows test plug-ins - to provide symbols to shared objects they load themselves. - - * examples/cppunittest/TestAssertTest.h: - * examples/cppunittest/TestAssertTest.cpp: - * examples/cppunittest/XmlUniformiserTest.h: - * examples/cppunittest/XmlUniformiserTest.cpp: - * include/cppunit/TestAssert.h: add the exception assertion macros - from cppunit 2: CPPUNIT_ASSERT_THROW, CPPUNIT_ASSERT_NO_THROW, - CPPUNIT_ASSERT_ASSERTION_FAIL, CPPUNIT_ASSERT_ASSERTION_PASS. - Updated unit test to use and test the new macros. - - * include/cppunit/extensions/HelperMacros.h: deprecated the - test case factory that check for exception (CPPUNIT_TEST_FAIL & - CPPUNIT_TEST_EXCEPTION). - - -2004-02-20 Baptiste Lepilleur - - * release 1.9.12 - -2004-02-18 Baptiste Lepilleur - - * configure.in: - * makefile.am: - * config/ax_cxx_gcc_abi_demangle.m4: - * src/cppunit/TypeInfoHelper.cpp: added patch from - Neil Ferguson to use gcc c++ abi to demangle typeinfo - name when available. - -2003-05-15 Baptiste Lepilleur - - * include/cppunit/plugin/testplugin.h: fixed bug #767358, wrong - preprocessor symbol for SHL_LOADER. - -2003-05-15 Baptiste Lepilleur - - * include/cppunit/config/config-msvc6.h: changed the compiler outputter - default format (CPPUNIT_COMPILER_LOCATION_FORMAT) for Visual Studio 7.0. - Assertion now appears in the task list. - -2003-05-07 Baptiste Lepilleur - - * include/cppunit/extensions/Makefile.am: removed TestSuiteBuilder.h - - * Makefile.am - * configure.in - * config/ac_dll.m4 - * examples/cppunittest/Makefile.am - * examples/hierarchy/Makefile.am - * examples/money/Makefile.am - * examples/simple/Makefile.am - * include/cppunit/config/SelectDllLoader.h - * include/cppunit/plugin/TestPlugIn.h - * include/cppunit/tools/Algorithm.h - * src/DllPlugInTester/Makefile.am - * src/cppunit/Makefile.am - * src/cppunit/TestDecorator.cpp - * src/cppunit/ShlDynamicLibraryManager.cpp - * src/cppunit/UnixDynamicLibraryManager.cpp - * src/cppunit/Win32DynamicLibraryManager.cpp: applied patch from - Abdessattar Sassi to add support - for plug-in to hp-ux (patch #721546). - - * INSTALL-unix: added build instruction for HP-UX. - -2003-04-06 Baptiste Lepilleur - - * include/cppunit/extensions/TestSuiteBuilder.h: removed (unused) - -2003-03-31 Baptiste Lepilleur - - * src/cppunit/DynamicLibraryManager.cpp: fixed compilation issue on Mingw - (bug #711583) - -2003-03-20 Baptiste Lepilleur - - * include/cppunit/extensions/TestNamer.h: - * src/cppunit/TestNamer.cpp: Fixed bug #704684, TestNamer has non-virtual - destructor. - -2003-03-15 Baptiste Lepilleur - - * src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp: - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp: - * examples/msvc6/HostApp/HostApp.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: fixed compatibility - issues with vc7 MFC. - - * include/cppunit/tools/Algorithm.h: - * examples/cppunittest/XmlOutputterTest.cpp: - * examples/cppunittest/XmlUniformiser.*: - * src/cppunit/CompilerOutputter.cpp: - * src/cppunit/ProtectorChain.cpp: - * src/cppunit/StringTools.cpp: - * src/cppunit/TestPath.cpp: - * src/cppunit/TypeInfoHelper.cpp: - * src/cppunit/XmlElement.cpp: - * src/cppunit/XmlOutputter.cpp: - * src/DllPlugInTester/CommandLineParser.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: switched to using unsigned index in loop to - avoid signed/unsigned warning in vc7. - - * include/cppunit/extension/ExceptionTestCaseDecorator.h: removed dll export - on template (caused link error on vc7). - -2003-03-11 Baptiste Lepilleur - * config/bb_enable_doxygen.m4: - * doc/Makefile.am: applied Luke Dunstan's fix for bug #700730 (spaces not - allowed in doxygen path) - - * src/cppunit/XmlElement.cpp: - * src/examples/cppunittest/XmlUniformser.cpp: fixed bug #676505 (no space - between attributes of XmlElement). - - * include/cppunit/tools/Algorithm.h: - * src/cppunit/TestResult.cpp: - * src/msvc6/testrunner/TestRunnerModel.cpp: added removeFromSequence - algorithm in Algorithm.h to fix STLPort compatibility issue - (std::remove use the one of cstdio instead of algorithm). Bug #694971. - - * src/examples/cppunittest/TrackedTestCase.cpp: - * src/examples/cppunittest/CppUnitTestMain.cpp: - * src/examples/money/Money.h: partially applied patch #699794. Fixed - compilation issues with Borland C++ 6. - -2003-01-23 Baptiste Lepilleur - - * include/cppunit/extensions/TestNamer.h: fixed bug #662666 (missing include - for typeinfo). - -2002-12-12 Baptiste Lepilleur - - * src/cppunit/TestResult.cpp: TestFailure are no longer passed as temporary, - but explicitely instantiated on the stack. Work around AIX compiler bug. - -2002-12-03 Baptiste Lepilleur - - * include/cppunit/TextTestResult.h: added missing dll export for - operator << (bug #610119). - -2002-12-02 Baptiste Lepilleur - - * include/cppunit/plugin/DynamicLibraryManagerException.h: added constructor - to fix compilation issues on recents version of gcc and sun CC (bug #619059) - - * include/cppunit/input/XmlInputHelper.h: added. - - * src/cppunit/XmlOuputter.cpp: use iterator instead of const_iterator. - - * src/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp: added call to - IsUp() in cdxCDynamicWnd::DoOnGetMinMaxInfo() before calling - GetBorderSize() which caused an assertion. Bug #643612. - -2002-09-10 Baptiste Lepilleur - - * include/cppunit/extensions/TestSuiteBuilderContext.h: - * src/cppunit/TestSuiteBuilderContext.cpp: added addProperty() and - getStringProperty(). Added macros CPPUNIT_TEST_SUITE_PROPERTY. - - * src/msvc6/testrunner/TestRunnerDlg.cpp: integrated Tim Threlkeld's - bug fix #610162: browse button was disabled if history was empty. - - * src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp: integrated - Tim Threlkeld's bug fix #610191: common control were not initialized. - - * include/cppunit/extensions/ExceptionTestCaseDecorator.h: bug #603172, - missing Message construction. - - * src/cppunit/DefaultProtector.cpp: bug #603172. Fixed missing ';'. - - * src/cppunit/TestCase.cpp: bug #603671. Removed unguarded typeinfo - include. - - * examples/cppunittests/*Suite.h: bug #603666. Added missing Portability.h - include. - -2002-09-01 Baptiste Lepilleur - - * include/cppunit/ui/text/TextTestRunner.h: fixed header guards. - -2002-08-29 Baptiste Lepilleur - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.cpp: fixed shouldStop() bug. - -2002-08-29 Baptiste Lepilleur - - * include/cppunit/CompilerOutputter.h: - * include/cppunit/Exception.h: - * include/cppunit/Protector.h: - * include/cppunit/TestListener.h: - * include/cppunit/TestPath.h: - * include/cppunit/TestResult.h: - * include/cppunit/TestRunner.h: - * include/cppunit/XmlOutputter.h: - * include/cppunit/plugin/DynamicLibraryManager.h: - * include/cppunit/plugin/PlugInManager.h: - * include/cppunit/plugin/PlugInParameters.h: - * include/cppunit/TestPlugIn.h: - * src/cppunit/DefaultProtector.h: - * src/cppunit/ProtectorChain.h: - * src/cppunit/ProtectorContext.h: - * src/cppunit/TestCase.cpp: - * src/cppunit/TestResult.cpp: fixed a dew documentation bugs. - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.cpp: moved documentation to header. - -2002-08-29 Baptiste Lepilleur - - * include/cppunit/Asserter.h: - * include/cppunit/Message.h: - * include/cppunit/extensions/TestNamer.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/tools/XmlDocument.h: - * include/cppunit/tools/XmlElement.h: Fixed a few documentation bugs. - -2002-08-28 Baptiste Lepilleur - - * include/cppunit/Portability.h: added CPPUNIT_STATIC_CAST. - - * include/cppunit/extensions/TestFixtureFactory.h: extracted from - HelperMacros.h. Added template class ConcretTestFixtureFactory. - - * include/cppunit/extensions/TestSuiteBuilderContext.h: - * src/cppunit/TestSuiteBuilderContext.cpp: added. Context used - to add test case to the fixture suite. Prevent future - compatibility break for custom test API. - - * include/cppunit/extensions/HelperMacros.h: mostly rewritten. No - longer use TestSuiteBuilder. Added support for abstract test fixture - through macro CPPUNIT_TEST_SUITE_END_ABSTRACT. Made custom test API - easier to use. - - * examples/cppunittest/HelperMacrosTest.h: - * examples/cppunittest/HelperMacrosTest.cpp: updated against - HelperMacros.h changes. - -2002-08-27 Baptiste Lepilleur - - * CodingGuideLines.txt: updated for OS/390 C++ limitation. - - * examples/cppunittests/MockFunctor.h: added. Mock Functor to help - testing. - - * examples/cppunittests/MockProtector.h: qdded. Mock Protector to help - testing. - - * examples/cppunittests/TestResultTest.h - * examples/cppunittests/TestResultTest.cpp: added tests for - pushProtector(), popProtector() and protect(). - - * include/cppunit/TestAssert.h: removed default message value from - assertEquals(). Caused compilation error on OS/390. - - * include/cppunit/plugin/PlugInParameters.h: - * src/cppunit/PlugInParameters.cpp: renamed commandLine() to - getCommandLine(). - - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: bug fix, disabled Browse - button while running tests. - -2002-08-22 Steve M. Robbins - - * cppunit.m4: Doc fix: MINIMUM-VERSION is not optional when using - this macro. - -2002-08-04 Baptiste Lepilleur - - * src/cppunit/XmlDocument.cpp: fixed compatility bug with C++ builder. - - * include/cppunit/plugin/Parameters.h: renamed PlugInParameters.h. - - * src/cppunit/PlugInParameter.cpp: added. Implementation of class - PlugInParameters. - - * examples/DumperPlugIn/DumperPlugIn.cpp: - * examples/ClockerPlugIn/ClockerPlugIn.cpp: - * src/DllPlugInTester/CommandLineParser.h: - * src/DllPlugInTester/CommandLineParser.cpp: - * include/cppunit/plugin/TestPlugInDefaultImpl.h: - * src/cppunit/TestPlugInDefaultImpl.cpp: - * include/cppunit/plugin/PlugInManager.h: - * src/cppunit/PlugInManager.cpp: updated against PlugInParameter - change. - -2002-08-03 Baptiste Lepilleur - - * include/cppunit/XmlOutputterHook.h: integrated Stephan Stapel - documentation update. - -2002-08-03 Baptiste Lepilleur - - * include/cppunit/Exception.h: - * src/cppunit/Exception.h: added setMessage(). - - * include/cppunit/Protector.h: - * src/cppunit/Protector.cpp: added class ProtectorGuard. Change the - reportXXX() method to support Exception passing and SourceLine. - - * include/cppunit/TestCaller.h: removed 'expect exception' features. - It is now handled by ExceptionTestCaseDecorator and TestCaller no - longer need default template argument support. - - * include/cppunit/TestCase.h: - * include/cppunit/extensions/TestCaller.h: runTest() is now public - instead of protected, so that it can be decorated. - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.h: added pushProtector() and popProtector() - methods. This allow user to specify their own exception trap when - running test case. - - * include/cppunit/extensions/TestDecorator.h: - * src/cppunit/TestDecorator.cpp: added. Extracted from TestDecorator.h. - The test passed to the constructor is now owned by the decorator. - - * include/cppunit/extensions/TestCaseDecorator.h: - * src/cppunit/TestCaseDecorator.cpp: added. Decorator for TestCase - setUp(), tearDown() and runTest(). - - * include/cppunit/extensions/ExceptionTestCaseDecorator.h: added. - TestCaseDecorator to expect that a specific exception is thrown. - - * include/cppunit/extensions/HelperMacros.h: updated against TestCaller - change. - - * src/cppunit/DefaultFunctor.h: fixed bug (did not return underlying - test return code). - - * src/cppunit/ProtectorChain.cpp: fixed bug in chaing return code. - - * src/cppunit/DefaultFunctor.h: fixed bug. - - * src/msvc6/testrunner/ActiveTest.h: - * src/msvc6/testrunner/ActiveTest.cpp: updated against - TestCaseDecorator ownership policy change. Moved inline functions - to .cpp. - - * examples/cppunittest/TestSetUpTest.cpp: updated to use MockTestCase - and against the new ownership policy. - - * examples/cppunittest/TestDecoratorTest.cpp: - * examples/cppunittest/RepeatedTestTest.cpp: updated against - TestDecorator ownership policy change. - - * examples/cppunittest/ExceptionTestCaseDecoratorTest.h: - * examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp: added. Unit - tests for ExceptionTestCaseDecoratorTest. - -2002-07-16 Baptiste Lepilleur - - * include/cppunit/Protector.h: - * src/cppunit/Protector.cpp: added. Base class for protectors. - - * src/cppunit/DefaultProtector.h: - * src/cppunit/DefaultProtector.cpp: added. Implementation of the default - protector used to catch std::exception and any other exception. - - * src/cppunit/ProtectorChain.h: - * src/cppunit/ProtectorChain.cpp: added. Implementation of a chain of - protector, allowing catching custom exception and implementation of - expected exception. - - * src/cppunit/TestCase.cpp: - * src/cppunit/TestResult.cpp: updated to use protector. - -2002-07-14 Baptiste Lepilleur - - * CodingGuideLines.txt: added. CppUnit's coding guidelines for portability. - - * include/cppunit/portability/CppUnitStack.h: added. wrapper for std::stack. - - * include/cppunit/portability/CppUnitSet.h: added. wrapper for std::set. - - * include/cppunit/ui/text/TestRunner.h: fixed namespace definition for - deprecated TestRunner. - - * include/cppunit/TestAssert.h: - * src/cppunit/TestAssert.cpp: removed old deprecated functions that did - not use SourceLine. Moved assertEquals() and assertDoubleEquals() into - CppUnit namespace. - - * src/cppunit/TestFactoryRegistry.cpp: use CppUnitMap instead of std::map. - - * src/DllPlugInTester/CommandLineParser.h: use CppUnitDeque instead - std::deque. - - * examples/cppunittest/*.h: - * examples/cppunittest/*.cpp: removed all usage of CppUnitTest namespace. - Everything is now in global space. - - * examples/*/*.h: - * examples/*/*.cpp: replaced usage of CppUnit:: with CPPUNIT_NS::. - - * examples/ClockerPlugIn/ClockerModel.h: use CppUnit STL wrapper instead - of STL container. - -2002-07-13 Baptiste Lepilleur - - * include/cppunit/ui/text/TestRunner.h: - * src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner - TextTestRunner and moved it to the CppUnit namespace. Added - a deprecated typedef for compatibility with previous version. - - * include/cppunit/ui/text/TextTestRunner.h: added. - - * include/cppunit/ui/mfc/TestRunner.h: - * src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner - MfcTestRunner. Added deprecated typedef for compatibility. Renamed - TestRunner.cpp to MfcTestRunner.cpp. - - * include/cppunit/ui/mfc/MfcTestRunner.h: added. - - * include/cppunit/ui/qt/TestRunner.h: - * src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner - and moved it to CppUnit namespace. Added a deprecated typedef for - compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp. - - * include/cppunit/ui/qt/TestRunner.h: - * src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace - and renamed it QtTestRunner. Added deprecated typedef for compatibility. - - * include/cppunit/Asserter.h: - * src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and - made all methods static. - - * include/cppunit/extensions/HelperMacros.h: - * include/cppunit/extensions/SourceLine.h: - * include/cppunit/extensions/TestAssert.h: - * include/cppunit/extensions/TestPlugIn.h: - * include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a - symbol macro that expand either to CppUnit or nothing. The symbol is - no longer a parameter. - - * include/cppunit/portability/CppUnitVector.h: - * include/cppunit/portability/CppUnitDeque.h: - * include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for - compilers that do not support template default argumenent and need - the allocator to be passed when instantiating STL container. - - * examples/cppunittest/*.h: - * examples/cppunittest/*.cpp: - * src/msvc6/testrunner/*.h: - * src/msvc6/testrunner/*.cpp: - * src/msvc6/testpluginrunner/*.h: - * src/msvc6/testpluginrunner/*.cpp: - * src/qttestrunner/*.h: - * src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS. - - * src/cppunit/TestSuite.h: - replaced occurence of std::vector by CppUnitVector. - -2002-07-12 Baptiste Lepilleur - - * include/cppunit/config/Portability.h: If the compiler does not support - namespace (CPPUNIT_HAVE_NAMESPACES=0), define CPPUNIT_NO_STD_NAMESPACE - and CPPUNIT_NO_NAMESPACE. If CPPUNIT_NO_STD_NAMESPACE is defined, then - CppUnit assumes that STL are in the global namespace. If - CPPUNIT_NO_NAMESPACE is defined, then CppUnit classes are placed in the - global namespace instead of the CppUnit namespace. - - * include/cppunit/config/config-bcb5.h: - * include/cppunit/config/config-msvc6.h: added definition of macro - CPPUNIT_HAVE_NAMESPACES. - - * include/cppunit/tools/StringTools.h: use CPPUNIT_WRAP_COLUMN as default - parameter value for wrap(). - - * include/cppunit/*/*.h: - * src/cppunit/*.cpp: changed all CppUnit namespace declaration to use - macros CPPUNIT_NS_BEGIN and CPPUNIT_NS_END. Also, changed reference - to CppUnit namespace (essentially in macros) using CPPUNIT_NS macro. - - * doc/doxyfile.in: - * doc/CppUnit-Win.dox: updated doxygen configuration files so that - CPPUNIT_NS_BEGIN and CPPUNIT_NS_END macros are expanded. This help - generates the documentation using the CppUnit namespace. - -2002-07-11 Baptiste Lepilleur - - * include/cppunit/Portability.h: added macro CPPUNIT_CONST_CAST. - - * src/cppunit/Exception.cpp: - * src/cppunit/Test.cpp: - * examples/cppunittest/MockTestCase.cpp: replaced usage of const_cast with - CPPUNIT_CONST_CAST. - - * include/cppunit/Test.h: - * src/cppunit/Test.cpp: made findTestPath(), findTest() and resolvePath() - const methods. - -2002-07-10 Baptiste Lepilleur - - * include/cppunit/extensions/AutoRegisterSuite.h: - * include/cppunit/extensions/Orthodox.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/TestSuiteFactory.h: - * include/cppunit/TestCaller.h: - * examples/hierarchy/BoardGameTest.h: - * examples/hierarchy/ChessTest.h: replaced usage of 'typename' in template - declaration with 'class'. - - * include/cppunit/ui/text/TestRunner.h: - * src/cppunit/TextTestRunner.cpp: updated to use the generic TestRunner. - Removed methods runTestByName() and runTest(). Inherits - CppUnit::TestRunner. - - * include/cppunit/extensions/TestSuiteBuilder.h: removed templatized method - addTestCallerForException(). It is no longer used since release 1.9.8. - - * examples/cppunittest/MockTestCase.h - * examples/cppunittest/MockTestCase.cpp: removed the usage of 'mutable' - keyword. - -2002-07-04 Baptiste Lepilleur - - * src/msvc6/DSPlugIn/DSPlugIn.dsp: updated so that only the release - configuration get copied to the lib/ directory. - -2002-07-03 Baptiste Lepilleur - - * include/cppunit/XmlOutputter.h: fixed XmlOutputter constructed default - value initializatino which caused compilation error with BC5. - - * src/cppunit/PlugInManager.cpp: added missing CPPUNIT_NO_TESTPLUGIN guard. - - * src/msvc6/testrunner/TestRunner.dsp: - * src/msvc6/testrunner/TestRunner.rc: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TreeHierarchyDlg.cpp: - * src/msvc6/testrunner/TreeHierarchyDlg.h: - * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: - * src/msvc6/testpluginrunner/TestPlugInRunner.rc: - * src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h: applied Steven Mitter - patch to fix bug #530426 (conflict between TestRunner and host - application's resources). Adapted patch to compile work with Unicode. - - * src/msvc6/testrunner/ResourceLoaders.h: - * src/msvc6/testrunner/ResourceLoaders.cpp: - * src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt: added, from - Steven Mitter's patch. Simplified loadCString() to compile with Unicode. - - * src/cppunit/cppunit.dsp: - * src/cppunit/cppunit_dll.dsp: - * src/DllPlugInTester/DllPlugInTester.dsp: - * src/msvc6/testrunner/TestRunner.dsp: - * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: all lib, dll and exe are - now created in the intermediate directory. A post-build rule is used to - copy them to the lib/ directory. - -2002-06-17 Baptiste Lepilleur - - * include/cppunit/AdditionalMessage.h: - * src/cppunit/AdditionalMessage.cpp: added. Class to help passing - additional message parameter. - - * include/cppunit/Asserter.h: added makeExpected(), makeActual() and - makeNotEqualMessage(). Removed methods made unnecessary by the - use of AdditionalMessage. - - * include/cppunit/Portability.h: added CPPUNIT_WRAP_COLUMN to define - CppUnit default wrap column. - - * src/cppunit/CompilerOutputter.cpp: use CPPUNIT_WRAP_COLUMN instead - of hard-coded value. - -2002-06-16 Baptiste Lepilleur - - * bumped version to 1.9.9 - - * release 1.9.8 - - * include/cppunit/plugin/TestPlugIn.h: updated documentation. - - * include/cppunit/tools/XmlDocument.h: updated documentation. - - * include/cppunit/tools/StringTools.h: - * src/cppunit/StringTools.cpp: added split() and wrap() functions. - - * include/cppunit/CompilerOutputter.h: - * src/cppunit/CompilerOutputter.cpp: extracted wrap() and - splitMessageIntoLines() to StringTools. - - * include/cppunit/XmlOutputterHook.h: - * src/cppunit/XmlOutputterHook.cpp: removed rooNode parameter from - beginDocument() and endDocument(). It can be retreive from document. - Renamed 'node' occurences to 'element'. - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: updated against - XmlOutputterHook changes. Renamed 'node' occurences to 'element'. - - * src/cppunit/Message.cpp: - * src/cppunit/XmlElement.cpp: added missing include - - * examples/ClockerPlugIn/ClockerXmlHook.h: - * examples/ClockerPlugIn/ClockerXmlHook.cpp: updated against - XmlOutputterHook changes. - - * examples/cppunittest/MessageTest.cpp: removed std::string() from - assertion. Somehow gcc can't parse it. Added missing include . - - * examples/cppunittest/XmlElement.cpp: added missing include . - - * examples/cppunittest/XmlElementTest.h: - * examples/cppunittest/XmlElementTest.cpp: Renamed 'node' occurences - to 'element'. - - * examples/cppunittest/XmlOutputterTest.cpp: updated against - XmlOutputterHook changes. - - * examples/cppunittest/StringToolsTest.h: - * examples/cppunittest/StringToolsTest.cpp: added. Unit tests for - StringTools. Turn out that VC++ dismiss empty lines in tools output, - which is the reason why empty lines where not printed in - CompilerOutputter. - -2002-06-14 Baptiste Lepilleur - - * include/cppunit/plugin/PlugInManager.h: - * src/cppunit/PlugInManager.cpp: added two methods to use the plug-in - interface for Xml Outputter hooks. - - * include/cppunit/plugin/TestPlugIn.h: added two methods to the plug-in - interface for Xml Outputter hooks. - - * include/cppunit/plugin/TestPlugInAdapter.h: - * src/cppunit/plugin/TestPlugInAdapter.cpp: renamed TestPlugInDefaultImpl. - Added empty implementation for Xml outputter hook methods. - - * include/cppunit/tools/StringTools.h: - * src/cppunit/tools/StringTools.cpp: added. Functions to manipulate string - (conversion, wrapping...) - - * include/cppunit/tools/XmlElement.h: - * src/cppunit/XmlElement.cpp: renamed addNode() to addElement(). Added - methods to walk and modify XmlElement (for hook). Added documentation. - Use StringTools. - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: added hook calls & management. - - * include/cppunit/XmlOutputterHook.h: - * src/cppunit/XmlOutputterHook.cpp: added. Hook to customize XML output. - - * src/DllPlugInTester/DllPlugInTester.cpp: call plug-in XmlOutputterHook - when writing XML output. Modified so that memory is freed before - unloading the test plug-in (caused crash when freeing the XmlDocument). - - * examples/ReadMe.txt: - * examples/ClockerPlugIn/ReadMe.txt: added details about the plug-in - (usage, xml content...) - - * examples/ClockerPlugIn/ClockerModel.h: - * examples/ClockerPlugIn/ClockerModel.cpp: extracted from ClockerListener. - Represents the test hierarchy and tracked time for each test. - - * examples/ClockerPlugIn/ClockerListener.h: - * examples/ClockerPlugIn/ClockerListener.cpp: extracted test hierarchy - tracking to ClockerModel. Replaced the 'flat' view option with a 'text' - option to print the timed test tree to stdout. - - * examples/ClockerPlugIn/ClockerPlugIn.cpp: updated to hook the XML - output and use the new classes. - - * examples/ClockerPlugIn/ClockerXmlHook.h: - * examples/ClockerPlugIn/ClockerXmlHook.cpp: added. XmlOutputterHook to - includes the timed test hierarchy and test timing in the XML output. - - * examples/cppunittest/XmlElementTest.h: - * examples/cppunittest/XmlElementTest.cpp: added new test cases. - - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: added tests for - XmlOutputterHook. - -2002-06-14 Baptiste Lepilleur - - * src/cppunit/TypeInfoHelper.cpp: added work around for bug #565481. - gcc 3.0 RTTI name() returns the type prefixed with a number (the - length of the type). The work around strip the number. - - * src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: registry key is now - set. Allow to save settings. - - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: added layout - initialization for resizing. - - * src/msvc6/testpluginrunner/TestPlugRunner.rc: - * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: added TestRunner - project files. Somehow I can't get cdxCDynamicDialog to compile - as a MFC extension. Included all sources files and resources - as a very dirt work around. - - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testrunner/TestRunnerModel.h: those classes are no longer - exported in the MFC extension. See TestPlugInRunner issue with - cdxCDynamicDialog. - - * include/cppunit/Message.h: - * include/cppunit/TestPath.h: - * include/cppunit/TestResult.h: - * include/cppunit/TestResultCollector.h: - * include/cppunit/TestSuite.h: - * include/cppunit/TestFactoryRegistry.h: - * include/cppunit/XmlElement.h: - * include/cppunit/TypeInfoHelper.h: commented out STL template export - in DLL. This caused conflicts when instantiting the same template in - a user project. - -2002-06-14 Baptiste Lepilleur - - * src/cppunit/CompilerOutputter.cpp: fixed bug #549762 (line wrap). - - * src/msvc6/testrunner/DynamicWindow/*: added. Dynamic Window library - from Hans Bühler (hans.buehler@topmail.de) to resize window. - - * src/msvc6/testrunner/TestRunnerModel.h: - * src/msvc6/testrunner/TestRunnerModel.cpp: removed dialog bounds from - settings. Added public registry keys for cppunit, main dialog, and - browse dialog. - - * src/msvc6/testrunner/TreeHierarchyDlg.h: - * src/msvc6/testrunner/TreeHierarchyDlg.cpp: dialog is now resizable. - Window placement is stored and restored. - - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: replaced dialog resizing code - by usage of Hans Bühler's Dynamic Window library. Dialog placement - is stored/restored by that library. ProgressBar is now a child window. - Added edit field to see the details of the failure. List on show - the short description of the failure. - - * src/msvc6/testrunner/ProgressBar.h: - * src/msvc6/testrunner/ProgressBar.cpp: is now a CWnd. - - * src/msvc6/testrunner/TestRunner.rc: named all static fill ID for resizing. - Added an invisble static field for progress bar placement. - -2002-06-13 Baptiste Lepilleur - - * doc/other_documentation.dox: fixed some typos. - - * include/cppunit/NotEqualException.h: - * src/cppunit/NotEqualException.cpp: removed. - - * include/cppunit/Exception.h: - * src/cppunit/Exception.cpp: removed 'type' related stuffs. - - * include/cppunit/TextTestResult.h: - * src/cppunit/TextTestResult.cpp: delegate printing to TextOutputter. - - * examples/simple/ExampleTestCase.h: - * examples/simple/ExampleTestCase.cpp: reindented. - - * src/qttestrunner/build: - * src/qttestrunner/qttestrunner.pro: - * src/qttestrunner/TestBrowserDlgImpl.h: - * src/qttestrunner/TestRunnerModel.h: applied Thomas Neidhart's patch, - 'Some minor fixes to compile QTTestrunner under Linux.'. - -2002-06-13 Baptiste Lepilleur - - * include/cppunit/Asserter.h: - * src/cppunit/Asserter.cpp: added functions that take a Message as a - parameter. Existing function have a short description indicating - an assertion failure. - - * include/cppunit/CompilerOuputter.h: - * src/cppunit/CompilerOuputter.cpp: removed printNotEqualMessage() and - printDefaultMessage(). Updated to use Message. - - * include/cppunit/Message.h: - * src/cppunit/Message.cpp: added. Represents a message associated to an - Exception. - - * include/cppunit/Exception.h: - * src/cppunit/Exception.cpp: the message associated to the exception is now - stored as a Message instead of a string. - - * include/cppunit/NotEqualException.cpp: constructs a Message instead of a - string. - - * include/cppunit/TestAssert.h: - * src/cppunit/TestAssert.cpp: updated to use Asserter functions that - take a message when pertinent (CPPUNIT_FAIL...). - - * include/cppunit/TestCaller.h: - * src/cppunit/TestCaller.cpp: exception not caught failure has a better - short description. - - * src/cppunit/TestCase.cpp: better short description when setUp() or - tearDown() fail. - - * src/msvc6/testrunner/TestRunnerDlg.cpp: replace '/n' in failure message - with space. - - * examples/cppunittest/ExceptionTest.cpp: - * examples/cppunittest/NotEqualExceptionTest.cpp: - * examples/cppunittest/TestCallerTest.cpp: - * examples/cppunittest/TestFailureTest.cpp: - * examples/cppunittest/TestResultCollectorTest.h: - * examples/cppunittest/TestResultCollectorTest.cpp: - * examples/cppunittest/TestResultTest.cpp: - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: updated to use Exception/Message. - - * examples/cppunittest/MessageTest.h: - * examples/cppunittest/MessageTest.cpp: added. Unit test for Message. - -2002-06-11 Baptiste Lepilleur - - * install-unix: added some hints extracted from bug #544684 on how to compile - for Solaris/Forte C++ compiler. - - * TODO: cleaned-up and added new things. - - * include/cppunit/extensions/HelperMacros.h: CPPUNIT_TEST_SUITE now declares - a class named ThisTestFixtureFactory which is a wrapper for the fixture - factory. This removes the need to cast the fixture to the correct type when - using the factory. Updated other macros implementation to use this new - factory. Modified CPPUNIT_TEST_CUSTOM(S) macros to use this new factory - class. Added macro CPPUNIT_TEST_ADD to help create new macros like - CPPUNIT_TEST_xxx. - - * examples/cppunittest/HelperMacrosTest.h: - * examples/cppunittest/HelperMacrosTest.cpp: added unit tests for - CPPUNIT_TEST_CUSTOM, CPPUNIT_TEST_CUSTOMS and CPPUNIT_TEST_ADD. - -2002-06-01 Baptiste Lepilleur - - * doc/cookbook.dox: fixed bug. - - * install-unix: added compilation instruction for Solaris/Sun 6.0 - -2002-05-25 Baptiste Lepilleur - - * include/cppunit/extensions/TestSuiteBuilder.h: updated to use TestNamer. Removed - template method addTestCallerForException() which should solve the compilation - issue with Sun 5.0/6.0 compiler. - - * include/cppunit/extensions/HelperMacros.h: updated against TestSuiteBuilder - change. Added CPPUNIT_TEST_CUSTOM and CPPUNIT_TEST_CUSTOMS to add custom - tests to the fixture suite. - - * include/cppunit/extensions/TestNamer.h: - * src/cppunit/TestNamer.cpp: added, TestNamer to name test case and fixture. - -2002-05-23 Baptiste Lepilleur - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: extracted class XmlOutputter::Node to - XmlElement. Extracted xml 'prolog' generation to XmlDocument. - - * include/cppunit/tools/XmlElement.h: - * src/cppunit/tools/XmlElement.cpp: added, extracted from XmlOutputter::Node. - - * include/cppunit/tools/XmlDocument.h: - * src/cppunit/tools/XmlDocument.cpp: added, extracted from XmlOutputter. Handle - XML document prolog (encoding & style-sheet) and manage the root element. - - * src/DllPlugInTester/DllPlugInTester.cpp: bug fix, flag --xsl was ignored. - - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: updated for XmlOuputter changes. - extracted tests for XmlOutputter::Node to XmlElementTest - - * examples/cppunittest/XmlElementTest.h: - * examples/cppunittest/XmlElementTest.cpp: added, tests extracted from - XmlOutputterTest. - -2002-05-21 Baptiste Lepilleur - - * src/msvc6/testrunner/MsDevCallerListCtrl.h: - * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: - * src/msvc6/testrunner/Resource.h: - * src/msvc6/testrunner/TestRunner.rc: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testrunner/TestRunnerModel.h: - * src/msvc6/testpluginrunner/TestPlugInRunner.rc: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h: - * src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp: integrated patch from - Marco Welti (Welti@GretagMacbeth.ch) with a few clean up. - Display the name of the test being run during above the progress bar. Allow the - VC++ add-ins to works with TestPlugInRunner (COM init). DLL name can be specified - on the command line after flag '-testsuite'. Display wait cursor, clear and reload - history when reloading DLL. - - * THANKS: added Marco Welti to the list. - -2002-05-07 Baptiste Lepilleur - - * src/DllPlugInTester/CommandLineParser.cpp: fixed compilation issue. - - * src/msvc6/TestRunner/ActiveTest.h: - * src/msvc6/TestRunner/ActiveTest.cpp: reindented. bugfix: thread - handle resource leak (bug #553424). - -2002-04-25 Baptiste Lepilleur - - * src/cppunit/XmlOutputter.cpp: bugfix, use ISO-8859-1 encoding if an - empty string is given. - - * src/DllPlugInTester/CommandLineParser.h: - * src/DllPlugInTester/CommandLineParser.cpp: - * src/DllPlugInTester/DllPlugInTester.cpp: added option -w to wait for - the user to press a key before exiting (Philippe Lavoie patch, - with change). - -2002-04-22 Baptiste Lepilleur - - * include/cppunit/plugin/DynamicLibraryManagerException.h: removed - trailing ',' in enum. - - * examples/ClockerPlugIn/ClockerListener.cpp: bugfix, average test - case time computation. - -2002-04-21 Baptiste Lepilleur - - * bumped version to 1.9.7 - - * comitted stuffs I forgot to in 1.9.6. - -2002-04-21 Baptiste Lepilleur - - * contrib/bc5/bcc-makefile.zip: updated, generic makefile for - Borland 5.5, contributed by project cuppa. - - * examples/cppunittest/*Suite.h: integrated Jeffrey Morgan's patch, - to remove warning with gcc. - - * release 1.9.6 - -2002-04-21 Baptiste Lepilleur - - * src/DllPlugInTester/makefile.am: removed ld.so from LDADD flags. - - * src/DllPlugInTester/CommandLineParser.h: - * src/DllPlugInTester/CommandLineParser.cpp: rewrote, fixed problem - with double quotes in command line... - - * src/DllPlugInTester/CommandLineParserTest.h: - * src/DllPlugInTester/CommandLineParserTest.cpp: - * src/DllPlugInTester/DllPlugInTesterTest.cpp: added, unit tests for - CommandLineParser. - - * src/msvc6/TestPlugIn/*: removed. - - * examples/Money/*: added. New 'hello world' example. - - * doc/Money.dox: added. Article that go along with the Money example. - -2002-04-21 Baptiste Lepilleur - - * THANKS: updated - - * src/cppunit/DynamicLibraryManager.cpp: bugfix: did not pass - library name to exception. - - * include/cppunit/TestPath.h: - * src/cppunit/TestPath.cpp: changed into value object. - - * src/cppunit/BeosDynamicLibraryManager.cpp: integrated patch from - Shibu Yoshiki for BeOS ('cuppa' project team). - - * src/DllPlugInTester/CommandLineParser.h: - * src/DllPlugInTester/CommandLineParser.cpp: added. Command line - parsing. - - * src/DllPlugInTester/DllPlugInTester.cpp: full command line support - with parameters for plug-ins. - - * src/DllPlugInTester/makefile.am: - * examples/simple/makefile.am: - * examples/cppunittest/makefile.am: integrated Jeffrey Morgan's patch, - Unix side should be working again. - - * examples/ReadMe.txt: added. Brief description of each example. - - * examples/cppunittest/CppUnitTestPlugIn.cpp: - * examples/cppunittest/CppUnitTestPlugIn.dsp: added. New project to - build CppUnit's test suite as a test plug-in. - - * examples/cppunittest/CppUnitTestSuite.cpp: updated. Use new - helper macros to create the test suite hierarchy. - - * examples/simple/simple_plugin.opt: added. Contains debug tab - settings. - - * examples/ClockerPlugIn/ClockerListener.cpp: - * examples/ClockerPlugIn/ClockerListener.h: - * examples/ClockerPlugIn/Timer.cpp: - * examples/ClockerPlugIn/Timer.h: - * examples/ClockerPlugIn/WinNtTimer.cpp: - * examples/ClockerPlugIn/WinNtTimer.h: - * examples/ClockerPlugIn/ClockerPlugIn.cpp: - * examples/ClockerPlugIn/ClockerPlugIn.dsp: added. test listener - plug-in that times tests. - - * examples/DumperPlugIn/DumperListener.cpp: - * examples/DumperPlugIn/DumperListener.h: - * examples/DumperPlugIn/DumperPlugIn.cpp: - * examples/DumperPlugIn/DumperPlugIn.dsp: added. test listener - plug-in that dump the test tree. - - -2002-04-19 Baptiste Lepilleur - - * src/cppunit/PlugInManager.cpp: fixed bug in unload(). - - * include/cppunit/TypeInfoHelper.h: - * src/cppunit/TypeInfoHelper.cpp: Implementation is now always available - is CPPUNIT_HAVE_RTTI is not 0. This removes the need to use - different libraries. CPPUNIT_USE_TYPEINFO_NAME can be set on a - case by case basis for HelperMacros. - - * src/cppunit/TestFactoryRegistry.cpp: removed unused include of - TypeInfoHelper.h. - - * include/cppunit/TextTestProgressListener.h: - * src/cppunit/TextTestProgressListener.cpp: used endTest() instead - of done() to finalize. - - * src/msvc6/TestPlugInRunner/TestPlugIn.h: - * src/msvc6/TestPlugInRunner/TestPlugIn.cpp: updated to use the - new test plug-in system. - - * examples/simple/SimplePlugIn.cpp: - * examples/simple/simple_plugin.dsp: crossplatform test plug-in - example using 'simple'. - - * examples/msvc6/EasyTestPlugIn/*: projects replaced with the - crossplatform projecct examples/simple/simple_plugin.dsp. - -2002-04-19 Baptiste Lepilleur - - * configure.in: added some makefile.am - - * contrib/readme.txt: updated. - - * contrib/bc5/bc5-makefile.zip: added borland 5.5 makefile. Contributed by - project cuppa. - - * src/cppunit/TypeInfoHelper.cpp: fixed implementation to be more - portable. - - -2002-04-18 Baptiste Lepilleur - - * bumped version to 1.9.3 - - * FAQ: added question about 4786 warning on VC++. - - * NEWS: updated. - - * contrib/msvc/readme.txt: moved to contrib/readme.txt. - - * contrib/xml-xsl/report.xsl: added XML style sheet contributed by - 'cuppa' project team (http://sourceforge.jp/projects/cuppa/) - - * examples/cppunittest/TestResultTest.h: - * examples/cppunittest/TestResultTest.cpp: added tests for - startTestRun()/endTestRun(). - - * examples/simple/*: added. A simple example. - - * include/cppunit/BriefTestProgressListener.h: - * src/cppunit/BriefTestProgressListener.cpp: added. Verbose progess listener - that print the test name before running the test. - - * include/cppunit/TestListener.h: added startTestRun()/endTestRun(). - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.cpp: added runTest(), to be called to run - a test by test runner. - - * src/cppunit/TextTestRunner.cpp: - * src/cppunit/TestRunner.cpp: updated to use TestResult::runTest(). - - * include/cppunit/plugin/PlugInManager.h: - * src/cppunit/PlugInManager.cpp: added. Managers for all loaded plug-ins. - - * include/cppunit/plugin/TestPlugInDefaultImpl.h: - * src/cppunit/TestPlugInDefaultImpl.cpp: renamed TestPlugInAdapter. All - implementations are empty. - - * include/cppunit/plugin/TestPlugInSuite.h: removed. - * src/cppunit/TestPlugInSuite.cpp: removed. Replaced by PlugInManager. - - * include/cppunit/plugin/TestPlugIn.h: rewrote the plug-in interface to - provide more versatility. updated macros to match new interface. - - * include/cppunit/extensions/TestFactoryRegistry.h: - * include/cppunit/extensions/TestFactoryRegistry.cpp: Added unregisterFactory(). - Added convenience method addRegistry(). Rewrote registry life cycle - management. AutoRegisterSuite can now detect that the registry has been - destroy and not call to it to unregister its test factory. - - * include/cppunit/extensions/AutoRegisterTest.h: on destruction, the registered - factory is unregistered from the registry. - - * include/cppunit/extensions/HelperMacros.h: added macros - CPPUNIT_REGISTRY_ADD_TO_DEFAULT and CPPUNIT_REGISTRY_ADD to help - build test suite hierarchy. - - * src/cppunit/msvc/DllPlugInTester/*: moved to src/cppunit/DllPlugInTester/. - - * src/cppunit/DllPlugInTester/DllPlugInTester.cpp: removed UNICODE stuffs. Use - the PlugInManager instead of PlugInTestSuite. Simplified: only one test on - command line, but many DLL can be specified. Added configurations to link - against cppunit dll, those are now the default configuration (static linking - don't make much sense for plug-in). - -2002-04-15 Baptiste Lepilleur - - * release 1.9.2. - - * NEWS: updated. - - * configure.in: added include/cppunit/config/Makefile and - include/cppunit/plugin/Makefile to the list of target. - - * doc/CppUnit-win.dox: enabled generation of HTML Help documentation. - - * include/cppunit/config/Makefile.am: - * include/cppunit/plugin/Makefile.am: added. - - * include/cppunit/config-bcb5.h: - * include/cppunit/config-msvc6.h: - * include/cppunit/config-mac.h: moved to include/cppunit/config/. - - * include/cppunit/Portability.h: updated config files location. Added macros - CPPUNIT_STRINGIZE and CPPUNIT_JOIN (implementation adapted from boost.org). - Added macro CPPUNIT_MAKE_UNIQUE_NAME. - - * include/cppunit/Test.h: modified methods order. - - * include/cppunit/extensions/HelperMacros.h: renamed macro - __CPPUNIT_MAKE_UNIQUE_NAME to CPPUNIT_MAKE_UNIQUE_NAME and moved its - definition to include/cppunit/Portability.h. - - * include/cppunit/extensions/TestDecorator.h: Inherits Test instead of TestLeaf. - - * include/cppunit/plugin/DynamicLibraryManager.h: - * src/cppunit/DynamicLibraryManager.cpp: added. DLL manager (load & lookup - symbol). - - * src/cppunit/BeOsDynamicLibraryManager.cpp: - * src/cppunit/UnixDynamicLibraryManager.cpp: - * src/cppunit/Win32DynamicLibraryManager.cpp: added. Implementation of - platform dependent methods of DynamicLibraryManager. - - * include/cppunit/plugin/DynamicLibraryManagerException.h: - * src/cppunit/DynamicLibraryManagerException.cpp: added. Exception thrown - by DynamicLibraryManager. - - * include/cppunit/plugin/TestPlugIn.h: added. CppUnitTestPlugIn interface - definition. Helper macros to implements plug-in. - - * include/cppunit/plugin/TestPlugInSuite.h: - * src/cppunit/plugin/TestPlugInSuite.cpp: added. A suite to wrap a test - plug-in. - - * include/cppunit/plugin/TestPlugInDefaultImpl.h: - * src/cppunit/TestPlugInDefaultImpl.cpp: added. A default implementation - of the test plug-in interface. - - * src/msvc6/DllPlugInTester/DllPlugInTester.cpp: updated to use the - new TestPlugIn. - - * examples/cppunittest/TestResultCollectorTest.cpp: fixed typo. - -2002-04-14 Baptiste Lepilleur - - * NEWS: updated. - - * include/cppunit/TestSucessListener.h: - * src/cppunit/TestSucessListener.cpp: renamed TestSuccessListener - - * doc/cookbook.dox: - * src/msvc6/DllPlugInTester/DllPlugInTester.cpp: - * examples/cppunittest/TestResultCollectorTest.h: - * examples/cppunittest/TestResultCollectorTest.cpp: - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: - * include/cppunit/CompilerOutputter.h: - * include/cppunit/TestListener.h: - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: - * src/cppunit/CompilerOutputter.cpp: fixed 'success' typo (was misspelled - 'sucess'). - - * include/cppunit/TestResultCollector.h: - * src/cppunit/TestResultCollector.cpp: updated (renaming of - TestSucessListener). - - * src/cppunit/XmlOutputter.cpp: - * examples/cppunittest/XmlOutputterTest.cpp: Changed SucessfulTests tag to - SucessfulTests. - -2002-04-13 Baptiste Lepilleur - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: Made XML output more human readable. Idented element. - - * examples/cppunittest/XmlUniformiser.h: - * examples/cppunittest/XmlUniformiser.cpp: - * examples/cppunittest/XmlUniformiserTest.cpp: modified to ignore trailing space - at the end of element content. - -2002-04-13 Baptiste Lepilleur - - * Snapshot 1.9.0 - - * NEWS: updated - - * doc/other_documentation.dox: addded new module for test plug-in. - - * include/msvc6/DSPlugin/TestRunnerDSPlugin.h: - * include/msvc6/DSPlugin/TestRunnerDSPlugin_i.c: added. Those file are - generated by project src/msvc/DSPlugin. They are provided to allow - compilation of TestRunner without compiling DSPlugIn which does not - build on VC++ 7. - - * examples/examples.dsw: removed DSPlugIn for workspace (fail to build - with VC++ 7). Added DllPlugInTester.dsp to workspace. - - * examples/msvc6/TestPlugIn/TestPlugIn.dsp: added post-build unit testing - using the new DllPlugInTester. - - * examples/msvc6/EasyTestPlugIn/*: a new project that - demonstrates the use of CPPUNIT_TESTPLUGIN_IMPL to create a test plug-in. - - * src/cppunit/cppunit.dsw: - * src/TestPlugInRunner.dsw: - * src/TestRunner.dsw: removed. Should use src/CppUnitLibraries.dsw instead. - - * include/cppunit/ui/text/TestRunner.h: - * src/cppunit/TextTestRunner.cpp: removed findTestName() method. Replaced - by Test::findTest(). - - * src/msvc6/DSPlugIn/DSPlugIn.dsp: - * src/msvc6/DSPlugIn/DSAddIn.h: changed include for add-in. MIDL generates - files in sub-directory ToAddToDistribution. Generated file should be - copied to include/msvc6/DSPlugin when modified. This remove the dependecy - of MfcTestRunner on DSPlugIn. - - * src/msvc6/testrunner/ListCtrlFormatter.h: - * src/msvc6/testrunner/ListCtrlFormatter.cpp: added GetNextColumnIndex(). - - * src/msvc6/testrunner/src/TestRunnerDlg.h: - * src/msvc6/testrunner/src/TestRunnerDlg.cpp: set column number in - MsDevCallerListCtrl when initializing the list. - - * src/msvc6/testrunner/src/MsDevCallerListCtrl.h: - * src/msvc6/testrunner/src/MsDevCallerListCtrl.cpp: column indexes for - file and line number are no longer static. Added methods to set those - indexes. Changed DSPlugIn header name. - - * include/msvc6/testrunner/TestPlugInInterface.h: fixed inclusion of - windows header for WINAPI. Added macro CPPUNIT_TESTPLUGIN_IMPL to - automatically implements a test plug-in. - - * src/msvc6/DllPlugInTester/*: added new project. A application to test DLL - and report using CompilerOutputter. Target for post-build testing and - debugging of DLL. - - -2002-04-13 Baptiste Lepilleur - - * include/cppunit/CompilerOutputter.h: - * src/cppunit/CompilerOutputter.h: deprecated defaultOuputter(). Added - setLocationFormat() and format specifiation in constructor. A string - that represent the location format is used to output the location. - Default format is defined by CPPUNIT_COMPILER_LOCATION_FORMAT. - - * include/cppunit/config-msvc6.h: - * include/cppunit/Portability.h: added CPPUNIT_COMPILER_LOCATION_FORMAT. - Use gcc location format if VC++ is not detected. - - * include/cppunit/Test.h: fixed documentation. - - * include/cppunit/TestListener.h: added startSuite() and endSuite() - callbacks. Added new example to documentation. - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.cpp: - * include/cppunit/TestComposite.h: - * src/cppunit/TestComposite.cpp: Updated to inform the listeners. - - * src/qttestrunner/TestBrowserDlgImpl.cpp: used Test new composite - interface instead of RTTI to explore the test hierarchy. - - * examples/cppunittest/MockTestListener.h: - * examples/cppunittest/MockTestListener.cpp: updated,added support for - startSuite() and endSuite(). - - * examples/cppunittest/TestResultTest.h: - * examples/cppunittest/TestResultTest.cpp: added tests for startSuite() - and endSuite(). - -2002-04-12 Baptiste Lepilleur - - * Makefile.am: added examples/qt to tar ball release. - - * TODO: heavily updated. - - * contrib/msvc/CppUnit*.wwtpl: changed base class for unit test to TestFixture. - - * include/cppunit/Test.h: removed toString() method. Not used by the framework - and source of confusions with getName(). - Added getChildTestCount() and getChildTestAt(), introducing the composite pattern - at top level. Added utility methods findTest() and findTestPath(). - - * src/cppunit/Test.cpp: added. Implementation of new utility methods. - - * include/cppunit/TestCase.h: - * src/cppunit/TestCase.cpp: inherits TestLeaf. Removed toString(), run(void) and - defaultResult(). Removed default constructor. - - * src/cppunit/TestCase.cpp: - * src/cppunit/TestSuite.cpp: fixed some includes that used "" instead of <>. - - * include/cppunit/TestComposite.h: - * src/cppunit/TestComposite.cpp: added. Common implementation of Test for composite - tests (TestSuite). - - * include/cppunit/TestFailure.h: - * src/cppunit/TestFailure.cpp: removed toString(). - - * include/cppunit/TestLeaf.h: - * src/cppunit/TestLeaf.cpp: added. Common implementation of Test for single test - (TestCase). - - * include/cppunit/TestListener.h: added TimingListener example to documentation. - - * include/cppunit/TestPath.h: - * src/cppunit/TestPath.cpp: added. List of test traversed to access a test in the - test hierarchy. - - * include/cppunit/TestRunner.h: added. Generic TestRunner. - - * src/cppunit/TestRunner.cpp: moved to TextTestRunner.cpp. Added new implementation - of includecppunit/TestRunner.h. - - * include/cppunit/TestSuite.h: - * src/cppunit/TestSuite.cpp: inherits TestComposite and implements new Test - interface. Removed toString(). - - * src/cppunit/TextTestRunner.cpp: moved from TestRunner.cpp. Implementation of - include/cppunit/ui/text/TestRunner.h. - - * include/cppunit/extensions/RepeatedTest.h: - * src/cppunit/RepeatedTest.cpp: removed toString(). - - * include/cppunit/extensions/TestDecorator.h: inherits TestLeaf. - Removed toString() - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: - * examples/cppunittest/XmlOutputterTest.cpp: - * examples/cppunittest/XmlOutputterTest.h: XML outputter now escape node content. - Add unit test for that bug (#540944). Added style sheet support. Modified - XML structure: failure message as its own element. - - * src/msvc/testrunner/TestRunnerModel.h: - * src/msvc/testrunner/TestRunnerModel.cpp: used Test::findTest() to find a test - by name instead of using RTTI. Added toAnsiString() for convertion when - compiling as UNICODE. - - * src/msvc/testrunner/TreeHierarchyDlg.h: - * src/msvc/testrunner/TreeHierarchyDlg.cpp: used new composite interface of Test - to explorer the test hierarchy instead of RTTI. - - * examples/cppunittest/TestPathTest.h: - * examples/cppunittest/TestPathTest.cpp: added, unit tests for TestPath. - - * examples/cppunittest/TestCaseTest.h: - * examples/cppunittest/TestCaseTest.cpp: added test for TestLeaf. - - * examples/cppunittest/TestSuiteTest.h: - * examples/cppunittest/TestSuiteTest.cpp: added test for TestComposite and - new Test interface. - -2002-04-11 Baptiste Lepilleur - - * configure.in: bumped version to 1.9.0 - - * NEWS: added version 1.9.0 - -2002-04-11 Baptiste Lepilleur - - * doc/FAQ: removed question about the Exception::operator =() problem. - - * release 1.8.0 - -2002-04-11 Steve M. Robbins - - * include/cppunit/ui/mfc/Makefile.am: - * include/cppunit/ui/qt/Makefile.am: - * include/cppunit/ui/text/Makefile.am: Set the libcppunitincludedir - variable. Correct case of header file ui/qt/Config.h. - - * configure.in: Output the new include/*/Makefiles. - -2002-04-10 Baptiste Lepilleur - - * Makefile.am: removed directory cppunitui from copy when making - the dist. - - * include/cppunit/ui: added Makefile.am for dist and install. - -2002-04-10 Baptiste Lepilleur - - * include/cppunitui/: moved to include/cppunit/ui (fix unix - install problem). - - * doc/cookbook.dox: - * examples/cppunittest/CppUnitTestMain.cpp: - * examples/msvc/CppUnitTestApp/HostApp.cpp: - * examples/msvc/HostApp/HostApp.cpp: - * examples/qt/Main.Cpp: - * examples/src/cppunit/TestRunner.cpp: - * examples/src/msvc6/TestRunner/TestRunner.cpp: - * examples/src/qttestrunner/TestRunner.cpp: updated to use - instead of in include directives. - - * doc/CppUnit-win.dox: generated documentation give the include - path at the bottom of the page for each class. - - * NEWS: added compatibility break for 1.7.10 users. - -2002-04-05 Baptiste Lepilleur - - * examples/cppunittest/CppUnitTestMain.cpp: never wait for a key press. - -2002-04-04 Baptiste Lepilleur - - * NEW: added CPPUNIT_ASSERT_EQUAL_MESSAGE compatiblity break. - - * include/cppunit/TestAssert.h: changed arguments order for - CPPUNIT_ASSERT_EQUAL_MESSAGE. 'message' is now the first argument - instead of the last (like CPPUNIT_ASSERT_MESSAGE). - - * examples/cppunittest/MockTestCase.cpp: - * examples/cppunittest/MockTestListener.cpp: updated to reflect - change on CPPUNIT_ASSERT_EQUAL_MESSAGE. - -2002-03-28 Baptiste Lepilleur - - * configure.in: bumped version to 1.7.11 - -2002-03-28 Baptiste Lepilleur - - * doc/cookbook.html: removed. Replaced by cookbook.doc. - - * doc/cookbook.dox: added, conversion of cookbook.html to Doxygen - format. - - * doc/other_documentation.dox: added groups definition. - - * doc/Makefile.am: replaced cookbook.html by cookbook.dox - - * doc/Doxyfile.in: added predefined CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION. - Replaced cookbook.html by cookbook.dox. - - * include/cppunitui/mfc/TestRunner.h: added, extracted from - include/msvc6/testrunner/TestRunner.h. Moved class TestRunner to - namespace CppUnit::MfcUi. - - * include/msvc6/testrunner/TestRunner.h: deprecated. A simple - typedef to CppUnit::MfcUi::TestRunner. - - * include/textui/TestRuner.h: added, extracted from - include/cppunit/TextTestRunner.h. - - * src/cppunit/TextTestRunner.cpp: renamed TestRunner.cpp. Moved - into namespace CppUnit::TextUi. - - * src/msvc6/testruner/TestRunner.cpp: moved into namespace - CppUnit::MfcUi. - - * src/cppunit/CompilerOutputter.cpp: removed printing "- " before - NotEqualException addional message, for consistency between - different TestRunner (Mfc,Text...) - - * include/cppunit/Asserter.h: - * include/cppunit/CompilerOutputter.h: - * include/cppunit/Exception.h: - * include/cppunit/NotEqualException.h: - * include/cppunit/Outputter.h: - * include/cppunit/SourceLine.h: - * include/cppunit/TestAssert.h: - * include/cppunit/TestCaller.h: - * include/cppunit/TestFailure.h: - * include/cppunit/TestFixture.h: - * include/cppunit/TestListener.h: - * include/cppunit/TestResult.h: - * include/cppunit/TestResultCollector.h: - * include/cppunit/TestSucessListener.h: - * include/cppunit/TestSuite.h: - * include/cppunit/TextTestProgressListener.h: - * include/cppunit/TextTestRunner.h: - * include/cppunit/XmlOutputter.h: - * include/cppunit/extensions/AutoRegisterSuite.h: - * include/cppunit/extensions/HelperMacros.h: - * include/cppunit/extensions/TestFactoryRegistry.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/TestSuiteFactory.h: doc - update. organization in groups. - - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp: - * examples/msvc6/HostApp/HostApp.cpp: updated to use - CppUnit::MfcUi::TestRunner. - - * examples/cppunittest/CppUnitTestMain.cpp: updated to use - CppUnit::TextUi::TestRunner. - -2002-03-27 Baptiste Lepilleur - - * include/msvc/testrunner/TestRunner.h: updated doc. reindented. - - * include/cppunit/Asserter.h: - * include/cppunit/Asserter.cpp: - * include/cppunit/TestResultCollector.h: - * include/cppunit/TestResult.h: - * include/cppunit/SynchronizedObject.h: - * include/cppunit/extensions/TestCaller.h: doc update. - - * include/cppunitui/qt/TestRunner.h: doc update. - -2002-03-27 Baptiste Lepilleur - - * makefile.am: added src/CppUnitLibraries.dsw, new contribution, and - src/qttestrunner. - - * TODO: updated (doc). - - * contrib/msvc/AddingUnitTestMethod.dsm: added, submitted by - bloodchen@hotmail.com. - - * constrib/msvc/readme.txt: updated. - - * include/cppunit/TestAsserter.h: - * include/cppunit/SourceLine.h: updated doc. - - * include/cppunit/TestCaller.h: reindented. updated doc. - - * include/cppunit/extensions/HelperMacros.h: relaxed constraint on fixture. - Fixture base class may be TestFixture instead of TestCase. - - * include/cppunit/TestCase.h: - * src/cppunit/TestCase.h: TestCase inherits TestFixture for setUp() and - tearDown() definition. Moved documentation to TestFixture. - - * include/cppunit/TestFixture.h: updated documentation. - - * include/cppunit/TestRegistry.h: - * src/cppunit/TestRegistry.cpp: Removed. Replaced by TestFactoryRegistry. - - * include/cppunit/TextTestRunner.h: - * src/cppunit/TextTestRunner.cpp: made printing progress using a - TextTestProgressListener optional. - - * examples/cppunittest/ExceptionTest.h: - * examples/cppunittest/HelperMacrosTest.h: - * examples/cppunittest/HelperMacrosTest.cpp: - * examples/cppunittest/NotEqualException.h: - * examples/cppunittest/OrthodoxTest.h: - * examples/cppunittest/RepeatedTest.h: - * examples/cppunittest/TestAssertTest.h: - * examples/cppunittest/TestCallerTest.h: - * examples/cppunittest/TestDecoratorTest.h: - * examples/cppunittest/TestFailureTest.h: - * examples/cppunittest/TestResultCollectorTest.h: - * examples/cppunittest/TestResultTest.h: - * examples/cppunittest/TestSetUpTest.h: - * examples/cppunittest/TestSuiteTest.h: - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: - * examples/cppunittest/XmlUniformizerTest.h: - * examples/cppunittest/XmlUniformizerTest.cpp: changed base class for fixture - from TestCase to TestFixture. - - * examples/hierarchy/BoardGameTest.h: - * examples/hierarchy/ChessTest.h: - * examples/hierarchy/main.cpp: updated to use HelperMacros for correct - fixture instantiation (the ChessBoard::testReset test case was using - BoardGame fixture instance instead of ChessBoard). - -2002-03-26 Baptiste Lepilleur - - * configure.in: bumped version to 1.7.9 - -2002-03-26 Baptiste Lepilleur - - * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: fixed release configuration. - -2002-03-25 Baptiste Lepilleur - - * include/cppunit/makefile.am: removed TestRegistry.h - - * include/cppunit/TestRegistry.h: removed. Obsolete, replaced by - TestFactoryRegistry. - - * src/cppunit/makefile.am: removed TestRegistry.cpp. Added cppunit_dll.dsp. - - * include/cppunit/CompilerOutputter.h: - * include/cppunit/NotEqualException.h: - * include/cppunit/SynchronizedObject.h: - * include/cppunit/TestFixture.h: - * include/cppunit/TestListener.h: - * include/cppunit/TestResult.h: - * include/cppunit/TestSucessListener.h: - * include/cppunit/TextOutputter.h: - * include/cppunit/TextTestProgressListener.h: - * include/cppunit/TextTestResult.h: - * include/cppunit/XmlOutputter.h: - * include/cppunit/extensions/TestFactory.h: - * include/cppunit/extensions/TestFactoryRegistry.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/TestSuiteFactory.h: minor doc update. - - * include/cppunit/TestFixture.h: added DLL export. - - * include/cppunit/msvc6/TestPlugInInterface.h: updated doc. Added automatic - exportation of TestPlugIn publishing function. - - * src/cppunit/TestCase.cpp: - * include/cppunit/TestCase.h: inherits setUp() and tearDown() from - class TestFixture. - -2002-03-25 Baptiste Lepilleur - - * configure.in: bumped version to 1.7.7 - -2002-03-25 Baptiste Lepilleur - - * include/cppunit/config-msvc6.h: - * include/cppunit/Portability.h - * include/cppunit/extensions/TestFactoryRegistry.h - * include/cppunit/TestResult.h - * include/cppunit/TestResultCollector.h - * include/cppunit/TestSuite.h - * include/cppunit/TextTestRunner.h - * include/cppunit/XmlOutputter.h: removed warning when compiling CppUnit - as DLL. - - * src/cppunit/DllMain.cpp: added some defines to speed up compilation a bit. - -2002-03-25 Baptiste Lepilleur - - * INSTALL-WIN32.txt: updated for MFC Unicode TestRunner. - - * src/msvc6/testrunner/TestRunner.dsp: added Unicode configurations. - - * src/msvc6/testrunner/ListCtrlSetter.cpp: - * src/msvc6/testrunner/ListCtrlSetter.h: replaced usage of std::string by - CString for easier ansi/unicode switch. - - * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testrunner/TestRunnerModel.cpp: - * src/msvc6/testrunner/TestRunnerModel.h: - * src/msvc6/testrunner/TreeHierarchyDlg.cpp: made changes to compile with - either ANSI and UNICODE support. - - * examples/msvc6/HostApp/HostApp.cpp: - * examples/msvc6/HostApp/HostApp.h: - * examples/msvc6/HostApp/HostAppDoc.cpp: - * examples/msvc6/HostApp/HostAppDoc.h: moved TestRunner execution to - HostApp::RunUnitTests() and removed the MainFrame application window. - - * examples/msvc6/HostApp/HostApp.dsp: added Unicode configurations. - -2002-03-24 Baptiste Lepilleur - - * INSTALL-WIN32.txt: added some info to build cppunit as a DLL. - - * include/cppunit/config-msvc6.h: added definition of macro CPPUNIT_API - when building or linking DLL. Defined CPPUNIT_BUILD_DLL when building, and - CPPUNIT_DLL when linking. - - * include/cppunit/Portability.h: added empty definition of macro - CPPUNIT_API when not building or using CppUnit as a DLL. When any of - those symbol is defined, the symbol CPPUNIT_NEED_DLL_DECL is set to 1. - - * include/cppunit/extensions/RepeatedTest.h: - * include/cppunit/extensions/TestDecorator.h: - * include/cppunit/extensions/TestSetUp.h: - * include/cppunit/TestCaller.h - * include/cppunit/extensions/TestFactory.h - * include/cppunit/extensions/TestFactoryRegistry.h - * include/cppunit/extensions/TypeInfoHelper.h - * include/cppunit/Asserter.h - * include/cppunit/Exception.h - * include/cppunit/NotEqualException.h - * include/cppunit/SourceLine.h - * include/cppunit/SynchronizedObject.h - * include/cppunit/Test.h - * include/cppunit/TestAssert.h - * include/cppunit/TestCase.h - * include/cppunit/TestFailure.h - * include/cppunit/TestListener.h - * include/cppunit/TestResult.h - * include/cppunit/TestSuite.h - * include/cppunit/CompilerOutputter.h - * include/cppunit/Outputter.h - * include/cppunit/TestResultCollector.h - * include/cppunit/TestSuccessListener.h - * include/cppunit/TextOutputter.h - * include/cppunit/TextTestProgressListener.h - * include/cppunit/TextTestResult.h - * include/cppunit/TextTestRunner.h - * include/cppunit/XmlOutputter.h: added CPPUNIT_API for DLL export. - - * include/cppunit/TestSuite.h: - * src/cppunit/TestSuite.cpp: reindented - - * include/cppunit/extensions/TestSetUp.h: - * src/cppunit/TestSetUp.cpp: added .cpp. extracted inline method and moved - them to cpp file. - - * src/cppunit/DllMain.cpp: added, contains Dll entry point. - -2002-03-06 Baptiste Lepilleur - - * src/cppunit/TextTestProgressListener.cpp: flush the stream after each - progess step. - -2002-03-03 Baptiste Lepilleur - - * configure.in: updated version number to 1.7.4 - -2002-03-03 Baptiste Lepilleur - - * include/cppunit/makefile.am: - * src/cppunit/makefile.am: added missing SynchronizedObject and - TextOutputter.h. - - * generated 1.7.3 tar ball. - -2002-02-29 Baptiste Lepilleur - - * inclued/cppunit/XmlOutputter.h: - * inclued/cppunit/XmlOutputter.cpp: added optional parameter to constructor - to specify the encoding. - - * configure.in: updated version number to 1.7.3 - -2002-02-28 Baptiste Lepilleur - - * NEW: updated and restructured. - - * include/cppunit/CompilerOutputter.h: - * src/cppunit/CompilerOutputter.cpp: - updated against TestResultChange. Changed TestResult to TestResultCollector. - - * include/cppunit/extensions/HelperMacros.h: minor documentation fix. - - * include/cppunit/Outputter.h: added. Abstract base class for all Outputter. - - * include/cppunit/Portability.h: made the fix on OStringStream suggested by - Bob Summerwill to remove level 4 warning with VC++. - - * include/cppunit/TestAssert.h: added macro CPPUNIT_ASSERT_EQUAL_MESSAGE. - - * src/cppunit/TestFailure.cpp: - * include/cppunit/TestFailure.h: added method clone() to duplicate a - failure. Made all method virtual. - - * include/cppunit/TestListener.h: changed signature of addFailure() to - addFailure( const TestFailure &failure ). Failure is now only a temporary - object. - - * include/cppunit/Outputter.h: added. Abstract base class for all - outputter. Used by TextTestRunner. - - * include/cppunit/SynchronizedObject.h: - * src/cppunit/SynchronizedObject.cpp: added. Class extracted from - TestResult. Base class for objects that can be accessed from different - threads. - - * include/cppunit/TestResult.h: TestFailure.h is no longer included. - - * include/cppunit/TestResult.h: - * src/cppunit/TestResult.cpp: extracted all methods related to keeping track - of the result to the new TestResultCollector class which is a TestListener. - - * include/cppunit/TestResultCollector.h: - * src/cppunit/TestResultCollector.cpp: added. TestListener which kept track - of the result of the test run. All failure/error, and tests are tracked. - - * include/cppunit/TestSucessListener.h: - * src/cppunit/TestSucessListener.cpp: added. TestListener extracted from - TestResult. Is responsible for wasSucessful(). - - * include/cppunit/TestCase.h: - * src/cppunit/TestCase.cpp: reindented. - - * include/cppunit/TextOutputter.h: - * src/cppunit/TextOutputter.cpp: added. Copied from the deprecated - TextTestResult and modified to act as an Ouputter. - - * include/cppunit/TextTestProgressListener.h: - * src/cppunit/TextTestProgressListener.cpp: Copied from the deprecated - TextTestResult and modified to print the dot while the test are running. - - * include/cppunit/TextTestResult.h: - * src/cppunit/TextTestResult.cpp: updated against TestResult change. - No compatiblity break. Deprecated. - - * include/cppunit/TextTestRunner.h: - * src/cppunit/TextTestRunner.cpp: updated to work with the new TestResult. - Use TextTestProgressListener and TextOutputter instead of TextTestResult. - Any outputter with interface Outputter can be used to print the test result - (CompilerOutputter, XmlOutputter, TextOutputter...) - - * include/cppunit/XmlOutputter.h: - * src/cppunit/XmlOutputter.cpp: updated against TestResultChange. - Changed TestResult to TestResultCollector. - - * src/msvc6/TestRunnerDlg.h: - * src/msvc6/TestRunnerDlg.cpp: fixed the 'fullrowselect' feature of the - list view. The dialog is a TestListener itself, it no longer use the - GUITestResult class. - - * src/msvc6/TestRunner.rc: moved the "autorun test button" in such a way that - it did not overlap the progress bar anymore. - - * src/msvc6/MfcSynchronizationObject.h: added. Generic SynchronizedObject - lock for MFC. - - * src/msvc6/GUITestResult.h : - * src/msvc6/GUITestResult.cpp : removed. - - * src/qttestrunner/TestRunnerModel.h: - * src/qttestrunner/TestRunnerModel.cpp: changed addFailure() signature to - reflect change on TestListener. - - * examples/cppunittest/CppUnitTestMain.cpp: updated to use the new Outputter - abstraction and TextTestRunner facilities. - - * examples/cppunittest/FailingTestCase.h: - * examples/cppunittest/FailingTestCase.cpp: removed. Replaced by MockTestCase. - - * examples/cppunittest/FailingTestCase.h: - * examples/cppunittest/FailingTestCase.h: - - * examples/cppunittest/HelperMacrosTest.h: - * examples/cppunittest/HelperMacrosTest.cpp: Updated against TestResult change. - Use MockTestListener instead of TestResult to check for sucess or failure. - - * examples/cppunittest/MockTestListener.h: - * examples/cppunittest/MockTestListener.cpp: the class now behave like a mock - object. - - * examples/cppunittest/MockTestCase.h: - * examples/cppunittest/MockTestCase.cpp: added. Mock TestCase object. - - * examples/cppunittest/OrthodoxTest.h: - * examples/cppunittest/OrthodoxTest.cpp: Updated against TestResult change. - Use MockTestListener instead of TestResult to check for sucess or failure. - - * examples/cppunittest/SynchronizedTestResult.h: Updated against TestResult - change. - - * examples/cppunittest/TestCallerTest.h: - * examples/cppunittest/TestCallerTest.cpp: Updated against TestResult change. - Use MockTestListener instead of TestResult. - - * examples/cppunittest/TestCaseTest.h: - * examples/cppunittest/TestCaseTest.cpp: Updated against TestResult change. - Use MockTestListener and MockTestCase instead of FailingTestCase and TestResult. - - * examples/cppunittest/TestDecoratorTest.h: - * examples/cppunittest/TestDecoratorTest.cpp: Updated against TestResult change. - Use MockTestCase instead of FailingTestCase. - - * examples/cppunittest/TestListenerTest.h: - * examples/cppunittest/TestListenerTest.cpp: removed. Those unit tests have been - rewrote and moved to TestResultTest. - - * examples/cppunittest/TestResultTest.h: - * examples/cppunittest/TestResultTest.cpp: Updated to test the new interface. - Tests from TestListenerTest have been moved here. - - * examples/cppunittest/TestResultCollectorTest.h: - * examples/cppunittest/TestResultCollectorTest.cpp: added. Tests for the class - that been extracted from TestResult. - - * examples/cppunittest/TestSetUpTest.h: - * examples/cppunittest/TestSetUpTest.cpp: renamed SetUp inner class to MockSetUp. - Changed interface to be more akin to a Mock object. - - * examples/cppunittest/TestSuiteTest.h: - * examples/cppunittest/TestSuiteTest.cpp: Updated against TestResult change, - and rewrote to use MockTestCase instead of FailingTestCase. - - * examples/cppunittest/XmlOutputterTest.h: - * examples/cppunittest/XmlOutputterTest.cpp: Updated against TestResult change. - Added some utility methods to make the update easier. - -2001-10-28 Steve M. Robbins - - * INSTALL-unix: Add note about cygwin. - -2001-10-24 Baptiste Lepilleur - - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp: - * examples/msvc6/HostApp/HostApp.dsp: use custom file build instead - of post-build/pre-link step to copy the TestRunner DLL to the - Release/Debug directory. - - * src/msvc6/ProgressBar.cpp: - * src/msvc6/ProgressBar.h: - * src/msvc6/TestRunner.rc: - * src/msvc6/TestRunnerDlg.cpp: - * src/msvc6/TestRunnerDlg.h: - * src/msvc6/testRunner.dsp: - * src/msvc6/TestRunnerModel.cpp: - * src/msvc6/TestRunnerModel.h: included Gigi Sayfan (gigi@morphink.com) - patch. The dialog can now be resized, and list view columns and dialog - sizes are saved. - - * src/msvc6/ProgressBar.cpp: - * src/msvc6/ProgressBar.h: Minor refactoring. - - * THANKS: added Gigi Sayfan to the list. - -2001-10-21 Steve M. Robbins - - * configure.in: Bump version to 1.7.2. - - * Release 1.7.1 (alpha). - - * Merged changes from cvs BRANCH_1_6; details follow. - - * examples/cppunittest/TestSetUpTest.h (class SetUp): Add - namespace qualifier to CppUnit::TestSetup() constructor call. - - * include/cppunit/Makefile.am (dist-hook): Restore hook to - remove config-auto.h from distribution. - - * doc/Makefile.am: Move the definition of htmldir inside if DOC - conditional. Add "else" branch to conditional with dummy targets - for install-data-hook and uninstall-local. Move all-local outside - the conditional, and move "dox" target into both branches of the - conditional. - -2001-10-20 Steve M. Robbins - - * examples/cppunittest/Makefile.am (cppunittestmain_SOURCES): - Include XmlUnformiserTest files. - - * doc/Doxyfile.in (GENERATE_MAN): Do not generate man pages. - * doc/Makefile.am: Do not make man directories. - -2001-10-19 Baptiste Lepilleur - - * include/cppunit/Exception.h: - * src/cppunit/Exception.cpp: what(), added back the throw() qualifier. - -2001-10-14 Baptiste Lepilleur - - * include/cppunitui/* : added, Qt TestRunner. - - * examples/qt/* : added, example showing the use of Qt TestRunner. - - * src/qttestrunner : added, source of the Qt TestRunner DLL. - -2001-10-08 Steve M. Robbins - - * src/cppunit/Exception.cpp (what): Remove "throw()" qualifier, to - match earlier change to header. - -2001-10-07 Baptiste Lepilleur - - * include/cppunit/CompilerTestResultOutputter.h : - renamed CompilerOutputter.h - - * src/cppunit/CompilerTestResultOutputter.cpp : - renamed CompilerOutputter.cpp - - * include/cppunit/CompilerTestResultOutputter.h : - * src/cppunit/CompilerTestResultOutputter.cpp : ajust max line length - for wrapping. Added static factory method defaultOutputter(). Print - the number of test runs on success. - - * include/cppunit/CompilerTestResultOutputter.h : renamed - CompilerOutputter.h. - - * src/cppunit/CompilerTestResultOutputter.cpp : renamed - CompilerOutputter.cpp. - - * examples/cppunittest/CppUnitTestMain.cpp : use factory method - CompilerTestResultOutputter::defaultOutputter(). - - * src/msvc6/DSPlugIn/DSPlugIn.dsp : removed COM registration in - post-build step. IT is automatically done by VC++ when the add-in is - added. Caused build to failed if the add-in was used in VC++. - - * NEWS : updated. - - * src/cppunit/TestAssert.cpp : modified deprecated assert - implementations to use Asserter. - - * examples/cppunittest/XmlTestResultOutputterTest.h : - renamed XmlOutputterTest.h. - - * examples/cppunittest/XmlTestResultOutputterTest.cpp : - renamed XmlOutputterTest.cpp. - - * NEWS : - * examples/cppunittest/CppUnitTestMain.cpp : - * examples/cppunittest/CppUnitTestMain.dsp : - * examples/cppunittest/Makefile.am : - * examples/cppunittest/XmlTestResultOutputterTest.h : - * examples/cppunittest/XmlTestResultOutputterTest.cpp : - * examples/msvc6/CppUniTestApp/CppUnitTestApp.dsp - * include/cppunit/CompilerOutputter.h : - * include/cppunit/Makefile.am : - * include/cppunit/XmlTestResultOutputter.h : - * src/cppunit/CompilerOutputter.cpp : - * src/cppunit/cppunit.dsp : - * src/cppunit/Makefile.am : - * src/cppunit/XmlTestResultOutputter.cpp : change due to renaming - CompilerTestResultOutputter to CompilerOutputter, - XmlTestResultOutputter to XmlOuputter, XmlTestResultOutputterTest - to XmlOutputterTest. - -2001-10-06 Baptiste Lepilleur - - * include/cppunit/CompilerTestResultOutputter.h : - * src/cppunit/CompilerTestResultOutputter.cpp : added. Output result - in a compiler compatible format. - - * src/cppunit/CppUnit.dsp : - * include/cppunit/MakeFile.am : - * src/cppunit/MakeFile.am : added CompilerTestResultOutputter.cpp - and CompilerTestResultOutputter.h. - - * examples/cppunittest/CppUnitTestMain.cpp : if -selftest is specified - on the command line, no standard test result are printed, but compiler - compatible result at printed. - - * examples/cppunittest/CppUnitTestMain.dsp : added post-build step to - run the test suite with -selftest. - - * NEWS : updated. - - * src/cppunit/TextTestRunner.cpp : skip a line after printing - progress. - -2001-10-06 Baptiste Lepilleur - - * examples/cppunittest/CppUnitTestMain.cpp : application returns - 0 is test suite run sucessfuly, 1 otherwise. - - * src/cppunit/Exception.cpp : bug fix, operator =() with VC++. - Removed call to std::exception::operator =() which is bugged - on VC++. - - * doc/FAQ : added a note explaining why the test - ExceptionTest.testAssignment used to fail. - - * NEWS : updated and detailed. - - * include/cppunit/TestResult.h : - * src/cppunit/TestResult.cpp : added reset(). - - * include/cppunit/TextTestRunner.h : - * src/cppunit/TextTestRunner.cpp : Constructor take an optional - TextTestRestult. The TextTestResult remain alive as long as - the runner. Added result() to retreive the result. Printing the - result is now optinal (enabled by default). - -2001-10-05 Baptiste Lepilleur - - * include/cppunit/Asserter.h : - * src/cppunit/Asserter.cpp : added. Helper to create assertion macros. - - * src/cppunit/cppunit.dsp : - * src/cppunit/Makefile.am : - * include/cppunit/Makefile.am : added Asserter.h and Asserter.cpp. - - * include/cppunit/Exception.h : - * src/cppunit/Exception.cpp : added constructor that take a - SourceLine argument. Deprecated static constant and old constructor. - Fixed some constness issues. - - * examples/cppunittest/ExceptionTest.cpp : Refactored. - - * NEWS : partially updated (need to be more detailed) - - * include/cppunit/NotEqualException.h : - * src/cppunit/NotEqualException.cpp : added constructor that take a - SourceLine argument. Deprecated old constructor. Added a third element - to compose message. - - * examples/cppunittest/NotEqualExceptionTest.cpp : moved to "Core" - suite. Added test for SourceLine() and additionalMessage(). - Refactored. - - * include/cppunit/SourceLine.h : - * src/cppunit/SourceLine.cpp : added. Result of applying - IntroduceParameterObject refactoring on filename & line number... - - * include/cppunit/TestAssert.h : - * src/cppunit/TestAssert.cpp : deprecated old assert functions. - added functions assertEquals() and assertDoubleEquals() which use - SourceLine. - - * src/cppunit/TestCase.cpp : Modified for SourceLine. - - * include/cppunit/TestFailure.h : - * src/cppunit/TestFailure.cpp : added failedTestName(), and - sourceLine(). - - * src/msvc6/testrunner/TestRunnerDlg.cpp : modified to use SourceLine. - - * include/cppunit/TextTestResult.h : - * src/cppunit/TextTestResult.cpp : corrected include order and - switched to angled brackets. Refactored. Don't print failure location - if not available. Not equal failure dump additional message if - available. - - * src/cppunit/TextTestRunner.cpp : run() now returns a boolean to - indicate if the run was sucessful. - - * src/cppunit/XmlTestResultOutputter.cpp : replaced itoa() with - OStringStream. Refactored. - - * examples/cppunittest/XmlUniformiser.h : - * examples/cppunittest/XmlUniformiser.cpp : - CPPUNITTEST_ASSERT_XML_EQUAL capture failure location. Refactored - checkXmlEqual(). - - * examples/cppunittest/XmlUniformiserTest.h : - * examples/cppunittest/XmlUniformiserTest.cpp : added test for - CPPUNITTEST_ASSERT_XML_EQUAL. - - * include/cppunit/XmlTestResultOutputter.h : - * src/cppunit/XmlTestResultOutputter.cpp : updated to use SourceLine. - -2001-10-05 Baptiste Lepilleur - - * NEWS : updated. - - * include/cppunit/Exception.h : added include Portability.h. - - * include/cppunit/TestResult.* : changed TestFailures to a deque. - added tests(). - - * examples/cppunittest/CppUnitTest.dsp : - * examples/cppunittest/MakeFile.am : - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp : Added - XmlTestResultOutputterTest.*, XmlUniformiser.*, XmlUniformiserTest.*, - UnitTestToolSuite.h, OutputSuite.h. - - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp : revised project - folders structure. Added missing NoteEqualExceptionTest.*. - - * examples/cppunittest/CppUnitTestSuite.cpp : added 'Output' and - 'UnitTestTool' suites. - - * src/cppunit/cppunit.dsp: removed estring.h. Revised project folders - structure. Removed TestRegistry.*. Added TestSetUp.h, - XmlTestResultOutputter.*. - - * src/cppunit/MakeFile.am: added XmlTestResultOutputter.*. - - * src/testrunner/TestRunnerDlg.cpp: removed disabled code. - -2001-10-03 Baptiste Lepilleur - - * include/cppunit/TestFailure.cpp : - * include/cppunit/TestFailure.h : fixed some constness issues. Added - argument to indicate the type of failure to constructor. Added - isError(). - - * include/cppunit/TestListener.h : removed addError(). addFailure() - now take a TestFailure as argument. - - * include/cppunit/TestResult.h : - * include/cppunit/TestResult.cpp : removed errors(). Refactored. Fixed - some constness issues. Added typedef TestFailures for vector returned - by failures(). failures() returns a const reference on the list of - failure. added testFailuresTotal(). Constructor can take an optional - synchronization object. - - * include/cppunit/TextTestResult.h : - * include/cppunit/TextTestResult.cpp : removed printErrors(). - Refactored. Updated to suit new TestResult, errors and failures are - reported in the same list. - - * examples/cppunittest/TestFailureTest.cpp : - * examples/cppunittest/TestFailureTest.h : modified to use the new - TestFailure constructor. Added one test. - - * examples/cppunittest/TestListenerTest.cpp: removed addError(). - Refactored to suit new TestListener. - - * examples/cppunittest/TestResultTest.h : - * examples/cppunittest/TestResultTest.cpp : modified to suit the - new TestResult. - -2001-10-02 Baptiste Lepilleur - - * include/cppunit/extensions/TestFactoryRegistry.h - * src/cppunit/TestFactoryRegistry.cpp : fixed memory leaks that - occured when a TestFactoryRegistry was registered into another - TestFactoryRegistry. - - * include/cppunit/extensions/AutoRegisterSuite.h : updated doc. - - * include/cppunit/extensions/HelperMacros.h : added macro - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION to register a suite into - a named suite. Updated doc. - - * examples/cppunittest/CoreSuite.h: - * examples/cppunittest/ExtensionSuite.h: - * examples/cppunittest/HelperSuite.h: added, declaration of suite for - use with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - - * examples/cppunittest/makefile.am : added HelperSuite.h, CoreSuite.h, - ExtensionSuite.h, CppUnitTestSuite.h and CppUnitTestSuite.cpp. - - * examples/cppunittest/CppUnitTestSuite.*: added. - - * examples/cppunittest/ExceptionTest.cpp: - * examples/cppunittest/TestAssertTest.cpp: - * examples/cppunittest/TestCaseTest.cpp: - * examples/cppunittest/TestFailureTest.cpp: - * examples/cppunittest/TestListenerTest.cpp: - * examples/cppunittest/TestResultTest.cpp: - * examples/cppunittest/TestSuiteTest.cpp: moved into named suite - "Core" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - - * examples/cppunittest/OrthodoxTest.cpp: - * examples/cppunittest/RepeatedTest.cpp: - * examples/cppunittest/TestDecoratorTest.cpp: - * examples/cppunittest/TestSetUpTest.cpp: moved into named suite - "Extension" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - - * examples/cppunittest/HelperMacrosTest.cpp: - * examples/cppunittest/TestCallerTest.cpp: moved into named suite - "Helper" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - - * examples/cppunittest/CppUnitTest.dsp : - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp : added - Makefile.am, HelperSuite.h, CoreSuite.h, ExtensionSuite.h, - CppUnitTestSuite.h and CppUnitTestSuite.cpp. - -2001-10-01 Baptiste Lepilleur - - * NEWS : updated. - - * doc/other_documentation.dox : added all the authors to the list of - authors. - - * examples/cppunittest/HelperMacrosTest.*: added unit tests for - CPPUNIT_TEST_FAIL & CPPUNIT_TEST_EXCEPTION. - - * examples/cppunittest/TestAssertTest.*: added unit tests for - CPPUNIT_FAIL. Corrected spelling error. Relaxed constraint on message - produced by CPPUNIT_ASSERT_MESSAGE. Refactored some tests. - - * include/cppunit/extensions/HelperMacros.h : added macro - CPPUNIT_TEST_EXCEPTION to create a test case for the specified method - that must throw an exception of the specified type. - - * include/cppunit/extensions/TestSuiteBuilder.h : made - makeTestName() public. Added addTestCallerForException() to add a - test case expecting an exception of the specified type to be - caught. - - * include/cppunit/TestAssert.h : added macro CPPUNIT_FAIL as a - shortcut for CPPUNIT_ASSERT_MESSAGE( message, false ). - -2001-09-30 Steve M. Robbins - - * configure.in: Set version to 1.7.0. - -2001-09-30 Steve M. Robbins - - * Release 1.6.1. - - * doc/footer.html: Do not meddle with font size. - - * doc/header.html: Add link to FAQ. Do not meddle with font size. - - * doc/Doxyfile.in (PROJECT_NAME): Set to "CppUnit", to be - consistent on capitalization. - (PROJECT_NUMBER): Include "Version" in the string. - - * doc/Makefile.am (EXTRA_DIST): Distribute FAQ. - - * Makefile.am (EXTRA_DIST): Distribute contrib/msvc/CppUnit.WWTpl - and contrib/msvc/readme.txt. - (dist-hook): Change line endings of these files. - - * include/cppunit/extensions/RepeatedTest.h - * src/cppunit/RepeatedTest.cpp (countTestCases, toString): - Add const qualifier to function. - -2001-09-30 Baptiste Lepilleur - - * contrib/msvc/CppUnit.WWTpl: added, template for WorkSpace Whiz! - to create new classes and unit tests. - - * doc/FAQ: - * INSTALL-WIN32.txt: moved FAQ from install-WIN32 to that file. Added - a generic question to hint at the helper macros. - - * include/cppunit/extensions/HelperMacros.h: bug #464844, moved - declaration of ThisTestCaseFactory from CPPUNIT_TEST_SUITE_END to - CPPUNIT_TEST_SUITE where the Fixture class name is available from - the macro parameter. - -2001-09-30 Steve M. Robbins - - * include/cppunit/config-mac.h: New. Macintosh configuration, - courtesy of Duane Murphy. - - * include/cppunit/Portability.h: Move include inside - #if-block that needs it. - - * doc/Makefile.am (doc-dist): Creates tar file of HTML doc files. - Remove all wildcarded filenames. Do not bother with manpages. - - * Makefile.am (EXTRA_DIST): Distribute INSTALL-unix and - cppunit-config.1. - (man_MANS): Install cppunit-config.1. - (doc-dist): Use "make doc-dist" in doc directory. - - * cppunit-config.1: Document --prefix and --exec-prefix. - - * cppunit-config.in (Usage): Remove "[LIBRARIES]" from help string. - -2001-09-29 Steve M. Robbins - - * configure.in: Set version to 1.6.1. - -2001-09-29 Baptiste Lepilleur - - * example/cppunittest/TestCaller.*: remove some memory leaks. - TestCaller exception catching features is now tested correctly. - Previous test tested nothing! - -2001-09-23 Steve M. Robbins - - * configure.in: Set version to 1.6.0. - - * Makefile.am (EXTRA_DIST): Add BUGS. - - * NEWS: Incorporate Baptiste's notes. - - * BUGS: New file for list of known bugs. - - * README: Note about file BUGS. - -2001-09-24 Baptiste Lepilleur - - * include/cppunit/TestAssert.h : changed header order to remove - warning on VC++ - - * include/cppunit/TestCaller.h : bugfix: threw 'new Exception' - instead of 'Exception'. - -2001-09-23 Steve M. Robbins - - * doc/footer.html: Put devel list in mailto tag. - - * doc/Makefile.am (man_MANS): Restore ability to install manpages. - (htmldir): HTML pages installed under $(pkgdatadir). - - * doc/other_documentation.dox: Reference cookbook.html - in same directory. Remove obsolete text. - - * configure.in: Do not set CFLAGS; remove --enable-debug-mode. - - * include/cppunit/Portability.h: - * include/cppunit/extensions/HelperMacros.h: Allow user - to request the old-style CU_TEST family of macros. - - * doc/Doxyfile.in (EXCLUDE_PATTERNS): Remove estring.h. - - * README: Add contact and bug-reporting info. - - * INSTALL-unix: New. Move the unix install notes here - from README. - - * AUTHORS: Put myself on the list. - -2001-09-21 Baptiste Lepilleur - - * include/cppunit/TestFailure.h : made destructor virtual. - - * INSTALL-WIN32.txt : added some more infos about DSPlugIn. - - * src/msvc6/DSPlugIn/DSPlugIn.rgs: added some registry data - that where missing to register the COM object. - - * src/msvc6/DSPlugIn/DSPlugIn.rc: updated some dll version info. - - * src/msvc6/DSPlugIn/DSPlugIn.dsp: fixed the custom build step to - register the DLL using regsvr32.exe. Added a post-build step to - copy the dll to the lib/ directory. This prevent a blocking - compilation error if the DLL is in use by VC++. - -2001-09-20 Steve M. Robbins - - * Makefile.am (snapshot): Replace "date -I" GNUism with portable - specification for ISO date format. - (dist-hook): Correct rule to change line endings for INSTALL-WIN32.txt. - - * include/cppunit/Portability.h: - * config/ac_cxx_have_strstream.m4 (AC_CXX_HAVE_STRSTREAM): Extend - to check for and use in preference to . - Patrick Hartling reports the former is required for the SGI - MIPSpro 7.3.1.2 compiler. - -2001-09-19 Baptiste Lepilleur - - * examples/cppunittest/makefile.am : added TestSetupTest.(cpp/h) - - * examples/examples.dsw: removed some unnecessary dependencies. - - * examples/msvc6/HostApp/HostApp.dsp: fixed release configuration - - * src/msvc6/DSPlugIn/DSPlugIn.dsp: fixed release configuration, and - disabled the custom build command that does not work. - - * include/cppunit/extensions/HelperMacros.h: reordered header to remove - some warning with VC++. - - * INSTALL-WIN32.txt : detailed what was in each project. Added a FAQ - about the failing test case in cppunittest. - -2001-09-19 Steve M. Robbins - - * README: Describe how to check if libtool is fixed. - - * Makefile.am (dist-hook): Include INSTALL-WIN32.txt in the list - of files to convert to MSDOS line endings. - (snapshot): Use ISO-8601 compliant date for filename. - (ACLOCAL_AMFLAGS): Specify local directory. - -2001-09-18 Steve M. Robbins - - * include/cppunit/TextTestResult.h: Change include from - to . Sugggested by Peer Sommerlund. - - * include/cppunit/Portability.h: Qualify ostrstream with std. - Suggested by Patrick Hartling. - -2001-09-18 Baptiste Lepilleur - - * examples/examples.dsw: - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw: - * examples/msvc6/HostApp/HostApp.dsw: - * examples/msvc6/TestPlugIn/TestPlugIn.dsw: Added missing - project dependency. - - * src/msvc6/DSPlugIn/DSPlugIn.dsp: fixed *.tlb output directory. - - * include/msvc6/testrunner/TestPlugInInterface.h: does not define - NOMINMAX if already defined. - -2001-09-17 Baptiste Lepilleur - - * Makefile.am: Added INSTALL-WIN32.txt to EXTRA_DIST. - - * INSTALL-WIN32.txt: added, short documentation for CppUnit and VC++. - - * include/cppunit/extensions/HelperMacros.h: bug #448363, removed - an extraneous ';' at the end of CPPUNIT_TEST_SUITE_END macro. - - * examples/cppunittest/TestCallerTest.cpp: bug #448332, fixed - memory leaks. - - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h: - * src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: change to define - IDD to a dummy value when subclassing the dialog. - - * src/cppunit/cppunit.dsp: - * src/msvc6/testrunner/TestRunner.dsp: - * src/msvc6/testpluginrunner/TestPlugInRunner.dsp: - * examples/cppunitttest/CppUnitTestMain.dsp: - * examples/hierarchy.dsp: - * examples/msvc6/TestPlugIn/TestPlugIn.dsp: - * examples/msvc6/HostApp/HostApp.dsp: all configurations can be compiled. - - * src/msvc6/testpluginrunner/TestPlugInRunner.dsw: added dependency to - cppunit.dsp and TestRunner.dsp. - -2001-09-16 Steve M. Robbins - - * Revert TestFixture-related changes from 2001-07-15: - - * src/cppunit/cppunit.dsp (SOURCE): Remove TestFixture.h. - - * src/cppunit/TestCase.cpp (setUp, tearDown): Restore function - bodies. - - * include/cppunit/TestCase.h (class TestCase): Do not derive - from class TestFixture. Restore member functions setUp() - and tearDown(). - - * include/cppunit/TestCaller.h: Do not include - . - - * include/cppunit/Makefile.am (libcppunitinclude_HEADERS): Remove - TestFixture.h. - -2001-09-14 Baptiste Lepilleur - * src/msvc6/testrunner/TestRunner.dsp: fixed release configuration. - - * src/msvc6/testrunner/TestRunner.dsw: added DSPlugIn.dsp. TestRunner - depends on DSPlugIn. - - * src/msvc6/testrunner/TestRunner.cpp: - * src/msvc6/testrunner/TestRunnerDlg.h: - * src/msvc6/testrunner/TestRunnerDlg.cpp: - * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: - * src/msvc6/testrunner/MsDevCallerListCtrl.h: - * src/msvc6/DSPlugIn/*: integrated patch from - Patrick Berny (PPBerny@web.de). An add-ins for VC++. Double-cliking - a failed test in the TestRunner, VC++ will open the source file and - go to the failure location. - - * src/cppunit/Exception.cpp: - * include/cppunit/Exception.h: compile fix, call to overrided - operator = of parent class failed. Using typedef to the parent - class fix that. - - * src/cppunit/cppunit.dsp: added TestFixture.h - - * src/cppunit/TestFactoryRegistry.cpp: removed which isn't - needed any more. - - * include/cppunit/TestCase.h: - * include/cppunit/TestSuite.h: - * include/cppunit/extensions/TestFactoryRegistry.h: added - include before any other includes to remove warning - with VC++. - - * include/cppunit/Portability.h: moved platform specific includes at - the beginning of the header. fixed CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION - declaration. - - * include/cppunit/config-msvc6.h: removed pragma once (useless, should - be put in each header to have an effect). - -2001-08-07 Steve M. Robbins - - * doc/Makefile.am: Add workaround for broken Doxygen. - - * src/cppunit/TextTestResult.cpp (operator<<): Remove CppUnit:: - prefix. - - * configure.in: Add check for . - * src/cppunit/TestAssert.cpp: Use if not - available. - * src/cppunit/TestCase.cpp: Do not include . - - * include/cppunit/config-bcb5.h (HAVE_CMATH): - * include/cppunit/config-msvc6.h (HAVE_CMATH): Add. - - * src/cppunit/Exception.cpp: Qualify std::exception. - - * examples/cppunittest/OrthodoxTest.h (TestCase): Add assignment - operator. MIPSpro fails to compile without one. - - * Makefile.am: Removed automake conditional "DOC". - * doc/Makefile.am: Placed "DOC" conditional around - rules that invoke Doxygen. - - * config/Makefile.am: Removed. - * configure.in: Do not create config/Makefile. - * Makefile.am (EXTRA_DIST): Distribute config/*.m4. - (SUBDIRS): Do not descend into config. - -2001-07-15 Steve M. Robbins - - * include/cppunit/TestFixture.h: New. Declare class TextFixture. - - * include/cppunit/TestCaller.h: - * include/cppunit/TestCase.h: - * src/cppunit/TestCase.cpp: - * include/cppunit/Makefile.am: Subclass TestCase from TestFixture. - -2001-07-14 Steve M. Robbins - - * include/cppunit/Exception.h: - * include/cppunit/Test.h: - * include/cppunit/TestCaller.h: - * include/cppunit/TestCase.h: - * include/cppunit/TestFailure.h: - * include/cppunit/TestListener.h: - * include/cppunit/TestSuite.h: - * include/cppunit/extensions/RepeatedTest.h: - * include/cppunit/extensions/TestDecorator.h: - * src/cppunit/TestCase.cpp: Add documentation. - -2001-07-13 Steve M. Robbins - - * examples/cppunittest/TestAssertTest.h: - * examples/cppunittest/TestAssertTest.cpp: Add tests - for CPPUNIT_ASSERT_EQUAL. - -2001-07-12 Steve M. Robbins - - * configure.in: Set to version 1.5.6. On the assumption that - backwards compatibility has been broken (though I'm not certain), - set the binary age and interface age to zero. - - * examples/cppunittest/TestFailureTest.h: - * include/cppunit/Exception.h: - * include/cppunit/NotEqualException.h: - * src/cppunit/Exception.cpp: - * src/cppunit/NotEqualException.cpp: Add "throw()" to overridden - std::exception destructors; required for GCC 3.0. - -2001-07-07 Steve M. Robbins - - * include/cppunit/Makefile.am: Clean config-auto.h using - DISTCLEANFILES. - - * doc/Makefile.am: Temporarily disable manpage installation. - Fix html installation to ensure files removed by uninstall. - - * src/cppunit/estring.h: Removed. - - * src/cppunit/Makefile.am: - * src/cppunit/TestCase.cpp: - * src/cppunit/TextTestResult.cpp: Recode to avoid use of estring. - - * examples/cppunittest/OrthodoxTest.h: Add const qualifier - to operator== methods. - - * include/cppunit/config-bcb5.h: - * include/cppunit/config-msvc6.h: Define CPPUNIT_HAVE_SSTREAM to 1. - - * config/ac_cxx_have_sstream.m4: New. Defines macro - AC_CXX_HAVE_SSTREAM. Taken from the autoconf archive. - - * config/ac_cxx_have_strstream.m4: New. Copy of above, - modified to check for presence of strstream; defines - macro AC_CXX_HAVE_STRSTREAM. - - * configure.in: Invoke AC_CXX_HAVE_SSTREAM and - AC_CXX_HAVE_STRSTREAM. - - * include/cppunit/Portability.h: Define class - CppUnit::OStringStream. - - * include/cppunit/TestAssert.h: - * src/cppunit/TestFactoryRegistry.cpp: Replace std::ostringstream - by CppUnit::OStringStream. - - -2001-07-06 Steve M. Robbins - - * configure.in: Add --disable-typeinfo-name option. - - * README: Add note about new configure option. - - * configure.in: Remove AM_DISABLE_STATIC. - - * INSTALL: Update to version from autoconf 2.50. - -2001-07-05 Steve M. Robbins - - * include/cppunit/Portability.h: Remove definition of - CPPUNIT_USE_TYPEINFO. - - * configure.in: Define USE_TYPEINFO_NAME in config.h. - - * include/cppunit/config-msvc6.h (CPPUNIT_USE_TYPEINFO_NAME): - * include/cppunit/config-bcb5.h (CPPUNIT_USE_TYPEINFO_NAME): Add - definition. - - * include/cppunit/TestCaller.h: - * include/cppunit/extensions/TypeInfoHelper.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/HelperMacros.h: - * src/cppunit/TypeInfoHelper.cpp: - * src/cppunit/TestFactoryRegistry.cpp: - * src/cppunit/TestCase.cpp (toString): - Switch from CPPUNIT_USE_TYPEINFO to CPPUNIT_USE_TYPEINFO_NAME. - - * src/cppunit/TestAssert.cpp: Remove include of estring.h. - - * configure.in: Invoke AC_PROG_CC to workaround a automake - bug. Move probes for CC/CXX ahead of the libtool macros. - - * examples/hierarchy/Makefile.am: - * examples/cppunittest/Makefile.am: - * src/cppunit/Makefile.am (INCLUDES): Search - $(top_builddir)/include for . - -2001-06-27 Baptiste Lepilleur - - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp: - moved dll copy from post-build to custom build setting, so that the - dll is copied even if the CppUnitTestApp was not modified. - - * examples/msvc6/TestPlugIn/: a new example of test plug in. - - * src/msvc6/TestRunner/ListCtrlFormatter.* - * src/msvc6/TestRunner/ListCtrlSetter.*: - added, helper to manipulate list control. - - * src/msvc6/TestRunner/TestRunnerDlg.*: change to make the error list - more compact. text moved to string resources. icons added for typ - test tfailure type. - - * src/msvc6/TestRunner/MostRecentTests.*: added, classes that will - replace the current implementation of MRU test which make it hard - to subclass the dialog. - - * src/msvc6/TestRunner/res/errortype.bmp: added, bitmap with error - types (failure and error). - - * src/msvc6/TestPlugInRunner/: A test runner to run test plug in. - Test plug in are DLL that publish a specified plug in interface. - Those DLL are loaded and reloaded by the TestPlugInRunner to run - tests. This remove the need to wrap DLL with a executable to test - them. - - * src/cppunit/cppunit.dsp: - removed config.h from project - added Portability.h and config-msvc6.h - - * include/cppunit/config-msvc6.h: - undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST - - -2001-06-20 Steve M. Robbins - - * autogen.sh: Stop when tool fails. Try /usr/local/share/aclocal - only if aclocal fails without it. - - * README.CVS: New. - -2001-06-18 Steve M. Robbins - - * include/cppunit/Portability.h (CPPUNIT_USE_TYPEINFO): - (CPPUNIT_ENABLE_NAKED_ASSERT): - (CPPUNIT_HAVE_CPP_SOURCEANNOTATION): Fix setting of - default values. - -2001-06-17 Steve M. Robbins - - * configure.in: Require autoconf 2.50 or better. - -2001-06-17 Bastiaan Bakker - - * configure.in: moved config.h from include/ to config/ - - * configure.in: added AC_CREATE_PREFIX_CONFIG_H call - - * config/ac_create_prefix_config_h.m4: added - - * configure.in: removed include/cppunit/config.h from AC_OUTPUT - * include/cppunit/config.h.in: obsoleted by - AC_CREATE_PREFIX_CONFIG_H macro. - - * configure.in: - * config/bb_enable_doxygen.m4: moved doxygen stuff into - BB_ENABLE_DOXYGEN macro - - * include/cppunit/Makefile.am: removed config.h, added config-auto.h, - config-msvc6.h, config-bcb5.h, Portability.h - - * include/cppunit/Makefile.am: added dist-hook to exclude - config-auto.h from dist tar - - * include/cppunit/TestAssert.h: - * include/cppunit/extensions/TypeInfoHelper.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/HelperMacros.h: - * src/cppunit/TypeInfoHelper.cpp: - * src/cppunit/TestRegistry.cpp: - * src/cppunit/TestFactoryRegistry.cpp: - * src/cppunit/TestCase.cpp: replaced #include of with - - - * src/cppunit/TypeInfoHelper.cpp: use new macro name - CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST - - -2001-06-12 Baptiste Lepilleur - - * include/cppunit/NotEqualException.h - * src/cppunit/NotEqualException.h: - Fixed constructor and operator = (aren't unit test nice?). Added - methods expectedValue() and actualValue(). - - * include/cppunit/TestAssert.h: - * src/cppunit/TestAssert.cpp: - Use NotEqualException to report equality failure. - - * src/cppunit/TestFactoryRegistry.cpp: fixed makeTest(). It did not use m_name for - naming the suite. - - * src/cppunit/TestResult.cpp: - Report expect/was on different line for assertEquals failure. - - * examples/cppunittest/NotEqualExceptionTest.*: added unit tests for - NotEqualException. - - * examples/cppunittest/OrthodoxTest.*: operator ! use explicit construction. - - * examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp: modified so that the dialog - is not displayed after the tests are run. - -2001-06-11 Steve M. Robbins - - * examples/cppunittest/TestResultTest.cpp (testAddTwoErrors, - testAddTwoFailures): Replace vector::at() with more portable - vector::operator[]; GCC doesn't have the former. - - * include/cppunit/extensions/TestDecorator.h (countTestCases): - Declare return type. - - * src/cppunit/Makefile.am (libcppunit_la_SOURCES): Add - TestAssert.cpp, RepeatedTest.cpp. - - * include/cppunit/TestCaller.h (NoExceptionExpected): Fix - constructor name. - -2001-06-11 Baptiste Lepilleur - - * include/cppunit/Exception.h: now inherit from std::exception - instead of ::exception. Added clone(), type(), and isInstanceOf() - methods for subclassing support. Changed UNKNOWNLINENUMBER type to - long for consistence with lineNumber(). - - * include/cppunit/NotEqualException.h: addded, exception to be - used with assertEquals(). - - * include/cppunit/TestAssert.h: changed TestAssert into a - namespace instead of a class. This remove the need of template - member methods and does not cause compiler internal error on - VC++. Macro CPPUNIT_ASSERT_MESSAGE has been added to fail test - with a specified message. - - * include/cppunit/TestCaller.h: added "Expected exception" - support. Based on Tim Jansen patch (#403745), but use a traits - instead of RTTI to distingh between "No expected exception" and - "Excepted exception". Exception type name is reported using RTTI - if CPPUNIT_USE_TYPEINFO is defined. - - * include/cppunit/extensions/HelperMacros.h: static method suite() - implemented by CPPUNIT_TEST_SUITE_END macro now returns a - TestSuite instead of a Test. - - * include/cppunit/extensions/RepeatedTest.h: corrected - countTestCases, operator = declaration. - - * include/cppunit/extensions/TestDecorator.h: removed const from - run() method. Did not match run() declaration of Test class. - - * include/cppunit/extensions/TestFactory.h: fixed a comment. - - * include/cppunit/extensions/TestSetup.h: corrected run() method - declaration. Methods setUp() and tearDown() were not declared - virtual. - - * include/cppunit/extensions/TestSuiteBuilder.h: added a method - addTestCaller() which take a pointer on a fixture. - - * include/cppunit/NotEqualException.cpp: addded, exception to be - used with assertEquals(). - - * src/cppunit/RepeatedTest.cpp: added to reduce header dependency - (TestResult.h was missing). - - * src/cppunit/TestAssert.cpp: added to put non template functions - there. - - * src/cppunit/TestCase.cpp: added std:: prefix to catch - (exception& e). Integrated a modified version of Tim Jansen patch - (#403745) for TestCase to make the unit test (TestCaseTest) - pass. If the setUp() fail then neither the runTest() nor the - tearDown() method is called. - - * examples/examples.dsw: added cppunittest projects to workspace. - - * examples/cppunittest/TestResultTest.*: renamed - TestListenerTest.* - - * examples/cppunittest/*: added unit tests for: HelperMacros, - TestAssert, TestCaller, TestCase, TestFailure, TestResult, - TestSuite, TestDecoratorTest, TestSetUp, RepeatedTestTest, - Orthodox, Exception. - -2001-06-05 Baptiste Lepilleur - - * src/cppunit/TypeInfoHelper.cpp: removed #include , - cppunit/config.h was already included. - - * src/cppunit/cppunit.dsp: removed TestAssert.cpp from project. - - * added/updated .cvsignore files for beter handling of windows - projects. - - * added include/cppunit/config.h with a default configuration for - VC++ 6.0. - - * include/cppunit/.cvsignore: removed config.h from the list of - ignored file. - - * renamed VC++ configurations without RTTI from "Debug No - CU_USE_TYPEINFO" to "Debug Crossplatform". - - * include/cppunit/TestAssert.h: added include for fabs(). - -2001-06-02 Steve M. Robbins - - * src/cppunit/Exception.cpp: Remove unnecessary namespace - declaration; it confuses Doxygen. - -2001-06-02 Steve M. Robbins - - * configure.in: Add AC_CXX_STRING_COMPARE_STRING_FIRST. - - * autogen.sh: Add "-I config" to aclocal flags, to pick up - the new .m4 files. - - * config/ac_cxx_namespaces.m4: New. Taken from - http://cryp.to/autoconf-archive. - - * config/ac_cxx_string_compare_string_first.m4: New. Detect - if std::string::compare() takes string argument first. - -2001-06-02 Steve M. Robbins - - * include/cppunit/TestAssert.h: Declare generic assertion_traits - class. Replace notEqualsMessage functions for long and double by - a generic, template function. Replace assertEquals for longs by a - generic template function. Inline all class methods. Define new - assertion macros CPPUNIT_ASSERT, CPPUNIT_ASSERT_EQUAL, and - CPPUNIT_ASSERT_DOUBLES_EQUAL; the old names are available by - editing . - - * src/cppunit/TestAssert.cpp: Removed. Move code to inline - functions. - - * config/ac_cxx_rtti.m4: New. Taken from - http://cryp.to/autoconf-archive. - - * include/cppunit/config.h.in: New. Input file for installable, - generated config.h file. - - * configure.in: Use AC_CXX_RTTI; generate include/cppunit/config.h. - - * include/cppunit/extensions/HelperMacros.h: - * include/cppunit/extensions/TestSuiteBuilder.h: - * include/cppunit/extensions/TypeInfoHelper.h: - * src/cppunit/TestCase.cpp: - * src/cppunit/TestFactoryRegistry.cpp: - * src/cppunit/TypeInfoHelper.cpp: - Use "#if CPPUNIT_USE_TYPEINFO" rather than "#ifdef". - - * src/cppunit/TypeInfoHelper.cpp: Allow for std::string::compare() - that takes the string in the first argument. - - * doc/cookbook.html: - * examples/cppunittest/TestCallerTest.cpp: - * examples/cppunittest/TestResultTest.cpp: - * examples/hierarchy/BoardGameTest.h: - * examples/hierarchy/ChessTest.h: - * examples/msvc6/HostApp/ExampleTestCase.cpp: - * include/cppunit/TestCase.h: - * include/cppunit/extensions/Orthodox.h: - Replace assert by CPPUNIT_ASSERT. - Replace assertLongsEqual by CPPUNIT_ASSERT_EQUAL. - Replace assertDoublesEqual by CPPUNIT_ASSERT_DOUBLES_EQUAL. - - * * (CU_TEST_SUITE, CU_TEST, CU_TEST_SUITE_END, - CU_TEST_SUITE_REGISTRATION): Replace prefix CU_ with CPPUNIT_. - - * examples/cppunittest/.cvsignore: Add UNIX generated files. - -2001-06-01 Bastiaan Bakker - - * examples/cppunittest/Makefile.am: added - - * configure.in: added examples/cppunittest/Makefile to AC_OUTPUT. - - * examples/cppunittest/TestCallerTest (suite), - examples/cppunittest/TestResultTest (suite): fixed 'ISO C++ - forbids taking the address of a bound member function to form - a pointer to member function' bug reported by g++. - - * examples/cppunittest/TestCallerTest (suite), - examples/cppunittest/TestResultTest (suite): removed dependency on - RTTI. - -2001-06-01 Baptiste Lepilleur - - * added project cppunittest to examples/: unit tests to test cppunit. - The main file is CppUnitTestMain.cpp. Unit tests have been implemented - for TestCaller and TestListener. - - * added project CppUnitTestApp to examples/msvc6: graphical runner - for cppunittest. - - * added TestListener to TestResult. It is a port of junit - TestListener. - - * updated some .cvsignore to ignore files generated with VC++. - -2001-05-30 Bastiaan Bakker - - * src/cppunit/TestCase.cpp (toString): put type_info in std - namespace and inside CU_USE_TYPEINFO ifdef. - -2001-05-29 Steve M. Robbins - - * examples/hierarchy/main.cpp: Remove extraneous includes. - - * src/cppunit/TextTestResult.cpp (addError, addFailure): Do not - emit a newline. - - * include/cppunit/extensions/HelperMacros.h: Rework documentation. - (CU_TEST_SUITE): Move definition of member function suite() ... - (CU_TEST_SUITE_END): ... to here. - (CU_TEST): Use '&' to take address of member function - "testMethod". - - * include/cppunit/extensions/AutoRegisterSuite.h: Declare "factory" - as a TestFactory*. - -2001-05-28 Steve M. Robbins - - * doc/other_documentation.dox: Don't include "CppUnit" in - anchor text, since Doxygen puts its own anchor around it. - - * doc/Makefile.am (html/index.html): Depend on - other_documentation.dox. - - * doc/Doxyfile.in (EXCLUDE): Move config.h and estring.h to - EXCLUDE_PATTERNS; they were not being excluded. - - * ChangeLog: Reformat all entries to start with . See - for change log - format. - - * doc/cookbook.html: Update all code examples, except for TestRunner - section. - -2001-05-23 Baptiste Lepilleur - - * Updated CU_TEST_SUITE macro documentation. It is now stated - explicitly that you do not need to specify template parameter as - macro argument. The documentation example has been updated to - reflect that. - -2001-05-23 Bastiaan Bakker - - * autogen.sh: added '--add-missing' option to automake. - * autogen.sh: added '--force' option to libtoolize and removed - '--copy'. - * config: removed generated files from CVS. - -2001-05-20 Baptiste Lepilleur - - * Fixed bug #424320 (VC++ TestRunner): access violation caused by - NULL pointer in history list. NULL pointer are not added to the - history anymore. - -2001-05-19 Baptiste Lepilleur - - * Added some items to the TODO list for VC++ TestRunner. - - * "Debug" configuration is now the default configuration in VC++ - project. - - * Modified sort order in the test browser of VC++ TestRunner so - that tests are in the same order as in the suite. Suites are still - sorted alphabetically. - - * Merged Steve M. Robbins patch to replace assertImplementation - with assert in hierarchy example. - - * Added a TextTestRunner to runner tests. It is based on Michael - Feather's version, but have been rewriten. - - * Removed traces that printed the test name in TextTestResult - while running. - - * Added the test name to error and failure report in - TextTestResult. - - * Updated hierarchy example to use TextTestRunner. - -2001-05-18 Baptiste Lepilleur - - * Symbol CU_USE_TYPEINFO must be defined instead of USE_TYPEINFO - to compile RTTI. - - * Added back default constructor to TestSuiteBuilder which use - RTTI. It is available only if CU_USE_TYPEINFO is defined. - - * Moved TypeInfoHelper.h from src/cppunit to - include/cppunit/extensions. - - * Macro CU_TEST_SUITE in HelperMacros.h now use TestSuiteBuilder - default constructor if CU_USE_TYPEINFO is defined, otherwise it - use the type name given to the CU_TEST_SUITE macro. - - * TestFactoryRegistry::registerFactory(factory) now generate a - dummy name based on a serial number instead of using RTTI. The - macro CU_TEST_SUITE_REGISTRATION and class AutoRegisterSuite can - now when CU_USE_TYPEINFO is not defined. - - * Added a new Configuration named "Debug Without CU_USE_TYPEINFO" - to msvc6 projects. The flag CU_USE_TYPEINFO is not defined in that - configuration. - -2001-05-17 Steve M. Robbins - - * Makefile.am (dist-hook): Copy files relative to $(top_srcdir). - - * doc/Makefile.am: Generated doc files depend on Doxyfile. - - * doc/Doxyfile.in: Use autoconf substitutions in file names. - - * examples/hierarchy/Makefile.am (check_PROGRAMS): Build hierarchy - with "make check", not "make all". - - * examples/hierarchy/Makefile.am (INCLUDES): - - * src/cppunit/Makefile.am (INCLUDES): Search in - $(top_srcdir)/include. - - * Added .cvsignore files. - -2001-05-16 Bastiaan Bakker - - * Merged Debian packaging support files by Christian Leutloff from - debian package version 1.5.4-2. Added make target 'debian' for - debian package creation. - -2001-05-09 Bastiaan Bakker - - * Release as 1.5.5. - - * Finished CppUnitW 1.2 merge. Removed RTTI depency from - TestSuite. Added TestCaller constructor for calling methods in - existing TestCases. - -2001-04-29 Bastiaan Bakker - - * Merged Baptiste Lepilleurs CppUnitW 1.2. Some differences: - TypeInfo stuff (in TestSuite) compiled in only if USE_TYPEINFO is - set. TestSuite.getTests now returns a const ref instead of taking - a ref as parameter. Removed auto_ptr stuff from - TestFactoryRegistry: auto_ptr cannot be used in containers. - -2001-04-28 Bastiaan Bakker - - * Merged MSVC++ specific TestRunner and example adapted from - Micheal Feathers version by Baptiste Lepilleur. - - * Moved cppunit subdir into src. - -2001-04-24 Bastiaan Bakker - - * Merged Baptiste Lepilleurs patch for TestRegistry: now TestCases - do not automatically register with the Registry anymore. - - * Added extension headers from Micheal Feathers port to - include/cppunit/extensions. - -2001-04-19 Bastiaan Bakker - - * Added MSVC++ workspace and project files, submitted by Baptiste - Lepilleur. - -2001-04-15 Bastiaan Bakker - - * Moved public headers from cppunit into new subdir - include/cppunit. This should make more clear which headers are - used internally only (like estring.h). - - * Moved autoconf auxiliary stuff into new subdir config, to make - the top dir less crowded. - - * Prefixed std:: to cerr, cout and endl. - -2001-04-14 Bastiaan Bakker - - * Release as 1.5.4 - - * Added support for RPM generation. - - * Added autoconf support for Doxygen document generation: Doxygen - and GraphViz dot are automatically detected and LaTeX and HTML can - be switch on or off. - - * cppunit/TextTestResult.cpp: changed cout to stream. Fixes bug - #232636 - - * cppunit/TextTestReulst.cpp: add '#include '. Fixes - bug #223290 - - * cppunit/*.cpp: removed bogus 'inline' specifiers. Fixes bug - #224542 and #223291. - - * doc/header.html: corrected link to CppUnit project page Fixes - bug #414073 - - * cppunit/*.cpp, examples/hierarchy/main.cpp: removed all 'using - namespace ...' occurences. - -2001-01-31 Tim Jansen - - * cppunit/TestCase.cpp, cppunit/TestCase.h, cppunit/TestSuite.h, - cppunit/TestSuite.cpp: applied patch #402271 by bwithrow. Fixes - bug #220207 - - * cppunit/TestSuite.cpp (deleteContents): clear vector after - contents have been deleted (so there are no invalid pointers in - the vector) Patch #403540 / #403542 - - * cppunit/TestCaller.h: create Fixture with empty constructor so - that only the TestCaller but not the Fixture instance is - registered in the TestRegistry Patch #403541 / #403542 - - * examples/hierarchy/BoardGameTest.h, - examples/hierarchy/ChessTest.h, examples/hierarchy/main.cpp: - initialize example TestCases with TestSuite so that the - TestCallers are registered in the TestRegistry Patch - #403542. Fixes bug #415249 - - * cppunit/TestCaller.h, cppunit/TestCase.cpp, cppunit/TestCase.h: - changed documentation; made hopefully clearer which constructor - registers the instance in the TestRegistry; corrected syntax in - code example Patch #403542. diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/CodingGuideLines.txt b/src/3rd_party/cppunit/cppunit-1.12.1/CodingGuideLines.txt deleted file mode 100644 index 5651ee80..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/CodingGuideLines.txt +++ /dev/null @@ -1,61 +0,0 @@ -CppUnit's coding guidelines for portability: --------------------------------------------- - -- don't explicitly declare CppUnit namespace, instead use macro - CPPUNIT_NS_BEGIN and CPPUNIT_NS_END. - -- don't explicitly use 'CppUnit' to refer to class in CppUnit namespace, - instead use macro CPPUNIT_NS which expands to either 'CppUnit' or - nothing depending on the configuration. - -- don't use the 'using directive', always use full qualification. For STL, - always use std::. - -- don't use C++ style cast directly, instead use CppUnit's cast macro - (CPPUNIT_CONST_CAST). - -- don't use the mutable keyword, instead do a const cast. - -- don't use the typename keyword in template declaration, instead use 'class'. - -- don't make use of RTTI (typeid) or dynamic_cast mandatory. - -- don't use STL container directly, instead use CppUnit's wrapper located - in include/cppunit/portability. This help support compilers that don't - support default template parameter and require an allocator to be - specified. - -- don't use default template parameters. If needed, use STLPort wrapper - technic (see include/cppunit/portability/). - -- don't use templatized member functions (template method declared inside a - class), instead declares them as simple template functions (even - mainstream compiler such as VC++ 6 as trouble with them). - -- don't use default parameter value in template function. Not supported - by all compiler (on OS/390 for instance). - -- don't use STL container at() method, instead use the array accessor []. - at() is not supported on some gcc versions. - -- dereferencing containers must be done by (*ref_ptr).data instead of - ref_ptr->data. - -In brief, it should be possible to compile CppUnit on a C++ compiler that do -not have the following features: -- C++ style cast -- mutable and typename keyword -- RTTI -- template default parameters -- templatized member functions (that is a template function declared within a - class). -- namespace - -As such, usage of those features should always be optional. - -Following those guidelines should allow to compile on most compilers, as long -as STL are available (in std namespace or not), with some form of strstream and -iostream, as well as exception support. - --- -Baptiste Lepilleur diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL b/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL deleted file mode 100644 index 666ffd9f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL +++ /dev/null @@ -1,226 +0,0 @@ -Basic Installation -================== - - These are generic installation instructions. - - 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 only 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. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. 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 variables by setting -them in the environment. You can do that on the command line like this: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Environment 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 must use a version of `make' that -supports the `VPATH' variable, such as 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 `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have 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' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' 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 host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it cannot guess the host 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 host type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option 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'. In this case, you should also specify the -build platform with `--build=TYPE', because, in this case, it may not -be possible to guess the build platform (it sometimes involves -compiling and running simple test programs, and this can't be done if -the compiler is a cross compiler). - -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. - -Environment 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 - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`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/3rd_party/cppunit/cppunit-1.12.1/INSTALL-WIN32.txt b/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL-WIN32.txt deleted file mode 100644 index 31756cd3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL-WIN32.txt +++ /dev/null @@ -1,205 +0,0 @@ -Frequently Asked Questions: See doc/FAQ - - -At the current time, the only supported WIN32 platform is -Microsoft Visual C++. You must have VC++ 6.0 at least. - -Quick Steps to compile & run a sample using the GUI TestRunner: -- Open examples/examples.dsw in VC++ (contains all the samples). - VC7 will ask you if you want to convert, anwser 'yes to all'. -- Make HostApp the Active project -- Compile -- For Visual Studio 6 only: - - in VC++, Tools/Customize.../Add-ins and macro files/Browse... - - select the file lib/TestRunnerDSPlugIn.dll and press ok to register - the add-ins (double-click on failure = open file in VC++). -- Run the project - - -Project build Target: ---------------------- - -Framework & tools: - -* cppunit (cppunit.lib) : unit testing framework library, the one you use -to write unit tests. - -* cppunit_dll(cppunit_dll.dll/lib) : same as above, but build as a DLL. - -* DllPlugInTester(DllPlugInTester.exe) : test plug-in runner executable. -Use this to test DLL in your post-build step, or debug them. - -* TestRunner (testrunner.dll) : a MFC extension DLL to run and browser unit -tests from a GUI. - -* DSPlugIn (lib/TestRunnerDSPlugIn.dll) : a VC++ 6.0 add-in used by -testrunner.dll. If you double-click on a failure in the MFC TestRunner, -a running instance of VC++ will open the file and highlight the line. -This add-ins is not required for Visual Studio 7. - -* TestPlugInRunner : (Warning: experimental) a VC++ -application to run test plug-in. A test plug-in is a DLL that publish a -specified interface. This application is still incomplete (the auto-reload -feature is missing). - -All libraries are placed in the lib/ directory. - - -Examples: ---------- - -* CppUnitTestMain : the actual test suite use to test CppUnit. Use a -TextTestRunner, and post-build testing with CompilterOutputter. Configuration -to link against cppunit static library and cppunit dll library. - -* CppUnitTestApp : contains the same test suite as CppUnitTestMain, but -run them using the MFC TestRunner. - -* hierarchy : a sample demonstrating how to sublcass test (you might rather -want to use HelperMacros.h and the CPPUNIT_TEST_SUB_SUITE macro which does -it in a 'cleaner' way. That sample has not been updated for a long time). - -* HostApp : a sample using the MFC TestRunner demonstrating different test -failure. Also demonstrates the MFC Unicode TestRunner. - -* Money : an example that come along with the Money article of the -documentation. Probably what you want to look at if you are a newbie. - - -Configuration: --------------- - -CppUnit and TestRunner comes with 3 configurations. - -* Release (): Multihtreaded DLL, release mode -* Debug (d): Debug Multithreaded DLL, debug mode -* Unicode Release (u): Unicode Multihtreaded DLL, release mode -* Unicode Debug (ud): Unicode Debug Multithreaded DLL, debug mode - -For CppUnit, when building as dll, "dll" is appended to the 'suffix'. - -The letters enclosed in brackets indicates the suffix added to -the library name. For example, the debug configuration cppunit static library -name is cppunitd.lib. The debug configuration cppunit dll name is cppunitd_dll.lib. - - -Building: ---------- - -* Open the src/CppUnitLibraries.dsw workspace in VC++. -* In the 'Build' menu, select 'Batch Build...' -* In the batch build dialog, select all projects and press the build button. -* The resulting libraries can be found in the lib/ directory. - - -Testing: --------- - -* Open the workspace examples/Examples.dsw. -* Make CppUnitTestApp the active project. -* Select the configuration you build the library for. -* Compile and run the project. The TestRunner GUI should appear. - - -Libraries: ----------- - -All the compiled libraries and DLL can be found in the 'lib' directory. -Most libraries can be build from src/CppUnitLibraries.dsw workspace. - -lib\: -cppunit.lib : CppUnit static library "Multithreaded DLL" -cppunitd.lib : CppUnit static library "Debug Multithreaded DLL" -cppunit_dll.dll : CppUnit dynamic library (DLL) "Multithreaded DLL" -cppunit_dll.lib : CppUnit dynamic import library "Multithreaded DLL" -cppunitd_dll.dll : CppUnit dynamic library (DLL) "Debug Multithreaded DLL" -cppunitd_dll.lib : CppUnit dynamic import library "Debug Multithreaded DLL" -qttestrunner.dll : QT TestRunner dynamic library (DLL) "Multithreaded DLL" -qttestrunner.lib : QT TestRunner import library "Multithreaded DLL" -testrunner.dll : MFC TestRunner dynamic library (DLL) "Multithreaded DLL" -testrunner.lib : MFC TestRunner import library "Multithreaded DLL" -testrunnerd.dll : MFC TestRunner dynamic library (DLL) "Debug Multithreaded DLL" -testrunnerd.lib : MFC TestRunner import library "Debug Multithreaded DLL" -testrunneru.dll : MFC Unicode TestRunner dynamic library (DLL) "Multithreaded DLL" -testrunneru.lib : MFC Unicode TestRunner import library "Multithreaded DLL" -testrunnerud.dll : MFC Unicode TestRunner dynamic library (DLL) "Debug Multithreaded DLL" -testrunnerud.lib : MFC Unicode TestRunner import library "Debug Multithreaded DLL" -TestRunnerDSPlugIn.dll : The add-in you register in VC++. - -Notes that when you are using CppUnit DLL (cppunit*_dll.dll), you must link -against the associated import library and define the pre-processor symbol -CPPUNIT_DLL in your project. - - -Tools: ------- - -CppUnit provides a generic test runner for test plug-in: DllPlugInTester. -It can be found in the lib/ directory. It requires cppunit*_dll.dll - -lib/: -DllPlugInTester_dll.exe : test plug-in runner, "Multithreaded DLL", cppunit_dll.dll -DllPlugInTesterd_dll.exe : test plug-in runner, "Debug Multithreaded DLL", cppunitd_dll.dll -DllPlugInTester.exe : test plug-in runner, "Multithreaded DLL", static link cppunit.lib -DllPlugInTesterd.exe : test plug-in runner, "Debug Multithreaded DLL", static link cppunitd.lib - -Notes that the DllPlugInTester(d).exe version of this tools does not allow -to use the automatic test registration that comes along with test plug-in. -You probably don't want to use them unless you really know what you are doing. - - -Using CppUnit: --------------- - -* Writing unit tests: - To write unit tests, you need to link against cppunitXX.lib, where - XX is the chosen configuration suffix letters. - CppUnit include directory must be in the include search path. - You can do that by adding the include directory in - Project Settings/C++/Preprocessor/Additional include directories, - or Tools/Options/Directories/Include. - - Quick steps: - - link lib/cppunitXX.lib - - include/ must be in the include search path - -* Using the TestRunner GUI: - To use the test runner GUI you need to link against testrunnerXX.lib - and cppunitXX.lib, where XX is the chosen configuration suffix - letters. testrunner.dll must be in the path when your program is - run (the Debug/Release directory, your project dsp directory, or - in a directory specified in the PATH environment variable). - One of the easiest way to do that is to either add a post-build - command or add the testrunner.dll which is in the lib/ directory - to your project and define a custom build step that copy the - dll to your "Intermediate" directory (Debug or Release usually). - - Since the TestRunner GUI is a MFC extension DLL, it can access - the CWinApp of the using application. Settings are stored using - the application registry key. That means that "most recently used - test" settings are different for each application. - - Quick steps: - - link lib/cppunitXX.lib and lib/testrunnerXX.lib - - include/ must be in the include search path - - lib/testrunnerXX.dll must be available to run your project - -* Using the DSPlugIn: - You must register the plug-in with VC++. This is done in - Tools/Customize/Add-ins and Macro files, selecting browse and - selecting lib/TestRunnerDSPlugIn.dll (you can register the release - or the debug version, both work). - - If an instance of VC++ is running and you double-click on a failure, - VC++ will open the file and select the failure line. - -* Using the Test Plug In Runner: - Your DLL must export a function that implement the interface -defined in include/msvc6/testrunner/TestPlugInInterface.h. -See examples/msvc6/TestPlugIn/TestPlugInInterfaceImpl.* for an example. -Be warned, that runner is still experimental and have not been tested -much. - - If you did a batch build, run TestPlugInRunnerd.exe and choose dll - examples/cppunittest/DebugPlugIn/CppUnitTestPlugInd.dll, or - examples/simple/DebugPlugIn/simple_plugind.dll to test it out. diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL-unix b/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL-unix deleted file mode 100644 index 52b4d8b2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/INSTALL-unix +++ /dev/null @@ -1,121 +0,0 @@ -See the file INSTALL for basic instructions. A short explanation for -each non-standard configure option follows. - - --disable-typeinfo-name - -Some output from the library will use a class name to distinguish -between tests. Normally, the Run-Time Type Information (RTTI) system -is used (specifically, the type_info::name() function) to generate the -name. Some compilers return human-readable names via this interface. -Other compilers do not. - -If your compiler does not generate a pleasing class name, specify -this option; the names will be generated by other means. The names -are used only for diagnostic purposes -- no functionality will be -lost nor gained by using this option. - - - - System Notes - ------------ - -cygwin ------- - -We have a number of reports that the shared library fails to -build properly. This may manifest itself as a failure to -build and run the test suite ("make check"). - -The workaround is to build a static library only. Configure using - - ./configure --disable-shared - -Then build normally. - - - -DEC alpha with cxx V6.1-029 and RogueWave STL ---------------------------------------------- - -A user reports that you have to issue the command - - export DEC_CXX="-D__USE_STD_IOSTREAM -D__STD_MS" - -in order to get ostream defined in namespace std. Otherwise, the -build reports the following error. - - Cannot define CppUnit::OStringStream - - - -If the compiler complains about 'exception', it may help to -re-run configure with - - CPPFLAGS='-U_OSF_SOURCE' - -on the configure line. Please let us know about your experiences -with this platform so that we can keep this information up-to-date. - - - -IRIX 6 / MIPSpro compiler -------------------------- - -The MIPSpro compiler requires the "-LANG:std" flag to enable the -standard C++ library. You must set the CC variable when you configure, -as follows - ./configure CC='CC -LANG:std' - -There is a bug in released versions of libtool prevents the -LANG flag -from being properly passed during the linking stage. To check if you -have this bug, examine the output of "grep 'no.*irix' libtool". If -you see a line like "no/*-*-irix*)" then you suffer from the bug. [A -fixed version of libtool will look like "no/*-*-irix* | /*-*-irix*)".] - -If your libtool script suffers from the bug, open it in an editor, -find the first line that contains "with_gcc", and change it to -read "with_gcc=no". - -The MIPSpro version 7.30 is able to compile cppunit proper, but will -fail to compile the example testsuite. I am assuming this is due -to known bugs in the compiler (7.30 is not the latest version). -The library appears to function OK. Please let us know if you find -it otherwise. - - -Solaris/Sun CC compiler ------------------------ - -Use the following configure line: - -./configure CXX=CC CXXFLAGS="-pta -instances=static -mt --xtarget=generic -g -features=no%transitions --xildoff" LD=CC LDFLAGS=-xildoff - -In Forte C++ compiler for Solaris all the linking has to go via -CC and ar, ld should not be run directly. For archive use CC -xar and -for linking and generating the .so use CC -G - -Notes: CC 5.5 don't need that much flag to compile correctly. Though, I'm not -sure what are the required one. - - -AIX ---- - -./configure --disable-shared - -The autogen tools don't seem to generate correctly script to handle dynamic linking. -If anyone know how to get it working, please contact us. - - -HP-UX ------ -Use the following options with configure to -enable the use of aCC and cc for the compilation of -CppUnit: -./configure --enable-hpuxshl CC=cc CXX=aCC CXXFLAGS="-AA" - -AA sets all the necessary flags to enable namespaces, -stl v2,.... - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.am deleted file mode 100644 index 90642176..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -AUTOMAKE_OPTIONS = 1.4 -ACLOCAL_AMFLAGS = -I config - -SUBDIRS = src include examples doc - -pkgconfigdatadir = $(libdir)/pkgconfig - -pkgconfigdata_DATA = cppunit.pc - -bin_SCRIPTS = cppunit-config -man_MANS = cppunit-config.1 - - -EXTRA_DIST = BUGS INSTALL-unix INSTALL-WIN32.txt CodingGuideLines.txt \ - cppunit-config.1 \ - cppunit.m4 cppunit.spec.in cppunit.spec \ - $(m4sources) \ - contrib/msvc/CppUnit.WWTpl \ - contrib/msvc/readme.txt \ - contrib/msvc/AddingUnitTestMethod.dsm \ - contrib/bc5/bcc-makefile.zip \ - contrib/xml-xsl/tests.xml \ - contrib/xml-xsl/report.xsl \ - src/CppUnitLibraries.dsw \ - lib/.keepme - -m4sources = \ - config/ac_create_prefix_config_h.m4 \ - config/ac_cxx_have_sstream.m4 \ - config/ac_cxx_have_strstream.m4 \ - config/ax_cxx_gcc_abi_demangle.m4 \ - config/ac_cxx_namespaces.m4 \ - config/ac_cxx_rtti.m4 \ - config/ac_cxx_string_compare_string_first.m4 \ - config/bb_enable_doxygen.m4 \ - config/ac_dll.m4 - -m4datadir = $(datadir)/aclocal -m4data_DATA = cppunit.m4 - -# Not sure what is creating the timestamp file. -# The so_locations file only happens on IRIX. -DISTCLEANFILES = config/stamp-h1 so_locations - -dist-hook: - cp -dpR $(top_srcdir)/src/msvc6 $(distdir)/src - cp -dpR $(top_srcdir)/src/qttestrunner $(distdir)/src - cp -dpR $(top_srcdir)/include/msvc6 $(distdir)/include - cp -dpR $(top_srcdir)/examples/msvc6 $(distdir)/examples - cp -dpR $(top_srcdir)/examples/qt $(distdir)/examples - test -d $(distdir)/lib || mkdir $(distdir)/lib - find $(distdir) -name CVS | xargs rm -rf - perl -pi -e 's/\n/\r\n/g' `find $(distdir) -name '*.ds?'` \ - $(distdir)/contrib/msvc/* \ - $(distdir)/INSTALL-WIN32.txt - -.PHONY: release snapshot rpm docs doc-dist - -release: - rm -rf .deps */.deps - $(MAKE) distcheck - -snapshot: - $(MAKE) dist distdir=$(PACKAGE)-`date +%Y-%m-%d` - -rpm: dist - rpm -ta $(PACKAGE)-$(VERSION).tar.gz - mv -f /usr/src/redhat/SRPMS/$(PACKAGE)-$(VERSION)-*.rpm . - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-$(VERSION)-*.rpm . - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-doc-$(VERSION)-*.rpm . - -debian: - chmod a+x debian/rules - dpkg-buildpackage -rfakeroot -sa -us -uc -tc - -doc-dist: - $(MAKE) -C doc doc-dist - mv -f doc/$(PACKAGE)-docs-$(VERSION).tar.gz . - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.in deleted file mode 100644 index eef51fbd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/Makefile.in +++ /dev/null @@ -1,872 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/cppunit-config.in \ - $(srcdir)/cppunit.pc.in $(srcdir)/cppunit.spec.in \ - $(top_srcdir)/config/config.h.in $(top_srcdir)/configure \ - AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \ - config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -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 = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = cppunit.pc cppunit.spec cppunit-config -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdatadir)" -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -man1dir = $(mandir)/man1 -NROFF = nroff -MANS = $(man_MANS) -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 = `echo $$p | sed -e 's|^.*/||'`; -m4dataDATA_INSTALL = $(INSTALL_DATA) -pkgconfigdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(m4data_DATA) $(pkgconfigdata_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.4 -ACLOCAL_AMFLAGS = -I config -SUBDIRS = src include examples doc -pkgconfigdatadir = $(libdir)/pkgconfig -pkgconfigdata_DATA = cppunit.pc -bin_SCRIPTS = cppunit-config -man_MANS = cppunit-config.1 -EXTRA_DIST = BUGS INSTALL-unix INSTALL-WIN32.txt CodingGuideLines.txt \ - cppunit-config.1 \ - cppunit.m4 cppunit.spec.in cppunit.spec \ - $(m4sources) \ - contrib/msvc/CppUnit.WWTpl \ - contrib/msvc/readme.txt \ - contrib/msvc/AddingUnitTestMethod.dsm \ - contrib/bc5/bcc-makefile.zip \ - contrib/xml-xsl/tests.xml \ - contrib/xml-xsl/report.xsl \ - src/CppUnitLibraries.dsw \ - lib/.keepme - -m4sources = \ - config/ac_create_prefix_config_h.m4 \ - config/ac_cxx_have_sstream.m4 \ - config/ac_cxx_have_strstream.m4 \ - config/ax_cxx_gcc_abi_demangle.m4 \ - config/ac_cxx_namespaces.m4 \ - config/ac_cxx_rtti.m4 \ - config/ac_cxx_string_compare_string_first.m4 \ - config/bb_enable_doxygen.m4 \ - config/ac_dll.m4 - -m4datadir = $(datadir)/aclocal -m4data_DATA = cppunit.m4 - -# Not sure what is creating the timestamp file. -# The so_locations file only happens on IRIX. -DISTCLEANFILES = config/stamp-h1 so_locations -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - 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: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config/config.h: config/stamp-h1 - @if test ! -f $@; then \ - rm -f config/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ - else :; fi - -config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status - @rm -f config/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config/config.h -$(top_srcdir)/config/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f config/stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config/config.h config/stamp-h1 -cppunit.pc: $(top_builddir)/config.status $(srcdir)/cppunit.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -cppunit.spec: $(top_builddir)/config.status $(srcdir)/cppunit.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -cppunit-config: $(top_builddir)/config.status $(srcdir)/cppunit-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -install-m4dataDATA: $(m4data_DATA) - @$(NORMAL_INSTALL) - test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" - @list='$(m4data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ - $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ - done - -uninstall-m4dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(m4data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ - done -install-pkgconfigdataDATA: $(pkgconfigdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)" - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - $(pkgconfigdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ - done - -uninstall-pkgconfigdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ - done - -# 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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__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) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(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 - $(am__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: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { 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 $(SCRIPTS) $(MANS) $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdatadir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-recursive - -info-am: - -install-data-am: install-m4dataDATA install-man \ - install-pkgconfigdataDATA - -install-dvi: install-dvi-recursive - -install-exec-am: install-binSCRIPTS - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: install-man1 - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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: uninstall-binSCRIPTS uninstall-m4dataDATA uninstall-man \ - uninstall-pkgconfigdataDATA - -uninstall-man: uninstall-man1 - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ 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-binSCRIPTS 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-m4dataDATA install-man install-man1 \ - install-pdf install-pdf-am install-pkgconfigdataDATA \ - 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-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-m4dataDATA uninstall-man uninstall-man1 \ - uninstall-pkgconfigdataDATA - - -dist-hook: - cp -dpR $(top_srcdir)/src/msvc6 $(distdir)/src - cp -dpR $(top_srcdir)/src/qttestrunner $(distdir)/src - cp -dpR $(top_srcdir)/include/msvc6 $(distdir)/include - cp -dpR $(top_srcdir)/examples/msvc6 $(distdir)/examples - cp -dpR $(top_srcdir)/examples/qt $(distdir)/examples - test -d $(distdir)/lib || mkdir $(distdir)/lib - find $(distdir) -name CVS | xargs rm -rf - perl -pi -e 's/\n/\r\n/g' `find $(distdir) -name '*.ds?'` \ - $(distdir)/contrib/msvc/* \ - $(distdir)/INSTALL-WIN32.txt - -.PHONY: release snapshot rpm docs doc-dist - -release: - rm -rf .deps */.deps - $(MAKE) distcheck - -snapshot: - $(MAKE) dist distdir=$(PACKAGE)-`date +%Y-%m-%d` - -rpm: dist - rpm -ta $(PACKAGE)-$(VERSION).tar.gz - mv -f /usr/src/redhat/SRPMS/$(PACKAGE)-$(VERSION)-*.rpm . - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-$(VERSION)-*.rpm . - mv -f /usr/src/redhat/RPMS/*/$(PACKAGE)-doc-$(VERSION)-*.rpm . - -debian: - chmod a+x debian/rules - dpkg-buildpackage -rfakeroot -sa -us -uc -tc - -doc-dist: - $(MAKE) -C doc doc-dist - mv -f doc/$(PACKAGE)-docs-$(VERSION).tar.gz . -# 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/3rd_party/cppunit/cppunit-1.12.1/NEWS b/src/3rd_party/cppunit/cppunit-1.12.1/NEWS deleted file mode 100644 index 95483151..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/NEWS +++ /dev/null @@ -1,1151 +0,0 @@ - New in CppUnit 1.12.1: - ---------------------- - -* Assertion: - - - CPPUNIT_ASSERT_DOUBLES_EQUAL() now properly handles non-finite - values, specifically NaN, +Inf, and -Inf. - -* Portability: - - - Fixed some compilation issue for QtTestRunner. - - Code should build on Windows in UNICODE mode. - - New in CppUnit 1.12.0: - ---------------------- - -* Portability: - - - autogen.sh can now be run on Mac OS X (patch #1449380 - contributed by Sander Temme). - -* MFC Test runner: - - - fixed bug #1498175: double click on failure would sometime - not goto failed assertion in visual studio. - -* Documentation: - - - now generated with doxygen 1.4.7 new 'tabs' style. - - - New in CppUnit 1.11.4: - ---------------------- - - -* Portability: - - - Support for Embedded Visual C++ 4 added. For this purpose, CppUnit now - provides a very simple stream implementation if none is provided. - This should also help porting on other platforms which have STL but - no stream support. Just make sure that CPPUNIT_NO_STREAM is defined - to 1 in your config header. - -* Assertion: - - - Added missing _MESSAGE variants for the following assertions: - - CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE - CPPUNIT_ASSERT_THROW_MESSAGE - CPPUNIT_ASSERT_NO_THROW_MESSAGE - CPPUNIT_ASSERT_ASSERTION_FAIL_MESSAGE - CPPUNIT_ASSERT_ASSERTION_PASS_MESSAGE - - Notes: change made to CPPUNIT_ASSERT_THROW may cause compilation error - if you're expecting std::exception as it would be caught twice. Contact us - if it is an issue (we don't see much use for such a test). - - Some assertions failure message are now more detailed (exception, - expression). - Thanks to Neil Ferguson who contributed this patch. - - - Assertion on real number now output expected and actual value using the - maximum available precision instead of the previous strategy of rounding - to 6 digits. - - Thanks to Neil Ferguson who contributed this patch. - -* Outputter: - - - XML Ouputter: patch #997006 contributed by Akos Maroy makes the - 'stand-alone' attribute of the XML header optional. - See XmlOutputter::setStandalone() & XmlDocument::setStandalone(). - - - Better integration of compiler output for gcc on Mac OS X with Xcode - (contributed by Claus Broch). - -* MFC Test Runner - - - Integration with VC++ 7.0 & 7.1. Double clicking on a failure will now - to the failure location in the open IDE (no add-in necessary). - This was contributed by Max Quatember and Andreas Pfaffenbichler. - - - Progress bar: now use system color to draw border - (patch from bug #1165875 contributed by Pieter Van Dyck). - -* QT Test Runner - - - Fixed display of multi-line messages (patch contributed by Karol Szkudlarek). - -* Compilation: - - - The standard pkg-config file is now generated on unix (contributed by - Robert Leight). - - - MinGW: patch #1024428 contributed by astar, fixed compilation issue in - Win32DynamicLibraryManager.cpp. - - - MinGW, cygwin: enable build of shared library when using libtool. - patch #1194394 contributed by Stéphane Fillod. - - - autotool: applied patch #1076398 contributed by Henner Sudek. Quote: - "This patch allows AM_PATH_CPPUNIT to accept version - numbers without minor and micro version. - Now you can do: - AM_PATH_CPPUNIT(1.9) - instead of - AM_PATH_CPPUNIT(1.9.0)" - - - Visual Studio 2005: removed deprecated warning. - -* Documentation: - - - Corrected many typos in cookbook and money example. Thanks to all - those who helped ! - -* Bug Fix: - - - cppunit.m4: patch #946302, AM_PATH_CPPUNIT doesn't report result - if CppUnit is missing. - - - Message/SourceLine: copy constructor have been specifically implemented - to ensure they are thread-safe even if std::string copy constructor - is not (usually on reference count based implementation). - - - TestResultCollector: fixed memory leak occuring when calling reset(). - -* Contrib: - - - added XSLT for compatibility with Ant junit xml formatter. - Patch #1112053 contributed by Norbert Barbosa. - See xml-xsl/cppunit2junit.xsl and cppunit2junit.txt for details. - - - xml-xsl/report.xsl has been fixed to work with current xml output. - -* (Possible) Compatiblity break: - - - All text output is now done on cout() instead of sometime cerr & - sometime cout depending on the component. - - - OStringStream definition has been removed from Portability.h. This - means that is no longer included, and that ostringstream and - string might not be defined. In practice this should have no impact - since those includes have been moved to other CppUnit headers. - -* Notes: - - - CppUnit now uses the alias OStream when refering to std::ostream for - portability. - - - - New in CppUnit 1.10.2: - ---------------------- - -* Bug Fix: - - - Memory checker: bug #938753, array bound read in - splitPathString() with substr if an empty string is passed. - - - Memory leaks: bug #952912, many memory leaks removed in the - MFC test plug-in runner. - - - Crash when using CPPUNIT_TEST_SUITE_REGISTRATION with cppunit dll. - Bug #921843. This bug was caused by a known STL bug in VC++ 6. - See http://www.dinkumware.com/vc_fixes.html issue with shared - std::map in dll. - -* Compilation: - - - mingw & cigwin, bug #930338 & #945737 fixed. - - - make install does not work on SunOS. Bug #940650 fixed. - - - bug #933154, post-build step fails in directory with spaces - with Visual C++. - - - DllPlugInTester, bug #941625 (char * string literal). Applied patch - contribued by Curt Arnold. - - - New in CppUnit 1.10.0 (same as 1.9.14): - -------------------------------------- - -* Assertions - - - Ported exception assertion macros from cppunit 2 to the 1.9.x series: - CPPUNIT_ASSERT_THROW, CPPUNIT_ASSERT_NO_THROW, - CPPUNIT_ASSERT_ASSERTION_FAIL, CPPUNIT_ASSERT_ASSERTION_PASS. - -* Deprecated: - - - The helper macros: CPPUNIT_TEST_FAIL & CPPUNIT_TEST_EXCEPTION have - been deprecated. Use the new exception assertion macros instead. - -* Bug Fix: - - - cppunit-config: bug #903363, missing -ldl from the output of - cppunit-config --libs. Fixed thanks Eric Blossom patch. - - - test plug-in(unix): Adding RTLD_GLOBAL allows test plug-ins - to provide symbols to shared objects they load themselves. - Thanks goes to Gareth Sylvester for this patch (#816563). - - - New in CppUnit 1.9.12: - --------------------- - -* Test Plug-in - - - added support contributed support for UNIX systems that - have libdld and not libdl (e.g. hp-ux). Contributed by - Abdessattar Sassi. - -* RTTI - - - TypeInfoHelper now used gcc c++ abi to demangle typeinfo name thanks to - Neil Ferguson contribution. - -* Bug Fix: - - - MFC TestRunner: integrated bug fix from Tim Threlkeld for bug - #610191 and #610162. Fixed assertion when minizing dialog - (bug #643612). - - - XMLOutputter: Fixed bug #676505: no space inserted between attributes - of XmlElement. - - - CppUnit portability: fixed many mistakes relating to compilation - without type info or namespace reported by Philip Craig. - - - Missing destructor with no throw specification for - DynamicLibraryManagerException. Bug #619059. - - - Fixed missing export for operator <<(TextTestResult). Bug #610119. - - - Missing include for typeinfo in TestNamer.h. Bug #662666. - -* Compilation - - - Fixed compilation issues for Borland C++ 6 and STLPort. Bug #694971, - #699794 and #662666. - - - Fixed compilation issues for AIX. - - - Fixed compilation issues for Visual C++ .NET 2002. - - - Fixed doxygen usage in mingw environment (space not allowed in - doxygen path). Bug #700730. - - - Fixed compilation issue for mingw (bug #711583). - - - New in CppUnit 1.9.10: - --------------------- - - - Major portability improvement - - Protector - - HelperMacros - - MFC TestRunner bug fixes - - Failure diagnostic - - Asserter - -* Major portability improvement: - - - Much work has been done to reduce C++ feature requirement to compile - CppUnit. It should now be possible to compile CppUnit on most - compilers, as long as STL are available (in std namespace or not), - with some form of strstream and iostream, as well as exception support. - See CodingGuideLines.txt for details. - -* Protector - - - Protector can be passed to the TestResult to 'protect' call to - setUp(), runTest() and tearDown() method. With this, it is easy to - capture exceptions which do not have std::exception as a base class, - such as CException or RWXMsg for example. TestResult and Protector - class documentation. Look at src/cppunit/DefaultProtector.cpp for - an example of implementation. - -* Helper macros - - - Mostly rewritten. It no longer use TestSuiteBuilder. A new object - TestSuiteBuilderContext was introduced. It is used to name test case, - create test fixture instance and add test to the fixture suite. It - is now much more easier to add custom test cases using - CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS. Should also prevent most - compability break concerning that macro. - - - Useful typedef are now public: TestFixtureType, ParentTestFixtureType. - - - New typedef for custom test method parameter: - typedef TestSuiteBuilderContext - TestSuiteBuilderContextType; - - - added support for abstract test fixture with - CPPUNIT_TEST_SUITE_END_ABSTRACT(). See documentation for further - detail. - -* Failure diagnostic - - - setUp() and tearDown() now provides a detailed diagnostic of the - failure (assertion, exception...) - - - If RTTI is allowed to extract type info, CppUnit will report the - actual exception type in the diagnostic. - -* Asserter: - - - A new AdditionalMessage class has been introduced. It is used for - assertion that takes an additional 'message' argument - (CPPUNIT_ASSERT_MESSAGE...). Since this macro has an implicit - constructor that take a string, which creates a Message with the - specified string as detail. That way, additional message can be a - single string or a complex Message object. See documentation for - example of use. - -* Bug Fix: - - - MFC TestRunner: bug #530426 (conflict between TestRunner and host - application's resources). A huge thanks to Steven Mitter for that one. - - - MFC TestRunner: Browse button is now disabled while running test. - -* Deprecated - - - CppUnit::TextUi::TestRunner moved to CppUnit::TextTestRunner. - - CppUnit::MfcUi::TestRunner moved to CppUnit::MfcTestRunner. - - CppUnit::QtUi::TestRunner moved to CppUnit::QtTestRunner. - -* Compatiblity break: - - - CppUnitTextUi::TestRunner, removed runTestByName() and runTest(). - - TestSuiteBuilder: removed templatized method - addTestCallerForException(). See implementation of - CPPUNIT_TEST_EXCEPTION implementation for an alternative. - - TestAssert: removed deprecated functions (those not using SourceLine) - assertImplementation(), assertNotEqualImplementation(), - assertEquals(). Moved non deprecated functions assertEquals() and - assertEquals() into CppUnit namespace. - - Plug-ins 'Parameters' typedef has been replaced by class - PlugInParameters. The method commandLine() returns what used to be in - Parameters[0]. This should avoid future compatibility break when the - parameters passing API will be defined. - - TestPlugIn::initialize() now takes a PlugInParameters in argument - instead of a Parameters. - - template void assertEquals() no longer has a default message - value (no impact, unless you used this function directly instead of - assertion macros). - - HelperMacros: renamed CPPUNIT_TEST_ADD to - CPPUNIT_TEST_SUITE_ADD_TEST. - - HelperMacros: removed CPPUNIT_TEST_CUSTOM. Instead use - CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS and call context.addTest() - passing the test that was returned. - - HelperMacros: renamed CPPUNIT_TEST_CUSTOMS to - CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS. Changed method signature to - static void aMethodName( TestSuiteBuilderContextType &context ). - You can replace the 3 previous parameters by context. (See - documentation for further detail). - - - - New in CppUnit 1.9.8: - --------------------- - - - New custom test macros for fixture suite - - Exception message are now structured - - Added detail field to MFC TestRunner - - New XmlDocument class to easily create new XML output format - - XmlOutputter customization - - Test plug-in XMLOutputter hook - - ClockerPlugIn example includes test time in XML output - - DllPlugInTester allows test plug-in to hook the XmlOutputter - - Configurable CompilerOutputter wrapping - -* New custom test macros - - - 3 new macros have been added for use when declaring test fixture suite: - - CPPUNIT_TEST_CUSTOM : to specify a method that returns an instance of - Test to add to the suite - - CPPUNIT_TEST_CUSTOM : to specify a method that add some tests to the - suite - - CPPUNIT_TEST_ADD : to add a test to the suite. Used this to create custom - CPPUNIT_TEST_xxx macros. - - See macros documentation for examples and details. - -* Exception message - - - Exception message are now stored in a Message object instead of a string. - A message is composed of two items: - - a short description (~20/30 characters) - - a list of detail strings - - The short description is used to indicate how the detail strings should be - interpreted. It usually indicates the failure types, such as - "assertion failed", "forced failure", "unexpected exception caught", - "equality assertion failed"... It should not contains new line characters - (\n). - - Detail strings are used to provide more information about the failure. It - can contains the asserted expression, the expected and actual values in an - equality assertion, some addional messages... Detail strings can contains - new line characters (\n). - - This change allow ouputters to deal with all failure the same way (there is - no special case for the equality assertion any more). - -* New XmlDocument class to easily create new XML output format - - - Classes XmlDocument and XmlElement where extracted from XmlOutputter. This - help writing outputters that use a completly different XML format. - - - XmlDocument represents a XML file, and XmlElement represents a XML element. - -* XmlOutputter customization - - - Xml output can be customized using XmlOutputterHook. To do so, subclass - XmlOutputterHook and register it to the XmlOutputter with addHook() before - call XmlOutputter::write(). - - Hook can be used to add some datas to the XmlDocument or the XmlElement of - a specific hook. Methods have been added to XmlElement to help navigating - and modifying the XmlDocument. - - See ClockerPlugIn example. - -* MFC TestRunner - - - The name of the test is displayed just before being run. - - Browse Test Hierarchy dialog is resizable. - - Better (and cleaner) handling of windows resizing - - Failure list now only show the short description of the failure. - - Edit field added to display the details of the selected failure. - -* MFC test plug-in runner (TestPlugInRunner): - - - command line: a dll name can be specified on the command after -testsuite: - example: TestPlugInRunnerd.exe -testsuite Simpled.dll - - - Layout configuration is stored/restored. - -* Test plug-in XML output Hook - - - TestPlugIn interface provides a mean for plug-in to register hook for - XML output. Practically, this allow plug-in to add specific data to the - output. See ClockerPlugIn example, which add timing datas to the xml - output. - -* DllPlugInTester: - - - added option -w / --wait to wait for the user to press a key before exiting. - - - plug-in can now provides XmlOutputterHook to add specific datas to the - XML ouput. See ClockerPlugIn example. - -* CompilerOutputter wrapping is parametrized - - - Wrap column can be set with setWrapColumn(). Default is now 79 instead of 80. - - - Wrapping can be disabled with setNoWrap(). - -* Examples: - - - ClockerPlugIn: the example now use the new XmlOutputterHook. Test time are - now included in the XML output. See examples/ClockerPlugIn/ReadMe.txt for - details. - -* Bug Fix: - - - CompilerOutputter: fixed wrapping issues (UT magic!) - - - DllPlugInTester: use ISO-LATIN1 encoding if none is given. Flag --xsl was - ignored. - - - MfcUi plug-in runner (TesTPlugInRunner): better handling of history when - loading and reloading a dll. - - - Qt Test Runner: minor bug fixes. Should compile on Unix. - - - XmlOutputter: use the default encoding if an empty string is given as - encoding - -* Compatibility Break: - - - CompilerOutputter: removed printNotEqualMessage() and printDefaultMessage(). - No longer needed since Exception message are processed in a generic way. - Removed wrap(). Extracted to StringTools. - - - Exception constructor takes a Message instead of a string. Notes that the - first argument in Message constructor is a short description, not the message. - Therefore, the change will usualy have the following form: - Exception( Message( "assertion failed", oldMessage ) ); - You may want to use Asserter functions instead of constructing and throwing - the exception manually. - - - TestPlugInAdapter: renamed TestPlugInDefaultImpl. - - - TestSuiteBuilder: removed default constructor. All remaining constructors - take an additional argument of type TestNamer used to specify the fixture - named and generate test case name. Remove template method - addTestCallerForException(). Use addTest() instead (see - CPPUNIT_TEST_EXCEPTION implementation). - - - TextTestResult: most printing method were removed. This task is now delegated - to TextOuputter. - - - XmlElement: renamed addNode() to addElement(). - - - XmlOutputter: removed methods writeProlog() and writeTestResult() which - are replaced by XmlDocument. Renamed makeRootNode() to setRootNode(). It - no longer returns the root node, but set the root node of the XML document. - - - XmlOuputter::Node: class has been extracted and renamed XmlElement. - -* Deprecated: - - - Asserter: all functions that use a string for the failure message. Construct - a Message instead (see Exception constructor compatiblity break and - Exception message feature). - - - New in CppUnit 1.9.6: - --------------------- - - - DllPlugInTester can be parametrized from command line - - Two test listener plug-in examples - - An 'hello world' example & getting started document : Money - - Contribution: generic makefile for Borland 5.5 free compiler. - - Bug fixes - -* DllPlugInTester: - - - Advanced command line to support miscellaneous listener outputer. - Parameters can now be passed to test plug-in: - - -c --compiler - Use CompilerOutputter - -x --xml [filename] - Use XmlOutputter (if filename is omitted, then output to cout or - cerr. - -s --xsl stylesheet - XML style sheet for XML Outputter - -e --encoding encoding - XML file encoding (UTF8, shift_jis, ISO-8859-1...) - -b --brief-progress - Use BriefTestProgressListener (default is TextTestProgressListener) - -n --no-progress - Show no test progress (disable default TextTestProgressListener) - -t --text - Use TextOutputter - -o --cout - Ouputters output to cout instead of the default cerr. - filename[="options"] - Many filenames can be specified. They are the name of the - test plug-ins to load. Optional plug-ins parameters can be - specified after the filename by adding '='. - [:testpath] - Optional. Only one test path can be specified. It must - be prefixed with ':'. See TestPath constructor for syntax. - - 'parameters' (test plug-in or XML filename, test path...) may contains - spaces if double quoted. Quote may be escaped with \". - - Some examples of command lines: -DllPlugInTesterd_dll.exe -b -x tests.xml -c simple_plugind.dll CppUnitTestPlugInd.dll - Will load 2 tests plug-ins (available in lib/), use the brief test - progress, output the result in XML in file tests.xml and also - output the result using the compiler outputter. - -DllPlugInTesterd_dll.exe ClockerPlugInd.dll="flat" -n CppUnitTestPlugInd.dll - Will load the 2 test plug-ins, and pass the parameter string "flat" - to the Clocker plug-in, disable test progress. Clocker being a test - listener plug-ins (it doesn't implements any tests, it just register - a TestListener), this is equivalent to say 'run all the test - of CppUnitTestPlugIn and use ClockerPlugIn as a TestLisener'. - -DllPlugInTesterd_dll.exe CppUnitTestPlugInd.dll :Core - Will run the test named "Core" (a suite in the present case ) of the - test plug-in. - -* Documentation - - - New getting started documentation. Not completed yet, but probably - a good complement to the current cookbook. Explore the creation - of the Money example. - -* Examples - - - Money (examples/Money): the 'hello world' example. Unit tests for - a simple Money class. - - - DllPlugInTesterTest (src/DllPlugInTester/DllPlugInTester.dsp): - unit tests for CommandLineParser. Not really an example, but only - slightly more complex than Money. - - - ClockerPlugIn (examples/ClockerPlugIn): a test listener plug-in - that track tests and test suites running time. Parameter: "flat" - for a reporting with a flattened tree. - - - DumperPlugIn (examples/DumperPlugIn): a test listener plug-in that - dump the test tree as it run. Paramater: "flat" for a reporting - with a flattened tree. - - - CppUnitTestPlugIn (examples/cppunitest/CppUnitTestPlugIn.dsp): - CppUnit's test suite as a test plug-in. - -* Contribution - - - Contributed by project cuppa team (http://sourceforge.jp/projects/cuppa/): - - - Makefile for CppUnit with Borland C++ 5.5 free compiler: does not - depend on a specific CppUnit version. - -* Compatiblity breaks - - - DllPlugInTester: (1.9.4 only), should add -c to DllPlugInTester - command line. - -* Bug Fix: - - - DynamicLibaryManager did not report the library name when loading a - a library. - - - BeosDynamicLibraryManager: fixed thanks to Shibu Yoshiki - ('cuppa' project team). - - - Broken build on Unix should be fixed for most (thanks to - Jeffrey Morgan). - - - New in CppUnit 1.9.4: - ---------------------- - - - More versatile, easier to make test plug-in. - - A PlugInManager to manage multiple test plug-ins. - - Crossplatform test plug-in runner. - - Crossplatform test plug-in example. - - A brief progress listener - - Easier test hierarchy creation - - Improved documentation. - - Tracking of test run start/end. - - Contribution: XML style sheet & borland 5.5 makefile. - - Help needed on the Unix side! - -* Buildling on Unix: - - - I did not get any feed back on the previous build issue on Unix. Using - a simple autobook example was useless to try to solve the problem. Here - is the issue: - - CppUnit library build fine, it is the example I'm having trouble with. - - Since the test plug-in have been added, CppUnit use the function - dlopen(), dlsym() and dlclose() on unix to load/unload the plug-in. - - Those functions apparently requires to link another library when - building an exectuable. Here is was should be done: - - linking against the said library for each example. - - generates the shared library for the examples/simple/simple_plugin - example (source files are ExampleTestCase.cpp, ExampleTestCase.cpp - and SimplePlugIn.cpp). - - if possible, makes the above optionnal if --disable-test-plug-in - is defined: - - don't link the dlXXX library - - don't compile the plug-in example - - add #define CPPUNIT_NO_TESTPLUGIN 1 to the config file - - Contact me on the mailing-list for more details. - -* TestPlugIn: - - - A simple fact I realised while testing: if you link your test plug-in - against the DLL version of cppunit (or shared library on Unix), then - test registered to the TestFactoryRegistry (it is what's hide behind - CPPUNIT_TEST_SUITE_REGISTRATION) are automatically shared. Changes - have been made to support that usage (CppUnit was crashing badly). - Using the TestFactoryRegistry provides much more flexiblity that - providing a single suite for the plug-in. As such: - - - CppUnit plug-in should be linked against the dll version of CppUnit library. - - - Plug-in should register their tests using the CPPUNIT_TEST_SUITE_xxx macros. - - - 'homemade' suite can still be registred to the TestFactoryRegistry that is - passed as parameter on plug-in initialization. Notes that you must - unregister those suites during plug-in uninitialization, otherwise on - destruction, the TestFactoryRegistry will attempt to destroy them... Your - plug-in would have been already unloaded... - - - Plug-in can accept parameters on initialization (notes that the Parameters - object is far from being stabilized, but whatever form it takes, it will be - a list of string). - - - Plug-in can register their one listener for a test run. This means that you - can extends 'DllPlugInTester' by creating test plug-in... This also means - than you can listen to startTestRun()/endTestRun() to do some global - setUp/tearDown (to initialize globales resources, such as COM...) - - - Why all this fuss around test plug-in ? Test plug-in are the incarnation of - an old concept: testable components... - -* PlugInManager: - - - The PlugInManager is used to load/unload plug-ins. It takes care of all - the 'plug-in' protocol and makes it easy to use multiple plug-ins at the - same time. It dispatches the addListener()/removeListener() message to - each plug-in. - -* Crossplatform test plug-in runner (src/DllPlugInRunner): - - - This application can be used to run your test plug-ins. It can load - multiple test plug-ins and run all or a specific test in the test - hierarchy returned by TestFactoryRegistry::getRegistry().makeTest(). - - - Plug-in loaded by the plug-in may also be custom TestListener. - - - It can be use for post-build check and to debug the plug-in. - - - Why use it? It keep you away from CppUnit API changes! - -* Easier test hierarchy creation (TestFactoryRegistry/HelperMacros): - - - added method addRegistry(name) to add a named registry to the registry. - see TestFactoryRegistry for an example of use. - - - added macros CPPUNIT_REGISTRY_ADD( which, to ) and - CPPUNIT_REGISTRY_ADD_TO_DEFAULT( which ) to create test hierarchy at static - initialization (in the spirit of CPPUNIT_TEST_SUITE_xxx() macros). - -* VerboseTestProgressListener: - - - A new TestListener that prints the test name before running it. Most useful when - a test crashing, mean a application crash. - -* Documentation: - - - More details about the test plug-in, how to use it, how does it works... - See module/Writing Test Plug-in. - -* Examples: - - - examAdded crossplatform simple example. Equivalent to VC++ HostApp example. - - examples/simple: a very simple example, demonstrating the use of CppUnit - with a single TestFixture. Demonstrate both how to build an application - using TestRunner, and how to build a test plug-in to use with the - test plug-in runner. - -* Contribution - - - Contributed by project cuppa team (http://sourceforge.jp/projects/cuppa/): - - - XML style sheet: transform CppUnit XML output into HTML. - - Makefile for CppUnit with Borland C++ 5.5 free compiler. - -* Behavior changes: - - - Test runner should call TestResult::runTest() to run the 'top level' test. This - will inform the TestListener of the test run start/end. - -* Compatiblity break: - - - TestFactoryRegistry don't own register test anymore. AutoRegisterSuite has - been updated to preverse its apparent behavior. It should be of concern - if you created and registered custom TestFactory. - - - Removed TextTestProgressListener::done(). No longer needed, it listens - for endTestRun(). - -* Compatiblity Break for 1.9.2 users: - - - TestPlugIn.h: CppUnitTestPlugIn as been completly rewritten. - - - TestPlugIn.h: macro CPPUNIT_PLUGIN_IMPLEMENT() don't take any arguments. - - - TestSuitePlugIn: removed. A similar functionnality is provided by - PlugInManager. - - - TestPlugInDefaultImpl: renamed TestPlugInAdapter. It does not implements - any default behavior anymore. - - - DllPlugInRunner: no longer support multiple specific tests. The test path must - be prefixed with ':'. Release and Debug configuration links against cppunit_dll. - -* Bug Fix: - - - Crash when linking CppUnit DLL within another DLL that registered test. Caused - by the destruction of tests registered to TestFactoryRegistry. Fixed by - providing a register/unregister interface and removing the ownership of - TestFactory to TestFactoryRegistry. - - - - New in CppUnit 1.9.2: - ---------------------- - - In short: - - Cleaner XML output - - Crossplatform Test plug-in - - TestPlugInSuite to wrap test plug-in - - More TestPlugIn documentation. - -* TestPlugIn: - - The test plug-in functionnality has been rewritten from scrash. - TestPlugIn related macro are now crossplatform (exporting the plug-in - function from the dynamic library...). - - - Class DynamicLibraryManager provides a generic way to access dynamic - library. Platform specific implementation provided for WIN32, unix, BeOs. - Can be very easily ported to new platform. - - - A More flexible and hopefully extensible interface has been introduced - (CppUnitPlugIn). - - - A default implementation using the test factory registry is provided - (TestPlugInDefaultImpl). Can be easily customized. - - - The one line test plug-in declaration was renamed CPPUNIT_PLUGIN_IMPLEMENT. - - See modules/Writing Test Plug-in documentation and examples/EasyTestPlugIn. - -* XmlOutputter: - - - XML output is now indented. Nodes that don't have children are one line - tag. The output can now easily be read. - -* Compatibility break: - - - class TestSucessListener was renamed to TestSuccessListener. - - - XmlOutput: renamed tag to - - - Global fix of the 'success' typo (was misspelled 'sucess'). Main impacts are listed - above, but check your own code in case you override some protected/private methods. - - - TestPlugInInterface (include/msvc6/TestPlugInInterface.h): this header and class - are now obsolete. You should use include/cppunit/plugin/TestPlugIn.h instead. - Macro CPPUNIT_TESTPLUGIN_IMPL have been replaced by CPPUNIT_PLUGIN_IMPLEMENT. - - - TestDecorator inherits Test instead of TestLeaf. - - - DllPlugInTester only run DLL implementing the new new TestPlugIn interface. - - - New in CppUnit 1.9.0: - ---------------------- - - In short: - - Exploration of the test hierarchy without RTTI support - - Utility methods to find a test in the hierarchy - - TestPath to store/load the path to a specific test in the hierarchy - - Generic TestRunner - - Style sheet support added to XML ouput. - - CompilerOutputter supports run-time parametrization of error location format. - - Tracking of test suite run. - - Debugging and post-build testing of DLL using DllPlugInTester. - - Easy creation a test plug-in and test plug-in new example - -* Test: - - - Exploration of the test hierarchy without RTTI support: - Added Test::getChildTestCount() and Test::getChildTestAt() to walk the test hierarchy - without RTTI. - - - Utility methods to find a test in the hierarchy: - Added Test::findTest(), Test::findTestPath() and Test::resolveTestPath(). - -* TestPath: - - - A new class that store the path to a specific test (list of pointer). Can be - converted into a string and constructed from a string. Typically used with - TestRunner. - -* TestListener: - - - Added startSuite() and endSuite() callback that are called before and after a - test suite runs its child tests. See TestListener for detail and new example. - -* CompilerOutputter: - - - Support run-time parametrization of compiler error format. Support for gcc error - format added. See CompilerOutputter::setLocationFormat(). - -* XmlOutputter: - - - Added style sheet support. - - - XML structure change (see Compatibility break) - -* DllPlugInTester: (src/msvc6/DllPlugInTester, in src/CppUnitLibraries.dsw) - - - An application to load a DLL test plug-in and run the specified test. Test - result are reported using a CompilerOutputter. It can be used for post-build - testing, but to debug DLL too! See examples/msvc6/TestPlugIn/TestPlugIn.dsp - which demonstrate both. - -* TestPlugInInterface (include/msvc6/TestPlugInInterface.h): - - - Easy creation a test plug-in with the new macro CPPUNIT_TESTPLUGIN_IMPL - that implements and exports everything for you. - See examples/msvc6/EasyTestPlugIn for an example. - - -* Compatibility break: - - - Test::toString() has been removed. Applies to all subclass of Test. - It was not used by the framework and was source of confusion with getName(). - - - TestCase::run(void) and TestCase::defaultResult() have been removed. Using the - run() method with a TestResult instead. - - - XmlOutput: added a message element to the XML structure. The message associated - to a failure is now in the content of element instead of in the content - of the element. - Changed from: - - test6 - Error - error2 - - To: - - test6 - Error - error2 - - - -* Deprecated: - - - CompilerOutputter::defaultOutputter(): use default constructor instead. - - -* Bug fix: - - - XmlOutputter: did not escape content (bug #540944). - - - Included qt/examples in distribution - - - Removed dependency of MfcTestRunner on DSPlugIn. It should now compile with - VC++ 7. - - - New in CppUnit 1.8.0: - ---------------------- - - In short: - - new assertions - - new facilities to write custom assertions - - new macros to define test case in your fixture - - registration of test fixture in named suite - - xml & compiler format test result output - - a new graphic test runner for the QT library - - MFC test runner window is resizable - - cppunit as a DLL - - Unicode support for MFC test runner. - - architecture clean-up: TestResultCollector extracted from TestResult. - - architecture clean-up: TestFixture extracted from TestCase. - - cookbook and documentation updated. - -* New assertion (TestAssert.h): - - CPPUNIT_FAIL(message) : equivalent to CPPUNIT_ASSERT_MESSAGE( message, false ) - - CPPUNIT_ASSERT_EQUAL_MESSAGE( expectedValue, actualValue, additionalMessage ): - behave like CPPUNIT_ASSERT_EQUAL but allow to add some contextual information. - -* New macros to write test case (HelperMacros.h): - - CPPUNIT_TEST_EXCEPTION that expect an exception of a specified type to - be thrown. - - CPPUNIT_TEST_FAIL that expect a test to fail. - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION to register a suite in a named suite. See - cppunittest example for a demo. - -* TextTestRunner (TextTestRunner.h): - -run() returns a boolean indicating is the run was successful. - -the constructor and setOutputter() allow you do define a specific outputter - to print the test result (CompilerOutputter, TextOutputter, XmlOutputter...) - -result() provide access to the result of the test run. - -eventManager() give access to the TestResult, allowing you to register others - TestListener. - -* TestResult (TestResult.h): - - That class has been splitted in two: TestResult and TestResultCollector. - - - TestResult manages the TestListener (registration and event dispatch), as - well as the stop flag indicating if the current test run should be interrupted. - All other responsabilites have been moved to TestResultCollector. - - - TestResult no longer hold the result of the test run (this is done by - TestResultCollector which is a TestListener). - -* TestListener (TestListener.h): - - all failures and errors are reported using a single method: - virtual void addFailure( const TestFailure &failure ) - => the failure object life time is limited to that of the method call. - Use TestFailure::isError() to distinguish error from failure. - Use TestFailure::clone() to obtain a duplicate of the failure. - -* New helpers to construct your own assertion (Asserter.h): - - It is now very easy to create your own assertion macro with failure - location. - - Asserter namespace contains functions used to construct and throw exception - to report failure. See Asserter documentation for an example of usage, and - examples/cppunittest/XmlUniformiser.h for a real life example. - - CPPUNIT_SOURCELINE() macro have been added (SourceLine.h). It captures the - failure location in a SourceLine object. Use it to write your own macros. - - Asserter namespace contains functions used to construct and throw exception - to report failure. See Asserter documentation for an example of usage, and - examples/cppunittest/XmlUniformiser.h for a real life example. - -* TestListener (TestListener.h): - - - TestSucesssListener : a simple listener that checks if a test has failed. - - - TestResultCollector : store all the test result. This class has been - extracted from the hold TestResult class. - - - TextTestProgressListener : print dot on cout to each time a test ends. - Letter 'F' and 'E' are printed when a failure or an error occurs. - -* Output (Outputter.h): - - - XML output: You can dump the TestResult as an XML document using - XmlOutputter. See examples/cppunittest/XmlOutputterTest.cpp for document - structure and usage. - - - Compiler compatible output : CompilerOutputter print the result in a - compiler compatible format. You can use your IDE to jump to the first - failure. See examples/cppunittest/CppUniTestMain.cpp for an example of usage. - - - Text output : replace the deprecated TextTestResult. Print the result in - a human readable format. - -* NotEqualException constructor take an additional message (usually used to -point out where the difference occured between the expected and actual value) -that can be retreived with additionalMessage(). See Asserter documentation for -an example of usage. - -* CppUnit - - - CppUnit can be compiled as a DLL (WIN32 platform). - DLL can be generated by the cppunit_dll.dsp project. You must define the - pre-processor symbol CPPUNIT_DLL when linking against CppUnit DLL. - See cppunittests examples for an example. - -* TestRunner - - - Qt TestRunner : a test runner for the Qt library (http://www.trolltech.com). - See examples/qt for an example of use. - - - MFC TestRunner : the dialog can now be resized. List view column sizes, - as well as the dialog size, are saved. Unicode configurations have been added. - -* Deprecated - - - TextTestResult : use the test listener TextTestProgressListener and the - ouputter TextOuputter instead. - - - Methods having fileName, lineNumber as parameter. Usually replaced by - a similar method that take a SourceLine parameter. Exception and - TestAssert are impacted. - - - TestRegistryFactory::registerFactory( const std::string &name, - TestFactory *factory ). - - You must define the symbol CPPUNIT_ENABLE_SOURCELINE_DEPRECATED to enable - old Exception constructor, UNKNOWNFILENAME and UNKNOWNLINENUMBER, as well - as function defined in the TestAssert namespace. The exception construction - and throwing as been moved to Asserter namespace. - -* Compatibility break: - - TestResult has been splitted in two class. TestResultCollector compatibility - breaks refer to the methods that were previously in TestResult. - - - TestListener::addError() was removed. addFailure() is used to report -any kind of failure. - - TestResultCollector::errors() was removed. Use failures() instead. - - TestResultCollector::failures() now reports all kind of failures. - - TestResultCollector::failures() returns a const reference. - - void TestListener::addFailure( TestFailure *failure ) was removed. - - void TestListener::addError( TestFailure *failure ) signature changed. - - - CPPUNIT_ASSERT_EQUAL_MESSAGE: changed arguments order. 'message' is now - the first argument instead of the last (like CPPUNIT_ASSERT_MESSAGE). - Notes that CPPUNIT_ASSERT_EQUAL was introduced in release 1.7.3. - - - directory for TestRunners as moved from cppunitui/ to cppunit/ui/ (concern - only users of release 1.7.10) - -* Bug fix: - - test ExceptionTest.testAssignment() don't fail anymore on VC++. See FAQ - for detail. - - - New in CppUnit 1.6.1 - -------------------- - -* This is a bug-fixing release. - - - New in CppUnit 1.6.0 - -------------------- - -* All CppUnit macros now begin with "CPPUNIT_". - - Macros CU_TEST_SUITE, CU_TEST, CU_TEST_SUITE_END, CU_TEST_SUB_SUITE, - and CU_TEST_SUITE_REGISTRATION are renamed but are otherwise unchanged; - they take the same arguments, and have the same effect. The old-style - macros can be used if your sources #define CPPUNIT_ENABLE_CU_TEST_MACROS - to 1 before including any CppUnit headers. - - Macros assert, assertEqual, and assertDoublesEqual, have been replaced - by CPPUNIT_ASSERT, CPPUNIT_ASSERT_EQUAL, and CPPUNIT_ASSERT_DOUBLES_EQUAL, - respectively. Macro assertLongsEqual is replaced by CPPUNIT_ASSERT_EQUAL. - The old assert macros can be used if your sources #define - CPPUNIT_ENABLE_NAKED_ASSERT to 1 before including any CppUnit headers. - - The old macro names are deprecated and will vanish in a future version - of CppUnit. - - -* Equality assertion CPPUNIT_ASSERT_EQUAL(expected,actual) can test - any type of expression. The types of "expected" and "actual" must - be the same; use a cast if necessary. - - -* Equality tested using CPPUNIT_ASSERT_EQUAL may be re-defined using - a traits class. Ditto for the string representation used in the - diagnostic messages. - - -* New assertion with arbitrary message: CPPUNIT_ASSERT_MESSAGE. - - -* A test case obtained using class TestCaller may check that - a particular exception is thrown. - - -* CppUnit has a test suite for itself! - - -* VC++ integration for MFC TestRunner. - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/README b/src/3rd_party/cppunit/cppunit-1.12.1/README deleted file mode 100644 index a27c5452..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/README +++ /dev/null @@ -1,19 +0,0 @@ - CppUnit --- The C++ Unit Test Library - ------------------------------------- - http://cppunit.sourceforge.net - - -CppUnit is the C++ port of the famous JUnit framework for unit -testing. - -For MSWindows installation notes, see INSTALL-WIN32.txt. -For other systems -- including cygwin -- see INSTALL and INSTALL-unix. - - -Bug reports are welcome. Please use the SourceForge bug tracking -system at http://sourceforge.net/projects/cppunit/. Bugs that already -appear in the file BUGS do not need to be reported. - -Email to the current maintainers may be sent to -. - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/THANKS b/src/3rd_party/cppunit/cppunit-1.12.1/THANKS deleted file mode 100644 index 89cfa9c7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/THANKS +++ /dev/null @@ -1,23 +0,0 @@ -Tim Jansen -Christian Leutloff -Steve M. Robbins -Patrick Berny -Patrick Hartling -Peer Sommerlund -Duane Murphy -Gigi Sayfan -Armin "bored" Michel -Jeffrey Morgan -'cuppa' project team (http://sourceforge.jp/projects/cuppa/) -Phil Verghese -Lavoie Philippe -Pavel Zabelin -Marco Welti -Thomas Neidhart -Hans Bühler (Dynamic Window library used by MFC UI) -John Sisson -Steven Mitter -Stephan Stapel -Abdessattar Sassi (hp-ux plug-in support) -Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) -Vincent Rivière diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/TODO b/src/3rd_party/cppunit/cppunit-1.12.1/TODO deleted file mode 100644 index 19fa3240..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/TODO +++ /dev/null @@ -1,35 +0,0 @@ -* Bugs: -Asserter::makeNotEqualMessage() strip the shortDescription of the additional message. - -* CppUnit: - - STL concept checker. - - Memory leak tracking: setUp/tearDown should be leak safe if no failure occured. - -* UnitTest - - add tests for XmlOutputter::setStyleSheet (current assertion macro strip when - testing ) - -* VC++ TestRunner: - - Modify MfcUi::TestRunner to expose TestResult (which allow specific TestListener - for global initialization). - - Update MfcTestRunner to use TestPath to store test in the registry - -* Documentation: - CookBook: - - how to create simple test cases (with CppUnit namespace) - - test case using only CPPUINT_ASSERT - - test case using CPPUNIT_ASSERT_EQUAL - - advanced assertions with the CPPUNIT_ASSERT_MESSAGE - - Helper Macros for convenience - - Creating a suite - - Composing a suite from more suites (i.e. compose tests for n modules to - form a big test for the whole program) - - customizing output using an user defined TestListener - - how to write the TestListener (subclass of TestListener) - - how to hook it in - - how to use the GUI - - MSVC++ special stuff - - other custmization stuff I haven't understood yet - - CppUnit: architecture overview. - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/aclocal.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/aclocal.m4 deleted file mode 100644 index ac008c6a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/aclocal.m4 +++ /dev/null @@ -1,7542 +0,0 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 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_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -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'.])]) - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -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 - -# 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 to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# 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 \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -_LT_REQUIRED_DARWIN_CHECKS - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])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_AC_SYS_COMPILER - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_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. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_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 -# -------------------------- -# Check for some things on darwin -AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - - 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. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c - 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" - ]) - case $host_os in - rhapsody* | darwin1.[[0123]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) - # 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" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" - else - _lt_dsymutil= - fi - ;; - esac -]) - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# 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. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_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 __oline__ "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*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|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*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - 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" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - 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_TRY_LINK([],[],[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 - ;; -sparc*-*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*) LD="${LD-ld} -m elf64_sparc" ;; - *) - 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* - ;; - -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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 - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/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 - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# 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*) - # 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; - ;; - - 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 - ;; - - 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"; 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 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - 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 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_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 < -#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 - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=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; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -}] -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_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_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*) - 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_AC_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_AC_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 -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_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:__oline__: $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:__oline__: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_AC_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 .. - rmdir conftest - $rm conftest* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_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 -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_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 -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_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_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; 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 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[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 -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -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" -m4_if($1,[],[ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # 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 -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # 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; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -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 - 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 - 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*) - 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=`$echo "X$lib" | $Xsed -e '\''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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - 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*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - 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' - 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}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - 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 - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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}${versuffix}$shared_ext ${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 - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[[123]]*) 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 - ;; - -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 - 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' - ;; - -interix[[3-9]]*) - 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' - 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 - 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 Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # 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;/^$/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 - 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=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=yes - ;; - -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 - 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 - 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 - export_dynamic_flag_spec='${wl}-Blargedynsym' - 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 - 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 - 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' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - 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' - ;; - -uts4*) - version_type=linux - 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 - -AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -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 -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_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=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_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=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_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=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_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="ifelse([$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 <&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 - -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 -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognize a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_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 - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_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]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])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 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -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 - ;; - -gnu*) - 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]) 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 Linux ELF. -linux* | k*bsd*-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=unknown - ;; - -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 - ;; - -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 - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -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 -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible 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 - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-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_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX - -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) -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 -fi -])# _LT_AC_PROG_CXXCPP - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ - - -# AC_LIBTOOL_RC -# ------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[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_AC_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_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF - -# 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]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_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(int, char *[[]]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_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_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++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_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_AC_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 "\-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_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - 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_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_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 echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_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_AC_SYS_LIBPATH_AIX - _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_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_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_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_AC_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}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_AC_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_AC_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 - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_AC_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) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_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; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_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_AC_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_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -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_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-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_AC_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_AC_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; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_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_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_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' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_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=`echo $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; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_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; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # 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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_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::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_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_AC_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_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - osf3*) - 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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_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=`echo $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; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_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 "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - 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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_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=`echo $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; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_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 "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # 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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_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_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -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 \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_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 \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_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. - # 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. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$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_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -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 -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([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. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -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... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # 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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP - -# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_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_AC_TAGVAR(objext, $1)=$objext - -# 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_AC_SYS_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" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -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_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG - - -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_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_AC_SYS_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" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG - - -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_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_AC_SYS_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" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then 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 -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# 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. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\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 -EOF - ;; - esac - - # 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) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -])# AC_LIBTOOL_CONFIG - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# 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]]*\)' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - 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 - -# 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 - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Try without a prefix undercore, 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. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext < $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 < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_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_save_LIBS" - CFLAGS="$lt_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 -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # 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_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $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_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # 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*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_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 - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - 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_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_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_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_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_AC_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= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # 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 - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = 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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[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_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_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_AC_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_AC_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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_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; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - _LT_AC_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 - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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_AC_TAGVAR(ld_shlibs, $1)=no - cat <&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. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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_AC_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_AC_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 - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_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_AC_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_AC_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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - 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_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_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 echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_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_AC_SYS_LIBPATH_AIX - _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_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*) - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # 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. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_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_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_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_AC_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}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; - - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $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_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_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_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_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~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_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' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_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_MSG_CHECKING([whether -lc should be explicitly linked in]) - $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_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - - -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. - -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE - -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P - -# 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. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_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]) -]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007 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.10' -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.10.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 AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 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], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -# 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. - -# serial 8 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$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 -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, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# 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. - -# serial 9 - -# 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", "GCJ", or "OBJC". -# 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 - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" 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'. - 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 - 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 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - 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 - ;; - none) break ;; - esac - # 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. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# 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. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; 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"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 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. - -# serial 13 - -# 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. - -# 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.60])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], -[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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [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) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# 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)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) - - -# 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, 2003, 2005 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 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 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. - -# serial 2 - -# 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])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 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. - -# serial 3 - -# 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 done -.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 -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -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, 1999, 2000, 2001, 2003, 2004, 2005 -# 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. - -# serial 5 - -# 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 supports --run. -# If it does, 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 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 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_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 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. - -# serial 3 - -# _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], -[AC_FOREACH([_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])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# 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 ( - 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 - rm -f conftest.file - 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 - - 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)]) - -# Copyright (C) 2001, 2003, 2005 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 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]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 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. - -# serial 2 - -# _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. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -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([config/ac_create_prefix_config_h.m4]) -m4_include([config/ac_cxx_have_sstream.m4]) -m4_include([config/ac_cxx_have_strstream.m4]) -m4_include([config/ac_cxx_namespaces.m4]) -m4_include([config/ac_cxx_rtti.m4]) -m4_include([config/ac_cxx_string_compare_string_first.m4]) -m4_include([config/ac_dll.m4]) -m4_include([config/ax_cxx_gcc_abi_demangle.m4]) -m4_include([config/ax_cxx_have_isfinite.m4]) -m4_include([config/bb_enable_doxygen.m4]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_create_prefix_config_h.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_create_prefix_config_h.m4 deleted file mode 100644 index 1534ff42..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_create_prefix_config_h.m4 +++ /dev/null @@ -1,107 +0,0 @@ -dnl @synopsis AC_CREATE_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])] -dnl -dnl this is a new variant from ac_prefix_config_ -dnl this one will use a lowercase-prefix if -dnl the config-define was starting with a lowercase-char, e.g. -dnl #define const or #define restrict or #define off_t -dnl (and this one can live in another directory, e.g. testpkg/config.h -dnl therefore I decided to move the output-header to be the first arg) -dnl -dnl takes the usual config.h generated header file; looks for each of -dnl the generated "#define SOMEDEF" lines, and prefixes the defined name -dnl (ie. makes it "#define PREFIX_SOMEDEF". The result is written to -dnl the output config.header file. The PREFIX is converted to uppercase -dnl for the conversions. -dnl -dnl default OUTPUT-HEADER = $PACKAGE-config.h -dnl default PREFIX = $PACKAGE -dnl default ORIG-HEADER, derived from OUTPUT-HEADER -dnl if OUTPUT-HEADER has a "/", use the basename -dnl if OUTPUT-HEADER has a "-", use the section after it. -dnl otherwise, just config.h -dnl -dnl In most cases, the configure.in will contain a line saying -dnl AC_CONFIG_HEADER(config.h) -dnl somewhere *before* AC_OUTPUT and a simple line saying -dnl AC_PREFIX_CONFIG_HEADER -dnl somewhere *after* AC_OUTPUT. -dnl -dnl example: -dnl AC_INIT(config.h.in) # config.h.in as created by "autoheader" -dnl AM_INIT_AUTOMAKE(testpkg, 0.1.1) # "#undef VERSION" and "PACKAGE" -dnl AM_CONFIG_HEADER(config.h) # in config.h.in -dnl AC_MEMORY_H # "#undef NEED_MEMORY_H" -dnl AC_C_CONST_H # "#undef const" -dnl AC_OUTPUT(Makefile) # creates the "config.h" now -dnl AC_CREATE_PREFIX_CONFIG_H # creates "testpkg-config.h" -dnl and the resulting "testpkg-config.h" contains lines like -dnl #ifndef TESTPKG_VERSION -dnl #define TESTPKG_VERSION "0.1.1" -dnl #endif -dnl #ifndef TESTPKG_NEED_MEMORY_H -dnl #define TESTPKG_NEED_MEMORY_H 1 -dnl #endif -dnl #ifndef _testpkg_const -dnl #define _testpkg_const const -dnl #endif -dnl -dnl and this "testpkg-config.h" can be installed along with other -dnl header-files, which is most convenient when creating a shared -dnl library (that has some headers) where some functionality is -dnl dependent on the OS-features detected at compile-time. No -dnl need to invent some "testpkg-confdefs.h.in" manually. :-) -dnl -dnl @version $Id: ac_create_prefix_config_h.m4,v 1.1 2001/06/17 15:47:32 bastiaan Exp $ -dnl @author Guido Draheim - -AC_DEFUN([AC_CREATE_PREFIX_CONFIG_H], -[changequote({, })dnl -ac_prefix_conf_OUT=`echo ifelse($1, , $PACKAGE-config.h, $1)` -ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e 'y:abcdefghijklmnopqrstuvwxyz./,-:ABCDEFGHIJKLMNOPQRSTUVWXYZ____:'` -ac_prefix_conf_PKG=`echo ifelse($2, , $PACKAGE, $2)` -ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` -ac_prefix_conf_UPP=`echo $ac_prefix_conf_PKG | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e '/^[0-9]/s/^/_/'` -ac_prefix_conf_INP=`echo ifelse($3, , _, $3)` -if test "$ac_prefix_conf_INP" = "_"; then - case $ac_prefix_conf_OUT in - */*) ac_prefix_conf_INP=`basename $ac_prefix_conf_OUT` - ;; - *-*) ac_prefix_conf_INP=`echo $ac_prefix_conf_OUT | sed -e 's/[a-zA-Z0-9_]*-//'` - ;; - *) ac_prefix_conf_INP=config.h - ;; - esac -fi -changequote([, ])dnl -if test -z "$ac_prefix_conf_PKG" ; then - AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H]) -else - AC_MSG_RESULT(creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines) - if test -f $ac_prefix_conf_INP ; then - AS_DIRNAME([/* automatically generated */], $ac_prefix_conf_OUT) -changequote({, })dnl - echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT - echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT - - echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed - echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed - echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT - echo '#endif' >>$ac_prefix_conf_OUT -changequote([, ])dnl - else - AC_MSG_ERROR([input file $ac_prefix_conf_IN does not exist, dnl - skip generating $ac_prefix_conf_OUT]) - fi - rm -f conftest.* -fi]) - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_sstream.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_sstream.m4 deleted file mode 100644 index 0630cf09..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_sstream.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_SSTREAM -dnl -dnl If the C++ library has a working stringstream, define HAVE_SSTREAM. -dnl -dnl @author Ben Stanley -dnl @version $Id: ac_cxx_have_sstream.m4,v 1.1 2001/07/07 16:05:47 smr99 Exp $ -dnl -AC_DEFUN([AC_CXX_HAVE_SSTREAM], -[AC_CACHE_CHECK(whether the compiler has stringstream, -ac_cv_cxx_have_sstream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[stringstream message; message << "Hello"; return 0;], - ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_sstream" = yes; then - AC_DEFINE(HAVE_SSTREAM,1,[define if the compiler has stringstream]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_strstream.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_strstream.m4 deleted file mode 100644 index 232a3d6f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_have_strstream.m4 +++ /dev/null @@ -1,29 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_STRSTREAM -dnl -dnl If the C++ library has a working strstream, define HAVE_CLASS_STRSTREAM. -dnl -dnl Adapted from ac_cxx_have_sstream.m4 by Steve Robbins -dnl -AC_DEFUN([AC_CXX_HAVE_STRSTREAM], -[AC_CACHE_CHECK(whether the library defines class strstream, -ac_cv_cxx_have_class_strstream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CHECK_HEADERS(strstream) - AC_TRY_COMPILE([ -#if HAVE_STRSTREAM -# include -#else -# include -#endif -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[ostrstream message; message << "Hello"; return 0;], - ac_cv_cxx_have_class_strstream=yes, ac_cv_cxx_have_class_strstream=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_class_strstream" = yes; then - AC_DEFINE(HAVE_CLASS_STRSTREAM,1,[define if the library defines strstream]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_namespaces.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_namespaces.m4 deleted file mode 100644 index 7041acfc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_namespaces.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl @synopsis AC_CXX_NAMESPACES -dnl -dnl If the compiler can prevent names clashes using namespaces, define -dnl HAVE_NAMESPACES. -dnl -dnl @version $Id: ac_cxx_namespaces.m4,v 1.1 2001/06/02 23:26:36 smr99 Exp $ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_NAMESPACES], -[AC_CACHE_CHECK(whether the compiler implements namespaces, -ac_cv_cxx_namespaces, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], - [using namespace Outer::Inner; return i;], - ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_namespaces" = yes; then - AC_DEFINE(HAVE_NAMESPACES,1,[define to 1 if the compiler implements namespaces]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_rtti.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_rtti.m4 deleted file mode 100644 index e91bc645..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_rtti.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl @synopsis AC_CXX_RTTI -dnl -dnl If the compiler supports Run-Time Type Identification (typeinfo -dnl header and typeid keyword), define HAVE_RTTI. -dnl -dnl @version $Id: ac_cxx_rtti.m4,v 1.1 2001/06/02 22:29:52 smr99 Exp $ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_RTTI], -[AC_CACHE_CHECK(whether the compiler supports Run-Time Type Identification, -ac_cv_cxx_rtti, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -class Base { public : - Base () {} - virtual int f () { return 0; } - }; -class Derived : public Base { public : - Derived () {} - virtual int f () { return 1; } - }; -],[Derived d; -Base *ptr = &d; -return typeid (*ptr) == typeid (Derived); -], - ac_cv_cxx_rtti=yes, ac_cv_cxx_rtti=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_rtti" = yes; then - AC_DEFINE(HAVE_RTTI,1, - [define if the compiler supports Run-Time Type Identification]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_string_compare_string_first.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_string_compare_string_first.m4 deleted file mode 100644 index a1cb7a28..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_cxx_string_compare_string_first.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl @synopsis AC_CXX_STRING_COMPARE_STRING_FIRST -dnl -dnl If the standard library string::compare() function takes the -dnl string as its first argument, define FUNC_STRING_COMPARE_STRING_FIRST to 1. -dnl -dnl @author Steven Robbins -dnl -AC_DEFUN([AC_CXX_STRING_COMPARE_STRING_FIRST], -[AC_CACHE_CHECK(whether std::string::compare takes a string in argument 1, -ac_cv_cxx_string_compare_string_first, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[string x("hi"); string y("h"); -return x.compare(y,0,1) == 0;], - ac_cv_cxx_string_compare_string_first=yes, - ac_cv_cxx_string_compare_string_first=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_string_compare_string_first" = yes; then - AC_DEFINE(FUNC_STRING_COMPARE_STRING_FIRST,1, - [define if library uses std::string::compare(string,pos,n)]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_dll.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_dll.m4 deleted file mode 100644 index ad7438a1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ac_dll.m4 +++ /dev/null @@ -1,47 +0,0 @@ - -# AC_LTDL_DLLIB -# ------------- -AC_DEFUN([AC_LTDL_DLLIB], -[LIBADD_DL= -AC_SUBST(LIBADD_DL) - -AC_CHECK_FUNC([shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.])], - [AC_CHECK_LIB([dld], [shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LIBADD_DL="$LIBADD_DL -ldld"], - [AC_CHECK_LIB([dl], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DL="-ldl"], - [AC_TRY_LINK([#if HAVE_DLFCN_H -# include -#endif - ], - [dlopen(0, 0);], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.])], - [AC_CHECK_LIB([svld], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DL="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [AC_DEFINE([HAVE_DLD], [1], - [Define if you have the GNU dld library.]) - LIBADD_DL="$LIBADD_DL -ldld" - ]) - ]) - ]) - ]) - ]) -]) - -if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then - LIBS_SAVE="$LIBS" - LIBS="$LIBS $LIBADD_DL" - AC_CHECK_FUNCS(dlerror) - LIBS="$LIBS_SAVE" -fi -])# AC_LTDL_DLLIB diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_gcc_abi_demangle.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_gcc_abi_demangle.m4 deleted file mode 100644 index 7a74956c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_gcc_abi_demangle.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl @synopsis AX_CXX_GCC_ABI_DEMANGLE -dnl -dnl If the compiler supports GCC C++ ABI name demangling (has header cxxabi.h -dnl and abi::__cxa_demangle() function), define HAVE_GCC_ABI_DEMANGLE -dnl -dnl Adapted from AC_CXX_RTTI by Luc Maisonobe -dnl -dnl @version $Id: ax_cxx_gcc_abi_demangle.m4,v 1.1 2004/02/18 20:45:36 blep Exp $ -dnl @author Neil Ferguson -dnl -AC_DEFUN([AX_CXX_GCC_ABI_DEMANGLE], -[AC_CACHE_CHECK(whether the compiler supports GCC C++ ABI name demangling, -ac_cv_cxx_gcc_abi_demangle, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#include -#include - -template -class A {}; -],[A instance; -int status = 0; -char* c_name = 0; - -c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status); - -std::string name(c_name); -free(c_name); - -return name == "A"; -], - ac_cv_cxx_gcc_abi_demangle=yes, ac_cv_cxx_gcc_abi_demangle=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_gcc_abi_demangle" = yes; then - AC_DEFINE(HAVE_GCC_ABI_DEMANGLE,1, - [define if the compiler supports GCC C++ ABI name demangling]) -fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_have_isfinite.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_have_isfinite.m4 deleted file mode 100644 index 5f9c7fca..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ax_cxx_have_isfinite.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl @synopsis AX_CXX_HAVE_ISFINITE -dnl -dnl If isfinite() is available to the C++ compiler: -dnl define HAVE_ISFINITE -dnl add "-lm" to LIBS -dnl -AC_DEFUN([AX_CXX_HAVE_ISFINITE], - [ax_cxx_have_isfinite_save_LIBS=$LIBS - LIBS="$LIBS -lm" - - AC_CACHE_CHECK(for isfinite, ax_cv_cxx_have_isfinite, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[int f = isfinite( 3 );]])], - [ax_cv_cxx_have_isfinite=yes], - [ax_cv_cxx_have_isfinite=no]) - AC_LANG_RESTORE]) - - if test "$ax_cv_cxx_have_isfinite" = yes; then - AC_DEFINE([HAVE_ISFINITE],1,[define if compiler has isfinite]) - else - LIBS=$ax_cxx_have_isfinite_save_LIBS - fi -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/bb_enable_doxygen.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/config/bb_enable_doxygen.m4 deleted file mode 100644 index f388639b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/bb_enable_doxygen.m4 +++ /dev/null @@ -1,34 +0,0 @@ -AC_DEFUN([BB_ENABLE_DOXYGEN], -[ -AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) -AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) -AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) -AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no]) -if test "x$enable_doxygen" = xno; then - enable_doc=no -else - AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) - if test "x$DOXYGEN" = x; then - if test "x$enable_doxygen" = xyes; then - AC_MSG_ERROR([could not find doxygen]) - fi - enable_doc=no - else - enable_doc=yes - AC_PATH_PROG(DOT, dot, , $PATH) - fi -fi -AM_CONDITIONAL(DOC, test x$enable_doc = xyes) - -if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - AC_MSG_ERROR([could not find dot]) - fi - enable_dot=no -else - enable_dot=yes -fi -AC_SUBST(enable_dot) -AC_SUBST(enable_html_docs) -AC_SUBST(enable_latex_docs) -]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/config.guess b/src/3rd_party/cppunit/cppunit-1.12.1/config/config.guess deleted file mode 100755 index f32079ab..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/config.guess +++ /dev/null @@ -1,1526 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-01-23' - -# 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 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# 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 Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -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 (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 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 - -# 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 tupples: *-*-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 __ELF__ >/dev/null - 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 ;; - *: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'` - exit ;; - 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 ;; - 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:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-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:*:[456]) - 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/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - 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 __LP64__ >/dev/null - 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:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - 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 ;; - 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-gnu`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/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - 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-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - 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 ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${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-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; 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.0*:*) - 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 i386. - echo i386-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; } ;; - 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.0*:*) - 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 ;; - 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 - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - 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 ;; - 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 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -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/3rd_party/cppunit/cppunit-1.12.1/config/config.h.in b/src/3rd_party/cppunit/cppunit-1.12.1/config/config.h.in deleted file mode 100644 index db5f1fea..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/config.h.in +++ /dev/null @@ -1,100 +0,0 @@ -/* config/config.h.in. Generated from configure.in by autoheader. */ - -/* define if library uses std::string::compare(string,pos,n) */ -#undef FUNC_STRING_COMPARE_STRING_FIRST - -/* define if the library defines strstream */ -#undef HAVE_CLASS_STRSTREAM - -/* Define to 1 if you have the header file. */ -#undef HAVE_CMATH - -/* Define if you have the GNU dld library. */ -#undef HAVE_DLD - -/* Define to 1 if you have the `dlerror' function. */ -#undef HAVE_DLERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `finite' function. */ -#undef HAVE_FINITE - -/* define if the compiler supports GCC C++ ABI name demangling */ -#undef HAVE_GCC_ABI_DEMANGLE - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* define if compiler has isfinite */ -#undef HAVE_ISFINITE - -/* Define if you have the libdl library or equivalent. */ -#undef HAVE_LIBDL - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* define to 1 if the compiler implements namespaces */ -#undef HAVE_NAMESPACES - -/* define if the compiler supports Run-Time Type Identification */ -#undef HAVE_RTTI - -/* Define if you have the shl_load function. */ -#undef HAVE_SHL_LOAD - -/* define if the compiler has stringstream */ -#undef HAVE_SSTREAM - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRSTREAM - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 to use type_info::name() for class names */ -#undef USE_TYPEINFO_NAME - -/* Version number of package */ -#undef VERSION diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/config.sub b/src/3rd_party/cppunit/cppunit-1.12.1/config/config.sub deleted file mode 100755 index 6759825a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/config.sub +++ /dev/null @@ -1,1658 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-01-16' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# 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. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# 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. - -# 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 (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 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-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - 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) - os= - basic_machine=$1 - ;; - -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*) - 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 \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | 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 | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-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-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | 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-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | 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-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; - # 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 - ;; - 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 - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - 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) - 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 - ;; - 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'm not sure what "Sysv32" means. Should this be sysv3.2? - 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 - ;; - 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 - ;; - mingw32) - basic_machine=i386-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 - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - 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 - ;; - 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) basic_machine=powerpc-unknown - ;; - ppc-*) 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) - 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 - ;; - 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 - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-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 - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-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[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. - -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* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -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* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -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*) - # 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 - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -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 - ;; - # 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 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - 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 - ;; - -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/3rd_party/cppunit/cppunit-1.12.1/config/depcomp b/src/3rd_party/cppunit/cppunit-1.12.1/config/depcomp deleted file mode 100755 index e5f9736c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/depcomp +++ /dev/null @@ -1,589 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2007-03-29.01 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# 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 outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -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" - -# 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 - -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 -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## 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). -## - 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 -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## 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. - tr ' ' ' -' < "$tmpdepfile" | -## 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. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -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 -eq 0; then : - else - 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 ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - 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 -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - 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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - 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 -eq 0; then : - else - 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,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # 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.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#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 $1 != '--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:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - 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 $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - 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. - -*|$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" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - 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 $1 != '--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, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -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-end: "$" -# End: diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/install-sh b/src/3rd_party/cppunit/cppunit-1.12.1/config/install-sh deleted file mode 100755 index a5897de6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/install-sh +++ /dev/null @@ -1,519 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-12-25.00 - -# 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 - 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 - 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 - trap '(exit $?); exit' 1 2 13 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 starting with `-'. - 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 - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # 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-writeable 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 -z "$d" && 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-end: "$" -# End: diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/ltmain.sh b/src/3rd_party/cppunit/cppunit-1.12.1/config/ltmain.sh deleted file mode 100644 index 5def3516..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/ltmain.sh +++ /dev/null @@ -1,6964 +0,0 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# 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. - -basename="s,^.*/,,g" - -# 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" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 - -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION="1.5.26 Debian 1.5.26-1" -TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" - -# Be Bourne compatible (taken from Autoconf:_AS_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 - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# 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 "$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" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } - fi - - $echo "X$my_tmpdir" | $Xsed -} - - -# 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. -func_win32_libid () -{ - 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 - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $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_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 () -{ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - 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 "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # 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. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # 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 - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - 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 - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - 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" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - 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 have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} -# End of Shell function definitions -##################################### - -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" - -disable_libs=no - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --version) - echo "\ -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - -Copyright (C) 2008 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." - exit $? - ;; - - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; - - --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 $? - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --preserve-dup-deps) duplicate_deps="yes" ;; - - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; - - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi - -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac - -# 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= - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # 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= - - 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) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - - -static | -prefer-pic | -prefer-non-pic) - later="$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,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$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. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; - *.sx) xform=sx ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # 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 - - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - 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 $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "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." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </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." - - $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 - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </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." - - $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 - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - 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 - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$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 - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - 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 - dlfiles="$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. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$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 - non_pic_objects="$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" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - 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 - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - 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 - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - 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*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$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*) - # 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 - deplibs="$deplibs -framework System" - 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 - deplibs="$deplibs $arg" - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -module) - module=yes - continue - ;; - - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - 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*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - 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 - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - 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 - dlfiles="$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. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$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 - non_pic_objects="$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" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - 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. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'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\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; - 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 test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$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 test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$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 - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - 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 - 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 "$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) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - 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 (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - 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 - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - 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 - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - 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 - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - 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 used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - 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. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # 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 - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$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 - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - 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. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$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 - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$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 - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - 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 - newlib_search_path="$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*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - 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 test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$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 - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$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 "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$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 - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library - - # Warn about portability, can't link against -module's on - # some systems (darwin) - if 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 "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; 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*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - 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 "$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 module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; 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 - 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; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$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 - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$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:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; 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:"*) ;; - *) finalize_shlibpath="$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 - [\\/]*) - add_dir="$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*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$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" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$deplibdir/$depdepl" ; then - depdepl="$deplibdir/$depdepl" - elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - else - # Can't find it, oh well... - depdepl= - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - 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 "*) ;; - *) lib_search_path="$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 "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$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 - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; - esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - 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 - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # 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="$2" - number_minor="$3" - number_revision="$4" - # - # 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 - darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - 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]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - 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]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - 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]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - 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 - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - 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 - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi - 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 - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=.`expr $current - $age` - 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 - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - 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 - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$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) - ;; - $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 - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "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 - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$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 "*) ;; - *) dlfiles="$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 "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-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 - deplibs="$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. - $rm conftest.c - cat > conftest.c </dev/null` - 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 "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$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 - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$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 - newdeplibs="$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 - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e '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 "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $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 - fi - ;; - 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 is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - 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 - - - # 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 "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$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 - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$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 - 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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$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" - if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$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 "$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 - realname="$2" - shift; 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 - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "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"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $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:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." - - # 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 - output_la=`$echo "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$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. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - 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~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done - - $echo "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" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - 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\" - 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 - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(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 "$mode" = relink; then - $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 - $show "${rm}r $gentop" - $run ${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 - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run 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) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; - esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${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" - # $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" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - 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 "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$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 "*) ;; - *) finalize_rpath="$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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$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 "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # 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/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - 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*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - 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 "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - 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 - rpath="$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 - rpath="$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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - 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" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - 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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "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}\" || 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 - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - 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 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#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 -# 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 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - -const char *program_name = NULL; - -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; - - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -const char * -base_name (const char *name) -{ - const char *base; - -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} - -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -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; - - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - - 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 ("getcwd failed"); - 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 ("getcwd failed"); - 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 * -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; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# 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. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible (taken from Autoconf:_AS_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 variable: - 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 - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e '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 \"X\$file\" | \$Xsed -e '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 \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $echo >> $output "\ - 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 >> $output "\ - - # 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 $EXIT_FAILURE - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - 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 $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - 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" - 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" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $addlibs - oldobjs="$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 - # 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 - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_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 - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$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= - 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 - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "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}\" || 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 - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; 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 "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - - # Only create the output if not a dry run. - if test -z "$run"; then - 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) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# 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' - -# Libraries that this one depends upon. -dependency_libs='$dependency_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 - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; - - # libtool install mode - install) - modename="$modename: install" - - # 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. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - 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. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$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 "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. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` - else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run 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 - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$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 - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run 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 - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - 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 - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo 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. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo 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. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "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) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - - $echo "X----------------------------------------------------------------------" | $Xsed - $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" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - 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 - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; 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 - 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 - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - 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) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - 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 (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - - # Read the .lo file - . $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$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 - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit $EXIT_FAILURE -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [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 - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -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. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [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: $modename [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 - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -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: $modename [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: $modename [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: $modename [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 rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [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 - -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 - -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] - -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: $modename [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." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? - -# 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 -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/config/missing b/src/3rd_party/cppunit/cppunit-1.12.1/config/missing deleted file mode 100755 index 1c8ff704..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/config/missing +++ /dev/null @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# 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 - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -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 - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/configure b/src/3rd_party/cppunit/cppunit-1.12.1/configure deleted file mode 100755 index 424eea62..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/configure +++ /dev/null @@ -1,23322 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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 - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -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 - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -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 - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="Makefile.am" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -CPPUNIT_MAJOR_VERSION -CPPUNIT_MINOR_VERSION -CPPUNIT_MICRO_VERSION -CPPUNIT_INTERFACE_AGE -CPPUNIT_BINARY_AGE -CPPUNIT_VERSION -LT_RELEASE -LT_CURRENT -LT_REVISION -LT_AGE -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CXX -CXXFLAGS -ac_ct_CXX -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -SED -GREP -EGREP -LN_S -ECHO -AR -RANLIB -DSYMUTIL -NMEDIT -DLLTOOL -AS -OBJDUMP -CPP -CXXCPP -F77 -FFLAGS -ac_ct_F77 -LIBTOOL -LIBADD_DL -DOXYGEN -DOT -DOC_TRUE -DOC_FALSE -enable_dot -enable_html_docs -enable_latex_docs -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CXX -CXXFLAGS -CCC -CPP -CXXCPP -F77 -FFLAGS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-doxygen enable documentation generation with doxygen (auto) - --enable-dot use 'dot' to generate graphs in doxygen (auto) - --enable-html-docs enable HTML generation with doxygen (yes) - --enable-latex-docs enable LaTeX documentation generation with doxygen (no) - --disable-typeinfo-name disable use of RTTI for class names - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-tags[=TAGS] include additional configurations [automatic] - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -configure -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -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 || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -# autoconf 2.50 or higher to rebuild aclocal.m4, because the -# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. - - -# Making releases: -# CPPUNIT_MICRO_VERSION += 1; -# CPPUNIT_INTERFACE_AGE += 1; -# CPPUNIT_BINARY_AGE += 1; -# if any functions have been added, set CPPUNIT_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set CPPUNIT_BINARY_AGE and CPPUNIT_INTERFACE_AGE to 0. -# -CPPUNIT_MAJOR_VERSION=1 -CPPUNIT_MINOR_VERSION=12 -CPPUNIT_MICRO_VERSION=1 -CPPUNIT_INTERFACE_AGE=0 -CPPUNIT_BINARY_AGE=0 -CPPUNIT_VERSION=$CPPUNIT_MAJOR_VERSION.$CPPUNIT_MINOR_VERSION.$CPPUNIT_MICRO_VERSION - - - - - - - -# libtool versioning -LT_RELEASE=$CPPUNIT_MAJOR_VERSION.$CPPUNIT_MINOR_VERSION -LT_CURRENT=`expr $CPPUNIT_MICRO_VERSION - $CPPUNIT_INTERFACE_AGE` -LT_REVISION=$CPPUNIT_INTERFACE_AGE -LT_AGE=`expr $CPPUNIT_BINARY_AGE - $CPPUNIT_INTERFACE_AGE` - - - - - -ac_aux_dir= -for ac_dir in config "$srcdir"/config; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -ac_config_headers="$ac_config_headers config/config.h" - -am__api_version='1.10' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# 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 ( - 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 - rm -f conftest.file - 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". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SET_MAKE= -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -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 - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - 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 - - -# Define the identity of the package. - PACKAGE=cppunit - VERSION=$CPPUNIT_VERSION - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# 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. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -# General "with" options -# ---------------------------------------------------------------------------- - - -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SET_MAKE= -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -# The libtool macro AC_PROG_LIBTOOL checks for the C preprocessor. -# Configure gets confused if we try to check for a C preprocessor -# without first checking for the C compiler -# (see http://sources.redhat.com/ml/autoconf/2001-07/msg00036.html), -# so we invoke AC_PROG_CC explicitly. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CC" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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'. - 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_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - 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 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - 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 - ;; - none) break ;; - esac - # 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. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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'. - 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_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - 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 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - 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 - ;; - none) break ;; - esac - # 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. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; 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 -else - enable_shared=yes -fi - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; 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 -else - enable_static=yes -fi - - -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; 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 -else - enable_fast_install=yes -fi - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # 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 { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$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 - -fi - -SED=$lt_cv_path_SED - -{ echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } - -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_GREP=$GREP -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_EGREP=$EGREP -fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 &5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi -fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } -NM="$lt_cv_path_NM" - -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } -fi - -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/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 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -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 - ;; - -gnu*) - 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]) 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 Linux ELF. -linux* | k*bsd*-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=unknown - ;; - -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 - ;; - -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 - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -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 - - - - -# 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 - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi - -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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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 4969 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - 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" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - 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" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - 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 - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - 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* - ;; - -*-*-cygwin* | *-*-mingw* | *-*-pw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; - -esac - -need_locks="$enable_libtool_lock" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -fi - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi -fi - - -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_f77_g=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi - -G77=`test $ac_compiler_gnu = yes && echo yes` -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -# find the maximum length of command line arguments -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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*) - # 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; - ;; - - 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 - ;; - - 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"; 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 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - 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 - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } -else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } -fi - - - - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# 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]*\)' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - 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 - -# 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 - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Try without a prefix undercore, 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. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && 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 < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - 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 - -fi - -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 - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } -else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } -fi - -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 -fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -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 - -# 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 to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# 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 \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - 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 <&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 - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - 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 <&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 - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c - fi -fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_ld_exported_symbols_list=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[0123]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) - # 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" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" - else - _lt_dsymutil= - fi - ;; - esac - - -enable_dlopen=no -enable_win32_dll=yes - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" -else - pic_mode=default -fi - -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$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);}' - - -# 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 - - -# save warnings/boilerplate of simple test code -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* - -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_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # 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:7838: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:7842: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - -lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - # 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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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 - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - 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_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - hpux*) - # 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_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-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_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # 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:8128: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:8132: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o=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:8232: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:8236: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $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 .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # 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'. - exclude_expsyms='_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. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) - # 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 - # 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 - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${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 - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [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 - ld_shlibs=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds='$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)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$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... - archive_expsym_cmds='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 - ld_shlibs=no - fi - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${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. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$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 - link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $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 - ld_shlibs=no - cat <&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. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - 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 - 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 - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$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. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; 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 - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$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. - - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - - 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 - hardcode_direct=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 - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - 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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=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. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${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. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$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*) - archive_cmds='$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)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # 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=' ' - allow_undefined_flag=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. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="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}" - module_expsym_cmds="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}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - freebsd1*) - ld_shlibs=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*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$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 - 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 - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # 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 "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$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 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - - # 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*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - 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 - allow_undefined_flag=unsupported - archive_cmds='$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' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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 - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$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' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=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 - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=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. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$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. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -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" - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # 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 -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # 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; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -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 - 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 - 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*) - 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=`$echo "X$lib" | $Xsed -e '\''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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - 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' - 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}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - 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 - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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}${versuffix}$shared_ext ${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`' - - 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 - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - 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' - ;; - -interix[3-9]*) - 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' - 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 - 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 Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # 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;/^$/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 - 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=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=yes - ;; - -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 - 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 - 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 - export_dynamic_flag_spec='${wl}-Blargedynsym' - 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 - 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 - 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' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - 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' - ;; - -uts4*) - version_type=linux - 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 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -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 - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != 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_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } - -if test "$hardcode_action" = relink; 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 - -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -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" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -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" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - ;; - *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ;; - esac -fi - -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*) - 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 - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library 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_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library 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_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - 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" - - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#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 - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=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; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#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 - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=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; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - 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 - - -# Report which library types will actually be built -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -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 -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - { echo "$as_me:$LINENO: creating $ofile" >&5 -echo "$as_me: creating $ofile" >&6;} - - cat <<__EOF__ >> "$cfgfile" -#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# 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. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# ### END LIBTOOL CONFIG - -__EOF__ - - - case $host_os in - aix3*) - cat <<\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 -EOF - ;; - esac - - # 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) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC="$lt_save_CC" - - -# Check whether --with-tags was given. -if test "${with_tags+set}" = set; then - withval=$with_tags; tagnames="$withval" -fi - - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= -compiler_lib_search_dirs_CXX= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$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(int, char *[]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# 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 - - -# save warnings/boilerplate of simple test code -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* - -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* - - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -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++"} -compiler=$CC -compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - 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 &5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_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 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${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 - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - 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. - archive_cmds_CXX='$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 "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=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. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - - 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 - hardcode_direct_CXX=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 - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - 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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=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. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${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. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$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 - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$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... - archive_expsym_cmds_CXX='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 - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="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}" - module_expsym_cmds_CXX="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}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$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}" - archive_expsym_cmds_CXX="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 - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac - fi - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=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 - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$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) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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 - ld_shlibs_CXX=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=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 - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$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; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${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 - ld_shlibs_CXX=no - fi - ;; - esac - ;; - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${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. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='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++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -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. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux* | k*bsd*-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. - archive_cmds_CXX='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' - archive_expsym_cmds_CXX='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; echo $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # 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."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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 - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$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' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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 - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # 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=`echo $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; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # 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. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=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::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - ld_shlibs_CXX=no - fi - ;; - osf3*) - 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. - archive_cmds_CXX='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' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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=`echo $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; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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 "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - 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. - archive_cmds_CXX='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' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='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' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # 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=`echo $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; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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 "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$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' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=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?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='echo' - - # 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. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$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. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -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 \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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 \"\-L\"" - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$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. - # 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. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$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 - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -GCC_CXX="$GXX" -LD_CXX="$LD" - -cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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 - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $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 - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p 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 "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$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 "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$rm -f confest.$objext - -compiler_lib_search_dirs_CXX= -if test -n "$compiler_lib_search_path_CXX"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - -# PORTME: override above test on systems where it is broken -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. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -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 - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # 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 - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - -lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - amigaos*) - # 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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # 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 - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - 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_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # 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*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-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_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--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 - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # 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:13110: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:13114: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=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:13214: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:13218: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $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 .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - 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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -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 - 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 - 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*) - 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=`$echo "X$lib" | $Xsed -e '\''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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - 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' - 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}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - 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 - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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}${versuffix}$shared_ext ${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`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - 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' - ;; - -interix[3-9]*) - 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' - 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 - 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 Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # 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;/^$/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 - 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=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=yes - ;; - -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 - 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 - 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 - export_dynamic_flag_spec='${wl}-Blargedynsym' - 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 - 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 - 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' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - 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' - ;; - -uts4*) - version_type=linux - 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 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -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 - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != 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_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink; 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 - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -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 - - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext - -# 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. - -# 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 - - -# save warnings/boilerplate of simple test code -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* - -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* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -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 -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - -GCC_F77="$G77" -LD_F77="$LD" - -lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - amigaos*) - # 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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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 - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; - - 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_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; - - hpux*) - # 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_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; - - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # 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:14812: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:14816: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; - *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_F77=yes - fi - else - lt_cv_prog_compiler_static_works_F77=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : -else - lt_prog_compiler_static_F77= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_F77=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:14916: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:14920: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . 2>&5 - $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 .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_F77= - enable_shared_with_static_runtimes_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - old_archive_From_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - thread_safe_flag_spec_F77= - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_direct_F77=no - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - link_all_deplibs_F77=unknown - hardcode_automatic_F77=no - module_cmds_F77= - module_expsym_cmds_F77= - always_export_symbols_F77=no - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # 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'. - exclude_expsyms_F77='_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. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) - # 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_F77=yes - if test "$with_gnu_ld" = 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 - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${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 - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [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 - ld_shlibs_F77=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds_F77='$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)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$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... - archive_expsym_cmds_F77='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 - ld_shlibs_F77=no - fi - ;; - - interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${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. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$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 - link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $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 - ld_shlibs_F77=no - cat <&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. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=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 - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$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. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$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. - - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - - 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 - hardcode_direct_F77=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 - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - 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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=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. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$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. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${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. - no_undefined_flag_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' - archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$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*) - archive_cmds_F77='$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)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no - ;; - - bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # 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_F77=' ' - allow_undefined_flag_F77=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. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_F77="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}" - module_expsym_cmds_F77="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}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac - fi - ;; - - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - freebsd1*) - ld_shlibs_F77=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*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_F77='$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 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$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 - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - *) - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - link_all_deplibs_F77=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_F77=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$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' - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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 - hardcode_libdir_flag_spec_F77='-rpath $libdir' - fi - hardcode_libdir_separator_F77=: - ;; - - solaris*) - no_undefined_flag_F77=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$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' - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=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 - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_F77=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. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no - ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; - - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$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. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - *) - ld_shlibs_F77=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6; } -test "$ld_shlibs_F77" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no - else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -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 - 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 - 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*) - 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=`$echo "X$lib" | $Xsed -e '\''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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - 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' - 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}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - 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 - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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}${versuffix}$shared_ext ${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`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - 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' - ;; - -interix[3-9]*) - 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' - 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 - 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 Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # 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;/^$/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 - 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=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=yes - ;; - -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 - 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 - 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 - export_dynamic_flag_spec='${wl}-Blargedynsym' - 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 - 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 - 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' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - 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' - ;; - -uts4*) - version_type=linux - 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 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -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 - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != 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_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6; } - -if test "$hardcode_action_F77" = relink; 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 - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_F77 \ - CC_F77 \ - LD_F77 \ - lt_prog_compiler_wl_F77 \ - lt_prog_compiler_pic_F77 \ - lt_prog_compiler_static_F77 \ - lt_prog_compiler_no_builtin_flag_F77 \ - export_dynamic_flag_spec_F77 \ - thread_safe_flag_spec_F77 \ - whole_archive_flag_spec_F77 \ - enable_shared_with_static_runtimes_F77 \ - old_archive_cmds_F77 \ - old_archive_from_new_cmds_F77 \ - predep_objects_F77 \ - postdep_objects_F77 \ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ - compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ - postuninstall_cmds_F77 \ - old_archive_from_expsyms_cmds_F77 \ - allow_undefined_flag_F77 \ - no_undefined_flag_F77 \ - export_symbols_cmds_F77 \ - hardcode_libdir_flag_spec_F77 \ - hardcode_libdir_flag_spec_ld_F77 \ - hardcode_libdir_separator_F77 \ - hardcode_automatic_F77 \ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ - fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - - case $var in - old_archive_cmds_F77 | \ - old_archive_from_new_cmds_F77 | \ - archive_cmds_F77 | \ - archive_expsym_cmds_F77 | \ - module_cmds_F77 | \ - module_expsym_cmds_F77 | \ - old_archive_from_expsyms_cmds_F77 | \ - export_symbols_cmds_F77 | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_F77 - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_F77 - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_F77 - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_F77 -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_F77 - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_F77 - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_F77 - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_F77 - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_F77 - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC="$lt_save_CC" - - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -objext_GCJ=$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. - -# 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 - - -# save warnings/boilerplate of simple test code -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* - -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* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -compiler_GCJ=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -archive_cmds_need_lc_GCJ=no - -old_archive_cmds_GCJ=$old_archive_cmds - - -lt_prog_compiler_no_builtin_flag_GCJ= - -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # 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:17136: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:17140: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -else - : -fi - -fi - -lt_prog_compiler_wl_GCJ= -lt_prog_compiler_pic_GCJ= -lt_prog_compiler_static_GCJ= - -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_static_GCJ='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - - amigaos*) - # 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_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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 - - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - - 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_prog_compiler_can_build_shared_GCJ=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_GCJ=-Kconform_pic - fi - ;; - - hpux*) - # 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_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_GCJ='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - else - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # 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). - - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_GCJ='-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_prog_compiler_pic_GCJ='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static_GCJ='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; - *) - lt_prog_compiler_wl_GCJ='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl_GCJ='-Qoption ld ' - lt_prog_compiler_pic_GCJ='-PIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_GCJ='-Kconform_pic' - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no - ;; - - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_GCJ=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_GCJ"; then - -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # 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:17426: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:17430: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; - esac -else - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_can_build_shared_GCJ=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= - ;; - *) - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_GCJ=yes - fi - else - lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : -else - lt_prog_compiler_static_GCJ= -fi - - -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_GCJ=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:17530: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:17534: \$? = $ac_status" >&5 - 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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o_GCJ=yes - fi - fi - chmod u+w . 2>&5 - $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 .. - rmdir conftest - $rm conftest* - -fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - 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 - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_GCJ= - enable_shared_with_static_runtimes_GCJ=no - archive_cmds_GCJ= - archive_expsym_cmds_GCJ= - old_archive_From_new_cmds_GCJ= - old_archive_from_expsyms_cmds_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - thread_safe_flag_spec_GCJ= - hardcode_libdir_flag_spec_GCJ= - hardcode_libdir_flag_spec_ld_GCJ= - hardcode_libdir_separator_GCJ= - hardcode_direct_GCJ=no - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=unsupported - link_all_deplibs_GCJ=unknown - hardcode_automatic_GCJ=no - module_cmds_GCJ= - module_expsym_cmds_GCJ= - always_export_symbols_GCJ=no - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_GCJ= - # 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'. - exclude_expsyms_GCJ='_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. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) - # 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_GCJ=yes - if test "$with_gnu_ld" = 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 - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${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 - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [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 - ld_shlibs_GCJ=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds_GCJ='$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)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$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... - archive_expsym_cmds_GCJ='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 - ld_shlibs_GCJ=no - fi - ;; - - interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${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. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$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 - link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $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 - ld_shlibs_GCJ=no - cat <&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. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=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 - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac - - if test "$ld_shlibs_GCJ" = no; then - runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$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. - hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_GCJ=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 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_GCJ='$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. - - archive_cmds_GCJ='' - hardcode_direct_GCJ=yes - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - - 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 - hardcode_direct_GCJ=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 - hardcode_minus_L_GCJ=yes - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - 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 - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_GCJ=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. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$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. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_GCJ='${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. - no_undefined_flag_GCJ=' ${wl}-bernotok' - allow_undefined_flag_GCJ=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' - archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$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*) - archive_cmds_GCJ='$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)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no - ;; - - bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # 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_GCJ=' ' - allow_undefined_flag_GCJ=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. - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_GCJ="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}" - module_expsym_cmds_GCJ="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}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac - fi - ;; - - dgux*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - - freebsd1*) - ld_shlibs_GCJ=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*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_GCJ='$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 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$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 - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - ;; - *) - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - link_all_deplibs_GCJ=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - newsos6) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_shlibpath_var_GCJ=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_GCJ=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$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' - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_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 - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' - fi - hardcode_libdir_separator_GCJ=: - ;; - - solaris*) - no_undefined_flag_GCJ=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$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' - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_shlibpath_var_GCJ=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 - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_GCJ=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. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_GCJ='$CC -r -o $output$reload_objs' - hardcode_direct_GCJ=no - ;; - motorola) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no - ;; - - sysv4.3*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_GCJ=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$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. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - - *) - ld_shlibs_GCJ=no - ;; - esac - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -test "$ld_shlibs_GCJ" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_GCJ" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_GCJ=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_GCJ 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. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ - allow_undefined_flag_GCJ= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no - else - archive_cmds_need_lc_GCJ=yes - fi - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } - ;; - esac - fi - ;; -esac - -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -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 - 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 - 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*) - 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=`$echo "X$lib" | $Xsed -e '\''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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - 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' - 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}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - 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 - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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}${versuffix}$shared_ext ${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`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - 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' - ;; - -interix[3-9]*) - 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' - 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 - 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 Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # 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;/^$/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 - 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=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=yes - ;; - -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 - 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 - 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 - export_dynamic_flag_spec='${wl}-Blargedynsym' - 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 - 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 - 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' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - 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' - ;; - -uts4*) - version_type=linux - 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 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -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 - -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != 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_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - -if test "$hardcode_action_GCJ" = relink; 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 - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_GCJ - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_GCJ - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_GCJ - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_GCJ - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_GCJ -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_GCJ - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_GCJ -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_GCJ - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_GCJ - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_GCJ - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_GCJ - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_GCJ - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_GCJ - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_GCJ - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_GCJ - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_GCJ - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC="$lt_save_CC" - - else - tagname="" - fi - ;; - - RC) - - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$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. - -# 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 - - -# save warnings/boilerplate of simple test code -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* - -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* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -lt_cv_prog_compiler_c_o_RC=yes - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # 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 - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_RC \ - CC_RC \ - LD_RC \ - lt_prog_compiler_wl_RC \ - lt_prog_compiler_pic_RC \ - lt_prog_compiler_static_RC \ - lt_prog_compiler_no_builtin_flag_RC \ - export_dynamic_flag_spec_RC \ - thread_safe_flag_spec_RC \ - whole_archive_flag_spec_RC \ - enable_shared_with_static_runtimes_RC \ - old_archive_cmds_RC \ - old_archive_from_new_cmds_RC \ - predep_objects_RC \ - postdep_objects_RC \ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ - compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ - postuninstall_cmds_RC \ - old_archive_from_expsyms_cmds_RC \ - allow_undefined_flag_RC \ - no_undefined_flag_RC \ - export_symbols_cmds_RC \ - hardcode_libdir_flag_spec_RC \ - hardcode_libdir_flag_spec_ld_RC \ - hardcode_libdir_separator_RC \ - hardcode_automatic_RC \ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ - fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - - case $var in - old_archive_cmds_RC | \ - old_archive_from_new_cmds_RC | \ - archive_cmds_RC | \ - archive_expsym_cmds_RC | \ - module_cmds_RC | \ - module_expsym_cmds_RC | \ - old_archive_from_expsyms_cmds_RC | \ - export_symbols_cmds_RC | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_RC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_RC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_RC - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_RC -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_RC - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_RC - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_RC - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_RC - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC="$lt_save_CC" - - ;; - - *) - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi -fi - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Prevent multiple expansion - - - - - - - - - - - - - - - - - - - - - -# check for dlopen,dlsym... or shl_load, shl_findsym... -LIBADD_DL= - - -{ echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library 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_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHL_LOAD 1 -_ACEOF - -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHL_LOAD 1 -_ACEOF - - LIBADD_DL="$LIBADD_DL -ldld" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBADD_DL="-ldl" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if HAVE_DLFCN_H -# include -#endif - -int -main () -{ -dlopen(0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBADD_DL="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DLD 1 -_ACEOF - - LIBADD_DL="$LIBADD_DL -ldld" - -fi - - -fi - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi - - -fi - - -fi - - -if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then - LIBS_SAVE="$LIBS" - LIBS="$LIBS $LIBADD_DL" - -for ac_func in dlerror -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - LIBS="$LIBS_SAVE" -fi - - -# check for doxygen - -# Check whether --enable-doxygen was given. -if test "${enable_doxygen+set}" = set; then - enableval=$enable_doxygen; -fi - -# Check whether --enable-dot was given. -if test "${enable_dot+set}" = set; then - enableval=$enable_dot; -fi - -# Check whether --enable-html-docs was given. -if test "${enable_html_docs+set}" = set; then - enableval=$enable_html_docs; -else - enable_html_docs=yes -fi - -# Check whether --enable-latex-docs was given. -if test "${enable_latex_docs+set}" = set; then - enableval=$enable_latex_docs; -else - enable_latex_docs=no -fi - -if test "x$enable_doxygen" = xno; then - enable_doc=no -else - # Extract the first word of "doxygen", so it can be a program name with args. -set dummy doxygen; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_DOXYGEN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $DOXYGEN in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -DOXYGEN=$ac_cv_path_DOXYGEN -if test -n "$DOXYGEN"; then - { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 -echo "${ECHO_T}$DOXYGEN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test "x$DOXYGEN" = x; then - if test "x$enable_doxygen" = xyes; then - { { echo "$as_me:$LINENO: error: could not find doxygen" >&5 -echo "$as_me: error: could not find doxygen" >&2;} - { (exit 1); exit 1; }; } - fi - enable_doc=no - else - enable_doc=yes - # Extract the first word of "dot", so it can be a program name with args. -set dummy dot; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_DOT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $DOT in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOT="$DOT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -DOT=$ac_cv_path_DOT -if test -n "$DOT"; then - { echo "$as_me:$LINENO: result: $DOT" >&5 -echo "${ECHO_T}$DOT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi - if test x$enable_doc = xyes; then - DOC_TRUE= - DOC_FALSE='#' -else - DOC_TRUE='#' - DOC_FALSE= -fi - - -if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - { { echo "$as_me:$LINENO: error: could not find dot" >&5 -echo "$as_me: error: could not find dot" >&2;} - { (exit 1); exit 1; }; } - fi - enable_dot=no -else - enable_dot=yes -fi - - - - - - -# Check for headers -# Note that the fourth argument to AC_CHECK_HEADERS is non-empty to force -# the configure probe to try compiling "#include
". See autoconf docs. -# ---------------------------------------------------------------------------- - - -for ac_header in cmath -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/**/ - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Check for compiler characteristics -# ---------------------------------------------------------------------------- - -{ echo "$as_me:$LINENO: checking whether the compiler supports Run-Time Type Identification" >&5 -echo $ECHO_N "checking whether the compiler supports Run-Time Type Identification... $ECHO_C" >&6; } -if test "${ac_cv_cxx_rtti+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -class Base { public : - Base () {} - virtual int f () { return 0; } - }; -class Derived : public Base { public : - Derived () {} - virtual int f () { return 1; } - }; - -int -main () -{ -Derived d; -Base *ptr = &d; -return typeid (*ptr) == typeid (Derived); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_rtti=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_rtti=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_rtti" >&5 -echo "${ECHO_T}$ac_cv_cxx_rtti" >&6; } -if test "$ac_cv_cxx_rtti" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_RTTI 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking whether the compiler supports GCC C++ ABI name demangling" >&5 -echo $ECHO_N "checking whether the compiler supports GCC C++ ABI name demangling... $ECHO_C" >&6; } -if test "${ac_cv_cxx_gcc_abi_demangle+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -template -class A {}; - -int -main () -{ -A instance; -int status = 0; -char* c_name = 0; - -c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status); - -std::string name(c_name); -free(c_name); - -return name == "A"; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_gcc_abi_demangle=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_gcc_abi_demangle=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_gcc_abi_demangle" >&5 -echo "${ECHO_T}$ac_cv_cxx_gcc_abi_demangle" >&6; } -if test "$ac_cv_cxx_gcc_abi_demangle" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GCC_ABI_DEMANGLE 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking whether the compiler implements namespaces" >&5 -echo $ECHO_N "checking whether the compiler implements namespaces... $ECHO_C" >&6; } -if test "${ac_cv_cxx_namespaces+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -namespace Outer { namespace Inner { int i = 0; }} -int -main () -{ -using namespace Outer::Inner; return i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_namespaces=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_namespaces=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_namespaces" >&5 -echo "${ECHO_T}$ac_cv_cxx_namespaces" >&6; } -if test "$ac_cv_cxx_namespaces" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NAMESPACES 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking whether std::string::compare takes a string in argument 1" >&5 -echo $ECHO_N "checking whether std::string::compare takes a string in argument 1... $ECHO_C" >&6; } -if test "${ac_cv_cxx_string_compare_string_first+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -string x("hi"); string y("h"); -return x.compare(y,0,1) == 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_string_compare_string_first=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_string_compare_string_first=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_string_compare_string_first" >&5 -echo "${ECHO_T}$ac_cv_cxx_string_compare_string_first" >&6; } -if test "$ac_cv_cxx_string_compare_string_first" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define FUNC_STRING_COMPARE_STRING_FIRST 1 -_ACEOF - -fi - - - -# Check for library functions -# ---------------------------------------------------------------------------- -{ echo "$as_me:$LINENO: checking whether the compiler has stringstream" >&5 -echo $ECHO_N "checking whether the compiler has stringstream... $ECHO_C" >&6; } -if test "${ac_cv_cxx_have_sstream+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -stringstream message; message << "Hello"; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_have_sstream=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_have_sstream=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_have_sstream" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_sstream" >&6; } -if test "$ac_cv_cxx_have_sstream" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SSTREAM 1 -_ACEOF - -fi - - -{ echo "$as_me:$LINENO: checking whether the library defines class strstream" >&5 -echo $ECHO_N "checking whether the library defines class strstream... $ECHO_C" >&6; } -if test "${ac_cv_cxx_have_class_strstream+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -for ac_header in strstream -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#if HAVE_STRSTREAM -# include -#else -# include -#endif -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -ostrstream message; message << "Hello"; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_cxx_have_class_strstream=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_have_class_strstream=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_have_class_strstream" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_class_strstream" >&6; } -if test "$ac_cv_cxx_have_class_strstream" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CLASS_STRSTREAM 1 -_ACEOF - -fi - -ax_cxx_have_isfinite_save_LIBS=$LIBS - LIBS="$LIBS -lm" - - { echo "$as_me:$LINENO: checking for isfinite" >&5 -echo $ECHO_N "checking for isfinite... $ECHO_C" >&6; } -if test "${ax_cv_cxx_have_isfinite+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int f = isfinite( 3 ); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ax_cv_cxx_have_isfinite=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ax_cv_cxx_have_isfinite=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ax_cv_cxx_have_isfinite" >&5 -echo "${ECHO_T}$ax_cv_cxx_have_isfinite" >&6; } - - if test "$ax_cv_cxx_have_isfinite" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ISFINITE 1 -_ACEOF - - else - LIBS=$ax_cxx_have_isfinite_save_LIBS - fi - - -for ac_func in finite -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library 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_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -cppunit_val='CPPUNIT_HAVE_RTTI' -# Check whether --enable-typeinfo-name was given. -if test "${enable_typeinfo_name+set}" = set; then - enableval=$enable_typeinfo_name; - test x$enableval = 'xno' && cppunit_val='0' - -fi - - - -cat >>confdefs.h <<_ACEOF -#define USE_TYPEINFO_NAME $cppunit_val -_ACEOF - - - -# Doesn't work. It's supposed to add "#define CPPUNIT_NO_TESTPLUGIN" if -# --disable-test-plugin was used on the command line. -# -# -# -#AC_ARG_ENABLE(test-plugin, -#[ --disable-test-plugin disable support for test plug-ins], -#[ -# if test -n "$enable_test_plugin"; then -# enable_test_plugin=${enable_test_plugin_default-yes} -# fi -# if test "$enable_test_plugin" = no; then -#echo "test-plug in disabled" -# fi -#]) -# -#testplugin_val=1 -#AC_DEFINE_UNQUOTED(NO_TESTPLUGIN,$testplugin_val, -#[defined to disable TestPlugIn]) - - -ac_config_files="$ac_config_files Makefile cppunit.pc cppunit.spec cppunit-config src/Makefile src/DllPlugInTester/Makefile src/cppunit/Makefile include/Makefile include/cppunit/Makefile include/cppunit/config/Makefile include/cppunit/extensions/Makefile include/cppunit/plugin/Makefile include/cppunit/portability/Makefile include/cppunit/tools/Makefile include/cppunit/ui/Makefile include/cppunit/ui/mfc/Makefile include/cppunit/ui/qt/Makefile include/cppunit/ui/text/Makefile doc/Makefile doc/Doxyfile examples/Makefile examples/simple/Makefile examples/hierarchy/Makefile examples/cppunittest/Makefile examples/ClockerPlugIn/Makefile examples/DumperPlugIn/Makefile examples/money/Makefile" - -ac_config_commands="$ac_config_commands default" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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 - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "cppunit.pc") CONFIG_FILES="$CONFIG_FILES cppunit.pc" ;; - "cppunit.spec") CONFIG_FILES="$CONFIG_FILES cppunit.spec" ;; - "cppunit-config") CONFIG_FILES="$CONFIG_FILES cppunit-config" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/DllPlugInTester/Makefile") CONFIG_FILES="$CONFIG_FILES src/DllPlugInTester/Makefile" ;; - "src/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES src/cppunit/Makefile" ;; - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "include/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/Makefile" ;; - "include/cppunit/config/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/config/Makefile" ;; - "include/cppunit/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/extensions/Makefile" ;; - "include/cppunit/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/plugin/Makefile" ;; - "include/cppunit/portability/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/portability/Makefile" ;; - "include/cppunit/tools/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/tools/Makefile" ;; - "include/cppunit/ui/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/ui/Makefile" ;; - "include/cppunit/ui/mfc/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/ui/mfc/Makefile" ;; - "include/cppunit/ui/qt/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/ui/qt/Makefile" ;; - "include/cppunit/ui/text/Makefile") CONFIG_FILES="$CONFIG_FILES include/cppunit/ui/text/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/simple/Makefile" ;; - "examples/hierarchy/Makefile") CONFIG_FILES="$CONFIG_FILES examples/hierarchy/Makefile" ;; - "examples/cppunittest/Makefile") CONFIG_FILES="$CONFIG_FILES examples/cppunittest/Makefile" ;; - "examples/ClockerPlugIn/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ClockerPlugIn/Makefile" ;; - "examples/DumperPlugIn/Makefile") CONFIG_FILES="$CONFIG_FILES examples/DumperPlugIn/Makefile" ;; - "examples/money/Makefile") CONFIG_FILES="$CONFIG_FILES examples/money/Makefile" ;; - "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -CPPUNIT_MAJOR_VERSION!$CPPUNIT_MAJOR_VERSION$ac_delim -CPPUNIT_MINOR_VERSION!$CPPUNIT_MINOR_VERSION$ac_delim -CPPUNIT_MICRO_VERSION!$CPPUNIT_MICRO_VERSION$ac_delim -CPPUNIT_INTERFACE_AGE!$CPPUNIT_INTERFACE_AGE$ac_delim -CPPUNIT_BINARY_AGE!$CPPUNIT_BINARY_AGE$ac_delim -CPPUNIT_VERSION!$CPPUNIT_VERSION$ac_delim -LT_RELEASE!$LT_RELEASE$ac_delim -LT_CURRENT!$LT_CURRENT$ac_delim -LT_REVISION!$LT_REVISION$ac_delim -LT_AGE!$LT_AGE$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LN_S!$LN_S$ac_delim -ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -DLLTOOL!$DLLTOOL$ac_delim -AS!$AS$ac_delim -OBJDUMP!$OBJDUMP$ac_delim -CPP!$CPP$ac_delim -CXXCPP!$CXXCPP$ac_delim -F77!$F77$ac_delim -FFLAGS!$FFLAGS$ac_delim -ac_ct_F77!$ac_ct_F77$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -LIBADD_DL!$LIBADD_DL$ac_delim -DOXYGEN!$DOXYGEN$ac_delim -DOT!$DOT$ac_delim -DOC_TRUE!$DOC_TRUE$ac_delim -DOC_FALSE!$DOC_FALSE$ac_delim -enable_dot!$enable_dot$ac_delim -enable_html_docs!$enable_html_docs$ac_delim -enable_latex_docs!$enable_latex_docs$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - :H) - # - # CONFIG_HEADER - # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f $ac_file - mv "$tmp/config.h" $ac_file - fi - else - echo "/* $configure_input */" - cat "$ac_result" - fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_arg=$ac_file -_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" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - 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"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - "default":C) chmod a+x cppunit-config ;; - - esac -done # for ac_tag - - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - -ac_prefix_conf_OUT=`echo include/cppunit/config-auto.h` -ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e 'y:abcdefghijklmnopqrstuvwxyz./,-:ABCDEFGHIJKLMNOPQRSTUVWXYZ____:'` -ac_prefix_conf_PKG=`echo $PACKAGE` -ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` -ac_prefix_conf_UPP=`echo $ac_prefix_conf_PKG | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e '/^[0-9]/s/^/_/'` -ac_prefix_conf_INP=`echo config/config.h` -if test "$ac_prefix_conf_INP" = "_"; then - case $ac_prefix_conf_OUT in - */*) ac_prefix_conf_INP=`basename $ac_prefix_conf_OUT` - ;; - *-*) ac_prefix_conf_INP=`echo $ac_prefix_conf_OUT | sed -e 's/[a-zA-Z0-9_]*-//'` - ;; - *) ac_prefix_conf_INP=config.h - ;; - esac -fi -if test -z "$ac_prefix_conf_PKG" ; then - { { echo "$as_me:$LINENO: error: no prefix for _PREFIX_PKG_CONFIG_H" >&5 -echo "$as_me: error: no prefix for _PREFIX_PKG_CONFIG_H" >&2;} - { (exit 1); exit 1; }; } -else - { echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5 -echo "${ECHO_T}creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; } - if test -f $ac_prefix_conf_INP ; then - $as_dirname -- /* automatically generated */ || -$as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X/* automatically generated */ : 'X\(//\)[^/]' \| \ - X/* automatically generated */ : 'X\(//\)$' \| \ - X/* automatically generated */ : 'X\(/\)' \| . 2>/dev/null || -echo X/* automatically generated */ | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT - echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT - - echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed - echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed - echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed - echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed - echo '#endif/' >>conftest.sed - sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT - echo ' ' >>$ac_prefix_conf_OUT - echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT - echo '#endif' >>$ac_prefix_conf_OUT - else - { { echo "$as_me:$LINENO: error: input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" >&5 -echo "$as_me: error: input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" >&2;} - { (exit 1); exit 1; }; } - fi - rm -f conftest.* -fi diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/configure.in b/src/3rd_party/cppunit/cppunit-1.12.1/configure.in deleted file mode 100644 index ed1880cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/configure.in +++ /dev/null @@ -1,155 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(Makefile.am) - -# autoconf 2.50 or higher to rebuild aclocal.m4, because the -# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. -AC_PREREQ(2.50) - -# Making releases: -# CPPUNIT_MICRO_VERSION += 1; -# CPPUNIT_INTERFACE_AGE += 1; -# CPPUNIT_BINARY_AGE += 1; -# if any functions have been added, set CPPUNIT_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set CPPUNIT_BINARY_AGE and CPPUNIT_INTERFACE_AGE to 0. -# -CPPUNIT_MAJOR_VERSION=1 -CPPUNIT_MINOR_VERSION=12 -CPPUNIT_MICRO_VERSION=1 -CPPUNIT_INTERFACE_AGE=0 -CPPUNIT_BINARY_AGE=0 -CPPUNIT_VERSION=$CPPUNIT_MAJOR_VERSION.$CPPUNIT_MINOR_VERSION.$CPPUNIT_MICRO_VERSION -AC_SUBST(CPPUNIT_MAJOR_VERSION) -AC_SUBST(CPPUNIT_MINOR_VERSION) -AC_SUBST(CPPUNIT_MICRO_VERSION) -AC_SUBST(CPPUNIT_INTERFACE_AGE) -AC_SUBST(CPPUNIT_BINARY_AGE) -AC_SUBST(CPPUNIT_VERSION) - -# libtool versioning -LT_RELEASE=$CPPUNIT_MAJOR_VERSION.$CPPUNIT_MINOR_VERSION -LT_CURRENT=`expr $CPPUNIT_MICRO_VERSION - $CPPUNIT_INTERFACE_AGE` -LT_REVISION=$CPPUNIT_INTERFACE_AGE -LT_AGE=`expr $CPPUNIT_BINARY_AGE - $CPPUNIT_INTERFACE_AGE` -AC_SUBST(LT_RELEASE) -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) - -AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER(config/config.h) -AM_INIT_AUTOMAKE(cppunit, $CPPUNIT_VERSION) - -# General "with" options -# ---------------------------------------------------------------------------- - -dnl Checks for programs. - -AC_PROG_MAKE_SET -AC_PROG_INSTALL - -# The libtool macro AC_PROG_LIBTOOL checks for the C preprocessor. -# Configure gets confused if we try to check for a C preprocessor -# without first checking for the C compiler -# (see http://sources.redhat.com/ml/autoconf/2001-07/msg00036.html), -# so we invoke AC_PROG_CC explicitly. -AC_PROG_CC -AC_PROG_CXX -AC_LANG(C++) - -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -# check for dlopen,dlsym... or shl_load, shl_findsym... -AC_LTDL_DLLIB - -# check for doxygen -BB_ENABLE_DOXYGEN - - -# Check for headers -# Note that the fourth argument to AC_CHECK_HEADERS is non-empty to force -# the configure probe to try compiling "#include
". See autoconf docs. -# ---------------------------------------------------------------------------- - -AC_CHECK_HEADERS(cmath,[],[],[/**/]) - -# Check for compiler characteristics -# ---------------------------------------------------------------------------- - -AC_CXX_RTTI -AX_CXX_GCC_ABI_DEMANGLE -AC_CXX_STRING_COMPARE_STRING_FIRST - - -# Check for library functions -# ---------------------------------------------------------------------------- -AC_CXX_HAVE_SSTREAM -AC_CXX_HAVE_STRSTREAM -AX_CXX_HAVE_ISFINITE -AC_CHECK_FUNCS(finite) - -cppunit_val='CPPUNIT_HAVE_RTTI' -AC_ARG_ENABLE(typeinfo-name, -[ --disable-typeinfo-name disable use of RTTI for class names], -[ - test x$enableval = 'xno' && cppunit_val='0' -]) - -AC_DEFINE_UNQUOTED(USE_TYPEINFO_NAME,$cppunit_val, -[Define to 1 to use type_info::name() for class names]) - - -# Doesn't work. It's supposed to add "#define CPPUNIT_NO_TESTPLUGIN" if -# --disable-test-plugin was used on the command line. -# -# -# -#AC_ARG_ENABLE(test-plugin, -#[ --disable-test-plugin disable support for test plug-ins], -#[ -# if test -n "$enable_test_plugin"; then -# enable_test_plugin=${enable_test_plugin_default-yes} -# fi -# if test "$enable_test_plugin" = no; then -#echo "test-plug in disabled" -# fi -#]) -# -#testplugin_val=1 -#AC_DEFINE_UNQUOTED(NO_TESTPLUGIN,$testplugin_val, -#[defined to disable TestPlugIn]) - - -AC_OUTPUT([ - Makefile - cppunit.pc - cppunit.spec - cppunit-config - src/Makefile - src/DllPlugInTester/Makefile - src/cppunit/Makefile - include/Makefile - include/cppunit/Makefile - include/cppunit/config/Makefile - include/cppunit/extensions/Makefile - include/cppunit/plugin/Makefile - include/cppunit/portability/Makefile - include/cppunit/tools/Makefile - include/cppunit/ui/Makefile - include/cppunit/ui/mfc/Makefile - include/cppunit/ui/qt/Makefile - include/cppunit/ui/text/Makefile - doc/Makefile - doc/Doxyfile - examples/Makefile - examples/simple/Makefile - examples/hierarchy/Makefile - examples/cppunittest/Makefile - examples/ClockerPlugIn/Makefile - examples/DumperPlugIn/Makefile - examples/money/Makefile -],[chmod a+x cppunit-config]) - -AC_CREATE_PREFIX_CONFIG_H([include/cppunit/config-auto.h], - $PACKAGE, [config/config.h]) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/bc5/bcc-makefile.zip b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/bc5/bcc-makefile.zip deleted file mode 100644 index 8be8d7bb..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/bc5/bcc-makefile.zip and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/AddingUnitTestMethod.dsm b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/AddingUnitTestMethod.dsm deleted file mode 100644 index 51f0dcba..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/AddingUnitTestMethod.dsm +++ /dev/null @@ -1,170 +0,0 @@ -'Made by bloodchen -'bloodchen@hotmail.com -Sub NewTestClass -On Error Resume Next -dim proj_path,ext,pos,proj_dir,MyCppFile,MyCppName,MyHFile,MyHName,ClassName,HText,CPPText -proj_path = ActiveProject.fullname -ext = "" -pos = len (proj_path) -Do While ext <> "\" -ext = Mid(proj_path, pos, 1) -pos = pos -1 -Loop -proj_dir = left(proj_path, pos+1) -ClassName=InputBox("Enter the class name:", "Class Name") -if ActiveProject.Type <> "Build" then -MsgBox "This project is not valid. Ending macro." -Exit Sub -end if -if (len(ClassName) <= 0) then -MsgBox "Invalid class name. Ending macro." -Exit Sub -end if - -' ClassName="CTest" -MyCppName=proj_dir+ClassName+".cpp" -MyHName=proj_dir+ClassName+".h" -ActiveProject.AddFile MyCppName -ActiveProject.AddFile MyHName -Documents.Add "Text" -ActiveDocument.Selection.StartOfDocument - -HText= "#ifndef "+ClassName+"DEF"+VbCrLf& _ -"#define "+ClassName+"DEF"+VbCrLf& _ -""+VbCrLf& _ -"#include "+VbCrLf& _ -"#include "+VbCrLf& _ -"class "+ClassName+":public CppUnit::TestCase"+VbCrLf& _ -"{"+VbCrLf& _ -" CPPUNIT_TEST_SUITE( "+ClassName+" );"+VbCrLf& _ -" CPPUNIT_TEST_SUITE_END();"+VbCrLf& _ -"public:"+VbCrLf& _ -" "+ClassName+"();"+VbCrLf& _ -" virtual ~"+ClassName+"();"+VbCrLf& _ -"};"+VbCrLf& _ -"#endif"+VbCrLf -ActiveDocument.Selection = HText -ActiveDocument.Save MyHName -' WriteFile MyHName,HText -Documents.Add "Text" -ActiveDocument.Selection.StartOfDocument -CPPText = "#include "+chr(34)+"stdafx.h"+chr(34)+VbCrLf& _ -"#include "+chr(34)+ClassName+".h"+chr(34)+VbCrLf& _ -""+VbCrLf& _ -""+VbCrLf& _ -"CPPUNIT_TEST_SUITE_REGISTRATION( "+ClassName+ " );"+VbCrLf& _ -""+VbCrLf& _ -""+VbCrLf& _ -ClassName+"::"+ClassName+"()"+VbCrLf& _ -"{"+VbCrLf& _ -"}"+VbCrLf& _ -""+VbCrLf& _ -""+VbCrLf& _ -ClassName+"::~"+ClassName+"()"+VbCrLf& _ -"{"+VbCrLf& _ -"}" -' WriteFile MyCppName,CPPText -ActiveDocument.Selection = CPPText -ActiveDocument.Save MyCppName - -End Sub - - -Sub ToggleHandCPP() -'DESCRIPTION: Opens the .cpp or .h file for the current document. -'Toggles between the .cpp & .h file -ext = ActiveDocument.FullName -If ext = "" Then -msgbox ("Error, not a .cpp or .h file") -exit sub -End If -DocName = UCase(ext) - -If Right(DocName,4) = ".CPP" Then -fn = left(DocName, Len(DocName)-3) & "h" -ElseIf Right(DocName,2) = ".H" Then -fn = Left(DocName, Len(DocName)-1) & "cpp" -Else -msgbox ("Error, not a .cpp or a .h file") -exit sub -End If -'msgbox (fn) -on error resume next -Documents.Open (fn) -End Sub - -Sub ADDTestMethod() -strHpt = ActiveDocument.FullName -if right(strHpt,3) = "CPP" Or right (strHpt,3) = "cpp" Then -ActiveDocument.Selection.SelectLine -strText = ActiveDocument.Selection.Text -if (Instr(strText, "::" ) = 0) Then -MsgBox("Line not valid !!") -Exit Sub -End If -else exit sub -end if - -pos = Instr(strText, "::") -strName = Right(strText, (Len(strText) - (pos+1))) -pos = Instr(strName,"(") -strName = Left(strName,pos-1) -strClass = Left(strText,pos - 1) -while (instr(strClass, " ") > 0) -pos = instr(strClass, " ") -strTyp = strTyp & Left(strClass, pos) -strClass = Right(strClass, Len(strClass) - (pos) ) -wend -ToggleHandCPP - -ActiveDocument.Selection.SelectAll -strHead = ActiveDocument.Selection.Text - -if (instr(strHead,strClass) = 0) Then -MsgBox(" Can't find class " & strClass & " !!") -ToggleHandCPP -Exit Sub -End If -ActiveDocument.Selection.EndOfDocument -lineBottom = ActiveDocument.Selection.CurrentLine - -ActiveDocument.Selection.StartOfDocument -ActiveDocument.Selection.StartOfLine -ActiveDocument.Selection.SelectLine -strLine = ActiveDocument.Selection.Text -while (instr(strLine, strName) = 0 And ActiveDocument.Selection.CurrentLine <> lineBottom) -ActiveDocument.Selection.StartOfLine -ActiveDocument.Selection.LineDown dsMove -ActiveDocument.Selection.SelectLine -strLine = ActiveDocument.Selection.Text -Wend -if (ActiveDocument.Selection.CurrentLine < lineBottom) Then -if( instr(strLine, "CPPUNIT_TEST" ) <> 0 )Then -ToggleHandCPP -Exit Sub -end if -End If - -ActiveDocument.Selection.StartOfDocument -ActiveDocument.Selection.StartOfLine -ActiveDocument.Selection.SelectLine -strLine = ActiveDocument.Selection.Text -while (instr(strLine, " CPPUNIT_TEST_SUITE_END();" ) = 0 And ActiveDocument.Selection.CurrentLine <> lineBottom) -ActiveDocument.Selection.StartOfLine -ActiveDocument.Selection.LineDown dsMove -ActiveDocument.Selection.SelectLine -strLine = ActiveDocument.Selection.Text -Wend -if (ActiveDocument.Selection.CurrentLine < lineBottom) Then -ActiveDocument.Selection.EndOfLine -ActiveDocument.Selection.LineUp -ActiveDocument.Selection.EndOfLine -ActiveDocument.Selection.NewLine -ActiveDocument.Selection = "CPPUNIT_TEST( "&strName&" );" -else -MsgBox("CPPUNIT_TEST_SUITE_END not found") -end if -ToggleHandCPP - -End Sub - \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/CppUnit.WWTpl b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/CppUnit.WWTpl deleted file mode 100644 index 174a64b5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/CppUnit.WWTpl +++ /dev/null @@ -1,486 +0,0 @@ -Baptiste Lepilleur's template file. -(@)Copyright 2001, Baptiste Lepilleur . - - - -[-ExtractPath] -!!Memo -Extract the path from a full filename. -path is the filename we need to extract the path from. -returns: extracted path. -Algo: we iterates the filename from the end until we found a character '\'. -!!End - -!!Params -path @@(ProjectPath)@@ -!!End - -!!Code -Input path: "@@path@@" -!!Set index @@(Strlen @@path@@)@@ -!!// -!!Set finalpath -!!Label LoopExtractPath -!!Sub index 1 -!!If @@index@@ < 0 -!!Goto EndExtractPath -!!Endif -!!// -!!Set lastchar @@(StrSub @@path@@ @@index@@ 1)@@ -!!If @@lastchar@@ != "\" -!!Goto LoopExtractPath -!!Endif -!!// -!!Add index 1 -!!Set finalpath @@(StrSub @@path@@ 0 @@index@@)@@ -!!// -!!Label EndExtractPath -!!Return @@finalpath@@ -!!End - - - ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- -[+01 Create Class in file] -!!Memo -Creates a new class in new files (.h/.cpp) and adds them to the project. -!!End - -!!Params -classname Ttr -parentclassname = -classdesc This class represents -objectkind Reference Object -hasserialize 0 -isrefobj 0 -inlinectordtor 0 -createfile 1 -isunittest 0 -!!End - -!!Dialog - -Class name:
-Brief description:
-Object Kind: -
- -Parent class name:
- - - Create a new file ? (otherwise Insert in current file).
-
- - Has: virtual void Serialize( CArchive &ar )
- - Is a reference counted object (inherit ERefObj)
- - Inline ctor/dtor, copy ctor/operator.
- - Is a CppUnit unit test.
- - - - - - - -!!End - -!!Code -!!// Set variable that indicates the kind of object we are working on. -!!Set defvalobject 0 -!!If @@objectkind@@ == "Default Value Object" -!!Set defvalobject 1 -!!Endif -!!// -!!Set valobject 0 -!!If @@objectkind@@ == "Explicit Value Object" -!!Set valobject 1 -!!Endif -!!// -!!Set refobject 0 -!!If @@objectkind@@ == "Reference Object" -!!Set refobject 1 -!!Endif -!!// -!!// Set class filename (relative to dsp) -!!Set headerfn @@classname@@.h -!!Set implfn @@classname@@.cpp -!!Set headerdefine @@(String @@(Call -MakeHeaderDefined fn @@headerfn@@)@@:U)@@ -!!// -!!// hasparentclass indicates if a parent class has been defined. -!!Set hasparentclass 0 -!!If @@parentclassname@@ != = -!!Set hasparentclass 1 -!!Else -!!If @@isunittest@@ -!!Set parentclassname CppUnit::TestFixture -!!Set hasparentclass 1 -!!Endif -!!Endif -!!// -!!// hasparent is set to 1 if the class has some parent (ERefObj or parentclass). -!!Set hasparent @@hasparentclass@@ -!!If @@isrefobj@@ -!!Set hasparent 1 -!!Endif -!!// -!!// -!!// All variables are set, we can now generates the class. -!!// -!!// -!!// -!!// -!!// ---------------------------------------------------------------------------- -!!// ------------------------------ header file --------------------------------- -!!// ---------------------------------------------------------------------------- -!!// -!!// -!!// -!!If @@createfile@@ -!!FileNew @@headerfn@@ dsp -!!Set headerpath @@(FilePath)@@ -// ////////////////////////////////////////////////////////////////////////// -// Header file @@headerfn@@ for class @@classname@@ -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: @@(Date "yyyy/MM/dd")@@ -// ////////////////////////////////////////////////////////////////////////// -#ifndef @@headerdefine@@ -#define @@headerdefine@@ -!!Else -// ////////////////////////////////////////////////////////////////////////// -// ////////////////////////////////////////////////////////////////////////// -// Definition of class @@classname@@ -// ////////////////////////////////////////////////////////////////////////// -// ////////////////////////////////////////////////////////////////////////// -!!Endif -!!If @@hasparentclass@@ - -!!If @@isunittest@@ -#include -!!Else -#include "@@parentclassname@@.h" -!!Endif -!!Endif - - -!!If @@isrefobj@@ -/*! Declare @@classname@@Ref as a reference pointer on @@classname@@. - */ -EDECL_REF( @@classname@@ ); - - - -!!Endif -/*! \class @@classname@@ - * \brief @@classdesc@@ - */ -class @@classname@@@@\ -!!// Write inherited class list (parent class first, then ERefObj if inherited). -!!If @@hasparent@@ - : @@\ -!!// xpos contains the indentation level for inheritance declarations... -!!GetPos xpos ypos -!!Sub xpos 1 -public @@\ -!!Else - -!!Endif -!!If @@hasparentclass@@ -@@parentclassname@@@@\ -!!If @@isrefobj@@ -, -@@(Call -MakeFiller filler " " count @@xpos@@)@@@@\ -public @@\ -!!Else - -!!Endif -!!Endif -!!If @@isrefobj@@ -ERefObj -!!Endif -{ -!!// -!!// -!!// ------------ Done with inheritance, declare the class body... ---------- -!!// -!!// -!!If @@isunittest@@ - CPPUNIT_TEST_SUITE( @@classname@@ ); - CPPUNIT_TEST( putTestMethodNameHere ); - CPPUNIT_TEST_SUITE_END(); - -!!Endif -public: -!!If !@@defvalobject@@ - /*! Constructs a @@classname@@ object. - */ - @@classname@@(); - -!!Endif -!!If @@valobject@@ - /*! Copy constructor. - * @param copy Object to copy. - */ - @@classname@@( const @@classname@@ © ); - -!!Endif - /// Destructor. - virtual ~@@classname@@(); -!!If @@valobject@@ - - /*! Copy operator. - * @param copy Object to copy. - * @return Reference on this object. - */ - @@classname@@ &operator =( const @@classname@@ © ); -!!Endif -!!If @@isunittest@@ - - void setUp(); - void tearDown(); -!!Endif -!!// Private for methods -!!If @@refobject@@ - -private: - /// Prevents the use of the copy constructor. - @@classname@@( const @@classname@@ © ); - - /// Prevents the use of the copy operator. - void operator =( const @@classname@@ © ); -!!Endif -!!// Private for member datas - -private: -}; - - - -!!If @@createfile@@ -// Inlines methods for @@classname@@:@@\ -!!GetPos xpos ypos -!!Sub xpos 4 - -// @@(Call -MakeFiller filler - count @@xpos@@)@@ -!!Endif //@@createfile@@ -!!If @@inlinectordtor@@ -!!If !@@defvalobject@@ - - -inline -@@classname@@::@@classname@@()@@\ -!!If @@hasparentclass@@ - : - @@parentclassname@@() -!!Else - -!!Endif -{ -} -!!Endif //!@@defvalobject@@ -!!If @@valobject@@ - - -inline -@@classname@@::@@classname@@( const @@classname@@ © )@@\ -!!If @@hasparentclass@@ - : - @@parentclassname@@( copy ) -!!Else - -!!Endif -!!Endif //@@valobject@@ - - -inline -@@classname@@::~@@classname@@() -{ -} -!!If @@valobject@@ - - -inline @@classname@@ & -@@classname@@::operator =( const @@classname@@ © ) -{ - - return *this; -} -!!Endif //@@valobject@@ -!!Endif //@@inlinectordtor@@ - - -!!If @@createfile@@ - -#endif // @@headerdefine@@ -!!FileSave -!!ProjectFileAdd -!!Endif -!!// -!!// -!!// -!!// ---------------------------------------------------------------------------- -!!// -------------------------- Implementation file ----------------------------- -!!// ---------------------------------------------------------------------------- -!!// -!!// -!!// -!!If @@createfile@@ -!!FileNew @@implfn@@ dsp -// ////////////////////////////////////////////////////////////////////////// -// Implementation file @@implfn@@ for class @@classname@@ -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: @@(Date "yyyy/MM/dd")@@ -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "@@headerfn@@" -!!Else - - -// ////////////////////////////////////////////////////////////////////////// -// Implementation of class @@classname@@ -// ////////////////////////////////////////////////////////////////////////// -!!Endif -!!If @@isunittest@@ - -CPPUNIT_TEST_SUITE_REGISTRATION( @@classname@@ ); -!!Endif -!!If !@@inlinectordtor@@ -!!If !@@defvalobject@@ - - -@@classname@@::@@classname@@()@@\ -!!If @@hasparentclass@@ - : - @@parentclassname@@() -!!Else - -!!Endif -{ -} -!!Endif -!!If @@valobject@@ - - -@@classname@@::@@classname@@( const @@classname@@ © )@@\ -!!If @@hasparentclass@@ - : - @@parentclassname@@( copy ) -!!Else - -!!Endif -{ -} -!!Endif - - -@@classname@@::~@@classname@@() -{ -} -!!If @@valobject@@ - - -@@classname@@ & -@@classname@@::operator =( const @@classname@@ © ) -{ - - return *this; -} -!!Endif -!!Endif -!!If @@isunittest@@ - - -void -@@classname@@::setUp() -{ -} - - -void -@@classname@@::tearDown() -{ -} -!!Endif - -!!If @@createfile@@ -!!FileSave -!!ProjectFileAdd -!!//ExecuteCommand FileOpen "@@headerpath@@" -!!Endif -!!End - ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- -[-Dummy] -!!Code -!!End - ---------------------------------------------------------------------------------- ------------------------- [-MakeHeaderDefined] ------------------------------- ---------------------------------------------------------------------------------- -[-MakeHeaderDefined] -!!Memo -This template replace all occurences of '.' in the specified filename "fn" by '_'. -This is typically used to make the #ifndef at the beginning of header files. -Parameters: "fn" filename in which each occurence of '.' is replaced by '_'. -Returns: Transformed filename. -!!End - -!!Params -fn TestDoIt -!!End - -!!Code -!!Set result @@fn@@ -!!Label LoopMakeHeaderDefined -!!Set fn @@result@@ -!!// Check if there is any occurence left of '.' -!!Set index @@(StrFind @@fn@@ ".")@@ -!!If @@index@@ < 0 -!!Goto EndMakeHeaderDefined -!!Endif -!!// Replace occurences of '.' in fb by '_' and set to result. -!!Set result @@(StrSub @@fn@@ 0 @@index@@ )@@_ -!!Add index 1 -!!Set result @@result@@@@(StrSub @@fn@@ @@index@@)@@ -!!Goto LoopMakeHeaderDefined -!!Label EndMakeHeaderDefined -!!Return @@result@@ -!!End - ---------------------------------------------------------------------------------- ----------------------------- [-MakeFiller] ---------------------------------- ---------------------------------------------------------------------------------- -[-MakeFiller] -!!Memo -Make a string that contains "count" occurrence of "filler". -Parameters: "filler" String that is repeated. - "count" Number of times the "filler" is repeated. -Returns: A string that contains "count" times the string "filler". -!!End - -!!Params -filler - -count 10 -!!End - -!!Code -!!Set result -!!Label LoopMakerFiller -!!If @@count@@ > 0 -!!Set result @@result@@@@filler@@ -!!Sub count 1 -!!Goto LoopMakerFiller -!!Endif -!!Return @@result@@ -!!End \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/readme.txt b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/readme.txt deleted file mode 100644 index b2ac1b48..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/msvc/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -What's in those files: - - * CppUnit.WWTpl: a template Workspace Whiz! which create a new class -and add the new files to the project. You can specify that the class is a -CppUnit testcase and all the macro will be defined to register the test case -and declare the test suite. Workspace Whiz! is an add-ins for VC++. It can -be found at: http://www.workspacewhiz.com/. - - * AddingUnitTestMethod.dsm: a set of VC++ macro to add unit test -using helper macros. \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/report.xsl b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/report.xsl deleted file mode 100644 index b394cdbe..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/report.xsl +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - -Test Report - - - -

Test Report

- - - - - - -

FailedTests

- - - - - - - - - - - -
idNameFailureTypeLocationMessage
- - - No failed test. - - - - - - - - - - -
- - - - - - line # in - - - - -

SuccessfulTests

- - - - - - - - -
idName
- - - No sucessful test. - - - - - - - - - - - - -

Statistics

- - - - - - - - - - - - - - - - - - - - - - - - - - -
StatusNumber
Tests
FailuresTotal
Errors
Failures
- - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/tests.xml b/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/tests.xml deleted file mode 100644 index 6fef14eb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/contrib/xml-xsl/tests.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - ExampleTestCase.example - Assertion - - exampletestcase.cpp - 7 - - - Expected : { 0; 7; 8; 9; 10; 11; 1; 2; 3; 4; 5; 6; 12; 13; 14; 15; 16; 17; 18; 19 } -- Actual : { 0; 1; 2; 3; 4; 5; 7; 8; 9; 10; 11; 6; 12; 13; 14; 15; 16; 17; 18; 19 } -- Difference at index 1 -->Expected : { 7; 8; 9; 10; 11; 1; 2; 3; 4; 5; 6; 12; 13; 14; 15; 16; 17; 18; 19 } -->Actual : { 1; 2; 3; 4; 5; 7; 8; 9; 10; 11; 6; 12; 13; 14; 15; 16; 17; 18; 19 } - - - ExampleTestCase.anotherExample - Assertion - - exampletestcase.cpp - 15 - - 1 == 2 - - - ExampleTestCase.testAdd - Assertion - - exampletestcase.cpp - 27 - - result == 6.0 - - - ExampleTestCase.testDivideByZero - Error - caught unknown exception - - - ExampleTestCase.testEquals - Assertion - - exampletestcase.cpp - 48 - - Expected: 12, but was: 13. - - - - - 5 - 5 - 1 - 4 - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.1 b/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.1 deleted file mode 100644 index baa8b584..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.1 +++ /dev/null @@ -1,67 +0,0 @@ -.TH cppunit 1 "September 2001" -.SH NAME -cppunit-config - script to get information about the installed version of cppunit -.SH SYNOPSIS -.B cppunit-config -[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] -.SH DESCRIPTION -.PP -\fIcppunit-config\fP is a tool that is used to configure to determine -the compiler and linker flags that should be used to compile and link -programs that use \fIcppunit\fP. It is also used internally to the .m4 -macros for GNU autoconf that are included with \fIcppunit\fP. -. -.SH OPTIONS -.l -\fIcppunit-config\fP accepts the following options: -.TP 8 -.B \-\-version -Print the currently installed version of \fIcppunit\fP on the standard -output. -.TP 8 -.B \-\-libs -Print the linker flags that are necessary to link a \fIcppunit\fP -program. -.TP 8 -.B \-\-cflags -Print the compiler flags that are necessary to compile a \fIcppunit\fP -program. -.TP 8 -.B \-\-prefix -Print the prefix with which \fIcppunit\fP was compiled. -.TP 8 -.B \-\-prefix=PREFIX -If specified, use PREFIX instead of the installation prefix that -\fIcppunit\fP was built with when computing the output for the -\-\-cflags and \-\-libs options. This option is also used for the exec -prefix if \-\-exec\-prefix was not specified. This option must be -specified before any \-\-libs or \-\-cflags options. -.TP 8 -.B \-\-exec\-prefix -Print the exec\-prefix with which \fIcppunit\fP was compiled. -.TP 8 -.B \-\-exec\-prefix=PREFIX -If specified, use PREFIX instead of the installation exec prefix that -\fIcppunit\fP was built with when computing the output for the -\-\-cflags and \-\-libs options. This option must be specified before -any \-\-libs or \-\-cflags options. -.SH COPYRIGHT -cppunit Copyright \(co 1996-2000 by Michael Feathers -.PP -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. -.PP -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. -.PP -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -.SH AUTHOR -This manpage is an almost word-for-word copy of the gtk-config -manpage, written by Owen Taylor. It was modified by E. Sommerlade -. diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.in b/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.in deleted file mode 100644 index 51e8b581..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit-config.in +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no -includedir=@includedir@ - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @CPPUNIT_VERSION@ - ;; - --help) - usage 0 - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_cflags" = "yes"; then - if test "$includedir" != "/usr/include" ; then - echo -I$includedir - fi -fi - -if test "$echo_libs" = "yes"; then - if test @libdir@ != /usr/lib ; then - my_linker_flags="-L@libdir@" - fi - echo ${my_linker_flags} -lcppunit @LIBADD_DL@ -fi - - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.m4 b/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.m4 deleted file mode 100644 index 41f067b6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.m4 +++ /dev/null @@ -1,92 +0,0 @@ -dnl -dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl -AC_DEFUN([AM_PATH_CPPUNIT], -[ - -AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)], - cppunit_config_prefix="$withval", cppunit_config_prefix="") -AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)], - cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="") - - if test x$cppunit_config_exec_prefix != x ; then - cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config - fi - fi - if test x$cppunit_config_prefix != x ; then - cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config - fi - fi - - AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) - cppunit_version_min=$1 - - AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min) - no_cppunit="" - if test "$CPPUNIT_CONFIG" = "no" ; then - AC_MSG_RESULT(no) - no_cppunit=yes - else - CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` - CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` - cppunit_version=`$CPPUNIT_CONFIG --version` - - cppunit_major_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - cppunit_minor_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - cppunit_micro_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - cppunit_major_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - if test "x${cppunit_major_min}" = "x" ; then - cppunit_major_min=0 - fi - - cppunit_minor_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - if test "x${cppunit_minor_min}" = "x" ; then - cppunit_minor_min=0 - fi - - cppunit_micro_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x${cppunit_micro_min}" = "x" ; then - cppunit_micro_min=0 - fi - - cppunit_version_proper=`expr \ - $cppunit_major_version \> $cppunit_major_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \> $cppunit_minor_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \= $cppunit_minor_min \& \ - $cppunit_micro_version \>= $cppunit_micro_min ` - - if test "$cppunit_version_proper" = "1" ; then - AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) - else - AC_MSG_RESULT(no) - no_cppunit=yes - fi - fi - - if test "x$no_cppunit" = x ; then - ifelse([$2], , :, [$2]) - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) -]) - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.pc.in b/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.pc.in deleted file mode 100644 index 79c3a7f5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: CppUnit -Description: The C++ Unit Test Library -Version: @CPPUNIT_VERSION@ -Libs: -L${libdir} -lcppunit -Libs.private: @LIBADD_DL@ -Cflags: -I${includedir} \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.spec.in b/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.spec.in deleted file mode 100644 index 39507dc3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/cppunit.spec.in +++ /dev/null @@ -1,65 +0,0 @@ -Name: cppunit -Version: @VERSION@ -Release: 2 - -Summary: C++ Port of JUnit Testing Framework -License: LGPL -Group: Development/Libraries -Url: http://cppunit.sourceforge.net/ -Source: ftp://download.sourceforge.net/pub/sourceforge/cppunit/cppunit-%version.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%description -CppUnit is the C++ port of the famous JUnit framework for unit testing. -Test output is in XML for automatic testing and GUI based for supervised tests. - -%package doc -Summary: HTML formatted API documention for Log for C++ -Group: Development/Libraries -Requires: %name = %version - -%description doc -The %name-doc package contains HTML formatted API documention generated by -the popular doxygen documentation generation tool. - -%prep -%setup -q - -%build -%configure --enable-doxygen -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_bindir}/cppunit-config -%{_bindir}/DllPlugInTester -%{_includedir}/cppunit/* -%{_mandir}/man1/* -%{_datadir}/aclocal/* -%{_libdir}/libcppunit*.so.* -%{_libdir}/libcppunit.so -%{_libdir}/libcppunit.a -%doc AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog TODO BUGS doc/FAQ - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files doc -%doc doc/html/* - -%changelog -* Mon Jul 4 2005 Patrice Dumas -- update using the fedora template -* Sat Apr 14 2001 Bastiaan Bakker -- Initial release diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Doxyfile.in b/src/3rd_party/cppunit/cppunit-1.12.1/doc/Doxyfile.in deleted file mode 100644 index 28f46245..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Doxyfile.in +++ /dev/null @@ -1,604 +0,0 @@ -# Doxyfile 1.1.4 - -# This file describes the settings to be used by doxygen for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = CppUnit - -# 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 = "Version @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 = . - -# 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: -# Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, -# Spanish and Russian - -OUTPUT_LANGUAGE = English - -# 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 - -# If the EXTRACT_ALL tag is set to YES all classes and functions will be -# included in the documentation, even if no documentation was available. - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members inside documented classes or files. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all -# undocumented classes. - -HIDE_UNDOC_CLASSES = NO - -# 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 - -# 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 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 = NO - -# 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. - -STRIP_FROM_PATH = - -# 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 CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a class diagram (in Html and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. - -CLASS_DIAGRAMS = YES - -# 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. - -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 CASE_SENSE_NAMES tag is set to NO (the default) 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. - -CASE_SENSE_NAMES = 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 - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the JAVADOC_AUTOBRIEF tag is set to YES (the default) 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-style will -# behave just like the Qt-style comments. - -JAVADOC_AUTOBRIEF = YES - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# reimplements. - -INHERIT_DOCS = 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 - -# 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 = 8 - -# The ENABLE_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -#--------------------------------------------------------------------------- -# 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 - -# 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. - -WARN_FORMAT = "$file:$line: $text" - -#--------------------------------------------------------------------------- -# 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 = @top_srcdir@/include @top_srcdir@/src/cppunit @srcdir@/other_documentation.dox @srcdir@/cookbook.dox @srcdir@/Money.dox - -# 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 all files are included. - -FILE_PATTERNS = *.cpp *.h - -# 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 = - -# 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. - -EXCLUDE_PATTERNS = config-*.h - -# 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 = ../examples - -# 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 = *.cpp *.h - -# 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. - -INPUT_FILTER = - -#--------------------------------------------------------------------------- -# 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 = YES - -# 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 = @enable_html_docs@ - -# 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_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 = @srcdir@/header.html - -# 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 = @srcdir@/footer.html - -# 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 - -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 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 compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -#--------------------------------------------------------------------------- -# 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 = @enable_latex_docs@ - -# 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 - -# 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 = NO - -# 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 - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# For now this is experimental and is disabled by default. The RTF output -# is optimised for Word 97 and may not look too pretty with other 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 a WORD or other. -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -#--------------------------------------------------------------------------- -# 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 - -#--------------------------------------------------------------------------- -# 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 = 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 = - -# 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. - -PREDEFINED = CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION \ - CPPUNIT_HAVE_NAMESPACES=1 \ - CPPUNIT_NS_BEGIN="namespace CppUnit {" \ - CPPUNIT_NS_END=} \ - CPPUNIT_NS=CppUnit - -# 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 tag. - -EXPAND_ONLY_PREDEF = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES tag can be used to specify one or more tagfiles. - -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 - -# 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 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 = @enable_dot@ - -# 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 ENABLE_PREPROCESSING, 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 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 - -# This tag 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 on the path. - -DOT_PATH = - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO - -# The CGI_NAME tag should be the name of the CGI script that -# starts the search engine (doxysearch) with the correct parameters. -# A script with this name will be generated by doxygen. - -CGI_NAME = search.cgi - -# The CGI_URL tag should be the absolute URL to the directory where the -# cgi binaries are located. See the documentation of your http daemon for -# details. - -CGI_URL = - -# The DOC_URL tag should be the absolute URL to the directory where the -# documentation is located. If left blank the absolute path to the -# documentation, with file:// prepended to it, will be used. - -DOC_URL = - -# The DOC_ABSPATH tag should be the absolute path to the directory where the -# documentation is located. If left blank the directory on the local machine -# will be used. - -DOC_ABSPATH = - -# The BIN_ABSPATH tag must point to the directory where the doxysearch binary -# is installed. - -BIN_ABSPATH = /usr/local/bin/ - -# The EXT_DOC_PATHS tag can be used to specify one or more paths to -# documentation generated for other projects. This allows doxysearch to search -# the documentation for these projects as well. - -EXT_DOC_PATHS = diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/FAQ b/src/3rd_party/cppunit/cppunit-1.12.1/doc/FAQ deleted file mode 100644 index e43cdbaf..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/FAQ +++ /dev/null @@ -1,31 +0,0 @@ -Frequently Asked Questions: ---------------------------- - -1) Questions relating to CppUnit - ---------------------------- - -1.1) Isn't there an easier way to write unit tests than using TestCaller ? - - Yes, there is. Macros have been created to take care of the repetitive -work. Look up include/extensions/HelperMacros.h in CppUnit documentation. -Most of CppUnit test suite is also written that way since they remain -compatible as CppUnit evolve. They also use RTTI if available. - - -2) Questions related to Microsoft Visual VC++ - ----------------------------------------- - -2.1) Why does the compiler report an error when linking with CppUnit library? - - You most likely are not using the same C-RunTime library as CppUnit. - In Release configuration, CppUnit use "Mulithreaded DLL". - In Debug configurations, CppUnit use "Debug Multihreaded DLL". - Check that Projects/Settings.../C++/Code Generation is indeed using -the correct library. - -2.2) Why does CppUnit generate warning 4786:... when compiling ? - - I really don't have a clue. All CppUnit's headers starts by either -including Portability.h or another CppUnit's header. Portability.h includes -config-msvc6.h which disable that specific warning. The warning is generated -by TestFactoryRegistry::m_factories. A solution to this problem is welcome. \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.am deleted file mode 100644 index 08e5a03b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -EXTRA_DIST = $(doxygen_input) $(static_pages) - -doxygen_input = cookbook.dox other_documentation.dox header.html footer.html Money.dox -static_pages = FAQ - - -# DOC is defined if installer requests doc generation. -# For now, we only install HTML documentation. We could install manpages -# using the following -# man_MANS = man/man3/CppUnit.3 -# man/man3/CppUnit.3: dox -# and an extra copy or two in the install-data-hook. -# However, the manpages do not appear to be tremendously useful, so -# let's not bother. - -if DOC - -htmldir = $(pkgdatadir)/html -html_DATA = $(static_pages) html/index.html - -install-data-hook: - cp -pR html/* $(DESTDIR)$(htmldir) - -# Automake's "distcheck" is sensitive to having files left over -# after "make uninstall", so we have to clean up the install hook. -uninstall-local: - rm -rf $(DESTDIR)$(htmldir) - -dox: html/index.html - -else - -# We repeat the three targets in both the "if" and "else" clauses -# of the conditional, because the generated makefile will contain -# references to the targets (target "install" depends on target -# "install-datahook", for example), and some make programs get upset -# if no target exists. - -install-data-hook: -uninstall-local: -dox: - -endif - - -all-local: dox - - -html/index.html: Doxyfile $(doxygen_input) - "@DOXYGEN@" - - -# Make tarfile to distribute the HTML documentation. -doc-dist: dox - cp $(static_pages) html - tar -czf $(PACKAGE)-docs-$(VERSION).tar.gz -C html . - -pdf: @PACKAGE@.pdf -@PACKAGE@.pdf: - $(MAKE) -C ./latex pdf - ln -s ./latex/refman.ps @PACKAGE@.ps - ln -s ./latex/refman.pdf @PACKAGE@.pdf - - -clean-local: - $(RM) -r latex - $(RM) -r html man @PACKAGE@.ps @PACKAGE@.pdf diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.in deleted file mode 100644 index a60dd6be..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Makefile.in +++ /dev/null @@ -1,441 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 -DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = Doxyfile -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(htmldir)" -htmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(html_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ - -# DOC is defined if installer requests doc generation. -# For now, we only install HTML documentation. We could install manpages -# using the following -# man_MANS = man/man3/CppUnit.3 -# man/man3/CppUnit.3: dox -# and an extra copy or two in the install-data-hook. -# However, the manpages do not appear to be tremendously useful, so -# let's not bother. -@DOC_TRUE@htmldir = $(pkgdatadir)/html -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = $(doxygen_input) $(static_pages) -doxygen_input = cookbook.dox other_documentation.dox header.html footer.html Money.dox -static_pages = FAQ -@DOC_TRUE@html_DATA = $(static_pages) html/index.html -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/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 -Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-htmlDATA: $(html_DATA) - @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - @list='$(html_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ - done - -uninstall-htmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(html_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(htmldir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(DATA) all-local -installdirs: - for dir in "$(DESTDIR)$(htmldir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-local mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-htmlDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -install-dvi: install-dvi-am - -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 - -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-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-htmlDATA uninstall-local - -.MAKE: install-am install-data-am install-strip - -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-htmlDATA \ - 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 uninstall uninstall-am \ - uninstall-htmlDATA uninstall-local - - -@DOC_TRUE@install-data-hook: -@DOC_TRUE@ cp -pR html/* $(DESTDIR)$(htmldir) - -# Automake's "distcheck" is sensitive to having files left over -# after "make uninstall", so we have to clean up the install hook. -@DOC_TRUE@uninstall-local: -@DOC_TRUE@ rm -rf $(DESTDIR)$(htmldir) - -@DOC_TRUE@dox: html/index.html - -# We repeat the three targets in both the "if" and "else" clauses -# of the conditional, because the generated makefile will contain -# references to the targets (target "install" depends on target -# "install-datahook", for example), and some make programs get upset -# if no target exists. - -@DOC_FALSE@install-data-hook: -@DOC_FALSE@uninstall-local: -@DOC_FALSE@dox: - -all-local: dox - -html/index.html: Doxyfile $(doxygen_input) - "@DOXYGEN@" - -# Make tarfile to distribute the HTML documentation. -doc-dist: dox - cp $(static_pages) html - tar -czf $(PACKAGE)-docs-$(VERSION).tar.gz -C html . - -pdf: @PACKAGE@.pdf -@PACKAGE@.pdf: - $(MAKE) -C ./latex pdf - ln -s ./latex/refman.ps @PACKAGE@.ps - ln -s ./latex/refman.pdf @PACKAGE@.pdf - -clean-local: - $(RM) -r latex - $(RM) -r html man @PACKAGE@.ps @PACKAGE@.pdf -# 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/3rd_party/cppunit/cppunit-1.12.1/doc/Money.dox b/src/3rd_party/cppunit/cppunit-1.12.1/doc/Money.dox deleted file mode 100644 index d35e8e8f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/Money.dox +++ /dev/null @@ -1,558 +0,0 @@ -/*! \page money_example Money, a step by step example - -\section Table of contents - - - \ref sec_setting_vc - - \ref sec_setting_unix - - \ref sec_running_test - - \ref sec_adding_testfixture - - \ref sec_first_tests - - \ref sec_more_tests - - \ref sec_credits - - The example explored in this article can be found in \c examples/Money/. - - - -\section sec_setting_vc Setting up your project (VC++) - -\subsection sec_install Compiling and installing CppUnit libaries - -In the following document, $CPPUNIT is the directory where you unpacked %CppUnit: -$CPPUNIT/: - include/ - lib/ - src/ - cppunit/ - -First, you need to compile %CppUnit libraries: -- Open the $CPPUNIT/src/CppUnitLibraries.dsw workspace in VC++. -- In the 'Build' menu, select 'Batch Build...' -- In the batch build dialog, select all projects and press the build button. -- The resulting libraries can be found in the $CPPUNIT/lib/ directory. - -Once it is done, you need to tell VC++ where are the includes and libraries -to use them in other projects. Open the 'Tools/Options...' dialog, and in the -'Directories' tab, select 'include files' in the combo. Add a new entry that -points to $CPPUNIT/include/. Change to 'libraries files' in the combo and -add a new entry for $CPPUNIT/lib/. Repeat the process with 'source files' -and add $CPPUNIT/src/cppunit/. - -\subsection sec_getting_started Getting started - -Creates a new console application ('a simple application' template will do). -Let's link %CppUnit library to our project. In the project settings: -- In tab 'C++', combo 'Code generation', set the combo to 'Multithreaded DLL' -for the release configuration, and 'Debug Multithreaded DLL' for the debug -configure, -- In tab 'C++', combo 'C++ langage', for All Configurations, check -'enable Run-Time Type Information (RTTI)', -- In tab 'Link', in the 'Object/library modules' field, add cppunitd.lib for -the debug configuration, and cppunit.lib for the release configuration. - -We're done ! - - - - - - - -\section sec_setting_unix Setting up your project (Unix) -We'll use \c autoconf and \c automake to make it simple to -create our build environment. Create a directory somewhere to -hold the code we're going to build. Create \c configure.in and -\c Makefile.am in that directory to get started. - -configure.in -\verbatim -dnl Process this file with autoconf to produce a configure script. -AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(money,0.1) -AM_PATH_CPPUNIT(1.9.6) -AC_PROG_CXX -AC_PROG_CC -AC_PROG_INSTALL -AC_OUTPUT(Makefile)\endverbatim - -Makefile.am -\verbatim -# Rules for the test code (use `make check` to execute) -TESTS = MoneyApp -check_PROGRAMS = $(TESTS) -MoneyApp_SOURCES = Money.h MoneyTest.h MoneyTest.cpp MoneyApp.cpp -MoneyApp_CXXFLAGS = $(CPPUNIT_CFLAGS) -MoneyApp_LDFLAGS = $(CPPUNIT_LIBS) -ldl\endverbatim - - - - - - - - -\section sec_running_test Running our tests - -We have a main that doesn't do anything. Let's start by adding the mechanics -to run our tests (remember, test before you code ;-) ). For this example, -we will use a TextTestRunner with the CompilerOutputter for post-build -testing: - -MoneyApp.cpp -\code -#include "stdafx.h" -#include -#include -#include - - -int main(int argc, char* argv[]) -{ - // Get the top level suite from the registry - CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest(); - - // Adds the test to the list of test to run - CppUnit::TextUi::TestRunner runner; - runner.addTest( suite ); - - // Change the default outputter to a compiler error format outputter - runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(), - std::cerr ) ); - // Run the tests. - bool wasSucessful = runner.run(); - - // Return error code 1 if the one of test failed. - return wasSucessful ? 0 : 1; -}\endcode - - VC++: Compile and run (Ctrl+F5). - - Unix: First build. Since we don't have all the file yet, let's create them - and build our application for the first time: -\verbatim -touch Money.h MoneyTest.h MoneyTest.cpp -aclocal -I /usr/local/share/aclocal -autoconf -automake -a -touch NEWS README AUTHORS ChangeLog # To make automake happy -./configure -make check\endverbatim - - Our application will report that everything -is fine and no test were run. So let's add some tests... - - - -\subsection sec_post_build Setting up automated post-build testing (VC++) - -What does post-build testing means? It means that each time you compile, -the test are automatically run when the build finish. This is very -useful, if you compile often you can know that you just 'broke' something, -or that everything is still working fine. - -Let's adds that to our project, In the project settings, in the -'post-build step' tab: -- Select 'All configurations' (upper left combo) -- In the 'Post-build description', enter 'Unit testing...' -- In 'post-build command(s)', add a new line: \$(TargetPath) - -\$(TargetPath) expands into the name of your application: -Debug\\MoneyApp.exe in debug configuration and Release\\MoneyApp.exe in release -configuration. - -What we are doing is say to VC++ to run our application for each build. -Notices the last line of \c main(), it returns a different error code, -depending on weither or not a test failed. If the code returned by -an application is not 0 in post-build step, it tell VC++ that the build -step failed. - -Compile. Notice that the application's output is now in the build window. -How convenient! - - (Unix: tips to integrate make check into various IDE?) - - - - - - - -\section sec_adding_testfixture Adding the TestFixture - -For this example, we are going to write a simple money class. Money -has an amount and a currency. Let's begin by creating a fixture where -we can put our tests, and add single test to test Money constructor: - -MoneyTest.h: -\code -#ifndef MONEYTEST_H -#define MONEYTEST_H - -#include - -class MoneyTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE( MoneyTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp(); - void tearDown(); - - void testConstructor(); -}; - -#endif // MONEYTEST_H\endcode - -- CPPUNIT_TEST_SUITE declares that our Fixture's test suite. -- CPPUNIT_TEST adds a test to our test suite. The test is implemented -by a method named testConstructor(). -- setUp() and tearDown() are use to setUp/tearDown some fixtures. We are -not using any for now. - -MoneyTest.cpp -\code -#include "stdafx.h" -#include "MoneyTest.h" - -// Registers the fixture into the 'registry' -CPPUNIT_TEST_SUITE_REGISTRATION( MoneyTest ); - - -void -MoneyTest::setUp() -{ -} - - -void -MoneyTest::tearDown() -{ -} - - -void -MoneyTest::testConstructor() -{ - CPPUNIT_FAIL( "not implemented" ); -} -\endcode - -Compile. As expected, it reports that a test failed. Press the \c F4 key -(Go to next Error). VC++ jump right to our failed assertion CPPUNIT_FAIL. -We can not ask better in term of integration! -\verbatim -Compiling... -MoneyTest.cpp -Linking... -Unit testing... -.F -G:\prg\vc\Lib\cppunit\examples\money\MoneyTest.cpp(26):Assertion -Test name: MoneyTest.testConstructor -not implemented -Failures !!! -Run: 1 Failure total: 1 Failures: 1 Errors: 0 -Error executing d:\winnt\system32\cmd.exe. - -moneyappd.exe - 1 error(s), 0 warning(s) -\endverbatim - -Well, we have everything set up, let's start doing some real testing. - - - - - - - -\section sec_first_tests Our first tests - -Let's write our first real test. A test is usually decomposed in three parts: -- setting up datas used by the test -- doing some processing based on those datas -- checking the result of the processing - -\code -void -MoneyTest::testConstructor() -{ - // Set up - const std::string currencyFF( "FF" ); - const double longNumber = 12345678.90123; - - // Process - Money money( longNumber, currencyFF ); - - // Check - CPPUNIT_ASSERT_EQUAL( longNumber, money.getAmount() ); - CPPUNIT_ASSERT_EQUAL( currencyFF, money.getCurrency() ); -}\endcode - -Well, we finally have a good start of what our Money class will -look like. Let's start implementing... - -Money.h -\code -#ifndef MONEY_H -#define MONEY_H - -#include - -class Money -{ -public: - Money( double amount, std::string currency ) - : m_amount( amount ) - , m_currency( currency ) - { - } - - double getAmount() const - { - return m_amount; - } - - std::string getCurrency() const - { - return m_currency; - } - -private: - double m_amount; - std::string m_currency; -}; - -#endif\endcode - -Include Money.h in MoneyTest.cpp and compile. - -Hum, an assertion failed! Press F4, and we jump to the assertion -that checks the currency of the constructed money object. The report -indicates that string is not equal to expected value. There is only -two ways for this to happen: the member was badly initialized or we -returned the wrong value. After a quick check, we find out it is the former. -Let's fix that: - -Money.h -\code - Money( double amount, std::string currency ) - : m_amount( amount ) - , m_currency( currency ) - { - }\endcode - -Compile. Our test finally pass! -Let's add some functionnality to our Money class. - - - - - - - - -\section sec_more_tests Adding more tests - -\subsection sec_equal Testing for equality - - We want to check if to Money object are equal. Let's start by adding -a new test to the suite, then add our method: - -MoneyTest.h -\code - CPPUNIT_TEST_SUITE( MoneyTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testEqual ); - CPPUNIT_TEST_SUITE_END(); -public: - ... - void testEqual(); -\endcode - -MoneyTest.cpp -\code -void -MoneyTest::testEqual() -{ - // Set up - const Money money123FF( 123, "FF" ); - const Money money123USD( 123, "USD" ); - const Money money12FF( 12, "FF" ); - const Money money12USD( 12, "USD" ); - - // Process & Check - CPPUNIT_ASSERT( money123FF == money123FF ); // == - CPPUNIT_ASSERT( money12FF != money123FF ); // != amount - CPPUNIT_ASSERT( money123USD != money123FF ); // != currency - CPPUNIT_ASSERT( money12USD != money123FF ); // != currency and != amount -}\endcode - - Let's implements \c operator \c == and \c operator \c != in Money.h: - -Money.h -\code -class Money -{ -public: -... - bool operator ==( const Money &other ) const - { - return m_amount == other.m_amount && - m_currency == other.m_currency; - } - - bool operator !=( const Money &other ) const - { - return (*this == other); - } -}; -\endcode - - Compile, run... Ooops... Press F4, it seems we're having trouble -with \c operator \c !=. Let's fix that: -\code - bool operator !=( const Money &other ) const - { - return !(*this == other); - }\endcode - -Compile, run. Finally got it working! - - - -\subsection sec_opadd Adding moneys - - Let's add our test 'testAdd' to MoneyTest. You know the routine... - -MoneyTest.cpp -\code -void -MoneyTest::testAdd() -{ - // Set up - const Money money12FF( 12, "FF" ); - const Money expectedMoney( 135, "FF" ); - - // Process - Money money( 123, "FF" ); - money += money12FF; - - // Check - CPPUNIT_ASSERT( expectedMoney == money ); // add works - CPPUNIT_ASSERT( &money == &(money += money12FF) ); // add returns ref. on 'this'. -}\endcode - - While writing that test case, you ask yourself, what is the result of -adding money of currencies. Obviously this is an error and it should be -reported, say let throw an exception, say \c IncompatibleMoneyError, -when the currencies are not equal. We will write another test case -for this later. For now let get our testAdd() case working: - -Money.h -\code -class Money -{ -public: -... - Money &operator +=( const Money &other ) - { - m_amount += other.m_amount; - return *this; - } -}; \endcode - -Compile, run. Miracle, everything is fine! Just to be sure the test is indeed -working, in the above code, change \c m_amount \c += to \c -=. Build and -check that it fails (always be suspicious of test that work the first -time: you may have forgotten to add it to the suite for example)! -Change the code back so that all the tests are working. - - Let's the incompatible money test case before we forget about it... -That test case expect an \c IncompatibleMoneyError exception to be thrown. -%CppUnit can test that for us, you need to specify that the test case -expect an exception when you add it to the suite: - -MoneyTest.h -\code -class MoneyTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE( MoneyTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testEqual ); - CPPUNIT_TEST( testAdd ); - CPPUNIT_TEST_EXCEPTION( testAddThrow, IncompatibleMoneyError ); - CPPUNIT_TEST_SUITE_END(); -public: - ... - void testAddThrow(); -};\endcode - -By convention, you end the name of such tests with \c 'Throw', that way, you -know that the test expect an exception to be thrown. Let's write our test case: - -MoneyTest.cpp -\code -void -MoneyTest::testAddThrow() -{ - // Set up - const Money money123FF( 123, "FF" ); - - // Process - Money money( 123, "USD" ); - money += money123FF; // should throw an exception -} -\endcode - - Compile... Ooops, forgot to declare the exception class. Let's do that: - -Money.h -\code -#include -#include - -class IncompatibleMoneyError : public std::runtime_error -{ -public: - IncompatibleMoneyError() : runtime_error( "Incompatible moneys" ) - { - } -}; -\endcode - - Compile. As expected testAddThrow() fail... Let's fix that: - -Money.h -\code - Money &operator +=( const Money &other ) - { - if ( m_currency != other.m_currency ) - throw IncompatibleMoneyError(); - - m_amount += other.m_amount; - return *this; - }\endcode - - Compile. Our test finaly passes! - - TODO: -- How to use CPPUNIT_ASSERT_EQUALS with Money -- Copy constructor/Assignment operator -- Introducing fixtures -- ? - - - - - - -\section sec_credits Credits -This article was written by Baptiste Lepilleur. Unix configuration & set up -by Phil Verghese. Inspired from many others (JUnit, Phil's cookbook...), -and all the newbies around that keep asking me for the -'Hello world' example ;-) - - - -*/ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/cookbook.dox b/src/3rd_party/cppunit/cppunit-1.12.1/doc/cookbook.dox deleted file mode 100644 index ace3eccb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/cookbook.dox +++ /dev/null @@ -1,523 +0,0 @@ -/*! \page cppunit_cookbook CppUnit Cookbook -Here is a short cookbook to help you get started. - - -\section simple_test_case Simple Test Case -You want to know whether your code is working. - -How do you do it? - -There are many ways. Stepping through a debugger or -littering your code with stream output calls are two of -the simpler ways, but they both have drawbacks. -Stepping through your code is a good idea, but it -is not automatic. You have to do it every time you -make changes. Streaming out text is also fine, -but it makes code ugly and it generates far more -information than you need most of the time. - -Tests in %CppUnit can be run automatically. -They are easy to set up and once you have -written them, they are always there to help -you keep confidence in the quality of your code. - -To make a simple test, here is what you do: - -Subclass the \link CppUnit::TestCase TestCase \endlink class. -Override the method \link CppUnit::TestCase::runTest() runTest()\endlink. -When you want to check a value, call -\link CPPUNIT_ASSERT() CPPUNIT_ASSERT(bool) \endlink -and pass in an expression that is true if the -test succeeds. - -For example, to test the equality comparison -for a Complex number class, write: - -\code -class ComplexNumberTest : public CppUnit::TestCase { -public: - ComplexNumberTest( std::string name ) : CppUnit::TestCase( name ) {} - - void runTest() { - CPPUNIT_ASSERT( Complex (10, 1) == Complex (10, 1) ); - CPPUNIT_ASSERT( !(Complex (1, 1) == Complex (2, 2)) ); - } -}; -\endcode - -That was a very simple test. Ordinarily, -you'll have many little test cases that you'll -want to run on the same set of objects. To do -this, use a fixture. - - - - - - -\section fixture Fixture -A fixture is a known set of objects that -serves as a base for a set of test cases. -Fixtures come in very handy when you are -testing as you develop. - -Let's try out this style of development and -learn about fixtures along the away. Suppose -that we are really developing a complex -number class. Let's start by defining a -empty class named Complex. - -\code -class Complex {}; -\endcode - -Now create an instance of ComplexNumberTest -above, compile the code and see what happens. -The first thing we notice is a few compiler -errors. The test uses operator ==, but it is -not defined. Let's fix that. - -\code -bool operator==( const Complex &a, const Complex &b) -{ - return true; -} -\endcode - -Now compile the test, and run it. This time it -compiles but the test fails. -We need a bit more to get an operator ==working -correctly, so we revisit the code. - -\code -class Complex { - friend bool operator ==(const Complex& a, const Complex& b); - double real, imaginary; -public: - Complex( double r, double i = 0 ) - : real(r) - , imaginary(i) - { - } -}; - -bool operator ==( const Complex &a, const Complex &b ) -{ - return a.real == b.real && a.imaginary == b.imaginary; -} -\endcode - -If we compile now and run our test it will pass. - -Now we are ready to add new operations and -new tests. At this point a fixture would be -handy. We would probably be better off when -doing our tests if we decided to instantiate -three or four complex numbers and reuse them -across our tests. - -Here is how we do it: -- Add member variables for each part of the - \link CppUnit::TestFixture fixture \endlink -- Override \link CppUnit::TestFixture::setUp() setUp() \endlink - to initialize the variables -- Override \link CppUnit::TestFixture::tearDown() tearDown() \endlink - to release any permanent resources you allocated in - \link CppUnit::TestFixture::setUp() setUp() \endlink - -\code -class ComplexNumberTest : public CppUnit::TestFixture { -private: - Complex *m_10_1, *m_1_1, *m_11_2; -public: - void setUp() - { - m_10_1 = new Complex( 10, 1 ); - m_1_1 = new Complex( 1, 1 ); - m_11_2 = new Complex( 11, 2 ); - } - - void tearDown() - { - delete m_10_1; - delete m_1_1; - delete m_11_2; - } -}; -\endcode - -Once we have this fixture, we can add the complex -addition test case and any others that we need -over the course of our development. - - - -\section test_case Test Case - -How do you write and invoke individual tests using a fixture? - -There are two steps to this process: -- Write the test case as a method in the fixture class -- Create a TestCaller which runs that particular method - -Here is our test case class with a few extra case methods: - -\code -class ComplexNumberTest : public CppUnit::TestFixture { -private: - Complex *m_10_1, *m_1_1, *m_11_2; -public: - void setUp() - { - m_10_1 = new Complex( 10, 1 ); - m_1_1 = new Complex( 1, 1 ); - m_11_2 = new Complex( 11, 2 ); - } - - void tearDown() - { - delete m_10_1; - delete m_1_1; - delete m_11_2; - } - - void testEquality() - { - CPPUNIT_ASSERT( *m_10_1 == *m_10_1 ); - CPPUNIT_ASSERT( !(*m_10_1 == *m_11_2) ); - } - - void testAddition() - { - CPPUNIT_ASSERT( *m_10_1 + *m_1_1 == *m_11_2 ); - } -}; -\endcode - -One may create and run instances for each test case like this: - -\code -CppUnit::TestCaller test( "testEquality", - &ComplexNumberTest::testEquality ); -CppUnit::TestResult result; -test.run( &result ); -\endcode - -The second argument to the test caller constructor is the address of -a method on ComplexNumberTest. When the test caller is run, -that specific method will be run. This is not a useful thing to do, -however, as no diagnostics will be displayed. -One will normally use a \link ExecutingTest TestRunner \endlink (see below) -to display the results. - -Once you have several tests, organize them into a suite. - - - - - -\section suite Suite - -How do you set up your tests so that you can run them all at once? - -%CppUnit provides a \link CppUnit::TestSuite TestSuite \endlink class -that runs any number of TestCases together. - -We saw, above, how to run a single test case. - -To create a suite of two or more tests, you do the following: - -\code -CppUnit::TestSuite suite; -CppUnit::TestResult result; -suite.addTest( new CppUnit::TestCaller( - "testEquality", - &ComplexNumberTest::testEquality ) ); -suite.addTest( new CppUnit::TestCaller( - "testAddition", - &ComplexNumberTest::testAddition ) ); -suite.run( &result ); -\endcode - -\link CppUnit::TestSuite TestSuites \endlink don't only have to -contain callers for TestCases. They can contain any object -that implements the \link CppUnit::Test Test \endlink interface. -For example, you can create a -\link CppUnit::TestSuite TestSuite \endlink in your code and -I can create one in mine, and we can run them together -by creating a \link CppUnit::TestSuite TestSuite \endlink -that contains both: - -\code -CppUnit::TestSuite suite; -CppUnit::TestResult result; -suite.addTest( ComplexNumberTest::suite() ); -suite.addTest( SurrealNumberTest::suite() ); -suite.run( &result ); -\endcode - - - - -\section test_runner TestRunner - -How do you run your tests and collect their results? - -Once you have a test suite, you'll want to run it. %CppUnit provides tools -to define the suite to be run and to display its results. -You make your suite accessible to a \link ExecutingTest TestRunner \endlink -program with a static method suite that returns a test suite. - -For example, to make a ComplexNumberTest suite available to a -\link ExecutingTest TestRunner \endlink, add the following code to -ComplexNumberTest: - -\code -public: - static CppUnit::TestSuite *suite() - { - CppUnit::TestSuite *suiteOfTests = new CppUnit::TestSuite( "ComplexNumberTest" ); - suiteOfTests->addTest( new CppUnit::TestCaller( - "testEquality", - &ComplexNumberTest::testEquality ) ); - suiteOfTests->addTest( new CppUnit::TestCaller( - "testAddition", - &ComplexNumberTest::testAddition ) ); - return suiteOfTests; - } -\endcode - -\anchor test_runner_code -To use the text version, include the header files for the tests in Main.cpp: - -\code -#include -#include "ExampleTestCase.h" -#include "ComplexNumberTest.h" -\endcode - -And add a call to -\link ::CppUnit::TextUi::TestRunner::addTest addTest(CppUnit::Test *) \endlink -in the main() function: - -\code -int main( int argc, char **argv) -{ - CppUnit::TextUi::TestRunner runner; - runner.addTest( ExampleTestCase::suite() ); - runner.addTest( ComplexNumberTest::suite() ); - runner.run(); - return 0; -} -\endcode - -The \link ExecutingTest TestRunner \endlink will run the tests. -If all the tests pass, you'll get an informative message. -If any fail, you'll get the following information: - -- The name of the test case that failed -- The name of the source file that contains the test -- The line number where the failure occurred -- All of the text inside the call to CPPUNIT_ASSERT() which detected the failure - -%CppUnit distinguishes between failures and errors. A failure is -anticipated and checked for with assertions. Errors are unanticipated problems -like division by zero and other exceptions thrown by the C++ runtime or your code. - - - - -\section helper_macros Helper Macros - -As you might have noticed, implementing the fixture static suite() -method is a repetitive and error prone task. A \ref WritingTestFixture set of -macros have been created to automatically implements the -static suite() method. - -The following code is a rewrite of ComplexNumberTest using those macros: - -\code -#include - -class ComplexNumberTest : public CppUnit::TestFixture { -\endcode -First, we declare the suite, passing the class name to the macro: -\code -CPPUNIT_TEST_SUITE( ComplexNumberTest ); -\endcode -The suite created by the static suite() method is named after -the class name. -Then, we declare each test case of the fixture: -\code -CPPUNIT_TEST( testEquality ); -CPPUNIT_TEST( testAddition ); -\endcode -Finally, we end the suite declaration: -\code -CPPUNIT_TEST_SUITE_END(); -\endcode -At this point, a method with the following signature has been implemented: -\code -static CppUnit::TestSuite *suite(); -\endcode -The rest of the fixture is left unchanged: -\code -private: - Complex *m_10_1, *m_1_1, *m_11_2; -public: - void setUp() - { - m_10_1 = new Complex( 10, 1 ); - m_1_1 = new Complex( 1, 1 ); - m_11_2 = new Complex( 11, 2 ); - } - - void tearDown() - { - delete m_10_1; - delete m_1_1; - delete m_11_2; - } - - void testEquality() - { - CPPUNIT_ASSERT( *m_10_1 == *m_10_1 ); - CPPUNIT_ASSERT( !(*m_10_1 == *m_11_2) ); - } - - void testAddition() - { - CPPUNIT_ASSERT( *m_10_1 + *m_1_1 == *m_11_2 ); - } -}; -\endcode - -The name of the \link CppUnit::TestCaller TestCaller \endlink added to the -suite are a composition of the fixture name and the method name. - -In the present case, the names would be: -"ComplexNumberTest.testEquality" and "ComplexNumberTest.testAddition". - -The \link WritingTestFixture helper macros \endlink help you write comon assertion. -For example, to check that ComplexNumber throws a MathException when dividing -a number by 0: -- add the test to the suite using CPPUNIT_TEST_EXCEPTION, specifying the expected - exception type. -- write the test case method - -\code -CPPUNIT_TEST_SUITE( ComplexNumberTest ); -// [...] -CPPUNIT_TEST_EXCEPTION( testDivideByZeroThrows, MathException ); -CPPUNIT_TEST_SUITE_END(); - -// [...] - - void testDivideByZeroThrows() - { - // The following line should throw a MathException. - *m_10_1 / ComplexNumber(0); - } -\endcode - -If the expected exception is not thrown, then a assertion failure is reported. - - - - -\section test_factory_registry TestFactoryRegistry - -The TestFactoryRegistry was created to solve two pitfalls: -- forgetting to add your fixture suite to the test runner (since it is in - another file, it is easy to forget) -- compilation bottleneck caused by the inclusion of all test case headers - (see \ref test_runner_code "previous example") - -The TestFactoryRegistry is a place where suites can be registered at initialization -time. - -To register the ComplexNumber suite, in the .cpp file, you add: - -\code -#include - -CPPUNIT_TEST_SUITE_REGISTRATION( ComplexNumberTest ); -\endcode - -Behind the scene, a static variable type of -\link CppUnit::AutoRegisterSuite AutoRegisterSuite \endlink is declared. -On construction, it will -\link CppUnit::TestFactoryRegistry::registerFactory(TestFactory*) register \endlink -a \link CppUnit::TestSuiteFactory TestSuiteFactory \endlink into the -\link CppUnit::TestFactoryRegistry TestFactoryRegistry \endlink. -The \link CppUnit::TestSuiteFactory TestSuiteFactory \endlink returns -the \link CppUnit::TestSuite TestSuite \endlink returned by ComplexNumber::suite(). - -To run the tests, using the text test runner, we don't need to include the fixture -anymore: - -\code -#include -#include - -int main( int argc, char **argv) -{ - CppUnit::TextUi::TestRunner runner; -\endcode -First, we retreive the instance of the -\link CppUnit::TestFactoryRegistry TestFactoryRegistry \endlink: -\code - CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); -\endcode -Then, we obtain and add a new \link CppUnit::TestSuite TestSuite \endlink created -by the \link CppUnit::TestFactoryRegistry TestFactoryRegistry \endlink that -contains all the test suite registered using CPPUNIT_TEST_SUITE_REGISTRATION(). -\code - runner.addTest( registry.makeTest() ); - runner.run(); - return 0; -} -\endcode - - - - -\section post_build_check Post-build check - -Well, now that we have our unit tests running, how about integrating unit -testing to our build process ? - -To do that, the application must returns a value different than 0 to indicate that -there was an error. - -\link CppUnit::TextUi::TestRunner::run() TestRunner::run() \endlink returns -a boolean indicating if the run was successful. - -Updating our main programm, we obtains: -\code -#include -#include - -int main( int argc, char **argv) -{ - CppUnit::TextUi::TestRunner runner; - CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); - runner.addTest( registry.makeTest() ); - bool wasSuccessful = runner.run( "", false ); - return !wasSuccessful; -} -\endcode - -Now, you need to run your application after compilation. - -With Visual C++, this is done in Project Settings/Post-Build step, -by adding the following command: "$(TargetPath)". It is expanded to -the application executable path. Look up the project -examples/cppunittest/CppUnitTestMain.dsp which -use that technic. - - - -Original version by Michael Feathers. -Doxygen conversion and update by Baptiste Lepilleur. -*/ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/footer.html b/src/3rd_party/cppunit/cppunit-1.12.1/doc/footer.html deleted file mode 100644 index 448359e1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/footer.html +++ /dev/null @@ -1,23 +0,0 @@ -
- - - - - - - -
- - SourceForge Logo - - hosts this site. - - - Send comments to:
- CppUnit Developers -
- - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/header.html b/src/3rd_party/cppunit/cppunit-1.12.1/doc/header.html deleted file mode 100644 index 01cf9322..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/header.html +++ /dev/null @@ -1,27 +0,0 @@ - - - -CppUnit - The Unit Testing Library - - - - - - - - - - - - -
- - CppUnit project page - - - FAQ - - CppUnit home page -
- -
diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/doc/other_documentation.dox b/src/3rd_party/cppunit/cppunit-1.12.1/doc/other_documentation.dox deleted file mode 100644 index df244c76..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/doc/other_documentation.dox +++ /dev/null @@ -1,147 +0,0 @@ -/** - \mainpage - - \section _history History - The first port of JUnit to C++ was done - by Michael Feathers. His versions - can be found on the - - XProgramming software page. They are os-specific, - so Jerome Lacoste provided a port to Unix/Solaris. - His version can be found on the same page. - The %CppUnit project has combined and built on this work. - - \section _usage Usage - Take a look into the \ref cppunit_cookbook. - It gives a quick start into using this - testing framework. Modules give - you a organized view of %CppUnit classes. - - (Notes to newbies, you may want to check out \ref money_example, - a work in progress, but the project is provided with %CppUnit). - - For a discussion on %CppUnit, check - - the WikiWiki Pages on CppUnit. There you can also - find the original versions and various ports to other - OSses and languages. - - \section _license License - This library is released under - the GNU - - Lesser General Public License. - - \author Eric Sommerlade (sommerlade@gmx.net) - \author Michael Feathers (mfeathers@objectmentor.com) - \author Jerome Lacoste (lacostej@altern.org) - \author Baptiste Lepilleur - \author Bastiaan Bakker - \author Steve Robbins - */ - - - -/*! \defgroup WritingTestFixture Writing test fixture - */ - -/*! \defgroup Assertions Making assertions - */ - -/*! \defgroup CreatingTestSuite Creating TestSuite - */ - -/*! \defgroup ExecutingTest Executing test - */ - -/*! \defgroup TrackingTestExecution Tracking test execution - */ - -/*! \defgroup WritingTestResult Writing test result - */ - -/*! \defgroup BrowsingCollectedTestResult Browsing collected test result - */ - -/*! \defgroup CreatingNewAssertions Creating custom assertions - */ - -/*! \defgroup WritingTestPlugIn Writing Test Plug-in - * - * Creating a test plug-in is really simple: - * - make your project a dynamic library (with VC++, choose Win32 Dynamic Library in - * the project wizard), and link against the dynamic library version of %CppUnit - * (cppunit*_dll.lib for VC++). - * - in a cpp file, include TestPlugIn.h, and use the macro CPPUNIT_PLUGIN_IMPLEMENT() - * to declare the test plug-in. - * - That's it, you're done! All the tests registered using the TestFactoryRegistry, - * CPPUNIT_TEST_SUITE_NAMED_REGISTRATION, or CPPUNIT_TEST_SUITE_REGISTRATION will - * be visible to other plug-in and to the DllPlugInRunner. - * - * Example: - * \code - * #include - * - * CPPUNIT_PLUGIN_IMPLEMENT(); - * \endcode - * - * The interface CppUnitTestPlugIn is automatically implemented by the previous - * macro. You can define your own implementation. - * - * To provide your custom implementation of the plug-in interface, you must: - * - create a class that implements the CppUnitTestPlugIn interface - * - use CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL() with your class to export - * the plug-in interface - * - implements the 'main' function with CPPUNIT_PLUGIN_IMPLEMENT_MAIN(). - * - * Some of the reason you may want to do this: - * - You do not use the TestFactoryRegistry to register your test. - * - You want to create a custom listener to use with DllPlugInRunner. - * - You want to do initialize some globale resources before running the test - * (setting up COM for example). - * - * See CppUnitTestPlugIn for further detail on how to do this. - * - * Creating your own test plug-in with VC++: - * - Create a new "Win32 Dynamic Library" project, choose the empty template - * - For the Debug Configuration, add cppunitd_dll.lib to - * 'Project Settings/Link/Object/Libariries modules', and for the Release - * Configuration, add cppunit_dll.lib. - * - For All Configuration, in 'C++/Preprocessor/Preprocessors definitions', - * add the symbol 'CPPUNIT_DLL' at the end of the line (it means that - * you are linking against cppunit dll). - * - Create a 'main' file that contains: -\verbatim -#include - -CPPUNIT_PLUGIN_IMPLEMENT();\endverbatim - * - Add your tests - * - You're done ! - * - * See examples/simple/simple_plugin.dsp for an example. - * - * Notes to VC++ users: - * - you can run a post-build check on the plug-in. Add the following line to your - * post-build tab: "DllPlugInTesterd_dll.exe $(TargetPath)". DllPlugInTesterd_dll.exe - * need to be some place were it can be found (path, ...), or you need to - * indicate the correct path. - * $(TargetPath) is the filename of your plug-in. - * - you can debug your DLL, set the executable for debug session to the plug-in - * runner, and the name of the DLL in the program arguments ($(xxx) won't work - * this time). - * - * How does it works ? - * - * When %CppUnit is linked as a DLL, the singleton used for the TestFactoryRegistry - * is the same for the plug-in runner (also linked against %CppUnit DLL). This means - * that the tests registered with the macros (at static initialization) are - * registered in the same registry. As soon as a DLL is loaded by the PlugInManager, - * the DLL static variable are constructed and the test registered to the - * TestFactoryRegistry. - * - * After loading the DLL, the PlugInManager look-up a specific function exported by - * the DLL. That function returns a pointer on the plug-in interface, which is later - * used by the PlugInManager. - * - * \see CreatingTestSuite. - */ \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.cpp deleted file mode 100644 index 93c377fc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file ClockerListener.cpp for class ClockerListener -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#include -#include -#include "ClockerListener.h" -#include "ClockerModel.h" -#include - - -ClockerListener::ClockerListener( ClockerModel *model, - bool text ) - : m_model( model ) - , m_text( text ) -{ -} - - -ClockerListener::~ClockerListener() -{ -} - - -void -ClockerListener::startTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - m_model->setExpectedTestCount( test->countTestCases() *2 ); -} - - -void -ClockerListener::endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - if ( m_text ) - printStatistics(); -} - - -void -ClockerListener::startTest( CPPUNIT_NS::Test *test ) -{ - m_model->enterTest( test, false ); -} - - -void -ClockerListener::endTest( CPPUNIT_NS::Test *test ) -{ - m_model->exitTest( test, false ); -} - - -void -ClockerListener::startSuite( CPPUNIT_NS::Test *suite ) -{ - m_model->enterTest( suite, true ); -} - - -void -ClockerListener::endSuite( CPPUNIT_NS::Test *suite ) -{ - m_model->exitTest( suite, true ); -} - - -void -ClockerListener::printStatistics() const -{ - printTest( 0, "" ); - CPPUNIT_NS::stdCOut() << "\n"; - CPPUNIT_NS::stdCOut() << "Total elapsed time: "; - printTime( m_model->totalElapsedTime() ); - CPPUNIT_NS::stdCOut() << ", average test case time: "; - printTime( m_model->averageTestCaseTime() ); -} - - -void -ClockerListener::printTest( int testIndex, - const std::string &indentString ) const -{ - std::string indent = indentString; - const int indentLength = 3; - - printTestIndent( indentString, indentLength ); - printTime( m_model->testTimeFor( testIndex ) ); - - CPPUNIT_NS::stdCOut() << m_model->testPathFor( testIndex ).getChildTest()->getName(); - CPPUNIT_NS::stdCOut() << "\n"; - - if ( m_model->childCountFor( testIndex ) == 0 ) - indent+= std::string( indentLength, ' ' ); - else - indent+= "|" + std::string( indentLength -1, ' ' ); - - for ( int index =0; index < m_model->childCountFor( testIndex ); ++index ) - printTest( m_model->childAtFor( testIndex, index ), indent ); -} - - -void -ClockerListener::printTestIndent( const std::string &indent, - const int indentLength ) const -{ - if ( indent.empty() ) - return; - - CPPUNIT_NS::stdCOut() << " "; - CPPUNIT_NS::stdCOut() << indent.substr( 0, indent.length() - indentLength ) ; - CPPUNIT_NS::stdCOut() << "+" << std::string( indentLength -1, '-' ); -} - - -void -ClockerListener::printTime( double time ) const -{ - CPPUNIT_NS::stdCOut() << '(' << ClockerModel::timeStringFor( time ) << "s) "; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.h deleted file mode 100644 index 17d85d4e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerListener.h +++ /dev/null @@ -1,66 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file ClockerListener.h for class ClockerListener -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CLOCKERLISTENER_H -#define CLOCKERLISTENER_H - -#include - -class ClockerModel; - - -/// TestListener that prints a flatten or hierarchical view of the test tree. -class ClockerListener : public CPPUNIT_NS::TestListener -{ -public: - ClockerListener( ClockerModel *model, - bool text ); - - virtual ~ClockerListener(); - - void startTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - - void endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - - void startTest( CPPUNIT_NS::Test *test ); - - void endTest( CPPUNIT_NS::Test *test ); - - void startSuite( CPPUNIT_NS::Test *suite ); - - void endSuite( CPPUNIT_NS::Test *suite ); - -private: - void printStatistics() const; - - void printTest( int testIndex, - const std::string &indentString ) const; - - void printTestIndent( const std::string &indent, - const int indentLength ) const; - - void printTime( double time ) const; - - /// Prevents the use of the copy constructor. - ClockerListener( const ClockerListener &other ); - - /// Prevents the use of the copy operator. - void operator =( const ClockerListener &other ); - -private: - ClockerModel *m_model; - bool m_text; -}; - - - -// Inlines methods for ClockerListener: -// ----------------------------------- - - - -#endif // CLOCKERLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.cpp deleted file mode 100644 index f3b12306..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.cpp +++ /dev/null @@ -1,146 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file ClockerModel.cpp for class ClockerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/06/14 -// ////////////////////////////////////////////////////////////////////////// -#include "ClockerModel.h" -#include - - -ClockerModel::ClockerModel() - : m_testCaseCount( 0 ) - , m_totalTestCaseTime( 0 ) -{ -} - - -ClockerModel::~ClockerModel() -{ -} - - -void -ClockerModel::setExpectedTestCount( int count ) -{ - m_tests.reserve( count ); -} - - -void -ClockerModel::enterTest( CPPUNIT_NS::Test *test, - bool isSuite ) -{ - m_currentPath.add( test ); - - int testIndex = m_tests.size(); - if ( !m_testIndexes.empty() ) - m_tests[ m_testIndexes.top() ].m_childIndexes.push_back( testIndex ); - m_testIndexes.push( testIndex ); - m_testToIndexes.insert( TestToIndexes::value_type( test, testIndex ) ); - - TestInfo info; - info.m_timer.start(); - info.m_path = m_currentPath; - info.m_isSuite = isSuite; - - m_tests.push_back( info ); - - if ( !isSuite ) - ++m_testCaseCount; -} - - -void -ClockerModel::exitTest( CPPUNIT_NS::Test *test, - bool isSuite ) -{ - m_tests[ m_testIndexes.top() ].m_timer.finish(); - if ( !isSuite ) - m_totalTestCaseTime += m_tests.back().m_timer.elapsedTime(); - - m_currentPath.up(); - m_testIndexes.pop(); -} - - -double -ClockerModel::totalElapsedTime() const -{ - return m_tests[0].m_timer.elapsedTime(); -} - - -double -ClockerModel::averageTestCaseTime() const -{ - double average = 0; - if ( m_testCaseCount > 0 ) - average = m_totalTestCaseTime / m_testCaseCount; - return average; -} - - -double -ClockerModel::testTimeFor( int testIndex ) const -{ - return m_tests[ testIndex ].m_timer.elapsedTime(); -} - - -std::string -ClockerModel::timeStringFor( double time ) -{ - char buffer[320]; - const char *format; - if ( time < 1 ) - format = "%2.3f"; - else if ( time < 10 ) - format = "%3.2f"; - else if (time < 100 ) - format = "%4.1f"; - else - format = "%6f"; - - ::sprintf( buffer, format, time ); - - return buffer; -} - - -bool -ClockerModel::isSuite( int testIndex ) const -{ - return m_tests[ testIndex ].m_isSuite; -} - - -const CPPUNIT_NS::TestPath & -ClockerModel::testPathFor( int testIndex ) const -{ - return m_tests[ testIndex ].m_path; -} - - -int -ClockerModel::indexOf( CPPUNIT_NS::Test *test ) const -{ - TestToIndexes::const_iterator itFound = m_testToIndexes.find( test ); - if ( itFound != m_testToIndexes.end() ) - return itFound->second; - return -1; -} - - -int -ClockerModel::childCountFor( int testIndex ) const -{ - return m_tests[ testIndex ].m_childIndexes.size(); -} - - -int -ClockerModel::childAtFor( int testIndex, - int chidIndex ) const -{ - return m_tests[ testIndex ].m_childIndexes[ chidIndex ]; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.h deleted file mode 100644 index 46f7ff1f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerModel.h +++ /dev/null @@ -1,95 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file ClockerModel.h for class ClockerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/06/14 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CLOCKERMODEL_H -#define CLOCKERMODEL_H - -#include -#include -#include -#include -#include - -#ifdef CLOCKER_USE_WINNTTIMER -#include "WinNtTimer.h" -typedef WinNtTimer Timer; -#else -#include "Timer.h" -#endif - - -/// Model that represents test timing. -class ClockerModel -{ -public: - /*! Constructs a ClockerModel object. - */ - ClockerModel(); - - /// Destructor. - virtual ~ClockerModel(); - - void setExpectedTestCount( int count ); - - void enterTest( CPPUNIT_NS::Test *test, - bool isSuite ); - - void exitTest( CPPUNIT_NS::Test *test, - bool isSuite ); - - double totalElapsedTime() const; - - double averageTestCaseTime() const; - - double testTimeFor( CPPUNIT_NS::Test *test ) const; - - double testTimeFor( int testIndex ) const; - - static std::string timeStringFor( double time ); - - bool isSuite( int testIndex ) const; - - const CPPUNIT_NS::TestPath &testPathFor( int testIndex ) const; - - // -1 is none - int indexOf( CPPUNIT_NS::Test *test ) const; - - int childCountFor( int testIndex ) const; - - int childAtFor( int testIndex, - int chidIndex ) const; - -private: - struct TestInfo - { - CPPUNIT_NS::TestPath m_path; - Timer m_timer; - bool m_isSuite; - CppUnitVector m_childIndexes; - }; - - /// Prevents the use of the copy constructor. - ClockerModel( const ClockerModel &other ); - - /// Prevents the use of the copy operator. - void operator =( const ClockerModel &other ); - -private: - CPPUNIT_NS::TestPath m_currentPath; - - int m_testCaseCount; - double m_totalTestCaseTime; - - typedef CppUnitMap TestToIndexes; - - TestToIndexes m_testToIndexes; - CppUnitStack m_testIndexes; - CppUnitVector m_tests; -}; - - - - -#endif // CLOCKERMODEL_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.cpp deleted file mode 100644 index 261e0601..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include // disabled unwanted warning on vc++ 6.0 -#include -#include -#include -#include "ClockerXmlHook.h" -#include "ClockerListener.h" -#include "ClockerModel.h" - - - -class ClockerPlugIn : public CppUnitTestPlugIn -{ -public: - ClockerPlugIn() - : m_dumper( NULL ) - , m_model( NULL ) - , m_xmlHook( NULL ) - { - } - - ~ClockerPlugIn() - { - delete m_dumper; - delete m_model; - delete m_xmlHook; - } - - - void initialize( CPPUNIT_NS::TestFactoryRegistry *registry, - const CPPUNIT_NS::PlugInParameters ¶meters ) - { - bool text = false; - if ( parameters.getCommandLine() == "text" ) - text = true; - - m_model = new ClockerModel(); - m_dumper = new ClockerListener( m_model, text ); - m_xmlHook = new ClockerXmlHook( m_model ); - } - - - void addListener( CPPUNIT_NS::TestResult *eventManager ) - { - eventManager->addListener( m_dumper ); - } - - - void removeListener( CPPUNIT_NS::TestResult *eventManager ) - { - eventManager->removeListener( m_dumper ); - } - - - void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) - { - outputter->addHook( m_xmlHook ); - } - - - void removeXmlOutputterHooks() - { - } - - - void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) - { - } - -private: - ClockerListener *m_dumper; - ClockerModel *m_model; - ClockerXmlHook *m_xmlHook; -}; - - -CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( ClockerPlugIn ); - -CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.dsp deleted file mode 100644 index 58b3d091..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerPlugIn.dsp +++ /dev/null @@ -1,229 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ClockerPlugIn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ClockerPlugIn - Win32 Debug NtTimer -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ClockerPlugIn.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ClockerPlugIn.mak" CFG="ClockerPlugIn - Win32 Debug NtTimer" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ClockerPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ClockerPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ClockerPlugIn - Win32 Debug NtTimer" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLOCKERPLUGIN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /out:"../../lib/ClockerPlugIn.dll" /libpath:"../../lib/" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLOCKERPLUGIN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"../../lib/ClockerPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug NtTimer" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug NtTimer" -# PROP BASE Intermediate_Dir "Debug NtTimer" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugNtTimer" -# PROP Intermediate_Dir "DebugNtTimer" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /D "CLOCKER_USE_WINNTTIMER" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"../../lib/ClockerPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"../../lib/ClockerPlugInNtd.dll" /pdbtype:sept /libpath:"../../lib/" - -!ENDIF - -# Begin Target - -# Name "ClockerPlugIn - Win32 Release" -# Name "ClockerPlugIn - Win32 Debug" -# Name "ClockerPlugIn - Win32 Debug NtTimer" -# Begin Source File - -SOURCE=.\ClockerListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\ClockerListener.h -# End Source File -# Begin Source File - -SOURCE=.\ClockerModel.cpp -# End Source File -# Begin Source File - -SOURCE=.\ClockerModel.h -# End Source File -# Begin Source File - -SOURCE=.\ClockerPlugIn.cpp -# End Source File -# Begin Source File - -SOURCE=.\ClockerXmlHook.cpp -# End Source File -# Begin Source File - -SOURCE=.\ClockerXmlHook.h -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# Begin Source File - -SOURCE=.\Timer.cpp - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug NtTimer" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Timer.h - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug NtTimer" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\WinNtTimer.cpp - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug NtTimer" - -# PROP BASE Exclude_From_Build 1 -# PROP Intermediate_Dir "DebugNtTimer" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\WinNtTimer.h - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug NtTimer" - -# PROP BASE Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.cpp deleted file mode 100644 index 20cc2f87..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file ClockerXmlHook.cpp for class ClockerXmlHook -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/06/14 -// ////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include "ClockerModel.h" -#include "ClockerXmlHook.h" - - -ClockerXmlHook::ClockerXmlHook( ClockerModel *model ) - : m_model( model ) -{ -} - - -ClockerXmlHook::~ClockerXmlHook() -{ -} - - -void -ClockerXmlHook::endDocument( CPPUNIT_NS::XmlDocument *document ) -{ - CPPUNIT_NS::XmlElement *testTreeElement = new CPPUNIT_NS::XmlElement( "TimedTestTree" ); - document->rootElement().addElement( testTreeElement ); - - addTimedTest( testTreeElement, 0 ); -} - - -void -ClockerXmlHook::addTimedTest( CPPUNIT_NS::XmlElement *parentElement, - int testIndex ) -{ - std::string elementName = m_model->isSuite( testIndex ) ? "TimedSuite" : "TimedTest"; - CPPUNIT_NS::XmlElement *testElement = new CPPUNIT_NS::XmlElement( elementName ); - parentElement->addElement( testElement ); - testElement->addAttribute( "id", testIndex ); - - const CPPUNIT_NS::TestPath &path = m_model->testPathFor( testIndex ); - testElement->addElement( new CPPUNIT_NS::XmlElement( "Name", - path.getChildTest()->getName() ) ); - testElement->addElement( new CPPUNIT_NS::XmlElement( "TestPath", path.toString() ) ); - testElement->addElement( new CPPUNIT_NS::XmlElement( "Time", - ClockerModel::timeStringFor( - m_model->testTimeFor( testIndex ) ) ) ); - - if ( m_model->isSuite( testIndex ) ) - { - for ( int childIndex =0; childIndex < m_model->childCountFor( testIndex ); ++childIndex ) - addTimedTest( testElement, m_model->childAtFor( testIndex, childIndex ) ); - } -} - - -void -ClockerXmlHook::failTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestFailure *failure ) -{ - successfulTestAdded( document, testElement, test ); -} - - -void -ClockerXmlHook::successfulTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test ) -{ - int testIndex = m_model->indexOf( test ); - double time = (testIndex >= 0) ? m_model->testTimeFor( testIndex ) : 0.0; - const CPPUNIT_NS::TestPath &path = m_model->testPathFor( testIndex ); - testElement->addElement( new CPPUNIT_NS::XmlElement( "TestPath", path.toString() ) ); - testElement->addElement( new CPPUNIT_NS::XmlElement( "Time", - ClockerModel::timeStringFor( time ) ) ); -} - - -void -ClockerXmlHook::statisticsAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *statisticsElement ) -{ - statisticsElement->addElement( - new CPPUNIT_NS::XmlElement( "TotalElapsedTime", - ClockerModel::timeStringFor( m_model->totalElapsedTime() ) ) ); - statisticsElement->addElement( - new CPPUNIT_NS::XmlElement( "AverageTestCaseTime", - ClockerModel::timeStringFor( m_model->averageTestCaseTime() ) ) ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.h deleted file mode 100644 index 831e106c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ClockerXmlHook.h +++ /dev/null @@ -1,61 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file ClockerXmlHook.h for class ClockerXmlHook -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/06/14 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CLOCKERXMLHOOK_H -#define CLOCKERXMLHOOK_H - -#include - -class ClockerModel; - - - -/// XML output hook to add test timing and test hierarchy timing. -class ClockerXmlHook : public CPPUNIT_NS::XmlOutputterHook -{ -public: - /*! Constructs a ClockerXmlHook object. - */ - ClockerXmlHook( ClockerModel *model ); - - /// Destructor. - virtual ~ClockerXmlHook(); - - void endDocument( CPPUNIT_NS::XmlDocument *document ); - - void failTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestFailure *failure ); - - void successfulTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test ); - - void statisticsAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *statisticsElement ); - -private: - /// Prevents the use of the copy constructor. - ClockerXmlHook( const ClockerXmlHook &other ); - - /// Prevents the use of the copy operator. - void operator =( const ClockerXmlHook &other ); - - void addTimedTest( CPPUNIT_NS::XmlElement *parentElement, - int testIndex ); - -private: - ClockerModel *m_model; -}; - - - -// Inlines methods for ClockerXmlHook: -// ----------------------------------- - - - -#endif // CLOCKERXMLHOOK_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.am deleted file mode 100644 index 65c18c91..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = WinNtTimer.h WinNtTimer.cpp ClockerPlugIn.dsp \ - Timer.h ClockerListener.h \ - Timer.cpp ClockerListener.cpp \ - ClockerPlugIn.cpp ClockerModel.h \ - ClockerModel.cpp ReadMe.txt \ - ClockerXmlHook.h ClockerXmlHook.cpp diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.in deleted file mode 100644 index f835b84e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Makefile.in +++ /dev/null @@ -1,359 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = examples/ClockerPlugIn -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = WinNtTimer.h WinNtTimer.cpp ClockerPlugIn.dsp \ - Timer.h ClockerListener.h \ - Timer.cpp ClockerListener.cpp \ - ClockerPlugIn.cpp ClockerModel.h \ - ClockerModel.cpp ReadMe.txt \ - ClockerXmlHook.h ClockerXmlHook.cpp - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/ClockerPlugIn/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/ClockerPlugIn/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 \ - 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ReadMe.txt b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ReadMe.txt deleted file mode 100644 index 57e4fc59..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/ReadMe.txt +++ /dev/null @@ -1,44 +0,0 @@ -A test plug-ins that track tests and test suites running time. It demonstrates -TestListener, TestPlugIn, and XmlOutputterHook. - -Both suite and test case times are tracked. The plug-in include in the XML -output the TestPath of each test cases and its tracked time. - -The timed test hierarchy is also included in the XML output. This way it is -possible to see the time each suite takes to run. - - - -* Usage: - -Just add this plug-in to DllPlugInTester command line. It will add a test -listener to track test time, and add a hook to the XmlOutputter to include -test time to the XmlOutput. - -If the option "text" is passed to the plug-in, the timed test tree will be -printed to stdout. - -DllPlugInRunnerd.exe ClockerPlugInd.dll -or -DllPlugInRunnerd.exe ClockerPlugInd.dll=text - -* Example: - -DllPlugInTesterd_dll.exe -x timed.xml ClockerPlugInd.dll CppUnitTestPlugInd.dll - -Will track time of all tests contains in CppUnitTestPlugInd.dll and save the -result in timed.xml. - -* Notes: - -The id of the are different than those of the - and trees. You can use the to -cross-reference the datas. - -* Remarks: - -You may want to review ClockerModel before using this plug-in for serious -purpose, add timing based on the process cpu time. - -A version is provided for NT that use the main thread cpu time. This is an issue -if the test cases are multithreaded. diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.cpp deleted file mode 100644 index 67198173..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file Timer.cpp for class Timer -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// - -#include "Timer.h" - - -void -Timer::start() -{ - m_beginTime = clock(); -} - - -void -Timer::finish() -{ - m_elapsedTime = double(clock() - m_beginTime) / CLOCKS_PER_SEC; -} - - -double -Timer::elapsedTime() const -{ - return m_elapsedTime; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.h deleted file mode 100644 index e2b34496..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/Timer.h +++ /dev/null @@ -1,32 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file Timer.h for class Timer -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TIMER_H -#define TIMER_H - -#include - -/// A Timer. -class Timer -{ -public: - void start(); - void finish(); - - double elapsedTime() const; - -private: - clock_t m_beginTime; - double m_elapsedTime; -}; - - - -// Inlines methods for Timer: -// -------------------------- - - - -#endif // TIMER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.cpp deleted file mode 100644 index 87546a2d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file WinNtTimer.cpp for class WinNtTimer -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// - -#include "WinNtTimer.h" - - -/*! Returns time spent in the thread. - * @param rquadTime Receive the time spent in the thread (user+kernel time) - * in unit of 100 nano-seconds. - * In pratice, the effective resolution is 10ms !!! - * - * @return \c true if sucess, \c false otherwise. - */ -static bool -GetThreadSpentTime( LONGLONG &rquadTime ) -{ - FILETIME timeCreation; - FILETIME timeExit; - FILETIME timeKernel; - FILETIME timeUser; - if ( !::GetThreadTimes( ::GetCurrentThread(), - &timeCreation, - &timeExit, - &timeKernel, - &timeUser) ) - { - rquadTime = 0; - return false; - } - - LARGE_INTEGER lintKernel; - lintKernel.LowPart = timeKernel.dwLowDateTime; - lintKernel.HighPart = timeKernel.dwHighDateTime; - - LARGE_INTEGER lintUser; - lintUser.LowPart = timeUser.dwLowDateTime; - lintUser.HighPart = timeUser.dwHighDateTime; - - rquadTime = lintKernel.QuadPart + lintUser.QuadPart; - - return true; -} - - - -void -WinNtTimer::start() -{ - m_isValid = GetThreadSpentTime( m_beginTime ); - -} - - -void -WinNtTimer::finish() -{ - LONGLONG quadTimeEnd; - LONGLONG quadProcessedElapse; - m_isValid = m_isValid && GetThreadSpentTime( quadTimeEnd ); - if ( m_isValid ) - { - quadProcessedElapse = quadTimeEnd - m_beginTime; - m_elapsedTime = double(quadProcessedElapse) / 10000000; - } - else - m_elapsedTime = -1; -} - - -double -WinNtTimer::elapsedTime() const -{ - return m_elapsedTime; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.h deleted file mode 100644 index fa871b9a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/ClockerPlugIn/WinNtTimer.h +++ /dev/null @@ -1,36 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file WinNtTimer.h for class WinNtTimer -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef WINNTTIMER_H -#define WINNTTIMER_H - -#include -#include -#include - - -/// A Timer. -class WinNtTimer -{ -public: - void start(); - void finish(); - - double elapsedTime() const; - -private: - LONGLONG m_beginTime; - double m_elapsedTime; - bool m_isValid; -}; - - - -// Inlines methods for Timer: -// -------------------------- - - - -#endif // WINNTTIMER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.cpp deleted file mode 100644 index 9d4e476c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file DumperListener.cpp for class DumperListener -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#include -#include -#include "DumperListener.h" - -DumperListener::DumperListener( bool flatten ) - : m_flatten( flatten ) - , m_suiteCount( 0 ) - , m_testCount( 0 ) - , m_suiteWithTestCount( 0 ) -{ -} - - -DumperListener::~DumperListener() -{ -} - - -void -DumperListener::startTest( CPPUNIT_NS::Test *test ) -{ - printPath( test, false ); - ++m_testCount; -} - - -void -DumperListener::endTest( CPPUNIT_NS::Test *test ) -{ - m_path.up(); - if ( !m_suiteHasTest.empty() ) - { - m_suiteHasTest.pop(); - m_suiteHasTest.push( true ); - } -} - - -void -DumperListener::startSuite( CPPUNIT_NS::Test *suite ) -{ - printPath( suite, true ); - ++m_suiteCount; - m_suiteHasTest.push( false ); -} - - -void -DumperListener::endSuite( CPPUNIT_NS::Test *suite ) -{ - m_path.up(); - if ( m_suiteHasTest.top() ) - ++m_suiteWithTestCount; - m_suiteHasTest.pop(); -} - - -void -DumperListener::endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - double average = 0; - if ( m_suiteWithTestCount > 0 ) - average = double(m_testCount) / m_suiteWithTestCount; - - CPPUNIT_NS::stdCOut() - << "Statistics: " << m_testCount << " test cases, " - << m_suiteCount << " suites, " - << average << " test cases / suite with test cases" - << "\n"; -} - - -void -DumperListener::printPath( CPPUNIT_NS::Test *test, - bool isSuite ) -{ - m_path.add( test ); - - if ( m_flatten ) - printFlattenedPath( isSuite ); - else - printIndentedPathChild(); -} - - -void -DumperListener::printFlattenedPath( bool isSuite ) -{ - std::string path = m_path.toString(); - if ( isSuite ) - path += "/"; - CPPUNIT_NS::stdCOut() << path << "\n"; -} - - -void -DumperListener::printIndentedPathChild() -{ - std::string indent = makeIndentString( m_path.getTestCount() -1 ); - CPPUNIT_NS::stdCOut() << indent << m_path.getChildTest()->getName() << "\n"; -} - - -std::string -DumperListener::makeIndentString( int indentLevel ) -{ - std::string indent; - for ( int parentIndent =0; parentIndent < indentLevel-1; ++parentIndent ) - indent += "| "; - - if ( indentLevel > 0 ) - indent += "+--"; - - return indent; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.h deleted file mode 100644 index 0e24f346..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperListener.h +++ /dev/null @@ -1,67 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file DumperListener.h for class DumperListener -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/04/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef DUMPERLISTENER_H -#define DUMPERLISTENER_H - -#include -#include -#include - - -/// TestListener that prints a flatten or hierarchical view of the test tree. -class DumperListener : public CPPUNIT_NS::TestListener -{ -public: - DumperListener( bool flatten ); - - virtual ~DumperListener(); - - void startTest( CPPUNIT_NS::Test *test ); - - void endTest( CPPUNIT_NS::Test *test ); - - void startSuite( CPPUNIT_NS::Test *suite ); - - void endSuite( CPPUNIT_NS::Test *suite ); - - void endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - -private: - /// Prevents the use of the copy constructor. - DumperListener( const DumperListener &other ); - - /// Prevents the use of the copy operator. - void operator =( const DumperListener &other ); - - void printPath( CPPUNIT_NS::Test *test, - bool isSuite ); - - void printFlattenedPath( bool isSuite ); - - void printIndentedPathChild(); - - std::string makeIndentString( int indentLevel ); - -private: - bool m_flatten; - CPPUNIT_NS::TestPath m_path; - - int m_suiteCount; - int m_testCount; - int m_suiteWithTestCount; - - CppUnitStack m_suiteHasTest; -}; - - - -// Inlines methods for DumperListener: -// ----------------------------------- - - - -#endif // DUMPERLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.cpp deleted file mode 100644 index 493f648d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include -#include -#include "DumperListener.h" - - - -class DumperPlugIn : public CppUnitTestPlugIn -{ -public: - DumperPlugIn() - : m_dumper( NULL ) - { - } - - ~DumperPlugIn() - { - delete m_dumper; - } - - - void initialize( CPPUNIT_NS::TestFactoryRegistry *registry, - const CPPUNIT_NS::PlugInParameters ¶meters ) - { - bool flatten = false; - if ( parameters.getCommandLine() == "flat" ) - flatten = true; - - m_dumper = new DumperListener( flatten ); - } - - - void addListener( CPPUNIT_NS::TestResult *eventManager ) - { - eventManager->addListener( m_dumper ); - } - - - void removeListener( CPPUNIT_NS::TestResult *eventManager ) - { - eventManager->removeListener( m_dumper ); - } - - - void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) - { - } - - - void removeXmlOutputterHooks() - { - } - - - void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) - { - } - -private: - DumperListener *m_dumper; -}; - - -CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( DumperPlugIn ); - -CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.dsp deleted file mode 100644 index 511c5cea..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/DumperPlugIn.dsp +++ /dev/null @@ -1,108 +0,0 @@ -# Microsoft Developer Studio Project File - Name="DumperPlugIn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=DumperPlugIn - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DumperPlugIn.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DumperPlugIn.mak" CFG="DumperPlugIn - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DumperPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "DumperPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DumperPlugIn - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /out:"../../lib/DumperPlugIn.dll" /libpath:"../../lib/" -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "DumperPlugIn - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../../lib/DumperPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" - -!ENDIF - -# Begin Target - -# Name "DumperPlugIn - Win32 Release" -# Name "DumperPlugIn - Win32 Debug" -# Begin Source File - -SOURCE=.\DumperListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\DumperListener.h -# End Source File -# Begin Source File - -SOURCE=.\DumperPlugIn.cpp -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.am deleted file mode 100644 index bb1f6d3b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = DumperListener.h DumperListener.cpp DumperPlugIn.cpp \ - DumperPlugIn.dsp \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.in deleted file mode 100644 index 30580d13..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/DumperPlugIn/Makefile.in +++ /dev/null @@ -1,355 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = examples/DumperPlugIn -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = DumperListener.h DumperListener.cpp DumperPlugIn.cpp \ - DumperPlugIn.dsp - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/DumperPlugIn/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/DumperPlugIn/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 \ - 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.am deleted file mode 100644 index f1d522a4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = hierarchy cppunittest simple ClockerPlugIn DumperPlugIn money - -# No dist subdir for msvc6: is handled by toplevel dist-hook -# DIST_SUBDIRS = msvc6 - -EXTRA_DIST = examples.dsw examples.opt - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.in deleted file mode 100644 index ba9b5ab2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/Makefile.in +++ /dev/null @@ -1,515 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = hierarchy cppunittest simple ClockerPlugIn DumperPlugIn money - -# No dist subdir for msvc6: is handled by toplevel dist-hook -# DIST_SUBDIRS = msvc6 -EXTRA_DIST = examples.dsw examples.opt -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu 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 - -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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-recursive \ - 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/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.cpp deleted file mode 100644 index 05bb78a5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include "BaseTestCase.h" - - -BaseTestCase::BaseTestCase() -{ -} - - -BaseTestCase::~BaseTestCase() -{ -} - - -void -BaseTestCase::setUp() -{ -} - - -void -BaseTestCase::tearDown() -{ -} - - -void -BaseTestCase::testUsingCheckIt() -{ - checkIt(); -} - - -void -BaseTestCase::checkIt() -{ -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.h deleted file mode 100644 index 019ed66d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/BaseTestCase.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef BASETESTCASE_H -#define BASETESTCASE_H - -#include - - -class BaseTestCase : public CPPUNIT_NS::TestCase -{ - CPPUNIT_TEST_SUITE( BaseTestCase ); - CPPUNIT_TEST( testUsingCheckIt ); - CPPUNIT_TEST_SUITE_END(); - -public: - BaseTestCase(); - virtual ~BaseTestCase(); - - virtual void setUp(); - virtual void tearDown(); - - void testUsingCheckIt(); - -protected: - virtual void checkIt(); - -private: - BaseTestCase( const BaseTestCase © ); - void operator =( const BaseTestCase © ); -}; - - - -#endif // BASETESTCASE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CoreSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CoreSuite.h deleted file mode 100644 index eb352cb9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CoreSuite.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef CPPUNITTEST_CORESUITE_H -#define CPPUNITTEST_CORESUITE_H - -#include -#include - -inline std::string coreSuiteName() -{ - return "Core"; -} - -#endif // CPPUNITTEST_CORESUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.cpp deleted file mode 100644 index a0168587..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -int -main( int argc, char* argv[] ) -{ - // Retreive test path from command line first argument. Default to "" which resolve - // to the top level suite. - std::string testPath = (argc > 1) ? std::string(argv[1]) : std::string(""); - - // Create the event manager and test controller - CPPUNIT_NS::TestResult controller; - - // Add a listener that colllects test result - CPPUNIT_NS::TestResultCollector result; - controller.addListener( &result ); - - // Add a listener that print dots as test run. -#ifdef WIN32 - CPPUNIT_NS::TextTestProgressListener progress; -#else - CPPUNIT_NS::BriefTestProgressListener progress; -#endif - controller.addListener( &progress ); - - // Add the top suite to the test runner - CPPUNIT_NS::TestRunner runner; - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - try - { - CPPUNIT_NS::stdCOut() << "Running " << testPath; - runner.run( controller, testPath ); - - CPPUNIT_NS::stdCOut() << "\n"; - - // Print test in a compiler compatible format. - CPPUNIT_NS::CompilerOutputter outputter( &result, CPPUNIT_NS::stdCOut() ); - outputter.write(); - -// Uncomment this for XML output -// std::ofstream file( "tests.xml" ); -// CPPUNIT_NS::XmlOutputter xml( &result, file ); -// xml.setStyleSheet( "report.xsl" ); -// xml.write(); -// file.close(); - } - catch ( std::invalid_argument &e ) // Test path not resolved - { - CPPUNIT_NS::stdCOut() << "\n" - << "ERROR: " << e.what() - << "\n"; - return 0; - } - - return result.wasSuccessful() ? 0 : 1; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsp deleted file mode 100644 index b0da20cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsp +++ /dev/null @@ -1,546 +0,0 @@ -# Microsoft Developer Studio Project File - Name="CppUnitTestMain" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=CppUnitTestMain - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestMain.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestMain.mak" CFG="CppUnitTestMain - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "CppUnitTestMain - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "CppUnitTestMain - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "CppUnitTestMain - Win32 Release DLL" (based on "Win32 (x86) Console Application") -!MESSAGE "CppUnitTestMain - Win32 Debug DLL" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "CppUnitTestMain - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\Release\CppUnitTestMain.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Self test -PostBuild_Cmds="$(TargetPath)" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" -# Begin Special Build Tool -TargetPath=.\Debug\CppUnitTestMain.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Self test -PostBuild_Cmds="$(TargetPath)" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "CppUnitTestMain___Win32_Release_DLL" -# PROP BASE Intermediate_Dir "CppUnitTestMain___Win32_Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDLL" -# PROP Intermediate_Dir "ReleaseDLL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /Ox /Ot /Oa /Ow /Og /Oi /Op /Ob0 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunit.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\ReleaseDLL\CppUnitTestMain.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Self test -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "CppUnitTestMain___Win32_Debug_DLL" -# PROP BASE Intermediate_Dir "CppUnitTestMain___Win32_Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDLL" -# PROP Intermediate_Dir "DebugDLL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" -# Begin Special Build Tool -TargetPath=.\DebugDLL\CppUnitTestMain.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Self test -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "CppUnitTestMain - Win32 Release" -# Name "CppUnitTestMain - Win32 Debug" -# Name "CppUnitTestMain - Win32 Release DLL" -# Name "CppUnitTestMain - Win32 Debug DLL" -# Begin Group "Tests" - -# PROP Default_Filter "" -# Begin Group "Core" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\assertion_traitsTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\assertion_traitsTest.h -# End Source File -# Begin Source File - -SOURCE=.\ExceptionTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExceptionTest.h -# End Source File -# Begin Source File - -SOURCE=.\MessageTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\MessageTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestAssertTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestAssertTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCallerTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestCallerTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCaseTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestCaseTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestFailureTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestFailureTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestPathTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPathTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestResultTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestResultTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestTest.h -# End Source File -# End Group -# Begin Group "UnitTestTools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\XmlUniformiser.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiser.h -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiserTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiserTest.h -# End Source File -# End Group -# Begin Group "Helper" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\HelperMacrosTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\HelperMacrosTest.h -# End Source File -# End Group -# Begin Group "Extension" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\ExceptionTestCaseDecoratorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExceptionTestCaseDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=.\OrthodoxTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\OrthodoxTest.h -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTestTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTestTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestDecoratorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestSetUpTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestSetUpTest.h -# End Source File -# End Group -# Begin Group "Output" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\TestResultCollectorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestResultCollectorTest.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterTest.h -# End Source File -# End Group -# Begin Group "Tools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\StringToolsTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\StringToolsTest.h -# End Source File -# Begin Source File - -SOURCE=.\XmlElementTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlElementTest.h -# End Source File -# End Group -# End Group -# Begin Group "TestSupport" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BaseTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\BaseTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\FailureException.h -# End Source File -# Begin Source File - -SOURCE=.\MockFunctor.h -# End Source File -# Begin Source File - -SOURCE=.\MockProtector.h -# End Source File -# Begin Source File - -SOURCE=.\MockTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\MockTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\MockTestListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\MockTestListener.h -# End Source File -# Begin Source File - -SOURCE=.\SubclassedTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\SubclassedTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\SynchronizedTestResult.h -# End Source File -# Begin Source File - -SOURCE=.\TrackedTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\TrackedTestCase.h -# End Source File -# End Group -# Begin Group "Suites" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\CoreSuite.h -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestSuite.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExtensionSuite.h -# End Source File -# Begin Source File - -SOURCE=.\HelperSuite.h -# End Source File -# Begin Source File - -SOURCE=.\OutputSuite.h -# End Source File -# Begin Source File - -SOURCE=.\ToolsSuite.h -# End Source File -# Begin Source File - -SOURCE=.\UnitTestToolSuite.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\lib\cppunit_dll.dll - -!IF "$(CFG)" == "CppUnitTestMain - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Release DLL" - -# Begin Custom Build - Updating DLL: $(InputPath) -IntDir=.\ReleaseDLL -InputPath=..\..\lib\cppunit_dll.dll -InputName=cppunit_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(IntDir)\$(InputName).dll" - -# End Custom Build - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug DLL" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\lib\cppunitd_dll.dll - -!IF "$(CFG)" == "CppUnitTestMain - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Release DLL" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestMain - Win32 Debug DLL" - -# Begin Custom Build - Updating DLL: $(InputPath) -IntDir=.\DebugDLL -InputPath=..\..\lib\cppunitd_dll.dll -InputName=cppunitd_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" "$(IntDir)\$(InputName).dll" - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestMain.cpp -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsw deleted file mode 100644 index a991330e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestMain.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "CppUnitTestMain"=.\CppUnitTestMain.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "cppunit"=..\..\src\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "cppunit_dll"=..\..\SRC\CPPUNIT\cppunit_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.cpp deleted file mode 100644 index 1517b111..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include - - -// Implements all the plug-in stuffs, WinMain... -CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.dsp deleted file mode 100644 index 5f20eaf6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestPlugIn.dsp +++ /dev/null @@ -1,396 +0,0 @@ -# Microsoft Developer Studio Project File - Name="CppUnitTestPlugIn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=CppUnitTestPlugIn - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestPlugIn.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestPlugIn.mak" CFG="CppUnitTestPlugIn - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "CppUnitTestPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "CppUnitTestPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "CppUnitTestPlugIn - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleasePlugIn" -# PROP Intermediate_Dir "ReleasePlugIn" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNITTESTPLUGIN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "NDEBUG" /D "CPPUNITTESTPLUGIN_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /libpath:"../../lib/" -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "CppUnitTestPlugIn - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugPlugIn" -# PROP Intermediate_Dir "DebugPlugIn" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNITTESTPLUGIN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "CPPUNIT_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"DebugPlugIn/CppUnitTestPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" - -!ENDIF - -# Begin Target - -# Name "CppUnitTestPlugIn - Win32 Release" -# Name "CppUnitTestPlugIn - Win32 Debug" -# Begin Group "Suites" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\CoreSuite.h -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestSuite.cpp -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestSuite.h -# End Source File -# Begin Source File - -SOURCE=.\ExtensionSuite.h -# End Source File -# Begin Source File - -SOURCE=.\HelperSuite.h -# End Source File -# Begin Source File - -SOURCE=.\OutputSuite.h -# End Source File -# Begin Source File - -SOURCE=.\ToolsSuite.h -# End Source File -# Begin Source File - -SOURCE=.\UnitTestToolSuite.h -# End Source File -# End Group -# Begin Group "TestSupport" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BaseTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\BaseTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\FailureException.h -# End Source File -# Begin Source File - -SOURCE=.\MockFunctor.h -# End Source File -# Begin Source File - -SOURCE=.\MockProtector.h -# End Source File -# Begin Source File - -SOURCE=.\MockTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\MockTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\MockTestListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\MockTestListener.h -# End Source File -# Begin Source File - -SOURCE=.\SubclassedTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\SubclassedTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\SynchronizedTestResult.h -# End Source File -# Begin Source File - -SOURCE=.\TrackedTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\TrackedTestCase.h -# End Source File -# End Group -# Begin Group "Tests" - -# PROP Default_Filter "" -# Begin Group "Core" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\ExceptionTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExceptionTest.h -# End Source File -# Begin Source File - -SOURCE=.\MessageTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\MessageTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestAssertTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestAssertTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCallerTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestCallerTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCaseTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestCaseTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestFailureTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestFailureTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestPathTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPathTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestResultTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestResultTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestTest.h -# End Source File -# End Group -# Begin Group "UnitTestTools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\XmlUniformiser.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiser.h -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiserTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlUniformiserTest.h -# End Source File -# End Group -# Begin Group "Helper" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\HelperMacrosTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\HelperMacrosTest.h -# End Source File -# End Group -# Begin Group "Extension" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\ExceptionTestCaseDecoratorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExceptionTestCaseDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=.\OrthodoxTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\OrthodoxTest.h -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTestTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTestTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestDecoratorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestSetUpTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestSetUpTest.h -# End Source File -# End Group -# Begin Group "Output" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\TestResultCollectorTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestResultCollectorTest.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterTest.h -# End Source File -# End Group -# Begin Group "Tools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\StringToolsTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\StringToolsTest.h -# End Source File -# Begin Source File - -SOURCE=.\XmlElementTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\XmlElementTest.h -# End Source File -# End Group -# End Group -# Begin Source File - -SOURCE=.\CppUnitTestPlugIn.cpp -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestSuite.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestSuite.cpp deleted file mode 100644 index 56e9be3b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/CppUnitTestSuite.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include "CoreSuite.h" -#include "HelperSuite.h" -#include "ExtensionSuite.h" -#include "OutputSuite.h" -#include "ToolsSuite.h" -#include "UnitTestToolSuite.h" - -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( coreSuiteName() ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( extensionSuiteName() ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( helperSuiteName() ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( outputSuiteName() ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( toolsSuiteName() ); -CPPUNIT_REGISTRY_ADD_TO_DEFAULT( unitTestToolSuiteName() ); diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.cpp deleted file mode 100644 index 31dce647..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "CoreSuite.h" -#include "ExceptionTest.h" -#include -#include - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTest, - coreSuiteName() ); - - -ExceptionTest::ExceptionTest() -{ -} - - -ExceptionTest::~ExceptionTest() -{ -} - - -void -ExceptionTest::setUp() -{ -} - - -void -ExceptionTest::tearDown() -{ -} - - -void -ExceptionTest::testConstructor() -{ - const CPPUNIT_NS::Message message( "a message" ); - const CPPUNIT_NS::SourceLine sourceLine( "dir/afile.cpp", 17 ); - - CPPUNIT_NS::Exception e( message, sourceLine ); - - CPPUNIT_ASSERT_EQUAL( message.shortDescription(), e.message().shortDescription() ); - CPPUNIT_ASSERT( sourceLine == e.sourceLine() ); -} - - -void -ExceptionTest::testDefaultConstructor() -{ - CPPUNIT_NS::Exception e; - - CPPUNIT_ASSERT( CPPUNIT_NS::Message() == e.message() ); - CPPUNIT_ASSERT( !e.sourceLine().isValid() ); -} - - -void -ExceptionTest::testCopyConstructor() -{ - CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 ); - CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine ); - CPPUNIT_NS::Exception other( e ); - checkIsSame( e, other ); -} - - -void -ExceptionTest::testAssignment() -{ - CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 ); - CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine ); - CPPUNIT_NS::Exception other; - other = e; - checkIsSame( e, other ); -} - - -void -ExceptionTest::testClone() -{ - CPPUNIT_NS::SourceLine sourceLine( "fileName.cpp", 123 ); - CPPUNIT_NS::Exception e( CPPUNIT_NS::Message("message"), sourceLine ); - std::auto_ptr other( e.clone() ); - checkIsSame( e, *other.get() ); -} - - -void -ExceptionTest::checkIsSame( CPPUNIT_NS::Exception &e, - CPPUNIT_NS::Exception &other ) -{ - std::string eWhat( e.what() ); - std::string otherWhat( other.what() ); - CPPUNIT_ASSERT_EQUAL( eWhat, otherWhat ); - CPPUNIT_ASSERT( e.sourceLine() == other.sourceLine() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.h deleted file mode 100644 index a3b4c911..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTest.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef EXCEPTIONTEST_H -#define EXCEPTIONTEST_H - -#include - - -class ExceptionTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExceptionTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testDefaultConstructor ); - CPPUNIT_TEST( testCopyConstructor ); - CPPUNIT_TEST( testAssignment ); - CPPUNIT_TEST( testClone ); - CPPUNIT_TEST_SUITE_END(); - -public: - ExceptionTest(); - virtual ~ExceptionTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testConstructor(); - void testDefaultConstructor(); - void testCopyConstructor(); - void testAssignment(); - void testClone(); - -private: - ExceptionTest( const ExceptionTest © ); - void operator =( const ExceptionTest © ); - void checkIsSame( CPPUNIT_NS::Exception &e, - CPPUNIT_NS::Exception &other ); - -private: -}; - - - -#endif // EXCEPTIONTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp deleted file mode 100644 index 17730380..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file ExceptionTestCaseDecoratorTest.cpp for class ExceptionTestCaseDecoratorTest -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/08/03 -// ////////////////////////////////////////////////////////////////////////// - -#include "ExtensionSuite.h" -#include "ExceptionTestCaseDecoratorTest.h" - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTestCaseDecoratorTest, - extensionSuiteName() ); - - -ExceptionTestCaseDecoratorTest::ExceptionTestCaseDecoratorTest() -{ -} - - -ExceptionTestCaseDecoratorTest::~ExceptionTestCaseDecoratorTest() -{ -} - - -void -ExceptionTestCaseDecoratorTest::setUp() -{ - m_testListener = new MockTestListener( "mock-testlistener" ); - m_result = new CPPUNIT_NS::TestResult(); - m_result->addListener( m_testListener ); - - m_test = new MockTestCase( "mock-decorated-testcase" ); - m_decorator = new FailureExceptionTestCase( m_test ); -} - - -void -ExceptionTestCaseDecoratorTest::tearDown() -{ - delete m_decorator; - delete m_result; - delete m_testListener; -} - - -void -ExceptionTestCaseDecoratorTest::testNoExceptionThrownFailed() -{ - m_testListener->setExpectedAddFailureCall(1); - m_test->setExpectedSetUpCall(); - m_test->setExpectedRunTestCall(); - m_test->setExpectedTearDownCall(); - - m_decorator->run( m_result ); - - m_testListener->verify(); -} - - -void -ExceptionTestCaseDecoratorTest::testExceptionThrownPass() -{ - m_testListener->setExpectNoFailure(); - m_test->setExpectedSetUpCall(); - m_test->setExpectedRunTestCall(); - m_test->setExpectedTearDownCall(); - m_test->makeRunTestThrow(); - - m_decorator->run( m_result ); - - m_testListener->verify(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.h deleted file mode 100644 index da9d168f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExceptionTestCaseDecoratorTest.h +++ /dev/null @@ -1,61 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file ExceptionTestCaseDecoratorTest.h for class ExceptionTestCaseDecoratorTest -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/08/03 -// ////////////////////////////////////////////////////////////////////////// -#ifndef EXCEPTIONTESTCASEDECORATORTEST_H -#define EXCEPTIONTESTCASEDECORATORTEST_H - -#include -#include -#include "FailureException.h" -#include "MockTestCase.h" -#include "MockTestListener.h" - - -/// Unit tests for ExceptionTestCaseDecoratorTest -class ExceptionTestCaseDecoratorTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExceptionTestCaseDecoratorTest ); - CPPUNIT_TEST( testNoExceptionThrownFailed ); - CPPUNIT_TEST( testExceptionThrownPass ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a ExceptionTestCaseDecoratorTest object. - */ - ExceptionTestCaseDecoratorTest(); - - /// Destructor. - virtual ~ExceptionTestCaseDecoratorTest(); - - void setUp(); - void tearDown(); - - void testNoExceptionThrownFailed(); - void testExceptionThrownPass(); - -private: - /// Prevents the use of the copy constructor. - ExceptionTestCaseDecoratorTest( const ExceptionTestCaseDecoratorTest &other ); - - /// Prevents the use of the copy operator. - void operator =( const ExceptionTestCaseDecoratorTest &other ); - -private: - typedef CPPUNIT_NS::ExceptionTestCaseDecorator FailureExceptionTestCase; - - CPPUNIT_NS::TestResult *m_result; - MockTestListener *m_testListener; - MockTestCase *m_test; - FailureExceptionTestCase *m_decorator; -}; - - - -// Inlines methods for ExceptionTestCaseDecoratorTest: -// --------------------------------------------------- - - - -#endif // EXCEPTIONTESTCASEDECORATORTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExtensionSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExtensionSuite.h deleted file mode 100644 index d92e430b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ExtensionSuite.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef CPPUNITTEST_EXTENSIONSSUITE_H -#define CPPUNITTEST_EXTENSIONSSUITE_H - -#include -#include - -inline std::string extensionSuiteName() -{ - return "Extensions"; -} - -#endif // CPPUNITTEST_EXTENSIONSSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/FailureException.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/FailureException.h deleted file mode 100644 index 0a4be471..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/FailureException.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef FAILUREEXCEPTION_H -#define FAILUREEXCEPTION_H - - -class FailureException -{ -}; - - -#endif // FAILUREEXCEPTION_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.cpp deleted file mode 100644 index b88dec6b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.cpp +++ /dev/null @@ -1,227 +0,0 @@ -#include -#include "FailureException.h" -#include "HelperMacrosTest.h" -#include "HelperSuite.h" -#include "MockTestCase.h" -#include "SubclassedTestCase.h" -#include -#include - -/* Note: - - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION... - */ - -class FailTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( FailTestFixture ); - CPPUNIT_TEST_FAIL( testFail ); - CPPUNIT_TEST_SUITE_END(); -public: - void testFail() - { - CPPUNIT_ASSERT_MESSAGE( "Failure", false ); - } -}; - - -class FailToFailTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( FailToFailTestFixture ); - CPPUNIT_TEST_FAIL( testFailToFail ); - CPPUNIT_TEST_SUITE_END(); -public: - void testFailToFail() - { - } -}; - - -class ExceptionTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExceptionTestFixture ); - CPPUNIT_TEST_EXCEPTION( testException, FailureException ); - CPPUNIT_TEST_SUITE_END(); -public: - void testException() - { - throw FailureException(); - } -}; - - -class ExceptionNotCaughtTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExceptionNotCaughtTestFixture ); - CPPUNIT_TEST_EXCEPTION( testExceptionNotCaught, FailureException ); - CPPUNIT_TEST_SUITE_END(); -public: - void testExceptionNotCaught() - { - } -}; - - -class CustomsTestTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( CustomsTestTestFixture ); - CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( addCustomTests ); - CPPUNIT_TEST_SUITE_END(); -public: - static void addCustomTests( TestSuiteBuilderContextType &context ) - { - MockTestCase *test1 = new MockTestCase( context.getTestNameFor( "myCustomTest1" ) ); - test1->makeRunTestThrow(); - MockTestCase *test2 = new MockTestCase( context.getTestNameFor( "myCustomTest2" ) ); - context.addTest( test1 ); - context.addTest( test2 ); - } -}; - - -#undef TEST_ADD_N_MOCK -#define TEST_ADD_N_MOCK( totalCount ) \ - { \ - for ( int count = (totalCount); count > 0; --count ) \ - CPPUNIT_TEST_SUITE_ADD_TEST( \ - new MockTestCase( context.getTestNameFor( "dummyName" ) ) ); \ - } - - - -class AddTestTestFixture : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( AddTestTestFixture ); - TEST_ADD_N_MOCK( 7 ); - CPPUNIT_TEST_SUITE_END(); -public: -}; - - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HelperMacrosTest, - helperSuiteName() ); - - -HelperMacrosTest::HelperMacrosTest() -{ -} - - -HelperMacrosTest::~HelperMacrosTest() -{ -} - - -void -HelperMacrosTest::setUp() -{ - m_testListener = new MockTestListener( "mock-testlistener" ); - m_result = new CPPUNIT_NS::TestResult(); - m_result->addListener( m_testListener ); -} - - -void -HelperMacrosTest::tearDown() -{ - delete m_result; - delete m_testListener; -} - - -void -HelperMacrosTest::testNoSubclassing() -{ - std::auto_ptr suite( BaseTestCase::suite() ); - CPPUNIT_ASSERT_EQUAL( 1, suite->countTestCases() ); - m_testListener->setExpectedStartTestCall( 1 ); - m_testListener->setExpectNoFailure(); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testSubclassing() -{ - std::auto_ptr suite( SubclassedTestCase::suite() ); - CPPUNIT_ASSERT_EQUAL( 2, suite->countTestCases() ); - m_testListener->setExpectedStartTestCall( 2 ); - m_testListener->setExpectedAddFailureCall( 1 ); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testFail() -{ - std::auto_ptr suite( FailTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 1 ); - m_testListener->setExpectNoFailure(); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testFailToFail() -{ - std::auto_ptr suite( FailToFailTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 1 ); - m_testListener->setExpectedAddFailureCall( 1 ); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testException() -{ - std::auto_ptr suite( ExceptionTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 1 ); - m_testListener->setExpectNoFailure(); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testExceptionNotCaught() -{ - std::auto_ptr suite( ExceptionNotCaughtTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 1 ); - m_testListener->setExpectedAddFailureCall( 1 ); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testCustomTests() -{ - std::auto_ptr suite( CustomsTestTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 2 ); - m_testListener->setExpectedAddFailureCall( 1 ); - - suite->run( m_result ); - m_testListener->verify(); -} - - -void -HelperMacrosTest::testAddTest() -{ - std::auto_ptr suite( AddTestTestFixture::suite() ); - m_testListener->setExpectedStartTestCall( 7 ); - m_testListener->setExpectedAddFailureCall( 0 ); - - suite->run( m_result ); - m_testListener->verify(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.h deleted file mode 100644 index 7a097975..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperMacrosTest.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef HELPERMACROSTEST_H -#define HELPERMACROSTEST_H - -#include -#include "MockTestListener.h" - - -class HelperMacrosTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( HelperMacrosTest ); - CPPUNIT_TEST( testNoSubclassing ); - CPPUNIT_TEST( testSubclassing ); - CPPUNIT_TEST( testFail ); - CPPUNIT_TEST( testFailToFail ); - CPPUNIT_TEST( testException ); - CPPUNIT_TEST( testExceptionNotCaught ); - CPPUNIT_TEST( testCustomTests ); - CPPUNIT_TEST( testAddTest ); - CPPUNIT_TEST_SUITE_END(); - -public: - HelperMacrosTest(); - virtual ~HelperMacrosTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testNoSubclassing(); - - void testSubclassing(); - - void testFail(); - void testFailToFail(); - - void testException(); - void testExceptionNotCaught(); - - void testCustomTest(); - void testCustomTests(); - void testAddTest(); - -private: - HelperMacrosTest( const HelperMacrosTest © ); - void operator =( const HelperMacrosTest © ); - -private: - CPPUNIT_NS::TestResult *m_result; - MockTestListener *m_testListener; -}; - - - -#endif // HELPERMACROSTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperSuite.h deleted file mode 100644 index 88dd3dc2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/HelperSuite.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CPPUNITTEST_HELPERSUITE_H -#define CPPUNITTEST_HELPERSUITE_H - -#include -#include - -inline std::string helperSuiteName() -{ - return "Helpers"; -} - - -#endif // CPPUNITTEST_HELPERSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.am deleted file mode 100644 index 3060a6cc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -EXTRA_DIST = CppUnitTestMain.dsw CppUnitTestMain.dsp CppUnitTestPlugIn.dsp CppUnitTestPlugIn.cpp - -TESTS = cppunittestmain -check_PROGRAMS = $(TESTS) - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - -cppunittestmain_SOURCES = \ - assertion_traitsTest.cpp \ - assertion_traitsTest.h \ - BaseTestCase.cpp \ - BaseTestCase.h \ - CoreSuite.h \ - CppUnitTestMain.cpp \ - CppUnitTestSuite.cpp \ - ExceptionTest.cpp \ - ExceptionTest.h \ - ExceptionTestCaseDecoratorTest.h \ - ExceptionTestCaseDecoratorTest.cpp \ - ExtensionSuite.h \ - FailureException.h \ - HelperMacrosTest.cpp \ - HelperMacrosTest.h \ - HelperSuite.h \ - MessageTest.h \ - MessageTest.cpp \ - MockFunctor.h \ - MockProtector.h \ - MockTestCase.h \ - MockTestCase.cpp \ - MockTestListener.cpp \ - MockTestListener.h \ - OrthodoxTest.cpp \ - OrthodoxTest.h \ - OutputSuite.h \ - RepeatedTestTest.cpp \ - RepeatedTestTest.h \ - StringToolsTest.h \ - StringToolsTest.cpp \ - SubclassedTestCase.cpp \ - SubclassedTestCase.h \ - SynchronizedTestResult.h \ - TestAssertTest.cpp \ - TestAssertTest.h \ - TestCallerTest.cpp \ - TestCallerTest.h \ - TestCaseTest.cpp \ - TestCaseTest.h \ - TestDecoratorTest.cpp \ - TestDecoratorTest.h \ - TestFailureTest.cpp \ - TestFailureTest.h \ - TestPathTest.h \ - TestPathTest.cpp \ - TestResultCollectorTest.cpp \ - TestResultCollectorTest.h \ - TestResultTest.cpp \ - TestResultTest.h \ - TestSetUpTest.cpp \ - TestSetUpTest.h \ - TestSuiteTest.cpp \ - TestSuiteTest.h \ - TestTest.cpp \ - TestTest.h \ - ToolsSuite.h \ - TrackedTestCase.cpp \ - TrackedTestCase.h \ - UnitTestToolSuite.h \ - XmlElementTest.h \ - XmlElementTest.cpp \ - XmlOutputterTest.h \ - XmlOutputterTest.cpp \ - XmlUniformiser.h \ - XmlUniformiser.cpp \ - XmlUniformiserTest.h \ - XmlUniformiserTest.cpp - -cppunittestmain_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -cppunittestmain_LDFLAGS = $(LIBADD_DL) - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.in deleted file mode 100644 index dd306b60..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/Makefile.in +++ /dev/null @@ -1,669 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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@ -TESTS = cppunittestmain$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -subdir = examples/cppunittest -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -am__EXEEXT_1 = cppunittestmain$(EXEEXT) -am_cppunittestmain_OBJECTS = assertion_traitsTest.$(OBJEXT) \ - BaseTestCase.$(OBJEXT) CppUnitTestMain.$(OBJEXT) \ - CppUnitTestSuite.$(OBJEXT) ExceptionTest.$(OBJEXT) \ - ExceptionTestCaseDecoratorTest.$(OBJEXT) \ - HelperMacrosTest.$(OBJEXT) MessageTest.$(OBJEXT) \ - MockTestCase.$(OBJEXT) MockTestListener.$(OBJEXT) \ - OrthodoxTest.$(OBJEXT) RepeatedTestTest.$(OBJEXT) \ - StringToolsTest.$(OBJEXT) SubclassedTestCase.$(OBJEXT) \ - TestAssertTest.$(OBJEXT) TestCallerTest.$(OBJEXT) \ - TestCaseTest.$(OBJEXT) TestDecoratorTest.$(OBJEXT) \ - TestFailureTest.$(OBJEXT) TestPathTest.$(OBJEXT) \ - TestResultCollectorTest.$(OBJEXT) TestResultTest.$(OBJEXT) \ - TestSetUpTest.$(OBJEXT) TestSuiteTest.$(OBJEXT) \ - TestTest.$(OBJEXT) TrackedTestCase.$(OBJEXT) \ - XmlElementTest.$(OBJEXT) XmlOutputterTest.$(OBJEXT) \ - XmlUniformiser.$(OBJEXT) XmlUniformiserTest.$(OBJEXT) -cppunittestmain_OBJECTS = $(am_cppunittestmain_OBJECTS) -cppunittestmain_DEPENDENCIES = \ - $(top_builddir)/src/cppunit/libcppunit.la -cppunittestmain_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(cppunittestmain_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(cppunittestmain_SOURCES) -DIST_SOURCES = $(cppunittestmain_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = CppUnitTestMain.dsw CppUnitTestMain.dsp CppUnitTestPlugIn.dsp CppUnitTestPlugIn.cpp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -cppunittestmain_SOURCES = \ - assertion_traitsTest.cpp \ - assertion_traitsTest.h \ - BaseTestCase.cpp \ - BaseTestCase.h \ - CoreSuite.h \ - CppUnitTestMain.cpp \ - CppUnitTestSuite.cpp \ - ExceptionTest.cpp \ - ExceptionTest.h \ - ExceptionTestCaseDecoratorTest.h \ - ExceptionTestCaseDecoratorTest.cpp \ - ExtensionSuite.h \ - FailureException.h \ - HelperMacrosTest.cpp \ - HelperMacrosTest.h \ - HelperSuite.h \ - MessageTest.h \ - MessageTest.cpp \ - MockFunctor.h \ - MockProtector.h \ - MockTestCase.h \ - MockTestCase.cpp \ - MockTestListener.cpp \ - MockTestListener.h \ - OrthodoxTest.cpp \ - OrthodoxTest.h \ - OutputSuite.h \ - RepeatedTestTest.cpp \ - RepeatedTestTest.h \ - StringToolsTest.h \ - StringToolsTest.cpp \ - SubclassedTestCase.cpp \ - SubclassedTestCase.h \ - SynchronizedTestResult.h \ - TestAssertTest.cpp \ - TestAssertTest.h \ - TestCallerTest.cpp \ - TestCallerTest.h \ - TestCaseTest.cpp \ - TestCaseTest.h \ - TestDecoratorTest.cpp \ - TestDecoratorTest.h \ - TestFailureTest.cpp \ - TestFailureTest.h \ - TestPathTest.h \ - TestPathTest.cpp \ - TestResultCollectorTest.cpp \ - TestResultCollectorTest.h \ - TestResultTest.cpp \ - TestResultTest.h \ - TestSetUpTest.cpp \ - TestSetUpTest.h \ - TestSuiteTest.cpp \ - TestSuiteTest.h \ - TestTest.cpp \ - TestTest.h \ - ToolsSuite.h \ - TrackedTestCase.cpp \ - TrackedTestCase.h \ - UnitTestToolSuite.h \ - XmlElementTest.h \ - XmlElementTest.cpp \ - XmlOutputterTest.h \ - XmlOutputterTest.cpp \ - XmlUniformiser.h \ - XmlUniformiser.cpp \ - XmlUniformiserTest.h \ - XmlUniformiserTest.cpp - -cppunittestmain_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -cppunittestmain_LDFLAGS = $(LIBADD_DL) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/cppunittest/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/cppunittest/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 - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -cppunittestmain$(EXEEXT): $(cppunittestmain_OBJECTS) $(cppunittestmain_DEPENDENCIES) - @rm -f cppunittestmain$(EXEEXT) - $(cppunittestmain_LINK) $(cppunittestmain_OBJECTS) $(cppunittestmain_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BaseTestCase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUnitTestMain.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CppUnitTestSuite.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExceptionTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExceptionTestCaseDecoratorTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HelperMacrosTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockTestCase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MockTestListener.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OrthodoxTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RepeatedTestTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringToolsTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SubclassedTestCase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestAssertTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCallerTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCaseTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDecoratorTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestFailureTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPathTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResultCollectorTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResultTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSetUpTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSuiteTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrackedTestCase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlElementTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlOutputterTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlUniformiser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlUniformiserTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assertion_traitsTest.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.cpp deleted file mode 100644 index c59544da..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.cpp +++ /dev/null @@ -1,234 +0,0 @@ -#include "CoreSuite.h" -#include "MessageTest.h" - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MessageTest, - coreSuiteName() ); - - -MessageTest::MessageTest() -{ -} - - -MessageTest::~MessageTest() -{ -} - - -void -MessageTest::setUp() -{ - m_message = new CPPUNIT_NS::Message(); -} - - -void -MessageTest::tearDown() -{ - delete m_message; -} - - -void -MessageTest::testDefaultConstructor() -{ - std::string empty; - CPPUNIT_ASSERT_EQUAL( empty, m_message->shortDescription() ); - CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() ); -} - - -void -MessageTest::testDetailAtThrowIfBadIndex() -{ - m_message->detailAt( -1 ); -} - - - -void -MessageTest::testDetailAtThrowIfBadIndex2() -{ - m_message->detailAt( 0 ); -} - - -void -MessageTest::testAddDetail() -{ - std::string expected( "first" ); - m_message->addDetail( expected ); - CPPUNIT_ASSERT_EQUAL( 1, m_message->detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected, m_message->detailAt(0) ); -} - - -void -MessageTest::testAddDetail2() -{ - std::string expected1( "first" ); - std::string expected2( "second" ); - m_message->addDetail( expected1, expected2 ); - CPPUNIT_ASSERT_EQUAL( 2, m_message->detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) ); - CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) ); -} - - -void -MessageTest::testAddDetail3() -{ - std::string expected1( "first" ); - std::string expected2( "second" ); - std::string expected3( "third" ); - m_message->addDetail( expected1, expected2, expected3 ); - CPPUNIT_ASSERT_EQUAL( 3, m_message->detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) ); - CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) ); - CPPUNIT_ASSERT_EQUAL( expected3, m_message->detailAt(2) ); -} - - -void -MessageTest::testAddDetailEmptyMessage() -{ - m_message->addDetail( CPPUNIT_NS::Message() ); - CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() ); -} - - -void -MessageTest::testAddDetailMessage() -{ - std::string expected1( "first" ); - std::string expected2( "second" ); - m_message->addDetail( CPPUNIT_NS::Message( "shortDesc", expected1, expected2 ) ); - CPPUNIT_ASSERT_EQUAL( 2, m_message->detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) ); - CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) ); -} - - -void -MessageTest::testSetShortDescription() -{ - std::string expected( "shortDesc" ); - m_message->setShortDescription( expected ); - CPPUNIT_ASSERT_EQUAL( expected, m_message->shortDescription() ); -} - - -void -MessageTest::testClearDetails() -{ - m_message->addDetail( "detail1" ); - m_message->clearDetails(); - CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() ); -} - - -void -MessageTest::testConstructor() -{ - std::string expected( "short" ); - CPPUNIT_NS::Message message( expected ); - - CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() ); - CPPUNIT_ASSERT_EQUAL( 0, message.detailCount() ); -} - - -void -MessageTest::testConstructorDetail1() -{ - std::string expected( "short" ); - std::string expected1( "detail-1" ); - CPPUNIT_NS::Message message( expected, expected1 ); - - CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() ); - CPPUNIT_ASSERT_EQUAL( 1, message.detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) ); -} - - -void -MessageTest::testConstructorDetail2() -{ - std::string expected( "short" ); - std::string expected1( "detail-1" ); - std::string expected2( "detail-2" ); - CPPUNIT_NS::Message message( expected, expected1, expected2 ); - - CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() ); - CPPUNIT_ASSERT_EQUAL( 2, message.detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) ); - CPPUNIT_ASSERT_EQUAL( expected2, message.detailAt(1) ); -} - - -void -MessageTest::testConstructorDetail3() -{ - std::string expected( "short" ); - std::string expected1( "detail-1" ); - std::string expected2( "detail-2" ); - std::string expected3( "detail-3" ); - CPPUNIT_NS::Message message( expected, expected1, expected2, expected3 ); - - CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() ); - CPPUNIT_ASSERT_EQUAL( 3, message.detailCount() ); - CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) ); - CPPUNIT_ASSERT_EQUAL( expected2, message.detailAt(1) ); - CPPUNIT_ASSERT_EQUAL( expected3, message.detailAt(2) ); -} - - -void -MessageTest::testDetailsNone() -{ - CPPUNIT_ASSERT_MESSAGE("012345678901234",true); - std::string empty; - CPPUNIT_ASSERT_EQUAL( empty, m_message->details() ); -} - - -void -MessageTest::testDetailsSome() -{ - m_message->addDetail( "Expected: 1", "Actual: 7", "Info: number" ); - std::string expected( "- Expected: 1\n- Actual: 7\n- Info: number\n" ); - std::string actual = m_message->details(); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -MessageTest::testEqual() -{ - CPPUNIT_ASSERT( *m_message == CPPUNIT_NS::Message() ); - - CPPUNIT_NS::Message message1( "short", "det1", "det2", "det3" ); - CPPUNIT_NS::Message message2( message1 ); - CPPUNIT_ASSERT( message1 == message2 ); - - CPPUNIT_ASSERT( !(*m_message == message1) ); - - CPPUNIT_NS::Message message3( "short" ); - CPPUNIT_ASSERT( !(message3 == message1) ); - - CPPUNIT_NS::Message message4( "long" ); - CPPUNIT_ASSERT( !(message3 == message4) ); - - CPPUNIT_NS::Message message5( "short", "det1", "det-2", "det3" ); - CPPUNIT_ASSERT( !(message1 == message5) ); -} - - -void -MessageTest::testNotEqual() -{ - CPPUNIT_NS::Message message1( "short", "det1", "det2", "det3" ); - CPPUNIT_NS::Message message2( "short", "det1", "det-2", "det3" ); - CPPUNIT_ASSERT( message1 != message2 ); - CPPUNIT_ASSERT( !(message1 != message1) ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.h deleted file mode 100644 index 4c757e81..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MessageTest.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef MESSAGETEST_H -#define MESSAGETEST_H - -#include -#include -#include - - -/// Unit tests for MessageTest -class MessageTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( MessageTest ); - CPPUNIT_TEST( testDefaultConstructor ); - CPPUNIT_TEST_EXCEPTION( testDetailAtThrowIfBadIndex, std::invalid_argument ); - CPPUNIT_TEST_EXCEPTION( testDetailAtThrowIfBadIndex2, std::invalid_argument ); - CPPUNIT_TEST( testAddDetail ); - CPPUNIT_TEST( testAddDetail2 ); - CPPUNIT_TEST( testAddDetail3 ); - CPPUNIT_TEST( testAddDetailEmptyMessage ); - CPPUNIT_TEST( testAddDetailMessage ); - CPPUNIT_TEST( testSetShortDescription ); - CPPUNIT_TEST( testClearDetails ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testConstructorDetail1 ); - CPPUNIT_TEST( testConstructorDetail2 ); - CPPUNIT_TEST( testConstructorDetail3 ); - CPPUNIT_TEST( testDetailsNone ); - CPPUNIT_TEST( testDetailsSome ); - CPPUNIT_TEST( testEqual ); - CPPUNIT_TEST( testNotEqual ); - CPPUNIT_TEST_SUITE_END(); - -public: - MessageTest(); - - virtual ~MessageTest(); - - void setUp(); - void tearDown(); - - void testDefaultConstructor(); - void testDetailAtThrowIfBadIndex(); - void testDetailAtThrowIfBadIndex2(); - void testAddDetail(); - void testAddDetail2(); - void testAddDetail3(); - void testAddDetailEmptyMessage(); - void testAddDetailMessage(); - void testSetShortDescription(); - void testClearDetails(); - - void testConstructor(); - void testConstructorDetail1(); - void testConstructorDetail2(); - void testConstructorDetail3(); - - void testDetailsNone(); - void testDetailsSome(); - - void testEqual(); - void testNotEqual(); - -private: - /// Prevents the use of the copy constructor. - MessageTest( const MessageTest &other ); - - /// Prevents the use of the copy operator. - void operator =( const MessageTest &other ); - -private: - CPPUNIT_NS::Message *m_message; -}; - - - -#endif // MESSAGETEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockFunctor.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockFunctor.h deleted file mode 100644 index 888273b7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockFunctor.h +++ /dev/null @@ -1,90 +0,0 @@ -#ifndef MOCKFUNCTOR_H -#define MOCKFUNCTOR_H - -#include -#include -#include "FailureException.h" -#include "MockProtector.h" - - -class MockFunctor : public CPPUNIT_NS::Functor -{ -public: - MockFunctor() - : m_shouldSucceed( true ) - , m_shouldThrow( false ) - , m_shouldThrowFailureException( false ) - , m_hasExpectation( false ) - , m_actualCallCount( 0 ) - , m_expectedCallCount( 0 ) - { - } - - - bool operator()() const - { - ++CPPUNIT_CONST_CAST(MockFunctor *,this)->m_actualCallCount; - - if ( m_shouldThrow ) - { - if ( m_shouldThrowFailureException ) - throw FailureException(); - throw MockProtectorException(); - } - - return m_shouldSucceed; - } - - void setThrowFailureException() - { - m_shouldThrow = true; - m_shouldThrowFailureException = true; - ++m_expectedCallCount; - m_hasExpectation = true; - } - - void setThrowMockProtectorException() - { - m_shouldThrow = true; - m_shouldThrowFailureException = false; - ++m_expectedCallCount; - m_hasExpectation = true; - } - - void setShouldFail() - { - m_shouldSucceed = false; - } - - void setShouldSucceed() - { - m_shouldSucceed = true; - } - - void setExpectedCallCount( int callCount =1 ) - { - m_expectedCallCount = callCount; - m_hasExpectation = true; - } - - void verify() - { - if ( m_hasExpectation ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( "MockFunctor: bad call count", - m_expectedCallCount, - m_actualCallCount ); - } - } - -private: - bool m_shouldSucceed; - bool m_shouldThrow; - bool m_shouldThrowFailureException; - bool m_hasExpectation; - int m_actualCallCount; - int m_expectedCallCount; -}; - - -#endif // MOCKFUNCTOR_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockProtector.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockProtector.h deleted file mode 100644 index ace538d3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockProtector.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef MOCKPROTECTOR_H -#define MOCKPROTECTOR_H - -#include -#include - - -class MockProtectorException : public std::runtime_error -{ -public: - MockProtectorException() - : std::runtime_error( "MockProtectorException" ) - { - } -}; - - -class MockProtector : public CPPUNIT_NS::Protector -{ -public: - MockProtector() - : m_wasCalled( false ) - , m_wasTrapped( false ) - , m_expectException( false ) - , m_hasExpectation( false ) - , m_shouldPropagateException( false ) - { - } - - bool protect( const CPPUNIT_NS::Functor &functor, - const CPPUNIT_NS::ProtectorContext &context ) - { - try - { - m_wasCalled = true; - return functor(); - } - catch ( MockProtectorException & ) - { - m_wasTrapped = true; - - if ( m_shouldPropagateException ) - throw; - - reportError( context, CPPUNIT_NS::Message("MockProtector trap") ); - } - - return false; - } - - void setExpectException() - { - m_expectException = true; - m_hasExpectation = true; - } - - void setExpectNoException() - { - m_expectException = false; - m_hasExpectation = true; - } - - void setExpectCatchAndPropagateException() - { - setExpectException(); - m_shouldPropagateException = true; - } - - void verify() - { - if ( m_hasExpectation ) - { - CPPUNIT_ASSERT_MESSAGE( "MockProtector::protect() was not called", - m_wasCalled ); - - std::string message; - if ( m_expectException ) - message = "did not catch the exception."; - else - message = "caught an unexpected exception."; - CPPUNIT_ASSERT_EQUAL_MESSAGE( "MockProtector::protect() " + message, - m_expectException, - m_wasTrapped ); - } - } - -private: - bool m_wasCalled; - bool m_wasTrapped; - bool m_expectException; - bool m_hasExpectation; - bool m_shouldPropagateException; -}; - - -#endif // MOCKPROTECTOR_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.cpp deleted file mode 100644 index 9f7c2f68..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.cpp +++ /dev/null @@ -1,190 +0,0 @@ -#include "FailureException.h" -#include "MockTestCase.h" -#include - - -MockTestCase::MockTestCase( std::string name ) - : CPPUNIT_NS::TestCase( name ) - , m_hasSetUpExpectation( false ) - , m_expectedSetUpCall( 0 ) - , m_actualSetUpCall( 0 ) - , m_hasTearDownExpectation( false ) - , m_expectedTearDownCall( 0 ) - , m_actualTearDownCall( 0 ) - , m_expectRunTestCall( false ) - , m_expectedRunTestCallCount( 0 ) - , m_actualRunTestCallCount( 0 ) - , m_expectCountTestCasesCall( false ) - , m_expectedCountTestCasesCallCount( 0 ) - , m_actualCountTestCasesCallCount( 0 ) - , m_setUpThrow( false ) - , m_tearDownThrow( false ) - , m_runTestThrow( false ) - , m_passingTest( NULL ) -{ -} - - -MockTestCase::~MockTestCase() -{ -} - - -int -MockTestCase::countTestCases() const -{ - MockTestCase *mutableThis = CPPUNIT_CONST_CAST(MockTestCase *, this ); - ++mutableThis->m_actualCountTestCasesCallCount; - if ( m_expectCountTestCasesCall ) - { - CPPUNIT_ASSERT_MESSAGE( getName() + ": unexpected MockTestCase::countTestCases() call", - m_actualCountTestCasesCallCount <= m_expectedCountTestCasesCallCount ); - } - - return SuperClass::countTestCases(); -} - - -void -MockTestCase::setUp() -{ - if ( m_hasSetUpExpectation ) - { - ++m_actualSetUpCall; - CPPUNIT_ASSERT_MESSAGE( getName() + ": unexpected MockTestCase::setUp() call", - m_actualSetUpCall <= m_expectedSetUpCall ); - } - - if ( m_setUpThrow ) - throw FailureException(); -} - -void -MockTestCase::tearDown() -{ - if ( m_hasTearDownExpectation ) - { - ++m_actualTearDownCall; - CPPUNIT_ASSERT_MESSAGE( getName() + ": unexpected MockTestCase::tearDown() call", - m_actualTearDownCall <= m_expectedTearDownCall ); - } - - if ( m_tearDownThrow ) - throw FailureException(); -} - - -void -MockTestCase::runTest() -{ - ++m_actualRunTestCallCount; - if ( m_expectRunTestCall ) - { - CPPUNIT_ASSERT_MESSAGE( getName() + ": unexpected MockTestCase::runTest() call", - m_actualRunTestCallCount <= m_expectedRunTestCallCount ); - } - - if ( m_runTestThrow ) - throw FailureException(); -} - -/* -bool -MockTestCase::findTestPath( const CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestPath &testPath ) -{ - if ( m_passingTest == test ) - { - testPath.add( this ); - return true; - } - - return false; -} -*/ - -void -MockTestCase::setExpectedSetUpCall( int callCount ) -{ - m_hasSetUpExpectation = true; - m_expectedSetUpCall = callCount; -} - - -void -MockTestCase::setExpectedTearDownCall( int callCount ) -{ -} - - -void -MockTestCase::setExpectedRunTestCall( int callCount ) -{ - m_expectRunTestCall = true; - m_expectedRunTestCallCount = callCount ; -} - - -void -MockTestCase::setExpectedCountTestCasesCall( int callCount ) -{ - m_expectCountTestCasesCall = true; - m_expectedCountTestCasesCallCount = callCount; -} - - -void -MockTestCase::makeSetUpThrow() -{ - m_setUpThrow = true; -} - - -void -MockTestCase::makeTearDownThrow() -{ - m_tearDownThrow = true; -} - - -void -MockTestCase::makeRunTestThrow() -{ - m_runTestThrow = true; -} - - -void -MockTestCase::verify() -{ - if ( m_hasSetUpExpectation ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( getName() + ": bad MockTestCase::setUp() " - "call count", - m_expectedSetUpCall, - m_actualSetUpCall ); - } - - if ( m_hasTearDownExpectation ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( getName() + ": bad MockTestCase::tearDown() " - "call count", - m_expectedTearDownCall, - m_actualTearDownCall ); - } - - if ( m_expectCountTestCasesCall ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( getName() + ": bad MockTestCase::countTestCases() " - "call count", - m_expectedCountTestCasesCallCount, - m_actualCountTestCasesCallCount ); - } - if ( m_expectRunTestCall ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( getName() + ": bad MockTestCase::runTest() " - "call count", - m_expectedRunTestCallCount, - m_actualRunTestCallCount ); - } -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.h deleted file mode 100644 index 8ff80e4b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestCase.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef MOCKTESTCASE_H -#define MOCKTESTCASE_H - -#include - - -/*! \class MockTestCase - * \brief This class represents a mock test case. - */ -class MockTestCase : public CPPUNIT_NS::TestCase -{ -public: - typedef CPPUNIT_NS::TestCase SuperClass; // work around VC++ call to super class method. - - /*! Constructs a MockTestCase object. - */ - MockTestCase( std::string name ); - - /// Destructor. - virtual ~MockTestCase(); - - void setExpectedSetUpCall( int callCount = 1 ); - void setExpectedTearDownCall( int callCount = 1 ); - void setExpectedRunTestCall( int callCount = 1 ); - void setExpectedCountTestCasesCall( int callCount = 1 ); - - void makeSetUpThrow(); - void makeTearDownThrow(); - void makeRunTestThrow(); - void makeFindTestPathPassFor( const CPPUNIT_NS::Test *testFound ); - - void verify(); - -protected: - int countTestCases() const; - void setUp(); - void tearDown(); - void runTest(); -// bool findTestPath( const CPPUNIT_NS::Test *test, -// CPPUNIT_NS::TestPath &testPath ); - -private: - /// Prevents the use of the copy constructor. - MockTestCase( const MockTestCase © ); - - /// Prevents the use of the copy operator. - void operator =( const MockTestCase © ); - -private: - bool m_hasSetUpExpectation; - int m_expectedSetUpCall; - int m_actualSetUpCall; - - bool m_hasTearDownExpectation; - int m_expectedTearDownCall; - int m_actualTearDownCall; - - bool m_expectRunTestCall; - int m_expectedRunTestCallCount; - int m_actualRunTestCallCount; - bool m_expectCountTestCasesCall; - int m_expectedCountTestCasesCallCount; - int m_actualCountTestCasesCallCount; - - bool m_setUpThrow; - bool m_tearDownThrow; - bool m_runTestThrow; - const CPPUNIT_NS::Test *m_passingTest; -}; - - - - - -#endif // MOCKTESTCASE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.cpp deleted file mode 100644 index 0cacfd36..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.cpp +++ /dev/null @@ -1,390 +0,0 @@ -#include -#include -#include "MockTestListener.h" - - -MockTestListener::MockTestListener( std::string name ) - : m_name( name ) - , m_hasExpectationForStartTest( false ) - , m_hasParametersExpectationForStartTest( false ) - , m_expectedStartTestCallCount( 0 ) - , m_startTestCall( 0 ) - , m_hasExpectationForEndTest( false ) - , m_hasParametersExpectationForEndTest( false ) - , m_expectedEndTestCallCount( 0 ) - , m_endTestCall( 0 ) - , m_hasExpectationForStartSuite( false ) - , m_hasParametersExpectationForStartSuite( false ) - , m_expectedStartSuiteCallCount( 0 ) - , m_startSuiteCall( 0 ) - , m_hasExpectationForEndSuite( false ) - , m_hasParametersExpectationForEndSuite( false ) - , m_expectedEndSuiteCallCount( 0 ) - , m_endSuiteCall( 0 ) - , m_hasExpectationForStartTestRun( false ) - , m_hasParametersExpectationForStartTestRun( false ) - , m_expectedStartTestRunCallCount( 0 ) - , m_startTestRunCall( 0 ) - , m_hasExpectationForEndTestRun( false ) - , m_hasParametersExpectationForEndTestRun( false ) - , m_expectedEndTestRunCallCount( 0 ) - , m_endTestRunCall( 0 ) - , m_hasExpectationForAddFailure( false ) - , m_hasExpectationForSomeFailure( false ) - , m_hasParametersExpectationForAddFailure( false ) - , m_expectedAddFailureCallCount( 0 ) - , m_addFailureCall( 0 ) - , m_expectedFailedTest( NULL ) - , m_expectedException( NULL ) - , m_expectedIsError( false ) -{ -} - - -void -MockTestListener::setExpectFailure( CPPUNIT_NS::Test *failedTest, - CPPUNIT_NS::Exception *thrownException, - bool isError ) -{ - m_hasExpectationForAddFailure = true; - m_hasParametersExpectationForAddFailure = true; - m_expectedAddFailureCallCount = 1; - m_expectedFailedTest = failedTest; - m_expectedException = thrownException; - m_expectedIsError = isError; -} - - -void -MockTestListener::setExpectNoFailure() -{ - m_hasExpectationForAddFailure = true; - m_expectedAddFailureCallCount = 0; -} - - -void -MockTestListener::setExpectFailure() -{ - m_hasExpectationForSomeFailure = true; -} - - -void -MockTestListener::setExpectedAddFailureCall( int callCount ) -{ - m_hasExpectationForAddFailure = true; - m_expectedAddFailureCallCount = callCount; -} - - -void -MockTestListener::setExpectStartTest( CPPUNIT_NS::Test *test ) -{ - m_hasExpectationForStartTest = true; - m_hasParametersExpectationForStartTest = true; - m_expectedStartTestCallCount = 1; - m_expectedStartTest = test; -} - - -void -MockTestListener::setExpectedStartTestCall( int callCount ) -{ - m_hasExpectationForStartTest = true; - m_expectedStartTestCallCount = callCount; -} - - -void -MockTestListener::setExpectEndTest( CPPUNIT_NS::Test *test ) -{ - m_hasExpectationForEndTest = true; - m_hasParametersExpectationForEndTest = true; - m_expectedEndTestCallCount = 1; - m_expectedEndTest = test; -} - - -void -MockTestListener::setExpectedEndTestCall( int callCount ) -{ - m_hasExpectationForEndTest = true; - m_expectedEndTestCallCount = callCount; -} - - -void -MockTestListener::setExpectStartSuite( CPPUNIT_NS::Test *test ) -{ - m_hasExpectationForStartSuite = true; - m_hasParametersExpectationForStartSuite = true; - m_expectedStartSuiteCallCount = 1; - m_expectedStartSuite = test; -} - - -void -MockTestListener::setExpectedStartSuiteCall( int callCount ) -{ - m_hasExpectationForStartSuite = true; - m_expectedStartSuiteCallCount = callCount; -} - - -void -MockTestListener::setExpectEndSuite( CPPUNIT_NS::Test *test ) -{ - m_hasExpectationForEndSuite = true; - m_hasParametersExpectationForEndSuite = true; - m_expectedEndSuiteCallCount = 1; - m_expectedEndSuite = test; -} - - -void -MockTestListener::setExpectedEndSuiteCall( int callCount ) -{ - m_hasExpectationForEndSuite = true; - m_expectedEndSuiteCallCount = callCount; -} - - -void -MockTestListener::setExpectStartTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - m_hasExpectationForStartTestRun = true; - m_hasParametersExpectationForStartTestRun = true; - m_expectedStartTestRunCallCount = 1; - m_expectedStartTestRun = test; - m_expectedStartTestRun2 = eventManager; -} - - -void -MockTestListener::setExpectedStartTestRunCall( int callCount ) -{ - m_hasExpectationForStartTestRun = true; - m_expectedStartTestRunCallCount = callCount; -} - - -void -MockTestListener::setExpectEndTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - m_hasExpectationForEndTestRun = true; - m_hasParametersExpectationForEndTestRun = true; - m_expectedEndTestRunCallCount = 1; - m_expectedEndTestRun = test; - m_expectedEndTestRun2 = eventManager; -} - - -void -MockTestListener::setExpectedEndTestRunCall( int callCount ) -{ - m_hasExpectationForEndTestRun = true; - m_expectedEndTestRunCallCount = callCount; -} - - -void -MockTestListener::addFailure( const CPPUNIT_NS::TestFailure &failure ) -{ - if ( m_hasExpectationForAddFailure || m_hasExpectationForSomeFailure ) - ++m_addFailureCall; - - if ( m_hasExpectationForAddFailure ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_addFailureCall <= m_expectedAddFailureCallCount ); - } - - if ( m_hasParametersExpectationForAddFailure ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedFailedTest == failure.failedTest() ); - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad thrownException", - m_expectedException == failure.thrownException() ); - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad isError", - m_expectedIsError == failure.isError() ); - } -} - - -void -MockTestListener::startTest( CPPUNIT_NS::Test *test ) -{ - if ( m_hasExpectationForStartTest ) - { - ++m_startTestCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_startTestCall <= m_expectedStartTestCallCount ); - - } - - if ( m_hasParametersExpectationForStartTest ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedStartTest == test ); - } -} - - -void -MockTestListener::endTest( CPPUNIT_NS::Test *test ) -{ - if ( m_hasExpectationForEndTest ) - { - ++m_endTestCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_endTestCall <= m_expectedEndTestCallCount ); - } - - if ( m_hasParametersExpectationForEndTest ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedEndTest == test ); - } -} - - -void -MockTestListener::startSuite( CPPUNIT_NS::Test *test ) -{ - if ( m_hasExpectationForStartSuite ) - { - ++m_startSuiteCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_startSuiteCall <= m_expectedStartSuiteCallCount ); - } - - if ( m_hasParametersExpectationForStartSuite ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedStartSuite == test ); - } -} - - -void -MockTestListener::endSuite( CPPUNIT_NS::Test *test ) -{ - if ( m_hasExpectationForEndSuite ) - { - ++m_endSuiteCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_endSuiteCall <= m_expectedEndSuiteCallCount ); - } - - if ( m_hasParametersExpectationForEndSuite ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedEndSuite == test ); - } -} - - -void -MockTestListener::startTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - if ( m_hasExpectationForStartTestRun ) - { - ++m_startTestRunCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_startTestRunCall <= m_expectedStartTestRunCallCount ); - } - - if ( m_hasParametersExpectationForStartTestRun ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedStartTestRun == test ); - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad eventManager", - m_expectedStartTestRun2 == eventManager ); - } -} - - -void -MockTestListener::endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ) -{ - if ( m_hasExpectationForEndTestRun ) - { - ++m_endTestRunCall; - CPPUNIT_ASSERT_MESSAGE( m_name + ": unexpected call", - m_endTestRunCall <= m_expectedEndTestRunCallCount ); - } - - if ( m_hasParametersExpectationForEndTestRun ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad test", - m_expectedEndTestRun == test ); - CPPUNIT_ASSERT_MESSAGE( m_name + ": bad eventManager", - m_expectedEndTestRun2 == eventManager ); - } -} - - -void -MockTestListener::verify() -{ - if ( m_hasExpectationForStartTest ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing startTest calls", - m_expectedStartTestCallCount, - m_startTestCall ); - } - - if ( m_hasExpectationForEndTest ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing endTest calls", - m_expectedEndTestCallCount, - m_endTestCall ); - } - - if ( m_hasExpectationForStartSuite ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing startSuite calls", - m_expectedStartSuiteCallCount, - m_startSuiteCall ); - } - - if ( m_hasExpectationForEndSuite ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing endSuite calls", - m_expectedEndSuiteCallCount, - m_endSuiteCall ); - } - - if ( m_hasExpectationForStartTestRun ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing startTestRun calls", - m_expectedStartTestRunCallCount, - m_startTestRunCall ); - } - - if ( m_hasExpectationForEndTestRun ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing endTestRun calls", - m_expectedEndTestRunCallCount, - m_endTestRunCall ); - } - - if ( m_hasExpectationForAddFailure ) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( m_name + ": missing addFailure calls", - m_expectedAddFailureCallCount, - m_addFailureCall ); - } - - if ( m_hasExpectationForSomeFailure ) - { - CPPUNIT_ASSERT_MESSAGE( m_name + ": there was no call to " - "MockTestListener::addFailure()", - m_addFailureCall > 0 ); - } -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.h deleted file mode 100644 index 17f2dfae..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/MockTestListener.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef MOCKTESTLISTENER_H -#define MOCKTESTLISTENER_H - -#include -#include - - -class MockTestListener : public CPPUNIT_NS::TestListener -{ -public: - MockTestListener( std::string name ); - virtual ~MockTestListener() {} - - void setExpectFailure( CPPUNIT_NS::Test *failedTest, - CPPUNIT_NS::Exception *thrownException, - bool isError ); - void setExpectNoFailure(); - void setExpectFailure(); - void setExpectedAddFailureCall( int callCount ); - void setExpectStartTest( CPPUNIT_NS::Test *test ); - void setExpectedStartTestCall( int callCount ); - void setExpectEndTest( CPPUNIT_NS::Test *test ); - void setExpectedEndTestCall( int callCount ); - void setExpectStartSuite( CPPUNIT_NS::Test *suite ); - void setExpectedStartSuiteCall( int callCount ); - void setExpectEndSuite( CPPUNIT_NS::Test *suite ); - void setExpectedEndSuiteCall( int callCount ); - void setExpectStartTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - void setExpectedStartTestRunCall( int callCount ); - void setExpectEndTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - void setExpectedEndTestRunCall( int callCount ); - - void addFailure( const CPPUNIT_NS::TestFailure &failure ); - void startTest( CPPUNIT_NS::Test *test ); - void endTest( CPPUNIT_NS::Test *test ); - void startSuite( CPPUNIT_NS::Test *suite ); - void endSuite( CPPUNIT_NS::Test *suite ); - void startTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - void endTestRun( CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestResult *eventManager ); - - void verify(); - -private: - std::string m_name; - - bool m_hasExpectationForStartTest; - bool m_hasParametersExpectationForStartTest; - int m_expectedStartTestCallCount; - int m_startTestCall; - CPPUNIT_NS::Test *m_expectedStartTest; - - bool m_hasExpectationForEndTest; - bool m_hasParametersExpectationForEndTest; - int m_expectedEndTestCallCount; - CPPUNIT_NS::Test *m_expectedEndTest; - int m_endTestCall; - - bool m_hasExpectationForStartSuite; - bool m_hasParametersExpectationForStartSuite; - int m_expectedStartSuiteCallCount; - CPPUNIT_NS::Test *m_expectedStartSuite; - int m_startSuiteCall; - - bool m_hasExpectationForEndSuite; - bool m_hasParametersExpectationForEndSuite; - int m_expectedEndSuiteCallCount; - CPPUNIT_NS::Test *m_expectedEndSuite; - int m_endSuiteCall; - - bool m_hasExpectationForStartTestRun; - bool m_hasParametersExpectationForStartTestRun; - int m_expectedStartTestRunCallCount; - CPPUNIT_NS::Test *m_expectedStartTestRun; - CPPUNIT_NS::TestResult *m_expectedStartTestRun2; - int m_startTestRunCall; - - bool m_hasExpectationForEndTestRun; - bool m_hasParametersExpectationForEndTestRun; - int m_expectedEndTestRunCallCount; - CPPUNIT_NS::Test *m_expectedEndTestRun; - CPPUNIT_NS::TestResult *m_expectedEndTestRun2; - int m_endTestRunCall; - - bool m_hasExpectationForAddFailure; - bool m_hasExpectationForSomeFailure; - bool m_hasParametersExpectationForAddFailure; - int m_expectedAddFailureCallCount; - int m_addFailureCall; - CPPUNIT_NS::Test *m_expectedFailedTest; - CPPUNIT_NS::Exception *m_expectedException; - bool m_expectedIsError; -}; - - - -// Inlines methods for MockTestListener: -// ------------------------------------- - - - -#endif // MOCKTESTLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.cpp deleted file mode 100644 index ae1edb36..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.cpp +++ /dev/null @@ -1,103 +0,0 @@ -#include "ExtensionSuite.h" -#include "OrthodoxTest.h" -#include -#include - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OrthodoxTest, - extensionSuiteName() ); - -OrthodoxTest::OrthodoxTest() -{ -} - - -OrthodoxTest::~OrthodoxTest() -{ -} - - -void -OrthodoxTest::setUp() -{ - m_testListener = new MockTestListener( "mock-listener" ); - m_result = new CPPUNIT_NS::TestResult(); - m_result->addListener( m_testListener ); -} - - -void -OrthodoxTest::tearDown() -{ - delete m_result; - delete m_testListener; -} - - -void -OrthodoxTest::testValue() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectNoFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadConstructor() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadInvert() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadEqual() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadNotEqual() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadCall() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} - - -void -OrthodoxTest::testValueBadAssignment() -{ - CPPUNIT_NS::Orthodox test; - m_testListener->setExpectFailure(); - test.run( m_result ); - m_testListener->verify(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.h deleted file mode 100644 index 422c0746..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OrthodoxTest.h +++ /dev/null @@ -1,178 +0,0 @@ -#ifndef ORTHODOXTEST_H -#define ORTHODOXTEST_H - -#include -#include "MockTestListener.h" - - -class OrthodoxTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( OrthodoxTest ); - CPPUNIT_TEST( testValue ); - CPPUNIT_TEST( testValueBadConstructor ); - CPPUNIT_TEST( testValueBadInvert ); - CPPUNIT_TEST( testValueBadEqual ); - CPPUNIT_TEST( testValueBadNotEqual ); - CPPUNIT_TEST( testValueBadCall ); - CPPUNIT_TEST( testValueBadAssignment ); - CPPUNIT_TEST_SUITE_END(); - -public: - OrthodoxTest(); - virtual ~OrthodoxTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testValue(); - void testValueBadConstructor(); - void testValueBadInvert(); - void testValueBadEqual(); - void testValueBadNotEqual(); - void testValueBadCall(); - void testValueBadAssignment(); - -private: - class Value - { - public: - Value( int value =0 ) : m_value( value ) {} - - Value& operator= ( const Value& v ) - { - m_value = v.m_value; - return *this; - } - - bool operator ==( const Value &other ) const - { - return m_value == other.m_value; - } - - bool operator !=( const Value &other ) - { - return !( *this == other ); - } - - Value operator !() - { - return Value( -1 - m_value ); - } - - protected: - int m_value; - }; - - - class ValueBadConstructor : public Value - { - public: - ValueBadConstructor() - { - static int serialNumber = 0; - m_value = ++serialNumber; - } - - ValueBadConstructor( int value ) : Value( value ) {} - - ValueBadConstructor operator !() - { - return ValueBadConstructor( -1 - m_value ); - } - }; - - - class ValueBadInvert : public Value - { - public: - ValueBadInvert( int value =0 ) : Value( value ) {} - - ValueBadInvert operator !() - { - return ValueBadInvert( 1 ); - } - }; - - - class ValueBadEqual : public Value - { - public: - ValueBadEqual( int value =0 ) : Value( value ) {} - - ValueBadEqual operator !() - { - return ValueBadEqual( -1 - m_value ); - } - - bool operator ==( const ValueBadEqual &other ) const - { - return m_value != other.m_value; - } - }; - - - class ValueBadNotEqual : public Value - { - public: - ValueBadNotEqual( int value =0 ) : Value( value ) {} - - ValueBadNotEqual operator !() - { - return ValueBadNotEqual( -1 - m_value ); - } - - bool operator !=( const ValueBadNotEqual &other ) - { - return m_value == other.m_value; - } - }; - - - class ValueBadCall : public Value - { - public: - ValueBadCall( int value =0 ) : Value( value ) {} - - ValueBadCall( const ValueBadCall &other ) - { - static int serialNumber = 0; - m_value = ++serialNumber; - } - - ValueBadCall operator !() - { - return ValueBadCall( -1 - m_value ); - } - }; - - - class ValueBadAssignment: public Value - { - public: - ValueBadAssignment( int value =0 ) : Value( value ) {} - - ValueBadAssignment operator !() - { - return ValueBadAssignment( -1 - m_value ); - } - - ValueBadAssignment &operator =( const ValueBadAssignment &other ) - { - ++m_value; - return *this; - } - }; - - - - OrthodoxTest( const OrthodoxTest © ); - void operator =( const OrthodoxTest © ); - -private: - CPPUNIT_NS::TestResult *m_result; - MockTestListener *m_testListener; -}; - - - -#endif // ORTHODOXTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OutputSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OutputSuite.h deleted file mode 100644 index 492d0541..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/OutputSuite.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CPPUNITTEST_OUTPUTSUITE_H -#define CPPUNITTEST_OUTPUTSUITE_H - -#include -#include - -inline std::string outputSuiteName() -{ - return "Output"; -} - - -#endif // CPPUNITTEST_OUTPUTSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.cpp deleted file mode 100644 index 70d55c70..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "ExtensionSuite.h" -#include "RepeatedTestTest.h" -#include -#include - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RepeatedTestTest, - extensionSuiteName() ); - - -RepeatedTestTest::RepeatedTestTest() : - m_repeatCount( 17 ) -{ -} - - -RepeatedTestTest::~RepeatedTestTest() -{ -} - - -void -RepeatedTestTest::setUp() -{ - m_test = new RunCountTest(); - m_repeatedTest = new CPPUNIT_NS::RepeatedTest( m_test, m_repeatCount ); -} - - -void -RepeatedTestTest::tearDown() -{ - delete m_repeatedTest; -} - - -void -RepeatedTestTest::testRun() -{ - CPPUNIT_NS::TestResult result; - m_repeatedTest->run( &result ); - - CPPUNIT_ASSERT_EQUAL( 17, m_test->m_runCount ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.h deleted file mode 100644 index 609fed4a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/RepeatedTestTest.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef REPEATEDTESTTEST_H -#define REPEATEDTESTTEST_H - -#include - - -class RepeatedTestTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( RepeatedTestTest ); - CPPUNIT_TEST( testRun ); - CPPUNIT_TEST_SUITE_END(); - -public: - RepeatedTestTest(); - virtual ~RepeatedTestTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testRun(); - -private: - class RunCountTest : public CPPUNIT_NS::TestCase - { - public: - RunCountTest() : m_runCount( 0 ) {} - - void runTest() - { - ++m_runCount; - } - - int m_runCount; - }; - - RepeatedTestTest( const RepeatedTestTest © ); - void operator =( const RepeatedTestTest © ); - -private: - RunCountTest *m_test; - CPPUNIT_NS::Test *m_repeatedTest; - const int m_repeatCount; -}; - - - -#endif // REPEATEDTESTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.cpp deleted file mode 100644 index 5682767c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.cpp +++ /dev/null @@ -1,233 +0,0 @@ -#include -#include "StringToolsTest.h" - -CPPUNIT_TEST_SUITE_REGISTRATION( StringToolsTest ); - - -StringToolsTest::StringToolsTest() -{ -} - - -StringToolsTest::~StringToolsTest() -{ -} - - -void -StringToolsTest::setUp() -{ -} - - -void -StringToolsTest::tearDown() -{ -} - - -void -StringToolsTest::testToStringInt() -{ - std::string expected = "123456789"; - std::string actual = CPPUNIT_NS::StringTools::toString( 123456789 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testToStringDouble() -{ - std::string expected = "1234.56"; - std::string actual = CPPUNIT_NS::StringTools::toString( 1234.56 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testSplitEmptyString() -{ - std::string text; - CPPUNIT_NS::StringTools::Strings expected; - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitOneItem() -{ - std::string text = "1"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "1" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitItemEmpty() -{ - std::string text = "1;"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "1" ); - expected.push_back( "" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitTwoItem() -{ - std::string text = "2;1"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "2" ); - expected.push_back( "1" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitEmptyTwoItem() -{ - std::string text = ";1;2"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "" ); - expected.push_back( "1" ); - expected.push_back( "2" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitEmptyItemEmpty() -{ - std::string text = ";1;"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "" ); - expected.push_back( "1" ); - expected.push_back( "" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testSplitEmptyItemEmptyEmptyItem() -{ - std::string text = ";1;;;2"; - CPPUNIT_NS::StringTools::Strings expected; - expected.push_back( "" ); - expected.push_back( "1" ); - expected.push_back( "" ); - expected.push_back( "" ); - expected.push_back( "2" ); - CPPUNIT_NS::StringTools::Strings actual = CPPUNIT_NS::StringTools::split( text, ';' ); - - CPPUNIT_ASSERT_EQUAL( expected.size(), actual.size() ); - CPPUNIT_ASSERT( expected == actual ); -} - - -void -StringToolsTest::testWrapEmpty() -{ - std::string text = ""; - std::string expected = ""; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapNotNeeded() -{ - std::string text = "abcd"; - std::string expected = text; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapLimitNotNeeded() -{ - std::string text = "abcdef"; - std::string expected = text; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapOneNeeded() -{ - std::string text = "abcdefghi"; - std::string expected = "abcdef\nghi"; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapTwoNeeded() -{ - std::string text = "abcdefghijklmnop"; - std::string expected = "abcdef\nghijkl\nmnop"; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapLimitTwoNeeded() -{ - std::string text = "abcdefghijklmnopqr"; - std::string expected = "abcdef\nghijkl\nmnopqr"; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapOneNeededTwoNeeded() -{ - std::string text = "123456789\nabcdefghijklmno"; - std::string expected = "123456\n789\nabcdef\nghijkl\nmno"; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -StringToolsTest::testWrapNotNeededEmptyLinesOneNeeded() -{ - std::string text = "12345\n\n\n\nabcdefghi"; - std::string expected = "12345\n\n\n\nabcdef\nghi"; - - std::string actual = CPPUNIT_NS::StringTools::wrap( text, 6 ); - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.h deleted file mode 100644 index 05a834ac..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/StringToolsTest.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef STRINGTOOLSTEST_H -#define STRINGTOOLSTEST_H - -#include -#include - - -/// Unit tests for StringToolsTest -class StringToolsTest : public CPPUNIT_NS::TestCase -{ - CPPUNIT_TEST_SUITE( StringToolsTest ); - CPPUNIT_TEST( testToStringInt ); - CPPUNIT_TEST( testToStringDouble ); - CPPUNIT_TEST( testSplitEmptyString ); - CPPUNIT_TEST( testSplitOneItem ); - CPPUNIT_TEST( testSplitItemEmpty ); - CPPUNIT_TEST( testSplitTwoItem ); - CPPUNIT_TEST( testSplitEmptyTwoItem ); - CPPUNIT_TEST( testSplitEmptyItemEmpty ); - CPPUNIT_TEST( testSplitEmptyItemEmptyEmptyItem ); - CPPUNIT_TEST( testWrapEmpty ); - CPPUNIT_TEST( testWrapNotNeeded ); - CPPUNIT_TEST( testWrapLimitNotNeeded ); - CPPUNIT_TEST( testWrapOneNeeded ); - CPPUNIT_TEST( testWrapTwoNeeded ); - CPPUNIT_TEST( testWrapLimitTwoNeeded ); - CPPUNIT_TEST( testWrapOneNeededTwoNeeded ); - CPPUNIT_TEST( testWrapNotNeededEmptyLinesOneNeeded ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a StringToolsTest object. - */ - StringToolsTest(); - - /// Destructor. - virtual ~StringToolsTest(); - - void setUp(); - void tearDown(); - - void testToStringInt(); - void testToStringDouble(); - - void testSplitEmptyString(); - void testSplitOneItem(); - void testSplitItemEmpty(); - void testSplitTwoItem(); - void testSplitEmptyTwoItem(); - void testSplitEmptyItemEmpty(); - void testSplitEmptyItemEmptyEmptyItem(); - - void testWrapEmpty(); - void testWrapNotNeeded(); - void testWrapLimitNotNeeded(); - void testWrapOneNeeded(); - void testWrapTwoNeeded(); - void testWrapLimitTwoNeeded(); - void testWrapOneNeededTwoNeeded(); - void testWrapNotNeededEmptyLinesOneNeeded(); - -private: - /// Prevents the use of the copy constructor. - StringToolsTest( const StringToolsTest &other ); - - /// Prevents the use of the copy operator. - void operator =( const StringToolsTest &other ); - -private: -}; - - - -#endif // STRINGTOOLSTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.cpp deleted file mode 100644 index a648f8b5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include "SubclassedTestCase.h" - - -SubclassedTestCase::SubclassedTestCase() -{ -} - - -SubclassedTestCase::~SubclassedTestCase() -{ -} - - -void -SubclassedTestCase::setUp() -{ -} - - -void -SubclassedTestCase::tearDown() -{ -} - - -void -SubclassedTestCase::checkIt() -{ - CPPUNIT_ASSERT( false ); -} - - -void -SubclassedTestCase::testSubclassing() -{ -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.h deleted file mode 100644 index 84e6e7ff..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SubclassedTestCase.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef SUBCLASSEDTESTCASE_H -#define SUBCLASSEDTESTCASE_H - -#include "BaseTestCase.h" - - -class SubclassedTestCase : public BaseTestCase -{ - CPPUNIT_TEST_SUB_SUITE( SubclassedTestCase, BaseTestCase ); - CPPUNIT_TEST( testSubclassing ); - CPPUNIT_TEST_SUITE_END(); - -public: - SubclassedTestCase(); - virtual ~SubclassedTestCase(); - - virtual void setUp(); - virtual void tearDown(); - - // Another test to ensure the subclassed test case are in the suite . - void testSubclassing(); - -protected: - // We overload this method to ensure that the testUsingCheckIt in the - // parent class will fail. - virtual void checkIt(); - -private: - SubclassedTestCase( const SubclassedTestCase © ); - void operator =( const SubclassedTestCase © ); -}; - - - -#endif // SUBCLASSEDTESTCASE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SynchronizedTestResult.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SynchronizedTestResult.h deleted file mode 100644 index 284a6396..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/SynchronizedTestResult.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef SYNCHRONIZEDTESTRESULT_H -#define SYNCHRONIZEDTESTRESULT_H - -#include - - -class SynchronizedTestResult : public CPPUNIT_NS::TestResultCollector -{ -public: - - class SynchronizationObjectListener - { - public: - virtual ~SynchronizationObjectListener() {} - virtual void locked() {} - virtual void unlocked() {} - }; - - class ObservedSynchronizationObject : public CPPUNIT_NS::SynchronizedObject::SynchronizationObject - { - public: - ObservedSynchronizationObject( SynchronizationObjectListener *listener ) : - m_listener( listener ) - { - } - - virtual ~ObservedSynchronizationObject() - { - } - - virtual void lock() - { - m_listener->locked(); - } - - virtual void unlock() - { - m_listener->unlocked(); - } - - private: - SynchronizationObjectListener *m_listener; - }; - - - SynchronizedTestResult( SynchronizationObjectListener *listener ) - { - setSynchronizationObject( new ObservedSynchronizationObject( listener ) ); - } - - virtual ~SynchronizedTestResult() {} - -}; - -#endif // SYNCHRONIZEDTESTRESULT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.cpp deleted file mode 100644 index 3960b8ed..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.cpp +++ /dev/null @@ -1,269 +0,0 @@ -#include "CoreSuite.h" -#include "TestAssertTest.h" -#include -#include -#include - -/* - Note: - - tests need to be added to test asserEquals() template function and - use of assertion traits. Some check may need to be added to check - the message content in Exception. - - code need to be refactored with the use of a test caller that expect - an exception. - */ - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestAssertTest, - coreSuiteName() ); - - -TestAssertTest::TestAssertTest() -{ -} - - -TestAssertTest::~TestAssertTest() -{ -} - - -void -TestAssertTest::setUp() -{ -} - - -void -TestAssertTest::tearDown() -{ -} - - -void -TestAssertTest::testAssertThrow() -{ - CPPUNIT_ASSERT_THROW( throw std::string(), std::string ); - - try - { - int x; - CPPUNIT_ASSERT_THROW( x = 1234, std::string ); - } - catch ( CPPUNIT_NS::Exception & ) - { - return; - } - - throw std::exception(); -} - - -void -TestAssertTest::testAssertNoThrow() -{ - int x; - CPPUNIT_ASSERT_NO_THROW( x = 1234 ); - - try - { - CPPUNIT_ASSERT_NO_THROW( throw std::exception() ); - } - catch ( CPPUNIT_NS::Exception & ) - { - return; - } - throw std::exception(); -} - - -void -TestAssertTest::testAssertAssertionFail() -{ - CPPUNIT_ASSERT_ASSERTION_FAIL( throw CPPUNIT_NS::Exception() ); - - try - { - int x; - CPPUNIT_ASSERT_ASSERTION_FAIL( x = 1234 ); - } - catch ( CPPUNIT_NS::Exception & ) - { - return; - } - - throw std::exception(); -} - - -void -TestAssertTest::testAssertAssertionPass() -{ - int x; - CPPUNIT_ASSERT_ASSERTION_PASS( x = 1234 ); - - try - { - CPPUNIT_ASSERT_ASSERTION_PASS( throw CPPUNIT_NS::Exception() ); - } - catch ( CPPUNIT_NS::Exception & ) - { - return; - } - - throw std::exception(); -} - - -void -TestAssertTest::testAssert() -{ - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( true ) ); - - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT( false ) ); -} - - -static int foo() { return 1; } - - -void -TestAssertTest::testAssertEqual() -{ - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_EQUAL( 1, 1 ) ); - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_EQUAL( 1, foo() ) ); - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_EQUAL( 12345678, 12345678 ) ); - - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_EQUAL( 1, 2 ) ); -} - -void -TestAssertTest::testAssertMessageTrue() -{ - CPPUNIT_ASSERT_ASSERTION_PASS( - CPPUNIT_ASSERT_MESSAGE( "This test should not failed", true ) ); -} - - -void -TestAssertTest::testAssertMessageFalse() -{ - bool exceptionCaught = false; - std::string message( "This test message should not be seen" ); - try - { - CPPUNIT_ASSERT_MESSAGE( message, 2==3 ); - } - catch( CPPUNIT_NS::Exception &e ) - { - exceptionCaught = true; // ok, we were expecting an exception. - checkMessageContains( &e, message ); - } - - CPPUNIT_ASSERT( exceptionCaught ); -} - - -void -TestAssertTest::testAssertDoubleEquals() -{ - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.1, 1.2, 0.101 ) ); - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.2, 1.1, 0.101 ) ); - - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.1, 1.2, 0.09 ) ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.2, 1.1, 0.09 ) ); -} - -/* - * Test that the error message from CPPUNIT_ASSERT_DOUBLES_EQUAL() - * has more than the default 6 digits of precision. - */ -void -TestAssertTest::testAssertDoubleEqualsPrecision() -{ - std::string failure( "2.000000001" ); - try - { - CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, 2.000000001, 1 ); - } - catch( CPPUNIT_NS::Exception &e ) - { - checkMessageContains( &e, failure ); - return; - } - CPPUNIT_FAIL( "Expected assertion failure" ); -} - - -void -TestAssertTest::testAssertDoubleNonFinite() -{ - double inf = std::numeric_limits::infinity(); - double nan = std::numeric_limits::quiet_NaN(); - // test our portable floating-point primitives that detect NaN values - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsUnordered( nan ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( inf ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( -inf ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( 1.0 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( 1.5 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( 2.0 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( 2.5 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( 0.0 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( -1.0 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsUnordered( -2.0 ) ); - // test our portable floating-point primitives that detect finite values - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 0.0 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 0.5 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 1.0 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 1.5 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 2.0 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( 2.5 ) ); - CPPUNIT_ASSERT( CPPUNIT_NS::floatingPointIsFinite( -1.5 ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsFinite( nan ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsFinite( inf ) ); - CPPUNIT_ASSERT( !CPPUNIT_NS::floatingPointIsFinite( -inf ) ); - // Infinity tests - CPPUNIT_ASSERT( inf == inf ); - CPPUNIT_ASSERT( -inf == -inf ); - CPPUNIT_ASSERT( -inf != inf ); - CPPUNIT_ASSERT( -inf < inf ); - CPPUNIT_ASSERT( inf > -inf ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, 0.0, 1.0 ) ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, inf, 1.0 ) ); - CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, inf, 1.0 ) ); - // NaN tests - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, 0.0, 1.0 ) ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, nan, 1.0 ) ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, inf, 1.0 ) ); - CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, nan, 1.0 ) ); -} - - -void -TestAssertTest::testFail() -{ - bool exceptionCaught = false; - std::string failure( "FailureMessage" ); - try - { - CPPUNIT_FAIL( failure ); - } - catch( CPPUNIT_NS::Exception &e ) - { - exceptionCaught = true; - checkMessageContains( &e, failure ); - } - CPPUNIT_ASSERT( exceptionCaught ); -} - - -void -TestAssertTest::checkMessageContains( CPPUNIT_NS::Exception *e, - std::string expected ) -{ - std::string actual = e->what(); - CPPUNIT_ASSERT_MESSAGE( "Expected message not found: " + expected + - ", was: " + actual, - std::search( actual.begin(), actual.end(), - expected.begin(), expected.end() ) != actual.end() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.h deleted file mode 100644 index a672d38f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestAssertTest.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef TESTASSERTTEST_H -#define TESTASSERTTEST_H - -#include - - -class TestAssertTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestAssertTest ); - CPPUNIT_TEST( testAssertThrow ); - CPPUNIT_TEST( testAssertNoThrow ); - CPPUNIT_TEST( testAssertAssertionFail ); - CPPUNIT_TEST( testAssertAssertionPass ); - CPPUNIT_TEST( testAssert ); - CPPUNIT_TEST( testAssertEqual ); - CPPUNIT_TEST( testAssertMessageTrue ); - CPPUNIT_TEST( testAssertMessageFalse ); - CPPUNIT_TEST( testAssertDoubleEquals ); - CPPUNIT_TEST( testAssertDoubleEqualsPrecision ); - CPPUNIT_TEST( testAssertDoubleNonFinite ); - CPPUNIT_TEST( testFail ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestAssertTest(); - - virtual ~TestAssertTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testAssertThrow(); - void testAssertNoThrow(); - void testAssertAssertionFail(); - void testAssertAssertionPass(); - - void testBasicAssertions(); - - void testAssert(); - - void testAssertEqual(); - - void testAssertMessageTrue(); - void testAssertMessageFalse(); - - void testAssertDoubleEquals(); - void testAssertDoubleEqualsPrecision(); - void testAssertDoubleNonFinite(); - - void testAssertLongEquals(); - void testAssertLongNotEquals(); - - void testFail(); - -private: - TestAssertTest( const TestAssertTest © ); - void operator =( const TestAssertTest © ); - - void checkDoubleNotEquals( double expected, - double actual, - double delta ); - - void checkMessageContains( CPPUNIT_NS::Exception *e, - std::string expectedMessage ); - -private: -}; - -#endif // TESTASSERTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.cpp deleted file mode 100644 index f5f4d7d3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "FailureException.h" -#include "HelperSuite.h" -#include "TestCallerTest.h" -#include - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCallerTest, - helperSuiteName() ); - - -void -TestCallerTest::ExceptionThrower::testThrowFailureException() -{ - throw FailureException(); -} - - -void -TestCallerTest::ExceptionThrower::testThrowException() -{ - throw CPPUNIT_NS::Exception( CPPUNIT_NS::Message( "expected Exception" ) ); -} - - -void -TestCallerTest::ExceptionThrower::testThrowNothing() -{ -} - - - -TestCallerTest::TestCallerTest() : - m_testName( "TrackedTestCaseCaller" ) -{ -} - - -TestCallerTest::~TestCallerTest() -{ -} - - -void -TestCallerTest::setUp() -{ - m_constructorCount = 0; - m_destructorCount = 0; - m_setUpCount = 0; - m_tearDownCount = 0; - m_testCount = 0; - TrackedTestCase::setTracker( this ); - m_testListener = new MockTestListener( "listener1" ); - m_result = new CPPUNIT_NS::TestResult(); - m_result->addListener( m_testListener ); -} - - -void -TestCallerTest::tearDown() -{ - TrackedTestCase::removeTracker(); - delete m_result; - delete m_testListener; -} - - -void -TestCallerTest::onConstructor() -{ - m_constructorCount++; -} - - -void -TestCallerTest::onDestructor() -{ - m_destructorCount++; -} - - -void -TestCallerTest::onSetUp() -{ - m_setUpCount++; -} - - -void -TestCallerTest::onTearDown() -{ - m_tearDownCount++; -} - - -void -TestCallerTest::onTest() -{ - m_testCount++; -} - - -void -TestCallerTest::testBasicConstructor() -{ - { - CPPUNIT_NS::TestCaller caller( m_testName, - &TrackedTestCase::test ); - checkTestName( caller.getName() ); - checkNothingButConstructorCalled(); - - caller.run( m_result ); - - checkRunningSequenceCalled(); - } // Force destruction of the test caller. - CPPUNIT_ASSERT_EQUAL( 1, m_destructorCount ); -} - - -void -TestCallerTest::testReferenceConstructor() -{ - TrackedTestCase testCase; - { - CPPUNIT_NS::TestCaller caller( "TrackedTestCaseCaller", - &TrackedTestCase::test, - testCase ); - checkTestName( caller.getName() ); - checkNothingButConstructorCalled(); - - caller.run( m_result ); - - checkRunningSequenceCalled(); - } // Force destruction of the test caller. - CPPUNIT_ASSERT_EQUAL( 0, m_destructorCount ); -} - - -void -TestCallerTest::testPointerConstructor() -{ - TrackedTestCase *testCase = new TrackedTestCase(); - { - CPPUNIT_NS::TestCaller caller( m_testName, - &TrackedTestCase::test, - testCase ); - checkTestName( caller.getName() ); - checkNothingButConstructorCalled(); - - caller.run( m_result ); - - checkRunningSequenceCalled(); - } // Force destruction of the test caller. - CPPUNIT_ASSERT_EQUAL( 1, m_destructorCount ); -} - -/* -// Now done by ExceptionTestCaseDecorator - -void -TestCallerTest::testExpectFailureException() -{ - CPPUNIT_NS::TestCaller caller( - m_testName, - &ExceptionThrower::testThrowFailureException ); - m_testListener->setExpectNoFailure(); - caller.run( m_result ); - m_testListener->verify(); -} - - -void -TestCallerTest::testExpectException() -{ - CPPUNIT_NS::TestCaller caller( - m_testName, - &ExceptionThrower::testThrowException ); - m_testListener->setExpectNoFailure(); - caller.run( m_result ); - m_testListener->verify(); -} - - -void -TestCallerTest::testExpectedExceptionNotCaught() -{ - CPPUNIT_NS::TestCaller caller( - m_testName, - &ExceptionThrower::testThrowNothing ); - m_testListener->setExpectedAddFailureCall( 1 ); - caller.run( m_result ); - m_testListener->verify(); -} -*/ - -void -TestCallerTest::checkNothingButConstructorCalled() -{ - CPPUNIT_ASSERT_EQUAL( 1, m_constructorCount ); - CPPUNIT_ASSERT_EQUAL( 0, m_destructorCount ); - CPPUNIT_ASSERT_EQUAL( 0, m_setUpCount ); - CPPUNIT_ASSERT_EQUAL( 0, m_tearDownCount ); - CPPUNIT_ASSERT_EQUAL( 0, m_testCount ); -} - - -void -TestCallerTest::checkRunningSequenceCalled() -{ - CPPUNIT_ASSERT_EQUAL( 1, m_setUpCount ); - CPPUNIT_ASSERT_EQUAL( 1, m_testCount ); - CPPUNIT_ASSERT_EQUAL( 1, m_tearDownCount ); -} - - -void -TestCallerTest::checkTestName( std::string testName ) -{ - CPPUNIT_ASSERT( testName == m_testName ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.h deleted file mode 100644 index b8c5a14c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCallerTest.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef TESTCALLERTEST_H -#define TESTCALLERTEST_H - -#include -#include -#include -#include -#include "MockTestListener.h" -#include "TrackedTestCase.h" - -class TestCallerTest : public CPPUNIT_NS::TestFixture, - Tracker -{ - CPPUNIT_TEST_SUITE( TestCallerTest ); - CPPUNIT_TEST( testBasicConstructor ); - CPPUNIT_TEST( testReferenceConstructor ); - CPPUNIT_TEST( testPointerConstructor ); -// CPPUNIT_TEST( testExpectFailureException ); -// CPPUNIT_TEST( testExpectException ); -// CPPUNIT_TEST( testExpectedExceptionNotCaught ); - CPPUNIT_TEST_SUITE_END(); -public: - TestCallerTest(); - virtual ~TestCallerTest(); - - void setUp(); - void tearDown(); - - void testBasicConstructor(); - void testReferenceConstructor(); - void testPointerConstructor(); - -// void testExpectFailureException(); -// void testExpectException(); -// void testExpectedExceptionNotCaught(); - -private: - class ExceptionThrower : public CPPUNIT_NS::TestCase - { - public: - void testThrowFailureException(); - void testThrowException(); - void testThrowNothing(); - }; - - virtual void onConstructor(); - virtual void onDestructor(); - virtual void onSetUp(); - virtual void onTearDown(); - virtual void onTest(); - - void checkNothingButConstructorCalled(); - void checkRunningSequenceCalled(); - void checkTestName( std::string testName ); - - TestCallerTest( const TestCallerTest © ); - void operator =( const TestCallerTest © ); - -private: - int m_constructorCount; - int m_destructorCount; - int m_setUpCount; - int m_tearDownCount; - int m_testCount; - const std::string m_testName; - MockTestListener *m_testListener; - CPPUNIT_NS::TestResult *m_result; -}; - - - -// Inlines methods for TestCallerTest: -// ----------------------------------- - - - -#endif // TESTCALLERTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.cpp deleted file mode 100644 index 8ed31bbb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.cpp +++ /dev/null @@ -1,161 +0,0 @@ -#include "CoreSuite.h" -#include "FailureException.h" -#include "MockTestCase.h" -#include "TestCaseTest.h" -#include - -/* - - test have been done to check exception management in run(). other - tests need to be added to check the other aspect of TestCase. - */ - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCaseTest, - coreSuiteName() ); - - -TestCaseTest::TestCaseTest() -{ -} - - -TestCaseTest::~TestCaseTest() -{ -} - - -void -TestCaseTest::setUp() -{ - m_testListener = new MockTestListener( "mock-testlistener" ); - m_result = new CPPUNIT_NS::TestResult(); - m_result->addListener( m_testListener ); -} - - -void -TestCaseTest::tearDown() -{ - delete m_result; - delete m_testListener; -} - - -void -TestCaseTest::testSetUpFailure() -{ - checkFailure( true, false, false ); -} - - -void -TestCaseTest::testRunTestFailure() -{ - checkFailure( false, true, false ); -} - - -void -TestCaseTest::testTearDownFailure() -{ - checkFailure( false, false, true ); -} - - -void -TestCaseTest::testFailAll() -{ - checkFailure( true, true, true ); -} - - -void -TestCaseTest::testNoFailure() -{ - checkFailure( false, false, false ); -} - - -void -TestCaseTest::checkFailure( bool failSetUp, - bool failRunTest, - bool failTearDown ) -{ - try - { - MockTestCase testCase( "mock-test" ); - if ( failSetUp ) - testCase.makeSetUpThrow(); - if ( failRunTest ) - testCase.makeRunTestThrow(); - if ( failTearDown ) - testCase.makeTearDownThrow(); - testCase.setExpectedSetUpCall( 1 ); - testCase.setExpectedRunTestCall( failSetUp ? 0 : 1 ); - testCase.setExpectedTearDownCall( failSetUp ? 0 : 1 ); - - testCase.run( m_result ); - - testCase.verify(); - } - catch ( FailureException & ) - { - CPPUNIT_ASSERT_MESSAGE( "exception should have been caught", false ); - } -} - - -void -TestCaseTest::testCountTestCases() -{ - CPPUNIT_NS::TestCase test; - CPPUNIT_ASSERT_EQUAL( 1, test.countTestCases() ); -} - - -void -TestCaseTest::testDefaultConstructor() -{ - CPPUNIT_NS::TestCase test; - CPPUNIT_ASSERT_EQUAL( std::string(""), test.getName() ); -} - - -void -TestCaseTest::testConstructorWithName() -{ - std::string testName( "TestName" ); - CPPUNIT_NS::TestCase test( testName ); - CPPUNIT_ASSERT_EQUAL( testName, test.getName() ); -} - - -void -TestCaseTest::testTwoRun() -{ - MockTestCase test1( "mocktest1" ); - test1.makeRunTestThrow(); - m_testListener->setExpectedStartTestCall( 2 ); - m_testListener->setExpectedAddFailureCall( 2 ); - m_testListener->setExpectedEndTestCall( 2 ); - - test1.run( m_result ); - test1.run( m_result ); - - m_testListener->verify(); -} - - -void -TestCaseTest::testGetChildTestCount() -{ - CPPUNIT_NS::TestCase test( "test" ); - CPPUNIT_ASSERT_EQUAL( 0, test.getChildTestCount() ); -} - - -void -TestCaseTest::testGetChildTestAtThrow() -{ - CPPUNIT_NS::TestCase test( "test" ); - test.getChildTestAt( 0 ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.h deleted file mode 100644 index 48c73aef..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestCaseTest.h +++ /dev/null @@ -1,73 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestCaseTest.h for class TestCaseTest -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2000/06/09 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTCASETEST_H -#define TESTCASETEST_H - -#include -#include -#include "MockTestListener.h" -#include - - -class TestCaseTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestCaseTest ); - CPPUNIT_TEST( testSetUpFailure ); - CPPUNIT_TEST( testRunTestFailure ); - CPPUNIT_TEST( testTearDownFailure ); - CPPUNIT_TEST( testFailAll ); - CPPUNIT_TEST( testNoFailure ); - CPPUNIT_TEST( testTwoRun ); - CPPUNIT_TEST( testCountTestCases ); - CPPUNIT_TEST( testDefaultConstructor ); - CPPUNIT_TEST( testConstructorWithName ); - CPPUNIT_TEST( testGetChildTestCount ); - CPPUNIT_TEST_EXCEPTION( testGetChildTestAtThrow, std::out_of_range ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestCaseTest(); - - virtual ~TestCaseTest(); - - void setUp(); - void tearDown(); - - void testSetUpFailure(); - void testRunTestFailure(); - void testTearDownFailure(); - void testFailAll(); - void testNoFailure(); - void testTwoRun(); - - void testCountTestCases(); - - void testDefaultConstructor(); - void testConstructorWithName(); - - void testGetChildTestCount(); - void testGetChildTestAtThrow(); - -private: - TestCaseTest( const TestCaseTest © ); - void operator =( const TestCaseTest © ); - - void checkFailure( bool failSetUp, - bool failRunTest, - bool failTearDown ); -/* - void checkResult( int failures, - int errors, - int testsRun, - CPPUNIT_NS::TestResult *result ); -*/ -private: - CPPUNIT_NS::TestResult *m_result; - MockTestListener *m_testListener; -}; - - -#endif // TESTCASETEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.cpp deleted file mode 100644 index f90874b8..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.cpp +++ /dev/null @@ -1,61 +0,0 @@ -#include "ExtensionSuite.h" -#include "TestDecoratorTest.h" -#include - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestDecoratorTest, - extensionSuiteName() ); - - -TestDecoratorTest::TestDecoratorTest() -{ -} - - -TestDecoratorTest::~TestDecoratorTest() -{ -} - - -void -TestDecoratorTest::setUp() -{ - m_test = new MockTestCase( "mocktest" ); - m_decorator = new CPPUNIT_NS::TestDecorator( m_test ); -} - - -void -TestDecoratorTest::tearDown() -{ - delete m_decorator; -} - - -void -TestDecoratorTest::testCountTestCases() -{ - m_test->setExpectedCountTestCasesCall( 1 ); - CPPUNIT_ASSERT_EQUAL( 1, m_decorator->countTestCases() ); - m_test->verify(); -} - - -void -TestDecoratorTest::testRun() -{ - m_test->setExpectedSetUpCall( 1 ); - m_test->setExpectedRunTestCall( 1 ); - m_test->setExpectedTearDownCall( 1 ); - CPPUNIT_NS::TestResult result; - - m_decorator->run( &result ); - m_test->verify(); -} - - -void -TestDecoratorTest::testGetName() -{ - CPPUNIT_ASSERT_EQUAL( m_test->getName(), m_decorator->getName() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.h deleted file mode 100644 index 7a098c9d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestDecoratorTest.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef TESTDECORATORTEST_H -#define TESTDECORATORTEST_H - -#include -#include -#include "MockTestCase.h" - - -class TestDecoratorTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestDecoratorTest ); - CPPUNIT_TEST( testCountTestCases ); - CPPUNIT_TEST( testRun ); - CPPUNIT_TEST( testGetName ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestDecoratorTest(); - virtual ~TestDecoratorTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testCountTestCases(); - void testRun(); - void testGetName(); - -private: - TestDecoratorTest( const TestDecoratorTest © ); - void operator =( const TestDecoratorTest © ); - -private: - MockTestCase *m_test; - CPPUNIT_NS::TestDecorator *m_decorator; -}; - - - -#endif // TESTDECORATORTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.cpp deleted file mode 100644 index 413460d5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "CoreSuite.h" -#include "TestFailureTest.h" -#include -#include - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestFailureTest, - coreSuiteName() ); - - -TestFailureTest::TestFailureTest() -{ -} - - -TestFailureTest::~TestFailureTest() -{ -} - - -void -TestFailureTest::setUp() -{ - m_exceptionDestroyed = false; -} - - -void -TestFailureTest::tearDown() -{ -} - - -void -TestFailureTest::testConstructorAndGetters() -{ - CPPUNIT_NS::TestCase test; - CPPUNIT_NS::Exception *error = new ObservedException( this ); - checkTestFailure( &test, error, false ); - CPPUNIT_ASSERT( m_exceptionDestroyed ); -} - - -void -TestFailureTest::testConstructorAndGettersForError() -{ - CPPUNIT_NS::TestCase test; - CPPUNIT_NS::Exception *error = new ObservedException( this ); - checkTestFailure( &test, error, true ); - CPPUNIT_ASSERT( m_exceptionDestroyed ); -} - - -void -TestFailureTest::exceptionDestroyed() -{ - m_exceptionDestroyed = true; -} - - -void -TestFailureTest::checkTestFailure( CPPUNIT_NS::Test *test, - CPPUNIT_NS::Exception *error, - bool isError ) -{ - CPPUNIT_NS::TestFailure failure( test, error, isError ); - CPPUNIT_ASSERT_EQUAL( test, failure.failedTest() ); - CPPUNIT_ASSERT_EQUAL( error, failure.thrownException() ); - CPPUNIT_ASSERT_EQUAL( isError, failure.isError() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.h deleted file mode 100644 index 84f41e90..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestFailureTest.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef TESTFAILURETEST_H -#define TESTFAILURETEST_H - -#include - - -class TestFailureTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestFailureTest ); - CPPUNIT_TEST( testConstructorAndGetters ); - CPPUNIT_TEST( testConstructorAndGettersForError ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestFailureTest(); - virtual ~TestFailureTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testConstructorAndGetters(); - void testConstructorAndGettersForError(); - - void exceptionDestroyed(); - -private: - class ObservedException : public CPPUNIT_NS::Exception - { - public: - ObservedException( TestFailureTest *listener ) : - CPPUNIT_NS::Exception( CPPUNIT_NS::Message("ObservedException" ) ), - m_listener( listener ) - { - } - - virtual ~ObservedException() throw() - { - m_listener->exceptionDestroyed(); - } - private: - TestFailureTest *m_listener; - }; - - - TestFailureTest( const TestFailureTest © ); - void operator =( const TestFailureTest © ); - void checkTestFailure( CPPUNIT_NS::Test *test, - CPPUNIT_NS::Exception *error, - bool isError ); - -private: - bool m_exceptionDestroyed; -}; - - - -#endif // TESTFAILURETEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.cpp deleted file mode 100644 index 0f3d3489..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.cpp +++ /dev/null @@ -1,490 +0,0 @@ -#include "CoreSuite.h" -#include "TestPathTest.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestPathTest, - coreSuiteName() ); - - -TestPathTest::TestPathTest() -{ -} - - -TestPathTest::~TestPathTest() -{ -} - - -void -TestPathTest::setUp() -{ - m_path = new CPPUNIT_NS::TestPath(); - m_test1 = new CPPUNIT_NS::TestCase( "test1" ); - m_test2 = new CPPUNIT_NS::TestCase( "test2" ); - m_test3 = new CPPUNIT_NS::TestCase( "test3" ); - m_test4 = new CPPUNIT_NS::TestCase( "test4" ); - - m_suite1 = new CPPUNIT_NS::TestSuite( "All Tests" ); - m_suite2 = new CPPUNIT_NS::TestSuite( "Custom" ); - m_testSuite2a = new CPPUNIT_NS::TestCase( "MyTest::testDefaultConstructor" ); - m_testSuite2b = new CPPUNIT_NS::TestCase( "MyTest::testConstructor" ); - m_suite2->addTest( m_testSuite2a ); - m_suite2->addTest( m_testSuite2b ); - m_suite1->addTest( m_suite2 ); -} - - -void -TestPathTest::tearDown() -{ - delete m_suite1; - delete m_path; - delete m_test4; - delete m_test3; - delete m_test2; - delete m_test1; -} - - -void -TestPathTest::testDefaultConstructor() -{ - CPPUNIT_ASSERT_EQUAL( 0, m_path->getTestCount() ); - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestPathTest::testAddTest() -{ - m_path->add( m_test1 ); - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_path->isValid() ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(0) ); -} - - -void -TestPathTest::testGetTestAtThrow1() -{ - m_path->getTestAt( 0 ); -} - - -void -TestPathTest::testGetTestAtThrow2() -{ - m_path->add( m_test1 ); - m_path->getTestAt( 1 ); -} - - -void -TestPathTest::testGetChildTest() -{ - m_path->add( m_test1 ); - CPPUNIT_ASSERT( m_test1 == m_path->getChildTest() ); -} - - -void -TestPathTest::testGetChildTestManyTests() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - m_path->add( m_test3 ); - CPPUNIT_ASSERT( m_test3 == m_path->getChildTest() ); -} - - -void -TestPathTest::testGetChildTestThrowIfNotValid() -{ - m_path->getChildTest(); -} - - -void -TestPathTest::testAddPath() -{ - CPPUNIT_NS::TestPath path; - path.add( m_test2 ); - path.add( m_test3 ); - - m_path->add( m_test1 ); - m_path->add( path ); - - CPPUNIT_ASSERT_EQUAL( 3, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(1) ); - CPPUNIT_ASSERT( m_test3 == m_path->getTestAt(2) ); -} - - -void -TestPathTest::testAddInvalidPath() -{ - CPPUNIT_NS::TestPath path; - m_path->add( path ); - - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestPathTest::testRemoveTests() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - m_path->removeTests(); - - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestPathTest::testRemoveTest() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - m_path->removeTest( 0 ); - - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(0) ); -} - - -void -TestPathTest::testRemoveTestThrow1() -{ - m_path->removeTest( -1 ); -} - - -void -TestPathTest::testRemoveTestThrow2() -{ - m_path->add( m_test1 ); - - m_path->removeTest( 1 ); -} - - -void -TestPathTest::testUp() -{ - m_path->add( m_test1 ); - - m_path->up(); - - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestPathTest::testUpThrow() -{ - m_path->up(); -} - - -void -TestPathTest::testInsert() -{ - m_path->add( m_test1 ); - - m_path->insert( m_test2, 0 ); - - CPPUNIT_ASSERT_EQUAL( 2, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(1) ); -} - - -void -TestPathTest::testInsertAtEnd() -{ - m_path->add( m_test1 ); - - m_path->insert( m_test2, 1 ); - - CPPUNIT_ASSERT_EQUAL( 2, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(1) ); -} - - -void -TestPathTest::testInsertThrow1() -{ - m_path->insert( m_test1, -1 ); -} - - -void -TestPathTest::testInsertThrow2() -{ - m_path->add( m_test1 ); - - m_path->insert( m_test1, 2 ); -} - - -void -TestPathTest::testInsertPath() -{ - CPPUNIT_NS::TestPath path; - path.add( m_test2 ); - path.add( m_test3 ); - - m_path->add( m_test1 ); - m_path->add( m_test4 ); - m_path->insert( path, 1 ); - - CPPUNIT_ASSERT_EQUAL( 4, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(1) ); - CPPUNIT_ASSERT( m_test3 == m_path->getTestAt(2) ); - CPPUNIT_ASSERT( m_test4 == m_path->getTestAt(3) ); -} - - -void -TestPathTest::testInsertPathThrow() -{ - CPPUNIT_NS::TestPath path; - path.add( m_test2 ); - - m_path->insert( path, 1 ); -} - - -void -TestPathTest::testInsertPathDontThrowIfInvalid() -{ - CPPUNIT_NS::TestPath path; - m_path->insert( path, 1 ); -} - - -void -TestPathTest::testRootConstructor() -{ - CPPUNIT_NS::TestPath path( m_test1 ); - CPPUNIT_ASSERT( path.isValid() ); - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathSliceConstructorCopyUntilEnd() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - m_path->add( m_test3 ); - - CPPUNIT_NS::TestPath path( *m_path, 1 ); - - CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() ); - CPPUNIT_ASSERT( m_test2 == path.getTestAt(0) ); - CPPUNIT_ASSERT( m_test3 == path.getTestAt(1) ); -} - - -void -TestPathTest::testPathSliceConstructorCopySpecifiedCount() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - m_path->add( m_test3 ); - - CPPUNIT_NS::TestPath path( *m_path, 0, 1 ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathSliceConstructorCopyNone() -{ - m_path->add( m_test1 ); - - CPPUNIT_NS::TestPath path( *m_path, 0, 0 ); - CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() ); -} - - -void -TestPathTest::testPathSliceConstructorNegativeIndex() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - CPPUNIT_NS::TestPath path( *m_path, -1, 2 ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathSliceConstructorAfterEndIndex() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - CPPUNIT_NS::TestPath path( *m_path, 2, 5 ); - - CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() ); -} - - -void -TestPathTest::testPathSliceConstructorNegativeIndexUntilEnd() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - CPPUNIT_NS::TestPath path( *m_path, -1 ); - - CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() ); - CPPUNIT_ASSERT( m_test1 == path.getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == path.getTestAt(1) ); -} - - -void -TestPathTest::testPathSliceConstructorNegativeIndexNone() -{ - m_path->add( m_test1 ); - m_path->add( m_test2 ); - - CPPUNIT_NS::TestPath path( *m_path, -2, 1 ); - - CPPUNIT_ASSERT_EQUAL( 0, path.getTestCount() ); -} - - -void -TestPathTest::testToStringNoTest() -{ - std::string expected = "/"; - std::string actual = m_path->toString(); - - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -TestPathTest::testToStringOneTest() -{ - m_path->add( m_test1 ); - - std::string expected = "/test1"; - std::string actual = m_path->toString(); - - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -TestPathTest::testToStringHierarchy() -{ - m_path->add( m_suite1 ); - m_path->add( m_suite2 ); - m_path->add( m_suite2->getChildTestAt(0) ); - - std::string expected = "/All Tests/Custom/MyTest::testDefaultConstructor"; - std::string actual = m_path->toString(); - - CPPUNIT_ASSERT_EQUAL( expected, actual ); -} - - -void -TestPathTest::testPathStringConstructorRoot() -{ - CPPUNIT_NS::TestPath path( m_suite1, "/All Tests" ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathStringConstructorEmptyIsRoot() -{ - CPPUNIT_NS::TestPath path( m_suite1, "" ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathStringConstructorHierarchy() -{ - CPPUNIT_NS::TestPath path( m_suite1, "/All Tests/Custom/MyTest::testDefaultConstructor" ); - - CPPUNIT_ASSERT_EQUAL( 3, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) ); - CPPUNIT_ASSERT( m_suite2 == path.getTestAt(1) ); - CPPUNIT_ASSERT( m_testSuite2a == path.getTestAt(2) ); -} - - -void -TestPathTest::testPathStringConstructorBadRootThrow() -{ - CPPUNIT_NS::TestPath path( m_suite1, "/Custom" ); -} - - -void -TestPathTest::testPathStringConstructorRelativeRoot() -{ - CPPUNIT_NS::TestPath path( m_suite1, "All Tests" ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite1 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathStringConstructorRelativeRoot2() -{ - CPPUNIT_NS::TestPath path( m_suite1, "Custom" ); - - CPPUNIT_ASSERT_EQUAL( 1, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite2 == path.getTestAt(0) ); -} - - -void -TestPathTest::testPathStringConstructorThrow1() -{ - CPPUNIT_NS::TestPath path( m_suite1, "/" ); -} - - -void -TestPathTest::testPathStringConstructorRelativeHierarchy() -{ - CPPUNIT_NS::TestPath path( m_suite1, "Custom/MyTest::testConstructor" ); - - CPPUNIT_ASSERT_EQUAL( 2, path.getTestCount() ); - CPPUNIT_ASSERT( m_suite2 == path.getTestAt(0) ); - CPPUNIT_ASSERT( m_testSuite2b == path.getTestAt(1) ); -} - - -void -TestPathTest::testPathStringConstructorBadRelativeHierarchyThrow() -{ - CPPUNIT_NS::TestPath path( m_suite1, "Custom/MyBadTest::testConstructor" ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.h deleted file mode 100644 index 655a8072..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestPathTest.h +++ /dev/null @@ -1,142 +0,0 @@ -#ifndef TESTPATHTEST_H -#define TESTPATHTEST_H - -#include -#include -#include -#include - - -/*! \class TestPathTest - * \brief Unit tests for class TestPath. - */ -class TestPathTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestPathTest ); - CPPUNIT_TEST( testDefaultConstructor ); - CPPUNIT_TEST( testAddTest ); - CPPUNIT_TEST_EXCEPTION( testGetTestAtThrow1, std::out_of_range ); - CPPUNIT_TEST_EXCEPTION( testGetTestAtThrow2, std::out_of_range ); - CPPUNIT_TEST( testGetChildTest ); - CPPUNIT_TEST( testGetChildTestManyTests ); - CPPUNIT_TEST_EXCEPTION( testGetChildTestThrowIfNotValid, std::out_of_range ); - CPPUNIT_TEST( testAddPath ); - CPPUNIT_TEST( testAddInvalidPath ); - CPPUNIT_TEST( testRemoveTests ); - CPPUNIT_TEST( testRemoveTest ); - CPPUNIT_TEST_EXCEPTION( testRemoveTestThrow1, std::out_of_range ); - CPPUNIT_TEST_EXCEPTION( testRemoveTestThrow2, std::out_of_range ); - CPPUNIT_TEST( testUp ); - CPPUNIT_TEST_EXCEPTION( testUpThrow, std::out_of_range ); - CPPUNIT_TEST( testInsert ); - CPPUNIT_TEST( testInsertAtEnd ); - CPPUNIT_TEST_EXCEPTION( testInsertThrow1, std::out_of_range ); - CPPUNIT_TEST_EXCEPTION( testInsertThrow2, std::out_of_range ); - CPPUNIT_TEST( testInsertPath ); - CPPUNIT_TEST_EXCEPTION( testInsertPathThrow, std::out_of_range ); - CPPUNIT_TEST( testInsertPathDontThrowIfInvalid ); - CPPUNIT_TEST( testRootConstructor ); - CPPUNIT_TEST( testPathSliceConstructorCopyUntilEnd ); - CPPUNIT_TEST( testPathSliceConstructorCopySpecifiedCount ); - CPPUNIT_TEST( testPathSliceConstructorCopyNone ); - CPPUNIT_TEST( testPathSliceConstructorNegativeIndex ); - CPPUNIT_TEST( testPathSliceConstructorAfterEndIndex ); - CPPUNIT_TEST( testPathSliceConstructorNegativeIndexUntilEnd ); - CPPUNIT_TEST( testPathSliceConstructorNegativeIndexNone ); - CPPUNIT_TEST( testToStringNoTest ); - CPPUNIT_TEST( testToStringOneTest ); - CPPUNIT_TEST( testToStringHierarchy ); - CPPUNIT_TEST( testPathStringConstructorRoot ); - CPPUNIT_TEST( testPathStringConstructorEmptyIsRoot ); - CPPUNIT_TEST( testPathStringConstructorHierarchy ); - CPPUNIT_TEST_EXCEPTION( testPathStringConstructorBadRootThrow, std::invalid_argument ); - CPPUNIT_TEST( testPathStringConstructorRelativeRoot ); - CPPUNIT_TEST( testPathStringConstructorRelativeRoot2 ); - CPPUNIT_TEST_EXCEPTION( testPathStringConstructorThrow1, std::invalid_argument ); - CPPUNIT_TEST( testPathStringConstructorRelativeHierarchy ); - CPPUNIT_TEST_EXCEPTION( testPathStringConstructorBadRelativeHierarchyThrow, std::invalid_argument ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a TestPathTest object. - */ - TestPathTest(); - - /// Destructor. - virtual ~TestPathTest(); - - void setUp(); - void tearDown(); - - void testDefaultConstructor(); - void testAddTest(); - void testGetTestAtThrow1(); - void testGetTestAtThrow2(); - void testGetChildTest(); - void testGetChildTestManyTests(); - void testGetChildTestThrowIfNotValid(); - - void testAddPath(); - void testAddInvalidPath(); - - void testRemoveTests(); - void testRemoveTest(); - void testRemoveTestThrow1(); - void testRemoveTestThrow2(); - void testUp(); - void testUpThrow(); - - void testInsert(); - void testInsertAtEnd(); - void testInsertThrow1(); - void testInsertThrow2(); - - void testInsertPath(); - void testInsertPathThrow(); - void testInsertPathDontThrowIfInvalid(); - - void testRootConstructor(); - void testPathSliceConstructorCopyUntilEnd(); - void testPathSliceConstructorCopySpecifiedCount(); - void testPathSliceConstructorCopyNone(); - void testPathSliceConstructorNegativeIndex(); - void testPathSliceConstructorAfterEndIndex(); - void testPathSliceConstructorNegativeIndexUntilEnd(); - void testPathSliceConstructorNegativeIndexNone(); - - void testToStringNoTest(); - void testToStringOneTest(); - void testToStringHierarchy(); - - void testPathStringConstructorRoot(); - void testPathStringConstructorEmptyIsRoot(); - void testPathStringConstructorHierarchy(); - void testPathStringConstructorBadRootThrow(); - void testPathStringConstructorRelativeRoot(); - void testPathStringConstructorRelativeRoot2(); - void testPathStringConstructorThrow1(); - void testPathStringConstructorRelativeHierarchy(); - void testPathStringConstructorBadRelativeHierarchyThrow(); - -private: - /// Prevents the use of the copy constructor. - TestPathTest( const TestPathTest © ); - - /// Prevents the use of the copy operator. - void operator =( const TestPathTest © ); - -private: - CPPUNIT_NS::TestPath *m_path; - CPPUNIT_NS::TestCase *m_test1; - CPPUNIT_NS::TestCase *m_test2; - CPPUNIT_NS::TestCase *m_test3; - CPPUNIT_NS::TestCase *m_test4; - CPPUNIT_NS::TestSuite *m_suite1; - CPPUNIT_NS::TestSuite *m_suite2; - CPPUNIT_NS::TestCase *m_testSuite2a; - CPPUNIT_NS::TestCase *m_testSuite2b; -}; - - - -#endif // TESTPATHTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.cpp deleted file mode 100644 index 175250b9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.cpp +++ /dev/null @@ -1,297 +0,0 @@ -#include "CoreSuite.h" -#include "TestResultCollectorTest.h" - - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultCollectorTest, - coreSuiteName() ); - - -TestResultCollectorTest::TestResultCollectorTest() -{ -} - - -TestResultCollectorTest::~TestResultCollectorTest() -{ -} - - -void -TestResultCollectorTest::setUp() -{ - m_lockCount = 0; - m_unlockCount = 0; - m_result = new CPPUNIT_NS::TestResultCollector(); - m_synchronizedResult = new SynchronizedTestResult( this ); - m_test = new CPPUNIT_NS::TestCase(); - m_test2 = new CPPUNIT_NS::TestCase(); -} - - -void -TestResultCollectorTest::tearDown() -{ - delete m_test2; - delete m_test; - delete m_synchronizedResult; - delete m_result; -} - - -void -TestResultCollectorTest::testConstructor() -{ - checkResult( 0, 0, 0 ); -} - - -void -TestResultCollectorTest::testAddTwoErrors() -{ - CPPUNIT_NS::Message errorMessage1( "First Error" ); - CPPUNIT_NS::Message errorMessage2( "Second Error" ); - { - CPPUNIT_NS::TestFailure failure1( m_test, - new CPPUNIT_NS::Exception( errorMessage1 ), - true ); - m_result->addFailure( failure1 ); - - CPPUNIT_NS::TestFailure failure2( m_test2, - new CPPUNIT_NS::Exception( errorMessage2 ), - true ); - m_result->addFailure( failure2 ); - } // ensure that the test result duplicate the failures. - - checkResult( 0, 2, 0 ); - checkFailure( m_result->failures()[0], - errorMessage1, - m_test, - true ); - checkFailure( m_result->failures()[1], - errorMessage2, - m_test2, - true ); -} - - -void -TestResultCollectorTest::testAddTwoFailures() -{ - CPPUNIT_NS::Message errorMessage1( "First Failure" ); - CPPUNIT_NS::Message errorMessage2( "Second Failure" ); - { - CPPUNIT_NS::TestFailure failure1( m_test, - new CPPUNIT_NS::Exception( errorMessage1 ), - false ); - m_result->addFailure( failure1 ); - - CPPUNIT_NS::TestFailure failure2( m_test2, - new CPPUNIT_NS::Exception( errorMessage2 ), - false ); - m_result->addFailure( failure2 ); - } // ensure that the test result duplicate the failures. - checkResult( 2, 0, 0 ); - checkFailure( m_result->failures()[0], - errorMessage1, - m_test, - false ); - checkFailure( m_result->failures()[1], - errorMessage2, - m_test2, - false ); -} - - -void -TestResultCollectorTest::testStartTest() -{ - m_result->startTest( m_test ); - m_result->startTest( m_test ); - checkResult( 0, 0, 2 ); -} - - -void -TestResultCollectorTest::testWasSuccessfulWithNoTest() -{ - checkWasSuccessful( true ); -} - - -void -TestResultCollectorTest::testWasSuccessfulWithErrors() -{ - addError( "Error1" ); - addError( "Error2" ); - checkWasSuccessful( false ); -} - - -void -TestResultCollectorTest::testWasSuccessfulWithFailures() -{ - addFailure( "Failure1" ); - addFailure( "Failure2" ); - checkWasSuccessful( false ); -} - - -void -TestResultCollectorTest::testWasSuccessfulWithErrorsAndFailures() -{ - addError( "Error1" ); - addFailure( "Failure2" ); - checkWasSuccessful( false ); -} - - -void -TestResultCollectorTest::testWasSuccessfulWithSuccessfulTest() -{ - m_result->startTest( m_test ); - m_result->endTest( m_test ); - m_result->startTest( m_test2 ); - m_result->endTest( m_test2 ); - checkWasSuccessful( true ); -} - - -void -TestResultCollectorTest::testSynchronizationAddFailure() -{ - addFailure( "Failure1", m_test, false, m_synchronizedResult ); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationStartTest() -{ - m_synchronizedResult->startTest( m_test ); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationRunTests() -{ - m_synchronizedResult->runTests(); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationTestErrors() -{ - m_synchronizedResult->testErrors(); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationTestFailures() -{ - m_synchronizedResult->testFailures(); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationFailures() -{ - m_synchronizedResult->failures(); - checkSynchronization(); -} - - -void -TestResultCollectorTest::testSynchronizationWasSuccessful() -{ - m_synchronizedResult->wasSuccessful(); - checkSynchronization(); -} - - -void -TestResultCollectorTest::checkResult( int failures, - int errors, - int testsRun ) -{ - CPPUNIT_ASSERT_EQUAL( testsRun, m_result->runTests() ); - CPPUNIT_ASSERT_EQUAL( errors, m_result->testErrors() ); - CPPUNIT_ASSERT_EQUAL( failures, m_result->testFailures() ); - CPPUNIT_ASSERT_EQUAL( errors + failures, - m_result->testFailuresTotal() ); -} - - -void -TestResultCollectorTest::checkFailure( CPPUNIT_NS::TestFailure *failure, - CPPUNIT_NS::Message expectedMessage, - CPPUNIT_NS::Test *expectedTest, - bool expectedIsError ) -{ - CPPUNIT_NS::Message actualMessage( failure->thrownException()->message() ); - CPPUNIT_ASSERT( expectedMessage == actualMessage ); - CPPUNIT_ASSERT_EQUAL( expectedTest, failure->failedTest() ); - CPPUNIT_ASSERT_EQUAL( expectedIsError, failure->isError() ); -} - - -void -TestResultCollectorTest::checkWasSuccessful( bool shouldBeSuccessful ) -{ - CPPUNIT_ASSERT_EQUAL( shouldBeSuccessful, m_result->wasSuccessful() ); -} - - -void -TestResultCollectorTest::locked() -{ - CPPUNIT_ASSERT_EQUAL( m_lockCount, m_unlockCount ); - ++m_lockCount; -} - - -void -TestResultCollectorTest::unlocked() -{ - ++m_unlockCount; - CPPUNIT_ASSERT_EQUAL( m_lockCount, m_unlockCount ); -} - - -void -TestResultCollectorTest::checkSynchronization() -{ - CPPUNIT_ASSERT_EQUAL( m_lockCount, m_unlockCount ); - CPPUNIT_ASSERT( m_lockCount > 0 ); -} - - -void -TestResultCollectorTest::addFailure( std::string message ) -{ - addFailure( message, m_test, false, m_result ); -} - - -void -TestResultCollectorTest::addError( std::string message ) -{ - addFailure( message, m_test, true, m_result ); -} - - -void -TestResultCollectorTest::addFailure( std::string message, - CPPUNIT_NS::Test *failedTest, - bool isError, - CPPUNIT_NS::TestResultCollector *result ) -{ - CPPUNIT_NS::TestFailure failure( failedTest, - new CPPUNIT_NS::Exception( CPPUNIT_NS::Message( message ) ), - isError ); - result->addFailure( failure ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.h deleted file mode 100644 index bf7e5ae9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultCollectorTest.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef TESTCOLLECTORRESULTTEST_H -#define TESTCOLLECTORRESULTTEST_H - -#include -#include -#include "SynchronizedTestResult.h" - - -class TestResultCollectorTest : public CPPUNIT_NS::TestFixture, - public SynchronizedTestResult::SynchronizationObjectListener -{ - CPPUNIT_TEST_SUITE( TestResultCollectorTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testAddTwoErrors ); - CPPUNIT_TEST( testAddTwoFailures ); - CPPUNIT_TEST( testStartTest ); - CPPUNIT_TEST( testWasSuccessfulWithErrors ); - CPPUNIT_TEST( testWasSuccessfulWithFailures ); - CPPUNIT_TEST( testWasSuccessfulWithErrorsAndFailures ); - CPPUNIT_TEST( testWasSuccessfulWithSuccessfulTest ); - CPPUNIT_TEST( testSynchronizationAddFailure ); - CPPUNIT_TEST( testSynchronizationStartTest ); - CPPUNIT_TEST( testSynchronizationRunTests ); - CPPUNIT_TEST( testSynchronizationTestErrors ); - CPPUNIT_TEST( testSynchronizationTestFailures ); - CPPUNIT_TEST( testSynchronizationFailures ); - CPPUNIT_TEST( testSynchronizationWasSuccessful ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestResultCollectorTest(); - virtual ~TestResultCollectorTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testConstructor(); - - void testAddTwoErrors(); - void testAddTwoFailures(); - void testStartTest(); - - void testWasSuccessfulWithNoTest(); - void testWasSuccessfulWithErrors(); - void testWasSuccessfulWithFailures(); - void testWasSuccessfulWithErrorsAndFailures(); - void testWasSuccessfulWithSuccessfulTest(); - - void testSynchronizationAddFailure(); - void testSynchronizationStartTest(); - void testSynchronizationRunTests(); - void testSynchronizationTestErrors(); - void testSynchronizationTestFailures(); - void testSynchronizationErrors(); - void testSynchronizationFailures(); - void testSynchronizationWasSuccessful(); - - virtual void locked(); - virtual void unlocked(); - -private: - TestResultCollectorTest( const TestResultCollectorTest © ); - void operator =( const TestResultCollectorTest © ); - - void checkResult( int failures, - int errors, - int testsRun ); - - void checkFailure( CPPUNIT_NS::TestFailure *failure, - CPPUNIT_NS::Message expectedMessage, - CPPUNIT_NS::Test *expectedTest, - bool expectedIsError ); - - void checkWasSuccessful( bool shouldBeSuccessful ); - - void checkSynchronization(); - - void addFailure( std::string message ); - void addError( std::string message ); - void addFailure( std::string message, - CPPUNIT_NS::Test *failedTest, - bool isError, - CPPUNIT_NS::TestResultCollector *result ); - -private: - CPPUNIT_NS::TestResultCollector *m_result; - SynchronizedTestResult *m_synchronizedResult; - CPPUNIT_NS::Test *m_test; - CPPUNIT_NS::Test *m_test2; - int m_lockCount; - int m_unlockCount; -}; - - - -#endif // TESTCOLLECTORRESULTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.cpp deleted file mode 100644 index 048aacd0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.cpp +++ /dev/null @@ -1,268 +0,0 @@ -#include "CoreSuite.h" -#include "MockFunctor.h" -#include "MockProtector.h" -#include "MockTestCase.h" -#include "TestResultTest.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultTest, - coreSuiteName() ); - - -TestResultTest::TestResultTest() -{ -} - - -TestResultTest::~TestResultTest() -{ -} - - -void -TestResultTest::setUp() -{ - m_result = new CPPUNIT_NS::TestResult(); - m_listener1 = new MockTestListener( "listener1" ); - m_listener2 = new MockTestListener( "listener2" ); - m_dummyTest = new MockTestCase( "dummy-test" ); -} - - -void -TestResultTest::tearDown() -{ - delete m_dummyTest; - delete m_listener1; - delete m_listener2; - delete m_result; -} - - -void -TestResultTest::testConstructor() -{ - CPPUNIT_ASSERT( !m_result->shouldStop() ); -} - - -void -TestResultTest::testStop() -{ - m_result->stop(); - CPPUNIT_ASSERT( m_result->shouldStop() ); -} - - -void -TestResultTest::testAddError() -{ - CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( - CPPUNIT_NS::Message( "some_error" ) ); - m_listener1->setExpectFailure( m_dummyTest, dummyException, true ); - m_result->addListener( m_listener1 ); - - m_result->addError( m_dummyTest, dummyException ); - - m_listener1->verify(); -} - - -void -TestResultTest::testAddFailure() -{ - CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( - CPPUNIT_NS::Message("some_error" ) ); - m_listener1->setExpectFailure( m_dummyTest, dummyException, false ); - m_result->addListener( m_listener1 ); - - m_result->addFailure( m_dummyTest, dummyException ); - - m_listener1->verify(); -} - - -void -TestResultTest::testStartTest() -{ - m_listener1->setExpectStartTest( m_dummyTest ); - m_result->addListener( m_listener1 ); - - m_result->startTest( m_dummyTest ); - - m_listener1->verify(); -} - - -void -TestResultTest::testEndTest() -{ - m_listener1->setExpectEndTest( m_dummyTest ); - m_result->addListener( m_listener1 ); - - m_result->endTest( m_dummyTest ); - - m_listener1->verify(); -} - - -void -TestResultTest::testStartSuite() -{ - m_listener1->setExpectStartSuite( m_dummyTest ); - m_result->addListener( m_listener1 ); - - m_result->startSuite( m_dummyTest ); - - m_listener1->verify(); -} - - -void -TestResultTest::testEndSuite() -{ - m_listener1->setExpectEndSuite( m_dummyTest ); - m_result->addListener( m_listener1 ); - - m_result->endSuite( m_dummyTest ); - - m_listener1->verify(); -} - - -void -TestResultTest::testRunTest() -{ - m_listener1->setExpectStartTestRun( m_dummyTest, m_result ); - m_listener1->setExpectEndTestRun( m_dummyTest, m_result ); - m_result->addListener( m_listener1 ); - - m_result->runTest( m_dummyTest ); - - m_listener1->verify(); -} - - -void -TestResultTest::testTwoListener() -{ - m_listener1->setExpectStartTest( m_dummyTest ); - m_listener2->setExpectStartTest( m_dummyTest ); - CPPUNIT_NS::Exception *dummyException1 = new CPPUNIT_NS::Exception( - CPPUNIT_NS::Message( "some_error" ) ); - m_listener1->setExpectFailure( m_dummyTest, dummyException1, true ); - m_listener2->setExpectFailure( m_dummyTest, dummyException1, true ); - m_listener1->setExpectEndTest( m_dummyTest ); - m_listener2->setExpectEndTest( m_dummyTest ); - m_result->addListener( m_listener1 ); - m_result->addListener( m_listener2 ); - - m_result->startTest( m_dummyTest ); - m_result->addError( m_dummyTest, dummyException1 ); - m_result->endTest( m_dummyTest ); - - m_listener1->verify(); - m_listener2->verify(); -} - - -void -TestResultTest::testDefaultProtectSucceed() -{ - MockFunctor functor; - functor.setShouldSucceed(); - m_listener1->setExpectNoFailure(); - - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( m_result->protect( functor, m_dummyTest ) ); - m_listener1->verify(); - functor.verify(); -} - - -void -TestResultTest::testDefaultProtectFail() -{ - MockFunctor functor; - functor.setShouldFail(); - m_listener1->setExpectNoFailure(); - - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( !m_result->protect( functor, m_dummyTest ) ); - m_listener1->verify(); - functor.verify(); -} - - -void -TestResultTest::testDefaultProtectFailIfThrow() -{ - MockFunctor functor; - functor.setThrowFailureException(); - m_listener1->setExpectFailure(); - - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( !m_result->protect( functor, m_dummyTest ) ); - m_listener1->verify(); - functor.verify(); -} - - -void -TestResultTest::testProtectChainPushOneTrap() -{ - MockFunctor functor; - MockProtector *protector = new MockProtector(); - functor.setThrowMockProtectorException(); - protector->setExpectException(); - m_listener1->setExpectFailure(); - - m_result->pushProtector( protector ); - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( !m_result->protect( functor, m_dummyTest ) ); - protector->verify(); - m_listener1->verify(); - functor.verify(); -} - - -void -TestResultTest::testProtectChainPushOnePassThrough() -{ - MockFunctor functor; - MockProtector *protector = new MockProtector(); - functor.setThrowFailureException(); - protector->setExpectNoException(); - m_listener1->setExpectFailure(); - - m_result->pushProtector( protector ); - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( !m_result->protect( functor, m_dummyTest ) ); - protector->verify(); - m_listener1->verify(); - functor.verify(); -} - - -void -TestResultTest::testProtectChainPushTwoTrap() -{ - MockFunctor functor; - functor.setThrowMockProtectorException(); - // protector1 catch the exception retrown by protector2 - MockProtector *protector1 = new MockProtector(); - protector1->setExpectException(); - // protector2 catch the exception and rethrow it - MockProtector *protector2 = new MockProtector(); - protector2->setExpectCatchAndPropagateException(); - m_listener1->setExpectFailure(); - - m_result->pushProtector( protector1 ); - m_result->pushProtector( protector2 ); - m_result->addListener( m_listener1 ); - CPPUNIT_ASSERT( !m_result->protect( functor, m_dummyTest ) ); - protector1->verify(); - protector2->verify(); - m_listener1->verify(); - functor.verify(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.h deleted file mode 100644 index 104944c1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestResultTest.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef TESTRESULTTEST_H -#define TESTRESULTTEST_H - -#include -#include -#include "MockTestListener.h" - - -class TestResultTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestResultTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testStop ); - CPPUNIT_TEST( testAddError ); - CPPUNIT_TEST( testAddFailure ); - CPPUNIT_TEST( testStartTest ); - CPPUNIT_TEST( testEndTest ); - CPPUNIT_TEST( testStartSuite ); - CPPUNIT_TEST( testEndSuite ); - CPPUNIT_TEST( testRunTest ); - CPPUNIT_TEST( testTwoListener ); - CPPUNIT_TEST( testDefaultProtectSucceed ); - CPPUNIT_TEST( testDefaultProtectFail ); - CPPUNIT_TEST( testDefaultProtectFailIfThrow ); - CPPUNIT_TEST( testProtectChainPushOneTrap ); - CPPUNIT_TEST( testProtectChainPushOnePassThrough ); - CPPUNIT_TEST( testProtectChainPushTwoTrap ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestResultTest(); - virtual ~TestResultTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testConstructor(); - void testStop(); - - void testAddError(); - void testAddFailure(); - void testStartTest(); - void testEndTest(); - void testStartSuite(); - void testEndSuite(); - void testRunTest(); - - void testTwoListener(); - - void testDefaultProtectSucceed(); - void testDefaultProtectFail(); - void testDefaultProtectFailIfThrow(); - - void testProtectChainPushOneTrap(); - void testProtectChainPushOnePassThrough(); - - void testProtectChainPushTwoTrap(); - -private: - TestResultTest( const TestResultTest © ); - void operator =( const TestResultTest © ); - -private: - CPPUNIT_NS::TestResult *m_result; - MockTestListener *m_listener1; - MockTestListener *m_listener2; - CPPUNIT_NS::Test *m_dummyTest; -}; - - - -#endif // TESTRESULTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.cpp deleted file mode 100644 index 20c4f24e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "ExtensionSuite.h" -#include "TestSetUpTest.h" -#include -#include "MockTestCase.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSetUpTest, - extensionSuiteName() ); - - -TestSetUpTest::TestSetUpTest() -{ -} - - -TestSetUpTest::~TestSetUpTest() -{ -} - - -void -TestSetUpTest::setUp() -{ -} - - -void -TestSetUpTest::tearDown() -{ -} - - -void -TestSetUpTest::testRun() -{ - CPPUNIT_NS::TestResult result; - MockTestCase *test = new MockTestCase( "TestSetUpTest" ); - test->setExpectedSetUpCall(); - test->setExpectedRunTestCall(); - test->setExpectedTearDownCall(); - MockSetUp setUpTest( test ); - - setUpTest.run( &result ); - - setUpTest.verify(); - test->verify(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.h deleted file mode 100644 index 117473bd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSetUpTest.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef TESTSETUPTEST_H -#define TESTSETUPTEST_H - -#include -#include - - -class TestSetUpTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestSetUpTest ); - CPPUNIT_TEST( testRun ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestSetUpTest(); - virtual ~TestSetUpTest(); - - void setUp(); - void tearDown(); - - void testRun(); - -private: - class MockSetUp : public CPPUNIT_NS::TestSetUp - { - public: - MockSetUp( CPPUNIT_NS::Test *test ) - : CPPUNIT_NS::TestSetUp( test ) - , m_setUpCalled( false ) - , m_tearDownCalled( false ) - { - } - - void setUp() - { - m_setUpCalled = true; - } - - void tearDown() - { - m_tearDownCalled = true; - } - - void verify() - { - CPPUNIT_ASSERT( m_setUpCalled ); - CPPUNIT_ASSERT( m_tearDownCalled ); - } - - private: - bool m_setUpCalled; - bool m_tearDownCalled; - }; - - TestSetUpTest( const TestSetUpTest © ); - void operator =( const TestSetUpTest © ); - -private: -}; - - - -#endif // TESTSETUPTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.cpp deleted file mode 100644 index ec4f4adc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.cpp +++ /dev/null @@ -1,179 +0,0 @@ -#include "CoreSuite.h" -#include "TestSuiteTest.h" -#include -#include "MockTestCase.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSuiteTest, - coreSuiteName() ); - - -TestSuiteTest::TestSuiteTest() -{ -} - - -TestSuiteTest::~TestSuiteTest() -{ -} - - -void -TestSuiteTest::setUp() -{ - m_suite = new CPPUNIT_NS::TestSuite(); -} - - -void -TestSuiteTest::tearDown() -{ - delete m_suite; -} - - -void -TestSuiteTest::testConstructor() -{ - std::string name( "MySuite" ); - CPPUNIT_NS::TestSuite suite( name ); - CPPUNIT_ASSERT_EQUAL( name, suite.getName() ); -} - - -void -TestSuiteTest::testCountTestCasesWithNoTest() -{ - CPPUNIT_ASSERT_EQUAL( 0, m_suite->countTestCases() ); -} - - -void -TestSuiteTest::testCountTestCasesWithTwoTests() -{ - MockTestCase *case1 = new MockTestCase( "test1" ); - case1->setExpectedCountTestCasesCall(); - MockTestCase *case2 = new MockTestCase( "test2" ); - case2->setExpectedCountTestCasesCall(); - m_suite->addTest( case1 ); - m_suite->addTest( case2 ); - - CPPUNIT_ASSERT_EQUAL( 2, m_suite->countTestCases() ); - case1->verify(); - case2->verify(); -} - - -void -TestSuiteTest::testCountTestCasesWithSubSuite() -{ - MockTestCase *case1 = new MockTestCase( "test1" ); - case1->setExpectedCountTestCasesCall(); - MockTestCase *case2 = new MockTestCase( "test2" ); - case2->setExpectedCountTestCasesCall(); - MockTestCase *case3 = new MockTestCase( "test3" ); - case3->setExpectedCountTestCasesCall(); - CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite"); - subSuite->addTest( case1 ); - subSuite->addTest( case2 ); - m_suite->addTest( case3 ); - m_suite->addTest( subSuite ); - - CPPUNIT_ASSERT_EQUAL( 3, m_suite->countTestCases() ); - case1->verify(); - case2->verify(); - case3->verify(); -} - - -void -TestSuiteTest::testRunWithOneTest() -{ - MockTestCase *case1 = new MockTestCase( "test1" ); - case1->setExpectedRunTestCall(); - m_suite->addTest( case1 ); - - CPPUNIT_NS::TestResult result; - m_suite->run( &result ); - - case1->verify(); -} - - -void -TestSuiteTest::testRunWithOneTestAndSubSuite() -{ - MockTestCase *case1 = new MockTestCase( "test1" ); - case1->setExpectedRunTestCall(); - MockTestCase *case2 = new MockTestCase( "test2" ); - case2->setExpectedRunTestCall(); - MockTestCase *case3 = new MockTestCase( "test3" ); - case3->setExpectedRunTestCall(); - CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite"); - subSuite->addTest( case1 ); - subSuite->addTest( case2 ); - m_suite->addTest( case3 ); - m_suite->addTest( subSuite); - - CPPUNIT_NS::TestResult result; - m_suite->run( &result ); - - case1->verify(); - case2->verify(); - case3->verify(); -} - - -void -TestSuiteTest::testGetTests() -{ - m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) ); - m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) ); - CPPUNIT_ASSERT_EQUAL( 2, int(m_suite->getTests().size()) ); -} - - -void -TestSuiteTest::testDeleteContents() -{ - m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) ); - m_suite->deleteContents(); - CPPUNIT_ASSERT_EQUAL( 0, int(m_suite->getTests().size()) ); -} - - -void -TestSuiteTest::testGetChildTestCount() -{ - m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) ); - m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) ); - - CPPUNIT_ASSERT_EQUAL( 2, m_suite->getChildTestCount() ); -} - - -void -TestSuiteTest::testGetChildTestAt() -{ - CPPUNIT_NS::TestCase *test1 = new CPPUNIT_NS::TestCase( "test1" ); - CPPUNIT_NS::TestCase *test2 = new CPPUNIT_NS::TestCase( "test2" ); - m_suite->addTest( test1 ); - m_suite->addTest( test2 ); - - CPPUNIT_ASSERT( test1 == m_suite->getChildTestAt(0) ); - CPPUNIT_ASSERT( test2 == m_suite->getChildTestAt(1) ); -} - - -void -TestSuiteTest::testGetChildTestAtThrow1() -{ - m_suite->getChildTestAt(-1); -} - - -void -TestSuiteTest::testGetChildTestAtThrow2() -{ - m_suite->getChildTestAt(0); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.h deleted file mode 100644 index cdb301ab..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestSuiteTest.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef TESTSUITETEST_H -#define TESTSUITETEST_H - -#include -#include - - -class TestSuiteTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestSuiteTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testCountTestCasesWithNoTest ); - CPPUNIT_TEST( testCountTestCasesWithTwoTests ); - CPPUNIT_TEST( testCountTestCasesWithSubSuite ); - CPPUNIT_TEST( testRunWithOneTest ); - CPPUNIT_TEST( testRunWithOneTestAndSubSuite ); - CPPUNIT_TEST( testGetTests ); - CPPUNIT_TEST( testDeleteContents ); - CPPUNIT_TEST( testGetChildTestCount ); - CPPUNIT_TEST( testGetChildTestAt ); - CPPUNIT_TEST_EXCEPTION( testGetChildTestAtThrow1, std::out_of_range ); - CPPUNIT_TEST_EXCEPTION( testGetChildTestAtThrow2, std::out_of_range ); - CPPUNIT_TEST_SUITE_END(); - -public: - TestSuiteTest(); - virtual ~TestSuiteTest(); - - virtual void setUp(); - virtual void tearDown(); - - void testConstructor(); - - void testCountTestCasesWithNoTest(); - void testCountTestCasesWithTwoTests(); - void testCountTestCasesWithSubSuite(); - - void testRunWithOneTest(); - void testRunWithOneTestAndSubSuite(); - - void testGetTests(); - - void testDeleteContents(); - - void testGetChildTestCount(); - void testGetChildTestAt(); - void testGetChildTestAtThrow1(); - void testGetChildTestAtThrow2(); - -private: - TestSuiteTest( const TestSuiteTest © ); - void operator =( const TestSuiteTest © ); - -private: - CPPUNIT_NS::TestSuite *m_suite; -}; - - - -#endif // TESTSUITETEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.cpp deleted file mode 100644 index 4edc31c5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.cpp +++ /dev/null @@ -1,133 +0,0 @@ -#include "CoreSuite.h" -#include "TestTest.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestTest, - coreSuiteName() ); - - -TestTest::TestTest() : - CPPUNIT_NS::TestFixture() -{ -} - - -TestTest::~TestTest() -{ -} - - -void -TestTest::setUp() -{ - m_suite = new CPPUNIT_NS::TestSuite( "suite" ); - m_test1 = new MockTestCase( "test1" ); - m_test2 = new MockTestCase( "test2" ); - m_suite->addTest( m_test1 ); - m_suite->addTest( m_test2 ); - - m_path = new CPPUNIT_NS::TestPath(); -} - - -void -TestTest::tearDown() -{ - delete m_suite; - delete m_path; -} - - -void -TestTest::testFindTestPathPointerThis() -{ - CPPUNIT_ASSERT( m_test1->findTestPath( m_test1, *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test1 == m_path->getChildTest() ); - - m_path->removeTests(); - - CPPUNIT_ASSERT( m_suite->findTestPath( m_suite, *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_suite == m_path->getChildTest() ); -} - - -void -TestTest::testFindTestPathPointer() -{ - CPPUNIT_ASSERT( m_suite->findTestPath( m_test1, *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 2, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_suite == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test1 == m_path->getTestAt(1) ); -} - - -void -TestTest::testFindTestPathPointerFail() -{ - MockTestCase test( "test" ); - CPPUNIT_ASSERT( !m_suite->findTestPath( &test, *m_path ) ); - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestTest::testFindTestPathNameThis() -{ - CPPUNIT_ASSERT( m_test1->findTestPath( "test1", *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_test1 == m_path->getChildTest() ); - - m_path->removeTests(); - - CPPUNIT_ASSERT( m_suite->findTestPath( "suite", *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 1, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_suite == m_path->getChildTest() ); -} - - -void -TestTest::testFindTestPathName() -{ - CPPUNIT_ASSERT( m_suite->findTestPath( "test2", *m_path ) ); - CPPUNIT_ASSERT_EQUAL( 2, m_path->getTestCount() ); - CPPUNIT_ASSERT( m_suite == m_path->getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == m_path->getTestAt(1) ); -} - - -void -TestTest::testFindTestPathNameFail() -{ - CPPUNIT_ASSERT( !m_suite->findTestPath( "bad-test", *m_path ) ); - CPPUNIT_ASSERT( !m_path->isValid() ); -} - - -void -TestTest::testFindTest() -{ - CPPUNIT_ASSERT( m_test1 == m_suite->findTest( "test1" ) ); -} - - -void -TestTest::testFindTestThrow() -{ - m_suite->findTest( "no-name" ); -} - - -void -TestTest::testResolveTestPath() -{ - CPPUNIT_NS::TestPath path1 = m_suite->resolveTestPath( "suite"); - CPPUNIT_ASSERT_EQUAL( 1, path1.getTestCount() ); - CPPUNIT_ASSERT( m_suite == path1.getTestAt(0) ); - - CPPUNIT_NS::TestPath path2 = m_suite->resolveTestPath( "suite/test2"); - CPPUNIT_ASSERT_EQUAL( 2, path2.getTestCount() ); - CPPUNIT_ASSERT( m_suite == path2.getTestAt(0) ); - CPPUNIT_ASSERT( m_test2 == path2.getTestAt(1) ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.h deleted file mode 100644 index d556acec..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TestTest.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TESTTEST_H -#define TESTTEST_H - -#include -#include -#include -#include "MockTestCase.h" -#include - - -/*! \class TestTest - * \brief Unit test for class Test. - */ -class TestTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( TestTest ); - CPPUNIT_TEST( testFindTestPathPointerThis ); - CPPUNIT_TEST( testFindTestPathPointer ); - CPPUNIT_TEST( testFindTestPathPointerFail ); - CPPUNIT_TEST( testFindTestPathNameThis ); - CPPUNIT_TEST( testFindTestPathName ); - CPPUNIT_TEST( testFindTestPathNameFail ); - CPPUNIT_TEST( testFindTest ); - CPPUNIT_TEST_EXCEPTION( testFindTestThrow, std::invalid_argument ); - CPPUNIT_TEST( testResolveTestPath ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a TestTest object. - */ - TestTest(); - - /// Destructor. - virtual ~TestTest(); - - void setUp(); - void tearDown(); - - void testFindTestPathPointerThis(); - void testFindTestPathPointer(); - void testFindTestPathPointerFail(); - - void testFindTestPathNameThis(); - void testFindTestPathName(); - void testFindTestPathNameFail(); - - void testFindTest(); - void testFindTestThrow(); - - void testResolveTestPath(); - -private: - /// Prevents the use of the copy constructor. - TestTest( const TestTest © ); - - /// Prevents the use of the copy operator. - void operator =( const TestTest © ); - -private: - CPPUNIT_NS::TestSuite *m_suite; - MockTestCase *m_test1; - MockTestCase *m_test2; - CPPUNIT_NS::TestPath *m_path; -}; - - -#endif // TESTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ToolsSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ToolsSuite.h deleted file mode 100644 index a96e8031..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/ToolsSuite.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef CPPUNITTEST_TOOLSSUITE_H -#define CPPUNITTEST_TOOLSSUITE_H - -#include -#include - -inline std::string toolsSuiteName() -{ - return "Tools"; -} - -#endif // CPPUNITTEST_TOOLSSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.cpp deleted file mode 100644 index aaea99ad..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "TrackedTestCase.h" - -Tracker *TrackedTestCase::ms_tracker = NULL; - -TrackedTestCase::TrackedTestCase() -: CPPUNIT_NS::TestCase( "" ) -{ - if ( ms_tracker != NULL ) - ms_tracker->onConstructor(); -} - - -TrackedTestCase::~TrackedTestCase() -{ - if ( ms_tracker != NULL ) - ms_tracker->onDestructor(); -} - - -void -TrackedTestCase::setUp() -{ - if ( ms_tracker != NULL ) - ms_tracker->onSetUp(); -} - - -void -TrackedTestCase::tearDown() -{ - if ( ms_tracker != NULL ) - ms_tracker->onTearDown(); -} - - -void -TrackedTestCase::test() -{ - if ( ms_tracker != NULL ) - ms_tracker->onTest(); -} - - -void -TrackedTestCase::setTracker( Tracker *tracker ) -{ - ms_tracker = tracker; -} - - -void -TrackedTestCase::removeTracker() -{ - ms_tracker = NULL; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.h deleted file mode 100644 index f665c50e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/TrackedTestCase.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef TRACKEDTESTCASE_H -#define TRACKEDTESTCASE_H - -#include - - -class Tracker -{ -public: - virtual ~Tracker() {} - - virtual void onConstructor() {} - virtual void onDestructor() {} - virtual void onSetUp() {} - virtual void onTearDown() {} - virtual void onTest() {}; -}; - - -class TrackedTestCase : public CPPUNIT_NS::TestCase -{ -public: - TrackedTestCase(); - - virtual ~TrackedTestCase(); - - virtual void setUp(); - virtual void tearDown(); - - void test(); - - static void setTracker( Tracker *tracker ); - static void removeTracker(); - -private: - TrackedTestCase( const TrackedTestCase © ); - - void operator =( const TrackedTestCase © ); - -private: - static Tracker *ms_tracker; -}; - - -#endif // TRACKEDTESTCASE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/UnitTestToolSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/UnitTestToolSuite.h deleted file mode 100644 index 4b126617..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/UnitTestToolSuite.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef CPPUNITTEST_UNITTESTTOOLSUITE_H -#define CPPUNITTEST_UNITTESTTOOLSUITE_H - -#include -#include - -inline std::string unitTestToolSuiteName() -{ - return "UnitTestTool"; -} - -#endif // CPPUNITTEST_UNITTESTTOOLSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.cpp deleted file mode 100644 index 56c6ef8d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.cpp +++ /dev/null @@ -1,226 +0,0 @@ -#include -#include -#include "ToolsSuite.h" -#include "XmlElementTest.h" -#include "XmlUniformiser.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlElementTest, - toolsSuiteName() ); - - -XmlElementTest::XmlElementTest() -{ -} - - -XmlElementTest::~XmlElementTest() -{ -} - - -void -XmlElementTest::setUp() -{ -} - - -void -XmlElementTest::tearDown() -{ -} - - -void -XmlElementTest::testStringContentConstructor() -{ - CPPUNIT_NS::XmlElement element( "aName", "someContent" ); - CPPUNIT_ASSERT_EQUAL( std::string("aName"), element.name() ); - CPPUNIT_ASSERT_EQUAL( std::string("someContent"), element.content() ); -} - - -void -XmlElementTest::testNumericContentConstructor() -{ - CPPUNIT_NS::XmlElement element( "numericName", 123456789 ); - CPPUNIT_ASSERT_EQUAL( std::string("numericName"), element.name() ); - CPPUNIT_ASSERT_EQUAL( std::string("123456789"), element.content() ); -} - - -void -XmlElementTest::testSetName() -{ - CPPUNIT_NS::XmlElement element( "aName" ); - element.setName( "anotherName" ); - CPPUNIT_ASSERT_EQUAL( std::string("anotherName"), element.name() ); -} - - -void -XmlElementTest::testSetStringContent() -{ - CPPUNIT_NS::XmlElement element( "aName", "someContent" ); - element.setContent( "other" ); - CPPUNIT_ASSERT_EQUAL( std::string("other"), element.content() ); -} - - -void -XmlElementTest::testSetNumericContent() -{ - CPPUNIT_NS::XmlElement element( "aName", "someContent" ); - element.setContent( 87654321 ); - CPPUNIT_ASSERT_EQUAL( std::string("87654321"), element.content() ); -} - - -void -XmlElementTest::testElementCount() -{ - CPPUNIT_NS::XmlElement node( "element", "content" ); - CPPUNIT_ASSERT_EQUAL( 0, node.elementCount() ); - - node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); - node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) ); - CPPUNIT_ASSERT_EQUAL( 2, node.elementCount() ); -} - - -void -XmlElementTest::testElementAtNegativeIndexThrow() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.elementAt( -1 ); -} - - -void -XmlElementTest::testElementAtTooLargeIndexThrow() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.elementAt( 0 ); -} - - -void -XmlElementTest::testElementAt() -{ - CPPUNIT_NS::XmlElement node( "element" ); - CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" ); - CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" ); - node.addElement( element1 ); - node.addElement( element2 ); - - CPPUNIT_ASSERT( element1 == node.elementAt(0) ); - CPPUNIT_ASSERT( element2 == node.elementAt(1) ); -} - - -void -XmlElementTest::testElementForThrow() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.addElement( new CPPUNIT_NS::XmlElement( "element1" ) ); - node.elementFor( "name2" ); -} - - -void -XmlElementTest::testElementFor() -{ - CPPUNIT_NS::XmlElement node( "element" ); - CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" ); - CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" ); - node.addElement( element1 ); - node.addElement( element2 ); - - CPPUNIT_ASSERT( element2 == node.elementFor( "element2" ) ); - CPPUNIT_ASSERT( element1 == node.elementFor( "element1" ) ); -} - - -void -XmlElementTest::testEmptyNodeToString() -{ - CPPUNIT_NS::XmlElement node( "element" ); - std::string expectedXml = ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementWithAttributesToString() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.addAttribute( "id", 17 ); - node.addAttribute( "date-format", "iso-8901" ); - std::string expectedXml = "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testEscapedAttributeValueToString() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.addAttribute( "escaped", "&<>\"'" ); - std::string expectedXml = ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementToStringEscapeContent() -{ - CPPUNIT_NS::XmlElement node( "element", "ChessTest" ); - std::string expectedXml = "" - "ChessTest<class Chess>" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementWithChildrenToString() -{ - CPPUNIT_NS::XmlElement node( "element" ); - node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); - node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) ); - std::string expectedXml = "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementWithContentToString() -{ - CPPUNIT_NS::XmlElement node( "element", "content\nline2" ); - std::string expectedXml = "content\nline2"; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementWithNumericContentToString() -{ - CPPUNIT_NS::XmlElement node( "element", 123456789 ); - std::string expectedXml = "123456789"; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} - - -void -XmlElementTest::testElementWithContentAndChildToString() -{ - CPPUNIT_NS::XmlElement node( "element", "content" ); - node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); - std::string expectedXml = "content"; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.h deleted file mode 100644 index 875ee515..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlElementTest.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef CPPUNITEST_XMLELEMENTTEST_H -#define CPPUNITEST_XMLELEMENTTEST_H - -#include -#include - - -/*! Unit tests for XmlElement. - */ -class XmlElementTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( XmlElementTest ); - CPPUNIT_TEST( testStringContentConstructor ); - CPPUNIT_TEST( testNumericContentConstructor ); - CPPUNIT_TEST( testSetName ); - CPPUNIT_TEST( testSetStringContent ); - CPPUNIT_TEST( testSetNumericContent ); - CPPUNIT_TEST( testElementCount ); - CPPUNIT_TEST_EXCEPTION( testElementAtNegativeIndexThrow, std::invalid_argument ); - CPPUNIT_TEST_EXCEPTION( testElementAtTooLargeIndexThrow, std::invalid_argument ); - CPPUNIT_TEST( testElementAt ); - CPPUNIT_TEST_EXCEPTION( testElementForThrow, std::invalid_argument ); - CPPUNIT_TEST( testElementFor ); - - CPPUNIT_TEST( testEmptyNodeToString ); - CPPUNIT_TEST( testElementWithAttributesToString ); - CPPUNIT_TEST( testEscapedAttributeValueToString ); - CPPUNIT_TEST( testElementToStringEscapeContent ); - CPPUNIT_TEST( testElementWithChildrenToString ); - CPPUNIT_TEST( testElementWithContentToString ); - CPPUNIT_TEST( testElementWithNumericContentToString ); - CPPUNIT_TEST( testElementWithContentAndChildToString ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a XmlElementTest object. - */ - XmlElementTest(); - - /// Destructor. - virtual ~XmlElementTest(); - - void setUp(); - void tearDown(); - - void testStringContentConstructor(); - void testNumericContentConstructor(); - void testSetName(); - void testSetStringContent(); - void testSetNumericContent(); - void testElementCount(); - void testElementAtNegativeIndexThrow(); - void testElementAtTooLargeIndexThrow(); - void testElementAt(); - void testElementForThrow(); - void testElementFor(); - - void testEmptyNodeToString(); - void testElementWithAttributesToString(); - void testEscapedAttributeValueToString(); - void testElementToStringEscapeContent(); - void testElementWithChildrenToString(); - void testElementWithContentToString(); - void testElementWithNumericContentToString(); - void testElementWithContentAndChildToString(); - -private: - /// Prevents the use of the copy constructor. - XmlElementTest( const XmlElementTest © ); - - /// Prevents the use of the copy operator. - void operator =( const XmlElementTest © ); -}; - - - -#endif // CPPUNITEST_XMLELEMENTTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.cpp deleted file mode 100644 index dad689c5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.cpp +++ /dev/null @@ -1,356 +0,0 @@ -#include -#include -#include -#include -#include -#include "OutputSuite.h" -#include "XmlOutputterTest.h" -#include "XmlUniformiser.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlOutputterTest, - outputSuiteName() ); - - -XmlOutputterTest::XmlOutputterTest() -{ -} - - -XmlOutputterTest::~XmlOutputterTest() -{ -} - - -void -XmlOutputterTest::setUp() -{ - m_dummyTests.clear(); - m_result = new CPPUNIT_NS::TestResultCollector(); -} - - -void -XmlOutputterTest::tearDown() -{ - delete m_result; - for ( unsigned int index =0; index < m_dummyTests.size(); ++index ) - delete m_dummyTests[index]; - m_dummyTests.clear(); -} - - -void -XmlOutputterTest::testWriteXmlResultWithNoTest() -{ - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.write(); - - std::string actualXml = stream.str(); - std::string expectedXml = - "" - "" - "" - "" - "0" - "0" - "0" - "0" - "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml ); -} - - -void -XmlOutputterTest::testWriteXmlResultWithOneFailure() -{ - addTestFailure( "test1", "message failure1", CPPUNIT_NS::SourceLine( "test.cpp", 3 ) ); - - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.write(); - - std::string actualXml = stream.str(); - std::string expectedXml = - "" - "" - "" - "test1" - "Assertion" - "" - "test.cpp" - "3" - "" - "message failure1" - "" - "" - "" - "" - "1" - "1" - "0" - "1" - "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml ); -} - - -void -XmlOutputterTest::testWriteXmlResultWithOneError() -{ - addTestError( "test1", "message error1" ); - - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.write(); - - std::string actualXml = stream.str(); - std::string expectedXml = - "" - "" - "" - "test1" - "Error" - "message error1" - "" - "" - "" - "" - "1" - "1" - "1" - "0" - "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml ); -} - - -void -XmlOutputterTest::testWriteXmlResultWithOneSuccess() -{ - addTest( "test1" ); - - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.write(); - - std::string actualXml = stream.str(); - std::string expectedXml = - "" - "" - "" - "" - "test1" - "" - "" - "" - "1" - "0" - "0" - "0" - "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml ); -} - - -void -XmlOutputterTest::testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSuccess() -{ - addTestFailure( "test1", "failure1" ); - addTestError( "test2", "error1" ); - addTestFailure( "test3", "failure2" ); - addTestFailure( "test4", "failure3" ); - addTest( "test5" ); - addTestError( "test6", "error2" ); - addTest( "test7" ); - - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.write(); - - std::string actualXml = stream.str(); - std::string expectedXml = - "" - "" - "" - "test1" - "Assertion" - "failure1" - "" - "" - "test2" - "Error" - "error1" - "" - "" - "test3" - "Assertion" - "failure2" - "" - "" - "test4" - "Assertion" - "failure3" - "" - "" - "test6" - "Error" - "error2" - "" - "" - "" - "" - "test5" - "" - "" - "test7" - "" - "" - "" - "7" - "5" - "2" - "3" - "" - ""; - CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, actualXml ); -} - - -class XmlOutputterTest::MockHook : public CPPUNIT_NS::XmlOutputterHook -{ -public: - MockHook( int &beginCalls, - int &endCalls, - int &statisticsCalls, - int &successfulTestCalls, - int &failedTestCalls ) - : m_beginCalls( beginCalls ) - , m_endCalls( endCalls ) - , m_statisticsCalls( statisticsCalls ) - , m_successfulTestCalls( successfulTestCalls ) - , m_failedTestCalls( failedTestCalls ) - { - } - - void beginDocument( CPPUNIT_NS::XmlDocument *document ) - { - ++m_beginCalls; - } - - void endDocument( CPPUNIT_NS::XmlDocument *document ) - { - ++m_endCalls; - } - - void failTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test, - CPPUNIT_NS::TestFailure *failure ) - { - ++m_failedTestCalls; - } - - void successfulTestAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *testElement, - CPPUNIT_NS::Test *test ) - { - ++m_successfulTestCalls; - } - - void statisticsAdded( CPPUNIT_NS::XmlDocument *document, - CPPUNIT_NS::XmlElement *statisticsElement ) - { - ++m_statisticsCalls; - } - -private: - int &m_beginCalls; - int &m_endCalls; - int &m_statisticsCalls; - int &m_successfulTestCalls; - int &m_failedTestCalls; -}; - - -void -XmlOutputterTest::testHook() -{ - int begin =0, end =0, statistics =0, successful =0, failed =0; - MockHook hook( begin, end, statistics, successful, failed ); - - addTest( "test1" ); - addTest( "test2" ); - addTest( "test3" ); - addTestFailure( "testfail1", "assertion failed" ); - addTestError( "testerror1", "exception" ); - - CPPUNIT_NS::OStringStream stream; - CPPUNIT_NS::XmlOutputter outputter( m_result, stream ); - outputter.addHook( &hook ); - outputter.write(); - - CPPUNIT_ASSERT_EQUAL( 1, begin ); - CPPUNIT_ASSERT_EQUAL( 1, end ); - CPPUNIT_ASSERT_EQUAL( 1, statistics ); - CPPUNIT_ASSERT_EQUAL( 3, successful ); - CPPUNIT_ASSERT_EQUAL( 2, failed ); -} - - -void -XmlOutputterTest::addTest( std::string testName ) -{ - CPPUNIT_NS::Test *test = makeDummyTest( testName ); - m_result->startTest( test ); - m_result->endTest( test ); -} - - -void -XmlOutputterTest::addTestFailure( std::string testName, - std::string message, - CPPUNIT_NS::SourceLine sourceLine ) -{ - addGenericTestFailure( testName, CPPUNIT_NS::Message(message), sourceLine, false ); -} - - -void -XmlOutputterTest::addTestError( std::string testName, - std::string message, - CPPUNIT_NS::SourceLine sourceLine ) -{ - addGenericTestFailure( testName, CPPUNIT_NS::Message(message), sourceLine, true ); -} - - -void -XmlOutputterTest::addGenericTestFailure( std::string testName, - CPPUNIT_NS::Message message, - CPPUNIT_NS::SourceLine sourceLine, - bool isError ) -{ - CPPUNIT_NS::Test *test = makeDummyTest( testName ); - m_result->startTest( test ); - CPPUNIT_NS::TestFailure failure( test, - new CPPUNIT_NS::Exception( message, sourceLine ), - isError ); - m_result->addFailure( failure ); - m_result->endTest( test ); -} - - -CPPUNIT_NS::Test * -XmlOutputterTest::makeDummyTest( std::string testName ) -{ - CPPUNIT_NS::Test *test = new CPPUNIT_NS::TestCase( testName ); - m_dummyTests.push_back( test ); - return test; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.h deleted file mode 100644 index 697a452c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlOutputterTest.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef CPPUNITEST_XMLTESTRESULTOUTPUTTERTEST_H -#define CPPUNITEST_XMLTESTRESULTOUTPUTTERTEST_H - -#include -#include -#include -#include -#include - - -/*! \class XmlOutputterTest - * \brief Unit tests for XmlOutputter. - */ -class XmlOutputterTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( XmlOutputterTest ); - CPPUNIT_TEST( testWriteXmlResultWithNoTest ); - CPPUNIT_TEST( testWriteXmlResultWithOneFailure ); - CPPUNIT_TEST( testWriteXmlResultWithOneError ); - CPPUNIT_TEST( testWriteXmlResultWithOneSuccess ); - CPPUNIT_TEST( testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSuccess ); - CPPUNIT_TEST( testHook ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a XmlOutputterTest object. - */ - XmlOutputterTest(); - - /// Destructor. - virtual ~XmlOutputterTest(); - - void setUp(); - void tearDown(); - void testWriteXmlResultWithNoTest(); - void testWriteXmlResultWithOneFailure(); - void testWriteXmlResultWithOneError(); - void testWriteXmlResultWithOneSuccess(); - void testWriteXmlResultWithThreeFailureTwoErrorsAndTwoSuccess(); - - void testHook(); - -private: - class MockHook; - - /// Prevents the use of the copy constructor. - XmlOutputterTest( const XmlOutputterTest © ); - - /// Prevents the use of the copy operator. - void operator =( const XmlOutputterTest © ); - - std::string statistics( int tests, - int total, - int error, - int failure ); - - void addTest( std::string testName ); - void addTestFailure( std::string testName, - std::string message, - CPPUNIT_NS::SourceLine sourceLine = CPPUNIT_NS::SourceLine() ); - void addTestError( std::string testName, - std::string message, - CPPUNIT_NS::SourceLine sourceLine = CPPUNIT_NS::SourceLine() ); - void addGenericTestFailure( std::string testName, - CPPUNIT_NS::Message message, - CPPUNIT_NS::SourceLine sourceLine, - bool isError ); - - CPPUNIT_NS::Test *makeDummyTest( std::string testName ); - -private: - CPPUNIT_NS::TestResultCollector *m_result; - CppUnitDeque m_dummyTests; -}; - - - -#endif // CPPUNITEST_XMLTESTRESULTOUTPUTTERTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.cpp deleted file mode 100644 index 48c02073..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.cpp +++ /dev/null @@ -1,236 +0,0 @@ -#include "XmlUniformiser.h" - - -int -notEqualIndex( std::string expectedXml, - std::string actualXml ) -{ - unsigned int index = 0; - while ( index < actualXml.length() && - index < expectedXml.length() && - actualXml[index] == expectedXml[index] ) - ++index; - - return index; -} - - -/// Asserts that two XML string are equivalent. -void -checkXmlEqual( std::string expectedXml, - std::string actualXml, - CPPUNIT_NS::SourceLine sourceLine ) -{ - std::string expected = XmlUniformiser( expectedXml ).stripped(); - std::string actual = XmlUniformiser( actualXml ).stripped(); - - if ( expected == actual ) - return; - - int index = notEqualIndex( expected, actual ); - CPPUNIT_NS::OStringStream message; - message << "differ at index: " << index << "\n" - << "expected: " << expected.substr(index) << "\n" - << "but was : " << actual.substr( index ); - CPPUNIT_NS::Asserter::failNotEqual( expected, - actual, - sourceLine, - message.str() ); -} - - - -XmlUniformiser::XmlUniformiser( const std::string &xml ) : - m_index( 0 ), - m_xml( xml ) -{ -} - - -std::string -XmlUniformiser::stripped() -{ - while ( isValidIndex() ) - { - skipSpaces(); - if ( startsWith( " 0 ) - ++m_index; -} - - -void -XmlUniformiser::copyNext( int count ) -{ - while ( count-- > 0 && isValidIndex() ) - m_stripped += m_xml[ m_index++ ]; -} - - -bool -XmlUniformiser::startsWith( std::string expected ) -{ - std::string actual = m_xml.substr( m_index, expected.length() ); - return actual == expected; -} - - -void -XmlUniformiser::skipProcessed() -{ - while ( isValidIndex() && !startsWith( "?>" ) ) - skipNext(); - if ( isValidIndex() ) - skipNext( 2 ); -} - - -void -XmlUniformiser::skipComment() -{ - while ( isValidIndex() && !startsWith( "-->" ) ) - skipNext(); - if ( isValidIndex() ) - skipNext( 3 ); -} - - -void -XmlUniformiser::copyElement() -{ - copyElementName(); - copyElementAttributes(); -} - - -void -XmlUniformiser::copyElementName() -{ - while ( isValidIndex() && - !( isSpace() || startsWith( ">" ) ) ) - copyNext(); -} - - -void -XmlUniformiser::copyElementAttributes() -{ - do - { - bool hadSpace = isSpace(); - skipSpaces(); - if ( startsWith( ">" ) ) - break; - - if ( hadSpace ) - m_stripped += ' '; - - copyAttributeName(); - skipSpaces(); - if ( startsWith( "=" ) ) - { - copyNext(); - copyAttributeValue(); - } - else // attribute should always be valued, ne ? - m_stripped += ' '; - } - while ( isValidIndex() ); - copyNext(); -} - - -void -XmlUniformiser::copyAttributeName() -{ - while ( isValidIndex() && !isEndOfAttributeName() ) - copyNext(); -} - - -bool -XmlUniformiser::isEndOfAttributeName() -{ - return isSpace() || startsWith( ">" ) || startsWith( "=" ); -} - - -void -XmlUniformiser::copyAttributeValue() -{ - skipSpaces(); - copyUntilDoubleQuote(); - copyUntilDoubleQuote(); -} - - -void -XmlUniformiser::copyUntilDoubleQuote() -{ - while ( isValidIndex() && !startsWith("\"") ) - copyNext(); - copyNext(); // '"' -} - - -void -XmlUniformiser::copyElementContent() -{ - while ( isValidIndex() && !startsWith( "<" ) ) - copyNext(); - removeTrailingSpaces(); -} - - -void -XmlUniformiser::removeTrailingSpaces() -{ - int index = m_stripped.length(); - while ( index-1 > 0 && isSpace( m_stripped[index-1] ) ) - --index; - m_stripped.resize( index ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.h deleted file mode 100644 index 545ece3c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiser.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef CPPUNITTEST_XMLUNIFORMISER_H -#define CPPUNITTEST_XMLUNIFORMISER_H - -#include -#include -#include - - -/*! Uniformise an XML string. - * - * Strips spaces between attribut in Element. - * \warning Attribute values must be double-quoted (att="value"). - * No support for embedded DTD declaration - */ -class XmlUniformiser -{ -public: - XmlUniformiser( const std::string &xml ); - std::string stripped(); - -private: - void skipSpaces(); - bool isValidIndex(); - void skipNext( int count =1 ); - void copyNext( int count =1 ); - void skipProcessed(); - void skipComment(); - void copyElement(); - void copyElementContent(); - bool isSpace( char c ); - bool isSpace(); - bool startsWith( std::string expected ); - void copyElementName(); - void copyElementAttributes(); - void copyAttributeName(); - bool isEndOfAttributeName(); - void copyAttributeValue(); - void copyUntilDoubleQuote(); - void removeTrailingSpaces(); - -private: - unsigned int m_index; - std::string m_xml; - std::string m_stripped; -}; - - - - -void -checkXmlEqual( std::string expectedXml, - std::string actualXml, - CPPUNIT_NS::SourceLine sourceLine ); - - -/// Asserts that two XML strings are equivalent. -#define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \ - ::checkXmlEqual( expected, actual, \ - CPPUNIT_SOURCELINE() ) - - - -#endif // XMLUNIFORMISER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.cpp deleted file mode 100644 index a04a1ddd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.cpp +++ /dev/null @@ -1,144 +0,0 @@ -#include -#include "UnitTestToolSuite.h" -#include "XmlUniformiserTest.h" -#include "XmlUniformiser.h" - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlUniformiserTest, - unitTestToolSuiteName() ); - - -XmlUniformiserTest::XmlUniformiserTest() -{ -} - - -XmlUniformiserTest::~XmlUniformiserTest() -{ -} - - -void -XmlUniformiserTest::setUp() -{ -} - - -void -XmlUniformiserTest::tearDown() -{ -} - - -void -XmlUniformiserTest::testEmpty() -{ - check( "", "" ); -} - - -void -XmlUniformiserTest::testSkipProcessed() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testOpenElementWithoutAttributeButSomeSpaces() -{ - check( " ", - "" ); -} - - -void -XmlUniformiserTest::testOpenCloseElement() -{ - check( " ", - "" ); -} - - -void -XmlUniformiserTest::testElementWithEmptyAttribute() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testElementWithEmptyAttributeButSomeSpaces() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testElementWithOneAttribute() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testElementWithThreeAttributes() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testElementWithContent() -{ - check( "\nContent\n\n", - "Content" ); -} - - -void -XmlUniformiserTest::testElementsHierarchyWithContents() -{ - check( "\n" - "2001-10-04\n" - "\n\n" - "TokenParserTest\n" - "\n\n\n", - "" - "2001-10-04" - "" - "TokenParserTest" - "" ); -} - - -void -XmlUniformiserTest::testSkipComment() -{ - check( "", - "" ); -} - - -void -XmlUniformiserTest::testAssertXmlEqual() -{ - CPPUNIT_ASSERT_ASSERTION_FAIL( - CPPUNITTEST_ASSERT_XML_EQUAL( "", "" ) ); - CPPUNIT_ASSERT_ASSERTION_PASS( - CPPUNITTEST_ASSERT_XML_EQUAL( "", "" ) ); -} - - -void -XmlUniformiserTest::check( const std::string &xml, - const std::string &expectedStrippedXml ) -{ - std::string actual = XmlUniformiser( xml ).stripped(); - CPPUNIT_ASSERT_EQUAL( expectedStrippedXml, actual ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.h deleted file mode 100644 index be2d6da4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/XmlUniformiserTest.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef XMLUNIFORMISERTEST_H -#define XMLUNIFORMISERTEST_H - -#include - - -/*! \class XmlUniformiserTest - * \brief Unit test for XmlUniformiser. - */ -class XmlUniformiserTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( XmlUniformiserTest ); - CPPUNIT_TEST( testEmpty ); - CPPUNIT_TEST( testSkipProcessed ); - CPPUNIT_TEST( testOpenElementWithoutAttributeButSomeSpaces ); - CPPUNIT_TEST( testOpenCloseElement ); - CPPUNIT_TEST( testElementWithEmptyAttribute ); - CPPUNIT_TEST( testElementWithEmptyAttributeButSomeSpaces ); - CPPUNIT_TEST( testElementWithOneAttribute ); - CPPUNIT_TEST( testElementWithThreeAttributes ); - CPPUNIT_TEST( testSkipComment ); - CPPUNIT_TEST( testElementWithContent ); - CPPUNIT_TEST( testElementsHierarchyWithContents ); - CPPUNIT_TEST( testAssertXmlEqual ); - CPPUNIT_TEST_SUITE_END(); - -public: - /*! Constructs a XmlUniformiserTest object. - */ - XmlUniformiserTest(); - - /// Destructor. - virtual ~XmlUniformiserTest(); - - void setUp(); - void tearDown(); - - void testEmpty(); - void testSkipProcessed(); - void testOpenElementWithoutAttributeButSomeSpaces(); - void testOpenCloseElement(); - void testElementWithEmptyAttribute(); - void testElementWithEmptyAttributeButSomeSpaces(); - void testElementWithOneAttribute(); - void testElementWithThreeAttributes(); - void testSkipComment(); - void testElementWithContent(); - void testElementsHierarchyWithContents(); - - void testAssertXmlEqual(); - -private: - void check( const std::string &xml, - const std::string &expectedStrippedXml ); - - /// Prevents the use of the copy constructor. - XmlUniformiserTest( const XmlUniformiserTest © ); - - /// Prevents the use of the copy operator. - void operator =( const XmlUniformiserTest © ); - -private: -}; - - - -#endif // XMLUNIFORMISERTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.cpp deleted file mode 100644 index b02c732d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include "CoreSuite.h" -#include "assertion_traitsTest.h" - - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( assertion_traitsTest, - coreSuiteName() ); - -assertion_traitsTest::assertion_traitsTest() -{ -} - - -void -assertion_traitsTest::test_toString() -{ - CPPUNIT_ASSERT_EQUAL( std::string( "abc" ), - CPPUNIT_NS::assertion_traits::toString( "abc" ) ); - - CPPUNIT_ASSERT_EQUAL( std::string( "33" ), - CPPUNIT_NS::assertion_traits::toString( 33 ) ); - - // Test that assertion_traits::toString() produces - // more than the standard 6 digits of precision. - CPPUNIT_ASSERT_EQUAL( std::string( "33.1" ), - CPPUNIT_NS::assertion_traits::toString( 33.1 ) ); - CPPUNIT_ASSERT_EQUAL( std::string( "33.001" ), - CPPUNIT_NS::assertion_traits::toString( 33.001 ) ); - CPPUNIT_ASSERT_EQUAL( std::string( "33.00001" ), - CPPUNIT_NS::assertion_traits::toString( 33.00001 ) ); - CPPUNIT_ASSERT_EQUAL( std::string( "33.0000001" ), - CPPUNIT_NS::assertion_traits::toString( 33.0000001 ) ); - CPPUNIT_ASSERT_EQUAL( std::string( "33.0000000001" ), - CPPUNIT_NS::assertion_traits::toString( 33.0000000001 ) ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.h deleted file mode 100644 index 207d9434..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/cppunittest/assertion_traitsTest.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef ASSERTIONTRAITSTEST_H -#define ASSERTIONTRAITSTEST_H - -#include - -class assertion_traitsTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( assertion_traitsTest ); - CPPUNIT_TEST( test_toString ); - CPPUNIT_TEST_SUITE_END(); - -public: - - assertion_traitsTest(); - - void test_toString(); - - -private: - assertion_traitsTest( const assertion_traitsTest © ); - void operator =( const assertion_traitsTest © ); - -private: -}; - -#endif - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.dsw deleted file mode 100644 index fc77400f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.dsw +++ /dev/null @@ -1,254 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ClockerPlugIn"=.\ClockerPlugIn\ClockerPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "CppUnitTestApp"=.\msvc6\CppUnitTestApp\CppUnitTestApp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TestRunner - End Project Dependency -}}} - -############################################################################### - -Project: "CppUnitTestMain"=.\cppunittest\CppUnitTestMain.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "CppUnitTestPlugIn"=.\cppunittest\CppUnitTestPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "DllPlugInTester"=..\src\DllPlugInTester\DllPlugInTester.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "DllPlugInTesterTest"=..\src\DllPlugInTester\DllPlugInTesterTest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "DumperPlugIn"=.\DumperPlugIn\DumperPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "HostApp"=.\msvc6\HostApp\HostApp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TestRunner - End Project Dependency -}}} - -############################################################################### - -Project: "TestPlugInRunner"=..\src\msvc6\testpluginrunner\TestPlugInRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "TestRunner"=..\src\msvc6\testrunner\TestRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Project: "cppunit"=..\src\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "cppunit_dll"=..\src\cppunit\cppunit_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "hierarchy"=.\hierarchy\hierarchy.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Project: "money"=.\money\money.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Project: "simple"=.\simple\simple.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Project: "simple_plugin"=.\SIMPLE\simple_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency - Begin Project Dependency - Project_Dep_Name DllPlugInTester - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.opt b/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.opt deleted file mode 100644 index 56de7b95..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/examples/examples.opt and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.cpp deleted file mode 100644 index f74af114..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "BoardGame.h" - -bool -BoardGame::reset() -{ - return true; -} - - -BoardGame::~BoardGame() -{ -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.h deleted file mode 100644 index d1864c52..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGame.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __BOARDGAME_H__ -#define __BOARDGAME_H__ - -/** Example class to show hierarchy testing. - * - * Shamelessly ripped and adapted from - * - * ClassHierarchyTestingInCppUnit - * - */ -class BoardGame { - public: - /// expected to return true - virtual bool reset(); - virtual ~BoardGame(); -}; - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGameTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGameTest.h deleted file mode 100644 index 5706acbb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/BoardGameTest.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef __BOARDGAMETEST_H__ -#define __BOARDGAMETEST_H__ - -#include -#include - -template -class BoardGameTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( BoardGameTest ); - CPPUNIT_TEST( testReset ); - CPPUNIT_TEST( testResetShouldFail ); - CPPUNIT_TEST_SUITE_END(); -protected: - GAMECLASS *m_game; - -public: - BoardGameTest() - { - } - - int countTestCases () const - { - return 1; - } - - void setUp() - { - this->m_game = new GAMECLASS; - } - - void tearDown() - { - delete this->m_game; - } - - void testReset() - { - CPPUNIT_ASSERT( this->m_game->reset() ); - } - - void testResetShouldFail() - { - CPPUNIT_NS::stdCOut() << "The following test fails, this is intended:" << "\n"; - CPPUNIT_ASSERT( !this->m_game->reset() ); - } -}; - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.cpp deleted file mode 100644 index a49263cc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Chess.h" - -int -Chess::getNumberOfPieces() const -{ - return 32; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.h deleted file mode 100644 index 9b050fcf..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Chess.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __CHESS_H__ -#define __CHESS_H__ - -#include "BoardGame.h" - -class Chess: public BoardGame { - public: - virtual int getNumberOfPieces() const; -}; - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/ChessTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/ChessTest.h deleted file mode 100644 index 8e70c1a2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/ChessTest.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef __CHESSTEST_H__ -#define __CHESSTEST_H__ - -#include "BoardGameTest.h" - -template -class ChessTest : public BoardGameTest -{ - CPPUNIT_TEST_SUB_SUITE( ChessTest, BoardGameTest ); - CPPUNIT_TEST( testNumberOfPieces ); - CPPUNIT_TEST_SUITE_END(); -public: - ChessTest() - { - } - - void testNumberOfPieces() - { - CPPUNIT_ASSERT( this->m_game->getNumberOfPieces () == 32 ); - } -}; - - - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.am deleted file mode 100644 index 03d4a5b2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -EXTRA_DIST = hierarchy.dsw hierarchy.dsp - -TESTS = hierarchy -XFAIL_TESTS = hierarchy - -check_PROGRAMS = $(TESTS) - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - -hierarchy_SOURCES= BoardGame.cpp \ - Chess.cpp \ - main.cpp \ - BoardGame.h \ - Chess.h \ - BoardGameTest.h \ - ChessTest.h - -hierarchy_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -hierarchy_LDFLAGS = $(LIBADD_DL) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.in deleted file mode 100644 index 44eeecee..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/Makefile.in +++ /dev/null @@ -1,566 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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@ -TESTS = hierarchy$(EXEEXT) -XFAIL_TESTS = hierarchy$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -subdir = examples/hierarchy -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -am__EXEEXT_1 = hierarchy$(EXEEXT) -am_hierarchy_OBJECTS = BoardGame.$(OBJEXT) Chess.$(OBJEXT) \ - main.$(OBJEXT) -hierarchy_OBJECTS = $(am_hierarchy_OBJECTS) -hierarchy_DEPENDENCIES = $(top_builddir)/src/cppunit/libcppunit.la -hierarchy_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(hierarchy_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(hierarchy_SOURCES) -DIST_SOURCES = $(hierarchy_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = hierarchy.dsw hierarchy.dsp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -hierarchy_SOURCES = BoardGame.cpp \ - Chess.cpp \ - main.cpp \ - BoardGame.h \ - Chess.h \ - BoardGameTest.h \ - ChessTest.h - -hierarchy_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -hierarchy_LDFLAGS = $(LIBADD_DL) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/hierarchy/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/hierarchy/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 - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -hierarchy$(EXEEXT): $(hierarchy_OBJECTS) $(hierarchy_DEPENDENCIES) - @rm -f hierarchy$(EXEEXT) - $(hierarchy_LINK) $(hierarchy_OBJECTS) $(hierarchy_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BoardGame.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Chess.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsp deleted file mode 100644 index 8957a607..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsp +++ /dev/null @@ -1,119 +0,0 @@ -# Microsoft Developer Studio Project File - Name="hierarchy" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=hierarchy - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "hierarchy.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "hierarchy.mak" CFG="hierarchy - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "hierarchy - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "hierarchy - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "hierarchy - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunit.lib /nologo /subsystem:console /machine:I386 -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "hierarchy - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "hierarchy - Win32 Release" -# Name "hierarchy - Win32 Debug" -# Begin Source File - -SOURCE=.\BoardGame.cpp -# End Source File -# Begin Source File - -SOURCE=.\BoardGame.h -# End Source File -# Begin Source File - -SOURCE=.\BoardGameTest.h -# End Source File -# Begin Source File - -SOURCE=.\Chess.cpp -# End Source File -# Begin Source File - -SOURCE=.\Chess.h -# End Source File -# Begin Source File - -SOURCE=.\ChessTest.h -# End Source File -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsw deleted file mode 100644 index 6a13d79a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/hierarchy.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "cppunit"=..\..\src\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "hierarchy"=.\hierarchy.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/main.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/main.cpp deleted file mode 100644 index e7f306f4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/hierarchy/main.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include "BoardGame.h" -#include "Chess.h" -#include "BoardGameTest.h" -#include "ChessTest.h" - - - -int -main(int argc, char** argv) -{ - CPPUNIT_NS::TextUi::TestRunner runner; - - runner.addTest( BoardGameTest::suite() ); - runner.addTest( ChessTest::suite() ); - - bool wasSuccessful = runner.run(); - - return wasSuccessful ? 0 : 1; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.am deleted file mode 100644 index 414e65bf..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# Include cookbook.html in distro -EXTRA_DIST = money.dsp money.dsw configure.in StdAfx.cpp - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - - -# Rules to make the production code -#bin_PROGRAMS = Money -#main_SOURCES = Money.h - -# Rules for the test code (use `make check` to execute) -TESTS = MoneyApp -check_PROGRAMS = $(TESTS) - -MoneyApp_SOURCES = Money.h MoneyTest.h MoneyTest.cpp MoneyApp.cpp StdAfx.h -MoneyApp_CXXFLAGS = $(CPPUNIT_CFLAGS) -MoneyApp_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -MoneyApp_LDFLAGS = $(CPPUNIT_LIBS) $(LIBADD_DL) - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.in deleted file mode 100644 index ddc12379..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Makefile.in +++ /dev/null @@ -1,588 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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@ -TESTS = MoneyApp$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -subdir = examples/money -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -am__EXEEXT_1 = MoneyApp$(EXEEXT) -am_MoneyApp_OBJECTS = MoneyApp-MoneyTest.$(OBJEXT) \ - MoneyApp-MoneyApp.$(OBJEXT) -MoneyApp_OBJECTS = $(am_MoneyApp_OBJECTS) -MoneyApp_DEPENDENCIES = $(top_builddir)/src/cppunit/libcppunit.la -MoneyApp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(MoneyApp_CXXFLAGS) \ - $(CXXFLAGS) $(MoneyApp_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(MoneyApp_SOURCES) -DIST_SOURCES = $(MoneyApp_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# Include cookbook.html in distro -EXTRA_DIST = money.dsp money.dsw configure.in StdAfx.cpp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -MoneyApp_SOURCES = Money.h MoneyTest.h MoneyTest.cpp MoneyApp.cpp StdAfx.h -MoneyApp_CXXFLAGS = $(CPPUNIT_CFLAGS) -MoneyApp_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -MoneyApp_LDFLAGS = $(CPPUNIT_LIBS) $(LIBADD_DL) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/money/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/money/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 - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -MoneyApp$(EXEEXT): $(MoneyApp_OBJECTS) $(MoneyApp_DEPENDENCIES) - @rm -f MoneyApp$(EXEEXT) - $(MoneyApp_LINK) $(MoneyApp_OBJECTS) $(MoneyApp_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MoneyApp-MoneyApp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MoneyApp-MoneyTest.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -MoneyApp-MoneyTest.o: MoneyTest.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -MT MoneyApp-MoneyTest.o -MD -MP -MF $(DEPDIR)/MoneyApp-MoneyTest.Tpo -c -o MoneyApp-MoneyTest.o `test -f 'MoneyTest.cpp' || echo '$(srcdir)/'`MoneyTest.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/MoneyApp-MoneyTest.Tpo $(DEPDIR)/MoneyApp-MoneyTest.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MoneyTest.cpp' object='MoneyApp-MoneyTest.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -c -o MoneyApp-MoneyTest.o `test -f 'MoneyTest.cpp' || echo '$(srcdir)/'`MoneyTest.cpp - -MoneyApp-MoneyTest.obj: MoneyTest.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -MT MoneyApp-MoneyTest.obj -MD -MP -MF $(DEPDIR)/MoneyApp-MoneyTest.Tpo -c -o MoneyApp-MoneyTest.obj `if test -f 'MoneyTest.cpp'; then $(CYGPATH_W) 'MoneyTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MoneyTest.cpp'; fi` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/MoneyApp-MoneyTest.Tpo $(DEPDIR)/MoneyApp-MoneyTest.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MoneyTest.cpp' object='MoneyApp-MoneyTest.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -c -o MoneyApp-MoneyTest.obj `if test -f 'MoneyTest.cpp'; then $(CYGPATH_W) 'MoneyTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MoneyTest.cpp'; fi` - -MoneyApp-MoneyApp.o: MoneyApp.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -MT MoneyApp-MoneyApp.o -MD -MP -MF $(DEPDIR)/MoneyApp-MoneyApp.Tpo -c -o MoneyApp-MoneyApp.o `test -f 'MoneyApp.cpp' || echo '$(srcdir)/'`MoneyApp.cpp -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/MoneyApp-MoneyApp.Tpo $(DEPDIR)/MoneyApp-MoneyApp.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MoneyApp.cpp' object='MoneyApp-MoneyApp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -c -o MoneyApp-MoneyApp.o `test -f 'MoneyApp.cpp' || echo '$(srcdir)/'`MoneyApp.cpp - -MoneyApp-MoneyApp.obj: MoneyApp.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -MT MoneyApp-MoneyApp.obj -MD -MP -MF $(DEPDIR)/MoneyApp-MoneyApp.Tpo -c -o MoneyApp-MoneyApp.obj `if test -f 'MoneyApp.cpp'; then $(CYGPATH_W) 'MoneyApp.cpp'; else $(CYGPATH_W) '$(srcdir)/MoneyApp.cpp'; fi` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/MoneyApp-MoneyApp.Tpo $(DEPDIR)/MoneyApp-MoneyApp.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MoneyApp.cpp' object='MoneyApp-MoneyApp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MoneyApp_CXXFLAGS) $(CXXFLAGS) -c -o MoneyApp-MoneyApp.obj `if test -f 'MoneyApp.cpp'; then $(CYGPATH_W) 'MoneyApp.cpp'; else $(CYGPATH_W) '$(srcdir)/MoneyApp.cpp'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/money/Money.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Money.h deleted file mode 100644 index 720f05a9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/Money.h +++ /dev/null @@ -1,73 +0,0 @@ -// Money.h -#ifndef MONEY_H -#define MONEY_H - -#include -#include -#include // or if portability is not an issue - -class IncompatibleMoneyError : public std::runtime_error -{ -public: - IncompatibleMoneyError() : std::runtime_error( "Incompatible moneys" ) - { - } -}; - - -class Money -{ -public: - Money( double amount, std::string currency ) - : m_amount( amount ) - , m_currency( currency ) - { - } - - double getAmount() const - { - return m_amount; - } - - std::string getCurrency() const - { - return m_currency; - } - - bool operator ==( const Money &other ) const - { - return m_amount == other.m_amount && - m_currency == other.m_currency; - } - - bool operator !=( const Money &other ) const - { - return !(*this == other); - } - - Money &operator +=( const Money &other ) - { - if ( m_currency != other.m_currency ) - throw IncompatibleMoneyError(); - - m_amount += other.m_amount; - return *this; - } - -private: - double m_amount; - std::string m_currency; -}; - - -// The function below could be prototyped as: -// inline std::ostream &operator <<( std::ostream &os, const Money &value ) -// If you know that you will never compile on a platform without std::ostream -// (such as embedded vc++ 4.0; though even that platform you can use STLPort) -inline CPPUNIT_NS::OStream &operator <<( CPPUNIT_NS::OStream &os, const Money &value ) -{ - return os << "Money< value =" << value.getAmount() << "; currency = " << value.getCurrency() << ">"; -} - - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyApp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyApp.cpp deleted file mode 100644 index fa1b2883..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyApp.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "StdAfx.h" -#include -#include -#include - - -int main(int argc, char* argv[]) -{ - // Get the top level suite from the registry - CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest(); - - // Adds the test to the list of test to run - CPPUNIT_NS::TextUi::TestRunner runner; - runner.addTest( suite ); - - // Change the default outputter to a compiler error format outputter - runner.setOutputter( new CPPUNIT_NS::CompilerOutputter( &runner.result(), - CPPUNIT_NS::stdCOut() ) ); - // Run the test. - bool wasSucessful = runner.run(); - - // Return error code 1 if the one of test failed. - return wasSucessful ? 0 : 1; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.cpp deleted file mode 100644 index 70e59869..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// MoneyTest.cpp - -#include "StdAfx.h" -#include -#include "Money.h" -#include "MoneyTest.h" - -// Registers the fixture into the 'registry' -CPPUNIT_TEST_SUITE_REGISTRATION( MoneyTest ); - - -void -MoneyTest::setUp() -{ -} - - -void -MoneyTest::tearDown() -{ -} - - -void -MoneyTest::testConstructor() -{ - // Set up - const std::string currencyFF( "FF" ); - const double longNumber = 1234.5678; - - // Process - Money money( longNumber, currencyFF ); - - // Check - CPPUNIT_ASSERT_EQUAL( longNumber, money.getAmount() ); - CPPUNIT_ASSERT_EQUAL( currencyFF, money.getCurrency() ); -} - - -void -MoneyTest::testEqual() -{ - // Set up - const Money money123FF( 123, "FF" ); - const Money money123USD( 123, "USD" ); - const Money money12FF( 12, "FF" ); - const Money money12USD( 12, "USD" ); - - // Process & Check - CPPUNIT_ASSERT( money123FF == money123FF ); // == - CPPUNIT_ASSERT( money12FF != money123FF ); // != amount - CPPUNIT_ASSERT( money123USD != money123FF ); // != currency - CPPUNIT_ASSERT( money12USD != money123FF ); // != currency and != amount -} - - -void -MoneyTest::testAdd() -{ - // Set up - const Money money12FF( 12, "FF" ); - const Money expectedMoney( 135, "FF" ); - - // Process - Money money( 123, "FF" ); - money += money12FF; - - // Check - CPPUNIT_ASSERT_EQUAL( expectedMoney, money ); // add works - CPPUNIT_ASSERT( &money == &(money += money12FF) ); // add returns ref. on 'this'. -} - - -void -MoneyTest::testAddThrow() -{ - // Set up - const Money money123FF( 123, "FF" ); - - // Process - Money money( 123, "USD" ); - money += money123FF; // should throw an exception -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.h deleted file mode 100644 index 44e1808a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/MoneyTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// MoneyTest.h -#ifndef MONEYTEST_H -#define MONEYTEST_H - -#include - -class MoneyTest : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( MoneyTest ); - CPPUNIT_TEST( testConstructor ); - CPPUNIT_TEST( testEqual ); - CPPUNIT_TEST( testAdd ); - CPPUNIT_TEST_EXCEPTION( testAddThrow, IncompatibleMoneyError ); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp(); - void tearDown(); - - void testConstructor(); - void testEqual(); - void testAdd(); - void testAddThrow(); -}; - -#endif // MONEYTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.cpp deleted file mode 100644 index 6c550b28..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// money.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "StdAfx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.h deleted file mode 100644 index 8e024359..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/StdAfx.h +++ /dev/null @@ -1,19 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__E8E36A23_EF1C_4C21_A2C0_D0E979CF0267__INCLUDED_) -#define AFX_STDAFX_H__E8E36A23_EF1C_4C21_A2C0_D0E979CF0267__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -// TODO: reference additional headers your program requires here - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__E8E36A23_EF1C_4C21_A2C0_D0E979CF0267__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/configure.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/configure.in deleted file mode 100644 index 5770e391..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/configure.in +++ /dev/null @@ -1,10 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl Don't forget to run `aclocal -I /usr/local/share/aclocal` before -dnl running autoconf! This is required for AM_PATH_CPPUNIT to work. -AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(cppunit-cookbook,1.6.2) -AM_PATH_CPPUNIT(1.6.2) -AC_PROG_CXX -AC_PROG_CC -AC_PROG_INSTALL -AC_OUTPUT(Makefile) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsp deleted file mode 100644 index c1c3abdc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsp +++ /dev/null @@ -1,136 +0,0 @@ -# Microsoft Developer Studio Project File - Name="money" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=money - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "money.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "money.mak" CFG="money - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "money - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "money - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "money - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\Release\money.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Unit testing... -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ELSEIF "$(CFG)" == "money - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"Debug/moneyd.exe" /pdbtype:sept /libpath:"../../lib" -# Begin Special Build Tool -TargetPath=.\Debug\moneyd.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Unit testing... -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "money - Win32 Release" -# Name "money - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\MoneyApp.cpp -# End Source File -# Begin Source File - -SOURCE=.\MoneyTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Money.h -# End Source File -# Begin Source File - -SOURCE=.\MoneyTest.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsw deleted file mode 100644 index cb1b94ca..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/money/money.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "money"=.\money.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/.cvsignore deleted file mode 100644 index 70845e08..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.in diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/.cvsignore deleted file mode 100644 index 94512ead..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -*.Tags.WW -Debug DebugCrossplatform Release -*.ncb *.opt *.aps diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp deleted file mode 100644 index e39da5ac..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// CppUnitTestApp.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" -#include "CppUnitTestApp.h" -#include "CppUnitTestAppDlg.h" -#include -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestApp - -BEGIN_MESSAGE_MAP(CppUnitTestApp, CWinApp) - //{{AFX_MSG_MAP(CppUnitTestApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - ON_COMMAND(ID_HELP, CWinApp::OnHelp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestApp construction - -CppUnitTestApp::CppUnitTestApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CppUnitTestApp object - -CppUnitTestApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestApp initialization - -BOOL -CppUnitTestApp::InitInstance() -{ - AfxEnableControlContainer(); - - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. - -#ifdef _AFXDLL -# if _MSC_VER < 1300 // vc6 - Enable3dControls(); // Call this when using MFC in a shared DLL -# endif -#else - Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif - - SetRegistryKey(_T("Local AppWizard-Generated Applications")); - - RunTests(); - - - // Since the dialog has been closed, return FALSE so that we exit the - // application, rather than start the application's message pump. - return FALSE; -} - - -void -CppUnitTestApp::RunTests() -{ - CPPUNIT_NS::MfcUi::TestRunner runner; - - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - - runner.run(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp deleted file mode 100644 index dccb35cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp +++ /dev/null @@ -1,489 +0,0 @@ -# Microsoft Developer Studio Project File - Name="CppUnitTestApp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=CppUnitTestApp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestApp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "CppUnitTestApp.mak" CFG="CppUnitTestApp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "CppUnitTestApp - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "CppUnitTestApp - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../../include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386 -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ../../../Lib/cppunitd.lib ../../../Lib/testrunnerd.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "CppUnitTestApp - Win32 Release" -# Name "CppUnitTestApp - Win32 Debug" -# Begin Group "GUI" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\CppUnitTestApp.cpp -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestApp.h -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestApp.rc -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestAppDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\CppUnitTestAppDlg.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\CppUnitTestApp.ico -# End Source File -# Begin Source File - -SOURCE=.\res\CppUnitTestApp.rc2 -# End Source File -# End Group -# Begin Group "DLL Dependencies" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\lib\testrunner.dll - -!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\Release -InputPath=..\..\..\lib\testrunner.dll -InputName=testrunner - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunnerd.dll - -!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\Debug -InputPath=..\..\..\lib\testrunnerd.dll -InputName=testrunnerd - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Group "Tests" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\cppunittest\BaseTestCase.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\BaseTestCase.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\CoreSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\CppUnitTestSuite.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ExceptionTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ExceptionTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ExceptionTestCaseDecoratorTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ExceptionTestCaseDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ExtensionSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\FailureException.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\HelperMacrosTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\HelperMacrosTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\HelperSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MessageTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MessageTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockFunctor.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockProtector.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockTestCase.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockTestCase.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockTestListener.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\MockTestListener.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\OrthodoxTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\OrthodoxTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\OutputSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\RepeatedTestTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\RepeatedTestTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\StringToolsTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\StringToolsTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\SubclassedTestCase.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\SubclassedTestCase.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\SynchronizedTestResult.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestAssertTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestAssertTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestCallerTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestCallerTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestCaseTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestCaseTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestDecoratorTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestDecoratorTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestFailureTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestFailureTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestPathTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestPathTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestResultCollectorTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestResultCollectorTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestResultTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestResultTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestSetUpTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestSetUpTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestSuiteTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestSuiteTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TestTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\ToolsSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TrackedTestCase.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\TrackedTestCase.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\UnitTestToolSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlElementTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlElementTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlOutputterTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlOutputterTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlUniformiser.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlUniformiser.h -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlUniformiserTest.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\cppunittest\XmlUniformiserTest.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\cppunittest\Makefile.am -# End Source File -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw deleted file mode 100644 index e42e5508..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw +++ /dev/null @@ -1,80 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "CppUnitTestApp"=.\CppUnitTestApp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name TestRunner - End Project Dependency - Begin Project Dependency - Project_Dep_Name DSPlugIn - End Project Dependency -}}} - -############################################################################### - -Project: "DSPlugIn"=..\..\..\src\msvc6\DSPlugIn\DSPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TestRunner"=..\..\..\src\msvc6\testrunner\TestRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name DSPlugIn - End Project Dependency -}}} - -############################################################################### - -Project: "cppunit"=..\..\..\src\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.h deleted file mode 100644 index 542f3f96..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.h +++ /dev/null @@ -1,52 +0,0 @@ -// CppUnitTestApp.h : main header file for the CPPUNITTESTAPP application -// - -#if !defined(AFX_CPPUNITTESTAPP_H__6569C745_ED89_4902_9794_AD8422583BC1__INCLUDED_) -#define AFX_CPPUNITTESTAPP_H__6569C745_ED89_4902_9794_AD8422583BC1__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestApp: -// See CppUnitTestApp.cpp for the implementation of this class -// - -class CppUnitTestApp : public CWinApp -{ -public: - CppUnitTestApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CppUnitTestApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - -// Implementation - - //{{AFX_MSG(CppUnitTestApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -private: - void RunTests(); -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CPPUNITTESTAPP_H__6569C745_ED89_4902_9794_AD8422583BC1__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc deleted file mode 100644 index 04bb0e75..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc +++ /dev/null @@ -1,219 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About CppUnitTestApp" -FONT 8, "MS Sans Serif" -BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "CppUnitTestApp Version 1.0",IDC_STATIC,40,10,119,8, - SS_NOPREFIX - LTEXT "Copyright (C) 2001",IDC_STATIC,40,25,119,8 - DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP -END - -IDD_CPPUNITTESTAPP_DIALOG DIALOGEX 0, 0, 320, 200 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "CppUnitTestApp" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,260,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,260,23,50,14 - LTEXT "TODO: Place dialog controls here.",IDC_STATIC,50,90,200, - 8 -END - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "CppUnitTestApp MFC Application\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "CppUnitTestApp\0" - VALUE "LegalCopyright", "Copyright (C) 2001\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "CppUnitTestApp.EXE\0" - VALUE "ProductName", "CppUnitTestApp Application\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 48 - END - - IDD_CPPUNITTESTAPP_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 313 - TOPMARGIN, 7 - BOTTOMMARGIN, 193 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\CppUnitTestApp.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ABOUTBOX "&About CppUnitTestApp..." -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// French (France) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif //_WIN32\r\n" - "#include ""res\\CppUnitTestApp.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // French (France) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif //_WIN32 -#include "res\CppUnitTestApp.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp deleted file mode 100644 index 882e6f93..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// CppUnitTestAppDlg.cpp : implementation file -// - -#include "stdafx.h" -#include "CppUnitTestApp.h" -#include "CppUnitTestAppDlg.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CAboutDlg dialog used for App About - -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - -// Dialog Data - //{{AFX_DATA(CAboutDlg) - enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - //{{AFX_MSG(CAboutDlg) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) -{ - //{{AFX_DATA_INIT(CAboutDlg) - //}}AFX_DATA_INIT -} - -void CAboutDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CAboutDlg) - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) - //{{AFX_MSG_MAP(CAboutDlg) - // No message handlers - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestAppDlg dialog - -CppUnitTestAppDlg::CppUnitTestAppDlg(CWnd* pParent /*=NULL*/) - : CDialog(CppUnitTestAppDlg::IDD, pParent) -{ - //{{AFX_DATA_INIT(CppUnitTestAppDlg) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT - // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 - m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); -} - -void CppUnitTestAppDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CppUnitTestAppDlg) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CppUnitTestAppDlg, CDialog) - //{{AFX_MSG_MAP(CppUnitTestAppDlg) - ON_WM_SYSCOMMAND() - ON_WM_PAINT() - ON_WM_QUERYDRAGICON() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestAppDlg message handlers - -BOOL CppUnitTestAppDlg::OnInitDialog() -{ - CDialog::OnInitDialog(); - - // Add "About..." menu item to system menu. - - // IDM_ABOUTBOX must be in the system command range. - ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); - ASSERT(IDM_ABOUTBOX < 0xF000); - - CMenu* pSysMenu = GetSystemMenu(FALSE); - if (pSysMenu != NULL) - { - CString strAboutMenu; - strAboutMenu.LoadString(IDS_ABOUTBOX); - if (!strAboutMenu.IsEmpty()) - { - pSysMenu->AppendMenu(MF_SEPARATOR); - pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); - } - } - - // Set the icon for this dialog. The framework does this automatically - // when the application's main window is not a dialog - SetIcon(m_hIcon, TRUE); // Set big icon - SetIcon(m_hIcon, FALSE); // Set small icon - - // TODO: Add extra initialization here - - return TRUE; // return TRUE unless you set the focus to a control -} - -void CppUnitTestAppDlg::OnSysCommand(UINT nID, LPARAM lParam) -{ - if ((nID & 0xFFF0) == IDM_ABOUTBOX) - { - CAboutDlg dlgAbout; - dlgAbout.DoModal(); - } - else - { - CDialog::OnSysCommand(nID, lParam); - } -} - -// If you add a minimize button to your dialog, you will need the code below -// to draw the icon. For MFC applications using the document/view model, -// this is automatically done for you by the framework. - -void CppUnitTestAppDlg::OnPaint() -{ - if (IsIconic()) - { - CPaintDC dc(this); // device context for painting - - SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); - - // Center icon in client rectangle - int cxIcon = GetSystemMetrics(SM_CXICON); - int cyIcon = GetSystemMetrics(SM_CYICON); - CRect rect; - GetClientRect(&rect); - int x = (rect.Width() - cxIcon + 1) / 2; - int y = (rect.Height() - cyIcon + 1) / 2; - - // Draw the icon - dc.DrawIcon(x, y, m_hIcon); - } - else - { - CDialog::OnPaint(); - } -} - -// The system calls this to obtain the cursor to display while the user drags -// the minimized window. -HCURSOR CppUnitTestAppDlg::OnQueryDragIcon() -{ - return (HCURSOR) m_hIcon; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h deleted file mode 100644 index cc11da8e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h +++ /dev/null @@ -1,49 +0,0 @@ -// CppUnitTestAppDlg.h : header file -// - -#if !defined(AFX_CPPUNITTESTAPPDLG_H__25E1CF20_72A4_4E25_B930_626DF60AD4C7__INCLUDED_) -#define AFX_CPPUNITTESTAPPDLG_H__25E1CF20_72A4_4E25_B930_626DF60AD4C7__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -///////////////////////////////////////////////////////////////////////////// -// CppUnitTestAppDlg dialog - -class CppUnitTestAppDlg : public CDialog -{ -// Construction -public: - CppUnitTestAppDlg(CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(CppUnitTestAppDlg) - enum { IDD = IDD_CPPUNITTESTAPP_DIALOG }; - // NOTE: the ClassWizard will add data members here - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CppUnitTestAppDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - HICON m_hIcon; - - // Generated message map functions - //{{AFX_MSG(CppUnitTestAppDlg) - virtual BOOL OnInitDialog(); - afx_msg void OnSysCommand(UINT nID, LPARAM lParam); - afx_msg void OnPaint(); - afx_msg HCURSOR OnQueryDragIcon(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CPPUNITTESTAPPDLG_H__25E1CF20_72A4_4E25_B930_626DF60AD4C7__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/ReadMe.txt b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/ReadMe.txt deleted file mode 100644 index 8dcfccb4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/ReadMe.txt +++ /dev/null @@ -1,88 +0,0 @@ -======================================================================== - MICROSOFT FOUNDATION CLASS LIBRARY : CppUnitTestApp -======================================================================== - - -AppWizard has created this CppUnitTestApp application for you. This application -not only demonstrates the basics of using the Microsoft Foundation classes -but is also a starting point for writing your application. - -This file contains a summary of what you will find in each of the files that -make up your CppUnitTestApp application. - -CppUnitTestApp.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - -CppUnitTestApp.h - This is the main header file for the application. It includes other - project specific headers (including Resource.h) and declares the - CppUnitTestApp application class. - -CppUnitTestApp.cpp - This is the main application source file that contains the application - class CppUnitTestApp. - -CppUnitTestApp.rc - This is a listing of all of the Microsoft Windows resources that the - program uses. It includes the icons, bitmaps, and cursors that are stored - in the RES subdirectory. This file can be directly edited in Microsoft - Visual C++. - -CppUnitTestApp.clw - This file contains information used by ClassWizard to edit existing - classes or add new classes. ClassWizard also uses this file to store - information needed to create and edit message maps and dialog data - maps and to create prototype member functions. - -res\CppUnitTestApp.ico - This is an icon file, which is used as the application's icon. This - icon is included by the main resource file CppUnitTestApp.rc. - -res\CppUnitTestApp.rc2 - This file contains resources that are not edited by Microsoft - Visual C++. You should place all resources not editable by - the resource editor in this file. - - - - -///////////////////////////////////////////////////////////////////////////// - -AppWizard creates one dialog class: - -CppUnitTestAppDlg.h, CppUnitTestAppDlg.cpp - the dialog - These files contain your CppUnitTestAppDlg class. This class defines - the behavior of your application's main dialog. The dialog's - template is in CppUnitTestApp.rc, which can be edited in Microsoft - Visual C++. - - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named CppUnitTestApp.pch and a precompiled types file named StdAfx.obj. - -Resource.h - This is the standard header file, which defines new resource IDs. - Microsoft Visual C++ reads and updates this file. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - -If your application uses MFC in a shared DLL, and your application is -in a language other than the operating system's current language, you -will need to copy the corresponding localized resources MFC42XXX.DLL -from the Microsoft Visual C++ CD-ROM onto the system or system32 directory, -and rename it to be MFCLOC.DLL. ("XXX" stands for the language abbreviation. -For example, MFC42DEU.DLL contains resources translated to German.) If you -don't do this, some of the UI elements of your application will remain in the -language of the operating system. - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/Resource.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/Resource.h deleted file mode 100644 index 2a209977..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/Resource.h +++ /dev/null @@ -1,21 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by CPPUNITTESTAPP.RC -// -#define IDR_MAINFRAME 128 -#define IDM_ABOUTBOX 0x0010 -#define IDD_ABOUTBOX 100 -#define IDS_ABOUTBOX 101 -#define IDD_CPPUNITTESTAPP_DIALOG 102 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS - -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 32771 -#endif -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.cpp deleted file mode 100644 index e8329396..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// CppUnitTestApp.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.h deleted file mode 100644 index 81f2a0c2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/StdAfx.h +++ /dev/null @@ -1,28 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__EB0CB528_6505_4130_843B_9CA567127807__INCLUDED_) -#define AFX_STDAFX_H__EB0CB528_6505_4130_843B_9CA567127807__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC Automation classes -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - -#pragma warning( disable : 4786 ) // remove warning "debug symbol length > 255..." - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__EB0CB528_6505_4130_843B_9CA567127807__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.ico b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.ico deleted file mode 100644 index 7eef0bcb..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.ico and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2 b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2 deleted file mode 100644 index b8d1fca2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// CPPUNITTESTAPP.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/.cvsignore deleted file mode 100644 index 939c32e7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -*.Tags.WW -Debug DebugCrossplatform Release ReleaseUnicode DebugUnicode -*.ncb *.opt -*.aps diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.cpp deleted file mode 100644 index ec13319a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "ExampleTestCase.h" - -CPPUNIT_TEST_SUITE_REGISTRATION( ExampleTestCase ); - -void ExampleTestCase::example () -{ - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, 1.1, 0.05); - CPPUNIT_ASSERT (1 == 0); - CPPUNIT_ASSERT (1 == 1); -} - - -void ExampleTestCase::anotherExample () -{ - CPPUNIT_ASSERT (1 == 2); -} - -void ExampleTestCase::setUp () -{ - m_value1 = 2.0; - m_value2 = 3.0; -} - -void ExampleTestCase::testAdd () -{ - double result = m_value1 + m_value2; - CPPUNIT_ASSERT (result == 6.0); -} - - - -void ExampleTestCase::testEquals () -{ - std::auto_ptr l1 (new long (12)); - std::auto_ptr l2 (new long (12)); - - CPPUNIT_ASSERT_EQUAL (12, 12); - CPPUNIT_ASSERT_EQUAL (12L, 12L); - CPPUNIT_ASSERT_EQUAL (*l1, *l2); - - CPPUNIT_ASSERT (12L == 12L); - CPPUNIT_ASSERT_EQUAL (12, 13); - CPPUNIT_ASSERT_DOUBLES_EQUAL (12.0, 11.99, 0.5); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.h deleted file mode 100644 index b0dddbee..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/ExampleTestCase.h +++ /dev/null @@ -1,38 +0,0 @@ - -#ifndef CPP_UNIT_EXAMPLETESTCASE_H -#define CPP_UNIT_EXAMPLETESTCASE_H - -#include - -/* - * A test case that is designed to produce - * example errors and failures - * - */ - -class ExampleTestCase : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExampleTestCase ); - CPPUNIT_TEST( example ); - CPPUNIT_TEST( anotherExample ); - CPPUNIT_TEST( testAdd ); - CPPUNIT_TEST( testEquals ); - CPPUNIT_TEST_SUITE_END(); -protected: - - double m_value1; - double m_value2; - -public: - - void setUp (); - -protected: - void example (); - void anotherExample (); - void testAdd (); - void testEquals (); -}; - - -#endif \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.cpp deleted file mode 100644 index d76abefb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// HostApp.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" -#include "HostApp.h" - -#include "MainFrm.h" -#include "HostAppDoc.h" -#include "HostAppView.h" - -// CppUnit: MFC TestRunner -#include -// CppUnit: TestFactoryRegistry to retreive the top test suite that contains all registered tests. -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -static AFX_EXTENSION_MODULE extTestRunner; - -///////////////////////////////////////////////////////////////////////////// -// CHostAppApp - -BEGIN_MESSAGE_MAP(CHostAppApp, CWinApp) - //{{AFX_MSG_MAP(CHostAppApp) - ON_COMMAND(ID_APP_ABOUT, OnAppAbout) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG_MAP - // Standard file based document commands - ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) - ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen) - // Standard print setup command - ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CHostAppApp construction - -CHostAppApp::CHostAppApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CHostAppApp object - -CHostAppApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CHostAppApp initialization - -BOOL CHostAppApp::InitInstance() -{ - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. - -#ifdef _AFXDLL -# if _MSC_VER < 1300 // vc6 - Enable3dControls(); // Call this when using MFC in a shared DLL -# endif -#else - Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif - - // Change the registry key under which our settings are stored. - // You should modify this string to be something appropriate - // such as the name of your company or organization. - SetRegistryKey(_T("Local AppWizard-Generated Applications")); - - LoadStdProfileSettings(); // Load standard INI file options (including MRU) - - // Register the application's document templates. Document templates - // serve as the connection between documents, frame windows and views. - - CSingleDocTemplate* pDocTemplate; - pDocTemplate = new CSingleDocTemplate( - IDR_MAINFRAME, - RUNTIME_CLASS(CHostAppDoc), - RUNTIME_CLASS(CMainFrame), // main SDI frame window - RUNTIME_CLASS(CHostAppView)); - AddDocTemplate(pDocTemplate); - - RunUnitTests(); - -/* - // Parse command line for standard shell commands, DDE, file open - CCommandLineInfo cmdInfo; - ParseCommandLine(cmdInfo); - - // Dispatch commands specified on the command line - if (!ProcessShellCommand(cmdInfo)) - return FALSE; - - // The one and only window has been initialized, so show and update it. - m_pMainWnd->ShowWindow(SW_SHOW); - m_pMainWnd->UpdateWindow(); -*/ - - return TRUE; -} - - -void -CHostAppApp::RunUnitTests() -{ - CPPUNIT_NS::MfcUi::TestRunner runner; - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - - runner.run(); -} - - -///////////////////////////////////////////////////////////////////////////// -// CAboutDlg dialog used for App About - -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - -// Dialog Data - //{{AFX_DATA(CAboutDlg) - enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - //{{AFX_MSG(CAboutDlg) - // No message handlers - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) -{ - //{{AFX_DATA_INIT(CAboutDlg) - //}}AFX_DATA_INIT -} - -void CAboutDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CAboutDlg) - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) - //{{AFX_MSG_MAP(CAboutDlg) - // No message handlers - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -// App command to run the dialog -void CHostAppApp::OnAppAbout() -{ - CAboutDlg aboutDlg; - aboutDlg.DoModal(); -} - -///////////////////////////////////////////////////////////////////////////// -// CHostAppApp commands diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsp deleted file mode 100644 index 7c345ca1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsp +++ /dev/null @@ -1,448 +0,0 @@ -# Microsoft Developer Studio Project File - Name="HostApp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=HostApp - Win32 Debug No Type Info Name -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "HostApp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug No Type Info Name" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HostApp - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "HostApp - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "HostApp - Win32 Release Unicode" (based on "Win32 (x86) Application") -!MESSAGE "HostApp - Win32 Debug Unicode" (based on "Win32 (x86) Application") -!MESSAGE "HostApp - Win32 Debug No Type Info Name" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HostApp - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386 -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none /map /nodefaultlib - -!ELSEIF "$(CFG)" == "HostApp - Win32 Release Unicode" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "HostApp___Win32_Release_Unicode" -# PROP BASE Intermediate_Dir "HostApp___Win32_Release_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseUnicode" -# PROP Intermediate_Dir "ReleaseUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_UNICODE" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunneru.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 -# SUBTRACT LINK32 /incremental:yes - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Unicode" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "HostApp___Win32_Debug_Unicode" -# PROP BASE Intermediate_Dir "HostApp___Win32_Debug_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugUnicode" -# PROP Intermediate_Dir "DebugUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_UNICODE" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib -# ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none /map /nodefaultlib - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug No Type Info Name" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "HostApp___Win32_Debug_No_Type_Info_Name" -# PROP BASE Intermediate_Dir "HostApp___Win32_Debug_No_Type_Info_Name" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugNoTypeInfoName" -# PROP Intermediate_Dir "DebugNoTypeInfoName" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D CPPUNIT_USE_TYPEINFO_NAME=0 /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib -# ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none /map /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "HostApp - Win32 Release" -# Name "HostApp - Win32 Debug" -# Name "HostApp - Win32 Release Unicode" -# Name "HostApp - Win32 Debug Unicode" -# Name "HostApp - Win32 Debug No Type Info Name" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ExampleTestCase.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\HostApp.cpp -# End Source File -# Begin Source File - -SOURCE=.\HostApp.rc -# End Source File -# Begin Source File - -SOURCE=.\HostAppDoc.cpp -# End Source File -# Begin Source File - -SOURCE=.\HostAppView.cpp -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ExampleTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\HostApp.h -# End Source File -# Begin Source File - -SOURCE=.\HostAppDoc.h -# End Source File -# Begin Source File - -SOURCE=.\HostAppView.h -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\HostApp.ico -# End Source File -# Begin Source File - -SOURCE=.\res\HostApp.rc2 -# End Source File -# Begin Source File - -SOURCE=.\res\HostAppDoc.ico -# End Source File -# Begin Source File - -SOURCE=.\res\Toolbar.bmp -# End Source File -# End Group -# Begin Group "DLL Dependencies" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\lib\testrunner.dll - -!IF "$(CFG)" == "HostApp - Win32 Release" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\Release -InputPath=..\..\..\lib\testrunner.dll -InputName=testrunner - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Release Unicode" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\ReleaseUnicode -InputPath=..\..\..\lib\testrunner.dll -InputName=testrunner - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Unicode" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug No Type Info Name" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunnerd.dll - -!IF "$(CFG)" == "HostApp - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\Debug -InputPath=..\..\..\lib\testrunnerd.dll -InputName=testrunnerd - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Release Unicode" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Unicode" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\DebugUnicode -InputPath=..\..\..\lib\testrunnerd.dll -InputName=testrunnerd - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug No Type Info Name" - -# Begin Custom Build - $(IntDir)\$(InputName).dll -IntDir=.\DebugNoTypeInfoName -InputPath=..\..\..\lib\testrunnerd.dll -InputName=testrunnerd - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunneru.dll - -!IF "$(CFG)" == "HostApp - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Release Unicode" - -# Begin Custom Build - Updating DLL $(InputPath) -IntDir=.\ReleaseUnicode -InputPath=..\..\..\lib\testrunneru.dll -InputName=testrunneru - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug No Type Info Name" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunnerud.dll - -!IF "$(CFG)" == "HostApp - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Unicode" - -# Begin Custom Build - Updating DLL $(InputPath) -IntDir=.\DebugUnicode -InputPath=..\..\..\lib\testrunnerud.dll -InputName=testrunnerud - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "HostApp - Win32 Debug No Type Info Name" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsw deleted file mode 100644 index 0cea5a4e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.dsw +++ /dev/null @@ -1,80 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "DSPlugIn"=..\..\..\src\msvc6\DSPlugIn\DSPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "HostApp"=.\HostApp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name TestRunner - End Project Dependency - Begin Project Dependency - Project_Dep_Name DSPlugIn - End Project Dependency -}}} - -############################################################################### - -Project: "TestRunner"=..\..\..\src\msvc6\testrunner\TestRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name DSPlugIn - End Project Dependency -}}} - -############################################################################### - -Project: "cppunit"=..\..\..\src\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.h deleted file mode 100644 index 2dadfff8..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.h +++ /dev/null @@ -1,53 +0,0 @@ -// HostApp.h : main header file for the HOSTAPP application -// - -#if !defined(AFX_HOSTAPP_H__A9C94DE7_1663_11D2_A499_00805FC1C042__INCLUDED_) -#define AFX_HOSTAPP_H__A9C94DE7_1663_11D2_A499_00805FC1C042__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// CHostAppApp: -// See HostApp.cpp for the implementation of this class -// - -class CHostAppApp : public CWinApp -{ -public: - CHostAppApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CHostAppApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - -// Implementation - - //{{AFX_MSG(CHostAppApp) - afx_msg void OnAppAbout(); - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); - -private: - void RunUnitTests(); -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_HOSTAPP_H__A9C94DE7_1663_11D2_A499_00805FC1C042__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.rc b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.rc deleted file mode 100644 index 097a02ab..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostApp.rc +++ /dev/null @@ -1,389 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif\r\n" - "#include ""res\\HostApp.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#endif\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\HostApp.ico" -IDR_HOSTAPTYPE ICON DISCARDABLE "res\\HostAppDoc.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDR_MAINFRAME BITMAP MOVEABLE PURE "res\\Toolbar.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Toolbar -// - -IDR_MAINFRAME TOOLBAR DISCARDABLE 16, 15 -BEGIN - BUTTON ID_FILE_NEW - BUTTON ID_FILE_OPEN - BUTTON ID_FILE_SAVE - SEPARATOR - BUTTON ID_EDIT_CUT - BUTTON ID_EDIT_COPY - BUTTON ID_EDIT_PASTE - SEPARATOR - BUTTON ID_FILE_PRINT - BUTTON ID_APP_ABOUT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MAINFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE - MENUITEM "Save &As...", ID_FILE_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT - MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR - MENUITEM "Recent File", ID_FILE_MRU_FILE1, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_APP_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOLBAR - MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR - END - POPUP "&Help" - BEGIN - MENUITEM "&About HostApp...", ID_APP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE -BEGIN - "N", ID_FILE_NEW, VIRTKEY, CONTROL - "O", ID_FILE_OPEN, VIRTKEY, CONTROL - "S", ID_FILE_SAVE, VIRTKEY, CONTROL - "P", ID_FILE_PRINT, VIRTKEY, CONTROL - "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL - "X", ID_EDIT_CUT, VIRTKEY, CONTROL - "C", ID_EDIT_COPY, VIRTKEY, CONTROL - "V", ID_EDIT_PASTE, VIRTKEY, CONTROL - VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT - VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT - VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL - VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT - VK_F6, ID_NEXT_PANE, VIRTKEY - VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 55 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About HostApp" -FONT 8, "MS Sans Serif" -BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "HostApp Version 1.0",IDC_STATIC,40,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 1998",IDC_STATIC,40,25,119,8 - DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP -END - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "HostApp MFC Application\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "HostApp\0" - VALUE "LegalCopyright", "Copyright (C) 1998\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "HostApp.EXE\0" - VALUE "ProductName", "HostApp Application\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 210 - TOPMARGIN, 7 - BOTTOMMARGIN, 48 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE PRELOAD DISCARDABLE -BEGIN - IDR_MAINFRAME "HostApp\n\nHostAp\n\n\nHostApp.Document\nHostAp Document" -END - -STRINGTABLE PRELOAD DISCARDABLE -BEGIN - AFX_IDS_APP_TITLE "HostApp" - AFX_IDS_IDLEMESSAGE "Ready" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_INDICATOR_EXT "EXT" - ID_INDICATOR_CAPS "CAP" - ID_INDICATOR_NUM "NUM" - ID_INDICATOR_SCRL "SCRL" - ID_INDICATOR_OVR "OVR" - ID_INDICATOR_REC "REC" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_FILE_NEW "Create a new document\nNew" - ID_FILE_OPEN "Open an existing document\nOpen" - ID_FILE_CLOSE "Close the active document\nClose" - ID_FILE_SAVE "Save the active document\nSave" - ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" - ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" - ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" - ID_FILE_PRINT "Print the active document\nPrint" - ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_APP_ABOUT "Display program information, version number and copyright\nAbout" - ID_APP_EXIT "Quit the application; prompts to save documents\nExit" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_FILE_MRU_FILE1 "Open this document" - ID_FILE_MRU_FILE2 "Open this document" - ID_FILE_MRU_FILE3 "Open this document" - ID_FILE_MRU_FILE4 "Open this document" - ID_FILE_MRU_FILE5 "Open this document" - ID_FILE_MRU_FILE6 "Open this document" - ID_FILE_MRU_FILE7 "Open this document" - ID_FILE_MRU_FILE8 "Open this document" - ID_FILE_MRU_FILE9 "Open this document" - ID_FILE_MRU_FILE10 "Open this document" - ID_FILE_MRU_FILE11 "Open this document" - ID_FILE_MRU_FILE12 "Open this document" - ID_FILE_MRU_FILE13 "Open this document" - ID_FILE_MRU_FILE14 "Open this document" - ID_FILE_MRU_FILE15 "Open this document" - ID_FILE_MRU_FILE16 "Open this document" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_NEXT_PANE "Switch to the next window pane\nNext Pane" - ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_WINDOW_SPLIT "Split the active window into panes\nSplit" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_EDIT_CLEAR "Erase the selection\nErase" - ID_EDIT_CLEAR_ALL "Erase everything\nErase All" - ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" - ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" - ID_EDIT_FIND "Find the specified text\nFind" - ID_EDIT_PASTE "Insert Clipboard contents\nPaste" - ID_EDIT_REPEAT "Repeat the last action\nRepeat" - ID_EDIT_REPLACE "Replace specific text with different text\nReplace" - ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" - ID_EDIT_UNDO "Undo the last action\nUndo" - ID_EDIT_REDO "Redo the previously undone action\nRedo" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" - ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_SCSIZE "Change the window size" - AFX_IDS_SCMOVE "Change the window position" - AFX_IDS_SCMINIMIZE "Reduce the window to an icon" - AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" - AFX_IDS_SCNEXTWINDOW "Switch to the next document window" - AFX_IDS_SCPREVWINDOW "Switch to the previous document window" - AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_SCRESTORE "Restore the window to normal size" - AFX_IDS_SCTASKLIST "Activate Task List" -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif -#include "res\HostApp.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#include "afxprint.rc" // printing/print preview resources -#endif -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.cpp deleted file mode 100644 index 297716d9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// HostAppDoc.cpp : implementation of the CHostAppDoc class -// - -#include "stdafx.h" -#include "HostApp.h" - -#include "HostAppDoc.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CHostAppDoc - -IMPLEMENT_DYNCREATE(CHostAppDoc, CDocument) - -BEGIN_MESSAGE_MAP(CHostAppDoc, CDocument) - //{{AFX_MSG_MAP(CHostAppDoc) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CHostAppDoc construction/destruction - -CHostAppDoc::CHostAppDoc() -{ - // TODO: add one-time construction code here -} - -CHostAppDoc::~CHostAppDoc() -{ -} - - - -BOOL CHostAppDoc::OnNewDocument() -{ - if (!CDocument::OnNewDocument()) - return FALSE; - - return TRUE; -} - - - -///////////////////////////////////////////////////////////////////////////// -// CHostAppDoc serialization - -void CHostAppDoc::Serialize(CArchive& ar) -{ - if (ar.IsStoring()) - { - // TODO: add storing code here - } - else - { - // TODO: add loading code here - } -} - -///////////////////////////////////////////////////////////////////////////// -// CHostAppDoc diagnostics - -#ifdef _DEBUG -void CHostAppDoc::AssertValid() const -{ - CDocument::AssertValid(); -} - -void CHostAppDoc::Dump(CDumpContext& dc) const -{ - CDocument::Dump(dc); -} -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CHostAppDoc commands diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.h deleted file mode 100644 index 4c01daf9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppDoc.h +++ /dev/null @@ -1,56 +0,0 @@ -// HostAppDoc.h : interface of the CHostAppDoc class -// -///////////////////////////////////////////////////////////////////////////// - - -#if !defined(AFX_HOSTAPPDOC_H) -#define AFX_HOSTAPPDOC_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - - -class CHostAppDoc : public CDocument -{ -protected: // create from serialization only - CHostAppDoc(); - DECLARE_DYNCREATE(CHostAppDoc) - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CHostAppDoc) - public: - virtual BOOL OnNewDocument(); - virtual void Serialize(CArchive& ar); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CHostAppDoc(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -protected: - -// Generated message map functions -protected: - //{{AFX_MSG(CHostAppDoc) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_HOSTAPPDOC_H) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.cpp deleted file mode 100644 index 20802645..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.cpp +++ /dev/null @@ -1,105 +0,0 @@ -// HostAppView.cpp : implementation of the CHostAppView class -// - -#include "stdafx.h" -#include "HostApp.h" - -#include "HostAppDoc.h" -#include "HostAppView.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView - -IMPLEMENT_DYNCREATE(CHostAppView, CView) - -BEGIN_MESSAGE_MAP(CHostAppView, CView) - //{{AFX_MSG_MAP(CHostAppView) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG_MAP - // Standard printing commands - ON_COMMAND(ID_FILE_PRINT, CView::OnFilePrint) - ON_COMMAND(ID_FILE_PRINT_DIRECT, CView::OnFilePrint) - ON_COMMAND(ID_FILE_PRINT_PREVIEW, CView::OnFilePrintPreview) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView construction/destruction - -CHostAppView::CHostAppView() -{ - // TODO: add construction code here - -} - -CHostAppView::~CHostAppView() -{ -} - -BOOL CHostAppView::PreCreateWindow(CREATESTRUCT& cs) -{ - // TODO: Modify the Window class or styles here by modifying - // the CREATESTRUCT cs - - return CView::PreCreateWindow(cs); -} - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView drawing - -void CHostAppView::OnDraw(CDC* pDC) -{ - CHostAppDoc* pDoc = GetDocument(); - ASSERT_VALID(pDoc); - - // TODO: add draw code for native data here -} - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView printing - -BOOL CHostAppView::OnPreparePrinting(CPrintInfo* pInfo) -{ - // default preparation - return DoPreparePrinting(pInfo); -} - -void CHostAppView::OnBeginPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) -{ - // TODO: add extra initialization before printing -} - -void CHostAppView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) -{ - // TODO: add cleanup after printing -} - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView diagnostics - -#ifdef _DEBUG -void CHostAppView::AssertValid() const -{ - CView::AssertValid(); -} - -void CHostAppView::Dump(CDumpContext& dc) const -{ - CView::Dump(dc); -} - -CHostAppDoc* CHostAppView::GetDocument() // non-debug version is inline -{ - ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CHostAppDoc))); - return (CHostAppDoc*)m_pDocument; -} -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CHostAppView message handlers diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.h deleted file mode 100644 index 0a1db291..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/HostAppView.h +++ /dev/null @@ -1,66 +0,0 @@ -// HostAppView.h : interface of the CHostAppView class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_HOSTAPPVIEW_H) -#define AFX_HOSTAPPVIEW_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -class CHostAppView : public CView -{ -protected: // create from serialization only - CHostAppView(); - DECLARE_DYNCREATE(CHostAppView) - -// Attributes -public: - CHostAppDoc* GetDocument(); - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CHostAppView) - public: - virtual void OnDraw(CDC* pDC); // overridden to draw this view - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); - protected: - virtual BOOL OnPreparePrinting(CPrintInfo* pInfo); - virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo); - virtual void OnEndPrinting(CDC* pDC, CPrintInfo* pInfo); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CHostAppView(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -protected: - -// Generated message map functions -protected: - //{{AFX_MSG(CHostAppView) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -#ifndef _DEBUG // debug version in HostAppView.cpp -inline CHostAppDoc* CHostAppView::GetDocument() - { return (CHostAppDoc*)m_pDocument; } -#endif - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_HOSTAPPVIEW_H) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.cpp deleted file mode 100644 index 8fbaec93..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.cpp +++ /dev/null @@ -1,107 +0,0 @@ -// MainFrm.cpp : implementation of the CMainFrame class -// - -#include "stdafx.h" -#include "HostApp.h" - -#include "MainFrm.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame - -IMPLEMENT_DYNCREATE(CMainFrame, CFrameWnd) - -BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) - //{{AFX_MSG_MAP(CMainFrame) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code ! - ON_WM_CREATE() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -static UINT indicators[] = -{ - ID_SEPARATOR, // status line indicator - ID_INDICATOR_CAPS, - ID_INDICATOR_NUM, - ID_INDICATOR_SCRL, -}; - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame construction/destruction - -CMainFrame::CMainFrame() -{ - // TODO: add member initialization code here - -} - -CMainFrame::~CMainFrame() -{ -} - -int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (CFrameWnd::OnCreate(lpCreateStruct) == -1) - return -1; - - if (!m_wndToolBar.Create(this) || - !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) - { - TRACE0("Failed to create toolbar\n"); - return -1; // fail to create - } - - if (!m_wndStatusBar.Create(this) || - !m_wndStatusBar.SetIndicators(indicators, - sizeof(indicators)/sizeof(UINT))) - { - TRACE0("Failed to create status bar\n"); - return -1; // fail to create - } - - // TODO: Remove this if you don't want tool tips or a resizeable toolbar - m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | - CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - - // TODO: Delete these three lines if you don't want the toolbar to - // be dockable - m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY); - EnableDocking(CBRS_ALIGN_ANY); - DockControlBar(&m_wndToolBar); - - return 0; -} - -BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) -{ - // TODO: Modify the Window class or styles here by modifying - // the CREATESTRUCT cs - - return CFrameWnd::PreCreateWindow(cs); -} - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame diagnostics - -#ifdef _DEBUG -void CMainFrame::AssertValid() const -{ - CFrameWnd::AssertValid(); -} - -void CMainFrame::Dump(CDumpContext& dc) const -{ - CFrameWnd::Dump(dc); -} - -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame message handlers diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.h deleted file mode 100644 index 12f5c935..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/MainFrm.h +++ /dev/null @@ -1,57 +0,0 @@ -// MainFrm.h : interface of the CMainFrame class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_MAINFRM_H__A9C94DEB_1663_11D2_A499_00805FC1C042__INCLUDED_) -#define AFX_MAINFRM_H__A9C94DEB_1663_11D2_A499_00805FC1C042__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -class CMainFrame : public CFrameWnd -{ -protected: // create from serialization only - CMainFrame(); - DECLARE_DYNCREATE(CMainFrame) - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMainFrame) - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CMainFrame(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -protected: // control bar embedded members - CStatusBar m_wndStatusBar; - CToolBar m_wndToolBar; - -// Generated message map functions -protected: - //{{AFX_MSG(CMainFrame) - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__A9C94DEB_1663_11D2_A499_00805FC1C042__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Makefile.am deleted file mode 100644 index eafbce5d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = res - -EXTRA_DIST = HostApp.rc - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Makefile.in deleted file mode 100644 index e69de29b..00000000 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Resource.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Resource.h deleted file mode 100644 index 91d050e2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/Resource.h +++ /dev/null @@ -1,20 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by HostApp.rc -// -#define IDD_ABOUTBOX 100 -#define IDR_MAINFRAME 128 -#define IDR_HOSTAPTYPE 129 -#define ID_TESTS_RUNALL 32771 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 130 -#define _APS_NEXT_COMMAND_VALUE 32772 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.cpp deleted file mode 100644 index 23ace163..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// HostApp.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.h deleted file mode 100644 index ded2a388..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/StdAfx.h +++ /dev/null @@ -1,26 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__A9C94DE9_1663_11D2_A499_00805FC1C042__INCLUDED_) -#define AFX_STDAFX_H__A9C94DE9_1663_11D2_A499_00805FC1C042__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - -#pragma warning( disable : 4786 ) - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9C94DE9_1663_11D2_A499_00805FC1C042__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/.cvsignore deleted file mode 100644 index 70845e08..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.in diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.ico b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.ico deleted file mode 100644 index 7eef0bcb..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.ico and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.rc2 b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.rc2 deleted file mode 100644 index fdaa3e57..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostApp.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// HOSTAPP.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostAppDoc.ico b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostAppDoc.ico deleted file mode 100644 index 2a1f1ae6..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/HostAppDoc.ico and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Makefile.am deleted file mode 100644 index ed67e207..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = res - -EXTRA_DIST = Toolbar.bmp HostApp.ico HostAppDoc.ico HostApp.rc2 - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Makefile.in deleted file mode 100644 index e69de29b..00000000 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Toolbar.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Toolbar.bmp deleted file mode 100644 index d501723c..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/HostApp/res/Toolbar.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/Makefile.am deleted file mode 100644 index abce471c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = HostApp CppUnitTestApp - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/Makefile.in deleted file mode 100644 index e69de29b..00000000 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/TestPlugIn/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/TestPlugIn/.cvsignore deleted file mode 100644 index fba27e11..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/msvc6/TestPlugIn/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.WW diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/.cvsignore deleted file mode 100644 index 33ceb8f0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.cpp deleted file mode 100644 index edd67b0c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "ExampleTestCases.h" - -CPPUNIT_TEST_SUITE_REGISTRATION( ExampleTestCases ); - -void ExampleTestCases::example () -{ - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, 1.1, 0.05); - CPPUNIT_ASSERT (1 == 0); - CPPUNIT_ASSERT (1 == 1); -} - -void ExampleTestCases::anotherExample () -{ - CPPUNIT_ASSERT (1 == 2); -} - -void ExampleTestCases::setUp () -{ - m_value1 = 2.0; - m_value2 = 3.0; -} - -void ExampleTestCases::testAdd () -{ - double result = m_value1 + m_value2; - CPPUNIT_ASSERT (result == 6.0); -} - -void ExampleTestCases::testEquals () -{ - std::auto_ptr l1 (new long (12)); - std::auto_ptr l2 (new long (12)); - - CPPUNIT_ASSERT_EQUAL (12, 12); - CPPUNIT_ASSERT_EQUAL (12L, 12L); - CPPUNIT_ASSERT_EQUAL (*l1, *l2); - - CPPUNIT_ASSERT (12L == 12L); - CPPUNIT_ASSERT_EQUAL (12, 13); - CPPUNIT_ASSERT_DOUBLES_EQUAL (12.0, 11.99, 0.5); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.h deleted file mode 100644 index 4c40b8e1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/ExampleTestCases.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef CPP_UNIT_EXAMPLETESTCASES_H -#define CPP_UNIT_EXAMPLETESTCASES_H - -#include -#include - -/* - * A test case that is designed to produce - * example errors and failures. - * - */ - -class ExampleTestCases : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExampleTestCases ); - CPPUNIT_TEST( example ); - CPPUNIT_TEST( anotherExample ); - CPPUNIT_TEST( testAdd ); - CPPUNIT_TEST( testEquals ); - CPPUNIT_TEST_SUITE_END(); - -protected: - - double m_value1; - double m_value2; -public: - - void setUp (); - -protected: - - void example (); - void anotherExample (); - void testAdd (); - void testEquals (); -}; - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/Main.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/Main.cpp deleted file mode 100644 index e6500400..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/Main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include -#include - - -int main( int argc, char** argv ) -{ - QApplication app( argc, argv ); - - //CPPUNIT_NS::QtUi::TestRunner runner; - - CPPUNIT_NS::QtTestRunner runner; - - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - runner.run( true ); - - return 0; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example deleted file mode 100644 index b89989f9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/tcsh -########################################################################### -# FILE: make_example -# PURPOSE: Create Makefile from project file and then make QtTestRunner -# example. -########################################################################### - -qmake qt_example.pro -make distclean -make diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example.bat b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example.bat deleted file mode 100644 index fd3f943a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/make_example.bat +++ /dev/null @@ -1,7 +0,0 @@ -@REM make_example.bat -@REM -@REM Create Makefile from project file and then make QtTestRunner example. - -qmake qt_example.pro -nmake distclean -nmake diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.pro b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.pro deleted file mode 100644 index c93f76e5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.pro +++ /dev/null @@ -1,96 +0,0 @@ -#---------------------------------------------------------------------- -# File: qt_example.pro -# Purpose: qmake config file for the QtTestRunner example. -# The program is built with the QtTestRunner debug staticlib. -# Set the CONFIG variable accordingly to build it differently. -#---------------------------------------------------------------------- - -TEMPLATE = app -LANGUAGE = C++ -TARGET = qt_example - -# Get rid of possibly predefined options - -CONFIG -= debug -CONFIG -= release - -CONFIG += qt warn_on debug use_static - -#CONFIG += qt warn_on release use_static -#CONFIG += qt warn_on debug use_dll -#CONFIG += qt warn_on release use_dll - - -CPPUNIT_LIB_DIR = ../../lib # Location of libraries - - -#---------------------------------------------------------------------- -# MS Windows -#---------------------------------------------------------------------- - -win32 { - # Suppress program database creation (should better be done - # in the qmake spec file) - QMAKE_CXXFLAGS_DEBUG += /Z7 - QMAKE_CXXFLAGS_DEBUG -= -Gm - QMAKE_CXXFLAGS_DEBUG -= -Zi -} - -win32 { - use_dll { - DEFINES += QTTESTRUNNER_DLL - debug { - OBJECTS_DIR = DebugDLL - LIBS += $${CPPUNIT_LIB_DIR}\cppunitd_dll.lib - LIBS += $${CPPUNIT_LIB_DIR}\qttestrunnerd_dll.lib - } - release { - OBJECTS_DIR = ReleaseDLL - LIBS += $${CPPUNIT_LIB_DIR}\cppunit_dll.lib - LIBS += $${CPPUNIT_LIB_DIR}\qttestrunner_dll.lib - } - } - use_static { - debug { - OBJECTS_DIR = Debug - LIBS += $${CPPUNIT_LIB_DIR}\cppunitd.lib - LIBS += $${CPPUNIT_LIB_DIR}\qttestrunnerd.lib - } - release { - OBJECTS_DIR = Release - LIBS += $${CPPUNIT_LIB_DIR}\cppunit.lib - LIBS += $${CPPUNIT_LIB_DIR}\qttestrunner.lib - } - } - DESTDIR = $${OBJECTS_DIR} -} - -#---------------------------------------------------------------------- -# Linux/Unix -#---------------------------------------------------------------------- - -unix { - debug { - OBJECTS_DIR = .obj_debug - use_static: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunnerd - use_dll: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunnerd_shared - LIBS += -L$${CPPUNIT_LIB_DIR} -lcppunit - } - release { - OBJECTS_DIR = .obj_release - use_static: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunner - use_dll: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunner_shared - LIBS += -L$${CPPUNIT_LIB_DIR} -lcppunit - } -} - -#---------------------------------------------------------------------- - -HEADERS = \ - ExampleTestCases.h - -SOURCES = \ - ExampleTestCases.cpp \ - Main.cpp - -INCLUDEPATH += . ../../include diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.sln b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.sln deleted file mode 100644 index 08179922..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.sln +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qt_example", "qt_example.vcproj", "{84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleUnitTest_with_DLL", "qt_example_dll.vcproj", "{44077776-21C3-4271-A74A-1ED1CDA862A4}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Debug.ActiveCfg = Debug|Win32 - {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Debug.Build.0 = Debug|Win32 - {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Release.ActiveCfg = Release|Win32 - {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Release.Build.0 = Release|Win32 - {44077776-21C3-4271-A74A-1ED1CDA862A4}.Debug.ActiveCfg = Debug|Win32 - {44077776-21C3-4271-A74A-1ED1CDA862A4}.Debug.Build.0 = Debug|Win32 - {44077776-21C3-4271-A74A-1ED1CDA862A4}.Release.ActiveCfg = Release|Win32 - {44077776-21C3-4271-A74A-1ED1CDA862A4}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.vcproj b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.vcproj deleted file mode 100644 index ef747afa..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example.vcproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example_dll.vcproj b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example_dll.vcproj deleted file mode 100644 index ea02f90d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/qt_example_dll.vcproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/run.bat b/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/run.bat deleted file mode 100755 index eaab68eb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/qt/run.bat +++ /dev/null @@ -1,2 +0,0 @@ -SET PATH=%PATH%;..\..\lib -Debug\qt_example.exe diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.cpp deleted file mode 100644 index c45109f0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include "ExampleTestCase.h" - -CPPUNIT_TEST_SUITE_REGISTRATION( ExampleTestCase ); - -void ExampleTestCase::example() -{ - CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, 1.1, 0.05 ); - CPPUNIT_ASSERT( 1 == 0 ); - CPPUNIT_ASSERT( 1 == 1 ); -} - - -void ExampleTestCase::anotherExample() -{ - CPPUNIT_ASSERT (1 == 2); -} - -void ExampleTestCase::setUp() -{ - m_value1 = 2.0; - m_value2 = 3.0; -} - -void ExampleTestCase::testAdd() -{ - double result = m_value1 + m_value2; - CPPUNIT_ASSERT( result == 6.0 ); -} - - -void ExampleTestCase::testEquals() -{ - long* l1 = new long(12); - long* l2 = new long(12); - - CPPUNIT_ASSERT_EQUAL( 12, 12 ); - CPPUNIT_ASSERT_EQUAL( 12L, 12L ); - CPPUNIT_ASSERT_EQUAL( *l1, *l2 ); - - delete l1; - delete l2; - - CPPUNIT_ASSERT( 12L == 12L ); - CPPUNIT_ASSERT_EQUAL( 12, 13 ); - CPPUNIT_ASSERT_DOUBLES_EQUAL( 12.0, 11.99, 0.5 ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.h deleted file mode 100644 index bdeb8d42..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/ExampleTestCase.h +++ /dev/null @@ -1,37 +0,0 @@ - -#ifndef CPP_UNIT_EXAMPLETESTCASE_H -#define CPP_UNIT_EXAMPLETESTCASE_H - -#include - -/* - * A test case that is designed to produce - * example errors and failures - * - */ - -class ExampleTestCase : public CPPUNIT_NS::TestFixture -{ - CPPUNIT_TEST_SUITE( ExampleTestCase ); - CPPUNIT_TEST( example ); - CPPUNIT_TEST( anotherExample ); - CPPUNIT_TEST( testAdd ); - CPPUNIT_TEST( testEquals ); - CPPUNIT_TEST_SUITE_END(); - -protected: - double m_value1; - double m_value2; - -public: - void setUp(); - -protected: - void example(); - void anotherExample(); - void testAdd(); - void testEquals(); -}; - - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Main.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Main.cpp deleted file mode 100644 index 4eca9d02..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Main.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -#include -#include -#include -#include - - -int -main( int argc, char* argv[] ) -{ - // Create the event manager and test controller - CPPUNIT_NS::TestResult controller; - - // Add a listener that colllects test result - CPPUNIT_NS::TestResultCollector result; - controller.addListener( &result ); - - // Add a listener that print dots as test run. - CPPUNIT_NS::BriefTestProgressListener progress; - controller.addListener( &progress ); - - // Add the top suite to the test runner - CPPUNIT_NS::TestRunner runner; - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - runner.run( controller ); - - // Print test in a compiler compatible format. - CPPUNIT_NS::CompilerOutputter outputter( &result, CPPUNIT_NS::stdCOut() ); - outputter.write(); - - return result.wasSuccessful() ? 0 : 1; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.am deleted file mode 100644 index 8bf4eedd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = simple.dsp simple_plugin.dsp SimplePlugIn.cpp - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - -noinst_PROGRAMS=simple - -simple_SOURCES= ExampleTestCase.cpp Main.cpp ExampleTestCase.h - -simple_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -simple_LDFLAGS = $(LIBADD_DL) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.in deleted file mode 100644 index b257005f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/Makefile.in +++ /dev/null @@ -1,480 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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@ -noinst_PROGRAMS = simple$(EXEEXT) -subdir = examples/simple -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_simple_OBJECTS = ExampleTestCase.$(OBJEXT) Main.$(OBJEXT) -simple_OBJECTS = $(am_simple_OBJECTS) -simple_DEPENDENCIES = $(top_builddir)/src/cppunit/libcppunit.la -simple_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(simple_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(simple_SOURCES) -DIST_SOURCES = $(simple_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = simple.dsp simple_plugin.dsp SimplePlugIn.cpp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -simple_SOURCES = ExampleTestCase.cpp Main.cpp ExampleTestCase.h -simple_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -simple_LDFLAGS = $(LIBADD_DL) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/simple/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/simple/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 - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) - @rm -f simple$(EXEEXT) - $(simple_LINK) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExampleTestCase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Main.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-noinstPROGRAMS \ - 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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -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 - -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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/cppunit/cppunit-1.12.1/examples/simple/SimplePlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/SimplePlugIn.cpp deleted file mode 100644 index 1d24f060..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/SimplePlugIn.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// EasyTestPlugIn.cpp : Defines the entry point for the DLL application. -// - -#include - - -// Implements all the plug-in stuffs, WinMain... -CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple.dsp deleted file mode 100644 index 30cf24ba..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="simple" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=simple - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "simple.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "simple.mak" CFG="simple - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "simple - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "simple - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "simple - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/" - -!ELSEIF "$(CFG)" == "simple - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" - -!ENDIF - -# Begin Target - -# Name "simple - Win32 Release" -# Name "simple - Win32 Debug" -# Begin Source File - -SOURCE=.\ExampleTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExampleTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\Main.cpp -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple_plugin.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple_plugin.dsp deleted file mode 100644 index 666ee9ad..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/examples/simple/simple_plugin.dsp +++ /dev/null @@ -1,118 +0,0 @@ -# Microsoft Developer Studio Project File - Name="simple_plugin" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=simple_plugin - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "simple_plugin.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "simple_plugin.mak" CFG="simple_plugin - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "simple_plugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "simple_plugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "simple_plugin - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "simple_plugin___Win32_Release" -# PROP BASE Intermediate_Dir "simple_plugin___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleasePlugIn" -# PROP Intermediate_Dir "ReleasePlugIn" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /libpath:"../../lib/" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\ReleasePlugIn\simple_plugin.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Running tests... -PostBuild_Cmds=..\..\lib\DllPlugInTester_dll.exe "$(TargetPath)" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "simple_plugin - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "simple_plugin___Win32_Debug" -# PROP BASE Intermediate_Dir "simple_plugin___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugPlugIn" -# PROP Intermediate_Dir "DebugPlugIn" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"DebugPlugIn/simple_plugind.dll" /pdbtype:sept /libpath:"../../lib/" -# Begin Special Build Tool -TargetPath=.\DebugPlugIn\simple_plugind.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Running tests... -PostBuild_Cmds=..\..\lib\DllPlugInTesterd_dll.exe -b --xml tests.xml -c "$(TargetPath)" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "simple_plugin - Win32 Release" -# Name "simple_plugin - Win32 Debug" -# Begin Source File - -SOURCE=.\ExampleTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExampleTestCase.h -# End Source File -# Begin Source File - -SOURCE=.\SimplePlugIn.cpp -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.am deleted file mode 100644 index 872ec706..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = cppunit - -# already handled by toplevel dist-hook. -# DIST_SUBDIRS = msvc6 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.in deleted file mode 100644 index a89d9141..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/Makefile.in +++ /dev/null @@ -1,514 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = cppunit -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu 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 - -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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-recursive \ - uninstall uninstall-am - - -# already handled by toplevel dist-hook. -# DIST_SUBDIRS = msvc6 -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/AdditionalMessage.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/AdditionalMessage.h deleted file mode 100644 index 917d7541..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/AdditionalMessage.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef CPPUNIT_ADDITIONALMESSAGE_H -#define CPPUNIT_ADDITIONALMESSAGE_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief An additional Message for assertions. - * \ingroup CreatingNewAssertions - * - * Provides a implicit constructor that takes a single string. This allow this - * class to be used as the message arguments in macros. - * - * The constructed object is either a Message with a single detail string if - * a string was passed to the macro, or a copy of the Message passed to the macro. - * - * Here is an example of usage: - * \code - * - * void checkStringEquals( const std::string &expected, - * const std::string &actual, - * const CppUnit::SourceLine &sourceLine, - * const CppUnit::AdditionalMessage &message ); - * - * #define XTLUT_ASSERT_STRING_EQUAL_MESSAGE( expected, actual, message ) \ - * ::XtlUt::Impl::checkStringEquals( ::Xtl::toString(expected), \ - * ::Xtl::toString(actual), \ - * CPPUNIT_SOURCELINE(), \ - * message ) - * \endcode - * - * In the previous example, the user can specify a simple string for \a message, - * or a complex Message object. - * - * \see Message - */ -class CPPUNIT_API AdditionalMessage : public Message -{ -public: - typedef Message SuperClass; - - /// Constructs an empty Message. - AdditionalMessage(); - - /*! \brief Constructs a Message with the specified detail string. - * \param detail1 Detail string of the message. If empty, then it is not added. - */ - AdditionalMessage( const std::string &detail1 ); - - /*! \brief Constructs a Message with the specified detail string. - * \param detail1 Detail string of the message. If empty, then it is not added. - */ - AdditionalMessage( const char *detail1 ); - - /*! \brief Constructs a copy of the specified message. - * \param other Message to copy. - */ - AdditionalMessage( const Message &other ); - - /*! \brief Assignment operator. - * \param other Message to copy. - * \return Reference on this object. - */ - AdditionalMessage &operator =( const Message &other ); - -private: -}; - - -CPPUNIT_NS_END - - - -#endif // CPPUNIT_ADDITIONALMESSAGE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Asserter.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Asserter.h deleted file mode 100644 index 94dadaad..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Asserter.h +++ /dev/null @@ -1,143 +0,0 @@ -#ifndef CPPUNIT_ASSERTER_H -#define CPPUNIT_ASSERTER_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class Message; - - -/*! \brief A set of functions to help writing assertion macros. - * \ingroup CreatingNewAssertions - * - * Here is an example of assertion, a simplified version of the - * actual assertion implemented in examples/cppunittest/XmlUniformiser.h: - * \code - * #include - * #include - * - * void - * checkXmlEqual( std::string expectedXml, - * std::string actualXml, - * CppUnit::SourceLine sourceLine ) - * { - * std::string expected = XmlUniformiser( expectedXml ).stripped(); - * std::string actual = XmlUniformiser( actualXml ).stripped(); - * - * if ( expected == actual ) - * return; - * - * ::CppUnit::Asserter::failNotEqual( expected, - * actual, - * sourceLine ); - * } - * - * /// Asserts that two XML strings are equivalent. - * #define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \ - * checkXmlEqual( expected, actual, \ - * CPPUNIT_SOURCELINE() ) - * \endcode - */ -struct Asserter -{ - /*! \brief Throws a Exception with the specified message and location. - */ - static void CPPUNIT_API fail( const Message &message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. - * \deprecated Use fail( Message, SourceLine ) instead. - */ - static void CPPUNIT_API fail( std::string message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. - * \param shouldFail if \c true then the exception is thrown. Otherwise - * nothing happen. - * \param message Message explaining the assertion failiure. - * \param sourceLine Location of the assertion. - */ - static void CPPUNIT_API failIf( bool shouldFail, - const Message &message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. - * \deprecated Use failIf( bool, Message, SourceLine ) instead. - * \param shouldFail if \c true then the exception is thrown. Otherwise - * nothing happen. - * \param message Message explaining the assertion failiure. - * \param sourceLine Location of the assertion. - */ - static void CPPUNIT_API failIf( bool shouldFail, - std::string message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Returns a expected value string for a message. - * Typically used to create 'not equal' message, or to check that a message - * contains the expected content when writing unit tests for your custom - * assertions. - * - * \param expectedValue String that represents the expected value. - * \return \a expectedValue prefixed with "Expected: ". - * \see makeActual(). - */ - static std::string CPPUNIT_API makeExpected( const std::string &expectedValue ); - - /*! \brief Returns an actual value string for a message. - * Typically used to create 'not equal' message, or to check that a message - * contains the expected content when writing unit tests for your custom - * assertions. - * - * \param actualValue String that represents the actual value. - * \return \a actualValue prefixed with "Actual : ". - * \see makeExpected(). - */ - static std::string CPPUNIT_API makeActual( const std::string &actualValue ); - - static Message CPPUNIT_API makeNotEqualMessage( const std::string &expectedValue, - const std::string &actualValue, - const AdditionalMessage &additionalMessage = AdditionalMessage(), - const std::string &shortDescription = "equality assertion failed"); - - /*! \brief Throws an Exception with the specified message and location. - * \param expected Text describing the expected value. - * \param actual Text describing the actual value. - * \param sourceLine Location of the assertion. - * \param additionalMessage Additional message. Usually used to report - * what are the differences between the expected and actual value. - * \param shortDescription Short description for the failure message. - */ - static void CPPUNIT_API failNotEqual( std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage = AdditionalMessage(), - std::string shortDescription = "equality assertion failed" ); - - /*! \brief Throws an Exception with the specified message and location. - * \param shouldFail if \c true then the exception is thrown. Otherwise - * nothing happen. - * \param expected Text describing the expected value. - * \param actual Text describing the actual value. - * \param sourceLine Location of the assertion. - * \param additionalMessage Additional message. Usually used to report - * where the "difference" is located. - * \param shortDescription Short description for the failure message. - */ - static void CPPUNIT_API failNotEqualIf( bool shouldFail, - std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage = AdditionalMessage(), - std::string shortDescription = "equality assertion failed" ); - -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_ASSERTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/BriefTestProgressListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/BriefTestProgressListener.h deleted file mode 100644 index 137ca44b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/BriefTestProgressListener.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef CPPUNIT_BRIEFTESTPROGRESSLISTENER_H -#define CPPUNIT_BRIEFTESTPROGRESSLISTENER_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief TestListener that prints the name of each test before running it. - * \ingroup TrackingTestExecution - */ -class CPPUNIT_API BriefTestProgressListener : public TestListener -{ -public: - /*! Constructs a BriefTestProgressListener object. - */ - BriefTestProgressListener(); - - /// Destructor. - virtual ~BriefTestProgressListener(); - - void startTest( Test *test ); - - void addFailure( const TestFailure &failure ); - - void endTest( Test *test ); - -private: - /// Prevents the use of the copy constructor. - BriefTestProgressListener( const BriefTestProgressListener © ); - - /// Prevents the use of the copy operator. - void operator =( const BriefTestProgressListener © ); - -private: - bool m_lastTestFailed; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_BRIEFTESTPROGRESSLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/CompilerOutputter.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/CompilerOutputter.h deleted file mode 100644 index 885fe652..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/CompilerOutputter.h +++ /dev/null @@ -1,146 +0,0 @@ -#ifndef CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H -#define CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class Exception; -class SourceLine; -class Test; -class TestFailure; -class TestResultCollector; - -/*! - * \brief Outputs a TestResultCollector in a compiler compatible format. - * \ingroup WritingTestResult - * - * Printing the test results in a compiler compatible format (assertion - * location has the same format as compiler error), allow you to use your - * IDE to jump to the assertion failure. Location format can be customized (see - * setLocationFormat() ). - * - * For example, when running the test in a post-build with VC++, if an assertion - * fails, you can jump to the assertion by pressing F4 (jump to next error). - * - * Heres is an example of usage (from examples/cppunittest/CppUnitTestMain.cpp): - * \code - * int main( int argc, char* argv[] ) { - * // if command line contains "-selftest" then this is the post build check - * // => the output must be in the compiler error format. - * bool selfTest = (argc > 1) && - * (std::string("-selftest") == argv[1]); - * - * CppUnit::TextUi::TestRunner runner; - * runner.addTest( CppUnitTest::suite() ); // Add the top suite to the test runner - * - * if ( selfTest ) - * { // Change the default outputter to a compiler error format outputter - * // The test runner owns the new outputter. - * runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(), - * std::cerr ) ); - * } - * - * // Run the test and don't wait a key if post build check. - * bool wasSuccessful = runner.run( "", !selfTest ); - * - * // Return error code 1 if the one of test failed. - * return wasSuccessful ? 0 : 1; - * } - * \endcode - */ -class CPPUNIT_API CompilerOutputter : public Outputter -{ -public: - /*! \brief Constructs a CompilerOutputter object. - * \param result Result of the test run. - * \param stream Stream used to output test result. - * \param locationFormat Error location format used by your compiler. Default - * to \c CPPUNIT_COMPILER_LOCATION_FORMAT which is defined - * in the configuration file. See setLocationFormat() for detail. - * \see setLocationFormat(). - */ - CompilerOutputter( TestResultCollector *result, - OStream &stream, - const std::string &locationFormat = CPPUNIT_COMPILER_LOCATION_FORMAT ); - - /// Destructor. - virtual ~CompilerOutputter(); - - /*! \brief Sets the error location format. - * - * Indicates the format used to report location of failed assertion. This format should - * match the one used by your compiler. - * - * The location format is a string in which the occurence of the following character - * sequence are replaced: - * - * - "%l" => replaced by the line number - * - "%p" => replaced by the full path name of the file ("G:\prg\vc\cppunit\MyTest.cpp") - * - "%f" => replaced by the base name of the file ("MyTest.cpp") - * - * Some examples: - * - * - VC++ error location format: "%p(%l):" => produce "G:\prg\MyTest.cpp(43):" - * - GCC error location format: "%f:%l:" => produce "MyTest.cpp:43:" - * - * Thoses are the two compilers currently supported (gcc format is used if - * VC++ is not detected). If you want your compiler to be automatically supported by - * CppUnit, send a mail to the mailing list (preferred), or submit a feature request - * that indicates how to detect your compiler with the preprocessor (\#ifdef...) and - * your compiler location format. - */ - void setLocationFormat( const std::string &locationFormat ); - - /*! \brief Creates an instance of an outputter that matches your current compiler. - * \deprecated This class is specialized through parameterization instead of subclassing... - * Use CompilerOutputter::CompilerOutputter instead. - */ - static CompilerOutputter *defaultOutputter( TestResultCollector *result, - OStream &stream ); - - void write(); - - void setNoWrap(); - - void setWrapColumn( int wrapColumn ); - - int wrapColumn() const; - - virtual void printSuccess(); - virtual void printFailureReport(); - virtual void printFailuresList(); - virtual void printStatistics(); - virtual void printFailureDetail( TestFailure *failure ); - virtual void printFailureLocation( SourceLine sourceLine ); - virtual void printFailureType( TestFailure *failure ); - virtual void printFailedTestName( TestFailure *failure ); - virtual void printFailureMessage( TestFailure *failure ); - -private: - /// Prevents the use of the copy constructor. - CompilerOutputter( const CompilerOutputter © ); - - /// Prevents the use of the copy operator. - void operator =( const CompilerOutputter © ); - - virtual bool processLocationFormatCommand( char command, - const SourceLine &sourceLine ); - - virtual std::string extractBaseName( const std::string &fileName ) const; - -private: - TestResultCollector *m_result; - OStream &m_stream; - std::string m_locationFormat; - int m_wrapColumn; -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Exception.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Exception.h deleted file mode 100644 index bf5fcacf..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Exception.h +++ /dev/null @@ -1,90 +0,0 @@ -#ifndef CPPUNIT_EXCEPTION_H -#define CPPUNIT_EXCEPTION_H - -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief Exceptions thrown by failed assertions. - * \ingroup BrowsingCollectedTestResult - * - * Exception is an exception that serves - * descriptive strings through its what() method - */ -class CPPUNIT_API Exception : public std::exception -{ -public: - /*! \brief Constructs the exception with the specified message and source location. - * \param message Message associated to the exception. - * \param sourceLine Source location related to the exception. - */ - Exception( const Message &message = Message(), - const SourceLine &sourceLine = SourceLine() ); - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED - /*! - * \deprecated Use other constructor instead. - */ - Exception( std::string message, - long lineNumber, - std::string fileName ); -#endif - - /*! \brief Constructs a copy of an exception. - * \param other Exception to copy. - */ - Exception( const Exception &other ); - - /// Destructs the exception - virtual ~Exception() throw(); - - /// Performs an assignment - Exception &operator =( const Exception &other ); - - /// Returns descriptive message - const char *what() const throw(); - - /// Location where the error occured - SourceLine sourceLine() const; - - /// Message related to the exception. - Message message() const; - - /// Set the message. - void setMessage( const Message &message ); - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED - /// The line on which the error occurred - long lineNumber() const; - - /// The file in which the error occurred - std::string fileName() const; - - static const std::string UNKNOWNFILENAME; - static const long UNKNOWNLINENUMBER; -#endif - - /// Clones the exception. - virtual Exception *clone() const; - -protected: - // VC++ does not recognize call to parent class when prefixed - // with a namespace. This is a workaround. - typedef std::exception SuperClass; - - Message m_message; - SourceLine m_sourceLine; - std::string m_whatMessage; -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_EXCEPTION_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.am deleted file mode 100644 index c743a67c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -SUBDIRS = extensions ui plugin config tools portability - -DISTCLEANFILES = config-auto.h - -libcppunitincludedir = $(includedir)/cppunit -libcppunitinclude_HEADERS = \ - config-auto.h \ - AdditionalMessage.h \ - Asserter.h \ - BriefTestProgressListener.h \ - CompilerOutputter.h \ - Exception.h \ - Message.h \ - Outputter.h \ - Portability.h \ - Protector.h \ - SourceLine.h \ - SynchronizedObject.h \ - Test.h \ - TestAssert.h \ - TestCase.h \ - TestCaller.h \ - TestComposite.h \ - TestFailure.h \ - TestFixture.h \ - TestLeaf.h \ - TestPath.h \ - TestResult.h \ - TestResultCollector.h \ - TestRunner.h \ - TestSuccessListener.h \ - TestSuite.h \ - TextOutputter.h \ - TextTestProgressListener.h \ - TextTestResult.h \ - TextTestRunner.h \ - TestListener.h \ - XmlOutputter.h \ - XmlOutputterHook.h - -dist-hook: - rm -f $(distdir)/config-auto.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.in deleted file mode 100644 index 4594fa04..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Makefile.in +++ /dev/null @@ -1,587 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = extensions ui plugin config tools portability -DISTCLEANFILES = config-auto.h -libcppunitincludedir = $(includedir)/cppunit -libcppunitinclude_HEADERS = \ - config-auto.h \ - AdditionalMessage.h \ - Asserter.h \ - BriefTestProgressListener.h \ - CompilerOutputter.h \ - Exception.h \ - Message.h \ - Outputter.h \ - Portability.h \ - Protector.h \ - SourceLine.h \ - SynchronizedObject.h \ - Test.h \ - TestAssert.h \ - TestCase.h \ - TestCaller.h \ - TestComposite.h \ - TestFailure.h \ - TestFixture.h \ - TestLeaf.h \ - TestPath.h \ - TestResult.h \ - TestResultCollector.h \ - TestRunner.h \ - TestSuccessListener.h \ - TestSuite.h \ - TextOutputter.h \ - TextTestProgressListener.h \ - TextTestResult.h \ - TextTestRunner.h \ - TestListener.h \ - XmlOutputter.h \ - XmlOutputterHook.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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -# 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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: check-recursive -all-am: Makefile $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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-libcppunitincludeHEADERS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive dist-hook 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-libcppunitincludeHEADERS 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-recursive uninstall uninstall-am \ - uninstall-libcppunitincludeHEADERS - - -dist-hook: - rm -f $(distdir)/config-auto.h -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Message.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Message.h deleted file mode 100644 index 1ae51cc2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Message.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef CPPUNIT_MESSAGE_H -#define CPPUNIT_MESSAGE_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include - - -CPPUNIT_NS_BEGIN - - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::deque; -#endif - -/*! \brief Message associated to an Exception. - * \ingroup CreatingNewAssertions - * A message is composed of two items: - * - a short description (~20/30 characters) - * - a list of detail strings - * - * The short description is used to indicate how the detail strings should be - * interpreted. It usually indicates the failure types, such as - * "assertion failed", "forced failure", "unexpected exception caught", - * "equality assertion failed"... It should not contains new line character (\n). - * - * Detail strings are used to provide more information about the failure. It - * can contains the asserted expression, the expected and actual values in an - * equality assertion, some addional messages... Detail strings can contains - * new line characters (\n). - */ -class CPPUNIT_API Message -{ -public: - Message(); - - // Ensure thread-safe copy by detaching the string. - Message( const Message &other ); - - explicit Message( const std::string &shortDescription ); - - Message( const std::string &shortDescription, - const std::string &detail1 ); - - Message( const std::string &shortDescription, - const std::string &detail1, - const std::string &detail2 ); - - Message( const std::string &shortDescription, - const std::string &detail1, - const std::string &detail2, - const std::string &detail3 ); - - Message &operator =( const Message &other ); - - /*! \brief Returns the short description. - * \return Short description. - */ - const std::string &shortDescription() const; - - /*! \brief Returns the number of detail string. - * \return Number of detail string. - */ - int detailCount() const; - - /*! \brief Returns the detail at the specified index. - * \param index Zero based index of the detail string to return. - * \returns Detail string at the specified index. - * \exception std::invalid_argument if \a index < 0 or index >= detailCount(). - */ - std::string detailAt( int index ) const; - - /*! \brief Returns a string that represents a list of the detail strings. - * - * Example: - * \code - * Message message( "not equal", "Expected: 3", "Actual: 7" ); - * std::string details = message.details(); - * // details contains: - * // "- Expected: 3\n- Actual: 7\n" \endcode - * - * \return A string that is a concatenation of all the detail strings. Each detail - * string is prefixed with '- ' and suffixed with '\n' before being - * concatenated to the other. - */ - std::string details() const; - - /*! \brief Removes all detail strings. - */ - void clearDetails(); - - /*! \brief Adds a single detail string. - * \param detail Detail string to add. - */ - void addDetail( const std::string &detail ); - - /*! \brief Adds two detail strings. - * \param detail1 Detail string to add. - * \param detail2 Detail string to add. - */ - void addDetail( const std::string &detail1, - const std::string &detail2 ); - - /*! \brief Adds three detail strings. - * \param detail1 Detail string to add. - * \param detail2 Detail string to add. - * \param detail3 Detail string to add. - */ - void addDetail( const std::string &detail1, - const std::string &detail2, - const std::string &detail3 ); - - /*! \brief Adds the detail strings of the specified message. - * \param message All the detail strings of this message are added to this one. - */ - void addDetail( const Message &message ); - - /*! \brief Sets the short description. - * \param shortDescription New short description. - */ - void setShortDescription( const std::string &shortDescription ); - - /*! \brief Tests if a message is identical to another one. - * \param other Message this message is compared to. - * \return \c true if the two message are identical, \c false otherwise. - */ - bool operator ==( const Message &other ) const; - - /*! \brief Tests if a message is different from another one. - * \param other Message this message is compared to. - * \return \c true if the two message are not identical, \c false otherwise. - */ - bool operator !=( const Message &other ) const; - -private: - std::string m_shortDescription; - - typedef CppUnitDeque Details; - Details m_details; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -#endif // CPPUNIT_MESSAGE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Outputter.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Outputter.h deleted file mode 100644 index f31d6815..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Outputter.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef CPPUNIT_OUTPUTTER_H -#define CPPUNIT_OUTPUTTER_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief Abstract outputter to print test result summary. - * \ingroup WritingTestResult - */ -class CPPUNIT_API Outputter -{ -public: - /// Destructor. - virtual ~Outputter() {} - - virtual void write() =0; -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_OUTPUTTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Portability.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Portability.h deleted file mode 100644 index ddf03169..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Portability.h +++ /dev/null @@ -1,177 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_H -#define CPPUNIT_PORTABILITY_H - -#if defined(_WIN32) && !defined(WIN32) -# define WIN32 1 -#endif - -/* include platform specific config */ -#if defined(__BORLANDC__) -# include -#elif defined (_MSC_VER) -# if _MSC_VER == 1200 && defined(_WIN32_WCE) //evc4 -# include -# else -# include -# endif -#else -# include -#endif - -// Version number of package -#ifndef CPPUNIT_VERSION -#define CPPUNIT_VERSION "1.12.0" -#endif - -#include // define CPPUNIT_API & CPPUNIT_NEED_DLL_DECL -#include - - -/* Options that the library user may switch on or off. - * If the user has not done so, we chose default values. - */ - - -/* Define to 1 if you wish to have the old-style macros - assert(), assertEqual(), assertDoublesEqual(), and assertLongsEqual() */ -#if !defined(CPPUNIT_ENABLE_NAKED_ASSERT) -# define CPPUNIT_ENABLE_NAKED_ASSERT 0 -#endif - -/* Define to 1 if you wish to have the old-style CU_TEST family - of macros. */ -#if !defined(CPPUNIT_ENABLE_CU_TEST_MACROS) -# define CPPUNIT_ENABLE_CU_TEST_MACROS 0 -#endif - -/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) - I don't think there is any C preprocess that does NOT support this! */ -#if !defined(CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION) -# define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION 1 -#endif - -/* Assumes that STL and CppUnit are in global space if the compiler does not - support namespace. */ -#if !defined(CPPUNIT_HAVE_NAMESPACES) -# if !defined(CPPUNIT_NO_NAMESPACE) -# define CPPUNIT_NO_NAMESPACE 1 -# endif // !defined(CPPUNIT_NO_NAMESPACE) -# if !defined(CPPUNIT_NO_STD_NAMESPACE) -# define CPPUNIT_NO_STD_NAMESPACE 1 -# endif // !defined(CPPUNIT_NO_STD_NAMESPACE) -#endif // !defined(CPPUNIT_HAVE_NAMESPACES) - -/* Define CPPUNIT_STD_NEED_ALLOCATOR to 1 if you need to specify - * the allocator you used when instantiating STL container. Typically - * used for compilers that do not support template default parameter. - * CPPUNIT_STD_ALLOCATOR will be used as the allocator. Default is - * std::allocator. On some compilers, you may need to change this to - * std::allocator. - */ -#if CPPUNIT_STD_NEED_ALLOCATOR -# if !defined(CPPUNIT_STD_ALLOCATOR) -# define CPPUNIT_STD_ALLOCATOR std::allocator -# endif // !defined(CPPUNIT_STD_ALLOCATOR) -#endif // defined(CPPUNIT_STD_NEED_ALLOCATOR) - - -// Compiler error location format for CompilerOutputter -// If not define, assumes that it's gcc -// See class CompilerOutputter for format. -#if !defined(CPPUNIT_COMPILER_LOCATION_FORMAT) -#if defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) ) -// gcc/Xcode integration on Mac OS X -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l: " -#else -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%f:%l:" -#endif -#endif - -// If CPPUNIT_HAVE_CPP_CAST is defined, then c++ style cast will be used, -// otherwise, C style cast are used. -#if defined( CPPUNIT_HAVE_CPP_CAST ) -# define CPPUNIT_CONST_CAST( TargetType, pointer ) \ - const_cast( pointer ) - -# define CPPUNIT_STATIC_CAST( TargetType, pointer ) \ - static_cast( pointer ) -#else // defined( CPPUNIT_HAVE_CPP_CAST ) -# define CPPUNIT_CONST_CAST( TargetType, pointer ) \ - ((TargetType)( pointer )) -# define CPPUNIT_STATIC_CAST( TargetType, pointer ) \ - ((TargetType)( pointer )) -#endif // defined( CPPUNIT_HAVE_CPP_CAST ) - -// If CPPUNIT_NO_STD_NAMESPACE is defined then STL are in the global space. -// => Define macro 'std' to nothing -#if defined(CPPUNIT_NO_STD_NAMESPACE) -# undef std -# define std -#endif // defined(CPPUNIT_NO_STD_NAMESPACE) - -// If CPPUNIT_NO_NAMESPACE is defined, then put CppUnit classes in the -// global namespace: the compiler does not support namespace. -#if defined(CPPUNIT_NO_NAMESPACE) -# define CPPUNIT_NS_BEGIN -# define CPPUNIT_NS_END -# define CPPUNIT_NS -#else // defined(CPPUNIT_NO_NAMESPACE) -# define CPPUNIT_NS_BEGIN namespace CppUnit { -# define CPPUNIT_NS_END } -# define CPPUNIT_NS CppUnit -#endif // defined(CPPUNIT_NO_NAMESPACE) - -/*! Stringize a symbol. - * - * Use this macro to convert a preprocessor symbol to a string. - * - * Example of usage: - * \code - * #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn - * const char *name = CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ); - * \endcode - */ -#define CPPUNIT_STRINGIZE( symbol ) _CPPUNIT_DO_STRINGIZE( symbol ) - -/// \internal -#define _CPPUNIT_DO_STRINGIZE( symbol ) #symbol - -/*! Joins to symbol after expanding them into string. - * - * Use this macro to join two symbols. Example of usage: - * - * \code - * #define MAKE_UNIQUE_NAME(prefix) CPPUNIT_JOIN( prefix, __LINE__ ) - * \endcode - * - * The macro defined in the example concatenate a given prefix with the line number - * to obtain a 'unique' identifier. - * - * \internal From boost documentation: - * The following piece of macro magic joins the two - * arguments together, even when one of the arguments is - * itself a macro (see 16.3.1 in C++ standard). The key - * is that macro expansion of macro arguments does not - * occur in CPPUNIT_JOIN2 but does in CPPUNIT_JOIN. - */ -#define CPPUNIT_JOIN( symbol1, symbol2 ) _CPPUNIT_DO_JOIN( symbol1, symbol2 ) - -/// \internal -#define _CPPUNIT_DO_JOIN( symbol1, symbol2 ) _CPPUNIT_DO_JOIN2( symbol1, symbol2 ) - -/// \internal -#define _CPPUNIT_DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2 - -/*! Adds the line number to the specified string to create a unique identifier. - * \param prefix Prefix added to the line number to create a unique identifier. - * \see CPPUNIT_TEST_SUITE_REGISTRATION for an example of usage. - */ -#define CPPUNIT_MAKE_UNIQUE_NAME( prefix ) CPPUNIT_JOIN( prefix, __LINE__ ) - -/*! Defines wrap colunm for %CppUnit. Used by CompilerOuputter. - */ -#if !defined(CPPUNIT_WRAP_COLUMN) -# define CPPUNIT_WRAP_COLUMN 79 -#endif - -#endif // CPPUNIT_PORTABILITY_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Protector.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Protector.h deleted file mode 100644 index d14e75f6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Protector.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef CPPUNIT_PROTECTOR_H -#define CPPUNIT_PROTECTOR_H - -#include - -CPPUNIT_NS_BEGIN - -class Exception; -class Message; -class ProtectorContext; -class TestResult; - - -class CPPUNIT_API Functor -{ -public: - virtual ~Functor(); - - virtual bool operator()() const =0; -}; - - -/*! \brief Protects one or more test case run. - * - * Protector are used to globably 'decorate' a test case. The most common - * usage of Protector is to catch exception that do not subclass std::exception, - * such as MFC CException class or Rogue Wave RWXMsg class, and capture the - * message associated to the exception. In fact, CppUnit capture message from - * Exception and std::exception using a Protector. - * - * Protector are chained. When you add a Protector using - * TestResult::pushProtector(), your protector is in fact passed as a Functor - * to the first protector of the chain. - * - * TestCase protects call to setUp(), runTest() and tearDown() by calling - * TestResult::protect(). - * - * Because the protector chain is handled by TestResult, a protector can be - * active for a single test, or a complete test run. - * - * Here are some possible usages: - * - run all test case in a separate thread and assumes the test failed if it - * did not finish in a given time (infinite loop work around) - * - performance tracing : time only the runTest() time. - * \sa TestResult, TestCase, TestListener. - */ -class CPPUNIT_API Protector -{ -public: - virtual ~Protector(); - - virtual bool protect( const Functor &functor, - const ProtectorContext &context ) =0; - -protected: - void reportError( const ProtectorContext &context, - const Exception &error ) const; - - void reportError( const ProtectorContext &context, - const Message &message, - const SourceLine &sourceLine = SourceLine() ) const; - - void reportFailure( const ProtectorContext &context, - const Exception &failure ) const; - - Message actualMessage( const Message &message, - const ProtectorContext &context ) const; -}; - - -/*! \brief Scoped protector push to TestResult. - * - * Adds the specified Protector to the specified TestResult for the object - * life-time. - */ -class CPPUNIT_API ProtectorGuard -{ -public: - /// Pushes the specified protector. - ProtectorGuard( TestResult *result, - Protector *protector ); - - /// Pops the protector. - ~ProtectorGuard(); - -private: - TestResult *m_result; -}; - -CPPUNIT_NS_END - - -#endif // CPPUNIT_PROTECTOR_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SourceLine.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SourceLine.h deleted file mode 100644 index f7a85df7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SourceLine.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef CPPUNIT_SOURCELINE_H -#define CPPUNIT_SOURCELINE_H - -#include -#include - -/*! \brief Constructs a SourceLine object initialized with the location where the macro is expanded. - * \ingroup CreatingNewAssertions - * \relates CppUnit::SourceLine - * Used to write your own assertion macros. - * \see Asserter for example of usage. - */ -#define CPPUNIT_SOURCELINE() CPPUNIT_NS::SourceLine( __FILE__, __LINE__ ) - - -CPPUNIT_NS_BEGIN - - -/*! \brief Represents a source line location. - * \ingroup CreatingNewAssertions - * \ingroup BrowsingCollectedTestResult - * - * Used to capture the failure location in assertion. - * - * Use the CPPUNIT_SOURCELINE() macro to construct that object. Typically used when - * writing an assertion macro in association with Asserter. - * - * \see Asserter. - */ -class CPPUNIT_API SourceLine -{ -public: - SourceLine(); - - // Ensure thread-safe copy by detaching the string buffer. - SourceLine( const SourceLine &other ); - - SourceLine( const std::string &fileName, - int lineNumber ); - - SourceLine &operator =( const SourceLine &other ); - - /// Destructor. - virtual ~SourceLine(); - - bool isValid() const; - - int lineNumber() const; - - std::string fileName() const; - - bool operator ==( const SourceLine &other ) const; - bool operator !=( const SourceLine &other ) const; - -private: - std::string m_fileName; - int m_lineNumber; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_SOURCELINE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SynchronizedObject.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SynchronizedObject.h deleted file mode 100644 index 0f7d094a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/SynchronizedObject.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H -#define CPPUNIT_SYNCHRONIZEDOBJECT_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief Base class for synchronized object. - * - * Synchronized object are object which members are used concurrently by mutiple - * threads. - * - * This class define the class SynchronizationObject which must be subclassed - * to implement an actual lock. - * - * Each instance of this class holds a pointer on a lock object. - * - * See src/msvc6/MfcSynchronizedObject.h for an example. - */ -class CPPUNIT_API SynchronizedObject -{ -public: - /*! \brief Abstract synchronization object (mutex) - */ - class SynchronizationObject - { - public: - SynchronizationObject() {} - virtual ~SynchronizationObject() {} - - virtual void lock() {} - virtual void unlock() {} - }; - - /*! Constructs a SynchronizedObject object. - */ - SynchronizedObject( SynchronizationObject *syncObject =0 ); - - /// Destructor. - virtual ~SynchronizedObject(); - -protected: - /*! \brief Locks a synchronization object in the current scope. - */ - class ExclusiveZone - { - SynchronizationObject *m_syncObject; - - public: - ExclusiveZone( SynchronizationObject *syncObject ) - : m_syncObject( syncObject ) - { - m_syncObject->lock(); - } - - ~ExclusiveZone() - { - m_syncObject->unlock (); - } - }; - - virtual void setSynchronizationObject( SynchronizationObject *syncObject ); - -protected: - SynchronizationObject *m_syncObject; - -private: - /// Prevents the use of the copy constructor. - SynchronizedObject( const SynchronizedObject © ); - - /// Prevents the use of the copy operator. - void operator =( const SynchronizedObject © ); -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_SYNCHRONIZEDOBJECT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Test.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Test.h deleted file mode 100644 index a56be0fb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/Test.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef CPPUNIT_TEST_H -#define CPPUNIT_TEST_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -class TestResult; -class TestPath; - -/*! \brief Base class for all test objects. - * \ingroup BrowsingCollectedTestResult - * - * All test objects should be a subclass of Test. Some test objects, - * TestCase for example, represent one individual test. Other test - * objects, such as TestSuite, are comprised of several tests. - * - * When a Test is run, the result is collected by a TestResult object. - * - * \see TestCase - * \see TestSuite - */ -class CPPUNIT_API Test -{ -public: - virtual ~Test() {}; - - /*! \brief Run the test, collecting results. - */ - virtual void run( TestResult *result ) =0; - - /*! \brief Return the number of test cases invoked by run(). - * - * The base unit of testing is the class TestCase. This - * method returns the number of TestCase objects invoked by - * the run() method. - */ - virtual int countTestCases () const =0; - - /*! \brief Returns the number of direct child of the test. - */ - virtual int getChildTestCount() const =0; - - /*! \brief Returns the child test of the specified index. - * - * This method test if the index is valid, then call doGetChildTestAt() if - * the index is valid. Otherwise std::out_of_range exception is thrown. - * - * You should override doGetChildTestAt() method. - * - * \param index Zero based index of the child test to return. - * \return Pointer on the test. Never \c NULL. - * \exception std::out_of_range is \a index is < 0 or >= getChildTestCount(). - */ - virtual Test *getChildTestAt( int index ) const; - - /*! \brief Returns the test name. - * - * Each test has a name. This name may be used to find the - * test in a suite or registry of tests. - */ - virtual std::string getName () const =0; - - /*! \brief Finds the test with the specified name and its parents test. - * \param testName Name of the test to find. - * \param testPath If the test is found, then all the tests traversed to access - * \a test are added to \a testPath, including \c this and \a test. - * \return \c true if a test with the specified name is found, \c false otherwise. - */ - virtual bool findTestPath( const std::string &testName, - TestPath &testPath ) const; - - /*! \brief Finds the specified test and its parents test. - * \param test Test to find. - * \param testPath If the test is found, then all the tests traversed to access - * \a test are added to \a testPath, including \c this and \a test. - * \return \c true if the specified test is found, \c false otherwise. - */ - virtual bool findTestPath( const Test *test, - TestPath &testPath ) const; - - /*! \brief Finds the test with the specified name in the hierarchy. - * \param testName Name of the test to find. - * \return Pointer on the first test found that is named \a testName. Never \c NULL. - * \exception std::invalid_argument if no test named \a testName is found. - */ - virtual Test *findTest( const std::string &testName ) const; - - /*! \brief Resolved the specified test path with this test acting as 'root'. - * \param testPath Test path string to resolve. - * \return Resolved TestPath. - * \exception std::invalid_argument if \a testPath could not be resolved. - * \see TestPath. - */ - virtual TestPath resolveTestPath( const std::string &testPath ) const; - -protected: - /*! Throws an exception if the specified index is invalid. - * \param index Zero base index of a child test. - * \exception std::out_of_range is \a index is < 0 or >= getChildTestCount(). - */ - virtual void checkIsValidIndex( int index ) const; - - /*! \brief Returns the child test of the specified valid index. - * \param index Zero based valid index of the child test to return. - * \return Pointer on the test. Never \c NULL. - */ - virtual Test *doGetChildTestAt( int index ) const =0; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TEST_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestAssert.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestAssert.h deleted file mode 100644 index f74797b9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestAssert.h +++ /dev/null @@ -1,428 +0,0 @@ -#ifndef CPPUNIT_TESTASSERT_H -#define CPPUNIT_TESTASSERT_H - -#include -#include -#include -#include -#include -#include // For struct assertion_traits - - -CPPUNIT_NS_BEGIN - - -/*! \brief Traits used by CPPUNIT_ASSERT_EQUAL(). - * - * Here is an example of specialising these traits: - * - * \code - * template<> - * struct assertion_traits // specialization for the std::string type - * { - * static bool equal( const std::string& x, const std::string& y ) - * { - * return x == y; - * } - * - * static std::string toString( const std::string& x ) - * { - * std::string text = '"' + x + '"'; // adds quote around the string to see whitespace - * OStringStream ost; - * ost << text; - * return ost.str(); - * } - * }; - * \endcode - */ -template -struct assertion_traits -{ - static bool equal( const T& x, const T& y ) - { - return x == y; - } - - static std::string toString( const T& x ) - { - OStringStream ost; - ost << x; - return ost.str(); - } -}; - - -/*! \brief Traits used by CPPUNIT_ASSERT_DOUBLES_EQUAL(). - * - * This specialisation from @c struct @c assertion_traits<> ensures that - * doubles are converted in full, instead of being rounded to the default - * 6 digits of precision. Use the system defined ISO C99 macro DBL_DIG - * within float.h is available to define the maximum precision, otherwise - * use the hard-coded maximum precision of 15. - */ -template <> -struct assertion_traits -{ - static bool equal( double x, double y ) - { - return x == y; - } - - static std::string toString( double x ) - { -#ifdef DBL_DIG - const int precision = DBL_DIG; -#else - const int precision = 15; -#endif // #ifdef DBL_DIG - char buffer[128]; -#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning. - sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); -#else - sprintf(buffer, "%.*g", precision, x); -#endif - return buffer; - } -}; - - -/*! \brief (Implementation) Asserts that two objects of the same type are equals. - * Use CPPUNIT_ASSERT_EQUAL instead of this function. - * \sa assertion_traits, Asserter::failNotEqual(). - */ -template -void assertEquals( const T& expected, - const T& actual, - SourceLine sourceLine, - const std::string &message ) -{ - if ( !assertion_traits::equal(expected,actual) ) // lazy toString conversion... - { - Asserter::failNotEqual( assertion_traits::toString(expected), - assertion_traits::toString(actual), - sourceLine, - message ); - } -} - - -/*! \brief (Implementation) Asserts that two double are equals given a tolerance. - * Use CPPUNIT_ASSERT_DOUBLES_EQUAL instead of this function. - * \sa Asserter::failNotEqual(). - * \sa CPPUNIT_ASSERT_DOUBLES_EQUAL for detailed semantic of the assertion. - */ -void CPPUNIT_API assertDoubleEquals( double expected, - double actual, - double delta, - SourceLine sourceLine, - const std::string &message ); - - -/* A set of macros which allow us to get the line number - * and file name at the point of an error. - * Just goes to show that preprocessors do have some - * redeeming qualities. - */ -#if CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION -/** Assertions that a condition is \c true. - * \ingroup Assertions - */ -#define CPPUNIT_ASSERT(condition) \ - ( CPPUNIT_NS::Asserter::failIf( !(condition), \ - CPPUNIT_NS::Message( "assertion failed", \ - "Expression: " #condition), \ - CPPUNIT_SOURCELINE() ) ) -#else -#define CPPUNIT_ASSERT(condition) \ - ( CPPUNIT_NS::Asserter::failIf( !(condition), \ - CPPUNIT_NS::Message( "assertion failed" ), \ - CPPUNIT_SOURCELINE() ) ) -#endif - -/** Assertion with a user specified message. - * \ingroup Assertions - * \param message Message reported in diagnostic if \a condition evaluates - * to \c false. - * \param condition If this condition evaluates to \c false then the - * test failed. - */ -#define CPPUNIT_ASSERT_MESSAGE(message,condition) \ - ( CPPUNIT_NS::Asserter::failIf( !(condition), \ - CPPUNIT_NS::Message( "assertion failed", \ - "Expression: " \ - #condition, \ - message ), \ - CPPUNIT_SOURCELINE() ) ) - -/** Fails with the specified message. - * \ingroup Assertions - * \param message Message reported in diagnostic. - */ -#define CPPUNIT_FAIL( message ) \ - ( CPPUNIT_NS::Asserter::fail( CPPUNIT_NS::Message( "forced failure", \ - message ), \ - CPPUNIT_SOURCELINE() ) ) - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -/// Generalized macro for primitive value comparisons -#define CPPUNIT_ASSERT_EQUAL(expected,actual) \ - ( CPPUNIT_NS::assertEquals( (expected), \ - (actual), \ - __LINE__, __FILE__ ) ) -#else -/** Asserts that two values are equals. - * \ingroup Assertions - * - * Equality and string representation can be defined with - * an appropriate CppUnit::assertion_traits class. - * - * A diagnostic is printed if actual and expected values disagree. - * - * Requirement for \a expected and \a actual parameters: - * - They are exactly of the same type - * - They are serializable into a std::strstream using operator <<. - * - They can be compared using operator ==. - * - * The last two requirements (serialization and comparison) can be - * removed by specializing the CppUnit::assertion_traits. - */ -#define CPPUNIT_ASSERT_EQUAL(expected,actual) \ - ( CPPUNIT_NS::assertEquals( (expected), \ - (actual), \ - CPPUNIT_SOURCELINE(), \ - "" ) ) - -/** Asserts that two values are equals, provides additional message on failure. - * \ingroup Assertions - * - * Equality and string representation can be defined with - * an appropriate assertion_traits class. - * - * A diagnostic is printed if actual and expected values disagree. - * The message is printed in addition to the expected and actual value - * to provide additional information. - * - * Requirement for \a expected and \a actual parameters: - * - They are exactly of the same type - * - They are serializable into a std::strstream using operator <<. - * - They can be compared using operator ==. - * - * The last two requirements (serialization and comparison) can be - * removed by specializing the CppUnit::assertion_traits. - */ -#define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual) \ - ( CPPUNIT_NS::assertEquals( (expected), \ - (actual), \ - CPPUNIT_SOURCELINE(), \ - (message) ) ) -#endif - -/*! \brief Macro for primitive double value comparisons. - * \ingroup Assertions - * - * The assertion pass if both expected and actual are finite and - * \c fabs( \c expected - \c actual ) <= \c delta. - * If either \c expected or actual are infinite (+/- inf), the - * assertion pass if \c expected == \c actual. - * If either \c expected or \c actual is a NaN (not a number), then - * the assertion fails. - */ -#define CPPUNIT_ASSERT_DOUBLES_EQUAL(expected,actual,delta) \ - ( CPPUNIT_NS::assertDoubleEquals( (expected), \ - (actual), \ - (delta), \ - CPPUNIT_SOURCELINE(), \ - "" ) ) - - -/*! \brief Macro for primitive double value comparisons, setting a - * user-supplied message in case of failure. - * \ingroup Assertions - * \sa CPPUNIT_ASSERT_DOUBLES_EQUAL for detailed semantic of the assertion. - */ -#define CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(message,expected,actual,delta) \ - ( CPPUNIT_NS::assertDoubleEquals( (expected), \ - (actual), \ - (delta), \ - CPPUNIT_SOURCELINE(), \ - (message) ) ) - - -/** Asserts that the given expression throws an exception of the specified type. - * \ingroup Assertions - * Example of usage: - * \code - * std::vector v; - * CPPUNIT_ASSERT_THROW( v.at( 50 ), std::out_of_range ); - * \endcode - */ -# define CPPUNIT_ASSERT_THROW( expression, ExceptionType ) \ - CPPUNIT_ASSERT_THROW_MESSAGE( CPPUNIT_NS::AdditionalMessage(), \ - expression, \ - ExceptionType ) - - -// implementation detail -#if CPPUNIT_USE_TYPEINFO_NAME -#define CPPUNIT_EXTRACT_EXCEPTION_TYPE_( exception, no_rtti_message ) \ - CPPUNIT_NS::TypeInfoHelper::getClassName( typeid(exception) ) -#else -#define CPPUNIT_EXTRACT_EXCEPTION_TYPE_( exception, no_rtti_message ) \ - std::string( no_rtti_message ) -#endif // CPPUNIT_USE_TYPEINFO_NAME - -// implementation detail -#define CPPUNIT_GET_PARAMETER_STRING( parameter ) #parameter - -/** Asserts that the given expression throws an exception of the specified type, - * setting a user supplied message in case of failure. - * \ingroup Assertions - * Example of usage: - * \code - * std::vector v; - * CPPUNIT_ASSERT_THROW_MESSAGE( "- std::vector v;", v.at( 50 ), std::out_of_range ); - * \endcode - */ -# define CPPUNIT_ASSERT_THROW_MESSAGE( message, expression, ExceptionType ) \ - do { \ - bool cpputCorrectExceptionThrown_ = false; \ - CPPUNIT_NS::Message cpputMsg_( "expected exception not thrown" ); \ - cpputMsg_.addDetail( message ); \ - cpputMsg_.addDetail( "Expected: " \ - CPPUNIT_GET_PARAMETER_STRING( ExceptionType ) ); \ - \ - try { \ - expression; \ - } catch ( const ExceptionType & ) { \ - cpputCorrectExceptionThrown_ = true; \ - } catch ( const std::exception &e) { \ - cpputMsg_.addDetail( "Actual : " + \ - CPPUNIT_EXTRACT_EXCEPTION_TYPE_( e, \ - "std::exception or derived") ); \ - cpputMsg_.addDetail( std::string("What() : ") + e.what() ); \ - } catch ( ... ) { \ - cpputMsg_.addDetail( "Actual : unknown."); \ - } \ - \ - if ( cpputCorrectExceptionThrown_ ) \ - break; \ - \ - CPPUNIT_NS::Asserter::fail( cpputMsg_, \ - CPPUNIT_SOURCELINE() ); \ - } while ( false ) - - -/** Asserts that the given expression does not throw any exceptions. - * \ingroup Assertions - * Example of usage: - * \code - * std::vector v; - * v.push_back( 10 ); - * CPPUNIT_ASSERT_NO_THROW( v.at( 0 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_NO_THROW( expression ) \ - CPPUNIT_ASSERT_NO_THROW_MESSAGE( CPPUNIT_NS::AdditionalMessage(), \ - expression ) - - -/** Asserts that the given expression does not throw any exceptions, - * setting a user supplied message in case of failure. - * \ingroup Assertions - * Example of usage: - * \code - * std::vector v; - * v.push_back( 10 ); - * CPPUNIT_ASSERT_NO_THROW( "std::vector v;", v.at( 0 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_NO_THROW_MESSAGE( message, expression ) \ - do { \ - CPPUNIT_NS::Message cpputMsg_( "unexpected exception caught" ); \ - cpputMsg_.addDetail( message ); \ - \ - try { \ - expression; \ - } catch ( const std::exception &e ) { \ - cpputMsg_.addDetail( "Caught: " + \ - CPPUNIT_EXTRACT_EXCEPTION_TYPE_( e, \ - "std::exception or derived" ) ); \ - cpputMsg_.addDetail( std::string("What(): ") + e.what() ); \ - CPPUNIT_NS::Asserter::fail( cpputMsg_, \ - CPPUNIT_SOURCELINE() ); \ - } catch ( ... ) { \ - cpputMsg_.addDetail( "Caught: unknown." ); \ - CPPUNIT_NS::Asserter::fail( cpputMsg_, \ - CPPUNIT_SOURCELINE() ); \ - } \ - } while ( false ) - - -/** Asserts that an assertion fail. - * \ingroup Assertions - * Use to test assertions. - * Example of usage: - * \code - * CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT( 1 == 2 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_ASSERTION_FAIL( assertion ) \ - CPPUNIT_ASSERT_THROW( assertion, CPPUNIT_NS::Exception ) - - -/** Asserts that an assertion fail, with a user-supplied message in - * case of error. - * \ingroup Assertions - * Use to test assertions. - * Example of usage: - * \code - * CPPUNIT_ASSERT_ASSERTION_FAIL_MESSAGE( "1 == 2", CPPUNIT_ASSERT( 1 == 2 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_ASSERTION_FAIL_MESSAGE( message, assertion ) \ - CPPUNIT_ASSERT_THROW_MESSAGE( message, assertion, CPPUNIT_NS::Exception ) - - -/** Asserts that an assertion pass. - * \ingroup Assertions - * Use to test assertions. - * Example of usage: - * \code - * CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( 1 == 1 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_ASSERTION_PASS( assertion ) \ - CPPUNIT_ASSERT_NO_THROW( assertion ) - - -/** Asserts that an assertion pass, with a user-supplied message in - * case of failure. - * \ingroup Assertions - * Use to test assertions. - * Example of usage: - * \code - * CPPUNIT_ASSERT_ASSERTION_PASS_MESSAGE( "1 != 1", CPPUNIT_ASSERT( 1 == 1 ) ); - * \endcode - */ -# define CPPUNIT_ASSERT_ASSERTION_PASS_MESSAGE( message, assertion ) \ - CPPUNIT_ASSERT_NO_THROW_MESSAGE( message, assertion ) - - - - -// Backwards compatibility - -#if CPPUNIT_ENABLE_NAKED_ASSERT - -#undef assert -#define assert(c) CPPUNIT_ASSERT(c) -#define assertEqual(e,a) CPPUNIT_ASSERT_EQUAL(e,a) -#define assertDoublesEqual(e,a,d) CPPUNIT_ASSERT_DOUBLES_EQUAL(e,a,d) -#define assertLongsEqual(e,a) CPPUNIT_ASSERT_EQUAL(e,a) - -#endif - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTASSERT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCaller.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCaller.h deleted file mode 100644 index dc4d82ed..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCaller.h +++ /dev/null @@ -1,204 +0,0 @@ -#ifndef CPPUNIT_TESTCALLER_H // -*- C++ -*- -#define CPPUNIT_TESTCALLER_H - -#include -#include - - -#if CPPUNIT_USE_TYPEINFO_NAME -# include -#endif - - -CPPUNIT_NS_BEGIN - -#if 0 -/*! \brief Marker class indicating that no exception is expected by TestCaller. - * This class is an implementation detail. You should never use this class directly. - */ -class CPPUNIT_API NoExceptionExpected -{ -private: - //! Prevent class instantiation. - NoExceptionExpected(); -}; - - -/*! \brief (Implementation) Traits used by TestCaller to expect an exception. - * - * This class is an implementation detail. You should never use this class directly. - */ -template -struct ExpectedExceptionTraits -{ - static void expectedException() - { -#if CPPUNIT_USE_TYPEINFO_NAME - throw Exception( Message( - "expected exception not thrown", - "Expected exception type: " + - TypeInfoHelper::getClassName( typeid( ExceptionType ) ) ) ); -#else - throw Exception( "expected exception not thrown" ); -#endif - } -}; - - -/*! \brief (Implementation) Traits specialization used by TestCaller to - * expect no exception. - * - * This class is an implementation detail. You should never use this class directly. - */ -template<> -struct ExpectedExceptionTraits -{ - static void expectedException() - { - } -}; - - -#endif - -//*** FIXME: rework this when class Fixture is implemented. ***// - - -/*! \brief Generate a test case from a fixture method. - * \ingroup WritingTestFixture - * - * A test caller provides access to a test case method - * on a test fixture class. Test callers are useful when - * you want to run an individual test or add it to a - * suite. - * Test Callers invoke only one Test (i.e. test method) on one - * Fixture of a TestFixture. - * - * Here is an example: - * \code - * class MathTest : public CppUnit::TestFixture { - * ... - * public: - * void setUp(); - * void tearDown(); - * - * void testAdd(); - * void testSubtract(); - * }; - * - * CppUnit::Test *MathTest::suite() { - * CppUnit::TestSuite *suite = new CppUnit::TestSuite; - * - * suite->addTest( new CppUnit::TestCaller( "testAdd", testAdd ) ); - * return suite; - * } - * \endcode - * - * You can use a TestCaller to bind any test method on a TestFixture - * class, as long as it accepts void and returns void. - * - * \see TestCase - */ - -template -class TestCaller : public TestCase -{ - typedef void (Fixture::*TestMethod)(); - -public: - /*! - * Constructor for TestCaller. This constructor builds a new Fixture - * instance owned by the TestCaller. - * \param name name of this TestCaller - * \param test the method this TestCaller calls in runTest() - */ - TestCaller( std::string name, TestMethod test ) : - TestCase( name ), - m_ownFixture( true ), - m_fixture( new Fixture() ), - m_test( test ) - { - } - - /*! - * Constructor for TestCaller. - * This constructor does not create a new Fixture instance but accepts - * an existing one as parameter. The TestCaller will not own the - * Fixture object. - * \param name name of this TestCaller - * \param test the method this TestCaller calls in runTest() - * \param fixture the Fixture to invoke the test method on. - */ - TestCaller(std::string name, TestMethod test, Fixture& fixture) : - TestCase( name ), - m_ownFixture( false ), - m_fixture( &fixture ), - m_test( test ) - { - } - - /*! - * Constructor for TestCaller. - * This constructor does not create a new Fixture instance but accepts - * an existing one as parameter. The TestCaller will own the - * Fixture object and delete it in its destructor. - * \param name name of this TestCaller - * \param test the method this TestCaller calls in runTest() - * \param fixture the Fixture to invoke the test method on. - */ - TestCaller(std::string name, TestMethod test, Fixture* fixture) : - TestCase( name ), - m_ownFixture( true ), - m_fixture( fixture ), - m_test( test ) - { - } - - ~TestCaller() - { - if (m_ownFixture) - delete m_fixture; - } - - void runTest() - { -// try { - (m_fixture->*m_test)(); -// } -// catch ( ExpectedException & ) { -// return; -// } - -// ExpectedExceptionTraits::expectedException(); - } - - void setUp() - { - m_fixture->setUp (); - } - - void tearDown() - { - m_fixture->tearDown (); - } - - std::string toString() const - { - return "TestCaller " + getName(); - } - -private: - TestCaller( const TestCaller &other ); - TestCaller &operator =( const TestCaller &other ); - -private: - bool m_ownFixture; - Fixture *m_fixture; - TestMethod m_test; -}; - - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTCALLER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCase.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCase.h deleted file mode 100644 index d4b7a46a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestCase.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef CPPUNIT_TESTCASE_H -#define CPPUNIT_TESTCASE_H - -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -class TestResult; - - -/*! \brief A single test object. - * - * This class is used to implement a simple test case: define a subclass - * that overrides the runTest method. - * - * You don't usually need to use that class, but TestFixture and TestCaller instead. - * - * You are expected to subclass TestCase is you need to write a class similiar - * to TestCaller. - */ -class CPPUNIT_API TestCase : public TestLeaf, - public TestFixture -{ -public: - - TestCase( const std::string &name ); - - TestCase(); - - ~TestCase(); - - virtual void run(TestResult *result); - - std::string getName() const; - - //! FIXME: this should probably be pure virtual. - virtual void runTest(); - -private: - TestCase( const TestCase &other ); - TestCase &operator=( const TestCase &other ); - -private: - const std::string m_name; -}; - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTCASE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestComposite.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestComposite.h deleted file mode 100644 index 0ded95fc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestComposite.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef CPPUNIT_TESTCOMPSITE_H // -*- C++ -*- -#define CPPUNIT_TESTCOMPSITE_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -/*! \brief A Composite of Tests. - * - * Base class for all test composites. Subclass this class if you need to implement - * a custom TestSuite. - * - * \see Test, TestSuite. - */ -class CPPUNIT_API TestComposite : public Test -{ -public: - TestComposite( const std::string &name = "" ); - - ~TestComposite(); - - void run( TestResult *result ); - - int countTestCases() const; - - std::string getName() const; - -private: - TestComposite( const TestComposite &other ); - TestComposite &operator =( const TestComposite &other ); - - virtual void doStartSuite( TestResult *controller ); - virtual void doRunChildTests( TestResult *controller ); - virtual void doEndSuite( TestResult *controller ); - -private: - const std::string m_name; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTCOMPSITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFailure.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFailure.h deleted file mode 100644 index 64199790..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFailure.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CPPUNIT_TESTFAILURE_H // -*- C++ -*- -#define CPPUNIT_TESTFAILURE_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -class Exception; -class SourceLine; -class Test; - - -/*! \brief Record of a failed Test execution. - * \ingroup BrowsingCollectedTestResult - * - * A TestFailure collects a failed test together with - * the caught exception. - * - * TestFailure assumes lifetime control for any exception - * passed to it. - */ -class CPPUNIT_API TestFailure -{ -public: - TestFailure( Test *failedTest, - Exception *thrownException, - bool isError ); - - virtual ~TestFailure (); - - virtual Test *failedTest() const; - - virtual Exception *thrownException() const; - - virtual SourceLine sourceLine() const; - - virtual bool isError() const; - - virtual std::string failedTestName() const; - - virtual TestFailure *clone() const; - -protected: - Test *m_failedTest; - Exception *m_thrownException; - bool m_isError; - -private: - TestFailure( const TestFailure &other ); - TestFailure &operator =( const TestFailure& other ); -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTFAILURE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFixture.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFixture.h deleted file mode 100644 index 1223adbc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestFixture.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef CPPUNIT_TESTFIXTURE_H // -*- C++ -*- -#define CPPUNIT_TESTFIXTURE_H - -#include - -CPPUNIT_NS_BEGIN - - -/*! \brief Wraps a test case with setUp and tearDown methods. - * \ingroup WritingTestFixture - * - * A TestFixture is used to provide a common environment for a set - * of test cases. - * - * To define a test fixture, do the following: - * - implement a subclass of TestCase - * - the fixture is defined by instance variables - * - initialize the fixture state by overriding setUp - * (i.e. construct the instance variables of the fixture) - * - clean-up after a test by overriding tearDown. - * - * Each test runs in its own fixture so there - * can be no side effects among test runs. - * Here is an example: - * - * \code - * class MathTest : public CppUnit::TestFixture { - * protected: - * int m_value1, m_value2; - * - * public: - * MathTest() {} - * - * void setUp () { - * m_value1 = 2; - * m_value2 = 3; - * } - * } - * \endcode - * - * For each test implement a method which interacts - * with the fixture. Verify the expected results with assertions specified - * by calling CPPUNIT_ASSERT on the expression you want to test: - * - * \code - * public: - * void testAdd () { - * int result = m_value1 + m_value2; - * CPPUNIT_ASSERT( result == 5 ); - * } - * \endcode - * - * Once the methods are defined you can run them. To do this, use - * a TestCaller. - * - * \code - * CppUnit::Test *test = new CppUnit::TestCaller( "testAdd", - * &MathTest::testAdd ); - * test->run(); - * \endcode - * - * - * The tests to be run can be collected into a TestSuite. - * - * \code - * public: - * static CppUnit::TestSuite *MathTest::suite () { - * CppUnit::TestSuite *suiteOfTests = new CppUnit::TestSuite; - * suiteOfTests->addTest(new CppUnit::TestCaller( - * "testAdd", &MathTest::testAdd)); - * suiteOfTests->addTest(new CppUnit::TestCaller( - * "testDivideByZero", &MathTest::testDivideByZero)); - * return suiteOfTests; - * } - * \endcode - * - * A set of macros have been created for convenience. They are located in HelperMacros.h. - * - * \see TestResult, TestSuite, TestCaller, - * \see CPPUNIT_TEST_SUB_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END, - * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_EXCEPTION, CPPUNIT_TEST_FAIL. - */ -class CPPUNIT_API TestFixture -{ -public: - virtual ~TestFixture() {}; - - //! \brief Set up context before running a test. - virtual void setUp() {}; - - //! Clean up after the test run. - virtual void tearDown() {}; -}; - - -CPPUNIT_NS_END - - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestLeaf.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestLeaf.h deleted file mode 100644 index c83b0759..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestLeaf.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef CPPUNIT_TESTLEAF_H -#define CPPUNIT_TESTLEAF_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief A single test object. - * - * Base class for single test case: a test that doesn't have any children. - * - */ -class CPPUNIT_API TestLeaf: public Test -{ -public: - /*! Returns 1 as the default number of test cases invoked by run(). - * - * You may override this method when many test cases are invoked (RepeatedTest - * for example). - * - * \return 1. - * \see Test::countTestCases(). - */ - int countTestCases() const; - - /*! Returns the number of child of this test case: 0. - * - * You should never override this method: a TestLeaf as no children by definition. - * - * \return 0. - */ - int getChildTestCount() const; - - /*! Always throws std::out_of_range. - * \see Test::doGetChildTestAt(). - */ - Test *doGetChildTestAt( int index ) const; -}; - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTLEAF_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestListener.h deleted file mode 100644 index 330262d3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestListener.h +++ /dev/null @@ -1,148 +0,0 @@ -#ifndef CPPUNIT_TESTLISTENER_H // -*- C++ -*- -#define CPPUNIT_TESTLISTENER_H - -#include - - -CPPUNIT_NS_BEGIN - - -class Exception; -class Test; -class TestFailure; -class TestResult; - - -/*! \brief Listener for test progress and result. - * \ingroup TrackingTestExecution - * - * Implementing the Observer pattern a TestListener may be registered - * to a TestResult to obtain information on the testing progress. Use - * specialized sub classes of TestListener for text output - * (TextTestProgressListener). Do not use the Listener for the test - * result output, use a subclass of Outputter instead. - * - * The test framework distinguishes between failures and errors. - * A failure is anticipated and checked for with assertions. Errors are - * unanticipated problems signified by exceptions that are not generated - * by the framework. - * - * Here is an example to track test time: - * - * - * \code - * #include - * #include - * #include // for clock() - * - * class TimingListener : public CppUnit::TestListener - * { - * public: - * void startTest( CppUnit::Test *test ) - * { - * _chronometer.start(); - * } - * - * void endTest( CppUnit::Test *test ) - * { - * _chronometer.end(); - * addTest( test, _chronometer.elapsedTime() ); - * } - * - * // ... (interface to add/read test timing result) - * - * private: - * Clock _chronometer; - * }; - * \endcode - * - * And another example that track failure/success at test suite level and captures - * the TestPath of each suite: - * \code - * class SuiteTracker : public CppUnit::TestListener - * { - * public: - * void startSuite( CppUnit::Test *suite ) - * { - * m_currentPath.add( suite ); - * } - * - * void addFailure( const TestFailure &failure ) - * { - * m_suiteFailure.top() = false; - * } - * - * void endSuite( CppUnit::Test *suite ) - * { - * m_suiteStatus.insert( std::make_pair( suite, m_suiteFailure.top() ) ); - * m_suitePaths.insert( std::make_pair( suite, m_currentPath ) ); - * - * m_currentPath.up(); - * m_suiteFailure.pop(); - * } - * - * private: - * std::stack m_suiteFailure; - * CppUnit::TestPath m_currentPath; - * std::map m_suiteStatus; - * std::map m_suitePaths; - * }; - * \endcode - * - * \see TestResult - */ -class CPPUNIT_API TestListener -{ -public: - virtual ~TestListener() {} - - /// Called when just before a TestCase is run. - virtual void startTest( Test * /*test*/ ) {} - - /*! \brief Called when a failure occurs while running a test. - * \see TestFailure. - * \warning \a failure is a temporary object that is destroyed after the - * method call. Use TestFailure::clone() to create a duplicate. - */ - virtual void addFailure( const TestFailure & /*failure*/ ) {} - - /// Called just after a TestCase was run (even if a failure occured). - virtual void endTest( Test * /*test*/ ) {} - - /*! \brief Called by a TestComposite just before running its child tests. - */ - virtual void startSuite( Test * /*suite*/ ) {} - - /*! \brief Called by a TestComposite after running its child tests. - */ - virtual void endSuite( Test * /*suite*/ ) {} - - /*! \brief Called by a TestRunner before running the test. - * - * You can use this to do some global initialisation. A listener - * could also use to output a 'prolog' to the test run. - * - * \param test Test that is going to be run. - * \param eventManager Event manager used for the test run. - */ - virtual void startTestRun( Test * /*test*/, - TestResult * /*eventManager*/ ) {} - - /*! \brief Called by a TestRunner after running the test. - * - * TextTestProgressListener use this to emit a line break. You can also use this - * to do some global uninitialisation. - * - * \param test Test that was run. - * \param eventManager Event manager used for the test run. - */ - virtual void endTestRun( Test * /*test*/, - TestResult * /*eventManager*/ ) {} -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTLISTENER_H - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestPath.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestPath.h deleted file mode 100644 index c3c851cc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestPath.h +++ /dev/null @@ -1,211 +0,0 @@ -#ifndef CPPUNIT_TESTPATH_H -#define CPPUNIT_TESTPATH_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include - -CPPUNIT_NS_BEGIN - - -class Test; - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::deque; -#endif - - -/*! \brief A List of Test representing a path to access a Test. - * \ingroup ExecutingTest - * - * The path can be converted to a string and resolved from a string with toString() - * and TestPath( Test *root, const std::string &pathAsString ). - * - * Pointed tests are not owned by the class. - * - * \see Test::resolvedTestPath() - */ -class CPPUNIT_API TestPath -{ -public: - /*! \brief Constructs an invalid path. - * - * The path is invalid until a test is added with add(). - */ - TestPath(); - - /*! \brief Constructs a valid path. - * - * \param root Test to add. - */ - TestPath( Test *root ); - - /*! \brief Constructs a path using a slice of another path. - * \param otherPath Path the test are copied from. - * \param indexFirst Zero based index of the first test to copy. Adjusted to be in valid - * range. \a count is adjusted with \a indexFirst. - * \param count Number of tests to copy. If < 0 then all test starting from index - * \a indexFirst are copied. - */ - TestPath( const TestPath &otherPath, - int indexFirst, - int count = -1 ); - - /*! \brief Resolves a path from a string returned by toString(). - * - * If \a pathAsString is an absolute path (begins with '/'), then the first test name - * of the path must be the name of \a searchRoot. Otherwise, \a pathAsString is a - * relative path, and the first test found using Test::findTest() matching the first - * test name is used as root. An empty string resolve to a path containing - * \a searchRoot. - * - * The resolved path is always valid. - * - * \param searchRoot Test used to resolve the path. - * \param pathAsString String that contains the path as a string created by toString(). - * \exception std::invalid_argument if one of the test names can not be resolved. - * \see toString(). - */ - TestPath( Test *searchRoot, - const std::string &pathAsString ); - - /*! \brief Copy constructor. - * \param other Object to copy. - */ - TestPath( const TestPath &other ); - - virtual ~TestPath(); - - /*! \brief Tests if the path contains at least one test. - * \return \c true if the path contains at least one test, otherwise returns \c false. - */ - virtual bool isValid() const; - - /*! \brief Adds a test to the path. - * \param test Pointer on the test to add. Must not be \c NULL. - */ - virtual void add( Test *test ); - - /*! \brief Adds all the tests of the specified path. - * \param path Path that contains the test to add. - */ - virtual void add( const TestPath &path ); - - /*! \brief Inserts a test at the specified index. - * \param test Pointer on the test to insert. Must not be \c NULL. - * \param index Zero based index indicating where the test is inserted. - * \exception std::out_of_range is \a index < 0 or \a index > getTestCount(). - */ - virtual void insert( Test *test, int index ); - - /*! \brief Inserts all the tests at the specified path at a given index. - * \param path Path that contains the test to insert. - * \param index Zero based index indicating where the tests are inserted. - * \exception std::out_of_range is \a index < 0 or \a index > getTestCount(), and - * \a path is valid. - */ - virtual void insert( const TestPath &path, int index ); - - /*! \brief Removes all the test from the path. - * - * The path becomes invalid after this call. - */ - virtual void removeTests(); - - /*! \brief Removes the test at the specified index of the path. - * \param index Zero based index of the test to remove. - * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount(). - */ - virtual void removeTest( int index ); - - /*! \brief Removes the last test. - * \exception std::out_of_range is the path is invalid. - * \see isValid(). - */ - virtual void up(); - - /*! \brief Returns the number of tests in the path. - * \return Number of tests in the path. - */ - virtual int getTestCount() const; - - /*! \brief Returns the test of the specified index. - * \param index Zero based index of the test to return. - * \return Pointer on the test at index \a index. Never \c NULL. - * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount(). - */ - virtual Test *getTestAt( int index ) const; - - /*! \brief Get the last test of the path. - * \return Pointer on the last test (test at the bottom of the hierarchy). Never \c NULL. - * \exception std::out_of_range if the path is not valid ( isValid() returns \c false ). - */ - virtual Test *getChildTest() const; - - /*! \brief Returns the path as a string. - * - * For example, if a path is composed of three tests named "All Tests", "Math" and - * "Math::testAdd", toString() will return: - * - * "All Tests/Math/Math::testAdd". - * - * \return A string composed of the test names separated with a '/'. It is a relative - * path. - */ - virtual std::string toString() const; - - /*! \brief Assignment operator. - * \param other Object to copy. - * \return This object. - */ - TestPath &operator =( const TestPath &other ); - -protected: - /*! \brief Checks that the specified test index is within valid range. - * \param index Zero based index to check. - * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount(). - */ - void checkIndexValid( int index ) const; - - /// A list of test names. - typedef CppUnitDeque PathTestNames; - - /*! \brief Splits a path string into its test name components. - * \param pathAsString Path string created with toString(). - * \param testNames Test name components are added to that container. - * \return \c true if the path is relative (does not begin with '/'), \c false - * if it is absolute (begin with '/'). - */ - bool splitPathString( const std::string &pathAsString, - PathTestNames &testNames ); - - /*! \brief Finds the actual root of a path string and get the path string name components. - * \param searchRoot Test used as root if the path string is absolute, or to search - * the root test if the path string is relative. - * \param pathAsString Path string. May be absolute or relative. - * \param testNames Test name components are added to that container. - * \return Pointer on the resolved root test. Never \c NULL. - * \exception std::invalid_argument if either the root name can not be resolved or if - * pathAsString contains no name components. - */ - Test *findActualRoot( Test *searchRoot, - const std::string &pathAsString, - PathTestNames &testNames ); - -protected: - typedef CppUnitDeque Tests; - Tests m_tests; - -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTPATH_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResult.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResult.h deleted file mode 100644 index e7e1050a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResult.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef CPPUNIT_TESTRESULT_H -#define CPPUNIT_TESTRESULT_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class Exception; -class Functor; -class Protector; -class ProtectorChain; -class Test; -class TestFailure; -class TestListener; - - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::deque; -#endif - -/*! \brief Manages TestListener. - * \ingroup TrackingTestExecution - * - * A single instance of this class is used when running the test. It is usually - * created by the test runner (TestRunner). - * - * This class shouldn't have to be inherited from. Use a TestListener - * or one of its subclasses to be informed of the ongoing tests. - * Use a Outputter to receive a test summary once it has finished - * - * TestResult supplies a template method 'setSynchronizationObject()' - * so that subclasses can provide mutual exclusion in the face of multiple - * threads. This can be useful when tests execute in one thread and - * they fill a subclass of TestResult which effects change in another - * thread. To have mutual exclusion, override setSynchronizationObject() - * and make sure that you create an instance of ExclusiveZone at the - * beginning of each method. - * - * \see Test, TestListener, TestResultCollector, Outputter. - */ -class CPPUNIT_API TestResult : protected SynchronizedObject -{ -public: - /// Construct a TestResult - TestResult( SynchronizationObject *syncObject = 0 ); - - /// Destroys a test result - virtual ~TestResult(); - - virtual void addListener( TestListener *listener ); - - virtual void removeListener( TestListener *listener ); - - /// Resets the stop flag. - virtual void reset(); - - /// Stop testing - virtual void stop(); - - /// Returns whether testing should be stopped - virtual bool shouldStop() const; - - /// Informs TestListener that a test will be started. - virtual void startTest( Test *test ); - - /*! \brief Adds an error to the list of errors. - * The passed in exception - * caused the error - */ - virtual void addError( Test *test, Exception *e ); - - /*! \brief Adds a failure to the list of failures. The passed in exception - * caused the failure. - */ - virtual void addFailure( Test *test, Exception *e ); - - /// Informs TestListener that a test was completed. - virtual void endTest( Test *test ); - - /// Informs TestListener that a test suite will be started. - virtual void startSuite( Test *test ); - - /// Informs TestListener that a test suite was completed. - virtual void endSuite( Test *test ); - - /*! \brief Run the specified test. - * - * Calls startTestRun(), test->run(this), and finally endTestRun(). - */ - virtual void runTest( Test *test ); - - /*! \brief Protects a call to the specified functor. - * - * See Protector to understand how protector works. A default protector is - * always present. It captures CppUnit::Exception, std::exception and - * any other exceptions, retrieving as much as possible information about - * the exception as possible. - * - * Additional Protector can be added to the chain to support other exception - * types using pushProtector() and popProtector(). - * - * \param functor Functor to call (typically a call to setUp(), runTest() or - * tearDown(). - * \param test Test the functor is associated to (used for failure reporting). - * \param shortDescription Short description override for the failure message. - */ - virtual bool protect( const Functor &functor, - Test *test, - const std::string &shortDescription = std::string("") ); - - /// Adds the specified protector to the protector chain. - virtual void pushProtector( Protector *protector ); - - /// Removes the last protector from the protector chain. - virtual void popProtector(); - -protected: - /*! \brief Called to add a failure to the list of failures. - */ - void addFailure( const TestFailure &failure ); - - virtual void startTestRun( Test *test ); - virtual void endTestRun( Test *test ); - -protected: - typedef CppUnitDeque TestListeners; - TestListeners m_listeners; - ProtectorChain *m_protectorChain; - bool m_stop; - -private: - TestResult( const TestResult &other ); - TestResult &operator =( const TestResult &other ); -}; - - -CPPUNIT_NS_END - - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - -#endif // CPPUNIT_TESTRESULT_H - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResultCollector.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResultCollector.h deleted file mode 100644 index 01b0a547..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestResultCollector.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H -#define CPPUNIT_TESTRESULTCOLLECTOR_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 4660 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include - - -CPPUNIT_NS_BEGIN - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::deque; -// template class CPPUNIT_API std::deque; -#endif - - -/*! \brief Collects test result. - * \ingroup WritingTestResult - * \ingroup BrowsingCollectedTestResult - * - * A TestResultCollector is a TestListener which collects the results of executing - * a test case. It is an instance of the Collecting Parameter pattern. - * - * The test framework distinguishes between failures and errors. - * A failure is anticipated and checked for with assertions. Errors are - * unanticipated problems signified by exceptions that are not generated - * by the framework. - * \see TestListener, TestFailure. - */ -class CPPUNIT_API TestResultCollector : public TestSuccessListener -{ -public: - typedef CppUnitDeque TestFailures; - typedef CppUnitDeque Tests; - - - /*! Constructs a TestResultCollector object. - */ - TestResultCollector( SynchronizationObject *syncObject = 0 ); - - /// Destructor. - virtual ~TestResultCollector(); - - void startTest( Test *test ); - void addFailure( const TestFailure &failure ); - - virtual void reset(); - - virtual int runTests() const; - virtual int testErrors() const; - virtual int testFailures() const; - virtual int testFailuresTotal() const; - - virtual const TestFailures& failures() const; - virtual const Tests &tests() const; - -protected: - void freeFailures(); - - Tests m_tests; - TestFailures m_failures; - int m_testErrors; - -private: - /// Prevents the use of the copy constructor. - TestResultCollector( const TestResultCollector © ); - - /// Prevents the use of the copy operator. - void operator =( const TestResultCollector © ); -}; - - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -#endif // CPPUNIT_TESTRESULTCOLLECTOR_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestRunner.h deleted file mode 100644 index 930370ad..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestRunner.h +++ /dev/null @@ -1,135 +0,0 @@ -#ifndef CPPUNIT_TESTRUNNER_H -#define CPPUNIT_TESTRUNNER_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -class Test; -class TestResult; - - -/*! \brief Generic test runner. - * \ingroup ExecutingTest - * - * The TestRunner assumes ownership of all added tests: you can not add test - * or suite that are local variable since they can't be deleted. - * - * Example of usage: - * \code - * #include - * #include - * #include - * #include - * #include - * #include - * - * - * int - * main( int argc, char* argv[] ) - * { - * std::string testPath = (argc > 1) ? std::string(argv[1]) : ""; - * - * // Create the event manager and test controller - * CppUnit::TestResult controller; - * - * // Add a listener that colllects test result - * CppUnit::TestResultCollector result; - * controller.addListener( &result ); - * - * // Add a listener that print dots as test run. - * CppUnit::TextTestProgressListener progress; - * controller.addListener( &progress ); - * - * // Add the top suite to the test runner - * CppUnit::TestRunner runner; - * runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); - * try - * { - * std::cout << "Running " << testPath; - * runner.run( controller, testPath ); - * - * std::cerr << std::endl; - * - * // Print test in a compiler compatible format. - * CppUnit::CompilerOutputter outputter( &result, std::cerr ); - * outputter.write(); - * } - * catch ( std::invalid_argument &e ) // Test path not resolved - * { - * std::cerr << std::endl - * << "ERROR: " << e.what() - * << std::endl; - * return 0; - * } - * - * return result.wasSuccessful() ? 0 : 1; - * } - * \endcode - */ -class CPPUNIT_API TestRunner -{ -public: - /*! \brief Constructs a TestRunner object. - */ - TestRunner( ); - - /// Destructor. - virtual ~TestRunner(); - - /*! \brief Adds the specified test. - * \param test Test to add. The TestRunner takes ownership of the test. - */ - virtual void addTest( Test *test ); - - /*! \brief Runs a test using the specified controller. - * \param controller Event manager and controller used for testing - * \param testPath Test path string. See Test::resolveTestPath() for detail. - * \exception std::invalid_argument if no test matching \a testPath is found. - * see TestPath::TestPath( Test*, const std::string &) - * for detail. - */ - virtual void run( TestResult &controller, - const std::string &testPath = "" ); - -protected: - /*! \brief (INTERNAL) Mutating test suite. - */ - class CPPUNIT_API WrappingSuite : public TestSuite - { - public: - WrappingSuite( const std::string &name = "All Tests" ); - - int getChildTestCount() const; - - std::string getName() const; - - void run( TestResult *result ); - - protected: - Test *doGetChildTestAt( int index ) const; - - bool hasOnlyOneTest() const; - - Test *getUniqueChildTest() const; - }; - -protected: - WrappingSuite *m_suite; - -private: - /// Prevents the use of the copy constructor. - TestRunner( const TestRunner © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunner © ); - -private: -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuccessListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuccessListener.h deleted file mode 100644 index 60c5ff50..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuccessListener.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef CPPUNIT_TESTSUCCESSLISTENER_H -#define CPPUNIT_TESTSUCCESSLISTENER_H - -#include -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief TestListener that checks if any test case failed. - * \ingroup TrackingTestExecution - */ -class CPPUNIT_API TestSuccessListener : public TestListener, - public SynchronizedObject -{ -public: - /*! Constructs a TestSuccessListener object. - */ - TestSuccessListener( SynchronizationObject *syncObject = 0 ); - - /// Destructor. - virtual ~TestSuccessListener(); - - virtual void reset(); - - void addFailure( const TestFailure &failure ); - - /// Returns whether the entire test was successful or not. - virtual bool wasSuccessful() const; - -private: - bool m_success; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TESTSUCCESSLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuite.h deleted file mode 100644 index 2b9cd8d4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TestSuite.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef CPPUNIT_TESTSUITE_H // -*- C++ -*- -#define CPPUNIT_TESTSUITE_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include - -CPPUNIT_NS_BEGIN - - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::vector; -#endif - - -/*! \brief A Composite of Tests. - * \ingroup CreatingTestSuite - * - * It runs a collection of test cases. Here is an example. - * \code - * CppUnit::TestSuite *suite= new CppUnit::TestSuite(); - * suite->addTest(new CppUnit::TestCaller ( - * "testAdd", testAdd)); - * suite->addTest(new CppUnit::TestCaller ( - * "testDivideByZero", testDivideByZero)); - * \endcode - * Note that \link TestSuite TestSuites \endlink assume lifetime - * control for any tests added to them. - * - * TestSuites do not register themselves in the TestRegistry. - * \see Test - * \see TestCaller - */ -class CPPUNIT_API TestSuite : public TestComposite -{ -public: - /*! Constructs a test suite with the specified name. - */ - TestSuite( std::string name = "" ); - - ~TestSuite(); - - /*! Adds the specified test to the suite. - * \param test Test to add. Must not be \c NULL. - */ - void addTest( Test *test ); - - /*! Returns the list of the tests (DEPRECATED). - * \deprecated Use getChildTestCount() & getChildTestAt() of the - * TestComposite interface instead. - * \return Reference on a vector that contains the tests of the suite. - */ - const CppUnitVector &getTests() const; - - /*! Destroys all the tests of the suite. - */ - virtual void deleteContents(); - - int getChildTestCount() const; - - Test *doGetChildTestAt( int index ) const; - -private: - CppUnitVector m_tests; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - -#endif // CPPUNIT_TESTSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextOutputter.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextOutputter.h deleted file mode 100644 index 6bd9ceaa..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextOutputter.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef CPPUNIT_TEXTOUTPUTTER_H -#define CPPUNIT_TEXTOUTPUTTER_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class Exception; -class SourceLine; -class TestResultCollector; -class TestFailure; - - -/*! \brief Prints a TestResultCollector to a text stream. - * \ingroup WritingTestResult - */ -class CPPUNIT_API TextOutputter : public Outputter -{ -public: - TextOutputter( TestResultCollector *result, - OStream &stream ); - - /// Destructor. - virtual ~TextOutputter(); - - void write(); - virtual void printFailures(); - virtual void printHeader(); - - virtual void printFailure( TestFailure *failure, - int failureNumber ); - virtual void printFailureListMark( int failureNumber ); - virtual void printFailureTestName( TestFailure *failure ); - virtual void printFailureType( TestFailure *failure ); - virtual void printFailureLocation( SourceLine sourceLine ); - virtual void printFailureDetail( Exception *thrownException ); - virtual void printFailureWarning(); - virtual void printStatistics(); - -protected: - TestResultCollector *m_result; - OStream &m_stream; - -private: - /// Prevents the use of the copy constructor. - TextOutputter( const TextOutputter © ); - - /// Prevents the use of the copy operator. - void operator =( const TextOutputter © ); -}; - - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TEXTOUTPUTTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestProgressListener.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestProgressListener.h deleted file mode 100644 index 7521c40b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestProgressListener.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef CPPUNIT_TEXTTESTPROGRESSLISTENER_H -#define CPPUNIT_TEXTTESTPROGRESSLISTENER_H - -#include - - -CPPUNIT_NS_BEGIN - - -/*! - * \brief TestListener that show the status of each TestCase test result. - * \ingroup TrackingTestExecution - */ -class CPPUNIT_API TextTestProgressListener : public TestListener -{ -public: - /*! Constructs a TextTestProgressListener object. - */ - TextTestProgressListener(); - - /// Destructor. - virtual ~TextTestProgressListener(); - - void startTest( Test *test ); - - void addFailure( const TestFailure &failure ); - - void endTestRun( Test *test, - TestResult *eventManager ); - -private: - /// Prevents the use of the copy constructor. - TextTestProgressListener( const TextTestProgressListener © ); - - /// Prevents the use of the copy operator. - void operator =( const TextTestProgressListener © ); - -private: -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TEXTTESTPROGRESSLISTENER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestResult.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestResult.h deleted file mode 100644 index e7b1fa3e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestResult.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef CPPUNIT_TEXTTESTRESULT_H -#define CPPUNIT_TEXTTESTRESULT_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class SourceLine; -class Exception; -class Test; - -/*! \brief Holds printable test result (DEPRECATED). - * \ingroup TrackingTestExecution - * - * deprecated Use class TextTestProgressListener and TextOutputter instead. - */ -class CPPUNIT_API TextTestResult : public TestResult, - public TestResultCollector -{ -public: - TextTestResult(); - - virtual void addFailure( const TestFailure &failure ); - virtual void startTest( Test *test ); - virtual void print( OStream &stream ); -}; - -/** insertion operator for easy output */ -CPPUNIT_API OStream &operator <<( OStream &stream, - TextTestResult &result ); - -CPPUNIT_NS_END - -#endif // CPPUNIT_TEXTTESTRESULT_H - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestRunner.h deleted file mode 100644 index 23890e08..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/TextTestRunner.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CPPUNIT_TEXTTESTRUNNER_H -#define CPPUNIT_TEXTTESTRUNNER_H - -#include - -#endif // CPPUNIT_TEXTTESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputter.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputter.h deleted file mode 100644 index 0de9676d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputter.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef CPPUNIT_XMLTESTRESULTOUTPUTTER_H -#define CPPUNIT_XMLTESTRESULTOUTPUTTER_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -class Test; -class TestFailure; -class TestResultCollector; -class XmlDocument; -class XmlElement; -class XmlOutputterHook; - - -/*! \brief Outputs a TestResultCollector in XML format. - * \ingroup WritingTestResult - * - * Save the test result as a XML stream. - * - * Additional datas can be added to the XML document using XmlOutputterHook. - * Hook are not owned by the XmlOutputter. They should be valid until - * destruction of the XmlOutputter. They can be removed with removeHook(). - * - * \see XmlDocument, XmlElement, XmlOutputterHook. - */ -class CPPUNIT_API XmlOutputter : public Outputter -{ -public: - /*! \brief Constructs a XmlOutputter object. - * \param result Result of the test run. - * \param stream Stream used to output the XML output. - * \param encoding Encoding used in the XML file (default is Latin-1). - */ - XmlOutputter( TestResultCollector *result, - OStream &stream, - std::string encoding = std::string("ISO-8859-1") ); - - /// Destructor. - virtual ~XmlOutputter(); - - /*! \brief Adds the specified hook to the outputter. - * \param hook Hook to add. Must not be \c NULL. - */ - virtual void addHook( XmlOutputterHook *hook ); - - /*! \brief Removes the specified hook from the outputter. - * \param hook Hook to remove. - */ - virtual void removeHook( XmlOutputterHook *hook ); - - /*! \brief Writes the specified result as an XML document to the stream. - * - * Refer to examples/cppunittest/XmlOutputterTest.cpp for example - * of use and XML document structure. - */ - virtual void write(); - - /*! \brief Sets the XSL style sheet used. - * - * \param styleSheet Name of the style sheet used. If empty, then no style sheet - * is used (default). - */ - virtual void setStyleSheet( const std::string &styleSheet ); - - /*! \brief set the output document as standalone or not. - * - * For the output document, specify wether it's a standalone XML - * document, or not. - * - * \param standalone if true, the output will be specified as standalone. - * if false, it will be not. - */ - virtual void setStandalone( bool standalone ); - - typedef CppUnitMap > FailedTests; - - /*! \brief Sets the root element and adds its children. - * - * Set the root element of the XML Document and add its child elements. - * - * For all hooks, call beginDocument() just after creating the root element (it - * is empty at this time), and endDocument() once all the datas have been added - * to the root element. - */ - virtual void setRootNode(); - - virtual void addFailedTests( FailedTests &failedTests, - XmlElement *rootNode ); - - virtual void addSuccessfulTests( FailedTests &failedTests, - XmlElement *rootNode ); - - /*! \brief Adds the statics element to the root node. - * - * Creates a new element containing statistics data and adds it to the root element. - * Then, for all hooks, call statisticsAdded(). - * \param rootNode Root element. - */ - virtual void addStatistics( XmlElement *rootNode ); - - /*! \brief Adds a failed test to the failed tests node. - * Creates a new element containing datas about the failed test, and adds it to - * the failed tests element. - * Then, for all hooks, call failTestAdded(). - */ - virtual void addFailedTest( Test *test, - TestFailure *failure, - int testNumber, - XmlElement *testsNode ); - - virtual void addFailureLocation( TestFailure *failure, - XmlElement *testElement ); - - - /*! \brief Adds a successful test to the successful tests node. - * Creates a new element containing datas about the successful test, and adds it to - * the successful tests element. - * Then, for all hooks, call successfulTestAdded(). - */ - virtual void addSuccessfulTest( Test *test, - int testNumber, - XmlElement *testsNode ); -protected: - virtual void fillFailedTestsMap( FailedTests &failedTests ); - -protected: - typedef CppUnitDeque Hooks; - - TestResultCollector *m_result; - OStream &m_stream; - std::string m_encoding; - std::string m_styleSheet; - XmlDocument *m_xml; - Hooks m_hooks; - -private: - /// Prevents the use of the copy constructor. - XmlOutputter( const XmlOutputter © ); - - /// Prevents the use of the copy operator. - void operator =( const XmlOutputter © ); - -private: -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -#endif // CPPUNIT_XMLTESTRESULTOUTPUTTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputterHook.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputterHook.h deleted file mode 100644 index 5ded3b1e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/XmlOutputterHook.h +++ /dev/null @@ -1,163 +0,0 @@ -#ifndef CPPUNIT_XMLOUTPUTTERHOOK_H -#define CPPUNIT_XMLOUTPUTTERHOOK_H - -#include - - -CPPUNIT_NS_BEGIN - - -class Test; -class TestFailure; -class XmlDocument; -class XmlElement; - - - -/*! \brief Hook to customize Xml output. - * - * XmlOutputterHook can be passed to XmlOutputter to customize the XmlDocument. - * - * Common customizations are: - * - adding some datas to successfull or failed test with - * failTestAdded() and successfulTestAdded(), - * - adding some statistics with statisticsAdded(), - * - adding other datas with beginDocument() or endDocument(). - * - * See examples/ClockerPlugIn which makes use of most the hook. - * - * Another simple example of an outputter hook is shown below. It may be - * used to add some meta information to your result files. In the example, - * the author name as well as the project name and test creation date is - * added to the head of the xml file. - * - * In order to make this information stored within the xml file, the virtual - * member function beginDocument() is overriden where a new - * XmlElement object is created. - * - * This element is simply added to the root node of the document which - * makes the information automatically being stored when the xml file - * is written. - * - * \code - * #include - * #include - * #include - * - * ... - * - * class MyXmlOutputterHook : public CppUnit::XmlOutputterHook - * { - * public: - * MyXmlOutputterHook(const std::string projectName, - * const std::string author) - * { - * m_projectName = projectName; - * m_author = author; - * }; - * - * virtual ~MyXmlOutputterHook() - * { - * }; - * - * void beginDocument(CppUnit::XmlDocument* document) - * { - * if (!document) - * return; - * - * // dump current time - * std::string szDate = CppUnit::StringTools::toString( (int)time(0) ); - * CppUnit::XmlElement* metaEl = new CppUnit::XmlElement("SuiteInfo", - * ""); - * - * metaEl->addElement( new CppUnit::XmlElement("Author", m_author) ); - * metaEl->addElement( new CppUnit::XmlElement("Project", m_projectName) ); - * metaEl->addElement( new CppUnit::XmlElement("Date", szDate ) ); - * - * document->rootElement().addElement(metaEl); - * }; - * private: - * std::string m_projectName; - * std::string m_author; - * }; - * \endcode - * - * Within your application's main code, you need to snap the hook - * object into your xml outputter object like shown below: - * - * \code - * CppUnit::TextUi::TestRunner runner; - * std::ofstream outputFile("testResults.xml"); - * - * CppUnit::XmlOutputter* outputter = new CppUnit::XmlOutputter( &runner.result(), - * outputFile ); - * MyXmlOutputterHook hook("myProject", "meAuthor"); - * outputter->addHook(&hook); - * runner.setOutputter(outputter); - * runner.addTest( VectorFixture::suite() ); - * runner.run(); - * outputFile.close(); - * \endcode - * - * This results into the following output: - * - * \code - * - * - * meAuthor - * myProject - * 1028143912 - * - * - * ... - * \endcode - * - * \see XmlOutputter, CppUnitTestPlugIn. - */ -class CPPUNIT_API XmlOutputterHook -{ -public: - /*! Called before any elements is added to the root element. - * \param document XML Document being created. - */ - virtual void beginDocument( XmlDocument *document ); - - /*! Called after adding all elements to the root element. - * \param document XML Document being created. - */ - virtual void endDocument( XmlDocument *document ); - - /*! Called after adding a fail test element. - * \param document XML Document being created. - * \param testElement \ element. - * \param test Test that failed. - * \param failure Test failure data. - */ - virtual void failTestAdded( XmlDocument *document, - XmlElement *testElement, - Test *test, - TestFailure *failure ); - - /*! Called after adding a successful test element. - * \param document XML Document being created. - * \param testElement \ element. - * \param test Test that was successful. - */ - virtual void successfulTestAdded( XmlDocument *document, - XmlElement *testElement, - Test *test ); - - /*! Called after adding the statistic element. - * \param document XML Document being created. - * \param statisticsElement \ element. - */ - virtual void statisticsAdded( XmlDocument *document, - XmlElement *statisticsElement ); - - virtual ~XmlOutputterHook() {} -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_XMLOUTPUTTERHOOK_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/CppUnitApi.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/CppUnitApi.h deleted file mode 100644 index a068bbd5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/CppUnitApi.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CPPUNIT_CONFIG_CPPUNITAPI -#define CPPUNIT_CONFIG_CPPUNITAPI - -#undef CPPUNIT_API - -#ifdef WIN32 - -// define CPPUNIT_DLL_BUILD when building CppUnit dll. -#ifdef CPPUNIT_BUILD_DLL -#define CPPUNIT_API __declspec(dllexport) -#endif - -// define CPPUNIT_DLL when linking to CppUnit dll. -#ifdef CPPUNIT_DLL -#define CPPUNIT_API __declspec(dllimport) -#endif - -#ifdef CPPUNIT_API -#undef CPPUNIT_NEED_DLL_DECL -#define CPPUNIT_NEED_DLL_DECL 1 -#endif - -#endif - - -#ifndef CPPUNIT_API -#define CPPUNIT_API -#undef CPPUNIT_NEED_DLL_DECL -#define CPPUNIT_NEED_DLL_DECL 0 -#endif - - -#endif // CPPUNIT_CONFIG_CPPUNITAPI diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.am deleted file mode 100644 index 2f0b1f80..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/config - -libcppunitinclude_HEADERS = \ - config-bcb5.h \ - config-evc4.h \ - config-mac.h \ - config-msvc6.h \ - SelectDllLoader.h \ - CppUnitApi.h \ - SourcePrefix.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.in deleted file mode 100644 index 4c21edb9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/Makefile.in +++ /dev/null @@ -1,438 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/config -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/config -libcppunitinclude_HEADERS = \ - config-bcb5.h \ - config-evc4.h \ - config-mac.h \ - config-msvc6.h \ - SelectDllLoader.h \ - CppUnitApi.h \ - SourcePrefix.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/config/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SelectDllLoader.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SelectDllLoader.h deleted file mode 100644 index dc1c0115..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SelectDllLoader.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef CPPUNIT_CONFIG_SELECTDLLLOADER_H -#define CPPUNIT_CONFIG_SELECTDLLLOADER_H - -/*! \file - * Selects DynamicLibraryManager implementation. - * - * Don't include this file directly. Include Portability.h instead. - */ - -/*! - * \def CPPUNIT_NO_TESTPLUGIN - * \brief If defined, then plug-in related classes and functions will not be compiled. - * - * \internal - * CPPUNIT_HAVE_WIN32_DLL_LOADER - * If defined, Win32 implementation of DynamicLibraryManager will be used. - * - * CPPUNIT_HAVE_BEOS_DLL_LOADER - * If defined, BeOs implementation of DynamicLibraryManager will be used. - * - * CPPUNIT_HAVE_UNIX_DLL_LOADER - * If defined, Unix implementation (dlfcn.h) of DynamicLibraryManager will be used. - */ - -/*! - * \def CPPUNIT_PLUGIN_EXPORT - * \ingroup WritingTestPlugIn - * \brief A macro to export a function from a dynamic library - * - * This macro export the C function following it from a dynamic library. - * Exporting the function makes it accessible to the DynamicLibraryManager. - * - * Example of usage: - * \code - * #include - * - * CPPUNIT_PLUGIN_EXPORT CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void) - * { - * ... - * return &myPlugInInterface; - * } - * \endcode - */ - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -// Is WIN32 platform ? -#if defined(WIN32) -#define CPPUNIT_HAVE_WIN32_DLL_LOADER 1 -#undef CPPUNIT_PLUGIN_EXPORT -#define CPPUNIT_PLUGIN_EXPORT extern "C" __declspec(dllexport) - -// Is BeOS platform ? -#elif defined(__BEOS__) -#define CPPUNIT_HAVE_BEOS_DLL_LOADER 1 - -// Is Unix platform and have shl_load() (hp-ux) -#elif defined(CPPUNIT_HAVE_SHL_LOAD) -#define CPPUNIT_HAVE_UNIX_SHL_LOADER 1 - -// Is Unix platform and have include -#elif defined(CPPUNIT_HAVE_LIBDL) -#define CPPUNIT_HAVE_UNIX_DLL_LOADER 1 - -// Otherwise, disable support for DllLoader -#else -#define CPPUNIT_NO_TESTPLUGIN 1 -#endif - -#if !defined(CPPUNIT_PLUGIN_EXPORT) -#define CPPUNIT_PLUGIN_EXPORT extern "C" -#endif // !defined(CPPUNIT_PLUGIN_EXPORT) - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - -#endif // CPPUNIT_CONFIG_SELECTDLLLOADER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SourcePrefix.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SourcePrefix.h deleted file mode 100644 index 2334601b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/SourcePrefix.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef CPPUNIT_CONFIG_H_INCLUDED -#define CPPUNIT_CONFIG_H_INCLUDED - -#include - -#ifdef _MSC_VER -#pragma warning(disable: 4018 4284 4146) -#if _MSC_VER >= 1400 -#pragma warning(disable: 4996) // sprintf is deprecated -#endif -#endif - - -#endif // CPPUNIT_CONFIG_H_INCLUDED diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-bcb5.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-bcb5.h deleted file mode 100644 index d4914520..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-bcb5.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _INCLUDE_CPPUNIT_CONFIG_BCB5_H -#define _INCLUDE_CPPUNIT_CONFIG_BCB5_H 1 - -#define HAVE_CMATH 1 - -/* include/cppunit/config-bcb5.h. Manually adapted from - include/cppunit/config-auto.h */ - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if library uses std::string::compare(string,pos,n) */ -#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 0 -#endif - -/* Define if you have the header file. */ -#ifdef CPPUNIT_HAVE_DLFCN_H -#undef CPPUNIT_HAVE_DLFCN_H -#endif - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if the compiler supports Run-Time Type Identification */ -#ifndef CPPUNIT_HAVE_RTTI -#define CPPUNIT_HAVE_RTTI 1 -#endif - -/* Define to 1 to use type_info::name() for class names */ -#ifndef CPPUNIT_USE_TYPEINFO_NAME -#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI -#endif - -#define CPPUNIT_HAVE_SSTREAM 1 - -/* Name of package */ -#ifndef CPPUNIT_PACKAGE -#define CPPUNIT_PACKAGE "cppunit" -#endif - -/* _INCLUDE_CPPUNIT_CONFIG_BCB5_H */ -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-evc4.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-evc4.h deleted file mode 100644 index a7916981..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-evc4.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef _INCLUDE_CPPUNIT_CONFIG_EVC4_H -#define _INCLUDE_CPPUNIT_CONFIG_EVC4_H 1 - -#if _MSC_VER > 1000 // VC++ -#pragma warning( disable : 4786 ) // disable warning debug symbol > 255... -#endif // _MSC_VER > 1000 - -#define HAVE_CMATH 1 - -/* include/cppunit/config-msvc6.h. Manually adapted from - include/cppunit/config-auto.h */ - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if library uses std::string::compare(string,pos,n) */ -#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#endif - -/* Define if you have the header file. */ -#ifdef CPPUNIT_HAVE_DLFCN_H -#undef CPPUNIT_HAVE_DLFCN_H -#endif - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if the compiler supports Run-Time Type Identification */ -#ifndef CPPUNIT_HAVE_RTTI -#define CPPUNIT_HAVE_RTTI 0 -#endif - -/* Define to 1 to use type_info::name() for class names */ -#ifndef CPPUNIT_USE_TYPEINFO_NAME -#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI -#endif - -#define CPPUNIT_NO_STREAM 1 -#define CPPUNIT_NO_ASSERT 1 - -#define CPPUNIT_HAVE_SSTREAM 0 - -/* Name of package */ -#ifndef CPPUNIT_PACKAGE -#define CPPUNIT_PACKAGE "cppunit" -#endif - - -// Compiler error location format for CompilerOutputter -// See class CompilerOutputter for format. -#undef CPPUNIT_COMPILER_LOCATION_FORMAT -#if _MSC_VER >= 1300 // VS 7.0 -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l) : error : " -#else -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):" -#endif - -/* define to 1 if the compiler has _finite() */ -#ifndef CPPUNIT_HAVE__FINITE -#define CPPUNIT_HAVE__FINITE 1 -#endif - -// Uncomment to turn on STL wrapping => use this to test compilation. -// This will make CppUnit subclass std::vector & co to provide default -// parameter. -/*#define CPPUNIT_STD_NEED_ALLOCATOR 1 -#define CPPUNIT_STD_ALLOCATOR std::allocator -//#define CPPUNIT_NO_NAMESPACE 1 -*/ - - -/* _INCLUDE_CPPUNIT_CONFIG_EVC4_H */ -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-mac.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-mac.h deleted file mode 100644 index 4ace906c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-mac.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef _INCLUDE_CPPUNIT_CONFIG_MAC_H -#define _INCLUDE_CPPUNIT_CONFIG_MAC_H 1 - -/* MacOS X should be installed using the configure script. - This file is for other macs. - - It is not integrated into because we don't - know a suitable preprocessor symbol that will distinguish MacOS X - from other MacOS versions. Email us if you know the answer. -*/ - -/* define if library uses std::string::compare(string,pos,n) */ -#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#endif - -/* define if the library defines strstream */ -#ifndef CPPUNIT_HAVE_CLASS_STRSTREAM -#define CPPUNIT_HAVE_CLASS_STRSTREAM 1 -#endif - -/* Define if you have the header file. */ -#ifdef CPPUNIT_HAVE_CMATH -#undef CPPUNIT_HAVE_CMATH -#endif - -/* Define if you have the header file. */ -#ifdef CPPUNIT_HAVE_DLFCN_H -#undef CPPUNIT_HAVE_DLFCN_H -#endif - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if the compiler supports Run-Time Type Identification */ -#ifndef CPPUNIT_HAVE_RTTI -#define CPPUNIT_HAVE_RTTI 1 -#endif - -/* define if the compiler has stringstream */ -#ifndef CPPUNIT_HAVE_SSTREAM -#define CPPUNIT_HAVE_SSTREAM 1 -#endif - -/* Define if you have the header file. */ -#ifndef CPPUNIT_HAVE_STRSTREAM -#define CPPUNIT_HAVE_STRSTREAM 1 -#endif - -/* Define to 1 to use type_info::name() for class names */ -#ifndef CPPUNIT_USE_TYPEINFO_NAME -#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI -#endif - -/* _INCLUDE_CPPUNIT_CONFIG_MAC_H */ -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-msvc6.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-msvc6.h deleted file mode 100644 index d6881711..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/config/config-msvc6.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef _INCLUDE_CPPUNIT_CONFIG_MSVC6_H -#define _INCLUDE_CPPUNIT_CONFIG_MSVC6_H 1 - -#if _MSC_VER > 1000 // VC++ -#pragma warning( disable : 4786 ) // disable warning debug symbol > 255... -#endif // _MSC_VER > 1000 - -#define HAVE_CMATH 1 - -/* include/cppunit/config-msvc6.h. Manually adapted from - include/cppunit/config-auto.h */ - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if library uses std::string::compare(string,pos,n) */ -#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -#endif - -/* Define if you have the header file. */ -#ifdef CPPUNIT_HAVE_DLFCN_H -#undef CPPUNIT_HAVE_DLFCN_H -#endif - -/* define to 1 if the compiler implements namespaces */ -#ifndef CPPUNIT_HAVE_NAMESPACES -#define CPPUNIT_HAVE_NAMESPACES 1 -#endif - -/* define if the compiler supports Run-Time Type Identification */ -#ifndef CPPUNIT_HAVE_RTTI -# ifdef _CPPRTTI // Defined by the compiler option /GR -# define CPPUNIT_HAVE_RTTI 1 -# else -# define CPPUNIT_HAVE_RTTI 0 -# endif -#endif - -/* Define to 1 to use type_info::name() for class names */ -#ifndef CPPUNIT_USE_TYPEINFO_NAME -#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI -#endif - -#define CPPUNIT_HAVE_SSTREAM 1 - -/* Name of package */ -#ifndef CPPUNIT_PACKAGE -#define CPPUNIT_PACKAGE "cppunit" -#endif - - -// Compiler error location format for CompilerOutputter -// See class CompilerOutputter for format. -#undef CPPUNIT_COMPILER_LOCATION_FORMAT -#if _MSC_VER >= 1300 // VS 7.0 -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l) : error : " -#else -# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):" -#endif - -// Define to 1 if the compiler support C++ style cast. -#define CPPUNIT_HAVE_CPP_CAST 1 - -/* define to 1 if the compiler has _finite() */ -#ifndef CPPUNIT_HAVE__FINITE -#define CPPUNIT_HAVE__FINITE 1 -#endif - - -// Uncomment to turn on STL wrapping => use this to test compilation. -// This will make CppUnit subclass std::vector & co to provide default -// parameter. -/*#define CPPUNIT_STD_NEED_ALLOCATOR 1 -#define CPPUNIT_STD_ALLOCATOR std::allocator -//#define CPPUNIT_NO_NAMESPACE 1 -*/ - - -/* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */ -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/AutoRegisterSuite.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/AutoRegisterSuite.h deleted file mode 100644 index e04adb5d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/AutoRegisterSuite.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H -#define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -/*! \brief (Implementation) Automatically register the test suite of the specified type. - * - * You should not use this class directly. Instead, use the following macros: - * - CPPUNIT_TEST_SUITE_REGISTRATION() - * - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() - * - * This object will register the test returned by TestCaseType::suite() - * when constructed to the test registry. - * - * This object is intented to be used as a static variable. - * - * - * \param TestCaseType Type of the test case which suite is registered. - * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION - * \see CppUnit::TestFactoryRegistry. - */ -template -class AutoRegisterSuite -{ -public: - /** Auto-register the suite factory in the global registry. - */ - AutoRegisterSuite() - : m_registry( &TestFactoryRegistry::getRegistry() ) - { - m_registry->registerFactory( &m_factory ); - } - - /** Auto-register the suite factory in the specified registry. - * \param name Name of the registry. - */ - AutoRegisterSuite( const std::string &name ) - : m_registry( &TestFactoryRegistry::getRegistry( name ) ) - { - m_registry->registerFactory( &m_factory ); - } - - ~AutoRegisterSuite() - { - if ( TestFactoryRegistry::isValid() ) - m_registry->unregisterFactory( &m_factory ); - } - -private: - TestFactoryRegistry *m_registry; - TestSuiteFactory m_factory; -}; - - -/*! \brief (Implementation) Automatically adds a registry into another registry. - * - * Don't use this class. Use the macros CPPUNIT_REGISTRY_ADD() and - * CPPUNIT_REGISTRY_ADD_TO_DEFAULT() instead. - */ -class AutoRegisterRegistry -{ -public: - AutoRegisterRegistry( const std::string &which, - const std::string &to ) - { - TestFactoryRegistry::getRegistry( to ).addRegistry( which ); - } - - AutoRegisterRegistry( const std::string &which ) - { - TestFactoryRegistry::getRegistry().addRegistry( which ); - } -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/ExceptionTestCaseDecorator.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/ExceptionTestCaseDecorator.h deleted file mode 100644 index 9c816add..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/ExceptionTestCaseDecorator.h +++ /dev/null @@ -1,104 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H -#define CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -/*! \brief Expected exception test case decorator. - * - * A decorator used to assert that a specific test case should throw an - * exception of a given type. - * - * You should use this class only if you need to check the exception object - * state (that a specific cause is set for example). If you don't need to - * do that, you might consider using CPPUNIT_TEST_EXCEPTION() instead. - * - * Intended use is to subclass and override checkException(). Example: - * - * \code - * - * class NetworkErrorTestCaseDecorator : - * public ExceptionTestCaseDecorator - * { - * public: - * NetworkErrorTestCaseDecorator( NetworkError::Cause expectedCause ) - * : m_expectedCause( expectedCause ) - * { - * } - * private: - * void checkException( ExpectedExceptionType &e ) - * { - * CPPUNIT_ASSERT_EQUAL( m_expectedCause, e.getCause() ); - * } - * - * NetworkError::Cause m_expectedCause; - * }; - * \endcode - * - */ -template -class ExceptionTestCaseDecorator : public TestCaseDecorator -{ -public: - typedef ExpectedException ExpectedExceptionType; - - /*! \brief Decorates the specified test. - * \param test TestCase to decorate. Assumes ownership of the test. - */ - ExceptionTestCaseDecorator( TestCase *test ) - : TestCaseDecorator( test ) - { - } - - /*! \brief Checks that the expected exception is thrown by the decorated test. - * is thrown. - * - * Calls the decorated test runTest() and checks that an exception of - * type ExpectedException is thrown. Call checkException() passing the - * exception that was caught so that some assertions can be made if - * needed. - */ - void runTest() - { - try - { - TestCaseDecorator::runTest(); - } - catch ( ExpectedExceptionType &e ) - { - checkException( e ); - return; - } - - // Moved outside the try{} statement to handle the case where the - // expected exception type is Exception (expecting assertion failure). -#if CPPUNIT_USE_TYPEINFO_NAME - throw Exception( Message( - "expected exception not thrown", - "Expected exception type: " + - TypeInfoHelper::getClassName( - typeid( ExpectedExceptionType ) ) ) ); -#else - throw Exception( Message("expected exception not thrown") ); -#endif - } - -private: - /*! \brief Called when the exception is caught. - * - * Should be overriden to check the exception. - */ - virtual void checkException( ExpectedExceptionType &e ) - { - } -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/HelperMacros.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/HelperMacros.h deleted file mode 100644 index 12431e46..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/HelperMacros.h +++ /dev/null @@ -1,541 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file HelperMacros.h -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/04/15 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CPPUNIT_EXTENSIONS_HELPERMACROS_H -#define CPPUNIT_EXTENSIONS_HELPERMACROS_H - -#include -#include -#include -#include -#include -#include -#include -#include - - -/*! \addtogroup WritingTestFixture Writing test fixture - */ -/** @{ - */ - - -/** \file - * Macros intended to ease the definition of test suites. - * - * The macros - * CPPUNIT_TEST_SUITE(), CPPUNIT_TEST(), and CPPUNIT_TEST_SUITE_END() - * are designed to facilitate easy creation of a test suite. - * For example, - * - * \code - * #include - * class MyTest : public CppUnit::TestFixture { - * CPPUNIT_TEST_SUITE( MyTest ); - * CPPUNIT_TEST( testEquality ); - * CPPUNIT_TEST( testSetName ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * void testEquality(); - * void testSetName(); - * }; - * \endcode - * - * The effect of these macros is to define two methods in the - * class MyTest. The first method is an auxiliary function - * named registerTests that you will not need to call directly. - * The second function - * \code static CppUnit::TestSuite *suite()\endcode - * returns a pointer to the suite of tests defined by the CPPUNIT_TEST() - * macros. - * - * Rather than invoking suite() directly, - * the macro CPPUNIT_TEST_SUITE_REGISTRATION() is - * used to create a static variable that automatically - * registers its test suite in a global registry. - * The registry yields a Test instance containing all the - * registered suites. - * \code - * CPPUNIT_TEST_SUITE_REGISTRATION( MyTest ); - * CppUnit::Test* tp = - * CppUnit::TestFactoryRegistry::getRegistry().makeTest(); - * \endcode - * - * The test suite macros can even be used with templated test classes. - * For example: - * - * \code - * template - * class StringTest : public CppUnit::TestFixture { - * CPPUNIT_TEST_SUITE( StringTest ); - * CPPUNIT_TEST( testAppend ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * ... - * }; - * \endcode - * - * You need to add in an implementation file: - * - * \code - * CPPUNIT_TEST_SUITE_REGISTRATION( StringTest ); - * CPPUNIT_TEST_SUITE_REGISTRATION( StringTest ); - * \endcode - */ - - -/*! \brief Begin test suite - * - * This macro starts the declaration of a new test suite. - * Use CPPUNIT_TEST_SUB_SUITE() instead, if you wish to include the - * test suite of the parent class. - * - * \param ATestFixtureType Type of the test case class. This type \b MUST - * be derived from TestFixture. - * \see CPPUNIT_TEST_SUB_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END, - * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_EXCEPTION, CPPUNIT_TEST_FAIL. - */ -#define CPPUNIT_TEST_SUITE( ATestFixtureType ) \ - public: \ - typedef ATestFixtureType TestFixtureType; \ - \ - private: \ - static const CPPUNIT_NS::TestNamer &getTestNamer__() \ - { \ - static CPPUNIT_TESTNAMER_DECL( testNamer, ATestFixtureType ); \ - return testNamer; \ - } \ - \ - public: \ - typedef CPPUNIT_NS::TestSuiteBuilderContext \ - TestSuiteBuilderContextType; \ - \ - static void \ - addTestsToSuite( CPPUNIT_NS::TestSuiteBuilderContextBase &baseContext ) \ - { \ - TestSuiteBuilderContextType context( baseContext ) - - -/*! \brief Begin test suite (includes parent suite) - * - * This macro may only be used in a class whose parent class - * defines a test suite using CPPUNIT_TEST_SUITE() or CPPUNIT_TEST_SUB_SUITE(). - * - * This macro begins the declaration of a test suite, in the same - * manner as CPPUNIT_TEST_SUITE(). In addition, the test suite of the - * parent is automatically inserted in the test suite being - * defined. - * - * Here is an example: - * - * \code - * #include - * class MySubTest : public MyTest { - * CPPUNIT_TEST_SUB_SUITE( MySubTest, MyTest ); - * CPPUNIT_TEST( testAdd ); - * CPPUNIT_TEST( testSub ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * void testAdd(); - * void testSub(); - * }; - * \endcode - * - * \param ATestFixtureType Type of the test case class. This type \b MUST - * be derived from TestFixture. - * \param ASuperClass Type of the parent class. - * \see CPPUNIT_TEST_SUITE. - */ -#define CPPUNIT_TEST_SUB_SUITE( ATestFixtureType, ASuperClass ) \ - public: \ - typedef ASuperClass ParentTestFixtureType; \ - private: \ - CPPUNIT_TEST_SUITE( ATestFixtureType ); \ - ParentTestFixtureType::addTestsToSuite( baseContext ) - - -/*! \brief End declaration of the test suite. - * - * After this macro, member access is set to "private". - * - * \see CPPUNIT_TEST_SUITE. - * \see CPPUNIT_TEST_SUITE_REGISTRATION. - */ -#define CPPUNIT_TEST_SUITE_END() \ - } \ - \ - static CPPUNIT_NS::TestSuite *suite() \ - { \ - const CPPUNIT_NS::TestNamer &namer = getTestNamer__(); \ - std::auto_ptr suite( \ - new CPPUNIT_NS::TestSuite( namer.getFixtureName() )); \ - CPPUNIT_NS::ConcretTestFixtureFactory factory; \ - CPPUNIT_NS::TestSuiteBuilderContextBase context( *suite.get(), \ - namer, \ - factory ); \ - TestFixtureType::addTestsToSuite( context ); \ - return suite.release(); \ - } \ - private: /* dummy typedef so that the macro can still end with ';'*/ \ - typedef int CppUnitDummyTypedefForSemiColonEnding__ - -/*! \brief End declaration of an abstract test suite. - * - * Use this macro to indicate that the %TestFixture is abstract. No - * static suite() method will be declared. - * - * After this macro, member access is set to "private". - * - * Here is an example of usage: - * - * The abstract test fixture: - * \code - * #include - * class AbstractDocument; - * class AbstractDocumentTest : public CppUnit::TestFixture { - * CPPUNIT_TEST_SUITE( AbstractDocumentTest ); - * CPPUNIT_TEST( testInsertText ); - * CPPUNIT_TEST_SUITE_END_ABSTRACT(); - * public: - * void testInsertText(); - * - * void setUp() - * { - * m_document = makeDocument(); - * } - * - * void tearDown() - * { - * delete m_document; - * } - * protected: - * virtual AbstractDocument *makeDocument() =0; - * - * AbstractDocument *m_document; - * };\endcode - * - * The concret test fixture: - * \code - * class RichTextDocumentTest : public AbstractDocumentTest { - * CPPUNIT_TEST_SUB_SUITE( RichTextDocumentTest, AbstractDocumentTest ); - * CPPUNIT_TEST( testInsertFormatedText ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * void testInsertFormatedText(); - * protected: - * AbstractDocument *makeDocument() - * { - * return new RichTextDocument(); - * } - * };\endcode - * - * \see CPPUNIT_TEST_SUB_SUITE. - * \see CPPUNIT_TEST_SUITE_REGISTRATION. - */ -#define CPPUNIT_TEST_SUITE_END_ABSTRACT() \ - } \ - private: /* dummy typedef so that the macro can still end with ';'*/ \ - typedef int CppUnitDummyTypedefForSemiColonEnding__ - - -/*! \brief Add a test to the suite (for custom test macro). - * - * The specified test will be added to the test suite being declared. This macro - * is intended for \e advanced usage, to extend %CppUnit by creating new macro such - * as CPPUNIT_TEST_EXCEPTION()... - * - * Between macro CPPUNIT_TEST_SUITE() and CPPUNIT_TEST_SUITE_END(), you can assume - * that the following variables can be used: - * \code - * typedef TestSuiteBuilder TestSuiteBuilderType; - * TestSuiteBuilderType &context; - * \endcode - * - * \c context can be used to name test case, create new test fixture instance, - * or add test case to the test fixture suite. - * - * Below is an example that show how to use this macro to create new macro to add - * test to the fixture suite. The macro below show how you would add a new type - * of test case which fails if the execution last more than a given time limit. - * It relies on an imaginary TimeOutTestCaller class which has an interface similar - * to TestCaller. - * - * \code - * #define CPPUNITEX_TEST_TIMELIMIT( testMethod, timeLimit ) \ - * CPPUNIT_TEST_SUITE_ADD_TEST( (new TimeOutTestCaller( \ - * namer.getTestNameFor( #testMethod ), \ - * &TestFixtureType::testMethod, \ - * factory.makeFixture(), \ - * timeLimit ) ) ) - * - * class PerformanceTest : CppUnit::TestFixture - * { - * public: - * CPPUNIT_TEST_SUITE( PerformanceTest ); - * CPPUNITEX_TEST_TIMELIMIT( testSortReverseOrder, 5.0 ); - * CPPUNIT_TEST_SUITE_END(); - * - * void testSortReverseOrder(); - * }; - * \endcode - * - * \param test Test to add to the suite. Must be a subclass of Test. The test name - * should have been obtained using TestNamer::getTestNameFor(). - */ -#define CPPUNIT_TEST_SUITE_ADD_TEST( test ) \ - context.addTest( test ) - -/*! \brief Add a method to the suite. - * \param testMethod Name of the method of the test case to add to the - * suite. The signature of the method must be of - * type: void testMethod(); - * \see CPPUNIT_TEST_SUITE. - */ -#define CPPUNIT_TEST( testMethod ) \ - CPPUNIT_TEST_SUITE_ADD_TEST( \ - ( new CPPUNIT_NS::TestCaller( \ - context.getTestNameFor( #testMethod), \ - &TestFixtureType::testMethod, \ - context.makeFixture() ) ) ) - -/*! \brief Add a test which fail if the specified exception is not caught. - * - * Example: - * \code - * #include - * #include - * class MyTest : public CppUnit::TestFixture { - * CPPUNIT_TEST_SUITE( MyTest ); - * CPPUNIT_TEST_EXCEPTION( testVectorAtThrow, std::invalid_argument ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * void testVectorAtThrow() - * { - * std::vector v; - * v.at( 1 ); // must throw exception std::invalid_argument - * } - * }; - * \endcode - * - * \param testMethod Name of the method of the test case to add to the suite. - * \param ExceptionType Type of the exception that must be thrown by the test - * method. - * \deprecated Use the assertion macro CPPUNIT_ASSERT_THROW instead. - */ -#define CPPUNIT_TEST_EXCEPTION( testMethod, ExceptionType ) \ - CPPUNIT_TEST_SUITE_ADD_TEST( \ - (new CPPUNIT_NS::ExceptionTestCaseDecorator< ExceptionType >( \ - new CPPUNIT_NS::TestCaller< TestFixtureType >( \ - context.getTestNameFor( #testMethod ), \ - &TestFixtureType::testMethod, \ - context.makeFixture() ) ) ) ) - -/*! \brief Adds a test case which is excepted to fail. - * - * The added test case expect an assertion to fail. You usually used that type - * of test case when testing custom assertion macros. - * - * \code - * CPPUNIT_TEST_FAIL( testAssertFalseFail ); - * - * void testAssertFalseFail() - * { - * CPPUNIT_ASSERT( false ); - * } - * \endcode - * \see CreatingNewAssertions. - * \deprecated Use the assertion macro CPPUNIT_ASSERT_ASSERTION_FAIL instead. - */ -#define CPPUNIT_TEST_FAIL( testMethod ) \ - CPPUNIT_TEST_EXCEPTION( testMethod, CPPUNIT_NS::Exception ) - -/*! \brief Adds some custom test cases. - * - * Use this to add one or more test cases to the fixture suite. The specified - * method is called with a context parameter that can be used to name, - * instantiate fixture, and add instantiated test case to the fixture suite. - * The specified method must have the following signature: - * \code - * static void aMethodName( TestSuiteBuilderContextType &context ); - * \endcode - * - * \c TestSuiteBuilderContextType is typedef to - * TestSuiteBuilderContext declared by CPPUNIT_TEST_SUITE(). - * - * Here is an example that add two custom tests: - * - * \code - * #include - * - * class MyTest : public CppUnit::TestFixture { - * CPPUNIT_TEST_SUITE( MyTest ); - * CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( addTimeOutTests ); - * CPPUNIT_TEST_SUITE_END(); - * public: - * static void addTimeOutTests( TestSuiteBuilderContextType &context ) - * { - * context.addTest( new TimeOutTestCaller( context.getTestNameFor( "test1" ) ), - * &MyTest::test1, - * context.makeFixture(), - * 5.0 ); - * context.addTest( new TimeOutTestCaller( context.getTestNameFor( "test2" ) ), - * &MyTest::test2, - * context.makeFixture(), - * 5.0 ); - * } - * - * void test1() - * { - * // Do some test that may never end... - * } - * - * void test2() - * { - * // Do some test that may never end... - * } - * }; - * \endcode - * @param testAdderMethod Name of the method called to add the test cases. - */ -#define CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( testAdderMethod ) \ - testAdderMethod( context ) - -/*! \brief Adds a property to the test suite builder context. - * \param APropertyKey Key of the property to add. - * \param APropertyValue Value for the added property. - * Example: - * \code - * CPPUNIT_TEST_SUITE_PROPERTY("XmlFileName", "paraTest.xml"); \endcode - */ -#define CPPUNIT_TEST_SUITE_PROPERTY( APropertyKey, APropertyValue ) \ - context.addProperty( std::string(APropertyKey), \ - std::string(APropertyValue) ) - -/** @} - */ - - -/*! Adds the specified fixture suite to the unnamed registry. - * \ingroup CreatingTestSuite - * - * This macro declares a static variable whose construction - * causes a test suite factory to be inserted in a global registry - * of such factories. The registry is available by calling - * the static function CppUnit::TestFactoryRegistry::getRegistry(). - * - * \param ATestFixtureType Type of the test case class. - * \warning This macro should be used only once per line of code (the line - * number is used to name a hidden static variable). - * \see CPPUNIT_TEST_SUITE_NAMED_REGISTRATION - * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT - * \see CPPUNIT_REGISTRY_ADD - * \see CPPUNIT_TEST_SUITE, CppUnit::AutoRegisterSuite, - * CppUnit::TestFactoryRegistry. - */ -#define CPPUNIT_TEST_SUITE_REGISTRATION( ATestFixtureType ) \ - static CPPUNIT_NS::AutoRegisterSuite< ATestFixtureType > \ - CPPUNIT_MAKE_UNIQUE_NAME(autoRegisterRegistry__ ) - - -/** Adds the specified fixture suite to the specified registry suite. - * \ingroup CreatingTestSuite - * - * This macro declares a static variable whose construction - * causes a test suite factory to be inserted in the global registry - * suite of the specified name. The registry is available by calling - * the static function CppUnit::TestFactoryRegistry::getRegistry(). - * - * For the suite name, use a string returned by a static function rather - * than a hardcoded string. That way, you can know what are the name of - * named registry and you don't risk mistyping the registry name. - * - * \code - * // MySuites.h - * namespace MySuites { - * std::string math() { - * return "Math"; - * } - * } - * - * // ComplexNumberTest.cpp - * #include "MySuites.h" - * - * CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ComplexNumberTest, MySuites::math() ); - * \endcode - * - * \param ATestFixtureType Type of the test case class. - * \param suiteName Name of the global registry suite the test suite is - * registered into. - * \warning This macro should be used only once per line of code (the line - * number is used to name a hidden static variable). - * \see CPPUNIT_TEST_SUITE_REGISTRATION - * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT - * \see CPPUNIT_REGISTRY_ADD - * \see CPPUNIT_TEST_SUITE, CppUnit::AutoRegisterSuite, - * CppUnit::TestFactoryRegistry.. - */ -#define CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ATestFixtureType, suiteName ) \ - static CPPUNIT_NS::AutoRegisterSuite< ATestFixtureType > \ - CPPUNIT_MAKE_UNIQUE_NAME(autoRegisterRegistry__ )(suiteName) - -/*! Adds that the specified registry suite to another registry suite. - * \ingroup CreatingTestSuite - * - * Use this macros to automatically create test registry suite hierarchy. For example, - * if you want to create the following hierarchy: - * - Math - * - IntegerMath - * - FloatMath - * - FastFloat - * - StandardFloat - * - * You can do this automatically with: - * \code - * CPPUNIT_REGISTRY_ADD( "FastFloat", "FloatMath" ); - * CPPUNIT_REGISTRY_ADD( "IntegerMath", "Math" ); - * CPPUNIT_REGISTRY_ADD( "FloatMath", "Math" ); - * CPPUNIT_REGISTRY_ADD( "StandardFloat", "FloatMath" ); - * \endcode - * - * There is no specific order of declaration. Think of it as declaring links. - * - * You register the test in each suite using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - * - * \param which Name of the registry suite to add to the registry suite named \a to. - * \param to Name of the registry suite \a which is added to. - * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION. - */ -#define CPPUNIT_REGISTRY_ADD( which, to ) \ - static CPPUNIT_NS::AutoRegisterRegistry \ - CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ )( which, to ) - -/*! Adds that the specified registry suite to the default registry suite. - * \ingroup CreatingTestSuite - * - * This macro is just like CPPUNIT_REGISTRY_ADD except the specified registry - * suite is added to the default suite (root suite). - * - * \param which Name of the registry suite to add to the default registry suite. - * \see CPPUNIT_REGISTRY_ADD. - */ -#define CPPUNIT_REGISTRY_ADD_TO_DEFAULT( which ) \ - static CPPUNIT_NS::AutoRegisterRegistry \ - CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ )( which ) - -// Backwards compatibility -// (Not tested!) - -#if CPPUNIT_ENABLE_CU_TEST_MACROS - -#define CU_TEST_SUITE(tc) CPPUNIT_TEST_SUITE(tc) -#define CU_TEST_SUB_SUITE(tc,sc) CPPUNIT_TEST_SUB_SUITE(tc,sc) -#define CU_TEST(tm) CPPUNIT_TEST(tm) -#define CU_TEST_SUITE_END() CPPUNIT_TEST_SUITE_END() -#define CU_TEST_SUITE_REGISTRATION(tc) CPPUNIT_TEST_SUITE_REGISTRATION(tc) - -#endif - - -#endif // CPPUNIT_EXTENSIONS_HELPERMACROS_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.am deleted file mode 100644 index ff96de31..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/extensions - -libcppunitinclude_HEADERS = \ - TestFactory.h \ - AutoRegisterSuite.h \ - HelperMacros.h \ - Orthodox.h \ - RepeatedTest.h \ - ExceptionTestCaseDecorator.h \ - TestCaseDecorator.h \ - TestDecorator.h \ - TestFactoryRegistry.h \ - TestFixtureFactory.h \ - TestNamer.h \ - TestSetUp.h \ - TestSuiteBuilderContext.h \ - TestSuiteFactory.h \ - TypeInfoHelper.h - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.in deleted file mode 100644 index c0889047..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Makefile.in +++ /dev/null @@ -1,446 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/extensions -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/extensions -libcppunitinclude_HEADERS = \ - TestFactory.h \ - AutoRegisterSuite.h \ - HelperMacros.h \ - Orthodox.h \ - RepeatedTest.h \ - ExceptionTestCaseDecorator.h \ - TestCaseDecorator.h \ - TestDecorator.h \ - TestFactoryRegistry.h \ - TestFixtureFactory.h \ - TestNamer.h \ - TestSetUp.h \ - TestSuiteBuilderContext.h \ - TestSuiteFactory.h \ - TypeInfoHelper.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/extensions/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/extensions/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Orthodox.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Orthodox.h deleted file mode 100644 index 72212593..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/Orthodox.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_ORTHODOX_H -#define CPPUNIT_EXTENSIONS_ORTHODOX_H - -#include - -CPPUNIT_NS_BEGIN - - -/* - * Orthodox performs a simple set of tests on an arbitary - * class to make sure that it supports at least the - * following operations: - * - * default construction - constructor - * equality/inequality - operator== && operator!= - * assignment - operator= - * negation - operator! - * safe passage - copy construction - * - * If operations for each of these are not declared - * the template will not instantiate. If it does - * instantiate, tests are performed to make sure - * that the operations have correct semantics. - * - * Adding an orthodox test to a suite is very - * easy: - * - * public: Test *suite () { - * TestSuite *suiteOfTests = new TestSuite; - * suiteOfTests->addTest (new ComplexNumberTest ("testAdd"); - * suiteOfTests->addTest (new TestCaller > ()); - * return suiteOfTests; - * } - * - * Templated test cases be very useful when you are want to - * make sure that a group of classes have the same form. - * - * see TestSuite - */ - - -template class Orthodox : public TestCase -{ -public: - Orthodox () : TestCase ("Orthodox") {} - -protected: - ClassUnderTest call (ClassUnderTest object); - void runTest (); - - -}; - - -// Run an orthodoxy test -template void Orthodox::runTest () -{ - // make sure we have a default constructor - ClassUnderTest a, b, c; - - // make sure we have an equality operator - CPPUNIT_ASSERT (a == b); - - // check the inverse - b.operator= (a.operator! ()); - CPPUNIT_ASSERT (a != b); - - // double inversion - b = !!a; - CPPUNIT_ASSERT (a == b); - - // invert again - b = !a; - - // check calls - c = a; - CPPUNIT_ASSERT (c == call (a)); - - c = b; - CPPUNIT_ASSERT (c == call (b)); - -} - - -// Exercise a call -template -ClassUnderTest Orthodox::call (ClassUnderTest object) -{ - return object; -} - - -CPPUNIT_NS_END - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/RepeatedTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/RepeatedTest.h deleted file mode 100644 index 390ce480..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/RepeatedTest.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_REPEATEDTEST_H -#define CPPUNIT_EXTENSIONS_REPEATEDTEST_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -class Test; -class TestResult; - - -/*! \brief Decorator that runs a test repeatedly. - * - * Does not assume ownership of the test it decorates - */ -class CPPUNIT_API RepeatedTest : public TestDecorator -{ -public: - RepeatedTest( Test *test, - int timesRepeat ) : - TestDecorator( test ), - m_timesRepeat(timesRepeat) - { - } - - void run( TestResult *result ); - - int countTestCases() const; - -private: - RepeatedTest( const RepeatedTest & ); - void operator=( const RepeatedTest & ); - - const int m_timesRepeat; -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_EXTENSIONS_REPEATEDTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestCaseDecorator.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestCaseDecorator.h deleted file mode 100644 index 3a15ba97..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestCaseDecorator.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTCASEDECORATOR_H -#define CPPUNIT_EXTENSIONS_TESTCASEDECORATOR_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -/*! \brief Decorator for Test cases. - * - * TestCaseDecorator provides an alternate means to extend functionality - * of a test class without subclassing the test. Instead, one can - * subclass the decorater and use it to wrap the test class. - * - * Does not assume ownership of the test it decorates - */ -class CPPUNIT_API TestCaseDecorator : public TestCase -{ -public: - TestCaseDecorator( TestCase *test ); - ~TestCaseDecorator(); - - std::string getName() const; - - void setUp(); - - void tearDown(); - - void runTest(); - -protected: - TestCase *m_test; -}; - - -CPPUNIT_NS_END - -#endif - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestDecorator.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestDecorator.h deleted file mode 100644 index 59d9a302..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestDecorator.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTDECORATOR_H -#define CPPUNIT_EXTENSIONS_TESTDECORATOR_H - -#include -#include - -CPPUNIT_NS_BEGIN - - -class TestResult; - - -/*! \brief Decorator for Tests. - * - * TestDecorator provides an alternate means to extend functionality - * of a test class without subclassing the test. Instead, one can - * subclass the decorater and use it to wrap the test class. - * - * Does not assume ownership of the test it decorates - */ -class CPPUNIT_API TestDecorator : public Test -{ -public: - TestDecorator( Test *test ); - ~TestDecorator(); - - int countTestCases() const; - - std::string getName() const; - - void run( TestResult *result ); - - int getChildTestCount() const; - -protected: - Test *doGetChildTestAt( int index ) const; - - Test *m_test; - -private: - TestDecorator( const TestDecorator &); - void operator =( const TestDecorator & ); -}; - - -CPPUNIT_NS_END - -#endif - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactory.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactory.h deleted file mode 100644 index 214d3534..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactory.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTFACTORY_H -#define CPPUNIT_EXTENSIONS_TESTFACTORY_H - -#include - -CPPUNIT_NS_BEGIN - - -class Test; - -/*! \brief Abstract Test factory. - */ -class CPPUNIT_API TestFactory -{ -public: - virtual ~TestFactory() {} - - /*! Makes a new test. - * \return A new Test. - */ - virtual Test* makeTest() = 0; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_TESTFACTORY_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactoryRegistry.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactoryRegistry.h deleted file mode 100644 index fc8723e4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFactoryRegistry.h +++ /dev/null @@ -1,182 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H -#define CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class TestSuite; - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::set; -#endif - - -/*! \brief Registry for TestFactory. - * \ingroup CreatingTestSuite - * - * Notes that the registry \b DON'T assumes lifetime control for any registered tests - * anymore. - * - * The default registry is the registry returned by getRegistry() with the - * default name parameter value. - * - * To register tests, use the macros: - * - CPPUNIT_TEST_SUITE_REGISTRATION(): to add tests in the default registry. - * - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(): to add tests in a named registry. - * - * Example 1: retreiving a suite that contains all the test registered with - * CPPUNIT_TEST_SUITE_REGISTRATION(). - * \code - * CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); - * CppUnit::TestSuite *suite = registry.makeTest(); - * \endcode - * - * Example 2: retreiving a suite that contains all the test registered with - * \link CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Math" )\endlink. - * \code - * CppUnit::TestFactoryRegistry &mathRegistry = CppUnit::TestFactoryRegistry::getRegistry( "Math" ); - * CppUnit::TestSuite *mathSuite = mathRegistry.makeTest(); - * \endcode - * - * Example 3: creating a test suite hierarchy composed of unnamed registration and - * named registration: - * - All Tests - * - tests registered with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Graph" ) - * - tests registered with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Math" ) - * - tests registered with CPPUNIT_TEST_SUITE_REGISTRATION - * - * \code - * CppUnit::TestSuite *rootSuite = new CppUnit::TestSuite( "All tests" ); - * rootSuite->addTest( CppUnit::TestFactoryRegistry::getRegistry( "Graph" ).makeTest() ); - * rootSuite->addTest( CppUnit::TestFactoryRegistry::getRegistry( "Math" ).makeTest() ); - * CppUnit::TestFactoryRegistry::getRegistry().addTestToSuite( rootSuite ); - * \endcode - * - * The same result can be obtained with: - * \code - * CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); - * registry.addRegistry( "Graph" ); - * registry.addRegistry( "Math" ); - * CppUnit::TestSuite *suite = registry.makeTest(); - * \endcode - * - * Since a TestFactoryRegistry is a TestFactory, the named registries can be - * registered in the unnamed registry, creating the hierarchy links. - * - * \see TestSuiteFactory, AutoRegisterSuite - * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION - */ -class CPPUNIT_API TestFactoryRegistry : public TestFactory -{ -public: - /** Constructs the registry with the specified name. - * \param name Name of the registry. It is the name of TestSuite returned by - * makeTest(). - */ - TestFactoryRegistry( std::string name ); - - /// Destructor. - virtual ~TestFactoryRegistry(); - - /** Returns a new TestSuite that contains the registered test. - * \return A new TestSuite which contains all the test added using - * registerFactory(TestFactory *). - */ - virtual Test *makeTest(); - - /** Returns a named registry. - * - * If the \a name is left to its default value, then the registry that is returned is - * the one used by CPPUNIT_TEST_SUITE_REGISTRATION(): the 'top' level registry. - * - * \param name Name of the registry to return. - * \return Registry. If the registry does not exist, it is created with the - * specified name. - */ - static TestFactoryRegistry &getRegistry( const std::string &name = "All Tests" ); - - /** Adds the registered tests to the specified suite. - * \param suite Suite the tests are added to. - */ - void addTestToSuite( TestSuite *suite ); - - /** Adds the specified TestFactory to the registry. - * - * \param factory Factory to register. - */ - void registerFactory( TestFactory *factory ); - - /*! Removes the specified TestFactory from the registry. - * - * The specified factory is not destroyed. - * \param factory Factory to remove from the registry. - * \todo Address case when trying to remove a TestRegistryFactory. - */ - void unregisterFactory( TestFactory *factory ); - - /*! Adds a registry to the registry. - * - * Convenience method to help create test hierarchy. See TestFactoryRegistry detail - * for examples of use. Calling this method is equivalent to: - * \code - * this->registerFactory( TestFactoryRegistry::getRegistry( name ) ); - * \endcode - * - * \param name Name of the registry to add. - */ - void addRegistry( const std::string &name ); - - /*! Tests if the registry is valid. - * - * This method should be used when unregistering test factory on static variable - * destruction to ensure that the registry has not been already destroyed (in - * that case there is no need to unregister the test factory). - * - * You should not concern yourself with this method unless you are writing a class - * like AutoRegisterSuite. - * - * \return \c true if the specified registry has not been destroyed, - * otherwise returns \c false. - * \see AutoRegisterSuite. - */ - static bool isValid(); - - /** Adds the specified TestFactory with a specific name (DEPRECATED). - * \param name Name associated to the factory. - * \param factory Factory to register. - * \deprecated Use registerFactory( TestFactory *) instead. - */ - void registerFactory( const std::string &name, - TestFactory *factory ); - -private: - TestFactoryRegistry( const TestFactoryRegistry © ); - void operator =( const TestFactoryRegistry © ); - -private: - typedef CppUnitSet > Factories; - Factories m_factories; - - std::string m_name; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -#endif // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFixtureFactory.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFixtureFactory.h deleted file mode 100644 index 45354c62..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestFixtureFactory.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H -#define CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H - -#include - - -CPPUNIT_NS_BEGIN - - -class TestFixture; - -/*! \brief Abstract TestFixture factory (Implementation). - * - * Implementation detail. Use by HelperMacros to handle TestFixture hierarchy. - */ -class TestFixtureFactory -{ -public: - //! Creates a new TestFixture instance. - virtual TestFixture *makeFixture() =0; - - virtual ~TestFixtureFactory() {} -}; - - -/*! \brief Concret TestFixture factory (Implementation). - * - * Implementation detail. Use by HelperMacros to handle TestFixture hierarchy. - */ -template -class ConcretTestFixtureFactory : public CPPUNIT_NS::TestFixtureFactory -{ - /*! \brief Returns a new TestFixture instance. - * \return A new fixture instance. The fixture instance is returned by - * the TestFixtureFactory passed on construction. The actual type - * is that of the fixture on which the static method suite() - * was called. - */ - TestFixture *makeFixture() - { - return new TestFixtureType(); - } -}; - - -CPPUNIT_NS_END - - -#endif // CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestNamer.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestNamer.h deleted file mode 100644 index 5a6471c0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestNamer.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTNAMER_H -#define CPPUNIT_EXTENSIONS_TESTNAMER_H - -#include -#include - -#if CPPUNIT_HAVE_RTTI -# include -#endif - - - -/*! \def CPPUNIT_TESTNAMER_DECL( variableName, FixtureType ) - * \brief Declares a TestNamer. - * - * Declares a TestNamer for the specified type, using RTTI if enabled, otherwise - * using macro string expansion. - * - * RTTI is used if CPPUNIT_USE_TYPEINFO_NAME is defined and not null. - * - * \code - * void someMethod() - * { - * CPPUNIT_TESTNAMER_DECL( namer, AFixtureType ); - * std::string fixtureName = namer.getFixtureName(); - * ... - * \endcode - * - * \relates TestNamer - * \see TestNamer - */ -#if CPPUNIT_USE_TYPEINFO_NAME -# define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType ) \ - CPPUNIT_NS::TestNamer variableName( typeid(FixtureType) ) -#else -# define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType ) \ - CPPUNIT_NS::TestNamer variableName( std::string(#FixtureType) ) -#endif - - - -CPPUNIT_NS_BEGIN - - -/*! \brief Names a test or a fixture suite. - * - * TestNamer is usually instantiated using CPPUNIT_TESTNAMER_DECL. - * - */ -class CPPUNIT_API TestNamer -{ -public: -#if CPPUNIT_HAVE_RTTI - /*! \brief Constructs a namer using the fixture's type-info. - * \param typeInfo Type-info of the fixture type. Use to name the fixture suite. - */ - TestNamer( const std::type_info &typeInfo ); -#endif - - /*! \brief Constructs a namer using the specified fixture name. - * \param fixtureName Name of the fixture suite. Usually extracted using a macro. - */ - TestNamer( const std::string &fixtureName ); - - virtual ~TestNamer(); - - /*! \brief Returns the name of the fixture. - * \return Name of the fixture. - */ - virtual std::string getFixtureName() const; - - /*! \brief Returns the name of the test for the specified method. - * \param testMethodName Name of the method that implements a test. - * \return A string that is the concatenation of the test fixture name - * (returned by getFixtureName()) and\a testMethodName, - * separated using '::'. This provides a fairly unique name for a given - * test. - */ - virtual std::string getTestNameFor( const std::string &testMethodName ) const; - -protected: - std::string m_fixtureName; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_TESTNAMER_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSetUp.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSetUp.h deleted file mode 100644 index f2128ecd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSetUp.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTSETUP_H -#define CPPUNIT_EXTENSIONS_TESTSETUP_H - -#include - -CPPUNIT_NS_BEGIN - - -class Test; -class TestResult; - -/*! \brief Decorates a test by providing a specific setUp() and tearDown(). - */ -class CPPUNIT_API TestSetUp : public TestDecorator -{ -public: - TestSetUp( Test *test ); - - void run( TestResult *result ); - -protected: - virtual void setUp(); - virtual void tearDown(); - -private: - TestSetUp( const TestSetUp & ); - void operator =( const TestSetUp & ); -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_TESTSETUP_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteBuilderContext.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteBuilderContext.h deleted file mode 100644 index db26926c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteBuilderContext.h +++ /dev/null @@ -1,131 +0,0 @@ -#ifndef CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H -#define CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H - -#include -#include -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - - -CPPUNIT_NS_BEGIN - -class TestSuite; -class TestFixture; -class TestFixtureFactory; -class TestNamer; - -/*! \brief Context used when creating test suite in HelperMacros. - * - * Base class for all context used when creating test suite. The - * actual context type during test suite creation is TestSuiteBuilderContext. - * - * \sa CPPUNIT_TEST_SUITE, CPPUNIT_TEST_SUITE_ADD_TEST, - * CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS. - */ -class CPPUNIT_API TestSuiteBuilderContextBase -{ -public: - /*! \brief Constructs a new context. - * - * You should not use this. The context is created in - * CPPUNIT_TEST_SUITE(). - */ - TestSuiteBuilderContextBase( TestSuite &suite, - const TestNamer &namer, - TestFixtureFactory &factory ); - - virtual ~TestSuiteBuilderContextBase(); - - /*! \brief Adds a test to the fixture suite. - * - * \param test Test to add to the fixture suite. Must not be \c NULL. - */ - void addTest( Test *test ); - - /*! \brief Returns the fixture name. - * \return Fixture name. It is the name used to name the fixture - * suite. - */ - std::string getFixtureName() const; - - /*! \brief Returns the name of the test for the specified method. - * - * \param testMethodName Name of the method that implements a test. - * \return A string that is the concatenation of the test fixture name - * (returned by getFixtureName()) and\a testMethodName, - * separated using '::'. This provides a fairly unique name for a given - * test. - */ - std::string getTestNameFor( const std::string &testMethodName ) const; - - /*! \brief Adds property pair. - * \param key PropertyKey string to add. - * \param value PropertyValue string to add. - */ - void addProperty( const std::string &key, - const std::string &value ); - - /*! \brief Returns property value assigned to param key. - * \param key PropertyKey string. - */ - const std::string getStringProperty( const std::string &key ) const; - -protected: - TestFixture *makeTestFixture() const; - - // Notes: we use a vector here instead of a map to work-around the - // shared std::map in dll bug in VC6. - // See http://www.dinkumware.com/vc_fixes.html for detail. - typedef std::pair Property; - typedef CppUnitVector Properties; - - TestSuite &m_suite; - const TestNamer &m_namer; - TestFixtureFactory &m_factory; - -private: - Properties m_properties; -}; - - -/*! \brief Type-sage context used when creating test suite in HelperMacros. - * - * \sa TestSuiteBuilderContextBase. - */ -template -class TestSuiteBuilderContext : public TestSuiteBuilderContextBase -{ -public: - typedef Fixture FixtureType; - - TestSuiteBuilderContext( TestSuiteBuilderContextBase &contextBase ) - : TestSuiteBuilderContextBase( contextBase ) - { - } - - /*! \brief Returns a new TestFixture instance. - * \return A new fixture instance. The fixture instance is returned by - * the TestFixtureFactory passed on construction. The actual type - * is that of the fixture on which the static method suite() - * was called. - */ - FixtureType *makeFixture() const - { - return CPPUNIT_STATIC_CAST( FixtureType *, - TestSuiteBuilderContextBase::makeTestFixture() ); - } -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - -#endif // CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteFactory.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteFactory.h deleted file mode 100644 index 260b4831..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TestSuiteFactory.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H -#define CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H - -#include - -CPPUNIT_NS_BEGIN - - - class Test; - - /*! \brief TestFactory for TestFixture that implements a static suite() method. - * \see AutoRegisterSuite. - */ - template - class TestSuiteFactory : public TestFactory - { - public: - virtual Test *makeTest() - { - return TestCaseType::suite(); - } - }; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TypeInfoHelper.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TypeInfoHelper.h deleted file mode 100644 index c0ecdbc6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/extensions/TypeInfoHelper.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CPPUNIT_TYPEINFOHELPER_H -#define CPPUNIT_TYPEINFOHELPER_H - -#include - -#if CPPUNIT_HAVE_RTTI - -#include -#include - -CPPUNIT_NS_BEGIN - - - /**! \brief Helper to use type_info. - */ - class CPPUNIT_API TypeInfoHelper - { - public: - /*! \brief Get the class name of the specified type_info. - * \param info Info which the class name is extracted from. - * \return The string returned by type_info::name() without - * the "class" prefix. If the name is not prefixed - * by "class", it is returned as this. - */ - static std::string getClassName( const std::type_info &info ); - }; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_HAVE_RTTI - -#endif // CPPUNIT_TYPEINFOHELPER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManager.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManager.h deleted file mode 100644 index d70ccde4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManager.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H -#define CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H - -#include -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -CPPUNIT_NS_BEGIN - - -/*! \brief Manages dynamic libraries. - * - * The Dynamic Library Manager provides a platform independent way to work with - * dynamic library. It load a specific dynamic library, and can returns specific - * symbol exported by the dynamic library. - * - * If an error occurs, a DynamicLibraryManagerException is thrown. - * - * \internal Implementation of the OS independent methods is in - * DynamicLibraryManager.cpp. - * - * \internal Porting to a new platform: - * - Adds platform detection in config/SelectDllLoader.h. Should define a specific - * macro for that platform of the form: CPPUNIT_HAVE_XYZ_DLL_LOADER, where - * XYZ is the platform. - * - Makes a copy of UnixDynamicLibraryManager.cpp and named it after the platform. - * - Updated the 'guard' in your file (CPPUNIT_HAVE_XYZ_DLL_LOADER) so that it is - * only processed if the matching platform has been detected. - * - Change the implementation of methods doLoadLibrary(), doReleaseLibrary(), - * doFindSymbol() in your copy. Those methods usually maps directly to OS calls. - * - Adds the file to the project. - */ -class DynamicLibraryManager -{ -public: - typedef void *Symbol; - typedef void *LibraryHandle; - - /*! \brief Loads the specified library. - * \param libraryFileName Name of the library to load. - * \exception DynamicLibraryManagerException if a failure occurs while loading - * the library (fail to found or load the library). - */ - DynamicLibraryManager( const std::string &libraryFileName ); - - /// Releases the loaded library.. - ~DynamicLibraryManager(); - - /*! \brief Returns a pointer on the specified symbol exported by the library. - * \param symbol Name of the symbol exported by the library. - * \return Pointer on the symbol. Should be casted to the actual type. Never \c NULL. - * \exception DynamicLibraryManagerException if the symbol is not found. - */ - Symbol findSymbol( const std::string &symbol ); - -private: - /*! Loads the specified library. - * \param libraryName Name of the library to load. - * \exception DynamicLibraryManagerException if a failure occurs while loading - * the library (fail to found or load the library). - */ - void loadLibrary( const std::string &libraryName ); - - /*! Releases the loaded library. - * - * \warning Must NOT throw any exceptions (called from destructor). - */ - void releaseLibrary(); - - /*! Loads the specified library. - * - * May throw any exceptions (indicates failure). - * \param libraryName Name of the library to load. - * \return Handle of the loaded library. \c NULL indicates failure. - */ - LibraryHandle doLoadLibrary( const std::string &libraryName ); - - /*! Releases the loaded library. - * - * The handle of the library to free is in \c m_libraryHandle. It is never - * \c NULL. - * \warning Must NOT throw any exceptions (called from destructor). - */ - void doReleaseLibrary(); - - /*! Returns a pointer on the specified symbol exported by the library. - * - * May throw any exceptions (indicates failure). - * \param symbol Name of the symbol exported by the library. - * \return Pointer on the symbol. \c NULL indicates failure. - */ - Symbol doFindSymbol( const std::string &symbol ); - - /*! Returns detailed information about doLoadLibrary() failure. - * - * Called just after a failed call to doLoadLibrary() to get extra - * error information. - * - * \return Detailed information about the failure of the call to - * doLoadLibrary() that just failed. - */ - std::string getLastErrorDetail() const; - - /// Prevents the use of the copy constructor. - DynamicLibraryManager( const DynamicLibraryManager © ); - - /// Prevents the use of the copy operator. - void operator =( const DynamicLibraryManager © ); - -private: - LibraryHandle m_libraryHandle; - std::string m_libraryName; -}; - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - -#endif // CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManagerException.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManagerException.h deleted file mode 100644 index 11ebbd9d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/DynamicLibraryManagerException.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H -#define CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H - -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) -#include -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief Exception thrown by DynamicLibraryManager when a failure occurs. - * - * Use getCause() to know what function caused the failure. - * - */ -class DynamicLibraryManagerException : public std::runtime_error -{ -public: - enum Cause - { - /// Failed to load the dynamic library - loadingFailed =0, - /// Symbol not found in the dynamic library - symbolNotFound - }; - - /// Failed to load the dynamic library or Symbol not found in the dynamic library. - DynamicLibraryManagerException( const std::string &libraryName, - const std::string &errorDetail, - Cause cause ); - - ~DynamicLibraryManagerException() throw() - { - } - - Cause getCause() const; - - const char *what() const throw(); - -private: - std::string m_message; - Cause m_cause; -}; - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - -#endif // CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.am deleted file mode 100644 index 5221a669..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/plugin - -libcppunitinclude_HEADERS = \ - DynamicLibraryManager.h \ - DynamicLibraryManagerException.h \ - TestPlugIn.h \ - TestPlugInDefaultImpl.h \ - PlugInManager.h \ - PlugInParameters.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.in deleted file mode 100644 index c97e6e4d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/Makefile.in +++ /dev/null @@ -1,437 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/plugin -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/plugin -libcppunitinclude_HEADERS = \ - DynamicLibraryManager.h \ - DynamicLibraryManagerException.h \ - TestPlugIn.h \ - TestPlugInDefaultImpl.h \ - PlugInManager.h \ - PlugInParameters.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/plugin/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/plugin/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInManager.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInManager.h deleted file mode 100644 index 6ecedc89..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInManager.h +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_PLUGINMANAGER_H -#define CPPUNIT_PLUGIN_PLUGINMANAGER_H - -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -struct CppUnitTestPlugIn; - -CPPUNIT_NS_BEGIN - - -class DynamicLibraryManager; -class TestResult; -class XmlOutputter; - - -/*! \brief Manges TestPlugIn. - */ -class CPPUNIT_API PlugInManager -{ -public: - /*! Constructs a PlugInManager object. - */ - PlugInManager(); - - /// Destructor. - virtual ~PlugInManager(); - - /*! \brief Loads the specified plug-in. - * - * After being loaded, the CppUnitTestPlugIn::initialize() is called. - * - * \param libraryFileName Name of the file that contains the TestPlugIn. - * \param parameters List of string passed to the plug-in. - * \return Pointer on the DynamicLibraryManager associated to the library. - * Valid until the library is unloaded. Never \c NULL. - * \exception DynamicLibraryManagerException is thrown if an error occurs during loading. - */ - void load( const std::string &libraryFileName, - const PlugInParameters ¶meters = PlugInParameters() ); - - /*! \brief Unloads the specified plug-in. - * \param libraryFileName Name of the file that contains the TestPlugIn passed - * to a previous call to load(). - */ - void unload( const std::string &libraryFileName ); - - /*! \brief Gives a chance to each loaded plug-in to register TestListener. - * - * For each plug-in, call CppUnitTestPlugIn::addListener(). - */ - void addListener( TestResult *eventManager ); - - /*! \brief Gives a chance to each loaded plug-in to unregister TestListener. - * For each plug-in, call CppUnitTestPlugIn::removeListener(). - */ - void removeListener( TestResult *eventManager ); - - /*! \brief Provides a way for the plug-in to register some XmlOutputterHook. - */ - void addXmlOutputterHooks( XmlOutputter *outputter ); - - /*! \brief Called when the XmlOutputter is destroyed. - * - * Can be used to free some resources allocated by addXmlOutputterHooks(). - */ - void removeXmlOutputterHooks(); - -protected: - /*! \brief (INTERNAL) Information about a specific plug-in. - */ - struct PlugInInfo - { - std::string m_fileName; - DynamicLibraryManager *m_manager; - CppUnitTestPlugIn *m_interface; - }; - - /*! Unloads the specified plug-in. - * \param plugIn Information about the plug-in. - */ - void unload( PlugInInfo &plugIn ); - -private: - /// Prevents the use of the copy constructor. - PlugInManager( const PlugInManager © ); - - /// Prevents the use of the copy operator. - void operator =( const PlugInManager © ); - -private: - typedef CppUnitDeque PlugIns; - PlugIns m_plugIns; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - - -#endif // CPPUNIT_PLUGIN_PLUGINMANAGER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInParameters.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInParameters.h deleted file mode 100644 index c67d0f1d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/PlugInParameters.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_PARAMETERS -#define CPPUNIT_PLUGIN_PARAMETERS - -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -#include -#include - -CPPUNIT_NS_BEGIN - -/*! \brief Test plug-ins parameters. - */ -class CPPUNIT_API PlugInParameters -{ -public: - /// Constructs plug-in parameters from the specified command-line. - PlugInParameters( const std::string &commandLine = "" ); - - virtual ~PlugInParameters(); - - /// Returns the command line that was passed on construction. - std::string getCommandLine() const; - -private: - std::string m_commandLine; -}; - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - - -#endif // CPPUNIT_PLUGIN_PARAMETERS diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h deleted file mode 100644 index 1c9b929a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h +++ /dev/null @@ -1,200 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_TESTPLUGIN -#define CPPUNIT_PLUGIN_TESTPLUGIN - -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -#include - -CPPUNIT_NS_BEGIN - - -class Test; -class TestFactoryRegistry; -class TestResult; -class XmlOutputter; - -CPPUNIT_NS_END - -/*! \file - */ - - -/*! \brief Test plug-in interface. - * \ingroup WritingTestPlugIn - * - * This class define the interface implemented by test plug-in. A pointer to that - * interface is returned by the function exported by the test plug-in. - * - * Plug-in are loaded/unloaded by PlugInManager. When a plug-in is loaded, - * initialize() is called. Before unloading the plug-in, the PlugInManager - * call uninitialize(). - * - * addListener() and removeListener() are called respectively before and after - * the test run. - * - * addXmlOutputterHooks() and removeXmlOutputterHooks() are called respectively - * before and after writing the XML output using a XmlOutputter. - * - * \see CPPUNIT_PLUGIN_IMPLEMENT, CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL - * \see CppUnit::TestPlugInDefaultImpl, CppUnit::XmlOutputter. - */ -struct CppUnitTestPlugIn -{ - /*! \brief Called just after loading the dynamic library. - * - * Override this method to add additional suite to the registry, though this - * is preferably done using the macros (CPPUNIT_TEST_SUITE_REGISTRATION...). - * If you are creating a custom listener to extends the plug-in runner, - * you can use this to configure the listener using the \a parameters. - * - * You could also use the parameters to specify some global parameter, such - * as test datas location, database name... - * - * N.B.: Parameters interface is not define yet, and the plug-in runner does - * not yet support plug-in parameter. - */ - virtual void initialize( CPPUNIT_NS::TestFactoryRegistry *registry, - const CPPUNIT_NS::PlugInParameters ¶meters ) =0; - - /*! \brief Gives a chance to the plug-in to register TestListener. - * - * Override this method to add a TestListener for the test run. This is useful - * if you are writing a custom TestListener, but also if you need to - * setUp some global resource: listen to TestListener::startTestRun(), - * and TestListener::endTestRun(). - */ - virtual void addListener( CPPUNIT_NS::TestResult *eventManager ) =0; - - /*! \brief Gives a chance to the plug-in to remove its registered TestListener. - * - * Override this method to remove a TestListener that has been added. - */ - virtual void removeListener( CPPUNIT_NS::TestResult *eventManager ) =0; - - /*! \brief Provides a way for the plug-in to register some XmlOutputterHook. - */ - virtual void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) =0; - - /*! \brief Called when the XmlOutputter is destroyed. - * - * Can be used to free some resources allocated by addXmlOutputterHooks(). - */ - virtual void removeXmlOutputterHooks() = 0; - - /*! \brief Called just before unloading the dynamic library. - * - * Override this method to unregister test factory added in initialize(). - * This is necessary to keep the TestFactoryRegistry 'clean'. When - * the plug-in is unloaded from memory, the TestFactoryRegistry will hold - * reference on test that are no longer available if they are not - * unregistered. - */ - virtual void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) =0; - - virtual ~CppUnitTestPlugIn() {} -}; - - - -/*! \brief Name of the function exported by a test plug-in. - * \ingroup WritingTestPlugIn - * - * The signature of the exported function is: - * \code - * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void); - * \endcode - */ -#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn - -/*! \brief Type of the function exported by a plug-in. - * \ingroup WritingTestPlugIn - */ -typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); - - -/*! \brief Implements the function exported by the test plug-in - * \ingroup WritingTestPlugIn - */ -#define CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( TestPlugInInterfaceType ) \ - CPPUNIT_PLUGIN_EXPORT CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void) \ - { \ - static TestPlugInInterfaceType plugIn; \ - return &plugIn; \ - } \ - typedef char __CppUnitPlugInExportFunctionDummyTypeDef // dummy typedef so it can end with ';' - - -// Note: This include should remain after definition of CppUnitTestPlugIn -#include - - -/*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN() - * \brief Implements the 'main' function for the plug-in. - * - * This macros implements the main() function for dynamic library. - * For example, WIN32 requires a DllMain function, while some Unix - * requires a main() function. This macros takes care of the implementation. - */ - -// Win32 -#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER) -#if !defined(APIENTRY) -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOUSER -#define NOKERNEL -#define NOSOUND -#define NOMINMAX -#define BLENDFUNCTION void // for mingw & gcc -#include -#endif -#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ - BOOL APIENTRY DllMain( HANDLE hModule, \ - DWORD ul_reason_for_call, \ - LPVOID lpReserved ) \ - { \ - return TRUE; \ - } \ - typedef char __CppUnitPlugInImplementMainDummyTypeDef - -// Unix -#elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) -#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ - int main( int argc, char *argv[] ) \ - { \ - return 0; \ - } \ - typedef char __CppUnitPlugInImplementMainDummyTypeDef - - -// Other -#else // other platforms don't require anything specifics -#endif - - - -/*! \brief Implements and exports the test plug-in interface. - * \ingroup WritingTestPlugIn - * - * This macro exports the test plug-in function using the subclass, - * and implements the 'main' function for the plug-in using - * CPPUNIT_PLUGIN_IMPLEMENT_MAIN(). - * - * When using this macro, CppUnit must be linked as a DLL (shared library). - * Otherwise, tests registered to the TestFactoryRegistry in the DLL will - * not be visible to the DllPlugInTester. - * - * \see CppUnitTestPlugIn - * \see CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL(), CPPUNIT_PLUGIN_IMPLEMENT_MAIN(). - */ -#define CPPUNIT_PLUGIN_IMPLEMENT() \ - CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS::TestPlugInDefaultImpl ); \ - CPPUNIT_PLUGIN_IMPLEMENT_MAIN() - - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - - -#endif // CPPUNIT_PLUGIN_TESTPLUGIN diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugInDefaultImpl.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugInDefaultImpl.h deleted file mode 100644 index fa4b8078..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/plugin/TestPlugInDefaultImpl.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef CPPUNIT_PLUGIN_TESTPLUGINADAPTER -#define CPPUNIT_PLUGIN_TESTPLUGINADAPTER - -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -#include - -CPPUNIT_NS_BEGIN - - -class TestSuite; - - -/*! \brief Default implementation of test plug-in interface. - * \ingroup WritingTestPlugIn - * - * Override getSuiteName() to specify the suite name. Default is "All Tests". - * - * CppUnitTestPlugIn::getTestSuite() returns a suite that contains - * all the test registered to the default test factory registry - * ( TestFactoryRegistry::getRegistry() ). - * - */ -class CPPUNIT_API TestPlugInDefaultImpl : public CppUnitTestPlugIn -{ -public: - TestPlugInDefaultImpl(); - - virtual ~TestPlugInDefaultImpl(); - - void initialize( TestFactoryRegistry *registry, - const PlugInParameters ¶meters ); - - void addListener( TestResult *eventManager ); - - void removeListener( TestResult *eventManager ); - - void addXmlOutputterHooks( XmlOutputter *outputter ); - - void removeXmlOutputterHooks(); - - void uninitialize( TestFactoryRegistry *registry ); -}; - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) - -#endif // CPPUNIT_PLUGIN_TESTPLUGINADAPTER diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitDeque.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitDeque.h deleted file mode 100644 index bbab21f5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitDeque.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_CPPUNITDEQUE_H -#define CPPUNIT_PORTABILITY_CPPUNITDEQUE_H - -// The technic used is similar to the wrapper of STLPort. - -#include -#include - - -#if CPPUNIT_STD_NEED_ALLOCATOR - -template -class CppUnitDeque : public std::deque -{ -public: -}; - -#else // CPPUNIT_STD_NEED_ALLOCATOR - -#define CppUnitDeque std::deque - -#endif - -#endif // CPPUNIT_PORTABILITY_CPPUNITDEQUE_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitMap.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitMap.h deleted file mode 100644 index 0cdc723a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitMap.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_CPPUNITMAP_H -#define CPPUNIT_PORTABILITY_CPPUNITMAP_H - -// The technic used is similar to the wrapper of STLPort. - -#include -#include -#include - - -#if CPPUNIT_STD_NEED_ALLOCATOR - -template -class CppUnitMap : public std::map - ,CPPUNIT_STD_ALLOCATOR> -{ -public: -}; - -#else // CPPUNIT_STD_NEED_ALLOCATOR - -#define CppUnitMap std::map - -#endif - -#endif // CPPUNIT_PORTABILITY_CPPUNITMAP_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitSet.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitSet.h deleted file mode 100644 index 18b8662e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitSet.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_CPPUNITSET_H -#define CPPUNIT_PORTABILITY_CPPUNITSET_H - -// The technic used is similar to the wrapper of STLPort. - -#include -#include -#include - - -#if CPPUNIT_STD_NEED_ALLOCATOR - -template -class CppUnitSet : public std::set - ,CPPUNIT_STD_ALLOCATOR> -{ -public: -}; - -#else // CPPUNIT_STD_NEED_ALLOCATOR - -#define CppUnitSet std::set - -#endif - -#endif // CPPUNIT_PORTABILITY_CPPUNITSET_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitStack.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitStack.h deleted file mode 100644 index bc7785b0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitStack.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_CPPUNITSTACK_H -#define CPPUNIT_PORTABILITY_CPPUNITSTACK_H - -// The technic used is similar to the wrapper of STLPort. - -#include -#include -#include - - -#if CPPUNIT_STD_NEED_ALLOCATOR - -template -class CppUnitStack : public std::stack > -{ -public: -}; - -#else // CPPUNIT_STD_NEED_ALLOCATOR - -#define CppUnitStack std::stack - -#endif - -#endif // CPPUNIT_PORTABILITY_CPPUNITSTACK_H \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitVector.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitVector.h deleted file mode 100644 index 6666a63b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/CppUnitVector.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_CPPUNITVECTOR_H -#define CPPUNIT_PORTABILITY_CPPUNITVECTOR_H - -// The technic used is similar to the wrapper of STLPort. - -#include -#include - - -#if CPPUNIT_STD_NEED_ALLOCATOR - -template -class CppUnitVector : public std::vector -{ -public: -}; - -#else // CPPUNIT_STD_NEED_ALLOCATOR - -#define CppUnitVector std::vector - -#endif - -#endif // CPPUNIT_PORTABILITY_CPPUNITVECTOR_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h deleted file mode 100644 index e8c91b3f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED -#define CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED - -#include -#include - -CPPUNIT_NS_BEGIN - -/// \brief Tests if a floating-point is a NaN. -// According to IEEE-754 floating point standard, -// (see e.g. page 8 of -// http://www.cs.berkeley.edu/~wkahan/ieee754status/ieee754.ps) -// all comparisons with NaN are false except "x != x", which is true. -// -// At least Microsoft Visual Studio 6 is known not to implement this test correctly. -// It emits the following code to test equality: -// fcomp qword ptr [nan] -// fnstsw ax // copie fp (floating-point) status register to ax -// test ah,40h // test bit 14 of ax (0x4000) => C3 of fp status register -// According to the following documentation on the x86 floating point status register, -// the C2 bit should be tested to test for NaN value. -// http://webster.cs.ucr.edu/AoA/Windows/HTML/RealArithmetic.html#1000117 -// In Microsoft Visual Studio 2003 & 2005, the test is implemented with: -// test ah,44h // Visual Studio 2005 test both C2 & C3... -// -// To work around this, a NaN is assumed to be detected if no strict ordering is found. -inline bool floatingPointIsUnordered( double x ) -{ - // x != x will detect a NaN on conformant platform - // (2.0 < x && x < 1.0) will detect a NaN on non conformant platform: - // => no ordering can be found for x. - return (x != x) || (2.0 < x && x < 1.0); -} - - -/// \brief Tests if a floating-point is finite. -/// @return \c true if x is neither a NaN, nor +inf, nor -inf, \c false otherwise. -inline int floatingPointIsFinite( double x ) -{ -#if defined(CPPUNIT_HAVE_ISFINITE) - return isfinite( x ); -#elif defined(CPPUNIT_HAVE_FINITE) - return finite( x ); -#elif defined(CPPUNIT_HAVE__FINITE) - return _finite(x); -#else - double testInf = x * 0.0; // Produce 0.0 if x is finite, a NaN otherwise. - return testInf == 0.0 && !floatingPointIsUnordered(testInf); -#endif -} - -CPPUNIT_NS_END - -#endif // CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.am deleted file mode 100644 index 2caeb321..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/portability - -libcppunitinclude_HEADERS = \ - CppUnitDeque.h \ - CppUnitMap.h \ - CppUnitSet.h \ - CppUnitStack.h \ - CppUnitVector.h \ - FloatingPoint.h \ - Stream.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.in deleted file mode 100644 index 80278e97..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Makefile.in +++ /dev/null @@ -1,438 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/portability -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/portability -libcppunitinclude_HEADERS = \ - CppUnitDeque.h \ - CppUnitMap.h \ - CppUnitSet.h \ - CppUnitStack.h \ - CppUnitVector.h \ - FloatingPoint.h \ - Stream.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/portability/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/portability/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Stream.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Stream.h deleted file mode 100644 index e9beb8c1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/portability/Stream.h +++ /dev/null @@ -1,347 +0,0 @@ -#ifndef CPPUNIT_PORTABILITY_STREAM_H_INCLUDED -#define CPPUNIT_PORTABILITY_STREAM_H_INCLUDED - -// This module define: -// Type CppUT::Stream (either std::stream or a custom type) -// Type CppUT::OStringStream (eitjer std::ostringstream, older alternate or a custom type) -// Functions stdCOut() & stdCErr() which returns a reference on cout & cerr stream (or our -// custom stream). - -#include - - -#if defined( CPPUNIT_NO_STREAM ) - -#include -#include -#include - -CPPUNIT_NS_BEGIN - -class StreamBuffer -{ -public: - virtual ~StreamBuffer() {} - - virtual void write( const char *text, unsigned int length ) = 0; - - virtual void flush() {} -}; - - -class StringStreamBuffer : public StreamBuffer -{ -public: - std::string str() const - { - return str_; - } - -public: // overridden from StreamBuffer - void write( const char *text, unsigned int length ) - { - str_.append( text, length ); - } - -private: - std::string str_; -}; - - -class FileStreamBuffer : public StreamBuffer -{ -public: - FileStreamBuffer( FILE *file ) - : file_( file ) - { - } - - FILE *file() const - { - return file_; - } - -public: // overridden from StreamBuffer - void write( const char *text, unsigned int length ) - { - if ( file_ ) - fwrite( text, sizeof(char), length, file_ ); - } - - void flush() - { - if ( file_ ) - fflush( file_ ); - } - -private: - FILE *file_; -}; - - -class OStream -{ -public: - OStream() - : buffer_( 0 ) - { - } - - OStream( StreamBuffer *buffer ) - : buffer_( buffer ) - { - } - - virtual ~OStream() - { - flush(); - } - - OStream &flush() - { - if ( buffer_ ) - buffer_->flush(); - return *this; - } - - void setBuffer( StreamBuffer *buffer ) - { - buffer_ = buffer; - } - - OStream &write( const char *text, unsigned int length ) - { - if ( buffer_ ) - buffer_->write( text, length ); - return *this; - } - - OStream &write( const char *text ) - { - return write( text, strlen(text) ); - } - - OStream &operator <<( bool v ) - { - const char *out = v ? "true" : "false"; - return write( out ); - } - - OStream &operator <<( short v ) - { - char buffer[64]; - sprintf( buffer, "%hd", v ); - return write( buffer ); - } - - OStream &operator <<( unsigned short v ) - { - char buffer[64]; - sprintf( buffer, "%hu", v ); - return write( buffer ); - } - - OStream &operator <<( int v ) - { - char buffer[64]; - sprintf( buffer, "%d", v ); - return write( buffer ); - } - - OStream &operator <<( unsigned int v ) - { - char buffer[64]; - sprintf( buffer, "%u", v ); - return write( buffer ); - } - - OStream &operator <<( long v ) - { - char buffer[64]; - sprintf( buffer, "%ld", v ); - return write( buffer ); - } - - OStream &operator <<( unsigned long v ) - { - char buffer[64]; - sprintf( buffer, "%lu", v ); - return write( buffer ); - } - - OStream &operator <<( float v ) - { - char buffer[128]; - sprintf( buffer, "%.16g", double(v) ); - return write( buffer ); - } - - OStream &operator <<( double v ) - { - char buffer[128]; - sprintf( buffer, "%.16g", v ); - return write( buffer ); - } - - OStream &operator <<( long double v ) - { - char buffer[128]; - sprintf( buffer, "%.16g", double(v) ); - return write( buffer ); - } - - OStream &operator <<( const void *v ) - { - char buffer[64]; - sprintf( buffer, "%p", v ); - return write( buffer ); - } - - OStream &operator <<( const char *v ) - { - return write( v ? v : "NULL" ); - } - - OStream &operator <<( char c ) - { - char buffer[16]; - sprintf( buffer, "%c", c ); - return write( buffer ); - } - - OStream &operator <<( const std::string &s ) - { - return write( s.c_str(), s.length() ); - } - -private: - StreamBuffer *buffer_; -}; - - -class OStringStream : public OStream -{ -public: - OStringStream() - : OStream( &buffer_ ) - { - } - - std::string str() const - { - return buffer_.str(); - } - -private: - StringStreamBuffer buffer_; -}; - - -class OFileStream : public OStream -{ -public: - OFileStream( FILE *file ) - : OStream( &buffer_ ) - , buffer_( file ) - , ownFile_( false ) - { - } - - OFileStream( const char *path ) - : OStream( &buffer_ ) - , buffer_( fopen( path, "wt" ) ) - , ownFile_( true ) - { - } - - virtual ~OFileStream() - { - if ( ownFile_ && buffer_.file() ) - fclose( buffer_.file() ); - } - -private: - FileStreamBuffer buffer_; - bool ownFile_; -}; - -inline OStream &stdCOut() -{ - static OFileStream stream( stdout ); - return stream; -} - -inline OStream &stdCErr() -{ - static OFileStream stream( stderr ); - return stream; -} - -CPPUNIT_NS_END - -#elif CPPUNIT_HAVE_SSTREAM // #if defined( CPPUNIT_NO_STREAM ) -# include -# include - - CPPUNIT_NS_BEGIN - typedef std::ostringstream OStringStream; // The standard C++ way - typedef std::ofstream OFileStream; - CPPUNIT_NS_END - - -#elif CPPUNIT_HAVE_CLASS_STRSTREAM -# include -# if CPPUNIT_HAVE_STRSTREAM -# include -# else // CPPUNIT_HAVE_STRSTREAM -# include -# endif // CPPUNIT_HAVE_CLASS_STRSTREAM - - CPPUNIT_NS_BEGIN - - class OStringStream : public std::ostrstream - { - public: - std::string str() - { -// (*this) << '\0'; -// std::string msg(std::ostrstream::str()); -// std::ostrstream::freeze(false); -// return msg; -// Alternative implementation that don't rely on freeze which is not -// available on some platforms: - return std::string( std::ostrstream::str(), pcount() ); - } - }; - - CPPUNIT_NS_END -#else // CPPUNIT_HAVE_CLASS_STRSTREAM -# error Cannot define CppUnit::OStringStream. -#endif // #if defined( CPPUNIT_NO_STREAM ) - - - -#if !defined( CPPUNIT_NO_STREAM ) - -#include - - CPPUNIT_NS_BEGIN - - typedef std::ostream OStream; - - inline OStream &stdCOut() - { - return std::cout; - } - - inline OStream &stdCErr() - { - return std::cerr; - } - - CPPUNIT_NS_END - -#endif // #if !defined( CPPUNIT_NO_STREAM ) - -#endif // CPPUNIT_PORTABILITY_STREAM_H_INCLUDED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Algorithm.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Algorithm.h deleted file mode 100644 index e5746a2b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Algorithm.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED -#define CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED - -#include - -CPPUNIT_NS_BEGIN - -template -void -removeFromSequence( SequenceType &sequence, - const ValueType &valueToRemove ) -{ - for ( unsigned int index =0; index < sequence.size(); ++index ) - { - if ( sequence[ index ] == valueToRemove ) - sequence.erase( sequence.begin() + index ); - } -} - -CPPUNIT_NS_END - - -#endif // CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.am deleted file mode 100644 index 8ce08086..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/tools - -libcppunitinclude_HEADERS = \ - Algorithm.h \ - StringTools.h \ - XmlElement.h \ - XmlDocument.h \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.in deleted file mode 100644 index 5b7d3e6c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/Makefile.in +++ /dev/null @@ -1,435 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/tools -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/tools -libcppunitinclude_HEADERS = \ - Algorithm.h \ - StringTools.h \ - XmlElement.h \ - XmlDocument.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/tools/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/tools/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/StringTools.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/StringTools.h deleted file mode 100644 index 7a6b6d71..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/StringTools.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CPPUNIT_TOOLS_STRINGTOOLS_H -#define CPPUNIT_TOOLS_STRINGTOOLS_H - -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -/*! \brief Tool functions to manipulate string. - */ -struct StringTools -{ - - typedef CppUnitVector Strings; - - static std::string CPPUNIT_API toString( int value ); - - static std::string CPPUNIT_API toString( double value ); - - static Strings CPPUNIT_API split( const std::string &text, - char separator ); - - static std::string CPPUNIT_API wrap( const std::string &text, - int wrapColumn = CPPUNIT_WRAP_COLUMN ); - -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TOOLS_STRINGTOOLS_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlDocument.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlDocument.h deleted file mode 100644 index 4ee73257..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlDocument.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef CPPUNIT_TOOLS_XMLDOCUMENT_H -#define CPPUNIT_TOOLS_XMLDOCUMENT_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include - - -CPPUNIT_NS_BEGIN - - -class XmlElement; - - -/*! \brief A XML Document. - * - * A XmlDocument represents a XML file. It holds a pointer on the root XmlElement - * of the document. It also holds the encoding and style sheet used. - * - * By default, the XML document is stand-alone and tagged with enconding "ISO-8859-1". - */ -class CPPUNIT_API XmlDocument -{ -public: - /*! \brief Constructs a XmlDocument object. - * \param encoding Encoding used in the XML file (default is Latin-1, ISO-8859-1 ). - * \param styleSheet Name of the XSL style sheet file used. If empty then no - * style sheet will be specified in the output. - */ - XmlDocument( const std::string &encoding = "", - const std::string &styleSheet = "" ); - - /// Destructor. - virtual ~XmlDocument(); - - std::string encoding() const; - void setEncoding( const std::string &encoding = "" ); - - std::string styleSheet() const; - void setStyleSheet( const std::string &styleSheet = "" ); - - bool standalone() const; - - /*! \brief set the output document as standalone or not. - * - * For the output document, specify wether it's a standalone XML - * document, or not. - * - * \param standalone if true, the output will be specified as standalone. - * if false, it will be not. - */ - void setStandalone( bool standalone ); - - void setRootElement( XmlElement *rootElement ); - XmlElement &rootElement() const; - - std::string toString() const; - -private: - /// Prevents the use of the copy constructor. - XmlDocument( const XmlDocument © ); - - /// Prevents the use of the copy operator. - void operator =( const XmlDocument © ); - -protected: - std::string m_encoding; - std::string m_styleSheet; - XmlElement *m_rootElement; - bool m_standalone; -}; - - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -CPPUNIT_NS_END - -#endif // CPPUNIT_TOOLS_XMLDOCUMENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlElement.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlElement.h deleted file mode 100644 index 0b36bd23..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/tools/XmlElement.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef CPPUNIT_TOOLS_XMLELEMENT_H -#define CPPUNIT_TOOLS_XMLELEMENT_H - -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - -#include -#include - - -CPPUNIT_NS_BEGIN - - -class XmlElement; - -#if CPPUNIT_NEED_DLL_DECL -// template class CPPUNIT_API std::deque; -#endif - - -/*! \brief A XML Element. - * - * A XML element has: - * - a name, specified on construction, - * - a content, specified on construction (may be empty), - * - zero or more attributes, added with addAttribute(), - * - zero or more child elements, added with addElement(). - */ -class CPPUNIT_API XmlElement -{ -public: - /*! \brief Constructs an element with the specified name and string content. - * \param elementName Name of the element. Must not be empty. - * \param content Content of the element. - */ - XmlElement( std::string elementName, - std::string content ="" ); - - /*! \brief Constructs an element with the specified name and numeric content. - * \param elementName Name of the element. Must not be empty. - * \param numericContent Content of the element. - */ - XmlElement( std::string elementName, - int numericContent ); - - /*! \brief Destructs the element and its child elements. - */ - virtual ~XmlElement(); - - /*! \brief Returns the name of the element. - * \return Name of the element. - */ - std::string name() const; - - /*! \brief Returns the content of the element. - * \return Content of the element. - */ - std::string content() const; - - /*! \brief Sets the name of the element. - * \param name New name for the element. - */ - void setName( const std::string &name ); - - /*! \brief Sets the content of the element. - * \param content New content for the element. - */ - void setContent( const std::string &content ); - - /*! \overload void setContent( const std::string &content ) - */ - void setContent( int numericContent ); - - /*! \brief Adds an attribute with the specified string value. - * \param attributeName Name of the attribute. Must not be an empty. - * \param value Value of the attribute. - */ - void addAttribute( std::string attributeName, - std::string value ); - - /*! \brief Adds an attribute with the specified numeric value. - * \param attributeName Name of the attribute. Must not be empty. - * \param numericValue Numeric value of the attribute. - */ - void addAttribute( std::string attributeName, - int numericValue ); - - /*! \brief Adds a child element to the element. - * \param element Child element to add. Must not be \c NULL. - */ - void addElement( XmlElement *element ); - - /*! \brief Returns the number of child elements. - * \return Number of child elements (element added with addElement()). - */ - int elementCount() const; - - /*! \brief Returns the child element at the specified index. - * \param index Zero based index of the element to return. - * \returns Element at the specified index. Never \c NULL. - * \exception std::invalid_argument if \a index < 0 or index >= elementCount(). - */ - XmlElement *elementAt( int index ) const; - - /*! \brief Returns the first child element with the specified name. - * \param name Name of the child element to return. - * \return First child element found which is named \a name. - * \exception std::invalid_argument if there is no child element with the specified - * name. - */ - XmlElement *elementFor( const std::string &name ) const; - - /*! \brief Returns a XML string that represents the element. - * \param indent String of spaces representing the amount of 'indent'. - * \return XML string that represents the element, its attributes and its - * child elements. - */ - std::string toString( const std::string &indent = "" ) const; - -private: - typedef std::pair Attribute; - - std::string attributesAsString() const; - std::string escape( std::string value ) const; - -private: - std::string m_name; - std::string m_content; - - typedef CppUnitDeque Attributes; - Attributes m_attributes; - - typedef CppUnitDeque Elements; - Elements m_elements; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - - -#endif // CPPUNIT_TOOLS_XMLELEMENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.am deleted file mode 100644 index 1b9f08ef..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = text mfc qt diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.in deleted file mode 100644 index e8a9d590..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/Makefile.in +++ /dev/null @@ -1,511 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = text mfc qt -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/ui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/ui/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 - -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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-recursive \ - 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.am deleted file mode 100644 index 1ea8b5ed..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/ui/mfc - -libcppunitinclude_HEADERS = \ - TestRunner.h \ - MfcTestRunner.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.in deleted file mode 100644 index abe488a1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/Makefile.in +++ /dev/null @@ -1,433 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/ui/mfc -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/ui/mfc -libcppunitinclude_HEADERS = \ - TestRunner.h \ - MfcTestRunner.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/ui/mfc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/ui/mfc/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/MfcTestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/MfcTestRunner.h deleted file mode 100644 index 6a5f7b77..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/MfcTestRunner.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef CPPUNITUI_MFC_MFCTESTRUNNER_H -#define CPPUNITUI_MFC_MFCTESTRUNNER_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#include -#include - -/* Refer to MSDN documentation to know how to write and use MFC extension DLL: - mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll - - This can be found in the index with "mfc extension" - The basic: - Using: - - your application must use MFC DLL - - memory allocation is done using the same heap - - you must define the symbol _AFX_DLL - - Building: - - you must define the symbol _AFX_DLL and _AFX_EXT - - export class using AFX_EXT_CLASS - */ - -CPPUNIT_NS_BEGIN - - class Test; - class TestSuite; - - -/*! \brief MFC test runner. - * \ingroup ExecutingTest - * - * Use this to launch the MFC TestRunner. Usually called from you CWinApp subclass: - * - * \code - * #include - * #include - * - * void - * CHostAppApp::RunUnitTests() - * { - * CppUnit::MfcTestRunner runner; - * runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); - * - * runner.run(); - * } - * \endcode - * \see CppUnit::TextTestRunner, CppUnit::TestFactoryRegistry. - */ -class AFX_EXT_CLASS MfcTestRunner -{ -public: - MfcTestRunner(); - virtual ~MfcTestRunner(); - - void run(); - - void addTest( Test *test ); - - void addTests( const CppUnitVector &tests ); - -protected: - Test *getRootTest(); - - TestSuite *m_suite; - - typedef CppUnitVector Tests; - Tests m_tests; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNITUI_MFC_MFCTESTRUNNER_H \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/TestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/TestRunner.h deleted file mode 100644 index c4d6affa..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/mfc/TestRunner.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CPPUNITUI_MFC_TESTRUNNER_H -#define CPPUNITUI_MFC_TESTRUNNER_H - -#include - -CPPUNIT_NS_BEGIN - -#if defined(CPPUNIT_HAVE_NAMESPACES) -namespace MfcUi -{ - /*! Mfc TestRunner (DEPRECATED). - * \deprecated Use CppUnit::MfcTestRunner instead. - */ - typedef CPPUNIT_NS::MfcTestRunner TestRunner; -} -#endif // defined(CPPUNIT_HAVE_NAMESPACES) - -CPPUNIT_NS_END - - -#endif // CPPUNITUI_MFC_TESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Config.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Config.h deleted file mode 100644 index beaf9ad4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Config.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CPPUNIT_QTUI_CONFIG_H -#define CPPUNIT_QTUI_CONFIG_H - -/*! Macro to export symbol to DLL with VC++. - * - * - QTTESTRUNNER_DLL_BUILD must be defined when building the DLL. - * - QTTESTRUNNER_DLL must be defined if linking against the DLL. - * - If none of the above are defined then you are building or linking against - * the static library. - */ - -#if defined( QTTESTRUNNER_DLL_BUILD ) -# define QTTESTRUNNER_API __declspec(dllexport) -#elif defined ( QTTESTRUNNER_DLL ) -# define QTTESTRUNNER_API __declspec(dllimport) -#else -# define QTTESTRUNNER_API -#endif - - -#endif // CPPUNIT_QTUI_CONFIG_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.am deleted file mode 100644 index 7d4fb46c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/ui/qt - -libcppunitinclude_HEADERS = \ - TestRunner.h \ - QtTestRunner.h \ - Config.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.in deleted file mode 100644 index 1154d400..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/Makefile.in +++ /dev/null @@ -1,434 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/ui/qt -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/ui/qt -libcppunitinclude_HEADERS = \ - TestRunner.h \ - QtTestRunner.h \ - Config.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/ui/qt/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/ui/qt/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/QtTestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/QtTestRunner.h deleted file mode 100644 index 4b6ab4e4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/QtTestRunner.h +++ /dev/null @@ -1,85 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunner.h for class TestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CPPUNIT_QTUI_QTTESTRUNNER_H -#define CPPUNIT_QTUI_QTTESTRUNNER_H - -#include -#include "Config.h" - -CPPUNIT_NS_BEGIN - - - class Test; - class TestSuite; - - -/*! - * \brief QT test runner. - * \ingroup ExecutingTest - * - * Here is an example of usage: - * \code - * #include - * #include - * - * [...] - * - * void - * QDepWindow::runTests() - * { - * CppUnit::QtUi::TestRunner runner; - * runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); - * runner.run( true ); - * } - * \endcode - * - */ -class QTTESTRUNNER_API QtTestRunner -{ -public: - /*! Constructs a TestRunner object. - */ - QtTestRunner(); - - /*! Destructor. - */ - virtual ~QtTestRunner(); - - void run( bool autoRun =false ); - - void addTest( Test *test ); - -private: - /// Prevents the use of the copy constructor. - QtTestRunner( const QtTestRunner © ); - - /// Prevents the use of the copy operator. - void operator =( const QtTestRunner © ); - - Test *getRootTest(); - -private: - typedef CppUnitVector Tests; - Tests *_tests; - - TestSuite *_suite; -}; - - -#if CPPUNIT_HAVE_NAMESPACES - namespace QtUi - { - /*! Qt TestRunner (DEPRECATED). - * \deprecated Use CppUnit::QtTestRunner instead. - */ - typedef CPPUNIT_NS::QtTestRunner TestRunner; - } -#endif - - -CPPUNIT_NS_END - -#endif // CPPUNIT_QTUI_QTTESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/TestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/TestRunner.h deleted file mode 100644 index 9c53e4ba..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/qt/TestRunner.h +++ /dev/null @@ -1,11 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunner.h for class TestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CPPUNIT_QTUI_TESTRUNNER_H -#define CPPUNIT_QTUI_TESTRUNNER_H - -#include - -#endif // CPPUNIT_QTUI_TESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.am deleted file mode 100644 index 5f01d814..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/ui/text - -libcppunitinclude_HEADERS = \ - TestRunner.h \ - TextTestRunner.h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.in deleted file mode 100644 index db794f69..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/Makefile.in +++ /dev/null @@ -1,433 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = include/cppunit/ui/text -DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libcppunitincludedir)" -libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libcppunitinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libcppunitincludedir = $(includedir)/cppunit/ui/text -libcppunitinclude_HEADERS = \ - TestRunner.h \ - TextTestRunner.h - -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/cppunit/ui/text/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/cppunit/ui/text/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 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)" - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -uninstall-libcppunitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libcppunitincludedir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libcppunitincludeHEADERS - -install-dvi: install-dvi-am - -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 - -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: uninstall-libcppunitincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-libcppunitincludeHEADERS 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 uninstall uninstall-am uninstall-libcppunitincludeHEADERS - -# 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/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TestRunner.h deleted file mode 100644 index 023eb834..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TestRunner.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CPPUNIT_UI_TEXT_TESTRUNNER_H -#define CPPUNIT_UI_TEXT_TESTRUNNER_H - -#include - - -#if defined(CPPUNIT_HAVE_NAMESPACES) - -CPPUNIT_NS_BEGIN -namespace TextUi -{ - - /*! Text TestRunner (DEPRECATED). - * \deprecated Use TextTestRunner instead. - */ - typedef TextTestRunner TestRunner; - -} -CPPUNIT_NS_END - -#endif // defined(CPPUNIT_HAVE_NAMESPACES) - - -#endif // CPPUNIT_UI_TEXT_TESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TextTestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TextTestRunner.h deleted file mode 100644 index 86da4d4b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/cppunit/ui/text/TextTestRunner.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H -#define CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H - - -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -class Outputter; -class Test; -class TestSuite; -class TextOutputter; -class TestResult; -class TestResultCollector; - - - -/*! - * \brief A text mode test runner. - * \ingroup WritingTestResult - * \ingroup ExecutingTest - * - * The test runner manage the life cycle of the added tests. - * - * The test runner can run only one of the added tests or all the tests. - * - * TestRunner prints out a trace as the tests are executed followed by a - * summary at the end. The trace and summary print are optional. - * - * Here is an example of use: - * - * \code - * CppUnit::TextTestRunner runner; - * runner.addTest( ExampleTestCase::suite() ); - * runner.run( "", true ); // Run all tests and wait - * \endcode - * - * The trace is printed using a TextTestProgressListener. The summary is printed - * using a TextOutputter. - * - * You can specify an alternate Outputter at construction - * or later with setOutputter(). - * - * After construction, you can register additional TestListener to eventManager(), - * for a custom progress trace, for example. - * - * \code - * CppUnit::TextTestRunner runner; - * runner.addTest( ExampleTestCase::suite() ); - * runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter( - * &runner.result(), - * std::cerr ) ); - * MyCustomProgressTestListener progress; - * runner.eventManager().addListener( &progress ); - * runner.run( "", true ); // Run all tests and wait - * \endcode - * - * \see CompilerOutputter, XmlOutputter, TextOutputter. - */ -class CPPUNIT_API TextTestRunner : public CPPUNIT_NS::TestRunner -{ -public: - TextTestRunner( Outputter *outputter =NULL ); - - virtual ~TextTestRunner(); - - bool run( std::string testPath ="", - bool doWait = false, - bool doPrintResult = true, - bool doPrintProgress = true ); - - void setOutputter( Outputter *outputter ); - - TestResultCollector &result() const; - - TestResult &eventManager() const; - -public: // overridden from TestRunner (to avoid hidden virtual function warning) - virtual void run( TestResult &controller, - const std::string &testPath = "" ); - -protected: - virtual void wait( bool doWait ); - virtual void printResult( bool doPrintResult ); - - TestResultCollector *m_result; - TestResult *m_eventManager; - Outputter *m_outputter; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/.cvsignore deleted file mode 100644 index e69de29b..00000000 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h deleted file mode 100644 index c19b4b07..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h +++ /dev/null @@ -1,190 +0,0 @@ -/* this ALWAYS GENERATED file contains the definitions for the interfaces */ - - -/* File created by MIDL compiler version 5.01.0164 */ -/* at Sat Apr 13 11:47:16 2002 - */ -/* Compiler settings for G:\prg\vc\Lib\cppunit\src\msvc6\DSPlugIn\TestRunnerDSPlugin.idl: - Os (OptLev=s), W1, Zp8, env=Win32, ms_ext, c_ext - error checks: allocation ref bounds_check enum stub_data -*/ -//@@MIDL_FILE_HEADING( ) - - -/* verify that the version is high enough to compile this file*/ -#ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 440 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __RPCNDR_H_VERSION__ -#error this stub requires an updated version of -#endif // __RPCNDR_H_VERSION__ - -#ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" -#endif /*COM_NO_WINDOWS_H*/ - -#ifndef __TestRunnerDSPluginVC6_h__ -#define __TestRunnerDSPluginVC6_h__ - -#ifdef __cplusplus -extern "C"{ -#endif - -/* Forward Declarations */ - -#ifndef __ITestRunnerDSPlugin_FWD_DEFINED__ -#define __ITestRunnerDSPlugin_FWD_DEFINED__ -typedef interface ITestRunnerDSPlugin ITestRunnerDSPlugin; -#endif /* __ITestRunnerDSPlugin_FWD_DEFINED__ */ - - -#ifndef __DSAddIn_FWD_DEFINED__ -#define __DSAddIn_FWD_DEFINED__ - -#ifdef __cplusplus -typedef class DSAddIn DSAddIn; -#else -typedef struct DSAddIn DSAddIn; -#endif /* __cplusplus */ - -#endif /* __DSAddIn_FWD_DEFINED__ */ - - -/* header files for imported files */ -#include "oaidl.h" -#include "ocidl.h" - -void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void __RPC_FAR * ); - -#ifndef __ITestRunnerDSPlugin_INTERFACE_DEFINED__ -#define __ITestRunnerDSPlugin_INTERFACE_DEFINED__ - -/* interface ITestRunnerDSPlugin */ -/* [oleautomation][unique][helpstring][uuid][object] */ - - -EXTERN_C const IID IID_ITestRunnerDSPlugin; - -#if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("3ADE0E37-5A56-4a68-BD8D-67E9E7502971") - ITestRunnerDSPlugin : public IUnknown - { - public: - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE goToLineInSourceCode( - /* [in] */ BSTR fileName, - /* [in] */ int lineNumber) = 0; - - }; - -#else /* C style interface */ - - typedef struct ITestRunnerDSPluginVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - ITestRunnerDSPlugin __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - ITestRunnerDSPlugin __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - ITestRunnerDSPlugin __RPC_FAR * This); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *goToLineInSourceCode )( - ITestRunnerDSPlugin __RPC_FAR * This, - /* [in] */ BSTR fileName, - /* [in] */ int lineNumber); - - END_INTERFACE - } ITestRunnerDSPluginVtbl; - - interface ITestRunnerDSPlugin - { - CONST_VTBL struct ITestRunnerDSPluginVtbl __RPC_FAR *lpVtbl; - }; - - - -#ifdef COBJMACROS - - -#define ITestRunnerDSPlugin_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - -#define ITestRunnerDSPlugin_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - -#define ITestRunnerDSPlugin_Release(This) \ - (This)->lpVtbl -> Release(This) - - -#define ITestRunnerDSPlugin_goToLineInSourceCode(This,fileName,lineNumber) \ - (This)->lpVtbl -> goToLineInSourceCode(This,fileName,lineNumber) - -#endif /* COBJMACROS */ - - -#endif /* C style interface */ - - - -/* [helpstring] */ HRESULT STDMETHODCALLTYPE ITestRunnerDSPlugin_goToLineInSourceCode_Proxy( - ITestRunnerDSPlugin __RPC_FAR * This, - /* [in] */ BSTR fileName, - /* [in] */ int lineNumber); - - -void __RPC_STUB ITestRunnerDSPlugin_goToLineInSourceCode_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - -#endif /* __ITestRunnerDSPlugin_INTERFACE_DEFINED__ */ - - - -#ifndef __TestRunnerDSPluginLib_LIBRARY_DEFINED__ -#define __TestRunnerDSPluginLib_LIBRARY_DEFINED__ - -/* library TestRunnerDSPluginLib */ -/* [helpstring][version][uuid] */ - - -EXTERN_C const IID LIBID_TestRunnerDSPluginLib; - -EXTERN_C const CLSID CLSID_DSAddIn; - -#ifdef __cplusplus - -class DECLSPEC_UUID("F193CE54-716C-41CB-80B2-FA74CA3EE2AC") -DSAddIn; -#endif -#endif /* __TestRunnerDSPluginLib_LIBRARY_DEFINED__ */ - -/* Additional Prototypes for ALL interfaces */ - -unsigned long __RPC_USER BSTR_UserSize( unsigned long __RPC_FAR *, unsigned long , BSTR __RPC_FAR * ); -unsigned char __RPC_FAR * __RPC_USER BSTR_UserMarshal( unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * ); -unsigned char __RPC_FAR * __RPC_USER BSTR_UserUnmarshal(unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * ); -void __RPC_USER BSTR_UserFree( unsigned long __RPC_FAR *, BSTR __RPC_FAR * ); - -/* end of Additional Prototypes */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c b/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c deleted file mode 100644 index 9490f9eb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c +++ /dev/null @@ -1,50 +0,0 @@ -/* this file contains the actual definitions of */ -/* the IIDs and CLSIDs */ - -/* link this file in with the server and any clients */ - - -/* File created by MIDL compiler version 5.01.0164 */ -/* at Sat Apr 13 11:47:16 2002 - */ -/* Compiler settings for G:\prg\vc\Lib\cppunit\src\msvc6\DSPlugIn\TestRunnerDSPlugin.idl: - Os (OptLev=s), W1, Zp8, env=Win32, ms_ext, c_ext - error checks: allocation ref bounds_check enum stub_data -*/ -//@@MIDL_FILE_HEADING( ) -#ifdef __cplusplus -extern "C"{ -#endif - - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - -typedef struct _IID -{ - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; -} IID; - -#endif // __IID_DEFINED__ - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED -typedef IID CLSID; -#endif // CLSID_DEFINED - -const IID IID_ITestRunnerDSPlugin = {0x3ADE0E37,0x5A56,0x4a68,{0xBD,0x8D,0x67,0xE9,0xE7,0x50,0x29,0x71}}; - - -const IID LIBID_TestRunnerDSPluginLib = {0x3ADE0E38,0x5A56,0x4a68,{0xBD,0x8D,0x67,0xE9,0xE7,0x50,0x29,0x71}}; - - -const CLSID CLSID_DSAddIn = {0xF193CE54,0x716C,0x41CB,{0x80,0xB2,0xFA,0x74,0xCA,0x3E,0xE2,0xAC}}; - - -#ifdef __cplusplus -} -#endif - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestPlugInInterface.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestPlugInInterface.h deleted file mode 100644 index 031f2a01..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestPlugInInterface.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H -#define CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H - -#include -#include - -#if !defined(WINAPI) -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOUSER -#define NOKERNEL -#define NOSOUND -#define NOMINMAX -#include -#endif - -/*! \brief Abstract TestPlugIn for DLL. - * \deprecated Use CppUnitTestPlugIn instead. - * - * A Test plug-in DLL must subclass this class and "publish" an instance - * using the following exported function: - * \code - * extern "C" { - * __declspec(dllimport) TestPlugInInterface *GetTestPlugInInterface(); - * } - * \endcode - * - * When loading the DLL, the TestPlugIn runner look-up this function and - * retreives the - * - * See the TestPlugIn example for VC++ for details. - */ -class TestPlugInInterface -{ -public: - virtual ~TestPlugInInterface() {} - - /*! Returns an instance of the "All Tests" suite. - * - * \return Instance of the top-level suite that contains all test. Ownership - * is granted to the method caller. - */ - virtual CppUnit::Test *makeTest() =0; -}; - -typedef TestPlugInInterface* (WINAPI *GetTestPlugInInterfaceFunction)(void); - - -extern "C" { - __declspec(dllexport) TestPlugInInterface *GetTestPlugInInterface(); -} - - - -#endif // CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestRunner.h b/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestRunner.h deleted file mode 100644 index 0bee97a9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/include/msvc6/testrunner/TestRunner.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef CPPUNIT_MSVC_TESTRUNNER_H -#define CPPUNIT_MSVC_TESTRUNNER_H - - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#include - -/*! \brief MFC test runner (DEPRECATED) - * \ingroup ExecutingTest - * \deprecated Use CppUnit::MfcUi::TestRunner instead. - */ -typedef CPPUNIT_NS::MfcTestRunner TestRunner; - -#endif // CPPUNIT_MSVC_TESTRUNNER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/lib/.keepme b/src/3rd_party/cppunit/cppunit-1.12.1/lib/.keepme deleted file mode 100644 index e69de29b..00000000 diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/CppUnitLibraries.dsw b/src/3rd_party/cppunit/cppunit-1.12.1/src/CppUnitLibraries.dsw deleted file mode 100644 index 1246aa33..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/CppUnitLibraries.dsw +++ /dev/null @@ -1,104 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "DSPlugIn"=.\msvc6\DSPlugIn\DSPlugIn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "DllPlugInTester"=.\DllPlugInTester\DllPlugInTester.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "TestPlugInRunner"=.\msvc6\testpluginrunner\TestPlugInRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TestRunner - End Project Dependency - Begin Project Dependency - Project_Dep_Name cppunit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "TestRunner"=.\msvc6\testrunner\TestRunner.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cppunit - End Project Dependency -}}} - -############################################################################### - -Project: "cppunit"=.\cppunit\cppunit.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "cppunit_dll"=.\cppunit\cppunit_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.cpp deleted file mode 100644 index 1ad02458..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.cpp +++ /dev/null @@ -1,253 +0,0 @@ -#include "CommandLineParser.h" - - -CommandLineParser::CommandLineParser( int argc, - const char *argv[] ) - : m_useCompiler( false ) - , m_useXml( false ) - , m_briefProgress( false ) - , m_noProgress( false ) - , m_useText( false ) - , m_useCout( false ) - , m_waitBeforeExit( false ) - , m_currentArgument( 0 ) -{ - for ( int index =1; index < argc; ++index ) - { - std::string argument( argv[index ] ); - m_arguments.push_back( argument ); - } -} - - -CommandLineParser::~CommandLineParser() -{ -} - - -void -CommandLineParser::parse() -{ - while ( hasNextArgument() ) - { - getNextOption(); - if ( isOption( "c", "compiler" ) ) - m_useCompiler = true; - else if ( isOption( "x", "xml" ) ) - { - m_useXml = true; - m_xmlFileName = getNextOptionalParameter(); - } - else if ( isOption( "s", "xsl" ) ) - m_xsl = getNextParameter(); - else if ( isOption( "e", "encoding" ) ) - m_encoding = getNextParameter(); - else if ( isOption( "b", "brief-progress" ) ) - m_briefProgress = true; - else if ( isOption( "n", "no-progress" ) ) - m_noProgress = true; - else if ( isOption( "t", "text" ) ) - m_useText = true; - else if ( isOption( "o", "cout" ) ) - m_useCout = true; - else if ( isOption( "w", "wait" ) ) - m_waitBeforeExit = true; - else if ( !m_option.empty() ) - fail( "Unknown option" ); - else if ( hasNextArgument() ) - readNonOptionCommands(); - } -} - - -void -CommandLineParser::readNonOptionCommands() -{ - if ( argumentStartsWith( ":" ) ) - m_testPath = getNextArgument().substr( 1 ); - else - { - CommandLinePlugInInfo plugIn; - int indexParameter = getCurrentArgument().find( '=' ); - if ( indexParameter < 0 ) - plugIn.m_fileName = getCurrentArgument(); - else - { - plugIn.m_fileName = getCurrentArgument().substr( 0, indexParameter ); - std::string parameters = getCurrentArgument().substr( indexParameter +1 ); - plugIn.m_parameters = CPPUNIT_NS::PlugInParameters( parameters ); - } - - m_plugIns.push_back( plugIn ); - - getNextArgument(); - } -} - - -bool -CommandLineParser::hasNextArgument() const -{ - return m_currentArgument < m_arguments.size(); -} - - -std::string -CommandLineParser::getNextArgument() -{ - if ( hasNextArgument() ) - return m_arguments[ m_currentArgument++ ]; - return ""; -} - - -std::string -CommandLineParser::getCurrentArgument() const -{ - if ( m_currentArgument < m_arguments.size() ) - return m_arguments[ m_currentArgument ]; - return ""; -} - - -bool -CommandLineParser::argumentStartsWith( const std::string &expected ) const -{ - return getCurrentArgument().substr( 0, expected.length() ) == expected; -} - - -void -CommandLineParser::getNextOption() -{ - if ( argumentStartsWith( "-" ) || argumentStartsWith( "--" ) ) - m_option = getNextArgument(); - else - m_option = ""; -} - - -bool -CommandLineParser::isOption( const std::string &shortName, - const std::string &longName ) -{ - return (m_option == "-" + shortName) || - (m_option == "--" + longName); -} - - -std::string -CommandLineParser::getNextParameter() -{ - if ( !hasNextArgument() ) - fail( "missing parameter" ); - return getNextArgument(); -} - - -std::string -CommandLineParser::getNextOptionalParameter() -{ - if ( argumentStartsWith( "-" ) || argumentStartsWith( ":" ) ) - return ""; - return getNextArgument(); -} - - -void -CommandLineParser::fail( std::string message ) -{ - throw CommandLineParserException( "while parsing option " + m_option+ - ",\n" + message ); -} - - -bool -CommandLineParser::useCompilerOutputter() const -{ - return m_useCompiler; -} - - -bool -CommandLineParser::useXmlOutputter() const -{ - return m_useXml; -} - - -std::string -CommandLineParser::getXmlFileName() const -{ - return m_xmlFileName; -} - - -std::string -CommandLineParser::getXmlStyleSheet() const -{ - return m_xsl; -} - - -std::string -CommandLineParser::getEncoding() const -{ - return m_encoding; -} - - -bool -CommandLineParser::useBriefTestProgress() const -{ - return m_briefProgress; -} - - -bool -CommandLineParser::noTestProgress() const -{ - return m_noProgress; -} - - -bool -CommandLineParser::useTextOutputter() const -{ - return m_useText; -} - - -bool -CommandLineParser::useCoutStream() const -{ - return m_useCout; -} - - -bool -CommandLineParser::waitBeforeExit() const -{ - return m_waitBeforeExit; -} - - -int -CommandLineParser::getPlugInCount() const -{ - return m_plugIns.size(); -} - -CommandLinePlugInInfo -CommandLineParser::getPlugInAt( int index ) const -{ - return m_plugIns[ index ]; -} - - -std::string -CommandLineParser::getTestPath() const -{ - return m_testPath; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.h deleted file mode 100644 index 3cbcb5af..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParser.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef CPPUNIT_HELPER_COMMANDLINEPARSER_H -#define CPPUNIT_HELPER_COMMANDLINEPARSER_H - -#include -#include -#include -#include -#include - - -/*! Exception thrown on error while parsing command line. - */ -class CommandLineParserException : public std::runtime_error -{ -public: - CommandLineParserException( std::string message ) - : std::runtime_error( message ) - { - } -}; - - -struct CommandLinePlugInInfo -{ - std::string m_fileName; - CPPUNIT_NS::PlugInParameters m_parameters; -}; - - -/*! \brief Parses a command line. - --c --compiler --x --xml [filename] --s --xsl stylesheet --e --encoding encoding --b --brief-progress --n --no-progress --t --text --o --cout --w --wait -filename[="options"] -:testpath - - */ -class CommandLineParser -{ -public: - /*! Constructs a CommandLineParser object. - */ - CommandLineParser( int argc, - const char *argv[] ); - - /// Destructor. - virtual ~CommandLineParser(); - - /*! Parses the command line. - * \exception CommandLineParserException if an error occurs. - */ - void parse(); - - bool useCompilerOutputter() const; - bool useXmlOutputter() const; - std::string getXmlFileName() const; - std::string getXmlStyleSheet() const; - std::string getEncoding() const; - bool useBriefTestProgress() const; - bool noTestProgress() const; - bool useTextOutputter() const; - bool useCoutStream() const; - bool waitBeforeExit() const; - std::string getTestPath() const; - int getPlugInCount() const; - CommandLinePlugInInfo getPlugInAt( int index ) const; - -protected: - /// Prevents the use of the copy constructor. - CommandLineParser( const CommandLineParser © ); - - /// Prevents the use of the copy operator. - void operator =( const CommandLineParser © ); - - void readNonOptionCommands(); - - bool hasNextArgument() const; - - std::string getNextArgument(); - - std::string getCurrentArgument() const; - - bool argumentStartsWith( const std::string &expected ) const; - - void getNextOption(); - - bool isOption( const std::string &shortName, - const std::string &longName ); - - std::string getNextParameter(); - - std::string getNextOptionalParameter(); - - void fail( std::string message ); - -protected: - bool m_useCompiler; - bool m_useXml; - std::string m_xmlFileName; - std::string m_xsl; - std::string m_encoding; - bool m_briefProgress; - bool m_noProgress; - bool m_useText; - bool m_useCout; - bool m_waitBeforeExit; - std::string m_testPath; - - typedef CppUnitDeque PlugIns; - PlugIns m_plugIns; - - typedef CppUnitDeque Arguments; - Arguments m_arguments; - unsigned int m_currentArgument; - - std::string m_option; -}; - - -#endif // CPPUNIT_HELPER_COMMANDLINEPARSER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.cpp deleted file mode 100644 index b521eb25..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "CommandLineParser.h" -#include "CommandLineParserTest.h" - -CPPUNIT_TEST_SUITE_REGISTRATION( CommandLineParserTest ); - - -CommandLineParserTest::CommandLineParserTest() -{ -} - - -CommandLineParserTest::~CommandLineParserTest() -{ -} - - -void -CommandLineParserTest::setUp() -{ - _parser = NULL; -} - - -void -CommandLineParserTest::tearDown() -{ - delete _parser; -} - - -void -CommandLineParserTest::parse( const char **lines ) -{ - int count =0; - for ( const char **line = lines; *line != NULL; ++line, ++count ); - - delete _parser; - _parser = new CommandLineParser( count, lines ); - _parser->parse(); -} - - -void -CommandLineParserTest::testEmptyCommandLine() -{ - static const char *lines[] = { "", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( !_parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( !_parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( !_parser->useXmlOutputter() ); -} - - -void -CommandLineParserTest::testFlagCompiler() -{ - static const char *lines[] = { "", "-c", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( !_parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( _parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( !_parser->useXmlOutputter() ); - CPPUNIT_ASSERT_EQUAL( 0, _parser->getPlugInCount() ); -} - - -void -CommandLineParserTest::testLongFlagBriefProgress() -{ - static const char *lines[] = { "", "--brief-progress", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( _parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( !_parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( !_parser->useXmlOutputter() ); - CPPUNIT_ASSERT_EQUAL( 0, _parser->getPlugInCount() ); -} - - -void -CommandLineParserTest::testFileName() -{ - static const char *lines[] = { "", "TestPlugIn.dll", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( !_parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( !_parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( !_parser->useXmlOutputter() ); - - CPPUNIT_ASSERT_EQUAL( 1, _parser->getPlugInCount() ); - - CommandLinePlugInInfo info( _parser->getPlugInAt( 0 ) ); - CPPUNIT_ASSERT_EQUAL( std::string("TestPlugIn.dll"), info.m_fileName ); - CPPUNIT_ASSERT( info.m_parameters.getCommandLine().empty() ); -} - - -void -CommandLineParserTest::testTestPath() -{ - static const char *lines[] = { "", ":Core", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( std::string("Core"), _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( !_parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( !_parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( !_parser->useXmlOutputter() ); - CPPUNIT_ASSERT_EQUAL( 0, _parser->getPlugInCount() ); -} - - -void -CommandLineParserTest::testParameterWithSpace() -{ - static const char *lines[] = { "", "--xml", "Test Results.xml", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getEncoding() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getTestPath() ); - CPPUNIT_ASSERT_EQUAL( std::string("Test Results.xml"), - _parser->getXmlFileName() ); - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlStyleSheet() ); - CPPUNIT_ASSERT( !_parser->noTestProgress() ); - CPPUNIT_ASSERT( !_parser->useBriefTestProgress() ); - CPPUNIT_ASSERT( !_parser->useCompilerOutputter() ); - CPPUNIT_ASSERT( !_parser->useCoutStream() ); - CPPUNIT_ASSERT( !_parser->useTextOutputter() ); - CPPUNIT_ASSERT( _parser->useXmlOutputter() ); - CPPUNIT_ASSERT_EQUAL( 0, _parser->getPlugInCount() ); -} - - -void -CommandLineParserTest::testMissingStyleSheetParameterThrow() -{ - static const char *lines[] = { "", "--xsl", NULL }; - parse( lines ); -} - - -void -CommandLineParserTest::testMissingEncodingParameterThrow() -{ - static const char *lines[] = { "", "--encoding", NULL }; - parse( lines ); -} - - -void -CommandLineParserTest::testXmlFileNameIsOptional() -{ - static const char *lines[] = { "", "--xml", NULL }; - parse( lines ); - - std::string none; - CPPUNIT_ASSERT_EQUAL( none, _parser->getXmlFileName() ); -} - - -void -CommandLineParserTest::testPlugInsWithParameters() -{ - static const char *lines[] = { "", "TestPlugIn1.dll=login = lain", - "Clocker.dll", NULL }; - parse( lines ); - - CPPUNIT_ASSERT_EQUAL( 2, _parser->getPlugInCount() ); - - CommandLinePlugInInfo info1( _parser->getPlugInAt( 0 ) ); - - CPPUNIT_ASSERT_EQUAL( std::string("TestPlugIn1.dll"), info1.m_fileName ); - CPPUNIT_ASSERT_EQUAL( std::string("login = lain"), - info1.m_parameters.getCommandLine() ); - - CommandLinePlugInInfo info2( _parser->getPlugInAt( 1 ) ); - CPPUNIT_ASSERT_EQUAL( std::string("Clocker.dll"), info2.m_fileName ); - CPPUNIT_ASSERT( info2.m_parameters.getCommandLine().empty() ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.h deleted file mode 100644 index ce2693cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/CommandLineParserTest.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef COMMANDLINEPARSERTEST_H -#define COMMANDLINEPARSERTEST_H - -#include - - -class CommandLineParser; -class CommandLineParserException; - - -class CommandLineParserTest : public CPPUNIT_NS::TestCase -{ - CPPUNIT_TEST_SUITE( CommandLineParserTest ); - CPPUNIT_TEST( testEmptyCommandLine ); - CPPUNIT_TEST( testFlagCompiler ); - CPPUNIT_TEST( testLongFlagBriefProgress ); - CPPUNIT_TEST( testFileName ); - CPPUNIT_TEST( testTestPath ); - CPPUNIT_TEST( testParameterWithSpace ); - CPPUNIT_TEST_EXCEPTION( testMissingStyleSheetParameterThrow, CommandLineParserException); - CPPUNIT_TEST_EXCEPTION( testMissingEncodingParameterThrow, CommandLineParserException); - CPPUNIT_TEST( testXmlFileNameIsOptional ); - CPPUNIT_TEST( testPlugInsWithParameters ); - CPPUNIT_TEST_SUITE_END(); - -public: - CommandLineParserTest(); - virtual ~CommandLineParserTest(); - - void setUp(); - void tearDown(); - - void testEmptyCommandLine(); - void testFlagCompiler(); - void testLongFlagBriefProgress(); - void testFileName(); - void testTestPath(); - void testParameterWithSpace(); - void testMissingStyleSheetParameterThrow(); - void testMissingEncodingParameterThrow(); - void testXmlFileNameIsOptional(); - void testPlugInsWithParameters(); - -private: - CommandLineParserTest( const CommandLineParserTest &other ); - void operator =( const CommandLineParserTest &other ); - - void parse( const char **lines ); - -private: - CommandLineParser *_parser; -}; - - - -// Inlines methods for CommandLineParserTest: -// ------------------------------------------ - - - -#endif // COMMANDLINEPARSERTEST_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp deleted file mode 100644 index 39559a8b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp +++ /dev/null @@ -1,258 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "CommandLineParser.h" - - -/* Notes: - - Memory allocated by test plug-in must be freed before unloading the test plug-in. - That is the reason why the XmlOutputter is explicitely destroyed. - */ - - -/*! Runs the specified tests located in the root suite. - * \param parser Command line parser. - * \return \c true if the run succeed, \c false if a test failed or if a test - * path was not resolved. - */ -bool -runTests( const CommandLineParser &parser ) -{ - bool wasSuccessful = false; - CPPUNIT_NS::PlugInManager plugInManager; - - // The following scope is used to explicitely free all memory allocated before - // unload the test plug-ins (uppon plugInManager destruction). - { - CPPUNIT_NS::TestResult controller; - CPPUNIT_NS::TestResultCollector result; - controller.addListener( &result ); - - // Set up outputters - CPPUNIT_NS::OStream *stream = &CPPUNIT_NS::stdCErr(); - if ( parser.useCoutStream() ) - stream = &CPPUNIT_NS::stdCOut(); - - CPPUNIT_NS::OStream *xmlStream = stream; - if ( !parser.getXmlFileName().empty() ) - xmlStream = new CPPUNIT_NS::OFileStream( parser.getXmlFileName().c_str() ); - - CPPUNIT_NS::XmlOutputter xmlOutputter( &result, *xmlStream, parser.getEncoding() ); - xmlOutputter.setStyleSheet( parser.getXmlStyleSheet() ); - CPPUNIT_NS::TextOutputter textOutputter( &result, *stream ); - CPPUNIT_NS::CompilerOutputter compilerOutputter( &result, *stream ); - - // Set up test listeners - CPPUNIT_NS::BriefTestProgressListener briefListener; - CPPUNIT_NS::TextTestProgressListener dotListener; - if ( parser.useBriefTestProgress() ) - controller.addListener( &briefListener ); - else if ( !parser.noTestProgress() ) - controller.addListener( &dotListener ); - - // Set up plug-ins - for ( int index =0; index < parser.getPlugInCount(); ++index ) - { - CommandLinePlugInInfo plugIn = parser.getPlugInAt( index ); - plugInManager.load( plugIn.m_fileName, plugIn.m_parameters ); - } - - // Registers plug-in specific TestListener (global setUp/tearDown, custom TestListener...) - plugInManager.addListener( &controller ); - - // Adds the default registry suite - CPPUNIT_NS::TestRunner runner; - runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() ); - - // Runs the specified test - try - { - runner.run( controller, parser.getTestPath() ); - wasSuccessful = result.wasSuccessful(); - } - catch ( std::invalid_argument & ) - { - CPPUNIT_NS::stdCOut() << "Failed to resolve test path: " - << parser.getTestPath() - << "\n"; - } - - // Removes plug-in specific TestListener (not really needed but...) - plugInManager.removeListener( &controller ); - - // write using outputters - if ( parser.useCompilerOutputter() ) - compilerOutputter.write(); - - if ( parser.useTextOutputter() ) - textOutputter.write(); - - if ( parser.useXmlOutputter() ) - { - plugInManager.addXmlOutputterHooks( &xmlOutputter ); - xmlOutputter.write(); - plugInManager.removeXmlOutputterHooks(); - } - - if ( !parser.getXmlFileName().empty() ) - delete xmlStream; - } - - return wasSuccessful; -} - - -void -printShortUsage( const std::string &applicationName ) -{ - CPPUNIT_NS::stdCOut() << "Usage:\n" - << applicationName << " [-c -b -n -t -o -w] [-x xml-filename]" - "[-s stylesheet] [-e encoding] plug-in[=parameters] [plug-in...] [:testPath]\n\n"; -} - - -void -printUsage( const std::string &applicationName ) -{ - printShortUsage( applicationName ); - CPPUNIT_NS::stdCOut() << -"-c --compiler\n" -" Use CompilerOutputter\n" -"-x --xml [filename]\n" -" Use XmlOutputter (if filename is omitted, then output to cout or\n" -" cerr.\n" -"-s --xsl stylesheet\n" -" XML style sheet for XML Outputter\n" -"-e --encoding encoding\n" -" XML file encoding (UTF8, shift_jis, ISO-8859-1...)\n" -"-b --brief-progress\n" -" Use BriefTestProgressListener (default is TextTestProgressListener)\n" -"-n --no-progress\n" -" Show no test progress (disable default TextTestProgressListener)\n" -"-t --text\n" -" Use TextOutputter\n" -"-o --cout\n" -" Ouputters output to cout instead of the default cerr.\n" -"-w --wait\n" -" Wait for the user to press a return before exit.\n" -"filename[=\"options\"]\n" -" Many filenames can be specified. They are the name of the \n" -" test plug-ins to load. Optional plug-ins parameters can be \n" -" specified after the filename by adding '='.\n" -"[:testpath]\n" -" Optional. Only one test path can be specified. It must \n" -" be prefixed with ':'. See TestPath constructor for syntax.\n" -"\n" -"'parameters' (test plug-in or XML filename, test path...) may contains \n" -"spaces if double quoted. Quote may be escaped with \".\n" -"\n" -"Some examples of command lines:\n" -"\n" -"DllPlugInTesterd_dll.exe -b -x tests.xml -c simple_plugind.dll CppUnitTestPlugInd.dll\n" -"\n" -" Will load 2 tests plug-ins (available in lib/), use the brief test\n" -"progress, output the result in XML in file tests.xml and also\n" -"output the result using the compiler outputter.\n" -"\n" -"DllPlugInTesterd_dll.exe ClockerPlugInd.dll=\"flat\" -n CppUnitTestPlugInd.dll\n" -"\n" -" Will load the 2 test plug-ins, and pass the parameter string \"flat\"\n" -"to the Clocker plug-in, disable test progress.\n\n"; - -} - - -/*! Main - * - * Usage: - * - * DllPlugInTester.exe dll-filename1 [dll-filename2 [dll-filename3 ...]] [:testpath] - * - * dll-filename must be the name of the DLL. If the DLL use some other DLL, they - * should be in the path or in the same directory as the DLL. The DLL must export - * a function named "GetTestPlugInInterface" with the signature - * GetTestPlugInInterfaceFunction. Both are defined in: - * \code - * #include - * \endcode. - * - * See examples/msvc6/TestPlugIn for an example of post-build testing. - * - * If no test path is specified, they all the test of the suite returned by the DLL - * are run. If a test path is specified, then only the specified test is run. The test - * path must be prefixed by ':'. - * - * Test paths are resolved using Test::resolveTestPath() on the suite returned by - * TestFactoryRegistry::getRegistry().makeTest(); - * - * If all test succeed and no error happen then the application exit with code 0. - * If any error occurs (failed to load dll, failed to resolve test paths) or a - * test fail, the application exit with code 1. If the application failed to - * parse the command line, it exits with code 2. - */ -int -main( int argc, - const char *argv[] ) -{ - const int successReturnCode = 0; - const int failureReturnCode = 1; - const int badCommadLineReturnCode = 2; - - // check command line - std::string applicationName( argv[0] ); - if ( argc < 2 ) - { - printUsage( applicationName ); - return badCommadLineReturnCode; - } - - CommandLineParser parser( argc, argv ); - try - { - parser.parse(); - } - catch ( CommandLineParserException &e ) - { - CPPUNIT_NS::stdCOut() << "Error while parsing command line: " << e.what() - << "\n\n"; - printShortUsage( applicationName ); - return badCommadLineReturnCode; - } - - bool wasSuccessful = false; - try - { - wasSuccessful = runTests( parser ); - } - catch ( CPPUNIT_NS::DynamicLibraryManagerException &e ) - { - CPPUNIT_NS::stdCOut() << "Failed to load test plug-in:\n" - << e.what() << "\n"; - } - -#if !defined( CPPUNIT_NO_STREAM ) - if ( parser.waitBeforeExit() ) - { - CPPUNIT_NS::stdCOut() << "Please press to exit\n"; - CPPUNIT_NS::stdCOut().flush(); - std::cin.get(); - } -#endif - - return wasSuccessful ? successReturnCode : failureReturnCode; -} - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.dsp deleted file mode 100644 index d493edb3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.dsp +++ /dev/null @@ -1,269 +0,0 @@ -# Microsoft Developer Studio Project File - Name="DllPlugInTester" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=DllPlugInTester - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTester.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTester.mak" CFG="DllPlugInTester - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DllPlugInTester - Win32 Release Unicode" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Debug Unicode" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Release Static" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Debug Static" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DllPlugInTester - Win32 Release Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Release_Unicode" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Release_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseUnicode" -# PROP Intermediate_Dir "ReleaseUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O1 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /out:"ReleaseUnicode\DllPlugInTesteru.exe" /libpath:"../../lib" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\ReleaseUnicode\DllPlugInTesteru.exe -TargetName=DllPlugInTesteru -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Debug_Unicode" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Debug_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugUnicode" -# PROP Intermediate_Dir "DebugUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/DllPlugInTesterd.exe" /pdbtype:sept /libpath:"../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"DebugUnicode\DllPlugInTesterud.exe" /pdbtype:sept /libpath:"../../lib" -# Begin Special Build Tool -TargetPath=.\DebugUnicode\DllPlugInTesterud.exe -TargetName=DllPlugInTesterud -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Release_Static" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Release_Static" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O1 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O1 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /out:"..\..\lib\DllPlugInTester.exe" /libpath:"../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\Release\DllPlugInTester.exe -TargetName=DllPlugInTester -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy $(TargetPath) ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Debug_Static" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Debug_Static" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\..\lib\DllPlugInTesterd.exe" /pdbtype:sept /libpath:"../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"Debug\DllPlugInTesterd.exe" /pdbtype:sept /libpath:"../../lib" -# Begin Special Build Tool -TargetPath=.\Debug\DllPlugInTesterd.exe -TargetName=DllPlugInTesterd -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy $(TargetPath) ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Release" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O1 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O1 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /subsystem:console /machine:I386 /out:"..\..\lib\DllPlugInTester_dll.exe" /libpath:"../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /subsystem:console /machine:I386 /out:"ReleaseDll\DllPlugInTester_dll.exe" /libpath:"../../lib" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\ReleaseDll\DllPlugInTester_dll.exe -TargetName=DllPlugInTester_dll -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Debug" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\..\lib\DllPlugInTesterd_dll.exe" /pdbtype:sept /libpath:"../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"DebugDll\DllPlugInTesterd_dll.exe" /pdbtype:sept /libpath:"../../lib" -# Begin Special Build Tool -TargetPath=.\DebugDll\DllPlugInTesterd_dll.exe -TargetName=DllPlugInTesterd_dll -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "DllPlugInTester - Win32 Release Unicode" -# Name "DllPlugInTester - Win32 Debug Unicode" -# Name "DllPlugInTester - Win32 Release Static" -# Name "DllPlugInTester - Win32 Debug Static" -# Name "DllPlugInTester - Win32 Release" -# Name "DllPlugInTester - Win32 Debug" -# Begin Source File - -SOURCE=.\CommandLineParser.cpp -# End Source File -# Begin Source File - -SOURCE=.\CommandLineParser.h -# End Source File -# Begin Source File - -SOURCE=.\DllPlugInTester.cpp -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp deleted file mode 100644 index 99274c1f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include -#include - - -int main(int argc, char* argv[]) -{ - CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest(); - CPPUNIT_NS::TextUi::TestRunner runner; - runner.addTest( suite ); - runner.setOutputter( new CPPUNIT_NS::CompilerOutputter( &runner.result(), - CPPUNIT_NS::stdCOut() ) ); - bool wasSucessful = runner.run(); - return wasSucessful ? 0 : 1; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.dsp deleted file mode 100644 index 38900b50..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.dsp +++ /dev/null @@ -1,181 +0,0 @@ -# Microsoft Developer Studio Project File - Name="DllPlugInTesterTest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=DllPlugInTesterTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTesterTest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTesterTest.mak" CFG="DllPlugInTesterTest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DllPlugInTesterTest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTesterTest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DllPlugInTesterTest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseTest" -# PROP Intermediate_Dir "ReleaseTest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /Ox /Ot /Oa /Ow /Og /Oi /Ob0 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\ReleaseTest\DllPlugInTesterTest.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Unit testing... -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DllPlugInTesterTest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugTest" -# PROP Intermediate_Dir "DebugTest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" -# Begin Special Build Tool -TargetPath=.\DebugTest\DllPlugInTesterTest.exe -SOURCE="$(InputPath)" -PostBuild_Desc=Unit testing... -PostBuild_Cmds=$(TargetPath) -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "DllPlugInTesterTest - Win32 Release" -# Name "DllPlugInTesterTest - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\DllPlugInTester\CommandLineParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\DllPlugInTester\CommandLineParser.h -# End Source File -# Begin Source File - -SOURCE=.\CommandLineParserTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\CommandLineParserTest.h -# End Source File -# Begin Source File - -SOURCE=..\..\lib\cppunit_dll.dll - -!IF "$(CFG)" == "DllPlugInTesterTest - Win32 Release" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\ReleaseTest -InputPath=..\..\lib\cppunit_dll.dll -InputName=cppunit_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "DllPlugInTesterTest - Win32 Debug" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\DebugTest -InputPath=..\..\lib\cppunit_dll.dll -InputName=cppunit_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\lib\cppunitd_dll.dll - -!IF "$(CFG)" == "DllPlugInTesterTest - Win32 Release" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\ReleaseTest -InputPath=..\..\lib\cppunitd_dll.dll -InputName=cppunitd_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "DllPlugInTesterTest - Win32 Debug" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\DebugTest -InputPath=..\..\lib\cppunitd_dll.dll -InputName=cppunitd_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\src\DllPlugInTester\DllPlugInTesterTest.cpp -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.am deleted file mode 100644 index b4f7f6fb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_DIST = DllPlugInTester.dsp DllPlugInTesterTest.dsp - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - -bin_PROGRAMS=DllPlugInTester - -TESTS = DllPlugInTesterTest -check_PROGRAMS = $(TESTS) - -DllPlugInTester_SOURCES= DllPlugInTester.cpp \ - CommandLineParser.h \ - CommandLineParser.cpp - -DllPlugInTester_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -DllPlugInTester_LDFLAGS = $(LIBADD_DL) - -DllPlugInTesterTest_SOURCES = DllPlugInTesterTest.cpp \ - CommandLineParser.cpp \ - CommandLineParser.h \ - CommandLineParserTest.cpp \ - CommandLineParserTest.h - -DllPlugInTesterTest_LDADD= \ - $(top_builddir)/src/cppunit/libcppunit.la - -DllPlugInTesterTest_LDFLAGS = $(LIBADD_DL) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.in deleted file mode 100644 index 158cbbef..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/DllPlugInTester/Makefile.in +++ /dev/null @@ -1,622 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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@ -bin_PROGRAMS = DllPlugInTester$(EXEEXT) -TESTS = DllPlugInTesterTest$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -subdir = src/DllPlugInTester -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -am__EXEEXT_1 = DllPlugInTesterTest$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) -am_DllPlugInTester_OBJECTS = DllPlugInTester.$(OBJEXT) \ - CommandLineParser.$(OBJEXT) -DllPlugInTester_OBJECTS = $(am_DllPlugInTester_OBJECTS) -DllPlugInTester_DEPENDENCIES = \ - $(top_builddir)/src/cppunit/libcppunit.la -DllPlugInTester_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(DllPlugInTester_LDFLAGS) $(LDFLAGS) -o $@ -am_DllPlugInTesterTest_OBJECTS = DllPlugInTesterTest.$(OBJEXT) \ - CommandLineParser.$(OBJEXT) CommandLineParserTest.$(OBJEXT) -DllPlugInTesterTest_OBJECTS = $(am_DllPlugInTesterTest_OBJECTS) -DllPlugInTesterTest_DEPENDENCIES = \ - $(top_builddir)/src/cppunit/libcppunit.la -DllPlugInTesterTest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(DllPlugInTesterTest_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(DllPlugInTester_SOURCES) $(DllPlugInTesterTest_SOURCES) -DIST_SOURCES = $(DllPlugInTester_SOURCES) \ - $(DllPlugInTesterTest_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = DllPlugInTester.dsp DllPlugInTesterTest.dsp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -DllPlugInTester_SOURCES = DllPlugInTester.cpp \ - CommandLineParser.h \ - CommandLineParser.cpp - -DllPlugInTester_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -DllPlugInTester_LDFLAGS = $(LIBADD_DL) -DllPlugInTesterTest_SOURCES = DllPlugInTesterTest.cpp \ - CommandLineParser.cpp \ - CommandLineParser.h \ - CommandLineParserTest.cpp \ - CommandLineParserTest.h - -DllPlugInTesterTest_LDADD = \ - $(top_builddir)/src/cppunit/libcppunit.la - -DllPlugInTesterTest_LDFLAGS = $(LIBADD_DL) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/DllPlugInTester/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/DllPlugInTester/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 -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -DllPlugInTester$(EXEEXT): $(DllPlugInTester_OBJECTS) $(DllPlugInTester_DEPENDENCIES) - @rm -f DllPlugInTester$(EXEEXT) - $(DllPlugInTester_LINK) $(DllPlugInTester_OBJECTS) $(DllPlugInTester_LDADD) $(LIBS) -DllPlugInTesterTest$(EXEEXT): $(DllPlugInTesterTest_OBJECTS) $(DllPlugInTesterTest_DEPENDENCIES) - @rm -f DllPlugInTesterTest$(EXEEXT) - $(DllPlugInTesterTest_LINK) $(DllPlugInTesterTest_OBJECTS) $(DllPlugInTesterTest_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CommandLineParser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CommandLineParserTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DllPlugInTester.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DllPlugInTesterTest.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-binPROGRAMS clean-checkPROGRAMS clean-generic \ - 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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: 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-binPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool ctags 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags 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/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.am deleted file mode 100644 index 81430b4e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = cppunit DllPlugInTester - -# already handled by toplevel dist-hook. -# DIST_SUBDIRS = msvc6 \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.in deleted file mode 100644 index 089cc494..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/Makefile.in +++ /dev/null @@ -1,514 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = cppunit DllPlugInTester -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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - 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 - -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. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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; \ - (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" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-recursive \ - uninstall uninstall-am - - -# already handled by toplevel dist-hook. -# DIST_SUBDIRS = msvc6 -# 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/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/AdditionalMessage.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/AdditionalMessage.cpp deleted file mode 100644 index 9f3da139..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/AdditionalMessage.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -AdditionalMessage::AdditionalMessage() -{ -} - - -AdditionalMessage::AdditionalMessage( const std::string &detail1 ) -{ - if ( !detail1.empty() ) - addDetail( detail1 ); -} - - -AdditionalMessage::AdditionalMessage( const char *detail1 ) -{ - if ( detail1 && !std::string( detail1 ).empty() ) - addDetail( std::string(detail1) ); -} - - -AdditionalMessage::AdditionalMessage( const Message &other ) - : SuperClass( other ) -{ -} - - -AdditionalMessage & -AdditionalMessage::operator =( const Message &other ) -{ - SuperClass::operator =( other ); - - return *this; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Asserter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Asserter.cpp deleted file mode 100644 index a9cf95cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Asserter.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -void -Asserter::fail( std::string message, - const SourceLine &sourceLine ) -{ - fail( Message( "assertion failed", message ), sourceLine ); -} - - -void -Asserter::fail( const Message &message, - const SourceLine &sourceLine ) -{ - throw Exception( message, sourceLine ); -} - - -void -Asserter::failIf( bool shouldFail, - const Message &message, - const SourceLine &sourceLine ) -{ - if ( shouldFail ) - fail( message, sourceLine ); -} - - -void -Asserter::failIf( bool shouldFail, - std::string message, - const SourceLine &sourceLine ) -{ - failIf( shouldFail, Message( "assertion failed", message ), sourceLine ); -} - - -std::string -Asserter::makeExpected( const std::string &expectedValue ) -{ - return "Expected: " + expectedValue; -} - - -std::string -Asserter::makeActual( const std::string &actualValue ) -{ - return "Actual : " + actualValue; -} - - -Message -Asserter::makeNotEqualMessage( const std::string &expectedValue, - const std::string &actualValue, - const AdditionalMessage &additionalMessage, - const std::string &shortDescription ) -{ - Message message( shortDescription, - makeExpected( expectedValue ), - makeActual( actualValue ) ); - message.addDetail( additionalMessage ); - - return message; -} - - -void -Asserter::failNotEqual( std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage, - std::string shortDescription ) -{ - fail( makeNotEqualMessage( expected, - actual, - additionalMessage, - shortDescription ), - sourceLine ); -} - - -void -Asserter::failNotEqualIf( bool shouldFail, - std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage, - std::string shortDescription ) -{ - if ( shouldFail ) - failNotEqual( expected, actual, sourceLine, additionalMessage, shortDescription ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BeOsDynamicLibraryManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BeOsDynamicLibraryManager.cpp deleted file mode 100644 index b8568be0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BeOsDynamicLibraryManager.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include - -#if defined(CPPUNIT_HAVE_BEOS_DLL_LOADER) -#include - -#include - - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManager::LibraryHandle -DynamicLibraryManager::doLoadLibrary( const std::string &libraryName ) -{ - return (LibraryHandle)::load_add_on( libraryName.c_str() ); -} - - -void -DynamicLibraryManager::doReleaseLibrary() -{ - ::unload_add_on( (image_id)m_libraryHandle ); -} - - -DynamicLibraryManager::Symbol -DynamicLibraryManager::doFindSymbol( const std::string &symbol ) -{ - void *symbolPointer; - if ( ::get_image_symbol( (image_id)m_libraryHandle, - symbol.c_str(), - B_SYMBOL_TYPE_TEXT, - &symbolPointer ) == B_OK ) - return symnolPointer; - return NULL; -} - - -std::string -DynamicLibraryManager::getLastErrorDetail() const -{ - return ""; -} - - -CPPUNIT_NS_END - - -#endif // defined(CPPUNIT_HAVE_BEOS_DLL_LOADER) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BriefTestProgressListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BriefTestProgressListener.cpp deleted file mode 100644 index c38cea06..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/BriefTestProgressListener.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -BriefTestProgressListener::BriefTestProgressListener() - : m_lastTestFailed( false ) -{ -} - - -BriefTestProgressListener::~BriefTestProgressListener() -{ -} - - -void -BriefTestProgressListener::startTest( Test *test ) -{ - stdCOut() << test->getName(); - stdCOut().flush(); - - m_lastTestFailed = false; -} - - -void -BriefTestProgressListener::addFailure( const TestFailure &failure ) -{ - stdCOut() << " : " << (failure.isError() ? "error" : "assertion"); - m_lastTestFailed = true; -} - - -void -BriefTestProgressListener::endTest( Test *test ) -{ - if ( !m_lastTestFailed ) - stdCOut() << " : OK"; - stdCOut() << "\n"; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/CompilerOutputter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/CompilerOutputter.cpp deleted file mode 100644 index 8196a5f8..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/CompilerOutputter.cpp +++ /dev/null @@ -1,216 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -CompilerOutputter::CompilerOutputter( TestResultCollector *result, - OStream &stream, - const std::string &locationFormat ) - : m_result( result ) - , m_stream( stream ) - , m_locationFormat( locationFormat ) - , m_wrapColumn( CPPUNIT_WRAP_COLUMN ) -{ -} - - -CompilerOutputter::~CompilerOutputter() -{ -} - - -void -CompilerOutputter::setLocationFormat( const std::string &locationFormat ) -{ - m_locationFormat = locationFormat; -} - - -CompilerOutputter * -CompilerOutputter::defaultOutputter( TestResultCollector *result, - OStream &stream ) -{ - return new CompilerOutputter( result, stream ); -} - - -void -CompilerOutputter::write() -{ - if ( m_result->wasSuccessful() ) - printSuccess(); - else - printFailureReport(); -} - - -void -CompilerOutputter::printSuccess() -{ - m_stream << "OK (" << m_result->runTests() << ")\n"; -} - - -void -CompilerOutputter::printFailureReport() -{ - printFailuresList(); - printStatistics(); -} - - -void -CompilerOutputter::printFailuresList() -{ - for ( int index =0; index < m_result->testFailuresTotal(); ++index) - { - printFailureDetail( m_result->failures()[ index ] ); - } -} - - -void -CompilerOutputter::printFailureDetail( TestFailure *failure ) -{ - printFailureLocation( failure->sourceLine() ); - printFailureType( failure ); - printFailedTestName( failure ); - printFailureMessage( failure ); -} - - -void -CompilerOutputter::printFailureLocation( SourceLine sourceLine ) -{ - if ( !sourceLine.isValid() ) - { - m_stream << "##Failure Location unknown## : "; - return; - } - - std::string location; - for ( unsigned int index = 0; index < m_locationFormat.length(); ++index ) - { - char c = m_locationFormat[ index ]; - if ( c == '%' && ( index+1 < m_locationFormat.length() ) ) - { - char command = m_locationFormat[index+1]; - if ( processLocationFormatCommand( command, sourceLine ) ) - { - ++index; - continue; - } - } - - m_stream << c; - } -} - - -bool -CompilerOutputter::processLocationFormatCommand( char command, - const SourceLine &sourceLine ) -{ - switch ( command ) - { - case 'p': - m_stream << sourceLine.fileName(); - return true; - case 'l': - m_stream << sourceLine.lineNumber(); - return true; - case 'f': - m_stream << extractBaseName( sourceLine.fileName() ); - return true; - } - - return false; -} - - -std::string -CompilerOutputter::extractBaseName( const std::string &fileName ) const -{ - int indexLastDirectorySeparator = fileName.find_last_of( '/' ); - - if ( indexLastDirectorySeparator < 0 ) - indexLastDirectorySeparator = fileName.find_last_of( '\\' ); - - if ( indexLastDirectorySeparator < 0 ) - return fileName; - - return fileName.substr( indexLastDirectorySeparator +1 ); -} - - -void -CompilerOutputter::printFailureType( TestFailure *failure ) -{ - m_stream << (failure->isError() ? "Error" : "Assertion"); -} - - -void -CompilerOutputter::printFailedTestName( TestFailure *failure ) -{ - m_stream << "\nTest name: " << failure->failedTestName(); -} - - -void -CompilerOutputter::printFailureMessage( TestFailure *failure ) -{ - m_stream << "\n"; - Exception *thrownException = failure->thrownException(); - m_stream << thrownException->message().shortDescription() << "\n"; - - std::string message = thrownException->message().details(); - if ( m_wrapColumn > 0 ) - message = StringTools::wrap( message, m_wrapColumn ); - - m_stream << message << "\n"; -} - - -void -CompilerOutputter::printStatistics() -{ - m_stream << "Failures !!!\n"; - m_stream << "Run: " << m_result->runTests() << " " - << "Failure total: " << m_result->testFailuresTotal() << " " - << "Failures: " << m_result->testFailures() << " " - << "Errors: " << m_result->testErrors() - << "\n"; -} - - -void -CompilerOutputter::setWrapColumn( int wrapColumn ) -{ - m_wrapColumn = wrapColumn; -} - - -void -CompilerOutputter::setNoWrap() -{ - m_wrapColumn = 0; -} - - -int -CompilerOutputter::wrapColumn() const -{ - return m_wrapColumn; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.cpp deleted file mode 100644 index 6fb306b2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include "DefaultProtector.h" - - -CPPUNIT_NS_BEGIN - - -bool -DefaultProtector::protect( const Functor &functor, - const ProtectorContext &context ) -{ - try - { - return functor(); - } - catch ( Exception &failure ) - { - reportFailure( context, failure ); - } - catch ( std::exception &e ) - { - std::string shortDescription( "uncaught exception of type " ); -#if CPPUNIT_USE_TYPEINFO_NAME - shortDescription += TypeInfoHelper::getClassName( typeid(e) ); -#else - shortDescription += "std::exception (or derived)."; -#endif - Message message( shortDescription, e.what() ); - reportError( context, message ); - } - catch ( ... ) - { - reportError( context, - Message( "uncaught exception of unknown type") ); - } - - return false; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.h deleted file mode 100644 index 4a76ea01..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DefaultProtector.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CPPUNIT_DEFAULTPROTECTOR_H -#define CPPUNIT_DEFAULTPROTECTOR_H - -#include - -CPPUNIT_NS_BEGIN - -/*! \brief Default protector that catch all exceptions (Implementation). - * - * Implementation detail. - * \internal This protector catch and generate a failure for the following - * exception types: - * - Exception - * - std::exception - * - ... - */ -class DefaultProtector : public Protector -{ -public: - bool protect( const Functor &functor, - const ProtectorContext &context ); -}; - -CPPUNIT_NS_END - -#endif // CPPUNIT_DEFAULTPROTECTOR_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DllMain.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DllMain.cpp deleted file mode 100644 index 51fe31ec..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DllMain.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOUSER -#define NOKERNEL -#define NOSOUND -#define BLENDFUNCTION void // for mingw & gcc - -#include - -BOOL APIENTRY -DllMain( HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved ) -{ - return TRUE; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManager.cpp deleted file mode 100644 index e6f62945..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManager.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) -#include - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManager::DynamicLibraryManager( const std::string &libraryFileName ) - : m_libraryHandle( NULL ) - , m_libraryName( libraryFileName ) -{ - loadLibrary( libraryFileName ); -} - - -DynamicLibraryManager::~DynamicLibraryManager() -{ - releaseLibrary(); -} - - -DynamicLibraryManager::Symbol -DynamicLibraryManager::findSymbol( const std::string &symbol ) -{ - try - { - Symbol symbolPointer = doFindSymbol( symbol ); - if ( symbolPointer != NULL ) - return symbolPointer; - } - catch ( ... ) - { - } - - throw DynamicLibraryManagerException( m_libraryName, - symbol, - DynamicLibraryManagerException::symbolNotFound ); - return NULL; // keep compiler happy -} - - -void -DynamicLibraryManager::loadLibrary( const std::string &libraryName ) -{ - try - { - releaseLibrary(); - m_libraryHandle = doLoadLibrary( libraryName ); - if ( m_libraryHandle != NULL ) - return; - } - catch (...) - { - } - - throw DynamicLibraryManagerException( m_libraryName, - getLastErrorDetail(), - DynamicLibraryManagerException::loadingFailed ); -} - - -void -DynamicLibraryManager::releaseLibrary() -{ - if ( m_libraryHandle != NULL ) - { - doReleaseLibrary(); - m_libraryHandle = NULL; - } -} - - -CPPUNIT_NS_END - - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManagerException.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManagerException.cpp deleted file mode 100644 index 8498652e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/DynamicLibraryManagerException.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManagerException::DynamicLibraryManagerException( - const std::string &libraryName, - const std::string &errorDetail, - Cause cause ) - : std::runtime_error( "" ), - m_cause( cause ) -{ - if ( cause == loadingFailed ) - m_message = "Failed to load dynamic library: " + libraryName + "\n" + - errorDetail; - else - m_message = "Symbol [" + errorDetail + "] not found in dynamic libary:" + - libraryName; -} - - -DynamicLibraryManagerException::Cause -DynamicLibraryManagerException::getCause() const -{ - return m_cause; -} - - -const char * -DynamicLibraryManagerException::what() const throw() -{ - return m_message.c_str(); -} - - -CPPUNIT_NS_END - - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Exception.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Exception.cpp deleted file mode 100644 index 3bbe24b9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Exception.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -/*! - * \deprecated Use SourceLine::isValid() instead. - */ -const std::string Exception::UNKNOWNFILENAME = ""; - -/*! - * \deprecated Use SourceLine::isValid() instead. - */ -const long Exception::UNKNOWNLINENUMBER = -1; -#endif - - -Exception::Exception( const Exception &other ) - : std::exception( other ) -{ - m_message = other.m_message; - m_sourceLine = other.m_sourceLine; -} - - -Exception::Exception( const Message &message, - const SourceLine &sourceLine ) - : m_message( message ) - , m_sourceLine( sourceLine ) -{ -} - - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -Exception::Exception( std::string message, - long lineNumber, - std::string fileName ) - : m_message( message ) - , m_sourceLine( fileName, lineNumber ) -{ -} -#endif - - -Exception::~Exception() throw() -{ -} - - -Exception & -Exception::operator =( const Exception& other ) -{ -// Don't call superclass operator =(). VC++ STL implementation -// has a bug. It calls the destructor and copy constructor of -// std::exception() which reset the virtual table to std::exception. -// SuperClass::operator =(other); - - if ( &other != this ) - { - m_message = other.m_message; - m_sourceLine = other.m_sourceLine; - } - - return *this; -} - - -const char* -Exception::what() const throw() -{ - Exception *mutableThis = CPPUNIT_CONST_CAST( Exception *, this ); - mutableThis->m_whatMessage = m_message.shortDescription() + "\n" + - m_message.details(); - return m_whatMessage.c_str(); -} - - -SourceLine -Exception::sourceLine() const -{ - return m_sourceLine; -} - - -Message -Exception::message() const -{ - return m_message; -} - - -void -Exception::setMessage( const Message &message ) -{ - m_message = message; -} - - -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -long -Exception::lineNumber() const -{ - return m_sourceLine.isValid() ? m_sourceLine.lineNumber() : - UNKNOWNLINENUMBER; -} - - -std::string -Exception::fileName() const -{ - return m_sourceLine.isValid() ? m_sourceLine.fileName() : - UNKNOWNFILENAME; -} -#endif - - -Exception * -Exception::clone() const -{ - return new Exception( *this ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.am b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.am deleted file mode 100644 index d5a60bf7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -# -# $Id: Makefile.am,v 1.44 2005/06/14 21:28:46 blep Exp $ -# - -EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - -lib_LTLIBRARIES = libcppunit.la - -libcppunit_la_SOURCES = \ - AdditionalMessage.cpp \ - Asserter.cpp \ - BeOsDynamicLibraryManager.cpp \ - BriefTestProgressListener.cpp \ - CompilerOutputter.cpp \ - DefaultProtector.h \ - DefaultProtector.cpp \ - DynamicLibraryManager.cpp \ - DynamicLibraryManagerException.cpp \ - Exception.cpp \ - Message.cpp \ - RepeatedTest.cpp \ - PlugInManager.cpp \ - PlugInParameters.cpp \ - Protector.cpp \ - ProtectorChain.h \ - ProtectorContext.h \ - ProtectorChain.cpp \ - SourceLine.cpp \ - StringTools.cpp \ - SynchronizedObject.cpp \ - Test.cpp \ - TestAssert.cpp \ - TestCase.cpp \ - TestCaseDecorator.cpp \ - TestComposite.cpp \ - TestDecorator.cpp \ - TestFactoryRegistry.cpp \ - TestFailure.cpp \ - TestLeaf.cpp \ - TestNamer.cpp \ - TestPath.cpp \ - TestPlugInDefaultImpl.cpp \ - TestResult.cpp \ - TestResultCollector.cpp \ - TestRunner.cpp \ - TestSetUp.cpp \ - TestSuccessListener.cpp \ - TestSuite.cpp \ - TestSuiteBuilderContext.cpp \ - TextOutputter.cpp \ - TextTestProgressListener.cpp \ - TextTestResult.cpp \ - TextTestRunner.cpp \ - TypeInfoHelper.cpp \ - UnixDynamicLibraryManager.cpp \ - ShlDynamicLibraryManager.cpp \ - XmlDocument.cpp \ - XmlElement.cpp \ - XmlOutputter.cpp \ - XmlOutputterHook.cpp \ - Win32DynamicLibraryManager.cpp - -libcppunit_la_LDFLAGS= \ - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.in b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.in deleted file mode 100644 index aa68cb04..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Makefile.in +++ /dev/null @@ -1,632 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ - -# -# $Id: Makefile.am,v 1.44 2005/06/14 21:28:46 blep Exp $ -# - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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/cppunit -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = \ - $(top_srcdir)/config/ac_create_prefix_config_h.m4 \ - $(top_srcdir)/config/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/config/ac_cxx_have_strstream.m4 \ - $(top_srcdir)/config/ac_cxx_namespaces.m4 \ - $(top_srcdir)/config/ac_cxx_rtti.m4 \ - $(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \ - $(top_srcdir)/config/ac_dll.m4 \ - $(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \ - $(top_srcdir)/config/ax_cxx_have_isfinite.m4 \ - $(top_srcdir)/config/bb_enable_doxygen.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libcppunit_la_LIBADD = -am_libcppunit_la_OBJECTS = AdditionalMessage.lo Asserter.lo \ - BeOsDynamicLibraryManager.lo BriefTestProgressListener.lo \ - CompilerOutputter.lo DefaultProtector.lo \ - DynamicLibraryManager.lo DynamicLibraryManagerException.lo \ - Exception.lo Message.lo RepeatedTest.lo PlugInManager.lo \ - PlugInParameters.lo Protector.lo ProtectorChain.lo \ - SourceLine.lo StringTools.lo SynchronizedObject.lo Test.lo \ - TestAssert.lo TestCase.lo TestCaseDecorator.lo \ - TestComposite.lo TestDecorator.lo TestFactoryRegistry.lo \ - TestFailure.lo TestLeaf.lo TestNamer.lo TestPath.lo \ - TestPlugInDefaultImpl.lo TestResult.lo TestResultCollector.lo \ - TestRunner.lo TestSetUp.lo TestSuccessListener.lo TestSuite.lo \ - TestSuiteBuilderContext.lo TextOutputter.lo \ - TextTestProgressListener.lo TextTestResult.lo \ - TextTestRunner.lo TypeInfoHelper.lo \ - UnixDynamicLibraryManager.lo ShlDynamicLibraryManager.lo \ - XmlDocument.lo XmlElement.lo XmlOutputter.lo \ - XmlOutputterHook.lo Win32DynamicLibraryManager.lo -libcppunit_la_OBJECTS = $(am_libcppunit_la_OBJECTS) -libcppunit_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libcppunit_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libcppunit_la_SOURCES) -DIST_SOURCES = $(libcppunit_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@ -CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@ -CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@ -CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@ -CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@ -CPPUNIT_VERSION = @CPPUNIT_VERSION@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_AGE = @LT_AGE@ -LT_CURRENT = @LT_CURRENT@ -LT_RELEASE = @LT_RELEASE@ -LT_REVISION = @LT_REVISION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -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@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -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_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -lib_LTLIBRARIES = libcppunit.la -libcppunit_la_SOURCES = \ - AdditionalMessage.cpp \ - Asserter.cpp \ - BeOsDynamicLibraryManager.cpp \ - BriefTestProgressListener.cpp \ - CompilerOutputter.cpp \ - DefaultProtector.h \ - DefaultProtector.cpp \ - DynamicLibraryManager.cpp \ - DynamicLibraryManagerException.cpp \ - Exception.cpp \ - Message.cpp \ - RepeatedTest.cpp \ - PlugInManager.cpp \ - PlugInParameters.cpp \ - Protector.cpp \ - ProtectorChain.h \ - ProtectorContext.h \ - ProtectorChain.cpp \ - SourceLine.cpp \ - StringTools.cpp \ - SynchronizedObject.cpp \ - Test.cpp \ - TestAssert.cpp \ - TestCase.cpp \ - TestCaseDecorator.cpp \ - TestComposite.cpp \ - TestDecorator.cpp \ - TestFactoryRegistry.cpp \ - TestFailure.cpp \ - TestLeaf.cpp \ - TestNamer.cpp \ - TestPath.cpp \ - TestPlugInDefaultImpl.cpp \ - TestResult.cpp \ - TestResultCollector.cpp \ - TestRunner.cpp \ - TestSetUp.cpp \ - TestSuccessListener.cpp \ - TestSuite.cpp \ - TestSuiteBuilderContext.cpp \ - TextOutputter.cpp \ - TextTestProgressListener.cpp \ - TextTestResult.cpp \ - TextTestRunner.cpp \ - TypeInfoHelper.cpp \ - UnixDynamicLibraryManager.cpp \ - ShlDynamicLibraryManager.cpp \ - XmlDocument.cpp \ - XmlElement.cpp \ - XmlOutputter.cpp \ - XmlOutputterHook.cpp \ - Win32DynamicLibraryManager.cpp - -libcppunit_la_LDFLAGS = \ - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/cppunit/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/cppunit/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 -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libcppunit.la: $(libcppunit_la_OBJECTS) $(libcppunit_la_DEPENDENCIES) - $(libcppunit_la_LINK) -rpath $(libdir) $(libcppunit_la_OBJECTS) $(libcppunit_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdditionalMessage.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Asserter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BeOsDynamicLibraryManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BriefTestProgressListener.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CompilerOutputter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultProtector.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DynamicLibraryManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DynamicLibraryManagerException.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlugInManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlugInParameters.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Protector.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProtectorChain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RepeatedTest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShlDynamicLibraryManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SourceLine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringTools.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SynchronizedObject.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Test.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestAssert.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCase.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestCaseDecorator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestComposite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestDecorator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestFactoryRegistry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestFailure.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestLeaf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestNamer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPath.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestPlugInDefaultImpl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResult.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestResultCollector.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestRunner.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSetUp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSuccessListener.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSuite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestSuiteBuilderContext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextOutputter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextTestProgressListener.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextTestResult.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextTestRunner.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TypeInfoHelper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnixDynamicLibraryManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Win32DynamicLibraryManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlDocument.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlElement.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlOutputter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlOutputterHook.Plo@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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 - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: 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 all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags 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 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/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Message.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Message.cpp deleted file mode 100644 index 9d6a0e92..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Message.cpp +++ /dev/null @@ -1,170 +0,0 @@ -#include -#include - - -CPPUNIT_NS_BEGIN - - -Message::Message() -{ -} - -Message::Message( const Message &other ) -{ - *this = other; -} - - -Message::Message( const std::string &shortDescription ) - : m_shortDescription( shortDescription ) -{ -} - - -Message::Message( const std::string &shortDescription, - const std::string &detail1 ) - : m_shortDescription( shortDescription ) -{ - addDetail( detail1 ); -} - - -Message::Message( const std::string &shortDescription, - const std::string &detail1, - const std::string &detail2 ) - : m_shortDescription( shortDescription ) -{ - addDetail( detail1, detail2 ); -} - - -Message::Message( const std::string &shortDescription, - const std::string &detail1, - const std::string &detail2, - const std::string &detail3 ) - : m_shortDescription( shortDescription ) -{ - addDetail( detail1, detail2, detail3 ); -} - -Message & -Message::operator =( const Message &other ) -{ - if ( this != &other ) - { - m_shortDescription = other.m_shortDescription.c_str(); - m_details.clear(); - Details::const_iterator it = other.m_details.begin(); - Details::const_iterator itEnd = other.m_details.end(); - while ( it != itEnd ) - m_details.push_back( (*it++).c_str() ); - } - - return *this; -} - - -const std::string & -Message::shortDescription() const -{ - return m_shortDescription; -} - - -int -Message::detailCount() const -{ - return m_details.size(); -} - - -std::string -Message::detailAt( int index ) const -{ - if ( index < 0 || index >= detailCount() ) - throw std::invalid_argument( "Message::detailAt() : invalid index" ); - - return m_details[ index ]; -} - - -std::string -Message::details() const -{ - std::string details; - for ( Details::const_iterator it = m_details.begin(); it != m_details.end(); ++it ) - { - details += "- "; - details += *it; - details += '\n'; - } - return details; -} - - -void -Message::clearDetails() -{ - m_details.clear(); -} - - -void -Message::addDetail( const std::string &detail ) -{ - m_details.push_back( detail ); -} - - -void -Message::addDetail( const std::string &detail1, - const std::string &detail2 ) -{ - addDetail( detail1 ); - addDetail( detail2 ); -} - - -void -Message::addDetail( const std::string &detail1, - const std::string &detail2, - const std::string &detail3 ) -{ - addDetail( detail1, detail2 ); - addDetail( detail3 ); -} - - -void -Message::addDetail( const Message &message ) -{ - m_details.insert( m_details.end(), - message.m_details.begin(), - message.m_details.end() ); -} - - -void -Message::setShortDescription( const std::string &shortDescription ) -{ - m_shortDescription = shortDescription; -} - - -bool -Message::operator ==( const Message &other ) const -{ - return m_shortDescription == other.m_shortDescription && - m_details == other.m_details; -} - - -bool -Message::operator !=( const Message &other ) const -{ - return !( *this == other ); -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInManager.cpp deleted file mode 100644 index b595deef..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInManager.cpp +++ /dev/null @@ -1,110 +0,0 @@ -#include -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -PlugInManager::PlugInManager() -{ -} - - -PlugInManager::~PlugInManager() -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - unload( *it ); -} - - -void -PlugInManager::load( const std::string &libraryFileName, - const PlugInParameters ¶meters ) -{ - PlugInInfo info; - info.m_fileName = libraryFileName; - info.m_manager = new DynamicLibraryManager( libraryFileName ); - - TestPlugInSignature plug = (TestPlugInSignature)info.m_manager->findSymbol( - CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ) ); - info.m_interface = (*plug)(); - - m_plugIns.push_back( info ); - - info.m_interface->initialize( &TestFactoryRegistry::getRegistry(), parameters ); -} - - -void -PlugInManager::unload( const std::string &libraryFileName ) -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - { - if ( (*it).m_fileName == libraryFileName ) - { - unload( *it ); - m_plugIns.erase( it ); - break; - } - } -} - - -void -PlugInManager::addListener( TestResult *eventManager ) -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - (*it).m_interface->addListener( eventManager ); -} - - -void -PlugInManager::removeListener( TestResult *eventManager ) -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - (*it).m_interface->removeListener( eventManager ); -} - - -void -PlugInManager::unload( PlugInInfo &plugIn ) -{ - try - { - plugIn.m_interface->uninitialize( &TestFactoryRegistry::getRegistry() ); - delete plugIn.m_manager; - } - catch (...) - { - delete plugIn.m_manager; - plugIn.m_manager = NULL; - throw; - } -} - - -void -PlugInManager::addXmlOutputterHooks( XmlOutputter *outputter ) -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - (*it).m_interface->addXmlOutputterHooks( outputter ); -} - - -void -PlugInManager::removeXmlOutputterHooks() -{ - for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it ) - (*it).m_interface->removeXmlOutputterHooks(); -} - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInParameters.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInParameters.cpp deleted file mode 100644 index 1b532f9f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/PlugInParameters.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -CPPUNIT_NS_BEGIN - - -PlugInParameters::PlugInParameters( const std::string &commandLine ) - : m_commandLine( commandLine ) -{ -} - - -PlugInParameters::~PlugInParameters() -{ -} - - -std::string -PlugInParameters::getCommandLine() const -{ - return m_commandLine; -} - - -CPPUNIT_NS_END - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Protector.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Protector.cpp deleted file mode 100644 index 5c171ec4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Protector.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include -#include -#include -#include -#include "ProtectorContext.h" -#include - -CPPUNIT_NS_BEGIN - -Functor::~Functor() -{ -} - - -Protector::~Protector() -{ -} - - -void -Protector::reportError( const ProtectorContext &context, - const Exception &error ) const -{ - std::auto_ptr actualError( error.clone() ); - actualError->setMessage( actualMessage( actualError->message(), context ) ); - context.m_result->addError( context.m_test, - actualError.release() ); -} - - - -void -Protector::reportError( const ProtectorContext &context, - const Message &message, - const SourceLine &sourceLine ) const -{ - reportError( context, Exception( message, sourceLine ) ); -} - - -void -Protector::reportFailure( const ProtectorContext &context, - const Exception &failure ) const -{ - std::auto_ptr actualFailure( failure.clone() ); - actualFailure->setMessage( actualMessage( actualFailure->message(), context ) ); - context.m_result->addFailure( context.m_test, - actualFailure.release() ); -} - - -Message -Protector::actualMessage( const Message &message, - const ProtectorContext &context ) const -{ - Message theActualMessage; - if ( context.m_shortDescription.empty() ) - theActualMessage = message; - else - { - theActualMessage = Message( context.m_shortDescription, - message.shortDescription() ); - theActualMessage.addDetail( message ); - } - - return theActualMessage; -} - - - - -ProtectorGuard::ProtectorGuard( TestResult *result, - Protector *protector ) - : m_result( result ) -{ - m_result->pushProtector( protector ); -} - - -ProtectorGuard::~ProtectorGuard() -{ - m_result->popProtector(); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.cpp deleted file mode 100644 index f528341e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "ProtectorChain.h" - -CPPUNIT_NS_BEGIN - - -class ProtectorChain::ProtectFunctor : public Functor -{ -public: - ProtectFunctor( Protector *protector, - const Functor &functor, - const ProtectorContext &context ) - : m_protector( protector ) - , m_functor( functor ) - , m_context( context ) - { - } - - bool operator()() const - { - return m_protector->protect( m_functor, m_context ); - } - -private: - Protector *m_protector; - const Functor &m_functor; - const ProtectorContext &m_context; -}; - - -ProtectorChain::~ProtectorChain() -{ - while ( count() > 0 ) - pop(); -} - - -void -ProtectorChain::push( Protector *protector ) -{ - m_protectors.push_back( protector ); -} - - -void -ProtectorChain::pop() -{ - delete m_protectors.back(); - m_protectors.pop_back(); -} - -int -ProtectorChain::count() const -{ - return m_protectors.size(); -} - - -bool -ProtectorChain::protect( const Functor &functor, - const ProtectorContext &context ) -{ - if ( m_protectors.empty() ) - return functor(); - - Functors functors; - for ( int index = m_protectors.size()-1; index >= 0; --index ) - { - const Functor &protectedFunctor = - functors.empty() ? functor : *functors.back(); - - functors.push_back( new ProtectFunctor( m_protectors[index], - protectedFunctor, - context ) ); - } - - const Functor &outermostFunctor = *functors.back(); - bool succeed = outermostFunctor(); - - for ( unsigned int deletingIndex = 0; deletingIndex < m_protectors.size(); ++deletingIndex ) - delete functors[deletingIndex]; - - return succeed; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.h deleted file mode 100644 index 711b56fb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorChain.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef CPPUNIT_PROTECTORCHAIN_H -#define CPPUNIT_PROTECTORCHAIN_H - -#include -#include - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( push ) -#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z -#endif - - -CPPUNIT_NS_BEGIN - -/*! \brief Protector chain (Implementation). - * Implementation detail. - * \internal Protector that protect a Functor using a chain of nested Protector. - */ -class CPPUNIT_API ProtectorChain : public Protector -{ -public: - ~ProtectorChain(); - - void push( Protector *protector ); - - void pop(); - - int count() const; - - bool protect( const Functor &functor, - const ProtectorContext &context ); - -private: - class ProtectFunctor; - -private: - typedef CppUnitDeque Protectors; - Protectors m_protectors; - - typedef CppUnitDeque Functors; -}; - - -CPPUNIT_NS_END - -#if CPPUNIT_NEED_DLL_DECL -#pragma warning( pop ) -#endif - -#endif // CPPUNIT_PROTECTORCHAIN_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorContext.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorContext.h deleted file mode 100644 index c3d496c4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ProtectorContext.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef CPPUNIT_PROTECTORCONTEXT_H -#define CPPUNIT_PROTECTORCONTEXT_H - -#include -#include - -CPPUNIT_NS_BEGIN - -class Test; -class TestResult; - - -/*! \brief Protector context (Implementation). - * Implementation detail. - * \internal Context use to report failure in Protector. - */ -class CPPUNIT_API ProtectorContext -{ -public: - ProtectorContext( Test *test, - TestResult *result, - const std::string &shortDescription ) - : m_test( test ) - , m_result( result ) - , m_shortDescription( shortDescription ) - { - } - - Test *m_test; - TestResult *m_result; - std::string m_shortDescription; -}; - - -CPPUNIT_NS_END - -#endif // CPPUNIT_PROTECTORCONTEXT_H - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/RepeatedTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/RepeatedTest.cpp deleted file mode 100644 index 2533ca1d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/RepeatedTest.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include - -CPPUNIT_NS_BEGIN - - -// Counts the number of test cases that will be run by this test. -int -RepeatedTest::countTestCases() const -{ - return TestDecorator::countTestCases() * m_timesRepeat; -} - - -// Runs a repeated test -void -RepeatedTest::run( TestResult *result ) -{ - for ( int n = 0; n < m_timesRepeat; n++ ) - { - if ( result->shouldStop() ) - break; - - TestDecorator::run( result ); - } -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ShlDynamicLibraryManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ShlDynamicLibraryManager.cpp deleted file mode 100644 index 9f4be227..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/ShlDynamicLibraryManager.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include - -#if defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) -#include - -#include -#include - - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManager::LibraryHandle -DynamicLibraryManager::doLoadLibrary( const std::string &libraryName ) -{ - return ::shl_load(libraryName.c_str(), BIND_IMMEDIATE, 0L); -} - - -void -DynamicLibraryManager::doReleaseLibrary() -{ - ::shl_unload( (shl_t)m_libraryHandle); -} - - -DynamicLibraryManager::Symbol -DynamicLibraryManager::doFindSymbol( const std::string &symbol ) -{ - DynamicLibraryManager::Symbol L_symaddr = 0; - if ( ::shl_findsym( (shl_t*)(&m_libraryHandle), - symbol.c_str(), - TYPE_UNDEFINED, - &L_symaddr ) == 0 ) - { - return L_symaddr; - } - - return 0; -} - - -std::string -DynamicLibraryManager::getLastErrorDetail() const -{ - return ""; -} - - -CPPUNIT_NS_END - - -#endif // defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SourceLine.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SourceLine.cpp deleted file mode 100644 index dfadae3f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SourceLine.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -SourceLine::SourceLine() : - m_lineNumber( -1 ) -{ -} - - -SourceLine::SourceLine( const SourceLine &other ) - : m_fileName( other.m_fileName.c_str() ) - , m_lineNumber( other.m_lineNumber ) -{ -} - - -SourceLine::SourceLine( const std::string &fileName, - int lineNumber ) - : m_fileName( fileName.c_str() ) - , m_lineNumber( lineNumber ) -{ -} - - -SourceLine & -SourceLine::operator =( const SourceLine &other ) -{ - if ( this != &other ) - { - m_fileName = other.m_fileName.c_str(); - m_lineNumber = other.m_lineNumber; - } - return *this; -} - - -SourceLine::~SourceLine() -{ -} - - -bool -SourceLine::isValid() const -{ - return !m_fileName.empty(); -} - - -int -SourceLine::lineNumber() const -{ - return m_lineNumber; -} - - -std::string -SourceLine::fileName() const -{ - return m_fileName; -} - - -bool -SourceLine::operator ==( const SourceLine &other ) const -{ - return m_fileName == other.m_fileName && - m_lineNumber == other.m_lineNumber; -} - - -bool -SourceLine::operator !=( const SourceLine &other ) const -{ - return !( *this == other ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/StringTools.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/StringTools.cpp deleted file mode 100644 index dc995d8b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/StringTools.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -std::string -StringTools::toString( int value ) -{ - OStringStream stream; - stream << value; - return stream.str(); -} - - -std::string -StringTools::toString( double value ) -{ - OStringStream stream; - stream << value; - return stream.str(); -} - - -StringTools::Strings -StringTools::split( const std::string &text, - char separator ) -{ - Strings splittedText; - - std::string::const_iterator itStart = text.begin(); - while ( !text.empty() ) - { - std::string::const_iterator itSeparator = std::find( itStart, - text.end(), - separator ); - splittedText.push_back( text.substr( itStart - text.begin(), - itSeparator - itStart ) ); - if ( itSeparator == text.end() ) - break; - itStart = itSeparator +1; - } - - return splittedText; -} - - -std::string -StringTools::wrap( const std::string &text, - int wrapColumn ) -{ - const char lineBreak = '\n'; - Strings lines = split( text, lineBreak ); - - std::string wrapped; - for ( Strings::const_iterator it = lines.begin(); it != lines.end(); ++it ) - { - if ( it != lines.begin() ) - wrapped += lineBreak; - - const std::string &line = *it; - unsigned int index =0; - while ( index < line.length() ) - { - std::string lineSlice( line.substr( index, wrapColumn ) ); - wrapped += lineSlice; - index += wrapColumn; - if ( index < line.length() ) - wrapped += lineBreak; - } - } - - return wrapped; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SynchronizedObject.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SynchronizedObject.cpp deleted file mode 100644 index 1764538e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/SynchronizedObject.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject ) - : m_syncObject( syncObject == 0 ? new SynchronizationObject() : - syncObject ) -{ -} - - -SynchronizedObject::~SynchronizedObject() -{ - delete m_syncObject; -} - - -/** Accept a new synchronization object for protection of this instance - * TestResult assumes ownership of the object - */ -void -SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject ) -{ - delete m_syncObject; - m_syncObject = syncObject; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Test.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Test.cpp deleted file mode 100644 index fef8be79..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Test.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -Test * -Test::getChildTestAt( int index ) const -{ - checkIsValidIndex( index ); - return doGetChildTestAt( index ); -} - - -Test * -Test::findTest( const std::string &testName ) const -{ - TestPath path; - Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this ); - mutableThis->findTestPath( testName, path ); - if ( !path.isValid() ) - throw std::invalid_argument( "No test named <" + testName + "> found in test <" - + getName() + ">." ); - return path.getChildTest(); -} - - -bool -Test::findTestPath( const std::string &testName, - TestPath &testPath ) const -{ - Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this ); - if ( getName() == testName ) - { - testPath.add( mutableThis ); - return true; - } - - int childCount = getChildTestCount(); - for ( int childIndex =0; childIndex < childCount; ++childIndex ) - { - if ( getChildTestAt( childIndex )->findTestPath( testName, testPath ) ) - { - testPath.insert( mutableThis, 0 ); - return true; - } - } - - return false; -} - - -bool -Test::findTestPath( const Test *test, - TestPath &testPath ) const -{ - Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this ); - if ( this == test ) - { - testPath.add( mutableThis ); - return true; - } - - int childCount = getChildTestCount(); - for ( int childIndex =0; childIndex < childCount; ++childIndex ) - { - if ( getChildTestAt( childIndex )->findTestPath( test, testPath ) ) - { - testPath.insert( mutableThis, 0 ); - return true; - } - } - - return false; -} - - -TestPath -Test::resolveTestPath( const std::string &testPath ) const -{ - Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this ); - return TestPath( mutableThis, testPath ); -} - - -void -Test::checkIsValidIndex( int index ) const -{ - if ( index < 0 || index >= getChildTestCount() ) - throw std::out_of_range( "Test::checkValidIndex(): invalid index" ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestAssert.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestAssert.cpp deleted file mode 100644 index 6e4e794b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestAssert.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include - -CPPUNIT_NS_BEGIN - - -void -assertDoubleEquals( double expected, - double actual, - double delta, - SourceLine sourceLine, - const std::string &message ) -{ - AdditionalMessage msg( "Delta : " + - assertion_traits::toString(delta) ); - msg.addDetail( AdditionalMessage(message) ); - - bool equal; - if ( floatingPointIsFinite(expected) && floatingPointIsFinite(actual) ) - equal = fabs( expected - actual ) <= delta; - else - { - // If expected or actual is not finite, it may be +inf, -inf or NaN (Not a Number). - // Value of +inf or -inf leads to a true equality regardless of delta if both - // expected and actual have the same value (infinity sign). - // NaN Value should always lead to a failed equality. - if ( floatingPointIsUnordered(expected) || floatingPointIsUnordered(actual) ) - { - equal = false; // expected or actual is a NaN - } - else // ordered values, +inf or -inf comparison - { - equal = expected == actual; - } - } - - Asserter::failNotEqualIf( !equal, - assertion_traits::toString(expected), - assertion_traits::toString(actual), - sourceLine, - msg, - "double equality assertion failed" ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCase.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCase.cpp deleted file mode 100644 index 13c05257..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCase.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#if CPPUNIT_USE_TYPEINFO_NAME -# include -#endif - -CPPUNIT_NS_BEGIN - -/*! \brief Functor to call test case method (Implementation). - * - * Implementation detail. - */ -class TestCaseMethodFunctor : public Functor -{ -public: - typedef void (TestCase::*Method)(); - - TestCaseMethodFunctor( TestCase *target, - Method method ) - : m_target( target ) - , m_method( method ) - { - } - - bool operator()() const - { - (m_target->*m_method)(); - return true; - } - -private: - TestCase *m_target; - Method m_method; -}; - - -/** Constructs a test case. - * \param name the name of the TestCase. - **/ -TestCase::TestCase( const std::string &name ) - : m_name(name) -{ -} - - -/// Run the test and catch any exceptions that are triggered by it -void -TestCase::run( TestResult *result ) -{ - result->startTest(this); -/* - try { - setUp(); - - try { - runTest(); - } - catch ( Exception &e ) { - Exception *copy = e.clone(); - result->addFailure( this, copy ); - } - catch ( std::exception &e ) { - result->addError( this, new Exception( Message( "uncaught std::exception", - e.what() ) ) ); - } - catch (...) { - Exception *e = new Exception( Message( "uncaught unknown exception" ) ); - result->addError( this, e ); - } - - try { - tearDown(); - } - catch (...) { - result->addError( this, new Exception( Message( "tearDown() failed" ) ) ); - } - } - catch (...) { - result->addError( this, new Exception( Message( "setUp() failed" ) ) ); - } -*/ - if ( result->protect( TestCaseMethodFunctor( this, &TestCase::setUp ), - this, - "setUp() failed" ) ) - { - result->protect( TestCaseMethodFunctor( this, &TestCase::runTest ), - this ); - } - - result->protect( TestCaseMethodFunctor( this, &TestCase::tearDown ), - this, - "tearDown() failed" ); - - result->endTest( this ); -} - - -/// All the work for runTest is deferred to subclasses -void -TestCase::runTest() -{ -} - - -/** Constructs a test case for a suite. - * \deprecated This constructor was used by fixture when TestFixture did not exist. - * Have your fixture inherits TestFixture instead of TestCase. - * \internal - * This TestCase was intended for use by the TestCaller and should not - * be used by a test case for which run() is called. - **/ -TestCase::TestCase() - : m_name( "" ) -{ -} - - -/// Destructs a test case -TestCase::~TestCase() -{ -} - - -/// Returns the name of the test case -std::string -TestCase::getName() const -{ - return m_name; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCaseDecorator.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCaseDecorator.cpp deleted file mode 100644 index a7229f4b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestCaseDecorator.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include - -CPPUNIT_NS_BEGIN - - -TestCaseDecorator::TestCaseDecorator( TestCase *test ) - : TestCase( test->getName() ), - m_test( test ) -{ -} - - -TestCaseDecorator::~TestCaseDecorator() -{ - delete m_test; -} - - -std::string -TestCaseDecorator::getName() const -{ - return m_test->getName(); -} - - -void -TestCaseDecorator::setUp() -{ - m_test->setUp(); -} - - -void -TestCaseDecorator::tearDown() -{ - m_test->tearDown(); -} - - -void -TestCaseDecorator::runTest() -{ - m_test->runTest(); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestComposite.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestComposite.cpp deleted file mode 100644 index 4768791b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestComposite.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include -#include - - -CPPUNIT_NS_BEGIN - - -TestComposite::TestComposite( const std::string &name ) - : m_name( name ) -{ -} - - -TestComposite::~TestComposite() -{ -} - - -void -TestComposite::run( TestResult *result ) -{ - doStartSuite( result ); - doRunChildTests( result ); - doEndSuite( result ); -} - - -int -TestComposite::countTestCases() const -{ - int count = 0; - - int childCount = getChildTestCount(); - for ( int index =0; index < childCount; ++index ) - count += getChildTestAt( index )->countTestCases(); - - return count; -} - - -std::string -TestComposite::getName() const -{ - return m_name; -} - - -void -TestComposite::doStartSuite( TestResult *controller ) -{ - controller->startSuite( this ); -} - - -void -TestComposite::doRunChildTests( TestResult *controller ) -{ - int childCount = getChildTestCount(); - for ( int index =0; index < childCount; ++index ) - { - if ( controller->shouldStop() ) - break; - - getChildTestAt( index )->run( controller ); - } -} - - -void -TestComposite::doEndSuite( TestResult *controller ) -{ - controller->endSuite( this ); -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestDecorator.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestDecorator.cpp deleted file mode 100644 index 4e25a6af..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestDecorator.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include - -CPPUNIT_NS_BEGIN - - -TestDecorator::TestDecorator( Test *test ) - : m_test( test) -{ -} - - -TestDecorator::~TestDecorator() -{ - delete m_test; -} - - -int -TestDecorator::countTestCases() const -{ - return m_test->countTestCases(); -} - - -void -TestDecorator::run( TestResult *result ) -{ - m_test->run(result); -} - - -std::string -TestDecorator::getName() const -{ - return m_test->getName(); -} - - -int -TestDecorator::getChildTestCount() const -{ - return m_test->getChildTestCount(); -} - - -Test * -TestDecorator::doGetChildTestAt( int index ) const -{ - return m_test->getChildTestAt( index ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFactoryRegistry.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFactoryRegistry.cpp deleted file mode 100644 index afe10bb4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFactoryRegistry.cpp +++ /dev/null @@ -1,161 +0,0 @@ -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - -/*! \brief (INTERNAL) List of all TestFactoryRegistry. - */ -class TestFactoryRegistryList -{ -private: - typedef CppUnitMap > Registries; - Registries m_registries; - - enum State { - doNotChange =0, - notCreated, - exist, - destroyed - }; - - static State stateFlag( State newState = doNotChange ) - { - static State state = notCreated; - if ( newState != doNotChange ) - state = newState; - return state; - } - - static TestFactoryRegistryList *getInstance() - { - static TestFactoryRegistryList list; - return &list; - } - - TestFactoryRegistry *getInternalRegistry( const std::string &name ) - { - Registries::const_iterator foundIt = m_registries.find( name ); - if ( foundIt == m_registries.end() ) - { - TestFactoryRegistry *factory = new TestFactoryRegistry( name ); - m_registries.insert( std::pair( name, factory ) ); - return factory; - } - return (*foundIt).second; - } - -public: - TestFactoryRegistryList() - { - stateFlag( exist ); - } - - ~TestFactoryRegistryList() - { - for ( Registries::iterator it = m_registries.begin(); it != m_registries.end(); ++it ) - delete (*it).second; - - stateFlag( destroyed ); - } - - static TestFactoryRegistry *getRegistry( const std::string &name ) - { - // If the following assertion failed, then TestFactoryRegistry::getRegistry() - // was called during static variable destruction without checking the registry - // validity beforehand using TestFactoryRegistry::isValid() beforehand. - assert( isValid() ); - if ( !isValid() ) // release mode - return NULL; // => force CRASH - - return getInstance()->getInternalRegistry( name ); - } - - static bool isValid() - { - return stateFlag() != destroyed; - } -}; - - - -TestFactoryRegistry::TestFactoryRegistry( std::string name ) : - m_name( name ) -{ -} - - -TestFactoryRegistry::~TestFactoryRegistry() -{ -} - - -TestFactoryRegistry & -TestFactoryRegistry::getRegistry( const std::string &name ) -{ - return *TestFactoryRegistryList::getRegistry( name ); -} - - -void -TestFactoryRegistry::registerFactory( const std::string &name, - TestFactory *factory ) -{ - registerFactory( factory ); -} - - -void -TestFactoryRegistry::registerFactory( TestFactory *factory ) -{ - m_factories.insert( factory ); -} - - -void -TestFactoryRegistry::unregisterFactory( TestFactory *factory ) -{ - m_factories.erase( factory ); -} - - -void -TestFactoryRegistry::addRegistry( const std::string &name ) -{ - registerFactory( &getRegistry( name ) ); -} - - -Test * -TestFactoryRegistry::makeTest() -{ - TestSuite *suite = new TestSuite( m_name ); - addTestToSuite( suite ); - return suite; -} - - -void -TestFactoryRegistry::addTestToSuite( TestSuite *suite ) -{ - for ( Factories::iterator it = m_factories.begin(); - it != m_factories.end(); - ++it ) - { - TestFactory *factory = *it; - suite->addTest( factory->makeTest() ); - } -} - - -bool -TestFactoryRegistry::isValid() -{ - return TestFactoryRegistryList::isValid(); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFailure.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFailure.cpp deleted file mode 100644 index e31e1389..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestFailure.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -/// Constructs a TestFailure with the given test and exception. -TestFailure::TestFailure( Test *failedTest, - Exception *thrownException, - bool isError ) : - m_failedTest( failedTest ), - m_thrownException( thrownException ), - m_isError( isError ) -{ -} - -/// Deletes the owned exception. -TestFailure::~TestFailure() -{ - delete m_thrownException; -} - -/// Gets the failed test. -Test * -TestFailure::failedTest() const -{ - return m_failedTest; -} - - -/// Gets the thrown exception. Never \c NULL. -Exception * -TestFailure::thrownException() const -{ - return m_thrownException; -} - - -/// Gets the failure location. -SourceLine -TestFailure::sourceLine() const -{ - return m_thrownException->sourceLine(); -} - - -/// Indicates if the failure is a failed assertion or an error. -bool -TestFailure::isError() const -{ - return m_isError; -} - - -/// Gets the name of the failed test. -std::string -TestFailure::failedTestName() const -{ - return m_failedTest->getName(); -} - - -TestFailure * -TestFailure::clone() const -{ - return new TestFailure( m_failedTest, m_thrownException->clone(), m_isError ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestLeaf.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestLeaf.cpp deleted file mode 100644 index 3d8767cf..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestLeaf.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -int -TestLeaf::countTestCases() const -{ - return 1; -} - - -int -TestLeaf::getChildTestCount() const -{ - return 0; -} - - -Test * -TestLeaf::doGetChildTestAt( int index ) const -{ - checkIsValidIndex( index ); - return NULL; // never called, checkIsValidIndex() always throw. -} - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestNamer.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestNamer.cpp deleted file mode 100644 index eec9be97..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestNamer.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -#if CPPUNIT_HAVE_RTTI -TestNamer::TestNamer( const std::type_info &typeInfo ) -{ - m_fixtureName = TypeInfoHelper::getClassName( typeInfo ); -} -#endif - - -TestNamer::TestNamer( const std::string &fixtureName ) - : m_fixtureName( fixtureName ) -{ -} - - -TestNamer::~TestNamer() -{ -} - - -std::string -TestNamer::getFixtureName() const -{ - return m_fixtureName; -} - - -std::string -TestNamer::getTestNameFor( const std::string &testMethodName ) const -{ - return getFixtureName() + "::" + testMethodName; -} - - - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPath.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPath.cpp deleted file mode 100644 index a2783a29..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPath.cpp +++ /dev/null @@ -1,254 +0,0 @@ -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TestPath::TestPath() -{ -} - - -TestPath::TestPath( Test *root ) -{ - add( root ); -} - - -TestPath::TestPath( const TestPath &other, - int indexFirst, - int count ) -{ - int countAdjustment = 0; - if ( indexFirst < 0 ) - { - countAdjustment = indexFirst; - indexFirst = 0; - } - - if ( count < 0 ) - count = other.getTestCount(); - else - count += countAdjustment; - - int index = indexFirst; - while ( count-- > 0 && index < other.getTestCount() ) - add( other.getTestAt( index++ ) ); -} - - -TestPath::TestPath( Test *searchRoot, - const std::string &pathAsString ) -{ - PathTestNames testNames; - - Test *parentTest = findActualRoot( searchRoot, pathAsString, testNames ); - add( parentTest ); - - for ( unsigned int index = 1; index < testNames.size(); ++index ) - { - bool childFound = false; - for ( int childIndex =0; childIndex < parentTest->getChildTestCount(); ++childIndex ) - { - if ( parentTest->getChildTestAt( childIndex )->getName() == testNames[index] ) - { - childFound = true; - parentTest = parentTest->getChildTestAt( childIndex ); - break; - } - } - - if ( !childFound ) - throw std::invalid_argument( "TestPath::TestPath(): failed to resolve test name <"+ - testNames[index] + "> of path <" + pathAsString + ">" ); - - add( parentTest ); - } -} - - -TestPath::TestPath( const TestPath &other ) - : m_tests( other.m_tests ) -{ -} - - -TestPath::~TestPath() -{ -} - - -TestPath & -TestPath::operator =( const TestPath &other ) -{ - if ( &other != this ) - m_tests = other.m_tests; - return *this; -} - - -bool -TestPath::isValid() const -{ - return getTestCount() > 0; -} - - -void -TestPath::add( Test *test ) -{ - m_tests.push_back( test ); -} - - -void -TestPath::add( const TestPath &path ) -{ - for ( int index =0; index < path.getTestCount(); ++index ) - add( path.getTestAt( index ) ); -} - - -void -TestPath::insert( Test *test, - int index ) -{ - if ( index < 0 || index > getTestCount() ) - throw std::out_of_range( "TestPath::insert(): index out of range" ); - m_tests.insert( m_tests.begin() + index, test ); -} - -void -TestPath::insert( const TestPath &path, - int index ) -{ - int itemIndex = path.getTestCount() -1; - while ( itemIndex >= 0 ) - insert( path.getTestAt( itemIndex-- ), index ); -} - - -void -TestPath::removeTests() -{ - while ( isValid() ) - removeTest( 0 ); -} - - -void -TestPath::removeTest( int index ) -{ - checkIndexValid( index ); - m_tests.erase( m_tests.begin() + index ); -} - - -void -TestPath::up() -{ - checkIndexValid( 0 ); - removeTest( getTestCount() -1 ); -} - - -int -TestPath::getTestCount() const -{ - return m_tests.size(); -} - - -Test * -TestPath::getTestAt( int index ) const -{ - checkIndexValid( index ); - return m_tests[index]; -} - - -Test * -TestPath::getChildTest() const -{ - return getTestAt( getTestCount() -1 ); -} - - -void -TestPath::checkIndexValid( int index ) const -{ - if ( index < 0 || index >= getTestCount() ) - throw std::out_of_range( "TestPath::checkIndexValid(): index out of range" ); -} - - -std::string -TestPath::toString() const -{ - std::string asString( "/" ); - for ( int index =0; index < getTestCount(); ++index ) - { - if ( index > 0 ) - asString += '/'; - asString += getTestAt(index)->getName(); - } - - return asString; -} - - -Test * -TestPath::findActualRoot( Test *searchRoot, - const std::string &pathAsString, - PathTestNames &testNames ) -{ - bool isRelative = splitPathString( pathAsString, testNames ); - - if ( isRelative && pathAsString.empty() ) - return searchRoot; - - if ( testNames.empty() ) - throw std::invalid_argument( "TestPath::TestPath(): invalid root or root name in absolute path" ); - - Test *root = isRelative ? searchRoot->findTest( testNames[0] ) // throw if bad test name - : searchRoot; - if ( root->getName() != testNames[0] ) - throw std::invalid_argument( "TestPath::TestPath(): searchRoot does not match path root name" ); - - return root; -} - - -bool -TestPath::splitPathString( const std::string &pathAsString, - PathTestNames &testNames ) -{ - if ( pathAsString.empty() ) - return true; - - bool isRelative = pathAsString[0] != '/'; - - int index = (isRelative ? 0 : 1); - while ( true ) - { - int separatorIndex = pathAsString.find( '/', index ); - if ( separatorIndex >= 0 ) - { - testNames.push_back( pathAsString.substr( index, separatorIndex - index ) ); - index = separatorIndex + 1; - } - else - { - testNames.push_back( pathAsString.substr( index ) ); - break; - } - } - - return isRelative; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPlugInDefaultImpl.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPlugInDefaultImpl.cpp deleted file mode 100644 index 1e398258..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestPlugInDefaultImpl.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include - -#if !defined(CPPUNIT_NO_TESTPLUGIN) - -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TestPlugInDefaultImpl::TestPlugInDefaultImpl() -{ -} - - -TestPlugInDefaultImpl::~TestPlugInDefaultImpl() -{ -} - - -void -TestPlugInDefaultImpl::initialize( TestFactoryRegistry *registry, - const PlugInParameters ¶meters ) -{ -} - - -void -TestPlugInDefaultImpl::addListener( TestResult *eventManager ) -{ -} - - -void -TestPlugInDefaultImpl::removeListener( TestResult *eventManager ) -{ -} - - -void -TestPlugInDefaultImpl::addXmlOutputterHooks( XmlOutputter *outputter ) -{ -} - - -void -TestPlugInDefaultImpl::removeXmlOutputterHooks() -{ -} - - -void -TestPlugInDefaultImpl::uninitialize( TestFactoryRegistry *registry ) -{ -} - - -CPPUNIT_NS_END - - -#endif // !defined(CPPUNIT_NO_TESTPLUGIN) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResult.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResult.cpp deleted file mode 100644 index 6be19f1a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResult.cpp +++ /dev/null @@ -1,196 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "DefaultProtector.h" -#include "ProtectorChain.h" -#include "ProtectorContext.h" - -CPPUNIT_NS_BEGIN - - -TestResult::TestResult( SynchronizationObject *syncObject ) - : SynchronizedObject( syncObject ) - , m_protectorChain( new ProtectorChain() ) - , m_stop( false ) -{ - m_protectorChain->push( new DefaultProtector() ); -} - - -TestResult::~TestResult() -{ - delete m_protectorChain; -} - - -void -TestResult::reset() -{ - ExclusiveZone zone( m_syncObject ); - m_stop = false; -} - - -void -TestResult::addError( Test *test, - Exception *e ) -{ - TestFailure failure( test, e, true ); - addFailure( failure ); -} - - -void -TestResult::addFailure( Test *test, Exception *e ) -{ - TestFailure failure( test, e, false ); - addFailure( failure ); -} - - -void -TestResult::addFailure( const TestFailure &failure ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->addFailure( failure ); -} - - -void -TestResult::startTest( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->startTest( test ); -} - - -void -TestResult::endTest( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->endTest( test ); -} - - -void -TestResult::startSuite( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->startSuite( test ); -} - - -void -TestResult::endSuite( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->endSuite( test ); -} - - -bool -TestResult::shouldStop() const -{ - ExclusiveZone zone( m_syncObject ); - return m_stop; -} - - -void -TestResult::stop() -{ - ExclusiveZone zone( m_syncObject ); - m_stop = true; -} - - -void -TestResult::addListener( TestListener *listener ) -{ - ExclusiveZone zone( m_syncObject ); - m_listeners.push_back( listener ); -} - - -void -TestResult::removeListener ( TestListener *listener ) -{ - ExclusiveZone zone( m_syncObject ); - removeFromSequence( m_listeners, listener ); -} - - -void -TestResult::runTest( Test *test ) -{ - startTestRun( test ); - test->run( this ); - endTestRun( test ); -} - - -void -TestResult::startTestRun( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->startTestRun( test, this ); -} - - -void -TestResult::endTestRun( Test *test ) -{ - ExclusiveZone zone( m_syncObject ); - for ( TestListeners::iterator it = m_listeners.begin(); - it != m_listeners.end(); - ++it ) - (*it)->endTestRun( test, this ); -} - - -bool -TestResult::protect( const Functor &functor, - Test *test, - const std::string &shortDescription ) -{ - ProtectorContext context( test, this, shortDescription ); - return m_protectorChain->protect( functor, context ); -} - - -void -TestResult::pushProtector( Protector *protector ) -{ - m_protectorChain->push( protector ); -} - - -void -TestResult::popProtector() -{ - m_protectorChain->pop(); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResultCollector.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResultCollector.cpp deleted file mode 100644 index 4371c503..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestResultCollector.cpp +++ /dev/null @@ -1,117 +0,0 @@ -#include -#include - - -CPPUNIT_NS_BEGIN - - -TestResultCollector::TestResultCollector( SynchronizationObject *syncObject ) - : TestSuccessListener( syncObject ) -{ - reset(); -} - - -TestResultCollector::~TestResultCollector() -{ - freeFailures(); -} - - -void -TestResultCollector::freeFailures() -{ - TestFailures::iterator itFailure = m_failures.begin(); - while ( itFailure != m_failures.end() ) - delete *itFailure++; - m_failures.clear(); -} - - -void -TestResultCollector::reset() -{ - TestSuccessListener::reset(); - - ExclusiveZone zone( m_syncObject ); - freeFailures(); - m_testErrors = 0; - m_tests.clear(); -} - - -void -TestResultCollector::startTest( Test *test ) -{ - ExclusiveZone zone (m_syncObject); - m_tests.push_back( test ); -} - - -void -TestResultCollector::addFailure( const TestFailure &failure ) -{ - TestSuccessListener::addFailure( failure ); - - ExclusiveZone zone( m_syncObject ); - if ( failure.isError() ) - ++m_testErrors; - m_failures.push_back( failure.clone() ); -} - - -/// Gets the number of run tests. -int -TestResultCollector::runTests() const -{ - ExclusiveZone zone( m_syncObject ); - return m_tests.size(); -} - - -/// Gets the number of detected errors (uncaught exception). -int -TestResultCollector::testErrors() const -{ - ExclusiveZone zone( m_syncObject ); - return m_testErrors; -} - - -/// Gets the number of detected failures (failed assertion). -int -TestResultCollector::testFailures() const -{ - ExclusiveZone zone( m_syncObject ); - return m_failures.size() - m_testErrors; -} - - -/// Gets the total number of detected failures. -int -TestResultCollector::testFailuresTotal() const -{ - ExclusiveZone zone( m_syncObject ); - return m_failures.size(); -} - - -/// Returns a the list failures (random access collection). -const TestResultCollector::TestFailures & -TestResultCollector::failures() const -{ - ExclusiveZone zone( m_syncObject ); - return m_failures; -} - - -const TestResultCollector::Tests & -TestResultCollector::tests() const -{ - ExclusiveZone zone( m_syncObject ); - return m_tests; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestRunner.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestRunner.cpp deleted file mode 100644 index 8d95a630..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestRunner.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TestRunner::WrappingSuite::WrappingSuite( const std::string &name ) - : TestSuite( name ) -{ -} - - -int -TestRunner::WrappingSuite::getChildTestCount() const -{ - if ( hasOnlyOneTest() ) - return getUniqueChildTest()->getChildTestCount(); - return TestSuite::getChildTestCount(); -} - - -std::string -TestRunner::WrappingSuite::getName() const -{ - if ( hasOnlyOneTest() ) - return getUniqueChildTest()->getName(); - return TestSuite::getName(); -} - - -Test * -TestRunner::WrappingSuite::doGetChildTestAt( int index ) const -{ - if ( hasOnlyOneTest() ) - return getUniqueChildTest()->getChildTestAt( index ); - return TestSuite::doGetChildTestAt( index ); -} - - -void -TestRunner::WrappingSuite::run( TestResult *result ) -{ - if ( hasOnlyOneTest() ) - getUniqueChildTest()->run( result ); - else - TestSuite::run( result ); -} - - -bool -TestRunner::WrappingSuite::hasOnlyOneTest() const -{ - return TestSuite::getChildTestCount() == 1; -} - - -Test * -TestRunner::WrappingSuite::getUniqueChildTest() const -{ - return TestSuite::doGetChildTestAt( 0 ); -} - - - - - -TestRunner::TestRunner() - : m_suite( new WrappingSuite() ) -{ -} - - -TestRunner::~TestRunner() -{ - delete m_suite; -} - - -void -TestRunner::addTest( Test *test ) -{ - m_suite->addTest( test ); -} - - -void -TestRunner::run( TestResult &controller, - const std::string &testPath ) -{ - TestPath path = m_suite->resolveTestPath( testPath ); - Test *testToRun = path.getChildTest(); - - controller.runTest( testToRun ); -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSetUp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSetUp.cpp deleted file mode 100644 index d4d85308..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSetUp.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include - -CPPUNIT_NS_BEGIN - - -TestSetUp::TestSetUp( Test *test ) : TestDecorator( test ) -{ -} - - -void -TestSetUp::setUp() -{ -} - - -void -TestSetUp::tearDown() -{ -} - - -void -TestSetUp::run( TestResult *result ) -{ - setUp(); - TestDecorator::run(result); - tearDown(); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuccessListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuccessListener.cpp deleted file mode 100644 index 3c9c8214..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuccessListener.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -TestSuccessListener::TestSuccessListener( SynchronizationObject *syncObject ) - : SynchronizedObject( syncObject ) - , m_success( true ) -{ -} - - -TestSuccessListener::~TestSuccessListener() -{ -} - - -void -TestSuccessListener::reset() -{ - ExclusiveZone zone( m_syncObject ); - m_success = true; -} - - -void -TestSuccessListener::addFailure( const TestFailure &failure ) -{ - ExclusiveZone zone( m_syncObject ); - m_success = false; -} - - -bool -TestSuccessListener::wasSuccessful() const -{ - ExclusiveZone zone( m_syncObject ); - return m_success; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuite.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuite.cpp deleted file mode 100644 index 8dd2ea6e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuite.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include -#include -#include - -CPPUNIT_NS_BEGIN - - -/// Default constructor -TestSuite::TestSuite( std::string name ) - : TestComposite( name ) -{ -} - - -/// Destructor -TestSuite::~TestSuite() -{ - deleteContents(); -} - - -/// Deletes all tests in the suite. -void -TestSuite::deleteContents() -{ - int childCount = getChildTestCount(); - for ( int index =0; index < childCount; ++index ) - delete getChildTestAt( index ); - - m_tests.clear(); -} - - -/// Adds a test to the suite. -void -TestSuite::addTest( Test *test ) -{ - m_tests.push_back( test ); -} - - -const CppUnitVector & -TestSuite::getTests() const -{ - return m_tests; -} - - -int -TestSuite::getChildTestCount() const -{ - return m_tests.size(); -} - - -Test * -TestSuite::doGetChildTestAt( int index ) const -{ - return m_tests[index]; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuiteBuilderContext.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuiteBuilderContext.cpp deleted file mode 100644 index ff71b52c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TestSuiteBuilderContext.cpp +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - -TestSuiteBuilderContextBase::TestSuiteBuilderContextBase( - TestSuite &suite, - const TestNamer &namer, - TestFixtureFactory &factory ) - : m_suite( suite ) - , m_namer( namer ) - , m_factory( factory ) -{ -} - - -TestSuiteBuilderContextBase::~TestSuiteBuilderContextBase() -{ -} - - -void -TestSuiteBuilderContextBase::addTest( Test *test ) -{ - m_suite.addTest( test ); -} - - -std::string -TestSuiteBuilderContextBase::getFixtureName() const -{ - return m_namer.getFixtureName(); -} - - -std::string -TestSuiteBuilderContextBase::getTestNameFor( - const std::string &testMethodName ) const -{ - return m_namer.getTestNameFor( testMethodName ); -} - - -TestFixture * -TestSuiteBuilderContextBase::makeTestFixture() const -{ - return m_factory.makeFixture(); -} - - -void -TestSuiteBuilderContextBase::addProperty( const std::string &key, - const std::string &value ) -{ - Properties::iterator it = m_properties.begin(); - for ( ; it != m_properties.end(); ++it ) - { - if ( (*it).first == key ) - { - (*it).second = value; - return; - } - } - - Property property( key, value ); - m_properties.push_back( property ); -} - -const std::string -TestSuiteBuilderContextBase::getStringProperty( const std::string &key ) const -{ - Properties::const_iterator it = m_properties.begin(); - for ( ; it != m_properties.end(); ++it ) - { - if ( (*it).first == key ) - return (*it).second; - } - return ""; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextOutputter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextOutputter.cpp deleted file mode 100644 index f74214fc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextOutputter.cpp +++ /dev/null @@ -1,140 +0,0 @@ -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TextOutputter::TextOutputter( TestResultCollector *result, - OStream &stream ) - : m_result( result ) - , m_stream( stream ) -{ -} - - -TextOutputter::~TextOutputter() -{ -} - - -void -TextOutputter::write() -{ - printHeader(); - m_stream << "\n"; - printFailures(); - m_stream << "\n"; -} - - -void -TextOutputter::printFailures() -{ - TestResultCollector::TestFailures::const_iterator itFailure = m_result->failures().begin(); - int failureNumber = 1; - while ( itFailure != m_result->failures().end() ) - { - m_stream << "\n"; - printFailure( *itFailure++, failureNumber++ ); - } -} - - -void -TextOutputter::printFailure( TestFailure *failure, - int failureNumber ) -{ - printFailureListMark( failureNumber ); - m_stream << ' '; - printFailureTestName( failure ); - m_stream << ' '; - printFailureType( failure ); - m_stream << ' '; - printFailureLocation( failure->sourceLine() ); - m_stream << "\n"; - printFailureDetail( failure->thrownException() ); - m_stream << "\n"; -} - - -void -TextOutputter::printFailureListMark( int failureNumber ) -{ - m_stream << failureNumber << ")"; -} - - -void -TextOutputter::printFailureTestName( TestFailure *failure ) -{ - m_stream << "test: " << failure->failedTestName(); -} - - -void -TextOutputter::printFailureType( TestFailure *failure ) -{ - m_stream << "(" - << (failure->isError() ? "E" : "F") - << ")"; -} - - -void -TextOutputter::printFailureLocation( SourceLine sourceLine ) -{ - if ( !sourceLine.isValid() ) - return; - - m_stream << "line: " << sourceLine.lineNumber() - << ' ' << sourceLine.fileName(); -} - - -void -TextOutputter::printFailureDetail( Exception *thrownException ) -{ - m_stream << thrownException->message().shortDescription() << "\n"; - m_stream << thrownException->message().details(); -} - - -void -TextOutputter::printHeader() -{ - if ( m_result->wasSuccessful() ) - m_stream << "\nOK (" << m_result->runTests () << " tests)\n" ; - else - { - m_stream << "\n"; - printFailureWarning(); - printStatistics(); - } -} - - -void -TextOutputter::printFailureWarning() -{ - m_stream << "!!!FAILURES!!!\n"; -} - - -void -TextOutputter::printStatistics() -{ - m_stream << "Test Results:\n"; - - m_stream << "Run: " << m_result->runTests() - << " Failures: " << m_result->testFailures() - << " Errors: " << m_result->testErrors() - << "\n"; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestProgressListener.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestProgressListener.cpp deleted file mode 100644 index 7fa92ce3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestProgressListener.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TextTestProgressListener::TextTestProgressListener() -{ -} - - -TextTestProgressListener::~TextTestProgressListener() -{ -} - - -void -TextTestProgressListener::startTest( Test *test ) -{ - stdCOut() << "."; -} - - -void -TextTestProgressListener::addFailure( const TestFailure &failure ) -{ - stdCOut() << ( failure.isError() ? "E" : "F" ); -} - - -void -TextTestProgressListener::endTestRun( Test *test, - TestResult *eventManager ) -{ - stdCOut() << "\n"; - stdCOut().flush(); -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestResult.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestResult.cpp deleted file mode 100644 index 871eb6da..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestResult.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -TextTestResult::TextTestResult() -{ - addListener( this ); -} - - -void -TextTestResult::addFailure( const TestFailure &failure ) -{ - TestResultCollector::addFailure( failure ); - stdCOut() << ( failure.isError() ? "E" : "F" ); -} - - -void -TextTestResult::startTest( Test *test ) -{ - TestResultCollector::startTest (test); - stdCOut() << "."; -} - - -void -TextTestResult::print( OStream &stream ) -{ - TextOutputter outputter( this, stream ); - outputter.write(); -} - - -OStream & -operator <<( OStream &stream, - TextTestResult &result ) -{ - result.print (stream); return stream; -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestRunner.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestRunner.cpp deleted file mode 100644 index 1534ec0c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TextTestRunner.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// ==> Implementation of cppunit/ui/text/TestRunner.h - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -/*! Constructs a new text runner. - * \param outputter used to print text result. Owned by the runner. - */ -TextTestRunner::TextTestRunner( Outputter *outputter ) - : m_result( new TestResultCollector() ) - , m_eventManager( new TestResult() ) - , m_outputter( outputter ) -{ - if ( !m_outputter ) - m_outputter = new TextOutputter( m_result, stdCOut() ); - m_eventManager->addListener( m_result ); -} - - -TextTestRunner::~TextTestRunner() -{ - delete m_eventManager; - delete m_outputter; - delete m_result; -} - - -/*! Runs the named test case. - * - * \param testName Name of the test case to run. If an empty is given, then - * all added tests are run. The name can be the name of any - * test in the hierarchy. - * \param doWait if \c true then the user must press the RETURN key - * before the run() method exit. - * \param doPrintResult if \c true (default) then the test result are printed - * on the standard output. - * \param doPrintProgress if \c true (default) then TextTestProgressListener is - * used to show the progress. - * \return \c true is the test was successful, \c false if the test - * failed or was not found. - */ -bool -TextTestRunner::run( std::string testName, - bool doWait, - bool doPrintResult, - bool doPrintProgress ) -{ - TextTestProgressListener progress; - if ( doPrintProgress ) - m_eventManager->addListener( &progress ); - - TestRunner *pThis = this; - pThis->run( *m_eventManager, testName ); - - if ( doPrintProgress ) - m_eventManager->removeListener( &progress ); - - printResult( doPrintResult ); - wait( doWait ); - - return m_result->wasSuccessful(); -} - - -void -TextTestRunner::wait( bool doWait ) -{ -#if !defined( CPPUNIT_NO_STREAM ) - if ( doWait ) - { - stdCOut() << " to continue\n"; - stdCOut().flush(); - std::cin.get (); - } -#endif -} - - -void -TextTestRunner::printResult( bool doPrintResult ) -{ - stdCOut() << "\n"; - if ( doPrintResult ) - m_outputter->write(); -} - - -/*! Returns the result of the test run. - * Use this after calling run() to access the result of the test run. - */ -TestResultCollector & -TextTestRunner::result() const -{ - return *m_result; -} - - -/*! Returns the event manager. - * The instance of TestResult results returned is the one that is used to run the - * test. Use this to register additional TestListener before running the tests. - */ -TestResult & -TextTestRunner::eventManager() const -{ - return *m_eventManager; -} - - -/*! Specifies an alternate outputter. - * - * Notes that the outputter will be use after the test run only if \a printResult was - * \c true. - * \param outputter New outputter to use. The previous outputter is destroyed. - * The TextTestRunner assumes ownership of the outputter. - * \see CompilerOutputter, XmlOutputter, TextOutputter. - */ -void -TextTestRunner::setOutputter( Outputter *outputter ) -{ - delete m_outputter; - m_outputter = outputter; -} - - -void -TextTestRunner::run( TestResult &controller, - const std::string &testPath ) -{ - TestRunner::run( controller, testPath ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp deleted file mode 100644 index bd01001b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include - -#if CPPUNIT_HAVE_RTTI - -#include - -#if CPPUNIT_HAVE_GCC_ABI_DEMANGLE -#include -#endif - - -CPPUNIT_NS_BEGIN - - -std::string -TypeInfoHelper::getClassName( const std::type_info &info ) -{ -#if defined(CPPUNIT_HAVE_GCC_ABI_DEMANGLE) && CPPUNIT_HAVE_GCC_ABI_DEMANGLE - - int status = 0; - char* c_name = 0; - - c_name = abi::__cxa_demangle( info.name(), 0, 0, &status ); - - std::string name( c_name ); - free( c_name ); - -#else // CPPUNIT_HAVE_GCC_ABI_DEMANGLE - - static std::string classPrefix( "class " ); - std::string name( info.name() ); - - // Work around gcc 3.0 bug: strip number before type name. - unsigned int firstNotDigitIndex = 0; - while ( firstNotDigitIndex < name.length() && - name[firstNotDigitIndex] >= '0' && - name[firstNotDigitIndex] <= '9' ) - ++firstNotDigitIndex; - name = name.substr( firstNotDigitIndex ); - - if ( name.substr( 0, classPrefix.length() ) == classPrefix ) - return name.substr( classPrefix.length() ); - -#endif // CPPUNIT_HAVE_GCC_ABI_DEMANGLE - - return name; -} - - -CPPUNIT_NS_END - -#endif // CPPUNIT_HAVE_RTTI diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/UnixDynamicLibraryManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/UnixDynamicLibraryManager.cpp deleted file mode 100644 index f235cce5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/UnixDynamicLibraryManager.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include - -#if defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) -#include - -#include -#include - - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManager::LibraryHandle -DynamicLibraryManager::doLoadLibrary( const std::string &libraryName ) -{ - return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL ); -} - - -void -DynamicLibraryManager::doReleaseLibrary() -{ - ::dlclose( m_libraryHandle); -} - - -DynamicLibraryManager::Symbol -DynamicLibraryManager::doFindSymbol( const std::string &symbol ) -{ - return ::dlsym ( m_libraryHandle, symbol.c_str() ); -} - - -std::string -DynamicLibraryManager::getLastErrorDetail() const -{ - return ""; -} - - -CPPUNIT_NS_END - - -#endif // defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Win32DynamicLibraryManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Win32DynamicLibraryManager.cpp deleted file mode 100644 index acadf462..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/Win32DynamicLibraryManager.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include - -#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER) -#include - -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOUSER -#define NOKERNEL -#define NOSOUND -#define NOMINMAX -#define BLENDFUNCTION void // for mingw & gcc -#include - - -CPPUNIT_NS_BEGIN - - -DynamicLibraryManager::LibraryHandle -DynamicLibraryManager::doLoadLibrary( const std::string &libraryName ) -{ - return ::LoadLibraryA( libraryName.c_str() ); -} - - -void -DynamicLibraryManager::doReleaseLibrary() -{ - ::FreeLibrary( (HINSTANCE)m_libraryHandle ); -} - - -DynamicLibraryManager::Symbol -DynamicLibraryManager::doFindSymbol( const std::string &symbol ) -{ - return (DynamicLibraryManager::Symbol)::GetProcAddress( - (HINSTANCE)m_libraryHandle, - symbol.c_str() ); -} - - -std::string -DynamicLibraryManager::getLastErrorDetail() const -{ - LPVOID lpMsgBuf; - ::FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPSTR) &lpMsgBuf, - 0, - NULL - ); - - std::string message = (LPCSTR)lpMsgBuf; - - // Display the string. -// ::MessageBoxA( NULL, (LPCSTR)lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION ); - - // Free the buffer. - ::LocalFree( lpMsgBuf ); - - return message; -} - - -CPPUNIT_NS_END - - -#endif // defined(CPPUNIT_HAVE_WIN32_DLL_LOADER) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlDocument.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlDocument.cpp deleted file mode 100644 index 31f9115a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlDocument.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -XmlDocument::XmlDocument( const std::string &encoding, - const std::string &styleSheet ) - : m_styleSheet( styleSheet ) - , m_rootElement( new XmlElement( "DummyRoot" ) ) - , m_standalone( true ) -{ - setEncoding( encoding ); -} - - -XmlDocument::~XmlDocument() -{ - delete m_rootElement; -} - - - -std::string -XmlDocument::encoding() const -{ - return m_encoding; -} - - -void -XmlDocument::setEncoding( const std::string &encoding ) -{ - m_encoding = encoding.empty() ? std::string("ISO-8859-1") : encoding; -} - - -std::string -XmlDocument::styleSheet() const -{ - return m_styleSheet; -} - - -void -XmlDocument::setStyleSheet( const std::string &styleSheet ) -{ - m_styleSheet = styleSheet; -} - - -bool -XmlDocument::standalone() const -{ - return m_standalone; -} - - -void -XmlDocument::setStandalone( bool standalone ) -{ - m_standalone = standalone; -} - - -void -XmlDocument::setRootElement( XmlElement *rootElement ) -{ - if ( rootElement == m_rootElement ) - return; - - delete m_rootElement; - m_rootElement = rootElement; -} - - -XmlElement & -XmlDocument::rootElement() const -{ - return *m_rootElement; -} - - -std::string -XmlDocument::toString() const -{ - std::string asString = "\n"; - - if ( !m_styleSheet.empty() ) - asString += "\n"; - - asString += m_rootElement->toString(); - - return asString; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlElement.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlElement.cpp deleted file mode 100644 index f930ad4e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlElement.cpp +++ /dev/null @@ -1,226 +0,0 @@ -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -XmlElement::XmlElement( std::string elementName, - std::string content ) - : m_name( elementName ) - , m_content( content ) -{ -} - - -XmlElement::XmlElement( std::string elementName, - int numericContent ) - : m_name( elementName ) -{ - setContent( numericContent ); -} - - -XmlElement::~XmlElement() -{ - Elements::iterator itNode = m_elements.begin(); - while ( itNode != m_elements.end() ) - { - XmlElement *element = *itNode++; - delete element; - } -} - - -std::string -XmlElement::name() const -{ - return m_name; -} - - -std::string -XmlElement::content() const -{ - return m_content; -} - - -void -XmlElement::setName( const std::string &name ) -{ - m_name = name; -} - - -void -XmlElement::setContent( const std::string &content ) -{ - m_content = content; -} - - -void -XmlElement::setContent( int numericContent ) -{ - m_content = StringTools::toString( numericContent ); -} - - -void -XmlElement::addAttribute( std::string attributeName, - std::string value ) -{ - m_attributes.push_back( Attribute( attributeName, value ) ); -} - - -void -XmlElement::addAttribute( std::string attributeName, - int numericValue ) -{ - addAttribute( attributeName, StringTools::toString( numericValue ) ); -} - - -void -XmlElement::addElement( XmlElement *node ) -{ - m_elements.push_back( node ); -} - - -int -XmlElement::elementCount() const -{ - return m_elements.size(); -} - - -XmlElement * -XmlElement::elementAt( int index ) const -{ - if ( index < 0 || index >= elementCount() ) - throw std::invalid_argument( "XmlElement::elementAt(), out of range index" ); - - return m_elements[ index ]; -} - - -XmlElement * -XmlElement::elementFor( const std::string &name ) const -{ - Elements::const_iterator itElement = m_elements.begin(); - for ( ; itElement != m_elements.end(); ++itElement ) - { - if ( (*itElement)->name() == name ) - return *itElement; - } - - throw std::invalid_argument( "XmlElement::elementFor(), not matching child element found" ); - return NULL; // make some compilers happy. -} - - -std::string -XmlElement::toString( const std::string &indent ) const -{ - std::string element( indent ); - element += "<"; - element += m_name; - if ( !m_attributes.empty() ) - { - element += " "; - element += attributesAsString(); - } - element += ">"; - - if ( !m_elements.empty() ) - { - element += "\n"; - - std::string subNodeIndent( indent + " " ); - Elements::const_iterator itNode = m_elements.begin(); - while ( itNode != m_elements.end() ) - { - const XmlElement *node = *itNode++; - element += node->toString( subNodeIndent ); - } - - element += indent; - } - - if ( !m_content.empty() ) - { - element += escape( m_content ); - if ( !m_elements.empty() ) - { - element += "\n"; - element += indent; - } - } - - element += "\n"; - - return element; -} - - -std::string -XmlElement::attributesAsString() const -{ - std::string attributes; - Attributes::const_iterator itAttribute = m_attributes.begin(); - while ( itAttribute != m_attributes.end() ) - { - if ( !attributes.empty() ) - attributes += " "; - - const Attribute &attribute = *itAttribute++; - attributes += attribute.first; - attributes += "=\""; - attributes += escape( attribute.second ); - attributes += "\""; - } - return attributes; -} - - -std::string -XmlElement::escape( std::string value ) const -{ - std::string escaped; - for ( unsigned int index =0; index < value.length(); ++index ) - { - char c = value[index ]; - switch ( c ) // escape all predefined XML entity (safe?) - { - case '<': - escaped += "<"; - break; - case '>': - escaped += ">"; - break; - case '&': - escaped += "&"; - break; - case '\'': - escaped += "'"; - break; - case '"': - escaped += """; - break; - default: - escaped += c; - } - } - - return escaped; -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputter.cpp deleted file mode 100644 index c605e335..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputter.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -CPPUNIT_NS_BEGIN - - -XmlOutputter::XmlOutputter( TestResultCollector *result, - OStream &stream, - std::string encoding ) - : m_result( result ) - , m_stream( stream ) - , m_xml( new XmlDocument( encoding ) ) -{ -} - - -XmlOutputter::~XmlOutputter() -{ - delete m_xml; -} - - -void -XmlOutputter::addHook( XmlOutputterHook *hook ) -{ - m_hooks.push_back( hook ); -} - - -void -XmlOutputter::removeHook( XmlOutputterHook *hook ) -{ - m_hooks.erase( std::find( m_hooks.begin(), m_hooks.end(), hook ) ); -} - - -void -XmlOutputter::write() -{ - setRootNode(); - m_stream << m_xml->toString(); -} - - -void -XmlOutputter::setStyleSheet( const std::string &styleSheet ) -{ - m_xml->setStyleSheet( styleSheet ); -} - - -void -XmlOutputter::setStandalone( bool standalone ) -{ - m_xml->setStandalone( standalone ); -} - - -void -XmlOutputter::setRootNode() -{ - XmlElement *rootNode = new XmlElement( "TestRun" ); - m_xml->setRootElement( rootNode ); - - for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it ) - (*it)->beginDocument( m_xml ); - - FailedTests failedTests; - fillFailedTestsMap( failedTests ); - - addFailedTests( failedTests, rootNode ); - addSuccessfulTests( failedTests, rootNode ); - addStatistics( rootNode ); - - for ( Hooks::iterator itEnd = m_hooks.begin(); itEnd != m_hooks.end(); ++itEnd ) - (*itEnd)->endDocument( m_xml ); -} - - -void -XmlOutputter::fillFailedTestsMap( FailedTests &failedTests ) -{ - const TestResultCollector::TestFailures &failures = m_result->failures(); - TestResultCollector::TestFailures::const_iterator itFailure = failures.begin(); - while ( itFailure != failures.end() ) - { - TestFailure *failure = *itFailure++; - failedTests.insert( std::pair(failure->failedTest(), failure ) ); - } -} - - -void -XmlOutputter::addFailedTests( FailedTests &failedTests, - XmlElement *rootNode ) -{ - XmlElement *testsNode = new XmlElement( "FailedTests" ); - rootNode->addElement( testsNode ); - - const TestResultCollector::Tests &tests = m_result->tests(); - for ( unsigned int testNumber = 0; testNumber < tests.size(); ++testNumber ) - { - Test *test = tests[testNumber]; - if ( failedTests.find( test ) != failedTests.end() ) - addFailedTest( test, failedTests[test], testNumber+1, testsNode ); - } -} - - -void -XmlOutputter::addSuccessfulTests( FailedTests &failedTests, - XmlElement *rootNode ) -{ - XmlElement *testsNode = new XmlElement( "SuccessfulTests" ); - rootNode->addElement( testsNode ); - - const TestResultCollector::Tests &tests = m_result->tests(); - for ( unsigned int testNumber = 0; testNumber < tests.size(); ++testNumber ) - { - Test *test = tests[testNumber]; - if ( failedTests.find( test ) == failedTests.end() ) - addSuccessfulTest( test, testNumber+1, testsNode ); - } -} - - -void -XmlOutputter::addStatistics( XmlElement *rootNode ) -{ - XmlElement *statisticsElement = new XmlElement( "Statistics" ); - rootNode->addElement( statisticsElement ); - statisticsElement->addElement( new XmlElement( "Tests", m_result->runTests() ) ); - statisticsElement->addElement( new XmlElement( "FailuresTotal", - m_result->testFailuresTotal() ) ); - statisticsElement->addElement( new XmlElement( "Errors", m_result->testErrors() ) ); - statisticsElement->addElement( new XmlElement( "Failures", m_result->testFailures() ) ); - - for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it ) - (*it)->statisticsAdded( m_xml, statisticsElement ); -} - - -void -XmlOutputter::addFailedTest( Test *test, - TestFailure *failure, - int testNumber, - XmlElement *testsNode ) -{ - Exception *thrownException = failure->thrownException(); - - XmlElement *testElement = new XmlElement( "FailedTest" ); - testsNode->addElement( testElement ); - testElement->addAttribute( "id", testNumber ); - testElement->addElement( new XmlElement( "Name", test->getName() ) ); - testElement->addElement( new XmlElement( "FailureType", - failure->isError() ? "Error" : - "Assertion" ) ); - - if ( failure->sourceLine().isValid() ) - addFailureLocation( failure, testElement ); - - testElement->addElement( new XmlElement( "Message", thrownException->what() ) ); - - for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it ) - (*it)->failTestAdded( m_xml, testElement, test, failure ); -} - - -void -XmlOutputter::addFailureLocation( TestFailure *failure, - XmlElement *testElement ) -{ - XmlElement *locationNode = new XmlElement( "Location" ); - testElement->addElement( locationNode ); - SourceLine sourceLine = failure->sourceLine(); - locationNode->addElement( new XmlElement( "File", sourceLine.fileName() ) ); - locationNode->addElement( new XmlElement( "Line", sourceLine.lineNumber() ) ); -} - - -void -XmlOutputter::addSuccessfulTest( Test *test, - int testNumber, - XmlElement *testsNode ) -{ - XmlElement *testElement = new XmlElement( "Test" ); - testsNode->addElement( testElement ); - testElement->addAttribute( "id", testNumber ); - testElement->addElement( new XmlElement( "Name", test->getName() ) ); - - for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it ) - (*it)->successfulTestAdded( m_xml, testElement, test ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputterHook.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputterHook.cpp deleted file mode 100644 index 4b4e8d8e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/XmlOutputterHook.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include - - -CPPUNIT_NS_BEGIN - - -void -XmlOutputterHook::beginDocument( XmlDocument *document ) -{ -} - - -void -XmlOutputterHook::endDocument( XmlDocument *document ) -{ -} - - -void -XmlOutputterHook::failTestAdded( XmlDocument *document, - XmlElement *testElement, - Test *test, - TestFailure *failure ) -{ -} - - -void -XmlOutputterHook::successfulTestAdded( XmlDocument *document, - XmlElement *testElement, - Test *test ) -{ -} - - -void -XmlOutputterHook::statisticsAdded( XmlDocument *document, - XmlElement *statisticsElement ) -{ -} - - -CPPUNIT_NS_END - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit.dsp deleted file mode 100644 index 1f588f51..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit.dsp +++ /dev/null @@ -1,707 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cppunit" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=CPPUNIT - WIN32 DEBUG -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cppunit.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cppunit.mak" CFG="CPPUNIT - WIN32 DEBUG" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cppunit - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo -# Begin Special Build Tool -TargetPath=.\Release\cppunit.lib -TargetName=cppunit -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "cppunit - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug\cppunitd.lib" -# Begin Special Build Tool -TargetPath=.\Debug\cppunitd.lib -TargetName=cppunitd -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "cppunit - Win32 Release" -# Name "cppunit - Win32 Debug" -# Begin Group "documentation" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\ChangeLog -# End Source File -# Begin Source File - -SOURCE=..\..\CodingGuideLines.txt -# End Source File -# Begin Source File - -SOURCE=..\..\doc\cookbook.dox -# End Source File -# Begin Source File - -SOURCE=..\..\doc\FAQ -# End Source File -# Begin Source File - -SOURCE="..\..\INSTALL-unix" -# End Source File -# Begin Source File - -SOURCE="..\..\INSTALL-WIN32.txt" -# End Source File -# Begin Source File - -SOURCE=..\..\doc\Money.dox -# End Source File -# Begin Source File - -SOURCE=..\..\NEWS -# End Source File -# Begin Source File - -SOURCE=..\..\doc\other_documentation.dox -# End Source File -# Begin Source File - -SOURCE=..\..\THANKS -# End Source File -# Begin Source File - -SOURCE=..\..\TODO -# End Source File -# End Group -# Begin Group "listener" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BriefTestProgressListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\BriefTestProgressListener.h -# End Source File -# Begin Source File - -SOURCE=.\TestResultCollector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestResultCollector.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuccessListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\TextTestProgressListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestProgressListener.h -# End Source File -# Begin Source File - -SOURCE=.\TextTestResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestResult.h -# End Source File -# End Group -# Begin Group "textui" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\ui\text\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=.\TextTestRunner.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestRunner.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\ui\text\TextTestRunner.h -# End Source File -# End Group -# Begin Group "portability" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-bcb5.h" -# End Source File -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-evc4.h" -# End Source File -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-mac.h" -# End Source File -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-msvc6.h" -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\CppUnitApi.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitDeque.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitSet.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitStack.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitVector.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\FloatingPoint.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Portability.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\SelectDllLoader.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\SourcePrefix.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\Stream.h -# End Source File -# End Group -# Begin Group "output" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\CompilerOutputter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\CompilerOutputter.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Outputter.h -# End Source File -# Begin Source File - -SOURCE=.\TextOutputter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextOutputter.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputter.cpp - -!IF "$(CFG)" == "cppunit - Win32 Release" - -!ELSEIF "$(CFG)" == "cppunit - Win32 Debug" - -# ADD CPP /W3 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\XmlOutputter.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterHook.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\XmlOutputterHook.h -# End Source File -# End Group -# Begin Group "core" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\AdditionalMessage.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\AdditionalMessage.h -# End Source File -# Begin Source File - -SOURCE=.\Asserter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Asserter.h -# End Source File -# Begin Source File - -SOURCE=.\Exception.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Exception.h -# End Source File -# Begin Source File - -SOURCE=.\Message.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Message.h -# End Source File -# Begin Source File - -SOURCE=.\SourceLine.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\SourceLine.h -# End Source File -# Begin Source File - -SOURCE=.\SynchronizedObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\SynchronizedObject.h -# End Source File -# Begin Source File - -SOURCE=.\Test.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Test.h -# End Source File -# Begin Source File - -SOURCE=.\TestAssert.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestAssert.h -# End Source File -# Begin Source File - -SOURCE=.\TestCase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestCase.h -# End Source File -# Begin Source File - -SOURCE=.\TestComposite.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestComposite.h -# End Source File -# Begin Source File - -SOURCE=.\TestFailure.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestFailure.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestFixture.h -# End Source File -# Begin Source File - -SOURCE=.\TestLeaf.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestLeaf.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestListener.h -# End Source File -# Begin Source File - -SOURCE=.\TestPath.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestPath.h -# End Source File -# Begin Source File - -SOURCE=.\TestResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestResult.h -# End Source File -# Begin Source File - -SOURCE=.\TestRunner.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuite.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestSuite.h -# End Source File -# End Group -# Begin Group "helper" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\AutoRegisterSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\HelperMacros.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestCaller.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TestFactoryRegistry.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFixtureFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TestNamer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestNamer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteBuilderContext.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilderContext.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TypeInfoHelper.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TypeInfoHelper.h -# End Source File -# End Group -# Begin Group "extension" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\ExceptionTestCaseDecorator.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\Orthodox.h -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\RepeatedTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCaseDecorator.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestCaseDecorator.h -# End Source File -# Begin Source File - -SOURCE=.\TestDecorator.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestDecorator.h -# End Source File -# Begin Source File - -SOURCE=.\TestSetUp.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSetUp.h -# End Source File -# End Group -# Begin Group "plugin" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BeOsDynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManager.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicLibraryManagerException.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManagerException.h -# End Source File -# Begin Source File - -SOURCE=.\PlugInManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\PlugInManager.h -# End Source File -# Begin Source File - -SOURCE=.\PlugInParameters.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\PlugInParameters.h -# End Source File -# Begin Source File - -SOURCE=.\ShlDynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\TestPlugIn.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInDefaultImpl.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\TestPlugInDefaultImpl.h -# End Source File -# Begin Source File - -SOURCE=.\UnixDynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Win32DynamicLibraryManager.cpp -# End Source File -# End Group -# Begin Group "tools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\Algorithm.h -# End Source File -# Begin Source File - -SOURCE=.\StringTools.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\StringTools.h -# End Source File -# Begin Source File - -SOURCE=.\XmlDocument.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\XmlDocument.h -# End Source File -# Begin Source File - -SOURCE=.\XmlElement.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\XmlElement.h -# End Source File -# End Group -# Begin Group "protector" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\DefaultProtector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DefaultProtector.h -# End Source File -# Begin Source File - -SOURCE=.\Protector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Protector.h -# End Source File -# Begin Source File - -SOURCE=.\ProtectorChain.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProtectorChain.h -# End Source File -# Begin Source File - -SOURCE=.\ProtectorContext.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\configure.in -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Makefile.am -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit_dll.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit_dll.dsp deleted file mode 100644 index 805fec3b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/cppunit/cppunit_dll.dsp +++ /dev/null @@ -1,682 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cppunit_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=cppunit_dll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cppunit_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cppunit_dll.mak" CFG="cppunit_dll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cppunit_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cppunit_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cppunit_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cppunit_dll___Win32_Release" -# PROP BASE Intermediate_Dir "cppunit_dll___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_BUILD_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:"..\..\lib\cppunit_dll.pdb" /machine:I386 -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetDir=.\ReleaseDll -TargetPath=.\ReleaseDll\cppunit_dll.dll -TargetName=cppunit_dll -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "cppunit_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cppunit_dll___Win32_Debug" -# PROP BASE Intermediate_Dir "cppunit_dll___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_BUILD_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:"..\..\lib\cppunitd_dll.pdb" /debug /machine:I386 /out:"DebugDll\cppunitd_dll.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetDir=.\DebugDll -TargetPath=.\DebugDll\cppunitd_dll.dll -TargetName=cppunitd_dll -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "cppunit_dll - Win32 Release" -# Name "cppunit_dll - Win32 Debug" -# Begin Group "DllSpecific" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\DllMain.cpp -# End Source File -# End Group -# Begin Group "extension" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\ExceptionTestCaseDecorator.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\Orthodox.h -# End Source File -# Begin Source File - -SOURCE=.\RepeatedTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\RepeatedTest.h -# End Source File -# Begin Source File - -SOURCE=.\TestCaseDecorator.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestCaseDecorator.h -# End Source File -# Begin Source File - -SOURCE=.\TestDecorator.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestDecorator.h -# End Source File -# Begin Source File - -SOURCE=.\TestSetUp.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSetUp.h -# End Source File -# End Group -# Begin Group "helper" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\AutoRegisterSuite.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\HelperMacros.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestCaller.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TestFactoryRegistry.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFactoryRegistry.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestFixtureFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TestNamer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestNamer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuiteBuilderContext.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilderContext.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h -# End Source File -# Begin Source File - -SOURCE=.\TypeInfoHelper.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\TypeInfoHelper.h -# End Source File -# End Group -# Begin Group "core" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\AdditionalMessage.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\AdditionalMessage.h -# End Source File -# Begin Source File - -SOURCE=.\Asserter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Asserter.h -# End Source File -# Begin Source File - -SOURCE=.\Exception.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Exception.h -# End Source File -# Begin Source File - -SOURCE=.\Message.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Message.h -# End Source File -# Begin Source File - -SOURCE=.\SourceLine.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\SourceLine.h -# End Source File -# Begin Source File - -SOURCE=.\SynchronizedObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\SynchronizedObject.h -# End Source File -# Begin Source File - -SOURCE=.\Test.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Test.h -# End Source File -# Begin Source File - -SOURCE=.\TestAssert.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestAssert.h -# End Source File -# Begin Source File - -SOURCE=.\TestCase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestCase.h -# End Source File -# Begin Source File - -SOURCE=.\TestComposite.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestComposite.h -# End Source File -# Begin Source File - -SOURCE=.\TestFailure.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestFailure.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestFixture.h -# End Source File -# Begin Source File - -SOURCE=.\TestLeaf.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestLeaf.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestListener.h -# End Source File -# Begin Source File - -SOURCE=.\TestPath.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestPath.h -# End Source File -# Begin Source File - -SOURCE=.\TestResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestResult.h -# End Source File -# Begin Source File - -SOURCE=.\TestRunner.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuite.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestSuite.h -# End Source File -# End Group -# Begin Group "output" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\CompilerOutputter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\CompilerOutputter.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Outputter.h -# End Source File -# Begin Source File - -SOURCE=.\TestResultCollector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TestResultCollector.h -# End Source File -# Begin Source File - -SOURCE=.\TextOutputter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextOutputter.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\XmlOutputter.h -# End Source File -# Begin Source File - -SOURCE=.\XmlOutputterHook.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\XmlOutputterHook.h -# End Source File -# End Group -# Begin Group "portability" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-bcb5.h" -# End Source File -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-mac.h" -# End Source File -# Begin Source File - -SOURCE="..\..\include\cppunit\config\config-msvc6.h" -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\CppUnitApi.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitDeque.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitSet.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitStack.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\portability\CppUnitVector.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Portability.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\SelectDllLoader.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\config\SourcePrefix.h -# End Source File -# End Group -# Begin Group "textui" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\cppunit\ui\text\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=.\TextTestRunner.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestRunner.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\ui\text\TextTestRunner.h -# End Source File -# End Group -# Begin Group "listener" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BriefTestProgressListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\BriefTestProgressListener.h -# End Source File -# Begin Source File - -SOURCE=.\TestSuccessListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\TextTestProgressListener.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestProgressListener.h -# End Source File -# Begin Source File - -SOURCE=.\TextTestResult.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\TextTestResult.h -# End Source File -# End Group -# Begin Group "documentation" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\ChangeLog -# End Source File -# Begin Source File - -SOURCE=..\..\doc\cookbook.dox -# End Source File -# Begin Source File - -SOURCE=..\..\doc\FAQ -# End Source File -# Begin Source File - -SOURCE=..\..\NEWS -# End Source File -# Begin Source File - -SOURCE=..\..\doc\other_documentation.dox -# End Source File -# Begin Source File - -SOURCE=..\..\TODO -# End Source File -# End Group -# Begin Group "plugin" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\BeosDynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManager.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicLibraryManagerException.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\DynamicLibraryManagerException.h -# End Source File -# Begin Source File - -SOURCE=.\PlugInManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\PlugInManager.h -# End Source File -# Begin Source File - -SOURCE=.\PlugInParameters.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\PlugInParameters.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\TestPlugIn.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInDefaultImpl.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\plugin\TestPlugInDefaultImpl.h -# End Source File -# Begin Source File - -SOURCE=.\UnixDynamicLibraryManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Win32DynamicLibraryManager.cpp -# End Source File -# End Group -# Begin Group "tools" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\StringTools.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\StringTools.h -# End Source File -# Begin Source File - -SOURCE=.\XmlDocument.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\XmlDocument.h -# End Source File -# Begin Source File - -SOURCE=.\XmlElement.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\tools\XmlElement.h -# End Source File -# End Group -# Begin Group "protector" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\DefaultProtector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DefaultProtector.h -# End Source File -# Begin Source File - -SOURCE=.\Protector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Protector.h -# End Source File -# Begin Source File - -SOURCE=.\ProtectorChain.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProtectorChain.h -# End Source File -# Begin Source File - -SOURCE=.\ProtectorContext.h -# End Source File -# End Group -# Begin Source File - -SOURCE="..\..\INSTALL-WIN32.txt" -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\Makefile.am -# End Source File -# Begin Source File - -SOURCE=.\Makefile.am -# End Source File -# Begin Source File - -SOURCE=..\..\include\cppunit\extensions\XmlInputHelper.h -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/.cvsignore deleted file mode 100644 index 7d739fe9..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Debug Release -*.clw *.opt *.Tags.WW *.tlb -TestRunnerDSPlugin_p.c -dlldata.c - -SunWS_cache -ir.out diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/COMHelper.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/COMHelper.h deleted file mode 100644 index add0e282..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/COMHelper.h +++ /dev/null @@ -1,111 +0,0 @@ -#ifndef COMHelper_h -#define COMHelper_h - -#pragma warning( push) -#pragma warning( disable: 4786) -#pragma warning( disable: 4290) - -#include -#include - -#include -#include - -namespace COMUtility -{ - -// simple template to reduce the typing effort when doing reinterpret casts -template< typename Interface> - inline void** ppvoid( Interface **ppInterface) -{ - return reinterpret_cast< void**>( ppInterface); -} - - -template< typename Interface> - inline GUID* piid( const Interface* pInterface) -{ - return __uuidof( pInterface); -} - -// to be used with _com_ptr_t, uses function overloading -template< typename InterfacePtr> - inline GUID* piid( const InterfacePtr& pInterface) -{ - return const_cast< GUID*>( &pInterface.GetIID()); -} - - -template< typename Interface> - inline const GUID& riid( const Interface* pInterface) -{ - return *__uuidof( pInterface); -} - -// to be used with _com_ptr_t, use function overloading -template< typename InterfacePtr> - inline const GUID& riid( const InterfacePtr& pInterface) -{ - return pInterface.GetIID(); -} - - -// this is used for regular COM interface pointers -template < class rawTargetInterface, class rawSourceInterface> - inline rawTargetInterface* interface_cast( rawSourceInterface* pSrcInterface) throw( std::bad_cast) -{ - rawTargetInterface* pTargetInterface = NULL; - - if ( SUCCEEDED( pSrcInterface->QueryInterface( __uuidof( pTargetInterface), - reinterpret_cast(&pTargetInterface)))) - return pTargetInterface; - else - throw std::bad_cast(); -} - - -// non-throwing versions of the same - need to use parameter std::nothrow on function call -template < class rawTargetInterface, class rawSourceInterface> - inline rawTargetInterface* interface_cast( const std::nothrow_t&, - rawSourceInterface* pSrcInterface) throw() -{ - rawTargetInterface* pTargetInterface = NULL; - - pSrcInterface->QueryInterface( __uuidof( pTargetInterface), - reinterpret_cast(&pTargetInterface)); - return pTargetInterface; -} - - -// Is probably best used as a static member of the class, so it's -// accessible everywhere -class COMExceptionThrower -{ -public: - COMExceptionThrower( void){} - ~COMExceptionThrower( void){} - - COMExceptionThrower( const HRESULT errCode) - { - this->operator=( errCode); - } - -protected: - // don't allow regular copy constructor call - COMExceptionThrower( const COMExceptionThrower&); - -public: - inline const COMExceptionThrower& operator=( const HRESULT errCode) const throw( _com_error) - { - if ( FAILED( errCode)) - _com_raise_error( errCode); - - return *this; - } -}; - -} // end namespace COMUtility - -#pragma warning( pop) - -#endif // COMHelper_h diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.cpp deleted file mode 100644 index ab8180ee..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// AddInMod.cpp : implementation file -// - -#include "stdafx.h" - -#include "DSPlugIn.h" -#include "COMHelper.h" -#include "DSAddIn.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - -COMUtility::COMExceptionThrower CDSAddIn::cex_; - -CDSAddIn::~CDSAddIn( void) -{ -} - -// This is called when the user first loads the add-in, and on start-up -// of each subsequent Developer Studio session -STDMETHODIMP CDSAddIn::OnConnection(IApplication* pApp, VARIANT_BOOL bFirstTime, - long dwCookie, VARIANT_BOOL* OnConnection) -{ - HRESULT result = S_OK; - - try - { - CComPtr< IUnknown> pIUnk; - - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - - cex_ = _Module.GetClassObject( GetObjectCLSID(), IID_IUnknown, reinterpret_cast(&pIUnk)); - - cex_ = CoRegisterClassObject( - GetObjectCLSID(), - pIUnk, - CLSCTX_LOCAL_SERVER, - REGCLS_MULTIPLEUSE, - &classRegistrationId_ - ); - - pIApp_ = pApp; - - m_dwCookie = dwCookie; - *OnConnection = VARIANT_TRUE; - } - catch( const std::bad_cast&) - { - *OnConnection = VARIANT_FALSE; - } - catch( const _com_error&) - { - *OnConnection = VARIANT_FALSE; - } - - return result; -} - -// This is called on shut-down, and also when the user unloads the add-in -STDMETHODIMP CDSAddIn::OnDisconnection(VARIANT_BOOL bLastTime) -{ - pIApp_.Release(); - CoRevokeClassObject( classRegistrationId_); - - return S_OK; -} - - -// ITestRunnerDSPlugin -STDMETHODIMP CDSAddIn::goToLineInSourceCode( BSTR fileName, int lineNumber) -{ - HRESULT result = S_OK; - - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - - try - { - CComPtr< IDispatch> tmp; - CComPtr< IDocuments> pIDocuments; - CComPtr< ITextDocument> pITextDocu; - CComPtr< ITextSelection> pITextSel; - - cex_ = pIApp_->get_Documents( &tmp); - pIDocuments.Attach( COMUtility::interface_cast( tmp.p)); - tmp.Release(); - cex_ = pIDocuments->Open( fileName, - CComVariant(), - CComVariant(), - &tmp); - pITextDocu.Attach( COMUtility::interface_cast< ITextDocument>( tmp.p)); - tmp.Release(); - cex_ = pITextDocu->get_Selection( &tmp); - pITextSel.Attach( COMUtility::interface_cast< ITextSelection>( tmp.p)); - cex_ = pITextSel->GoToLine( lineNumber, CComVariant( 1)); - } - catch( const std::bad_cast&) - { - result = E_FAIL; - } - catch( const _com_error&) - { - result = E_FAIL; - } - - return result; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.h deleted file mode 100644 index 556f336e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSAddIn.h +++ /dev/null @@ -1,59 +0,0 @@ -// DSAddIn.h : header file -// - -#if !defined(AFX_DSADDIN_H__3F8385DE_5079_4944_A01B_236F76A0E901__INCLUDED_) -#define AFX_DSADDIN_H__3F8385DE_5079_4944_A01B_236F76A0E901__INCLUDED_ - - -#include "ToAddToDistribution/TestRunnerDSPluginVC6.h" -#include "COMHelper.h" - -// {F193CE54-716C-41CB-80B2-FA74CA3EE2AC} -// DEFINE_GUID(CLSID_DSAddIn, -// 0xf193ce54, 0x716c, 0x41cb, 0x80, 0xb2, 0xfa, 0x74, 0xca, 0x3e, 0xe2, 0xac); - -///////////////////////////////////////////////////////////////////////////// -// CDSAddIn - -class CDSAddIn : - public CComObjectRoot, - public CComCoClass, - public IDSAddIn, - public ITestRunnerDSPlugin -{ -public: - DECLARE_REGISTRY_RESOURCEID( IDR_DSADDIN) - - CDSAddIn(): classRegistrationId_( 0) {} - ~CDSAddIn(); - - BEGIN_COM_MAP(CDSAddIn) - COM_INTERFACE_ENTRY(IDSAddIn) - COM_INTERFACE_ENTRY(ITestRunnerDSPlugin) - END_COM_MAP() - DECLARE_NOT_AGGREGATABLE(CDSAddIn) - - DECLARE_CLASSFACTORY_SINGLETON( CDSAddIn) - -// IDSAddIns -public: - STDMETHOD( OnConnection)(THIS_ IApplication* pApp, VARIANT_BOOL bFirstTime, - long dwCookie, VARIANT_BOOL* OnConnection); - STDMETHOD( OnDisconnection)(THIS_ VARIANT_BOOL bLastTime); - -// ITestRunnerDSPlugin - STDMETHOD( goToLineInSourceCode)( BSTR fileName, int lineNumber); - - -protected: - CComPtr< IApplication> pIApp_; - DWORD classRegistrationId_; - DWORD m_dwCookie; - - static COMUtility::COMExceptionThrower cex_; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DSADDIN_H__3F8385DE_5079_4944_A01B_236F76A0E901__INCLUDED) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.cpp deleted file mode 100644 index 17674432..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// DSPlugIn.cpp : Defines the initialization routines for the DLL. -// - -#include "stdafx.h" -#include -#include "DSPlugIn.h" -#include "DSAddIn.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -CComModule _Module; - -BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_DSAddIn, CDSAddIn) -END_OBJECT_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CDSPlugInApp - -class CDSPlugInApp : public CWinApp -{ -public: - CDSPlugInApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CDSPlugInApp) - public: - virtual BOOL InitInstance(); - virtual int ExitInstance(); - //}}AFX_VIRTUAL - - //{{AFX_MSG(CDSPlugInApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// -// CDSPlugInApp - -BEGIN_MESSAGE_MAP(CDSPlugInApp, CWinApp) - //{{AFX_MSG_MAP(CDSPlugInApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// The one and only CDSPlugInApp object - -CDSPlugInApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CDSPlugInApp construction - -CDSPlugInApp::CDSPlugInApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// CDSPlugInApp initialization - -BOOL CDSPlugInApp::InitInstance() -{ - _Module.Init(ObjectMap, m_hInstance, &LIBID_TestRunnerDSPluginLib); - return CWinApp::InitInstance(); -} - -int CDSPlugInApp::ExitInstance() -{ - _Module.Term(); - return CWinApp::ExitInstance(); -} - -///////////////////////////////////////////////////////////////////////////// -// Special entry points required for inproc servers - -STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) -{ - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - return _Module.GetClassObject(rclsid, riid, ppv); -} - -STDAPI DllCanUnloadNow(void) -{ - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - return (AfxDllCanUnloadNow()==S_OK && _Module.GetLockCount()==0) ? S_OK : S_FALSE; -} - -// by exporting DllRegisterServer, you can use regsvr32.exe -STDAPI DllRegisterServer(void) -{ - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - HRESULT hRes = S_OK; - - // Registers object, typelib and all interfaces in typelib - hRes = _Module.RegisterServer(TRUE); - if (FAILED(hRes)) - return hRes; - - // Register description of this add-in object in its own - // "/Description" subkey. - // TODO: If you add more add-ins to this module, you need - // to register all of their descriptions, each description - // in each add-in object's registry CLSID entry: - // HKEY_CLASSES_ROOT\Clsid\{add-in CLSID}\Description="add-in description" -/* - _ATL_OBJMAP_ENTRY* pEntry = _Module.m_pObjMap; - CRegKey key; - LONG lRes = key.Open(HKEY_CLASSES_ROOT, _T("CLSID")); - if (lRes == ERROR_SUCCESS) - { - USES_CONVERSION; - LPOLESTR lpOleStr; - StringFromCLSID(*pEntry->pclsid, &lpOleStr); - LPTSTR lpsz = OLE2T(lpOleStr); - - lRes = key.Open(key, lpsz); - if (lRes == ERROR_SUCCESS) - { - CString strDescription; - strDescription.LoadString(IDS_DSPLUGIN_DESCRIPTION); - key.SetKeyValue(_T("Description"), strDescription); - } - CoTaskMemFree(lpOleStr); - } - if (lRes != ERROR_SUCCESS) - hRes = HRESULT_FROM_WIN32(lRes); -*/ - return hRes; -} - -///////////////////////////////////////////////////////////////////////////// -// DllUnregisterServer - Removes entries from the system registry - -STDAPI DllUnregisterServer(void) -{ - AFX_MANAGE_STATE(AfxGetStaticModuleState()); - - HRESULT hRes = S_OK; - _Module.UnregisterServer(); - return hRes; -} - - -///////////////////////////////////////////////////////////////////////////// -// Debugging support - -// GetLastErrorDescription is used in the implementation of the VERIFY_OK -// macro, defined in stdafx.h. - -#ifdef _DEBUG - -void GetLastErrorDescription(CComBSTR& bstr) -{ - CComPtr pErrorInfo; - if (GetErrorInfo(0, &pErrorInfo) == S_OK) - pErrorInfo->GetDescription(&bstr); -} - -#endif //_DEBUG diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.def b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.def deleted file mode 100644 index 38cc6e15..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.def +++ /dev/null @@ -1,11 +0,0 @@ -; DSPlugIn.def : Declares the module parameters for the DLL. - -LIBRARY "TestRunnerDSPlugin" -DESCRIPTION 'TestRunnerDSPlugin Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here - DllCanUnloadNow PRIVATE - DllGetClassObject PRIVATE - DllRegisterServer PRIVATE - DllUnregisterServer PRIVATE diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.dsp deleted file mode 100644 index 8616169a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.dsp +++ /dev/null @@ -1,606 +0,0 @@ -# Microsoft Developer Studio Project File - Name="DSPlugIn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=DSPlugIn - Win32 Debug Unicode -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DSPlugIn.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DSPlugIn.mak" CFG="DSPlugIn - Win32 Debug Unicode" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DSPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "DSPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "DSPlugIn - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "DSPlugIn - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /i "../../../../lib" /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"Release/TestRunnerDSPlugIn.dll" -# Begin Custom Build - Performing Registration -OutDir=.\Release -TargetPath=.\Release\TestRunnerDSPlugIn.dll -InputPath=.\Release\TestRunnerDSPlugIn.dll -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem echo Automatically done when the add-in is registered with VC++ - rem regsvr32 "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - rem echo Server registration done! - -# End Custom Build -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=duplicating DLL to lib directory -PostBuild_Cmds=echo The following command may fail if you have already registered the add-in copy Release\TestRunnerDSPlugIn.dll ..\..\..\lib\TestRunnerDSPlugIn.dll -# End Special Build Tool - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /i "../../../../lib" /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/TestRunnerDSPlugInD.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# Begin Custom Build - Performing Registration -OutDir=.\Debug -TargetPath=.\Debug\TestRunnerDSPlugInD.dll -InputPath=.\Debug\TestRunnerDSPlugInD.dll -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem echo Automatically done when the add-in is registered with VC++ - rem regsvr32 "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - rem echo Server registration done! - -# End Custom Build - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DSPlugIn___Win32_Release_Unicode" -# PROP BASE Intermediate_Dir "DSPlugIn___Win32_Release_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseUnicode" -# PROP Intermediate_Dir "ReleaseUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "_UNICODE" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# SUBTRACT BASE MTL /mktyplib203 -# ADD MTL /nologo /D "NDEBUG" /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x409 /i "../../../../lib" /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /i "../../../../lib" /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"Release/TestRunnerDSPlugIn.dll" -# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /dll /machine:I386 /out:"ReleaseUnicode/TestRunnerDSPlugIn.dll" -# Begin Custom Build - Performing Registration -OutDir=.\ReleaseUnicode -TargetPath=.\ReleaseUnicode\TestRunnerDSPlugIn.dll -InputPath=.\ReleaseUnicode\TestRunnerDSPlugIn.dll -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem echo Automatically done when the add-in is registered with VC++ - rem regsvr32 "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - rem echo Server registration done! - -# End Custom Build - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DSPlugIn___Win32_Debug_Unicode" -# PROP BASE Intermediate_Dir "DSPlugIn___Win32_Debug_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugUnicode" -# PROP Intermediate_Dir "DebugUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "_UNICODE" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# SUBTRACT BASE MTL /mktyplib203 -# ADD MTL /nologo /D "_DEBUG" /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x409 /i "../../../../lib" /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /i "../../../../lib" /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/TestRunnerDSPlugInD.dll" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"DebugUnicode/TestRunnerDSPlugInD.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# Begin Custom Build - Performing Registration -OutDir=.\DebugUnicode -TargetPath=.\DebugUnicode\TestRunnerDSPlugInD.dll -InputPath=.\DebugUnicode\TestRunnerDSPlugInD.dll -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem echo Automatically done when the add-in is registered with VC++ - rem regsvr32 "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - rem echo Server registration done! - -# End Custom Build -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=duplicating DLL to lib directory -PostBuild_Cmds=echo The following command may fail if you have already registered the add-in copy Debug\TestRunnerDSPlugInD.dll ..\..\..\lib\TestRunnerDSPlugInD.dll -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "DSPlugIn - Win32 Release" -# Name "DSPlugIn - Win32 Debug" -# Name "DSPlugIn - Win32 Release Unicode" -# Name "DSPlugIn - Win32 Debug Unicode" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\DSAddIn.cpp - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\DSPlugIn.cpp - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\DSPlugIn.def - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\DSPlugIn.rc - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -# ADD CPP /Yc"stdafx.h" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 -# ADD CPP /Yc"stdafx.h" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 -# ADD CPP /Yc"stdafx.h" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 -# ADD CPP /Yc"stdafx.h" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerDSPlugin.idl - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -# ADD MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 -# ADD MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" /Oicf - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 -# ADD BASE MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" -# ADD MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 -# ADD BASE MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" /Oicf -# ADD MTL /tlb "TestRunnerDSPlugin.tlb" /h "ToAddToDistribution/TestRunnerDSPluginVC6.h" /iid "ToAddToDistribution/TestRunnerDSPluginVC6_i.c" /Oicf - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\ToAddToDistribution\TestRunnerDSPluginVC6_i.c - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\COMHelper.h - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\DSAddIn.h - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\DSPlugIn.h - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Resource.h - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\DSPlugIn.rc2 -# PROP Exclude_From_Scan -1 -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DSPlugIn.rgs - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\res\TBarLrge.bmp - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\res\TBarMedm.bmp - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerDSPlugin.tlb - -!IF "$(CFG)" == "DSPlugIn - Win32 Release" - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Release Unicode" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "DSPlugIn - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.h deleted file mode 100644 index 7d1720a3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.h +++ /dev/null @@ -1,23 +0,0 @@ -// DSPlugIn.h : main header file for the DSPLUGIN DLL -// - -#if !defined(AFX_DSPLUGIN_H__4DD05CAB_F04B_43DE_8B5D_17B299239CD9__INCLUDED_) -#define AFX_DSPLUGIN_H__4DD05CAB_F04B_43DE_8B5D_17B299239CD9__INCLUDED_ - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -#include -#include -#include -#include -#include - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DSPLUGIN_H__4DD05CAB_F04B_43DE_8B5D_17B299239CD9__INCLUDED) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rc b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rc deleted file mode 100644 index b2c9d368..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rc +++ /dev/null @@ -1,156 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif //_WIN32\r\n" - "#include ""res\\DSPlugIn.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\r\n" - "1 TYPELIB ""TestRunnerDSPlugin.tlb""\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "GNU\0" - VALUE "FileDescription", "Cppunit.TestRunner Developer Studio Addin\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "DSPlugIn\0" - VALUE "LegalCopyright", "Copyright (C) 2001\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "TestRunnerDSPlugin.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "TestRunnerDSPlugin Dynamic Link Library\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// REGISTRY -// - -IDR_DSADDIN REGISTRY DISCARDABLE "DSPlugIn.rgs" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DSPLUGIN_LONGNAME "CppUnit Developer Studio Add-in" - IDS_DSPLUGIN_DESCRIPTION - "Allows TestRunner dialog of cppunit to invoke the line of code where assert occurred" - IDS_CMD_STRING "\nDSPlugIn Sample Command\nDisplays a message box\nDSPlugIn Command" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif //_WIN32 -#include "res\DSPlugIn.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif -1 TYPELIB "TestRunnerDSPlugin.tlb" - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rgs b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rgs deleted file mode 100644 index 93aefb71..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/DSPlugIn.rgs +++ /dev/null @@ -1,32 +0,0 @@ -HKCR -{ - GNU.cppunit.DevStudioAddin.1 = s 'CppUnit.Testrunner Developer Studio Add-in' - { - CLSID = s '{F193CE54-716C-41CB-80B2-FA74CA3EE2AC}' - } - GNU.cppunit.DevStudioAddin = s 'CppUnit.Testrunner Developer Studio Add-in' - { - CLSID = s '{F193CE54-716C-41CB-80B2-FA74CA3EE2AC}' - CurVer = s 'GNU.cppunit.DevStudioAddin.1' - } - NoRemove CLSID - { - ForceRemove {F193CE54-716C-41CB-80B2-FA74CA3EE2AC} = s 'CppUnit.Testrunner Developer Studio Add-in' - { - ProgID = s 'GNU.cppunit.DevStudioAddin.1' - VersionIndependentProgID = s 'GNU.cppunit.DevStudioAddin' - InprocServer32 = s '%MODULE%' - TypeLib = s '{3ADE0E38-5A56-4a68-BD8D-67E9E7502971}' - Description = s 'Allows TestRunner dialog of cppunit to invoke the line of code where error occurred' - } - } - NoRemove Interface - { - ForceRemove {3ADE0E37-5A56-4a68-BD8D-67E9E7502971} = s 'ITestRunnerDSPlugin' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{3ADE0E38-5A56-4a68-BD8D-67E9E7502971}' - } - } -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/ReadMe.txt b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/ReadMe.txt deleted file mode 100644 index 0384029a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/ReadMe.txt +++ /dev/null @@ -1,96 +0,0 @@ -======================================================================== - DEVELOPER STUDIO ADD-IN : DSPlugIn -======================================================================== - - -The Add-in Wizard has created this DSPlugIn DLL for you. This DLL not only -demonstrates the basics of creating a Developer Studio add-in, but it is also -a starting point for writing your own add-in. - -An add-in mainly does two things. - (1) It adds commands to Developer Studio, which can then be tied - to keystrokes or toolbar buttons by the user or programmatically - by the add-in. - (2) It responds to events fired by Developer Studio. -In both cases, the add-in code has access to the full Developer Studio -Automation Object Model, and may manipulate those objects to affect the -behavior of Developer Studio. - -This file contains a summary of what you will find in each of the files that -make up your DSPlugIn DLL. - - -DSPlugIn.h - This is the main header file for the DLL. It declares the - CDSPlugInApp class. - -DSPlugIn.cpp - This is the main DLL source file. It contains the class CDSPlugInApp. - It also contains the OLE entry points required of inproc servers. - -DSPlugIn.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - -DSPlugIn.odl - This file contains the Object Description Language source code for the - type library of your DLL. - -DSPlugIn.rc - This is a listing of all of the Microsoft Windows resources that the - program uses. This file can be directly edited in Microsoft - Developer Studio. - -res\DSPlugIn.rc2 - This file contains resources that are not edited by Microsoft - Developer Studio. You should place all resources not - editable by the resource editor in this file. - -DSPlugIn.def - This file contains information about the DLL that must be - provided to run with Microsoft Windows. It defines parameters - such as the name and description of the DLL. It also exports - functions from the DLL. - -DSPlugIn.clw - This file contains information used by ClassWizard to edit existing - classes or add new classes. ClassWizard also uses this file to store - information needed to create and edit message maps and dialog data - maps and to create prototype member functions. - -///////////////////////////////////////////////////////////////////////////// -Add-in-specific files: - -DSAddIn.cpp, DSAddIn.h - These files contain the CDSAddIn class, which implements the - IDSAddIn interface. This interface contains handlers - for connecting and disconnecting the add-in. - -Commands.cpp, Commands.h - These files contain the CCommands class, which implements your - command dispatch interface. This interface contains one method - for each command you add to Developer Studio. It already implements - a sample command (DSPlugInCommand) which displays a message - box when it is invoked. You will probably want to rename and modify this - command, as well as add your own commands. - - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named DSPlugIn.pch and a precompiled types file named StdAfx.obj. - -Resource.h - This is the standard header file, which defines new resource IDs. - Microsoft Developer Studio reads and updates this file. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.cpp deleted file mode 100644 index f233c6ed..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// DSPlugIn.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -#include "atlimpl.cpp" diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.h deleted file mode 100644 index bb80c03b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/StdAfx.h +++ /dev/null @@ -1,76 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__4D384BCD_0580_402B_8270_1C9B5FB5ADA8__INCLUDED_) -#define AFX_STDAFX_H__4D384BCD_0580_402B_8270_1C9B5FB5ADA8__INCLUDED_ - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#if _MSC_VER >= 1300 // VC++ 7 or more -#error This add-in is for VC++ 6.0 only. -#endif - -#include // MFC core and standard components -#include - -#include -//You may derive a class from CComModule and use it if you want to override -//something, but do not change the name of _Module -extern CComModule _Module; -#include - -// Developer Studio Object Model -#include -#include -#include -#include -#include -#include -#include -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// Debugging support - -// Use VERIFY_OK around all calls to the Developer Studio objects which -// you expect to return S_OK. -// In DEBUG builds of your add-in, VERIFY_OK displays an ASSERT dialog box -// if the expression returns an HRESULT other than S_OK. If the HRESULT -// is a success code, the ASSERT box will display that HRESULT. If it -// is a failure code, the ASSERT box will display that HRESULT plus the -// error description string provided by the object which raised the error. -// In RETAIL builds of your add-in, VERIFY_OK just evaluates the expression -// and ignores the returned HRESULT. - -#ifdef _DEBUG - -void GetLastErrorDescription(CComBSTR& bstr); // Defined in DSPlugIn.cpp -#define VERIFY_OK(f) \ - { \ - HRESULT hr = (f); \ - if (hr != S_OK) \ - { \ - if (FAILED(hr)) \ - { \ - CComBSTR bstr; \ - GetLastErrorDescription(bstr); \ - _RPTF2(_CRT_ASSERT, "Object call returned %lx\n\n%S", hr, (BSTR) bstr); \ - } \ - else \ - _RPTF1(_CRT_ASSERT, "Object call returned %lx", hr); \ - } \ - } - -#else //_DEBUG - -#define VERIFY_OK(f) (f); - -#endif //_DEBUG - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__4D384BCD_0580_402B_8270_1C9B5FB5ADA8__INCLUDED) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl deleted file mode 100644 index 9770d9ce..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl +++ /dev/null @@ -1,43 +0,0 @@ -// BCProto.idl : IDL source for BCProto.dll -// - -// This file will be processed by the MIDL tool to -// produce the type library (BCProto.tlb) and marshalling code. - -import "oaidl.idl"; -import "ocidl.idl"; - -[ - object, - uuid(3ADE0E37-5A56-4a68-BD8D-67E9E7502971), - helpstring("ITestRunnerDSPlugin Interface"), - pointer_default(unique), - oleautomation -] -interface ITestRunnerDSPlugin : IUnknown -{ - // please let me know whether get_current is accessible through VB - [helpstring("command goToLineInSourceCode")] - HRESULT goToLineInSourceCode( [in] BSTR fileName, [in] int lineNumber); -}; - - -[ - uuid(3ADE0E38-5A56-4a68-BD8D-67E9E7502971), - version(1.0), - helpstring("TestRunnerDSPlugin 1.0 Type Library") -] -library TestRunnerDSPluginLib -{ - importlib("stdole32.tlb"); - - [ - uuid( F193CE54-716C-41CB-80B2-FA74CA3EE2AC), - version(1.0), - helpstring("TestRunner Developer Studio Plugin") - ] - coclass DSAddIn - { - [default] interface ITestRunnerDSPlugin; - } -}; \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/DSPlugIn.rc2 b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/DSPlugIn.rc2 deleted file mode 100644 index f61a8894..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/DSPlugIn.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// DSPLUGIN.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarLrge.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarLrge.bmp deleted file mode 100644 index c128524c..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarLrge.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarMedm.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarMedm.bmp deleted file mode 100644 index 6f24e11e..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/res/TBarMedm.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/resource.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/resource.h deleted file mode 100644 index 6bddcc0b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DSPlugIn/resource.h +++ /dev/null @@ -1,19 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by DSPlugIn.rc -// -#define IDS_DSPLUGIN_LONGNAME 1 -#define IDS_DSPLUGIN_DESCRIPTION 2 -#define IDS_CMD_STRING 3 -#define IDR_DSADDIN 133 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 134 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/.cvsignore deleted file mode 100644 index ac568e6b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -*.Tags.WW -Debug Release ReleaseUnicode DebugUnicode -*.ncb *.opt *.aps *.clw -SunWS_cache -ir.out diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.cpp deleted file mode 100644 index 7136a85c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.cpp +++ /dev/null @@ -1,194 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#ifndef _UNICODE -#define TCERR CPPUNIT_NS::stdCOut() -#else -#define TCERR std::wcerr -#endif - -class NotOwningTestRunner : public CppUnit::TestRunner -{ -public: - typedef CppUnit::TestRunner SuperClass; // work around VC++ bug - - void addTest( CppUnit::Test *test ) - { - SuperClass::addTest( new CppUnit::TestDecorator( test ) ); - } -}; - - -/*! Converts a ansi string to a TCHAR string. - */ -std::basic_string -toVariableString( const char *text ) -{ -#ifdef _UNICODE - int textLength = ::strlen( text ); - - wchar_t *unicodeString = new wchar_t[ textLength + 1 ]; - - ::MultiByteToWideChar( CP_THREAD_ACP, MB_PRECOMPOSED, - text, textLength, - unicodeString, textLength + 1 ); - - std::wstring str( unicodeString ); - delete[] unicodeString; - return str; -#else - return text; -#endif -} - - -/*! Converts a TCHAR string to an ANSI string. - */ -std::string -toAnsiString( const TCHAR *text ) -{ -#ifdef _UNICODE - int bufferLength = ::WideCharToMultiByte( CP_THREAD_ACP, 0, - text, text.GetLength(), - NULL, 0, NULL, NULL ) +1; - char *ansiString = new char[bufferLength]; - ::WideCharToMultiByte( CP_THREAD_ACP, 0, - text, text.GetLength(), - ansiString, bufferLength, - NULL, - NULL ); - - std::string str( ansiString, bufferLength-1 ); - delete[] ansiString; - - return str; -#else - return std::string( text ); -#endif -} - - -/*! Runs the specified tests located in the root suite. - * \param root Root suite that contains all the test of the DLL. - * \param testPaths Array of string that contains the test paths of all the test to run. - * \param numberOfPath Number of test paths in \a testPaths. If 0 then \a root suite - * is run. - * \return \c true if the run succeed, \c false if a test failed or if a test - * path was not resolved. - */ -bool -runDllTest( CppUnit::Test *root, - TCHAR *testPaths[], - int numberOfPath ) -{ - CppUnit::TestResult controller; - CppUnit::TestResultCollector result; - controller.addListener( &result ); - CppUnit::TextTestProgressListener progress; - controller.addListener( &progress ); - - NotOwningTestRunner runner; - if ( numberOfPath == 0 ) - runner.addTest( root ); - else - { - for ( int index =0; index < numberOfPath; ++index ) - { - const TCHAR *testPath = testPaths[index]; - try - { - runner.addTest( root->resolveTestPath( testPath).getChildTest() ); - } - catch ( std::invalid_argument & ) - { - TCERR << _T("Failed to resolve test path: ") << testPath << "\n"; - return false; - } - } - } - - runner.run( controller ); - - stdCOut() << "\n"; - - CppUnit::CompilerOutputter outputter( &result, stdCOut() ); - outputter.write(); - - return result.wasSuccessful(); -} - - -/*! Main - * - * Usage: - * - * DllPlugInTester.exe dll-filename [testpath1] [testpath2]... - * - * dll-filename must be the name of the DLL. If the DLL use some other DLL, they - * should be in the path or in the same directory as the DLL. The DLL must export - * a function named "GetTestPlugInInterface" with the signature - * GetTestPlugInInterfaceFunction. Both are defined in: - * \code - * #include - * \endcode. - * - * See examples/msvc6/TestPlugIn for an example of post-build testing. - * - * If no test path is specified, they all the test of the suite returned by the DLL - * are run. - * - * You can specify as much test path as you which. Only the test specified by the - * test paths will be run. Test paths are resolved using Test::resolveTestPath() on - * the suite returned by the DLL. - * - * If all test succeed and no error happen then the application exit with code 0. - * If any error occurs (failed to load dll, failed to resolve test paths) or a - * test fail, the application exit with code 1. - */ -int -_tmain( int argc, - TCHAR* argv[], - TCHAR* envp[] ) -{ - const int successReturnCode = 0; - const int failureReturnCode = 1; - - // check command line - const TCHAR *applicationName = argv[0]; - if ( argc < 2 ) - { - TCERR << _T("Usage:\n") - << applicationName - << " dll-filename [test-path] [test-path]...\n"; - return failureReturnCode; - } - - // open the dll - const TCHAR *dllFileName = argv[1]; - - bool wasSuccessful = false; - try - { - CppUnit::TestPlugInSuite suite( dllFileName ); - wasSuccessful = runDllTest( &suite, argv+2, argc-2 ); - } - catch ( CppUnit::DynamicLibraryManagerException &e ) - { - TCERR << "Failed to load test plug-in:\n" - << toVariableString( e.what() ) << "\n"; - } - - return wasSuccessful ? successReturnCode : failureReturnCode; -} - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.dsp deleted file mode 100644 index 2f831f02..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/DllPlugInTester/DllPlugInTester.dsp +++ /dev/null @@ -1,150 +0,0 @@ -# Microsoft Developer Studio Project File - Name="DllPlugInTester" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=DllPlugInTester - Win32 Debug Unicode -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTester.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DllPlugInTester.mak" CFG="DllPlugInTester - Win32 Debug Unicode" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DllPlugInTester - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Release Unicode" (based on "Win32 (x86) Console Application") -!MESSAGE "DllPlugInTester - Win32 Debug Unicode" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DllPlugInTester - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O1 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\lib\DllPlugInTester.exe" /libpath:"../../../lib" - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\..\..\lib\DllPlugInTesterd.exe" /pdbtype:sept /libpath:"../../../lib" - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Release Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Release_Unicode" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Release_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseUnicode" -# PROP Intermediate_Dir "ReleaseUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GR /GX /O1 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\lib\DllPlugInTesteru.exe" /libpath:"../../../lib" - -!ELSEIF "$(CFG)" == "DllPlugInTester - Win32 Debug Unicode" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DllPlugInTester___Win32_Debug_Unicode" -# PROP BASE Intermediate_Dir "DllPlugInTester___Win32_Debug_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugUnicode" -# PROP Intermediate_Dir "DebugUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/DllPlugInTesterd.exe" /pdbtype:sept /libpath:"../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\..\..\lib\DllPlugInTesterud.exe" /pdbtype:sept /libpath:"../../../lib" - -!ENDIF - -# Begin Target - -# Name "DllPlugInTester - Win32 Release" -# Name "DllPlugInTester - Win32 Debug" -# Name "DllPlugInTester - Win32 Release Unicode" -# Name "DllPlugInTester - Win32 Debug Unicode" -# Begin Source File - -SOURCE=.\DllPlugInTester.cpp -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/.cvsignore deleted file mode 100644 index 5df8a105..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.Tags.WW -Debug DebugCrossplatform Release -*.ncb *.opt -*.aps -SunWS_cache -ir.out diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/ReadMe.txt b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/ReadMe.txt deleted file mode 100644 index fac52604..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/ReadMe.txt +++ /dev/null @@ -1,88 +0,0 @@ -======================================================================== - MICROSOFT FOUNDATION CLASS LIBRARY : TestPlugInRunner -======================================================================== - - -AppWizard has created this TestPlugInRunner application for you. This application -not only demonstrates the basics of using the Microsoft Foundation classes -but is also a starting point for writing your application. - -This file contains a summary of what you will find in each of the files that -make up your TestPlugInRunner application. - -TestPlugInRunner.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - -TestPlugInRunner.h - This is the main header file for the application. It includes other - project specific headers (including Resource.h) and declares the - TestPlugInRunnerApp application class. - -TestPlugInRunner.cpp - This is the main application source file that contains the application - class TestPlugInRunnerApp. - -TestPlugInRunner.rc - This is a listing of all of the Microsoft Windows resources that the - program uses. It includes the icons, bitmaps, and cursors that are stored - in the RES subdirectory. This file can be directly edited in Microsoft - Visual C++. - -TestPlugInRunner.clw - This file contains information used by ClassWizard to edit existing - classes or add new classes. ClassWizard also uses this file to store - information needed to create and edit message maps and dialog data - maps and to create prototype member functions. - -res\TestPlugInRunner.ico - This is an icon file, which is used as the application's icon. This - icon is included by the main resource file TestPlugInRunner.rc. - -res\TestPlugInRunner.rc2 - This file contains resources that are not edited by Microsoft - Visual C++. You should place all resources not editable by - the resource editor in this file. - - - - -///////////////////////////////////////////////////////////////////////////// - -AppWizard creates one dialog class: - -TestPlugInRunnerDlg.h, TestPlugInRunnerDlg.cpp - the dialog - These files contain your TestPlugInRunnerDlg class. This class defines - the behavior of your application's main dialog. The dialog's - template is in TestPlugInRunner.rc, which can be edited in Microsoft - Visual C++. - - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named TestPlugInRunner.pch and a precompiled types file named StdAfx.obj. - -Resource.h - This is the standard header file, which defines new resource IDs. - Microsoft Visual C++ reads and updates this file. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - -If your application uses MFC in a shared DLL, and your application is -in a language other than the operating system's current language, you -will need to copy the corresponding localized resources MFC42XXX.DLL -from the Microsoft Visual C++ CD-ROM onto the system or system32 directory, -and rename it to be MFCLOC.DLL. ("XXX" stands for the language abbreviation. -For example, MFC42DEU.DLL contains resources translated to German.) If you -don't do this, some of the UI elements of your application will remain in the -language of the operating system. - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/Resource.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/Resource.h deleted file mode 100644 index e9b1bea2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/Resource.h +++ /dev/null @@ -1,49 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by TestPlugInRunner.rc -// -#define IDS_ERROR_SELECT_TEST 1 -#define IDS_ERRORLIST_TYPE 2 -#define IDS_ERRORLIST_NAME 3 -#define IDS_ERRORLIST_FAILED_CONDITION 4 -#define IDS_ERRORLIST_LINE_NUMBER 5 -#define IDS_ERRORLIST_FILE_NAME 6 -#define IDR_MAINFRAME 128 -#define IDR_ACCELERATOR_TEST_RUNNER 131 -#define IDC_LIST 1000 -#define ID_RUN 1001 -#define ID_STOP 1002 -#define IDC_PROGRESS 1003 -#define IDC_INDICATOR 1004 -#define IDC_COMBO_TEST 1005 -#define IDC_STATIC_RUNS 1007 -#define IDC_STATIC_ERRORS 1008 -#define IDC_STATIC_FAILURES 1009 -#define IDC_EDIT_TIME 1010 -#define IDC_BUTTON1 1011 -#define IDC_BROWSE_TEST 1011 -#define IDC_TREE_TEST 1012 -#define IDC_DETAILS 1012 -#define IDC_CHECK_AUTORUN 1013 -#define IDC_RUNNING_TEST_CASE_LABEL 1016 -#define IDC_STATIC_TEST_NAME 1017 -#define IDC_STATIC_PROGRESS 1018 -#define IDC_STATIC_LABEL_RUNS 1019 -#define IDC_STATIC_LABEL_ERRORS 1020 -#define IDC_STATIC_LABEL_FAILURES 1021 -#define IDC_STATIC_PROGRESS_BAR 1022 -#define IDC_STATIC_DETAILS 1023 -#define IDC_CHOOSE_DLL 1040 -#define IDC_RELOAD_DLL 1041 -#define ID_QUIT_APPLICATION 32771 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 130 -#define _APS_NEXT_COMMAND_VALUE 32772 -#define _APS_NEXT_CONTROL_VALUE 1042 -#define _APS_NEXT_SYMED_VALUE 103 -#endif -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.cpp deleted file mode 100644 index f0e39426..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// TestPlugInRunner.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.h deleted file mode 100644 index 7d2a6ea8..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/StdAfx.h +++ /dev/null @@ -1,29 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__2CCC624C_C151_496F_A333_28951EA9A8D3__INCLUDED_) -#define AFX_STDAFX_H__2CCC624C_C151_496F_A333_28951EA9A8D3__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#pragma warning( disable : 4786 ) // warning of hell: debug symbol too long... - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC Automation classes -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__2CCC624C_C151_496F_A333_28951EA9A8D3__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.cpp deleted file mode 100644 index 2612220e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.cpp +++ /dev/null @@ -1,101 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestPlugIn.cpp for class TestPlugIn -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/23 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "TestPlugIn.h" -#include -#include -#include -#include "TestPlugInException.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -TestPlugIn::TestPlugIn( const std::string fileName ) : - m_fileName( fileName ) -{ - m_copyFileName = m_fileName + "-hotrunner"; -} - - -TestPlugIn::~TestPlugIn() -{ - deleteDllCopy(); -} - - -void -TestPlugIn::deleteDllCopy() -{ - m_manager.unload( m_copyFileName ); - ::DeleteFile( m_copyFileName.c_str() ); -} - - -class NullTest : public CPPUNIT_NS::TestCase -{ -public: - NullTest( std::string name ) : TestCase( name ) - { - } - - ~NullTest() - { - } - - void runTests() - { - CPPUNIT_ASSERT_MESSAGE( "Failed to load" + getName(), FALSE ); - } -}; - - -CPPUNIT_NS::Test * -TestPlugIn::makeTest() -{ - reloadDll(); - return CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest(); -} - - -void -TestPlugIn::reloadDll() -{ - m_manager.unload( m_copyFileName ); - makeDllCopy(); - loadDll(); -} - - -void -TestPlugIn::makeDllCopy() -{ - if ( ::CopyFile( m_fileName.c_str(), m_copyFileName.c_str(), FALSE ) == FALSE ) - { - throw TestPlugInException( "Failed to copy DLL" + m_fileName + - " to " + m_copyFileName, TestPlugInException::failedToCopyDll ); - } -} - - -void -TestPlugIn::loadDll() -{ - try - { - m_manager.load( m_copyFileName ); - } - catch ( CPPUNIT_NS::DynamicLibraryManagerException &e ) - { - throw TestPlugInException( e.what(), - TestPlugInException::failedToLoadDll ); - } -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.h deleted file mode 100644 index 73b0d141..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugIn.h +++ /dev/null @@ -1,68 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestPlugIn.h for class TestPlugIn -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/23 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTPLUGIN_H -#define TESTPLUGIN_H - -#include -#include -#include - - -/*! \class TestPlugIn - * \brief This class represents a test plug-in. - */ -class TestPlugIn -{ -public: - /*! Constructs a TestPlugIn object. - */ - TestPlugIn( const std::string fileName ); - - /*! Destructor. - */ - virtual ~TestPlugIn(); - - /*! Obtains a new test from a new copy of the dll. - * \exception TestPlugInException if a error occurs. - */ - CPPUNIT_NS::Test *makeTest(); - -private: - /// Prevents the use of the copy constructor. - TestPlugIn( const TestPlugIn © ); - - /// Prevents the use of the copy operator. - void operator =( const TestPlugIn © ); - - void reloadDll(); - void deleteDllCopy(); - - /*! Copy m_fileName DLL to m_copyFileName. - * - * Working on a copy of the DLL allow to update the original DLL. - * \exception TestPlugInException on copy failure. - */ - void makeDllCopy(); - - /*! Load the DLL. - * \exception TestPlugInException on dll loading failure. - */ - void loadDll(); - -private: - std::string m_fileName; - std::string m_copyFileName; - CPPUNIT_NS::PlugInManager m_manager; -}; - - - -// Inlines methods for TestPlugIn: -// ------------------------------- - - - -#endif // TESTPLUGIN_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.cpp deleted file mode 100644 index c4fcddd4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestPlugInException.cpp for class TestPlugInException -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/23 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "TestPlugInException.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -TestPlugInException::TestPlugInException( std::string message, - Cause cause ) : - runtime_error( message ), - m_cause( cause ) -{ -} - - -TestPlugInException::TestPlugInException( const TestPlugInException © ) : - runtime_error( copy ) -{ -} - - -TestPlugInException::~TestPlugInException() -{ -} - - -TestPlugInException & -TestPlugInException::operator =( const TestPlugInException © ) -{ - runtime_error::operator =( copy ); - m_cause = copy.m_cause; - return *this; -} - - -TestPlugInException::Cause -TestPlugInException::getCause() const -{ - return m_cause; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.h deleted file mode 100644 index 15005dcb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInException.h +++ /dev/null @@ -1,60 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestPlugInException.h for class TestPlugInException -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/23 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTPLUGINEXCEPTION_H -#define TESTPLUGINEXCEPTION_H - -#include -#include - - -/*! \class TestPlugInException - * \brief This class represents a failure of using the test plug-in. - */ -class TestPlugInException : public std::runtime_error -{ -public: - enum Cause - { - failedToLoadDll =0, - failedToCopyDll, - failedToGetInterfaceFunction, - failedToMakeTest - }; - - /*! Constructs a TestPlugInException object. - */ - TestPlugInException( std::string message, - Cause cause ); - - /*! Copy constructor. - * @param copy Object to copy. - */ - TestPlugInException( const TestPlugInException © ); - - /*! Destructor. - */ - virtual ~TestPlugInException(); - - /*! Copy operator. - * @param copy Object to copy. - * @return Reference on this object. - */ - TestPlugInException &operator =( const TestPlugInException © ); - - Cause getCause() const; - -private: - Cause m_cause; -}; - - - -// Inlines methods for TestPlugInException: -// ---------------------------------------- - - - -#endif // TESTPLUGINEXCEPTION_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.dsp deleted file mode 100644 index c39c5bcc..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.dsp +++ /dev/null @@ -1,473 +0,0 @@ -# Microsoft Developer Studio Project File - Name="TestPlugInRunner" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=TestPlugInRunner - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestPlugInRunner.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestPlugInRunner.mak" CFG="TestPlugInRunner - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestPlugInRunner - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "TestPlugInRunner - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestPlugInRunner - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /I "../TestRunner" /I "..\..\..\include" /I "..\..\..\include\msvc6" /I "..\TestRunner" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD" /D "CPPUNIT_DLL" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 cppunit_dll.lib winmm.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../lib/" -# SUBTRACT LINK32 /incremental:yes -# Begin Special Build Tool -TargetPath=.\Release\TestPlugInRunner.exe -TargetName=TestPlugInRunner -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "TestPlugInRunner - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /I "..\TestRunner" /D "_DEBUG" /D "CPPUNIT_TESTPLUGINRUNNER_BUILD" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD" /D "CPPUNIT_DLL" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 cppunitd_dll.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /out:"Debug/TestPlugInRunnerd.exe" /pdbtype:sept /libpath:"../../../lib/" -# Begin Special Build Tool -TargetPath=.\Debug\TestPlugInRunnerd.exe -TargetName=TestPlugInRunnerd -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "TestPlugInRunner - Win32 Release" -# Name "TestPlugInRunner - Win32 Debug" -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\errortype.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\ico00001.ico -# End Source File -# Begin Source File - -SOURCE=..\testrunner\res\ico00001.ico -# End Source File -# Begin Source File - -SOURCE=..\testrunner\res\ico00002.ico -# End Source File -# Begin Source File - -SOURCE=..\testrunner\res\idr_test.ico -# End Source File -# Begin Source File - -SOURCE=.\res\test_type.bmp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\res\test_type.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\TestPlugInRunner.ico -# End Source File -# Begin Source File - -SOURCE=.\res\TestPlugInRunner.rc2 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\res\tfwkui_r.bmp -# End Source File -# End Group -# Begin Group "Gui" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunner.rc -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerApp.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerApp.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerDlg.h -# End Source File -# End Group -# Begin Group "Interface" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\include\msvc6\testrunner\TestPlugInInterface.h -# End Source File -# End Group -# Begin Group "Models" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\TestPlugIn.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPlugIn.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInException.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInException.h -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerModel.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestPlugInRunnerModel.h -# End Source File -# End Group -# Begin Group "DLL" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\lib\cppunit_dll.dll - -!IF "$(CFG)" == "TestPlugInRunner - Win32 Release" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\Release -InputPath=..\..\..\lib\cppunit_dll.dll -InputName=cppunit_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ELSEIF "$(CFG)" == "TestPlugInRunner - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\cppunitd_dll.dll - -!IF "$(CFG)" == "TestPlugInRunner - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "TestPlugInRunner - Win32 Debug" - -# Begin Custom Build - Updating $(InputPath) -IntDir=.\Debug -InputPath=..\..\..\lib\cppunitd_dll.dll -InputName=cppunitd_dll - -"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(IntDir)\$(InputName).dll - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunner.dll -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\testrunnerd.dll -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "TestRunner-Was-In-Dll" - -# PROP Default_Filter "" -# Begin Group "UserInterface" - -# PROP Default_Filter "" -# Begin Group "DynamicWindow" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicBar.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicBar.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicControlsManager.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicControlsManager.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicDialog.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicFormView.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicFormView.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicPropSheet.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicPropSheet.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWnd.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWnd.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWndEx.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWndEx.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCSizeIconCtrl.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\cdxCSizeIconCtrl.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\SizeCBar.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\testrunner\DynamicWindow\SizeCBar.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\testrunner\ListCtrlFormatter.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ListCtrlFormatter.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ListCtrlSetter.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ListCtrlSetter.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\MsDevCallerListCtrl.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\MsDevCallerListCtrl.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ProgressBar.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ProgressBar.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ResourceLoaders.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ResourceLoaders.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TestRunnerDlg.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TestRunnerDlg.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TreeHierarchyDlg.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TreeHierarchyDlg.h -# End Source File -# End Group -# Begin Group "Components" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\testrunner\ActiveTest.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\ActiveTest.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\MfcSynchronizationObject.h -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TestRunnerModel.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\TestRunnerModel.h -# End Source File -# End Group -# Begin Group "NewFiles" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\testrunner\MostRecentTests.cpp -# End Source File -# Begin Source File - -SOURCE=..\testrunner\MostRecentTests.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# End Group -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.rc b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.rc deleted file mode 100644 index de10daf2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunner.rc +++ /dev/null @@ -1,268 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -CPP_UNIT_TEST_RUNNER_PLUG_IN_IDD_TEST_PLUG_IN_RUNNER DIALOG DISCARDABLE 0, 0, 330, 226 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Test plug-in runner" -FONT 8, "MS Sans Serif" -BEGIN - PUSHBUTTON "&Choose DLL",IDC_CHOOSE_DLL,273,72,50,14 - PUSHBUTTON "Re&load DLL",IDC_RELOAD_DLL,273,88,50,14 - LTEXT "&Test:",IDC_STATIC_TEST_NAME,7,7,17,8 - COMBOBOX IDC_COMBO_TEST,28,7,235,157,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Browse",IDC_BROWSE_TEST,273,7,50,14 - DEFPUSHBUTTON "&Run",ID_RUN,273,23,50,14 - LTEXT "Progress:",IDC_STATIC_PROGRESS,7,23,33,9 - LTEXT "none",IDC_RUNNING_TEST_CASE_LABEL,43,23,220,9 - LTEXT "Progress Bar",IDC_STATIC_PROGRESS_BAR,7,34,256,15,NOT - WS_VISIBLE - LTEXT "Runs:",IDC_STATIC_LABEL_RUNS,7,55,29,10 - LTEXT "0",IDC_STATIC_RUNS,48,55,30,8 - LTEXT "Errors:",IDC_STATIC_LABEL_ERRORS,89,55,29,10 - LTEXT "0",IDC_STATIC_ERRORS,127,55,19,8 - LTEXT "Failures:",IDC_STATIC_LABEL_FAILURES,174,55,29,10 - LTEXT "0",IDC_STATIC_FAILURES,212,55,19,8 - LTEXT "&Errors and Failures:",IDC_STATIC,7,70,67,9 - CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | - WS_TABSTOP,7,81,257,60 - LTEXT "&Details:",IDC_STATIC_DETAILS,7,145,24,8 - EDITTEXT IDC_DETAILS,7,156,316,48,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_READONLY - CONTROL "&Autorun at startup",IDC_CHECK_AUTORUN,"Button", - BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,273,46,49,19 - PUSHBUTTON "&Stop",ID_STOP,273,112,50,14 - PUSHBUTTON "&Close",IDOK,273,128,50,14 - EDITTEXT IDC_EDIT_TIME,7,206,316,13,ES_AUTOHSCROLL | ES_READONLY -END - -CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY DIALOG DISCARDABLE 0, 0, 259, 250 -STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Test hierarchy" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "Select",IDOK,202,7,50,14 - CONTROL "Tree1",IDC_TREE_TEST,"SysTreeView32",TVS_HASBUTTONS | - TVS_HASLINES | TVS_LINESATROOT | TVS_FULLROWSELECT | - WS_BORDER | WS_TABSTOP,7,7,189,236 - PUSHBUTTON "&Close",IDCANCEL,202,34,50,14 -END - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "TestPlugInRunner MFC Application\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "TestPlugInRunner\0" - VALUE "LegalCopyright", "Copyright (C) 2001\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "TestPlugInRunner.EXE\0" - VALUE "ProductName", "TestPlugInRunner Application\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - "CPP_UNIT_TEST_RUNNER_PLUG_IN_IDD_TEST_PLUG_IN_RUNNER", DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 323 - TOPMARGIN, 7 - BOTTOMMARGIN, 219 - END - - "CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY", DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 252 - TOPMARGIN, 7 - BOTTOMMARGIN, 243 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR_TEST_RUNNER ACCELERATORS DISCARDABLE -BEGIN - "Q", ID_QUIT_APPLICATION, VIRTKEY, NOINVERT - VK_SPACE, ID_RUN, VIRTKEY, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -CPP_UNIT_TEST_RUNNER_IDB_ERROR_TYPE BITMAP DISCARDABLE "res\\errortype.bmp" -CPP_UNIT_TEST_RUNNER_IDB_TEST_TYPE BITMAP DISCARDABLE "res\\test_type.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -CPP_UNIT_TEST_RUNNER_PLUG_IN_IDR_TEST_PLUGIN_RUNNER ICON DISCARDABLE "res\\TestPlugInRunner.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ERROR_SELECT_TEST "You must select a test!" - IDS_ERRORLIST_TYPE "Type" - IDS_ERRORLIST_NAME "Name" - IDS_ERRORLIST_FAILED_CONDITION "Failed Condition" - IDS_ERRORLIST_LINE_NUMBER "Line Number" - IDS_ERRORLIST_FILE_NAME "File Name" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// French (France) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif //_WIN32\r\n" - "#include ""res\\TestPlugInRunner.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // French (France) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif //_WIN32 -#include "res\TestPlugInRunner.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp deleted file mode 100644 index 4f7d6b2e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// TestPlugInRunner.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" -#include "TestPlugInRunnerApp.h" -#include "TestPlugInRunnerDlg.h" -#include "TestPlugInRunnerModel.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -HINSTANCE g_testRunnerResource; - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerApp - -BEGIN_MESSAGE_MAP(TestPlugInRunnerApp, CWinApp) - //{{AFX_MSG_MAP(TestPlugInRunnerApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - ON_COMMAND(ID_HELP, CWinApp::OnHelp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerApp construction - -TestPlugInRunnerApp::TestPlugInRunnerApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only TestPlugInRunnerApp object - -TestPlugInRunnerApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerApp initialization - -BOOL TestPlugInRunnerApp::InitInstance() -{ - AfxEnableControlContainer(); - - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. - -#ifdef _AFXDLL -# if _MSC_VER < 1300 // vc6 - Enable3dControls(); // Call this when using MFC in a shared DLL -# endif -#else - Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif - - g_testRunnerResource = AfxGetResourceHandle(); - - SetRegistryKey(_T("CppUnit Test Plug-In Runner")); - - { - TestPlugInRunnerModel model; - TestPlugInRunnerDlg dlg( &model ); - m_pMainWnd = &dlg; - dlg.DoModal(); - - } - // Since the dialog has been closed, return FALSE so that we exit the - // application, rather than start the application's message pump. - return FALSE; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.h deleted file mode 100644 index fc022d29..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerApp.h +++ /dev/null @@ -1,49 +0,0 @@ -// TestPlugInRunner.h : main header file for the TESTPLUGINRUNNER application -// - -#if !defined(AFX_TESTPLUGINRUNNER_H__C64A0384_27BB_4A9A_854C_B19BF07A81F8__INCLUDED_) -#define AFX_TESTPLUGINRUNNER_H__C64A0384_27BB_4A9A_854C_B19BF07A81F8__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerApp: -// See TestPlugInRunner.cpp for the implementation of this class -// - -class TestPlugInRunnerApp : public CWinApp -{ -public: - TestPlugInRunnerApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(TestPlugInRunnerApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - -// Implementation - - //{{AFX_MSG(TestPlugInRunnerApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TESTPLUGINRUNNER_H__C64A0384_27BB_4A9A_854C_B19BF07A81F8__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp deleted file mode 100644 index bf9e2a78..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp +++ /dev/null @@ -1,197 +0,0 @@ -// TestPlugInRunnerDlg.cpp : implementation file -// - -#include "stdafx.h" -#include "TestPlugInRunnerDlg.h" -#include "TestPlugIn.h" -#include "TestPlugInException.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerDlg dialog - -TestPlugInRunnerDlg::TestPlugInRunnerDlg( TestPlugInRunnerModel *model, - CWnd* pParent ) - : TestRunnerDlg( model, "CPP_UNIT_TEST_RUNNER_PLUG_IN_IDD_TEST_PLUG_IN_RUNNER", pParent ) -{ - //{{AFX_DATA_INIT(TestPlugInRunnerDlg) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT - // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 - m_hIcon = AfxGetApp()->LoadIcon("CPP_UNIT_TEST_RUNNER_PLUG_IN_IDR_TEST_PLUGIN_RUNNER"); -} - - -void -TestPlugInRunnerDlg::DoDataExchange( CDataExchange* pDX ) -{ - TestRunnerDlg::DoDataExchange(pDX); - //{{AFX_DATA_MAP(TestPlugInRunnerDlg) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(TestPlugInRunnerDlg, TestRunnerDlg) - //{{AFX_MSG_MAP(TestPlugInRunnerDlg) - ON_WM_PAINT() - ON_WM_QUERYDRAGICON() - ON_BN_CLICKED(IDC_CHOOSE_DLL, OnChooseDll) - ON_BN_CLICKED(IDC_RELOAD_DLL, OnReloadDll) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerDlg message handlers - -BOOL TestPlugInRunnerDlg::OnInitDialog() -{ - TestRunnerDlg::OnInitDialog(); - - // Set the icon for this dialog. The framework does this automatically - // when the application's main window is not a dialog - SetIcon(m_hIcon, TRUE); // Set big icon - SetIcon(m_hIcon, FALSE); // Set small icon - - // TODO: Add extra initialization here - loadPluginIfNesseccary(); - - return TRUE; // return TRUE unless you set the focus to a control -} - -// If you add a minimize button to your dialog, you will need the code below -// to draw the icon. For MFC applications using the document/view model, -// this is automatically done for you by the framework. - -void TestPlugInRunnerDlg::OnPaint() -{ - if (IsIconic()) - { - CPaintDC dc(this); // device context for painting - - SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); - - // Center icon in client rectangle - int cxIcon = GetSystemMetrics(SM_CXICON); - int cyIcon = GetSystemMetrics(SM_CYICON); - CRect rect; - GetClientRect(&rect); - int x = (rect.Width() - cxIcon + 1) / 2; - int y = (rect.Height() - cyIcon + 1) / 2; - - // Draw the icon - dc.DrawIcon(x, y, m_hIcon); - } - else - { - TestRunnerDlg::OnPaint(); - } -} - - -// The system calls this to obtain the cursor to display while the user drags -// the minimized window. -HCURSOR TestPlugInRunnerDlg::OnQueryDragIcon() -{ - return (HCURSOR) m_hIcon; -} - - -TestPlugInRunnerModel & -TestPlugInRunnerDlg::plugInModel() -{ - return *static_cast( m_model ); -} - - -void -TestPlugInRunnerDlg::OnChooseDll() -{ - CFileDialog dlg( TRUE, "*.dll", "", 0, - "Test Plug-in (*.dll)|*.dll|All Files (*.*)|*.*||", - this ); - if ( dlg.DoModal() != IDOK ) - return; - - try - { - loadDll(std::string(dlg.GetPathName())); - } - catch ( TestPlugInException &e ) - { - AfxMessageBox( e.what() ); - } -} - - -void -TestPlugInRunnerDlg::OnReloadDll() -{ - reset(); - plugInModel().reloadPlugIn(); -} - - -std::list -TestPlugInRunnerDlg::getCommandLineArguments() -{ - int argc; - LPWSTR *argv = ::CommandLineToArgvW( ::GetCommandLineW(), &argc ); - - std::list arguments; - for( int index = 0; index < argc; index++ ) - arguments.push_back( std::string( CString( argv[index] ) ) ); - - ::GlobalFree( argv ); - - return arguments; -} - - -void -TestPlugInRunnerDlg::loadPluginIfNesseccary() -{ - std::list argv = getCommandLineArguments(); - std::list::iterator iter = std::find( argv.begin(), - argv.end(), - std::string( "-testsuite" ) ); - - if ( iter == argv.end() ) - return; - - try - { - loadDll( *++iter ); - } - catch( std::exception &e ) - { - AfxMessageBox( e.what() ); - } -} - - -void -TestPlugInRunnerDlg::loadDll( std::string path ) -{ - TestPlugIn *plugIn = new TestPlugIn( path ); - plugInModel().setPlugIn( plugIn ); - - m_model->selectHistoryTest( plugInModel().rootTest() ); - updateHistoryCombo(); -} - - -void -TestPlugInRunnerDlg::initializeLayout() -{ - TestRunnerDlg::initializeLayout(); - - AddSzXControl( IDC_CHOOSE_DLL, mdRepos ); - AddSzXControl( IDC_RELOAD_DLL, mdRepos ); - -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h deleted file mode 100644 index 8772a0a2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h +++ /dev/null @@ -1,67 +0,0 @@ -// TestPlugInRunnerDlg.h : header file -// - -#if !defined(AFX_TESTPLUGINRUNNERDLG_H__AF6DB5BC_25E5_4459_8A54_9704298F64FF__INCLUDED_) -#define AFX_TESTPLUGINRUNNERDLG_H__AF6DB5BC_25E5_4459_8A54_9704298F64FF__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#include "resource.h" -#include -#include -#include "TestPlugInRunnerModel.h" -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// TestPlugInRunnerDlg dialog - -class TestPlugInRunnerDlg : public TestRunnerDlg -{ -// Construction -public: - TestPlugInRunnerDlg( TestPlugInRunnerModel *model, - CWnd* pParent = NULL); - -// Dialog Data - //{{AFX_DATA(TestPlugInRunnerDlg) - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(TestPlugInRunnerDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - HICON m_hIcon; - - // Generated message map functions - //{{AFX_MSG(TestPlugInRunnerDlg) - virtual BOOL OnInitDialog(); - afx_msg void OnPaint(); - afx_msg HCURSOR OnQueryDragIcon(); - afx_msg void OnChooseDll(); - afx_msg void OnReloadDll(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); - -protected: - virtual void initializeLayout(); - - -private: - TestPlugInRunnerModel &plugInModel(); - - static std::list getCommandLineArguments(); - void loadPluginIfNesseccary(); - void loadDll( std::string path ); -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TESTPLUGINRUNNERDLG_H__AF6DB5BC_25E5_4459_8A54_9704298F64FF__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp deleted file mode 100644 index 13418d35..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestPlugInRunnerModel.cpp for class TestPlugInRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/24 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "TestPlugInRunnerModel.h" -#include -#include "TestPlugIn.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - -TestPlugInRunnerModel::TestPlugInRunnerModel() : - TestRunnerModel( new CPPUNIT_NS::TestSuite( "Default" ) ), - m_plugIn( new TestPlugIn( "default plug-in" ) ) -{ -} - - -TestPlugInRunnerModel::~TestPlugInRunnerModel() -{ - freeRootTest(); - delete m_plugIn; -} - - -void -TestPlugInRunnerModel::setPlugIn( TestPlugIn *plugIn ) -{ - freeRootTest(); - delete m_plugIn; - m_plugIn = plugIn; - reloadPlugIn(); -} - - -void -TestPlugInRunnerModel::reloadPlugIn() -{ - try - { - CWaitCursor waitCursor; - m_history.clear(); - freeRootTest(); - setRootTest( m_plugIn->makeTest() ); - - loadHistory(); - } - catch (...) - { - setRootTest( new CPPUNIT_NS::TestSuite( "Default" ) ); - loadHistory(); - throw; - } -} - - -void -TestPlugInRunnerModel::freeRootTest() -{ - delete m_rootTest; - m_rootTest = 0; -} - - -void -TestPlugInRunnerModel::setRootTest( CPPUNIT_NS::Test *rootTest ) -{ - freeRootTest(); - TestRunnerModel::setRootTest( rootTest ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.h deleted file mode 100644 index 3b31cd8f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/TestPlugInRunnerModel.h +++ /dev/null @@ -1,54 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestPlugInRunnerModel.h for class TestPlugInRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/24 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTPLUGINRUNNERMODEL_H -#define TESTPLUGINRUNNERMODEL_H - -#include -class TestPlugIn; - - -/*! \class TestPlugInRunnerModel - * \brief This class represents a model for the plug in runner. - */ -class TestPlugInRunnerModel : public TestRunnerModel -{ -public: - /*! Constructs a TestPlugInRunnerModel object. - */ - TestPlugInRunnerModel(); - - /*! Destructor. - */ - virtual ~TestPlugInRunnerModel(); - - void setPlugIn( TestPlugIn *plugIn ); - - void reloadPlugIn(); - -public: // overridden from TestRunnerModel - void setRootTest( CPPUNIT_NS::Test *rootTest ); - -private: - /// Prevents the use of the copy constructor. - TestPlugInRunnerModel( const TestPlugInRunnerModel © ); - - /// Prevents the use of the copy operator. - void operator =( const TestPlugInRunnerModel © ); - - void freeRootTest(); - -private: - TestPlugIn *m_plugIn; -}; - - - -// Inlines methods for TestPlugInRunnerModel: -// ------------------------------------------ - - - -#endif // TESTPLUGINRUNNERMODEL_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.ico b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.ico deleted file mode 100644 index 4eafd8bb..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.ico and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.rc2 b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.rc2 deleted file mode 100644 index 0f08ced3..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/TestPlugInRunner.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// TESTPLUGINRUNNER.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/errortype.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/errortype.bmp deleted file mode 100644 index aa645bab..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/errortype.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/test_type.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/test_type.bmp deleted file mode 100644 index 63e7fa0f..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testpluginrunner/res/test_type.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/.cvsignore deleted file mode 100644 index c4170eac..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -*.Tags.WW -Debug DebugCrossplatform Release DebugNoTypeInfo ReleaseUnicode DebugUnicode -*.ncb *.opt *.aps *.clw -SunWS_cache -ir.out diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.cpp deleted file mode 100644 index 67da35d1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "stdafx.h" -#include "ActiveTest.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -// Construct the active test -ActiveTest::ActiveTest( CPPUNIT_NS::Test *test ) - : TestDecorator( test ) - , m_runCompleted() -{ - m_currentTestResult = NULL; - m_threadHandle = INVALID_HANDLE_VALUE; -} - - -// Pend until the test has completed -ActiveTest::~ActiveTest() -{ - CSingleLock( &m_runCompleted, TRUE ); - m_test = NULL; -} - - -// Set the test result that we are to run -void -ActiveTest::setTestResult( CPPUNIT_NS::TestResult *result ) -{ - m_currentTestResult = result; -} - - -// Run our test result -void -ActiveTest::run() -{ - TestDecorator::run( m_currentTestResult ); -} - - -// Spawn a thread to a test -void -ActiveTest::run( CPPUNIT_NS::TestResult *result ) -{ - CWinThread *thread; - - setTestResult( result ); - m_runCompleted.ResetEvent(); - - thread = ::AfxBeginThread( threadFunction, - this, - THREAD_PRIORITY_NORMAL, - 0, - CREATE_SUSPENDED); - - ::DuplicateHandle( GetCurrentProcess(), - thread->m_hThread, - GetCurrentProcess(), - &m_threadHandle, - 0, - FALSE, - DUPLICATE_SAME_ACCESS ); - - thread->ResumeThread (); -} - - -// Simple execution thread. Assuming that an ActiveTest instance -// only creates one of these at a time. -UINT -ActiveTest::threadFunction( LPVOID thisInstance ) -{ - ActiveTest *test = (ActiveTest *)thisInstance; - - test->run (); - - ::CloseHandle( test->m_threadHandle ); - test->m_threadHandle = INVALID_HANDLE_VALUE; - - test->m_runCompleted.SetEvent(); - - return 0; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.h deleted file mode 100644 index 809d6e6b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ActiveTest.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef CPPUNIT_ACTIVETEST_H -#define CPPUNIT_ACTIVETEST_H - -#include - -#ifndef CPPUNIT_TESTDECORATOR_H -#include -#endif - - -/* A Microsoft-specific active test - * - * An active test manages its own - * thread of execution. This one - * is very simple and only sufficient - * for the limited use we put it through - * in the TestRunner. It spawns a thread - * on run (TestResult *) and signals - * completion of the test. - * - * We assume that only one thread - * will be active at once for each - * instance. - * - */ - -class ActiveTest : public CPPUNIT_NS::TestDecorator -{ -public: - ActiveTest( CPPUNIT_NS::Test *test ); - ~ActiveTest(); - - void run( CPPUNIT_NS::TestResult *result ); - -protected: - HANDLE m_threadHandle; - CEvent m_runCompleted; - CPPUNIT_NS::TestResult *m_currentTestResult; - - void run(); - void setTestResult( CPPUNIT_NS::TestResult *result ); - static UINT threadFunction( LPVOID thisInstance ); -}; - -#endif - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt deleted file mode 100644 index 7fcdd3da..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt +++ /dev/null @@ -1,111 +0,0 @@ -Diary of making test runner DLL resource safe. - -Repeat everything, that was done for version 1.8.0. This is point 1) to 9). - -0) With the unit-tests for the test runner DLL all four tests fail with the original - version 1.9.8 of CPP-Unit. - -1) Replace the original integer dialog ids with new string ids - CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY - CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TESTRUNNER - Because these are not in resource.h VC++ interpretes these values - as string ids. - -2) TestRunnerDlg.cpp: - - Make a copy of the constructor and replace the integer id with a string id. - - Move the initialization code in the two constructors to the new private member - function init(). - - Put an ASSERT in the old constructor. - - Remove the enum IDD=IDD_DIALOG_TESTRUNNER from the resource.h and TestRunnerDlg.h - header files. Accordingly remove the default value nDialogResourceId in the - constructor, that uses the integer id. - -3) TreeHierarchyDlg.cpp: - - Replace the integer id in the call to the base class constructor with - the new string id. - - Remove the enum IDD=IDD_DIALOG_TEST_HIERARCHY from the resource.h and - TreeHierarchyDlg.h header file. - -4) Test. Two of the four tests still fail. The remaining errors result from - the conflicts in the string table. - -5) Since strings ids don't work for the string table I created the new function - loadCString to load the strings from the correct resource module which is of - course the test runner module. The new function is in the files - ResourceLoaders.[cpp|h] since I didn't find a good existing place. Baptiste, - if you know of a good existing place simply move the function and remove the - two new files. - -6) Check all occurences of the strings and replace the original string refernces - with the new function loadCString. - IDS_ERROR_SELECT_TEST - IDS_ERRORLIST_TYPE - IDS_ERRORLIST_NAME - IDS_ERRORLIST_FAILED_CONDITION - IDS_ERRORLIST_LINE_NUMBER - IDS_ERRORLIST_FILE_NAME - -7) Test. No more errors are found. - -8) Change the two bitmaps that are used in the list and the tree to use - string ids instead of integer ids. - - First changed the unit test so that the originally incorrect behaviour - is shown. Inserted red circles in the bitmaps in the unit test. - Then added the new test checkListBitmaps() and changed checkBrowseDlg() - to let the user visually check, if the correct bitmaps are used. - This has to be done by the user visually, because I couldn't think of - an automatic test, that could be implemented easily. - The last test for the correct bitmaps will ALWAYS fail, so that the - bitmaps can be checked visually. - - Changed the RC-file of the test runner DLL: - CPP_UNIT_TEST_RUNNER_IDB_TEST_TYPE - CPP_UNIT_TEST_RUNNER_IDB_ERROR_TYPE - Removed the original string ids from resource.h and changed TreeHierarchyDlg.cpp - and TestRunnerDlg.cpp so that the new string ids are used. - - -9) Changed the TestPlugInRunner. I don't know, how I can test this and would - ask you Baptiste to check it or let me know, how I can check it. - I did the following: - - Change the dialog id to the string id - CPP_UNIT_TEST_RUNNER_PLUG_IN_IDD_TEST_PLUG_IN_RUNNER - ^^^^^^^ => This is different from the string id used - in the test runner DLL! - - Removed the original integer id from resource.h and TestPlugInRunnerDlg.h. - - Changed the constructor in TestPlugInRunnerDlg.cpp to use the new string id. - - Replaced the integer id IDR_TEST_PLUGIN_RUNNER for the icon with the string - id CPP_UNIT_TEST_RUNNER_PLUG_IN_IDR_TEST_PLUGIN_RUNNER in the RC-file and in - the constructor TestPlugInRunnerDlg and removed the original id from resource.h. - - -Here start the changes, that were only needed for version 1.9.8. - -10) TestRunner is OK now. But I saw, that TestPlugInRunner has now more - resources than in version 1.8.0. After looking at it more carefully - it turned out that the sources of the test runner DLL have been - included in the test plug-in runner. In version 1.8.0 the test runner - was used through the testrunner.dll. This means that some additional - changes have to be made to the test plug-in runner. - - Additionally changed IDD_DIALOG_TEST_HIERARCHY to - CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY. This is the same - name as in the original test runner because the dialog is created - with the original code. I don't know how to check this, thus I'm - not sure wether this is OK. - - Replaced the ids for the bitmaps. Here the same applies as in the - previous point, I'm not sure, if it works. - - Include ResourceLoaders.cpp in the subproject - TestPlugInRunner/TestRunner-Was-In-Dll/UserInterface - - Removed the original #include "TestRunnerApp.h" in ResourceLoaders.cpp - and replaced it with - extern HINSTANCE g_testRunnerResource; - - Included - HINSTANCE g_testRunnerResource; - in TestPlugInRunnerApp.cpp and set the variable in InitInstance() with - g_testRunnerResource = AfxGetResourceHandle(); - - Replaced the integer id for the icon with a string id - m_hIcon = AfxGetApp()->LoadIcon("CPP_UNIT_TEST_RUNNER_PLUG_IN_IDR_TEST_PLUGIN_RUNNER"); - in the constructor in TestPlugInRunnerDlg.cpp and in the RC-file. - -11) FINISHED. - --- Steven Mitter \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.cpp deleted file mode 100644 index ea347dd0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.cpp +++ /dev/null @@ -1,1061 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998, 1999 by Cristi Posea -// All rights reserved -// -// Use and distribute freely, except: don't remove my name from the -// source or documentation (don't take credit for my work), mark your -// changes (don't get me blamed for your possible bugs), don't alter -// or remove this notice. -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// This class is intended to be used as a base class. Do not simply add -// your code to this file - instead create a new class derived from -// CSizingControlBar and put there what you need. -// Modify this file only to fix bugs, and don't forget to send me a copy. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., -// and I'll try to keep a version up to date. I can be reached at: -// cristip@dundas.com -// -// More details at MFC Programmer's SourceBook -// http://www.codeguru.com/docking/docking_window.shtml or search -// www.codeguru.com for my name if the article was moved. -// -///////////////////////////////////////////////////////////////////////// -// -// Acknowledgements: -// o Thanks to Harlan R. Seymour (harlans@dundas.com) for his continuous -// support during development of this code. -// o Thanks to Dundas Software for the opportunity to test this code -// on real-life applications. -// If you don't know who they are, visit them at www.dundas.com . -// Their award winning components and development suites are -// a pile of gold. -// o Thanks to Chris Maunder (chrism@dundas.com) who came with the -// simplest way to query "Show window content while dragging" system -// setting. -// o Thanks to Zafir Anjum (zafir@codeguru.com) for publishing this -// code on his cool site (www.codeguru.com). -// o Some ideas for the gripper came from the CToolBarEx flat toolbar -// by Joerg Koenig (Joerg.Koenig@rhein-neckar.de). Also he inspired -// me on writing this notice:) . Thanks, Joerg! -// o Thanks to Jakawan Ratiwanich (jack@alpha.fsec.ucf.edu) and to -// Udo Schaefer (Udo.Schaefer@vcase.de) for the dwStyle bug fix under -// VC++ 6.0. -// o And, of course, many thanks to all of you who used this code, -// for the invaluable feedback I received. -// -///////////////////////////////////////////////////////////////////////// - - -// sizecbar.cpp : implementation file -// - -#include "stdafx.h" -#include "sizecbar.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar - -CSCBArray CSizingControlBar::m_arrBars; // static member - -IMPLEMENT_DYNAMIC(CSizingControlBar, baseCSizingControlBar); - -CSizingControlBar::CSizingControlBar() -{ - m_szMin = CSize(33, 32); - m_szHorz = CSize(200, 200); - m_szVert = CSize(200, 200); - m_szFloat = CSize(200, 200); - m_bTracking = FALSE; - m_bKeepSize = FALSE; - m_bParentSizing = FALSE; - m_cxEdge = 5; - m_bDragShowContent = FALSE; - m_nDockBarID = 0; - m_dwSCBStyle = 0; -} - -CSizingControlBar::~CSizingControlBar() -{ -} - -BEGIN_MESSAGE_MAP(CSizingControlBar, baseCSizingControlBar) - //{{AFX_MSG_MAP(CSizingControlBar) - ON_WM_CREATE() - ON_WM_PAINT() - ON_WM_NCPAINT() - ON_WM_NCCALCSIZE() - ON_WM_WINDOWPOSCHANGING() - ON_WM_CAPTURECHANGED() - ON_WM_SETTINGCHANGE() - ON_WM_LBUTTONUP() - ON_WM_MOUSEMOVE() - ON_WM_NCLBUTTONDOWN() - ON_WM_LBUTTONDOWN() - ON_WM_LBUTTONDBLCLK() - ON_WM_RBUTTONDOWN() - ON_WM_NCLBUTTONUP() - ON_WM_NCMOUSEMOVE() - ON_WM_NCHITTEST() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -BOOL CSizingControlBar::Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, - UINT nID, DWORD dwStyle) -{ - // must have a parent - ASSERT_VALID(pParentWnd); - // cannot be both fixed and dynamic - // (CBRS_SIZE_DYNAMIC is used for resizng when floating) - ASSERT (!((dwStyle & CBRS_SIZE_FIXED) && - (dwStyle & CBRS_SIZE_DYNAMIC))); - - m_dwStyle = dwStyle & CBRS_ALL; // save the control bar styles - - m_szHorz = sizeDefault; // set the size members - m_szVert = sizeDefault; - m_szFloat = sizeDefault; - - m_cyGripper = bHasGripper ? 12 : 0; // set the gripper width - - // register and create the window - skip CControlBar::Create() - CString wndclass = ::AfxRegisterWndClass(CS_DBLCLKS, - ::LoadCursor(NULL, IDC_ARROW), - ::GetSysColorBrush(COLOR_BTNFACE), 0); - - dwStyle &= ~CBRS_ALL; // keep only the generic window styles - dwStyle |= WS_CLIPCHILDREN; // prevents flashing - if (!CWnd::Create(wndclass, lpszWindowName, dwStyle, - CRect(0, 0, 0, 0), pParentWnd, nID)) - return FALSE; - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar message handlers - -int CSizingControlBar::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (baseCSizingControlBar::OnCreate(lpCreateStruct) == -1) - return -1; - - // querry SPI_GETDRAGFULLWINDOWS system parameter - // OnSettingChange() will update m_bDragShowContent - m_bDragShowContent = FALSE; - ::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, - &m_bDragShowContent, 0); - - m_arrBars.Add(this); // register - -// m_dwSCBStyle |= SCBS_SHOWEDGES; - - return 0; -} - -BOOL CSizingControlBar::DestroyWindow() -{ - int nPos = FindSizingBar(this); - ASSERT(nPos >= 0); - - m_arrBars.RemoveAt(nPos); // unregister - - return baseCSizingControlBar::DestroyWindow(); -} - -const BOOL CSizingControlBar::IsFloating() const -{ - return !IsHorzDocked() && !IsVertDocked(); -} - -const BOOL CSizingControlBar::IsHorzDocked() const -{ - return (m_nDockBarID == AFX_IDW_DOCKBAR_TOP || - m_nDockBarID == AFX_IDW_DOCKBAR_BOTTOM); -} - -const BOOL CSizingControlBar::IsVertDocked() const -{ - return (m_nDockBarID == AFX_IDW_DOCKBAR_LEFT || - m_nDockBarID == AFX_IDW_DOCKBAR_RIGHT); -} - -const BOOL CSizingControlBar::IsSideTracking() const -{ - // don't call this when not tracking - ASSERT(m_bTracking && !IsFloating()); - - return (m_htEdge == HTLEFT || m_htEdge == HTRIGHT) ? - IsHorzDocked() : IsVertDocked(); -} - -CSize CSizingControlBar::CalcFixedLayout(BOOL bStretch, BOOL bHorz) -{ - if (bStretch) // the bar is stretched (is not the child of a dockbar) - if (bHorz) - return CSize(32767, m_szHorz.cy); - else - return CSize(m_szVert.cx, 32767); - - // dirty cast - using CSCBDockBar to access protected CDockBar members - CSCBDockBar* pDockBar = (CSCBDockBar*) m_pDockBar; - - // force imediate RecalcDelayShow() for all sizing bars on the row - // with delayShow/delayHide flags set to avoid IsVisible() problems - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - AFX_SIZEPARENTPARAMS layout; - layout.hDWP = pDockBar->m_bLayoutQuery ? - NULL : ::BeginDeferWindowPos(arrSCBars.GetSize()); - for (int i = 0; i < arrSCBars.GetSize(); i++) - arrSCBars[i]->RecalcDelayShow(&layout); - if (layout.hDWP != NULL) - ::EndDeferWindowPos(layout.hDWP); - - // get available length - CRect rc = pDockBar->m_rectLayout; - if (rc.IsRectEmpty()) - m_pDockSite->GetClientRect(&rc); - int nLengthAvail = bHorz ? rc.Width() + 2 : rc.Height() - 2; - - if (IsVisible() && !IsFloating() && - m_bParentSizing && arrSCBars[0] == this) - if (NegociateSpace(nLengthAvail, (bHorz != FALSE))) - AlignControlBars(); - - m_bParentSizing = FALSE; - - CSize szRet = bHorz ? m_szHorz : m_szVert; - szRet.cx = max(m_szMin.cx, szRet.cx); - szRet.cy = max(m_szMin.cy, szRet.cy); - - return szRet; -} - -CSize CSizingControlBar::CalcDynamicLayout(int nLength, DWORD dwMode) -{ - if (dwMode & (LM_HORZDOCK | LM_VERTDOCK)) // docked ? - { - if (nLength == -1) - m_bParentSizing = TRUE; - - return baseCSizingControlBar::CalcDynamicLayout(nLength, dwMode); - } - - if (dwMode & LM_MRUWIDTH) return m_szFloat; - if (dwMode & LM_COMMIT) return m_szFloat; // already committed - - ((dwMode & LM_LENGTHY) ? m_szFloat.cy : m_szFloat.cx) = nLength; - - m_szFloat.cx = max(m_szFloat.cx, m_szMin.cx); - m_szFloat.cy = max(m_szFloat.cy, m_szMin.cy); - - return m_szFloat; -} - -void CSizingControlBar::OnWindowPosChanging(WINDOWPOS FAR* lpwndpos) -{ - // force non-client recalc if moved or resized - lpwndpos->flags |= SWP_FRAMECHANGED; - - baseCSizingControlBar::OnWindowPosChanging(lpwndpos); - - // find on which side are we docked - UINT nOldDockBarID = m_nDockBarID; - m_nDockBarID = GetParent()->GetDlgCtrlID(); - - if (!IsFloating()) - if (lpwndpos->flags & SWP_SHOWWINDOW) - m_bKeepSize = TRUE; -} - -///////////////////////////////////////////////////////////////////////// -// Mouse Handling -// -void CSizingControlBar::OnLButtonDown(UINT nFlags, CPoint point) -{ - if (m_pDockBar != NULL) - { - // start the drag - ASSERT(m_pDockContext != NULL); - ClientToScreen(&point); - m_pDockContext->StartDrag(point); - } - else - CWnd::OnLButtonDown(nFlags, point); -} - -void CSizingControlBar::OnLButtonDblClk(UINT nFlags, CPoint point) -{ - if (m_pDockBar != NULL) - { - // toggle docking - ASSERT(m_pDockContext != NULL); - m_pDockContext->ToggleDocking(); - } - else - CWnd::OnLButtonDblClk(nFlags, point); -} - -void CSizingControlBar::OnNcLButtonDown(UINT nHitTest, CPoint point) -{ - if (IsFloating()) - { - baseCSizingControlBar::OnNcLButtonDown(nHitTest, point); - return; - } - - if (m_bTracking) return; - - if ((nHitTest >= HTSIZEFIRST) && (nHitTest <= HTSIZELAST)) - StartTracking(nHitTest); // sizing edge hit -} - -void CSizingControlBar::OnNcLButtonUp(UINT nHitTest, CPoint point) -{ - if (nHitTest == HTCLOSE) - m_pDockSite->ShowControlBar(this, FALSE, FALSE); // hide - - baseCSizingControlBar::OnNcLButtonUp(nHitTest, point); -} - -void CSizingControlBar::OnLButtonUp(UINT nFlags, CPoint point) -{ - if (m_bTracking) - StopTracking(); - - baseCSizingControlBar::OnLButtonUp(nFlags, point); -} - -void CSizingControlBar::OnRButtonDown(UINT nFlags, CPoint point) -{ - if (m_bTracking) - StopTracking(); - - baseCSizingControlBar::OnRButtonDown(nFlags, point); -} - -void CSizingControlBar::OnMouseMove(UINT nFlags, CPoint point) -{ - if (m_bTracking) - OnTrackUpdateSize(point); - - baseCSizingControlBar::OnMouseMove(nFlags, point); -} - -void CSizingControlBar::OnCaptureChanged(CWnd *pWnd) -{ - if (m_bTracking && (pWnd != this)) - StopTracking(); - - baseCSizingControlBar::OnCaptureChanged(pWnd); -} - -void CSizingControlBar::OnNcCalcSize(BOOL bCalcValidRects, - NCCALCSIZE_PARAMS FAR* lpncsp) -{ - // compute the the client area - CRect rcClient = lpncsp->rgrc[0]; - rcClient.DeflateRect(5, 5); - - m_dwSCBStyle &= ~SCBS_EDGEALL; - - switch(m_nDockBarID) - { - case AFX_IDW_DOCKBAR_TOP: - m_dwSCBStyle |= SCBS_EDGEBOTTOM; - rcClient.DeflateRect(m_cyGripper, 0, 0, 0); - break; - case AFX_IDW_DOCKBAR_BOTTOM: - m_dwSCBStyle |= SCBS_EDGETOP; - rcClient.DeflateRect(m_cyGripper, 0, 0, 0); - break; - case AFX_IDW_DOCKBAR_LEFT: - m_dwSCBStyle |= SCBS_EDGERIGHT; - rcClient.DeflateRect(0, m_cyGripper, 0, 0); - break; - case AFX_IDW_DOCKBAR_RIGHT: - m_dwSCBStyle |= SCBS_EDGELEFT; - rcClient.DeflateRect(0, m_cyGripper, 0, 0); - break; - default: - break; - } - - if (!IsFloating() && m_pDockBar != NULL) - { - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - - for (int i = 0; i < arrSCBars.GetSize(); i++) - if (arrSCBars[i] == this) - { - if (i > 0) - m_dwSCBStyle |= IsHorzDocked() ? - SCBS_EDGELEFT : SCBS_EDGETOP; - if (i < arrSCBars.GetSize() - 1) - m_dwSCBStyle |= IsHorzDocked() ? - SCBS_EDGERIGHT : SCBS_EDGEBOTTOM; - } - } - - // make room for edges only if they will be painted - if (m_dwSCBStyle & SCBS_SHOWEDGES) - rcClient.DeflateRect( - (m_dwSCBStyle & SCBS_EDGELEFT) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGETOP) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGERIGHT) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGEBOTTOM) ? m_cxEdge : 0); - - // "hide" button positioning - CPoint ptOrgBtn; - if (IsHorzDocked()) - ptOrgBtn = CPoint(rcClient.left - m_cyGripper - 1, - rcClient.top - 1); - else - ptOrgBtn = CPoint(rcClient.right - 11, - rcClient.top - m_cyGripper - 1); - - m_biHide.Move(ptOrgBtn - CRect(lpncsp->rgrc[0]).TopLeft()); - - lpncsp->rgrc[0] = rcClient; -} - -void CSizingControlBar::OnNcPaint() -{ - // get window DC that is clipped to the non-client area - CWindowDC dc(this); - - CRect rcClient, rcBar; - GetClientRect(rcClient); - ClientToScreen(rcClient); - GetWindowRect(rcBar); - rcClient.OffsetRect(-rcBar.TopLeft()); - rcBar.OffsetRect(-rcBar.TopLeft()); - - // client area is not our bussiness :) - dc.ExcludeClipRect(rcClient); - - // draw borders in non-client area - CRect rcDraw = rcBar; - DrawBorders(&dc, rcDraw); - - // erase parts not drawn - dc.IntersectClipRect(rcDraw); - - // erase NC background the hard way - HBRUSH hbr = (HBRUSH)GetClassLong(m_hWnd, GCL_HBRBACKGROUND); - ::FillRect(dc.m_hDC, rcDraw, hbr); - - if (m_dwSCBStyle & SCBS_SHOWEDGES) - { - CRect rcEdge; // paint the sizing edges - for (int i = 0; i < 4; i++) - if (GetEdgeRect(rcBar, GetEdgeHTCode(i), rcEdge)) - dc.Draw3dRect(rcEdge, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - } - - if (m_cyGripper && !IsFloating()) - NcPaintGripper(&dc, rcClient); - - ReleaseDC(&dc); -} - -void CSizingControlBar::NcPaintGripper(CDC* pDC, CRect rcClient) -{ - // paints a simple "two raised lines" gripper - // override this if you want a more sophisticated gripper - CRect gripper = rcClient; - CRect rcbtn = m_biHide.GetRect(); - BOOL bHorz = IsHorzDocked(); - - gripper.DeflateRect(1, 1); - if (bHorz) - { // gripper at left - gripper.left -= m_cyGripper; - gripper.right = gripper.left + 3; - gripper.top = rcbtn.bottom + 3; - } - else - { // gripper at top - gripper.top -= m_cyGripper; - gripper.bottom = gripper.top + 3; - gripper.right = rcbtn.left - 3; - } - - pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - gripper.OffsetRect(bHorz ? 3 : 0, bHorz ? 0 : 3); - - pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - m_biHide.Paint(pDC); -} - -void CSizingControlBar::OnPaint() -{ - // overridden to skip border painting based on clientrect - CPaintDC dc(this); -} - -UINT CSizingControlBar::OnNcHitTest(CPoint point) -{ - if (IsFloating()) - return baseCSizingControlBar::OnNcHitTest(point); - - CRect rcBar, rcEdge; - GetWindowRect(rcBar); - - for (int i = 0; i < 4; i++) - if (GetEdgeRect(rcBar, GetEdgeHTCode(i), rcEdge)) - if (rcEdge.PtInRect(point)) return GetEdgeHTCode(i); - - CRect rc = m_biHide.GetRect(); - rc.OffsetRect(rcBar.TopLeft()); - if (rc.PtInRect(point)) - return HTCLOSE; - - return HTCLIENT; -} - -void CSizingControlBar::OnSettingChange(UINT uFlags, LPCTSTR lpszSection) -{ - baseCSizingControlBar::OnSettingChange(uFlags, lpszSection); - - m_bDragShowContent = FALSE; - ::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, - &m_bDragShowContent, 0); // update -} - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar implementation helpers - -void CSizingControlBar::StartTracking(UINT nHitTest) -{ - SetCapture(); - - // make sure no updates are pending - RedrawWindow(NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); - - BOOL bHorz = IsHorzDocked(); - - m_szOld = bHorz ? m_szHorz : m_szVert; - - CRect rc; - GetWindowRect(&rc); - CRect rcEdge; - VERIFY(GetEdgeRect(rc, nHitTest, rcEdge)); - m_ptOld = rcEdge.CenterPoint(); - - m_htEdge = nHitTest; - m_bTracking = TRUE; - - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - - // compute the minsize as the max minsize of the sizing bars on row - m_szMinT = m_szMin; - for (int i = 0; i < arrSCBars.GetSize(); i++) - if (bHorz) - m_szMinT.cy = max(m_szMinT.cy, arrSCBars[i]->m_szMin.cy); - else - m_szMinT.cx = max(m_szMinT.cx, arrSCBars[i]->m_szMin.cx); - - if (!IsSideTracking()) - { - // the control bar cannot grow with more than the size of - // remaining client area of the mainframe - m_pDockSite->RepositionBars(0, 0xFFFF, AFX_IDW_PANE_FIRST, - reposQuery, &rc, NULL, TRUE); - m_szMaxT = m_szOld + rc.Size() - CSize(4, 4); - } - else - { - // side tracking: max size is the actual size plus the amount - // the neighbour bar can be decreased to reach its minsize - for (int i = 0; i < arrSCBars.GetSize(); i++) - if (arrSCBars[i] == this) break; - - CSizingControlBar* pBar = arrSCBars[i + - ((m_htEdge == HTTOP || m_htEdge == HTLEFT) ? -1 : 1)]; - - m_szMaxT = m_szOld + (bHorz ? pBar->m_szHorz : - pBar->m_szVert) - pBar->m_szMin; - } - - OnTrackInvertTracker(); // draw tracker -} - -void CSizingControlBar::StopTracking() -{ - OnTrackInvertTracker(); // erase tracker - - m_bTracking = FALSE; - ReleaseCapture(); - - m_pDockSite->DelayRecalcLayout(); -} - -void CSizingControlBar::OnTrackUpdateSize(CPoint& point) -{ - ASSERT(!IsFloating()); - - CPoint pt = point; - ClientToScreen(&pt); - CSize szDelta = pt - m_ptOld; - - CSize sizeNew = m_szOld; - switch (m_htEdge) - { - case HTLEFT: sizeNew -= CSize(szDelta.cx, 0); break; - case HTTOP: sizeNew -= CSize(0, szDelta.cy); break; - case HTRIGHT: sizeNew += CSize(szDelta.cx, 0); break; - case HTBOTTOM: sizeNew += CSize(0, szDelta.cy); break; - } - - // enforce the limits - sizeNew.cx = max(m_szMinT.cx, min(m_szMaxT.cx, sizeNew.cx)); - sizeNew.cy = max(m_szMinT.cy, min(m_szMaxT.cy, sizeNew.cy)); - - BOOL bHorz = IsHorzDocked(); - szDelta = sizeNew - (bHorz ? m_szHorz : m_szVert); - - if (szDelta == CSize(0, 0)) return; // no size change - - OnTrackInvertTracker(); // erase tracker - - (bHorz ? m_szHorz : m_szVert) = sizeNew; // save the new size - - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - - for (int i = 0; i < arrSCBars.GetSize(); i++) - if (!IsSideTracking()) - { // track simultaneously - CSizingControlBar* pBar = arrSCBars[i]; - (bHorz ? pBar->m_szHorz.cy : pBar->m_szVert.cx) = - bHorz ? sizeNew.cy : sizeNew.cx; - } - else - { // adjust the neighbour's size too - if (arrSCBars[i] != this) continue; - - CSizingControlBar* pBar = arrSCBars[i + - ((m_htEdge == HTTOP || m_htEdge == HTLEFT) ? -1 : 1)]; - - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) -= - bHorz ? szDelta.cx : szDelta.cy; - } - - OnTrackInvertTracker(); // redraw tracker at new pos - - if (m_bDragShowContent) - m_pDockSite->DelayRecalcLayout(); -} - -void CSizingControlBar::OnTrackInvertTracker() -{ - ASSERT(m_bTracking); - - if (m_bDragShowContent) - return; // don't show tracker if DragFullWindows is on - - BOOL bHorz = IsHorzDocked(); - CRect rc, rcBar, rcDock, rcFrame; - GetWindowRect(rcBar); - m_pDockBar->GetWindowRect(rcDock); - m_pDockSite->GetWindowRect(rcFrame); - VERIFY(GetEdgeRect(rcBar, m_htEdge, rc)); - if (!IsSideTracking()) - rc = bHorz ? - CRect(rcDock.left + 1, rc.top, rcDock.right - 1, rc.bottom) : - CRect(rc.left, rcDock.top + 1, rc.right, rcDock.bottom - 1); - - rc.OffsetRect(-rcFrame.TopLeft()); - - CSize sizeNew = bHorz ? m_szHorz : m_szVert; - CSize sizeDelta = sizeNew - m_szOld; - if (m_nDockBarID == AFX_IDW_DOCKBAR_LEFT && m_htEdge == HTTOP || - m_nDockBarID == AFX_IDW_DOCKBAR_RIGHT && m_htEdge != HTBOTTOM || - m_nDockBarID == AFX_IDW_DOCKBAR_TOP && m_htEdge == HTLEFT || - m_nDockBarID == AFX_IDW_DOCKBAR_BOTTOM && m_htEdge != HTRIGHT) - sizeDelta = -sizeDelta; - rc.OffsetRect(sizeDelta); - - CDC *pDC = m_pDockSite->GetDCEx(NULL, - DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE); - CBrush* pBrush = CDC::GetHalftoneBrush(); - CBrush* pBrushOld = pDC->SelectObject(pBrush); - - pDC->PatBlt(rc.left, rc.top, rc.Width(), rc.Height(), PATINVERT); - - pDC->SelectObject(pBrushOld); - m_pDockSite->ReleaseDC(pDC); -} - -BOOL CSizingControlBar::GetEdgeRect(CRect rcWnd, UINT nHitTest, - CRect& rcEdge) -{ - rcEdge = rcWnd; - if (m_dwSCBStyle & SCBS_SHOWEDGES) - rcEdge.DeflateRect(1, 1); - BOOL bHorz = IsHorzDocked(); - - switch (nHitTest) - { - case HTLEFT: - if (!(m_dwSCBStyle & SCBS_EDGELEFT)) return FALSE; - rcEdge.right = rcEdge.left + m_cxEdge; - rcEdge.DeflateRect(0, bHorz ? m_cxEdge: 0); - break; - case HTTOP: - if (!(m_dwSCBStyle & SCBS_EDGETOP)) return FALSE; - rcEdge.bottom = rcEdge.top + m_cxEdge; - rcEdge.DeflateRect(bHorz ? 0 : m_cxEdge, 0); - break; - case HTRIGHT: - if (!(m_dwSCBStyle & SCBS_EDGERIGHT)) return FALSE; - rcEdge.left = rcEdge.right - m_cxEdge; - rcEdge.DeflateRect(0, bHorz ? m_cxEdge: 0); - break; - case HTBOTTOM: - if (!(m_dwSCBStyle & SCBS_EDGEBOTTOM)) return FALSE; - rcEdge.top = rcEdge.bottom - m_cxEdge; - rcEdge.DeflateRect(bHorz ? 0 : m_cxEdge, 0); - break; - default: - ASSERT(FALSE); // invalid hit test code - } - return TRUE; -} - -UINT CSizingControlBar::GetEdgeHTCode(int nEdge) -{ - if (nEdge == 0) return HTLEFT; - if (nEdge == 1) return HTTOP; - if (nEdge == 2) return HTRIGHT; - if (nEdge == 3) return HTBOTTOM; - ASSERT(FALSE); // invalid edge no - return HTNOWHERE; -} - -void CSizingControlBar::GetRowInfo(int& nFirst, int& nLast, int& nThis) -{ - ASSERT_VALID(m_pDockBar); // verify bounds - - nThis = m_pDockBar->FindBar(this); - ASSERT(nThis != -1); - - int i, nBars = m_pDockBar->m_arrBars.GetSize(); - - // find the first and the last bar in row - for (nFirst = -1, i = nThis - 1; i >= 0 && nFirst == -1; i--) - if (m_pDockBar->m_arrBars[i] == NULL) - nFirst = i + 1; - for (nLast = -1, i = nThis + 1; i < nBars && nLast == -1; i++) - if (m_pDockBar->m_arrBars[i] == NULL) - nLast = i - 1; - - ASSERT((nLast != -1) && (nFirst != -1)); -} - -void CSizingControlBar::GetRowSizingBars(CSCBArray& arrSCBars) -{ - arrSCBars.RemoveAll(); - - int nFirst, nLast, nThis; - GetRowInfo(nFirst, nLast, nThis); - - for (int i = nFirst; i <= nLast; i++) - { - CControlBar* pBar = (CControlBar*)m_pDockBar->m_arrBars[i]; - if (HIWORD(pBar) == 0) continue; // placeholder - if (!pBar->IsVisible()) continue; - if (FindSizingBar(pBar) >= 0) - arrSCBars.Add((CSizingControlBar*)pBar); - } -} - -const int CSizingControlBar::FindSizingBar(CControlBar* pBar) const -{ - for (int nPos = 0; nPos < m_arrBars.GetSize(); nPos++) - if (m_arrBars[nPos] == pBar) - return nPos; // got it - - return -1; // not found -} - -BOOL CSizingControlBar::NegociateSpace(int nLengthAvail, BOOL bHorz) -{ - ASSERT(bHorz == IsHorzDocked()); - - int nFirst, nLast, nThis; - GetRowInfo(nFirst, nLast, nThis); - - // step 1: subtract the visible fixed bars' lengths - for (int i = nFirst; i <= nLast; i++) - { - CControlBar* pFBar = (CControlBar*)m_pDockBar->m_arrBars[i]; - if (HIWORD(pFBar) == 0) continue; // placeholder - if (!pFBar->IsVisible() || (FindSizingBar(pFBar) >= 0)) continue; - - CRect rcBar; - pFBar->GetWindowRect(&rcBar); - - nLengthAvail -= (bHorz ? rcBar.Width() - 2 : rcBar.Height() - 2); - } - - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - CSizingControlBar* pBar; - - // step 2: compute actual and min lengths; also the common width - int nActualLength = 0; - int nMinLength = 2; - int nWidth = 0; - for (i = 0; i < arrSCBars.GetSize(); i++) - { - pBar = arrSCBars[i]; - nActualLength += bHorz ? pBar->m_szHorz.cx - 2 : - pBar->m_szVert.cy - 2; - nMinLength += bHorz ? pBar->m_szMin.cx - 2: - pBar->m_szMin.cy - 2; - nWidth = max(nWidth, bHorz ? pBar->m_szHorz.cy : - pBar->m_szVert.cx); - } - - // step 3: pop the bar out of the row if not enough room - if (nMinLength > nLengthAvail) - { - if (nFirst < nThis || nThis < nLast) - { // not enough room - create a new row - m_pDockBar->m_arrBars.InsertAt(nLast + 1, this); - m_pDockBar->m_arrBars.InsertAt(nLast + 1, (CControlBar*) NULL); - m_pDockBar->m_arrBars.RemoveAt(nThis); - } - return FALSE; - } - - // step 4: make the bars same width - for (i = 0; i < arrSCBars.GetSize(); i++) - if (bHorz) - arrSCBars[i]->m_szHorz.cy = nWidth; - else - arrSCBars[i]->m_szVert.cx = nWidth; - - if (nActualLength == nLengthAvail) - return TRUE; // no change - - // step 5: distribute the difference between the bars, but - // don't shrink them below minsize - int nDelta = nLengthAvail - nActualLength; - - while (nDelta != 0) - { - int nDeltaOld = nDelta; - for (i = 0; i < arrSCBars.GetSize(); i++) - { - pBar = arrSCBars[i]; - int nLMin = bHorz ? pBar->m_szMin.cx : pBar->m_szMin.cy; - int nL = bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy; - - if ((nL == nLMin) && (nDelta < 0) || // already at min length - pBar->m_bKeepSize) // or wants to keep its size - continue; - - // sign of nDelta - int nDelta2 = (nDelta == 0) ? 0 : ((nDelta < 0) ? -1 : 1); - - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) += nDelta2; - nDelta -= nDelta2; - if (nDelta == 0) break; - } - // clear m_bKeepSize flags - if ((nDeltaOld == nDelta) || (nDelta == 0)) - for (i = 0; i < arrSCBars.GetSize(); i++) - arrSCBars[i]->m_bKeepSize = FALSE; - } - - return TRUE; -} - -void CSizingControlBar::AlignControlBars() -{ - int nFirst, nLast, nThis; - GetRowInfo(nFirst, nLast, nThis); - - BOOL bHorz = IsHorzDocked(); - BOOL bNeedRecalc = FALSE; - int nPos, nAlign = bHorz ? -2 : 0; - - CRect rc, rcDock; - m_pDockBar->GetWindowRect(&rcDock); - - for (int i = nFirst; i <= nLast; i++) - { - CControlBar* pBar = (CControlBar*)m_pDockBar->m_arrBars[i]; - if (HIWORD(pBar) == 0) continue; // placeholder - if (!pBar->IsVisible()) continue; - - pBar->GetWindowRect(&rc); - rc.OffsetRect(-rcDock.TopLeft()); - - if ((nPos = FindSizingBar(pBar)) >= 0) - rc = CRect(rc.TopLeft(), bHorz ? - m_arrBars[nPos]->m_szHorz : m_arrBars[nPos]->m_szVert); - - if ((bHorz ? rc.left : rc.top) != nAlign) - { - if (!bHorz) - rc.OffsetRect(0, nAlign - rc.top - 2); - else if (m_nDockBarID == AFX_IDW_DOCKBAR_TOP) - rc.OffsetRect(nAlign - rc.left, -2); - else - rc.OffsetRect(nAlign - rc.left, 0); - pBar->MoveWindow(rc); - bNeedRecalc = TRUE; - } - nAlign += (bHorz ? rc.Width() : rc.Height()) - 2; - } - - if (bNeedRecalc) - { - m_pDockSite->DelayRecalcLayout(); - TRACE("ccc\n"); - } -} - -void CSizingControlBar::OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) -{ - BOOL bNeedPaint = FALSE; - - CPoint pt; - ::GetCursorPos(&pt); - BOOL bHit = (OnNcHitTest(pt) == HTCLOSE); - BOOL bLButtonDown = (::GetKeyState(VK_LBUTTON) < 0); - - BOOL bWasPushed = m_biHide.bPushed; - m_biHide.bPushed = bHit && bLButtonDown; - - BOOL bWasRaised = m_biHide.bRaised; - m_biHide.bRaised = bHit && !bLButtonDown; - - bNeedPaint |= (m_biHide.bPushed ^ bWasPushed) || - (m_biHide.bRaised ^ bWasRaised); - - if (bNeedPaint) - SendMessage(WM_NCPAINT); -} - -void CSizingControlBar::LoadState(LPCTSTR lpszProfileName) -{ - ASSERT_VALID(this); - ASSERT(GetSafeHwnd()); // must be called after Create() - - CWinApp* pApp = AfxGetApp(); - - TCHAR szSection[256]; - wsprintf(szSection, _T("%s-SCBar-%d"), lpszProfileName, - GetDlgCtrlID()); - - m_szHorz.cx = max(m_szMin.cx, (int) pApp->GetProfileInt(szSection, - _T("sizeHorzCX"), m_szHorz.cx)); - m_szHorz.cy = max(m_szMin.cy, (int) pApp->GetProfileInt(szSection, - _T("sizeHorzCY"), m_szHorz.cy)); - - m_szVert.cx = max(m_szMin.cx, (int) pApp->GetProfileInt(szSection, - _T("sizeVertCX"), m_szVert.cx)); - m_szVert.cy = max(m_szMin.cy, (int) pApp->GetProfileInt(szSection, - _T("sizeVertCY"), m_szVert.cy)); - - m_szFloat.cx = max(m_szMin.cx, (int) pApp->GetProfileInt(szSection, - _T("sizeFloatCX"), m_szFloat.cx)); - m_szFloat.cy = max(m_szMin.cy, (int) pApp->GetProfileInt(szSection, - _T("sizeFloatCY"), m_szFloat.cy)); -} - -void CSizingControlBar::SaveState(LPCTSTR lpszProfileName) -{ - // place your SaveState or GlobalSaveState call in - // CMainFrame::DestroyWindow(), not in OnDestroy() - ASSERT_VALID(this); - ASSERT(GetSafeHwnd()); - - CWinApp* pApp = AfxGetApp(); - - TCHAR szSection[256]; - wsprintf(szSection, _T("%s-SCBar-%d"), lpszProfileName, - GetDlgCtrlID()); - - pApp->WriteProfileInt(szSection, _T("sizeHorzCX"), m_szHorz.cx); - pApp->WriteProfileInt(szSection, _T("sizeHorzCY"), m_szHorz.cy); - - pApp->WriteProfileInt(szSection, _T("sizeVertCX"), m_szVert.cx); - pApp->WriteProfileInt(szSection, _T("sizeVertCY"), m_szVert.cy); - - pApp->WriteProfileInt(szSection, _T("sizeFloatCX"), m_szFloat.cx); - pApp->WriteProfileInt(szSection, _T("sizeFloatCY"), m_szFloat.cy); -} - -void CSizingControlBar::GlobalLoadState(LPCTSTR lpszProfileName) -{ - for (int i = 0; i < m_arrBars.GetSize(); i++) - ((CSizingControlBar*) m_arrBars[i])->LoadState(lpszProfileName); -} - -void CSizingControlBar::GlobalSaveState(LPCTSTR lpszProfileName) -{ - for (int i = 0; i < m_arrBars.GetSize(); i++) - ((CSizingControlBar*) m_arrBars[i])->SaveState(lpszProfileName); -} - -///////////////////////////////////////////////////////////////////////// -// CSCBButton - -CSCBButton::CSCBButton() -{ - bRaised = FALSE; - bPushed = FALSE; -} - -void CSCBButton::Paint(CDC* pDC) -{ - CRect rc = GetRect(); - - if (bPushed) - pDC->Draw3dRect(rc, ::GetSysColor(COLOR_BTNSHADOW), - ::GetSysColor(COLOR_BTNHIGHLIGHT)); - else - if (bRaised) - pDC->Draw3dRect(rc, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - COLORREF clrOldTextColor = pDC->GetTextColor(); - pDC->SetTextColor(::GetSysColor(COLOR_BTNTEXT)); - int nPrevBkMode = pDC->SetBkMode(TRANSPARENT); - CFont font; - int ppi = pDC->GetDeviceCaps(LOGPIXELSX); - int pointsize = MulDiv(60, 96, ppi); // 6 points at 96 ppi - font.CreatePointFont(pointsize, _T("Marlett")); - CFont* oldfont = pDC->SelectObject(&font); - - pDC->TextOut(ptOrg.x + 2, ptOrg.y + 2, CString(_T("r"))); // x-like - - pDC->SelectObject(oldfont); - pDC->SetBkMode(nPrevBkMode); - pDC->SetTextColor(clrOldTextColor); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.h deleted file mode 100644 index 8d23a429..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.h +++ /dev/null @@ -1,195 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998, 1999 by Cristi Posea -// All rights reserved -// -// Use and distribute freely, except: don't remove my name from the -// source or documentation (don't take credit for my work), mark your -// changes (don't get me blamed for your possible bugs), don't alter -// or remove this notice. -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// This class is intended to be used as a base class. Do not simply add -// your code to this file - instead create a new class derived from -// CSizingControlBar and put there what you need. -// Modify this file only to fix bugs, and don't forget to send me a copy. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., -// and I'll try to keep a version up to date. I can be reached at: -// cristip@dundas.com -// -// More details at MFC Programmer's SourceBook -// http://www.codeguru.com/docking/docking_window.shtml or search -// www.codeguru.com for my name if the article was moved. -// -///////////////////////////////////////////////////////////////////////// - -#if !defined(__SIZECBAR_H__) -#define __SIZECBAR_H__ - -#include // for CDockContext -#include // for CArray - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -///////////////////////////////////////////////////////////////////////// -// CSCBButton (button info) helper class - -class CSCBButton -{ -public: - CSCBButton(); - - void Move(CPoint ptTo) {ptOrg = ptTo; }; - CRect GetRect() { return CRect(ptOrg, CSize(11, 11)); }; - void Paint(CDC* pDC); - - BOOL bPushed; - BOOL bRaised; - -protected: - CPoint ptOrg; -}; - -///////////////////////////////////////////////////////////////////////// -// CSCBDockBar dummy class for access to protected members - -class CSCBDockBar : public CDockBar -{ - friend class CSizingControlBar; -}; - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar control bar styles - -#define SCBS_EDGELEFT 0x00000001 -#define SCBS_EDGERIGHT 0x00000002 -#define SCBS_EDGETOP 0x00000004 -#define SCBS_EDGEBOTTOM 0x00000008 -#define SCBS_EDGEALL 0x0000000F -#define SCBS_SHOWEDGES 0x00000010 -#define SCBS_GRIPPER 0x00000020 - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar control bar - -#ifndef baseCSizingControlBar -#define baseCSizingControlBar CControlBar -#endif - -class CSizingControlBar; -typedef CTypedPtrArray CSCBArray; - -class CSizingControlBar : public baseCSizingControlBar -{ - DECLARE_DYNAMIC(CSizingControlBar); - -// Construction -protected: - CSizingControlBar(); - -public: - virtual BOOL Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, UINT nID, - DWORD dwStyle = WS_CHILD | WS_VISIBLE | CBRS_TOP); - -// Attributes -public: - CSize m_szHorz; - CSize m_szVert; - CSize m_szFloat; - const BOOL IsFloating() const; - const BOOL IsHorzDocked() const; - const BOOL IsVertDocked() const; - const BOOL IsSideTracking() const; - -// Operations -public: - virtual void LoadState(LPCTSTR lpszProfileName); - virtual void SaveState(LPCTSTR lpszProfileName); - static void GlobalLoadState(LPCTSTR lpszProfileName); - static void GlobalSaveState(LPCTSTR lpszProfileName); - -// Overridables - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler); - -// Overrides -public: - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSizingControlBar) - public: - virtual CSize CalcFixedLayout(BOOL bStretch, BOOL bHorz); - virtual CSize CalcDynamicLayout(int nLength, DWORD dwMode); - virtual BOOL DestroyWindow(); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CSizingControlBar(); - -protected: - // implementation helpers - UINT GetEdgeHTCode(int nEdge); - BOOL GetEdgeRect(CRect rcWnd, UINT nHitTest, CRect& rcEdge); - virtual void StartTracking(UINT nHitTest); - virtual void StopTracking(); - virtual void OnTrackUpdateSize(CPoint& point); - virtual void OnTrackInvertTracker(); - virtual void NcPaintGripper(CDC* pDC, CRect rcClient); - - virtual void AlignControlBars(); - const int FindSizingBar(CControlBar* pBar) const; - void GetRowInfo(int& nFirst, int& nLast, int& nThis); - void GetRowSizingBars(CSCBArray& arrSCBars); - BOOL NegociateSpace(int nLengthAvail, BOOL bHorz); - -protected: - static CSCBArray m_arrBars; - - DWORD m_dwSCBStyle; - UINT m_htEdge; - - CSize m_szMin; - CSize m_szMinT; - CSize m_szMaxT; - CSize m_szOld; - CPoint m_ptOld; - BOOL m_bTracking; - BOOL m_bKeepSize; - BOOL m_bParentSizing; - BOOL m_bDragShowContent; - UINT m_nDockBarID; - int m_cxEdge; - int m_cyGripper; - - CSCBButton m_biHide; - -// Generated message map functions -protected: - //{{AFX_MSG(CSizingControlBar) - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnNcPaint(); - afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp); - afx_msg UINT OnNcHitTest(CPoint point); - afx_msg void OnCaptureChanged(CWnd *pWnd); - afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection); - afx_msg void OnLButtonUp(UINT nFlags, CPoint point); - afx_msg void OnMouseMove(UINT nFlags, CPoint point); - afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point); - afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point); - afx_msg void OnRButtonDown(UINT nFlags, CPoint point); - afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point); - afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); - afx_msg void OnPaint(); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() -}; - -#endif // !defined(__SIZECBAR_H__) - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.html b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.html deleted file mode 100644 index 11585840..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/SizeCBar.html +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - The Code Project - CSizingControlBar - a resizable control bar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

CSizingControlBar - a resizable control bar

-

Cristi Posea

-

DevStudio-like docking window 

-

-Newsletter | -Forums | -Search | -Latest Updates | -Submit an Article | -Win a Prize! -

-		 -

-Level:    Advanced
-Posted:   17 Nov 1999
-Updated: 12 Jan 2000
-

-
Platform:
VC++ 5.0-6.0, NT 4.0, Win95/98/2k
-
Keywords:
GUI, MFC, docking
-
- -
Home - ->> Toolbars & Docking Windows - ->> General - -Problems? Suggestions? -Email us
-
- - - -

Features of CSizingControlBar 2.31

- -
    -
  • Resizable control bar, that can be resized both when docked and when floating. -
  • Multiple sizing control bars can be docked on the same row/column. -
  • Full dynamic resizing, both when docked and floating, including diagonal resizing when floating. -
  • State persistence support (SaveState/LoadState). -
  • Gripper with "hide bar" flat button. -
  • Memory DC flickerless NC painting. -
  • Sample extension class with focus autosensing text caption. On Win98/Win2k, the caption is painted with gradient. -
  • No custom resources were used (bitmaps, cursors, strings, etc.), so the integration is easier and you have full control over the resources you eventually use in derived classes. -
  • Easy to use: just derive your own control bar(s) from CSizingControlBar then add your child controls. -
- -

Instructions

-

Derive a class from CSizingControlBar (you have an example in mybar.h and mybar.cpp).
-Add a member variable to CMainFrame (in mainfrm.h). - -

-CMyBar m_wndMyBar;
-
- -

Create the bar in CMainFrame::OnCreate(). Then set bar styles, enable it to dock... like any control bar. -

Some experience in working with control bars (like toolbars) is required. - -

-if (!m_wndMyBar.Create(_T("My Bar"), this, CSize(200, 100),
-    TRUE /*bHasGripper*/, AFX_IDW_CONTROLBAR_FIRST + 32))
-{
-    TRACE0("Failed to create mybar\n");
-    return -1;
-    // fail to create
-}
-m_wndMyBar.SetBarStyle(m_wndMyBar.GetBarStyle() |
-    CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
-m_wndMyBar.EnableDocking(CBRS_ALIGN_ANY);
-EnableDocking(CBRS_ALIGN_ANY);
-
-m_pFloatingFrameClass = RUNTIME_CLASS(CSCBMiniDockFrameWnd);
-
-DockControlBar(&m_wndMyBar, AFX_IDW_DOCKBAR_LEFT);
-
- -Note: Starting with version 2.3, the line - -
-m_pFloatingFrameClass = RUNTIME_CLASS(CSCBMiniDockFrameWnd);
-
- -must be added to CMainFrame::OnCreate(), after the EnableDocking() call. This is required! - -

Plugging in the CSizingControlBarCF class

- -

1. Add scbarcf.h and scbarcf.cpp to your project. -

2. In your derived class header file change the "#include "sizecbar.h" to "#include "scbarcf.h". -

3. Replace the base class for your custom bar from CSizingControlBar to CSizingControlBarCF. If you used the baseCMyBar trick, you only have to change a line. Otherwise, replace all occurences of CSizingControlBar with CSizingControlBarCF in your derived class. -

4. Rebuild and run. Easy, huh? - -

Remarks

-

This class is intended to be used as a base class. -Do not simply add your code to the sizecbar.* files - instead create a new class derived from CSizingControlBar and put there what you need. - -

Window IDs: You can see above that the control bar is created with the ID AFX_IDW_CONTROLBAR_FIRST + 32. -The usage of IDs in the range of AFX_IDW_CONTROLBAR_FIRST + 32 .. AFX_IDW_CONTROLBAR_LAST is required only if the bar will not be enabled for docking (that's is - it will stay fixed right under the frame's menu). -But in this situation you won't be able to fully use the features of this class, so if you will enable it to dock (a reasonable guess :) then you can use any valid window ID.
-Another place where the IDs are important is the saving/loading of the bar's state. -You must use different IDs for each control bar that is enabled to dock, and this includes the other bars too. -For example, if you have two toolbars, you can create the first one with the default ID (which is AFX_IDW_TOOLBAR = AFX_IDW_CONTROLBAR_FIRST), but the second one must have a different ID. - -

OnUpdateCmdUI: This member function is pure virtual in CControlBar (the base class of CSizingControlBar). -Its purpose is to allow updating of controls at idle time (from here CCmdUI::DoUpdate() is called for the toolbars' buttons, dialogbars' controls, the panes of status bar, etc.).
-However, I found it very useful to update the look of the "x" flat button (no timers needed). -So, if you will use this function, don't forget to call the base class' member (see mybar.cpp). - -

Dynamic resizing: This feature allows redrawing of the bar during resizing. -Also all the bars are repositioned and redrawn if necessary.
-The SPI_GETDRAGFULLWINDOWS system parameter is queried for this (it is enabled by the "Show window contents while dragging" checkbox in Display Properties). - -

CBRS_SIZE_DYNAMIC: This bar style is required. Make sure you add it to the bar, otherwise the application will crash when the user floats a bar. You can add it using SetBarStyle() after Create(), or by changing the default style for Create() to something like: WS_VISIBLE | WS_CHILD | CBRS_TOP | CBRS_SIZE_DYNAMIC. - -

State persistence: The common MFC control bars' docking state is saved using CMainFrame::SaveBarState(). In addition to the info saved by this function, the CSizingControlBar class needs to save 3 sizes. This is done in CSizingControlBar::SaveState() function, so a m_wndMyBar.SaveState() call is required. Please note that the state storing code must be placed in CMainFrame's OnClose() or DestroyWindow(), not in OnDestroy(), because at the time WM_DESTROY message is received, the floating bars are already destroyed.
-In CMainFrame::OnCreate(), the m_wndMyBar.LoadState() call must be placed before LoadBarState().
-Alternatively, if you have multiple CSizingControlBar derived bars, you can call once the static member SizingControlBar::GlobalSaveState() instead of calling each bar's SaveState(). The same for LoadState() - there is a CSizingControlBar::GlobalLoadState() function. See both samples here for more details. - -

See also www.datamekanix.com for a full changelog, FAQ, a dedicated message board and more. - - -

- - - - - - - - - -
-
Home - >> Toolbars & Docking Windows -
last updated 12 Jan 2000
 -
Copyright © CodeProject, 1999-2000.
All rights reserved
- 		-
webmaster@codeproject.com
-
- - \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.cpp deleted file mode 100644 index edebbd45..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.cpp +++ /dev/null @@ -1,184 +0,0 @@ -// cdxCDynamicBar.cpp : implementation file -// - -#include "stdafx.h" -#include "cdxCDynamicBar.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBarDlg dialog -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCDynamicBarDlg,cdxCDynamicChildDlg); - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBarDlg dialog -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCDynamicBarDlg, cdxCDynamicChildDlg) - ON_WM_CLOSE() -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBarDlg functions -///////////////////////////////////////////////////////////////////////////// - -bool cdxCDynamicBarDlg::Create(cdxCDynamicBar *pBar) -{ - return cdxCDynamicChildDlg::Create(m_nID,(CWnd *)pBar) != FALSE; -} - - - - - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBar -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCDynamicBar,CSizingControlBar); - -///////////////////////////////////////////////////////////////////////////// -// construction -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCDynamicBar, CSizingControlBar) - //{{AFX_MSG_MAP(cdxCDynamicBar) - ON_WM_SIZING() - ON_WM_SIZE() - ON_WM_NCCALCSIZE() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBar message handlers -///////////////////////////////////////////////////////////////////////////// - -/* - * create bar & dialog - */ - -BOOL cdxCDynamicBar::Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, UINT nID, - DWORD dwStyle) -{ - if(!( CSizingControlBar::Create( lpszWindowName, - pParentWnd, - sizeDefault, - bHasGripper, - nID, - dwStyle|WS_CLIPCHILDREN) )) - { - ASSERT(false); - return FALSE; - } - - if(!( m_rDlg.Create(this) )) - { - DestroyWindow(); - ASSERT(false); - return FALSE; - } - - ASSERT(::IsWindow(m_hWnd)); - ASSERT(m_rDlg.IsWindow()); - ASSERT(!m_rectBorder.IsRectNull()); - - // the following code will even be provided by - m_szMin.cx = m_rectBorder.left + m_rectBorder.right; - m_szMin.cy = m_rectBorder.top + m_rectBorder.bottom; - m_szMin += m_rDlg.m_szMin; - - return TRUE; -} - -/* - * route command UI updates to dialog - */ - -void cdxCDynamicBar::OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) -{ - CSizingControlBar::OnUpdateCmdUI(pTarget,bDisableIfNoHndler); - if(m_rDlg.IsWindow()) - m_rDlg.OnUpdateCmdUI(pTarget,bDisableIfNoHndler); -} - -/* - * when sizing starts, we'll force the super-duper anti-flickering mode : - */ - -void cdxCDynamicBar::OnSizing(UINT fwSide, LPRECT pRect) -{ - CSizingControlBar::OnSizing(fwSide, pRect); - m_rDlg.StartAntiFlickering((fwSide == WMSZ_BOTTOM) || - (fwSide == WMSZ_BOTTOMRIGHT) || - (fwSide == WMSZ_RIGHT)); -} - -/* - * let my dialog cover the entire area - */ - -void cdxCDynamicBar::OnSize(UINT nType, int cx, int cy) -{ - CSizingControlBar::OnSize(nType, cx, cy); - if(::IsWindow(m_hWnd) && m_rDlg.IsWindow() && (nType != SIZE_MINIMIZED)) - { - m_rDlg.SetWindowPos( NULL,0,0,cx,cy, SWP_NOACTIVATE| - SWP_NOOWNERZORDER| - SWP_NOZORDER); - - } -} - -/* - * OnNcCalcSize() is used to calculate the optimum - * min size for the dialog. - */ - -void cdxCDynamicBar::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp) -{ - m_rectBorder = lpncsp->rgrc[0]; // load initial rectangle - - CSizingControlBar::OnNcCalcSize(bCalcValidRects, lpncsp); - - ASSERT(m_rectBorder.left <= lpncsp->rgrc[0].left); - ASSERT(m_rectBorder.top <= lpncsp->rgrc[0].top); - ASSERT(m_rectBorder.right >= lpncsp->rgrc[0].right); - ASSERT(m_rectBorder.bottom >= lpncsp->rgrc[0].bottom); - - m_rectBorder.left = lpncsp->rgrc[0].left - m_rectBorder.left; - m_rectBorder.top = lpncsp->rgrc[0].top - m_rectBorder.top; - m_rectBorder.right = m_rectBorder.right - lpncsp->rgrc[0].right; - m_rectBorder.bottom = m_rectBorder.bottom - lpncsp->rgrc[0].bottom; - m_szMin = m_rDlg.m_szMin; - m_szMin.cx += m_rectBorder.left + m_rectBorder.right; - m_szMin.cy += m_rectBorder.top + m_rectBorder.bottom; -} - -/* - * route commands a long... - */ - -BOOL cdxCDynamicBar::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo) -{ - if(m_rDlg.IsWindow() && m_rDlg.OnCmdMsg(nID, nCode, pExtra, pHandlerInfo)) - return TRUE; - return CSizingControlBar::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo); -} - -/* - * route commands ... - */ - -BOOL cdxCDynamicBar::OnCommand(WPARAM wParam, LPARAM lParam) -{ - if(m_rDlg.IsWindow() && m_rDlg.OnCommand(wParam, lParam)) - return TRUE; - return CSizingControlBar::OnCommand(wParam, lParam); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.h deleted file mode 100644 index 5a9e924d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.h +++ /dev/null @@ -1,168 +0,0 @@ -#if !defined(AFX_CDXCDYNAMICBAR_H__910C28F6_6854_11D3_803A_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICBAR_H__910C28F6_6854_11D3_803A_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// cdxCDynamicBar.h : header file -// - -#include "SizeCBar.h" -#include "cdxCDynamicDialog.h" - -/* - * cdxCDynamicDlgBarT - * ================== - * A resizable dialog bar. - * The entire bar stuff is handled using - * CSizingControlBar by Cristi Posea - * http://www.codeguru.com/docking/docking_window2.shtml - * titled "Resizable Docking Window 2". - * To use it, the following steps must be performed: - * - * a) Create a new dialog say - * CMyBarDlg - * - * b) Change its base class from CDialog to cdxCDynamicBarDlg. - * - * c) In your mainframe, add a member variable - * cdxCDynamicDlgBarT m_wndMyBar; - * - * e) Add the following code to your CMainFrame::OnCreate() - * - * if (!m_wndMyBar.Create(_T("My Bar"), this, CSize(200, 100), - * TRUE, AFX_IDW_CONTROLBAR_FIRST + 32)) - * { - * TRACE0("Failed to create mybar\n"); - * return -1; // fail to create - * } - * - * m_wndMyBar.SetBarStyle(m_wndMyBar.GetBarStyle() | - * CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - * - * m_wndMyBar.EnableDocking(CBRS_ALIGN_ANY); - * EnableDocking(CBRS_ALIGN_ANY); // <---- needed only once for the frame - * DockControlBar(&m_wndMyBar, AFX_IDW_DOCKBAR_LEFT); - * - * f) Refer to URL stated above to learn more about the features of the - * CSizingControlBar class. - */ - -/* - * cdxCDynamicBarDlg - * ================= - * The child dialog. - */ - -class cdxCDynamicBarDlg : public cdxCDynamicChildDlg -{ - DECLARE_DYNAMIC(cdxCDynamicBarDlg); - - friend class cdxCDynamicBar; - -public: - const UINT m_nID; - -public: - cdxCDynamicBarDlg(UINT idd, CWnd *pParent = NULL) : m_nID(idd), cdxCDynamicChildDlg(idd,pParent) { } - virtual ~cdxCDynamicBarDlg() {} - - // - // Create() without parameters :) - // - - virtual bool Create(cdxCDynamicBar *pBar); - - // - // this handler might be used to update things - // -protected: - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) { UpdateDialogControls(pTarget,bDisableIfNoHndler); } - - // - // this catches OnOK, OnCancel and OnClose - // to protect the dialog from being closed accidentially - // -protected: - virtual void OnOK() {} - virtual void OnCancel() {} - afx_msg void OnClose() { OnCancel(); } - - DECLARE_MESSAGE_MAP(); -}; - -/* - * cdxCDynamicBar - * ============== - * The bar. - */ - -class cdxCDynamicBar : public CSizingControlBar -{ - DECLARE_DYNAMIC(cdxCDynamicBar); - -private: - cdxCDynamicBarDlg & m_rDlg; - CRect m_rectBorder; - -public: - cdxCDynamicBar(cdxCDynamicBarDlg & rDlg) : m_rDlg(rDlg), m_rectBorder(0,0,0,0) {} - virtual ~cdxCDynamicBar() {} - -// Attributes -public: - virtual BOOL Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, UINT nID, - DWORD dwStyle = WS_CHILD | WS_VISIBLE | CBRS_TOP); - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(cdxCDynamicBar) - public: - virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo); - protected: - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); - //}}AFX_VIRTUAL - -// Implementation -protected: - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler); - - // Generated message map functions -protected: - //{{AFX_MSG(cdxCDynamicBar) - afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp); - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); -}; - -/* - * cdxCDynamicBarT - * =============== - * A nice template class, makes life easier :) - */ - -template -class cdxCDynamicBarT : public cdxCDynamicBar -{ -public: - DLG m_wndDlg; - -public: - cdxCDynamicBarT() : m_wndDlg(), cdxCDynamicBar(m_wndDlg) {} - virtual ~cdxCDynamicBarT() { m_wndDlg.DestroyWindow(); cdxCDynamicBar::DestroyWindow(); } -}; - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicBarDlg inlines -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CDXCDYNAMICBAR_H__910C28F6_6854_11D3_803A_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.cpp deleted file mode 100644 index b3334e97..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.cpp +++ /dev/null @@ -1,779 +0,0 @@ -// cdxCDynamicControlsManager.cpp: implementation of the cdxCDynamicControlsManager class. -// -////////////////////////////////////////////////////////////////////// - -/* - * you should define OEMRESOURCE - * in your project settings (C/C++, General) ! - */ - -#include "stdafx.h" -#include "cdxCDynamicControlsManager.h" - -#include -#include - -#ifndef OBM_SIZE -#define OBM_SIZE 32766 -#pragma message("*** NOTE: cdxCDynamicControlsManager.cpp: Please define OEMRESOURCE in your project settings !") -// taken from WinresRc.h -// if not used for any reason -#endif - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// Some static variables -///////////////////////////////////////////////////////////////////////////// - -#define REGVAL_NOSTATE -1 -#define REGVAL_VISIBLE 1 -#define REGVAL_HIDDEN 0 -#define REGVAL_MAXIMIZED 1 -#define REGVAL_ICONIC 0 -#define REGVAL_INVALID 0 -#define REGVAL_VALID 1 - -/* - * registry value names - * (for StoreWindowPosition()/RestoreWindowPosition()) - */ - -static LPCTSTR lpszRegVal_Left = _T("Left"), - lpszRegVal_Right = _T("Right"), - lpszRegVal_Top = _T("Top"), - lpszRegVal_Bottom = _T("Bottom"), - lpszRegVal_Visible = _T("Visibility"), - lpszRegVal_State = _T("State"), - lpszRegVal_Valid = _T("(valid)"); - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::ControlData::ControlEntry -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// construction/destruction -///////////////////////////////////////////////////////////////////////////// - -cdxCDynamicControlsManager::ControlData::ControlEntry::ControlEntry(CWnd & ctrl, ControlData & rMaster) -: m_rMaster(rMaster), m_rCtrl(ctrl) -{ - if(m_pNext = rMaster.m_pCtrl) - m_pNext->m_pPrev = this; - rMaster.m_pCtrl = this; - m_pPrev = NULL; - - // raise total counter - ++rMaster.m_rMaster.m_iTotalCnt; -} - -cdxCDynamicControlsManager::ControlData::ControlEntry::~ControlEntry() -{ - if(m_pPrev) - { - if(m_pPrev->m_pNext = m_pNext) - m_pNext->m_pPrev = m_pPrev; - } - else - { - ASSERT( m_rMaster.m_pCtrl == this ); - if(m_rMaster.m_pCtrl = m_pNext) - m_pNext->m_pPrev = NULL; - } - - // lower - ASSERT( m_rMaster.m_rMaster.m_iTotalCnt > 0 ); - ++m_rMaster.m_rMaster.m_iTotalCnt; -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::ControlData -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// construction/destruction -///////////////////////////////////////////////////////////////////////////// - -/* - * constructor - * copies all paramaters and gets the controls initial position using - * GetWindowPos(). - * - * NOTE that the constructor need ctrl.m_hWnd to exist (in contrast to - * Add() - */ - -cdxCDynamicControlsManager::ControlData::ControlData(cdxCDynamicControlsManager & rMaster, CWnd & ctrl, const PositionSetup & rPosSetup) -: m_rMaster(rMaster), m_pCtrl(NULL), - m_pNext(NULL), m_pPrev(NULL), - m_posSetup(rPosSetup) -{ - ASSERT(::IsWindow(ctrl.m_hWnd)); // control must have already been created ! - ASSERT(rPosSetup.IsValid()); - - // - // get initial values - // - - WINDOWPLACEMENT wpl; - VERIFY( ctrl.GetWindowPlacement(&wpl) ); - - m_rectOriginal = wpl.rcNormalPosition; - - // - // remember control - // - - new ControlEntry(ctrl,*this); - ASSERT(m_pCtrl != NULL); - - // - // link us to the cdxCDynamicControlsManager's list - // - - if(m_pNext = m_rMaster.m_pFirst) - m_pNext->m_pPrev = this; - m_pPrev = NULL; - m_rMaster.m_pFirst = this; -} - -/* - * detach from list - * The m_Ctrl deletes all children by itself - */ - -cdxCDynamicControlsManager::ControlData::~ControlData() -{ - // - // delete all control references - // - - while(m_pCtrl) - delete m_pCtrl; - - // - // unlink from list - // - - if(m_pPrev) - { - if(m_pPrev->m_pNext = m_pNext) - m_pNext->m_pPrev = m_pPrev; - } - else - { - ASSERT(m_rMaster.m_pFirst == this); - if(m_rMaster.m_pFirst = m_pNext) - m_pNext->m_pPrev = NULL; - } -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::ControlData virtuals -///////////////////////////////////////////////////////////////////////////// - -/* - * checks whether the CWnd is part of this control data - */ - -bool cdxCDynamicControlsManager::ControlData::IsMember(CWnd & ctrl) const -{ - for(const ControlEntry *pEntry = m_pCtrl; pEntry; pEntry = pEntry->GetNext()) - if(*pEntry == ctrl) - return true; - - return false; -} - -/* - * removes a CWnd from this chain - */ - -bool cdxCDynamicControlsManager::ControlData::Rem(CWnd & ctrl) -{ - for(ControlEntry *pEntry = m_pCtrl; pEntry; pEntry = pEntry->GetNext()) - if(*pEntry == ctrl) - { - delete pEntry; - return true; - } - - return false; -} - -/* - * Get current position - */ - -CRect cdxCDynamicControlsManager::ControlData::GetCurrentPosition() const -{ - if(!IsUsed()) - { - ASSERT(false); // all sub-controls have been deleted - return CRect(0,0,0,0); - } - - WINDOWPLACEMENT wpl; - VERIFY( m_pCtrl->GetCWnd().GetWindowPlacement(&wpl) ); - return CRect(wpl.rcNormalPosition); -} - -/* - * modify initial setup - * NOTE: this function does not move the controls. - * You habe to call cdxCDynamicControlsManager::ReorganizeControls past - * using this function - */ - -bool cdxCDynamicControlsManager::ControlData::Modify(const CRect & rectOriginal, const PositionSetup & rSetup) -{ - if((rectOriginal.left > rectOriginal.right) || - (rectOriginal.top > rectOriginal.bottom) || - !rSetup.IsValid()) - { - ASSERT(false); // bad function call - return false; - } - - m_rectOriginal = rectOriginal; - m_posSetup = rSetup; - return true; -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// handling events from CWnd -///////////////////////////////////////////////////////////////////////////// - -/* - * this function initializes the following members: - * m_pWnd - the window handle - * m_szCurrent - the current window's size - * m_szMin - the minimum window's size (taken from current size) - * m_szMax - the maximum window's size (set to (0,0) <=> don't change maximum) - * m_wndSizeIcon - the icon (if wanted) - * - * parameters: - * rWnd - the window to supervise - * fd - in which directions can we size the window (does only apply to user-sizing) - * bSizeIcon - do you want a sizable icon ? - * pBaseClientSize- if non-zero, this defines the real (normal) size of the - * window relative to all furher calculations will be made. - * if zero, the current window's size will be taken. - */ - -void cdxCDynamicControlsManager::DoInitWindow(CWnd & rWnd, Freedom fd, bool bSizeIcon, const CSize * pBaseClientSize) -{ - ASSERT(m_pWnd == NULL); // you MUST NOT call this function twice ! - ASSERT(::IsWindow(rWnd.m_hWnd)); // rWnd MUST already exist !! - - m_pWnd = &rWnd; - m_Freedom = fd; - - // - // get current's window size - // - - CRect rect; - m_pWnd->GetWindowRect(&rect); - CRect rectClient; - m_pWnd->GetClientRect(&rectClient); - - if(!pBaseClientSize) - { - m_szClientRelative.cx = rectClient.Width(); - m_szClientRelative.cy = rectClient.Height(); - - m_szMin.cx = rect.Width(); - m_szMin.cy = rect.Height(); - } - else - { - ASSERT((pBaseClientSize->cx > 0) && (pBaseClientSize->cy > 0)); - - m_szClientRelative = *pBaseClientSize; - m_szMin.cx = m_szClientRelative.cx + (rect.Width() - rectClient.Width()); - m_szMin.cy = m_szClientRelative.cy + (rect.Height() - rectClient.Height()); - } - - m_szMax.cx = 0; - m_szMax.cy = 0; - - // - // set up icon if wanted - // - - if(bSizeIcon) - { - VERIFY( m_pWndSizeIcon = new cdxCSizeIconCtrl ); - VERIFY( m_pWndSizeIcon->Create(m_pWnd,m_idSizeIcon) ); // creates my control; id is SIZE_CONTROL_ID - - AddSzControl(*m_pWndSizeIcon,mdRepos,mdRepos); - m_pWndSizeIcon->ShowWindow(SW_SHOW); // finally - show it - } -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * fill in MINMAXINFO as requested - * Call your CWnd's OnGetMinMaxInfo first ! - * - * changed due to a but report by Michel Wassink - */ - -void cdxCDynamicControlsManager::DoOnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - if(IsReady() && !IsDisabled()) - { - lpMMI->ptMinTrackSize.x = m_szMin.cx; - lpMMI->ptMinTrackSize.y = m_szMin.cy; - - if(m_Freedom & fdHoriz) - { - if(m_szMax.cx) - lpMMI->ptMaxTrackSize.x = m_szMax.cx; - } - else - lpMMI->ptMaxTrackSize.x = m_szMin.cx; - - if(m_Freedom & fdVert) - { - if(m_szMax.cy) - lpMMI->ptMaxTrackSize.y = m_szMax.cy; - } - else - lpMMI->ptMaxTrackSize.y = m_szMin.cy; - } -} - -/* - * handle OnSize - we can't rely on cx,cy being client dimensions - * as stated in the documentation ... - */ - -void cdxCDynamicControlsManager::DoOnSize(UINT nType, int cx, int cy) -{ - if(IsReady() && (nType != SIZE_MINIMIZED) && !IsDisabled()) - ReorganizeControls(true); -} - -/* - * free all memory - * after having called this function, you can reuse the object - * although I wouldn't recommend to do so :) - */ - -void cdxCDynamicControlsManager::DoDestroyWindow() -{ - while(m_pFirst) - { - OnDeleteControlPosition(*m_pFirst); - delete m_pFirst; - } - - if(m_pWndSizeIcon) - { - if(::IsWindow(m_pWndSizeIcon->m_hWnd)) - m_pWndSizeIcon->DestroyWindow(); - delete m_pWndSizeIcon; - m_pWndSizeIcon = NULL; - } - - m_pWnd = NULL; -} - -///////////////////////////////////////////////////////////////////////////// -// control positioning -///////////////////////////////////////////////////////////////////////////// - -/* - * Reposition (without current rectangle size) - * - * rectWin - window rectangle (including border) - * rectClient - window rectangle (client area) - * Note that since release 6, rectClient.left and .top might be > zero - * (for scrolling) - * bRedraw - invalidate & update window - */ - -void cdxCDynamicControlsManager::ReorganizeControlsAdvanced(const CRect & rectWin, CRect rectClient, bool bRedraw) -{ - ASSERT(IsReady()); - - if(!GetTotalChildCnt()) - return; - - // - // we won't go smaller with the whole window than - // m_szMin - // - - if(rectWin.Width() < m_szMin.cx) - rectClient.right += (m_szMin.cx - rectWin.Width()); - if(rectWin.Height() < m_szMin.cy) - rectClient.bottom += (m_szMin.cy - rectWin.Height()); - - // - // we new replace all controls - // - - CSize szDelta; - szDelta.cx = rectClient.Width() - m_szClientRelative.cx; - szDelta.cy = rectClient.Height() - m_szClientRelative.cy; - - CPoint pntOffset = rectClient.TopLeft(); - - // newly added code by Rodger Bernstein - - AFX_SIZEPARENTPARAMS layout; - ControlData *sz; - bool bManual = true; - - if(!( layout.hDWP = ::BeginDeferWindowPos(GetTotalChildCnt()) )) - { - TRACE(_T("*** ERROR[cdxCDynamicControlsManager::ReorganizeControlsAdvanced()]: BeginDeferWindowPos() failed.\n")); - } - else - { - for(sz = m_pFirst; sz; sz = sz->GetNext()) - sz->OnSize(szDelta, &layout, &pntOffset); - - if(!::EndDeferWindowPos(layout.hDWP)) - { - TRACE(_T("*** ERROR[cdxCDynamicControlsManager::ReorganizeControlsAdvanced()]: EndDeferWindowPos() failed.\n")); - } - else - bManual = false; - } - - if(bManual) - for(sz = m_pFirst; sz; sz = sz->GetNext()) - sz->OnSize(szDelta, NULL); - - if(bRedraw && m_pWnd->IsWindowVisible()) - { - m_pWnd->RedrawWindow(NULL, NULL, RDW_UPDATENOW | RDW_NOERASE); - } -} - -///////////////////////////////////////////////////////////////////////////// -// misc -///////////////////////////////////////////////////////////////////////////// - -/* - * change minimum and maximum height of window. - * - * szMin - new minimum size (use GetMinSize() to leave it as being before) - * szMax - new maximum size ( " GetMaxSize() ") - * Set to CSize(0,0) if you don't want a maximum size. - * bResizeIfNecessary - call FixWindowSize() past calculating new sizes. - * - * returns false if szMin and szMax are illegal (e.g. szMin > szMax) - */ - -bool cdxCDynamicControlsManager::SetMinMaxSize(const CSize & szMin, const CSize & szMax, bool bResizeIfNecessary) -{ - ASSERT(IsReady()); // DoInitWindow() not called ? - - if((szMax.cx && (szMin.cx > szMax.cx)) || - (szMax.cy && (szMin.cy > szMax.cy))) - { - return false; - } - - m_szMin = szMin; - m_szMax = szMax; - - if(bResizeIfNecessary) - FixWindowSize(); - - return true; -} - -/* - * this function ensure that the window's size is between m_szMin and m_szMax. - * returns true if window size has been changed - */ - -bool cdxCDynamicControlsManager::FixWindowSize() -{ - ASSERT(IsReady()); // use DoInitWindow() first ! - - CSize szCurrent = GetWindowSize(*m_pWnd), - szDelta; - - if(m_szMax.cx && (szCurrent.cx > m_szMax.cx)) - szDelta.cx = m_szMax.cx - szCurrent.cx; // is negative - else - if(szCurrent.cx < m_szMin.cx) - szDelta.cx = m_szMin.cx - szCurrent.cx; // is positive - else - szDelta.cx = 0; - - if(m_szMax.cy && (szCurrent.cy > m_szMax.cy)) - szDelta.cy = m_szMax.cy - szCurrent.cy; // is negative - else - if(szCurrent.cy < m_szMin.cy) - szDelta.cy = m_szMin.cy - szCurrent.cy; // is positive - else - szDelta.cy = 0; - - if(!szDelta.cx && !szDelta.cy) - return false; // nothing to do - - StretchWindow(*m_pWnd,szDelta); - return true; -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * hide and show icon - */ - -void cdxCDynamicControlsManager::HideSizeIcon() -{ - if(m_pWndSizeIcon && ::IsWindow(m_pWndSizeIcon->m_hWnd)) - m_pWndSizeIcon->ShowWindow(SW_HIDE); -} - -void cdxCDynamicControlsManager::ShowSizeIcon() -{ - if(m_pWndSizeIcon && ::IsWindow(m_pWndSizeIcon->m_hWnd)) - m_pWndSizeIcon->ShowWindow(SW_SHOW); -} - -///////////////////////////////////////////////////////////////////////////// -// static functions: window sizing -///////////////////////////////////////////////////////////////////////////// - -/* - * stretches the window by szDelta (i.e. if szDelta is 100, the window is enlarged by 100 pixels) - * stretching means that the center point of the window remains - * - * returns false if the window would be smaller than (1,1) - * - * NOTE: this function does NOT care of the min/max dimensions of a window - * Use MoveWindow() if you need to take care of it. - * - * STATIC - */ - -bool cdxCDynamicControlsManager::StretchWindow(CWnd & rWnd, const CSize & szDelta) -{ - ASSERT(::IsWindow(rWnd.m_hWnd)); - - WINDOWPLACEMENT wpl; - rWnd.GetWindowPlacement(&wpl); - - wpl.rcNormalPosition.left -= szDelta.cx / 2; - wpl.rcNormalPosition.right += (szDelta.cx + 1) / 2; - wpl.rcNormalPosition.top -= szDelta.cy / 2; - wpl.rcNormalPosition.bottom += (szDelta.cy + 1) / 2; -// wpl.flags = SW_SHOWNA|SW_SHOWNOACTIVATE; - - if((wpl.rcNormalPosition.left >= wpl.rcNormalPosition.right) || - (wpl.rcNormalPosition.top >= wpl.rcNormalPosition.bottom)) - return false; - - VERIFY( rWnd.SetWindowPos( NULL, - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.top, - wpl.rcNormalPosition.right - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.bottom - wpl.rcNormalPosition.top, - SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER) ); - - return true; -} - -/* - * stretch window by a percent value - * the algorithm calculates the new size for both dimensions by: - * - * newWid = oldWid + (oldWid * iAddPcnt) / 100 - * - * NOTE: iAddPcnt may even be nagtive, but it MUST be greater than -100. - * NOTE: this function does NOT care of the min/max dimensions of a window - * - * The function will return false if the new size would be empty. - * - * STATIC - */ - -bool cdxCDynamicControlsManager::StretchWindow(CWnd & rWnd, int iAddPcnt) -{ - ASSERT(::IsWindow(rWnd.m_hWnd)); - - CSize szDelta = GetWindowSize(rWnd); - - szDelta.cx = (szDelta.cx * iAddPcnt) / 100; - szDelta.cy = (szDelta.cy * iAddPcnt) / 100; - - return StretchWindow(rWnd,szDelta); -} - -/* - * get current window's size - * - * STATIC - */ - -CSize cdxCDynamicControlsManager::GetWindowSize(CWnd & rWnd) -{ - ASSERT(::IsWindow(rWnd.m_hWnd)); - - CRect rect; - rWnd.GetWindowRect(&rect); - return CSize(rect.Width(),rect.Height()); -} - -///////////////////////////////////////////////////////////////////////////// -// static functions: window & registry -///////////////////////////////////////////////////////////////////////////// - -/* - * stores a window's position and visiblity to the registry. - * - * return false if any error occured - * - * STATIC - */ - -bool cdxCDynamicControlsManager::StoreWindowPosition(CWnd & rWnd, LPCTSTR lpszProfile) -{ - ASSERT(::IsWindow(rWnd.m_hWnd) && lpszProfile && *lpszProfile); - // can't use an empty profile section string; see CWinApp::GetProfileInt() for further information - - WINDOWPLACEMENT wpl; - VERIFY( rWnd.GetWindowPlacement(&wpl) ); - BOOL bVisible = rWnd.IsWindowVisible(); - int iState = REGVAL_NOSTATE; - - if(rWnd.IsIconic()) - iState = REGVAL_ICONIC; - else - if(rWnd.IsZoomed()) - iState = REGVAL_MAXIMIZED; - - return AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Valid, REGVAL_INVALID) && // invalidate first - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Left, wpl.rcNormalPosition.left) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Right, wpl.rcNormalPosition.right) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Top, wpl.rcNormalPosition.top) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Bottom, wpl.rcNormalPosition.bottom) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Visible, bVisible ? REGVAL_VISIBLE : REGVAL_HIDDEN) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_State, iState) && - AfxGetApp()->WriteProfileInt(lpszProfile, lpszRegVal_Valid, REGVAL_VALID); // validate position -} - -/* - * load the registry data stored by StoreWindowPosition() - * returns true if data have been found in the registry - * - * STATIC - */ - -bool cdxCDynamicControlsManager::RestoreWindowPosition(CWnd & rWnd, LPCTSTR lpszProfile, UINT restoreFlags) -{ - ASSERT(::IsWindow(rWnd.m_hWnd) && lpszProfile && *lpszProfile); - // can't use an empty profile section string; see CWinApp::GetProfileInt() for further information - - // - // first, we check whether the position had been saved successful any time before - // - - if( AfxGetApp()->GetProfileInt(lpszProfile,lpszRegVal_Valid,REGVAL_INVALID) != REGVAL_VALID ) - return false; - - // - // get old position - // - - WINDOWPLACEMENT wpl; - VERIFY( rWnd.GetWindowPlacement(&wpl) ); - - // - // read registry - // - - int iState = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_State, REGVAL_NOSTATE); - - // - // get window's previous normal position - // - - wpl.rcNormalPosition.left = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_Left, wpl.rcNormalPosition.left); - wpl.rcNormalPosition.right = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_Right, wpl.rcNormalPosition.right); - wpl.rcNormalPosition.top = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_Top, wpl.rcNormalPosition.top); - wpl.rcNormalPosition.bottom = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_Bottom, wpl.rcNormalPosition.bottom); - - if(wpl.rcNormalPosition.left > wpl.rcNormalPosition.right) - { - long l = wpl.rcNormalPosition.right; - wpl.rcNormalPosition.right = wpl.rcNormalPosition.left; - wpl.rcNormalPosition.left = l; - } - if(wpl.rcNormalPosition.top > wpl.rcNormalPosition.bottom) - { - long l = wpl.rcNormalPosition.bottom; - wpl.rcNormalPosition.bottom = wpl.rcNormalPosition.top; - wpl.rcNormalPosition.top = l; - } - - // - // get restore stuff - // - - UINT showCmd = SW_SHOWNA; - - if(restoreFlags & rflg_state) - { - if(iState == REGVAL_MAXIMIZED) - showCmd = SW_MAXIMIZE; - else - if(iState == REGVAL_ICONIC) - showCmd = SW_MINIMIZE; - } - - // - // use MoveWindow() which takes care of WM_GETMINMAXINFO - // - - rWnd.MoveWindow( wpl.rcNormalPosition.left,wpl.rcNormalPosition.top, - wpl.rcNormalPosition.right - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.bottom - wpl.rcNormalPosition.top, - showCmd == SW_SHOWNA); - - if(showCmd != SW_SHOWNA) - { - // read updated position - - VERIFY( rWnd.GetWindowPlacement(&wpl) ); - wpl.showCmd = showCmd; - rWnd.SetWindowPlacement(&wpl); - } - - // - // get visiblity - // - - if(restoreFlags & rflg_visibility) - { - int i = AfxGetApp()->GetProfileInt(lpszProfile, lpszRegVal_Visible, REGVAL_NOSTATE); - if(i == REGVAL_VISIBLE) - rWnd.ShowWindow(SW_SHOW); - else - if(i == REGVAL_HIDDEN) - rWnd.ShowWindow(SW_HIDE); - } - - return true; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.h deleted file mode 100644 index c8bb3e90..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.h +++ /dev/null @@ -1,615 +0,0 @@ -// cdxCDynamicControlsManager.h: interface for the cdxCDynamicControlsManager class. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_CDXCDYNAMICCONTROLSMANAGER_H__6517AE13_5D12_11D2_BE4C_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICCONTROLSMANAGER_H__6517AE13_5D12_11D2_BE4C_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#include "cdxCSizeIconCtrl.h" -#include -typedef cdxCSizeIconCtrl cdxCSizeCtrl; - -// -// cdxCDynamicControlsManager.h : header file -// ----------------------------------------------------------------------- -// Author: Hans Bühler (hans.buehler@student.hu-berlin.de) -// codex design (http://www-pool.mathematik.hu-berlin.de/~codex -// Version: 1.5 -// Release: 5 (Mar 1999 to www.codeguru.com) -// ----------------------------------------------------------------------- -// Changes for V1.1: -// - cdxCSizeCtrl is now only a typedef on cdxCSizeIconCtrl which is been -// but in two extra files (header and impl.) to make it available to -// the programmer even if you don't use cdxCDynamicControls. -// The include/impl file for cdxCSizeIconCtrl must be available. -// - GetSizeIconBitmap() is been deleted. -// - ICON_CONTROL_ID has been changed to AFX_IDW_SIZE_BOX -// Changes for V1.2: -// - cdxCDynamicControlsManager::DoOnGetMinMaxInfo() has been modified -// (thanks to a bug report by Michel Wassink ): -// Now, if you don't call SetMaxSize(), the maximum position of a window -// will not be changed. -// BUG: Under W95 and W98, resizing didn't work properly REMOVED. -// Changes for V1.3: -// - FindSzControl() and RemSzControl() have been added. -// Changes for V1.4: -// - RestoreWindowPosition() is been speed up. -// - FixWindowSize() has been debugged -// - RemSzControl() is been made more comfortable. -// You can now remove controls properly from the dynamic controls manager. -// Moreover, the embedded ControlPosition class has now some more virtual -// functions for your own use. -// For example, you can modify the way a control reacts later now. -// - Enable() / Disable() have been added. -// Using them you can temporarily disable the automatic repositioning. -// Changes to V1.5 -// - Flickering of controls during resize fixed thanks to great hint -// by Rodger Bernstein. -// ----------------------------------------------------------------------- -// Comments welcome. -// - -/* - * cdxCDynamicControlsManager - * ========================== - * Makes any CWnd derived class capable of dynamic control resizing - * and repositioning. - * Moreover, it can set a window's max/min tracking size (the size - * the user can change) and add a nice sizing icon to the windows - * lower right corner (if the window does not have one - as dialogs). - * - * To make any CWnd derived capable of automatically displaying - * its controls, you embed a member of this class in your window - * (or you derive your class from both this class and your window - * base class - that depends on how you want to use the member - * functions of this class). - * - * Then, the following functions must be called - * - * DoInitWindow() - Must be called after the window became - * valid (i.e. CWnd::m_hWnd is non-zero) - * and has its initial (minimum) size. - * DoOnSize() - by the OnSize() message handler - * DoOnGetMinMaxInfo() - by the OnGetMinMaxInfo() message handler - * DoDestroyWindow() - by DestroyWindow(). - * - * See cdxCSizingDialog.h for an example. - * - * NOTE: - * Unfortunately, we cannot derive this class from CObject, because - * those macros DECLARE_xxx are too lame to handle multipile derived - * classes if both classes have been derived from the same base-class - * CObject. - */ - -class cdxCDynamicControlsManager -{ - // - // various constants - // -public: - enum Mode // flags for AddSzControl() - { - mdNone = 0, // does nothing - mdResize = 1, // resize in that dimension - mdRepos = 2, // reposition - mdRelative = 3, // center (size by delta/2 and repos by delta/2) - md__Last = mdRelative - }; - - enum Freedom - { - fdNone = 0, // might be used but I don't imagine what you want from this ?? - fdHoriz = 0x01, // horizantally sizable only - fdVert = 0x02, // vertically sizable only - fdAll = fdHoriz|fdVert // sizable in all directions - }; - - enum RestoreFlags - { - rflg_none = 0, // only load window position - rflg_state = 0x01, // make window iconic/zoomed if been before - rflg_visibility = 0x02, // hide/show window as been before - rflg_all = rflg_state|rflg_visibility - }; - - enum - { - ICON_CONTROL_ID = AFX_IDW_SIZE_BOX - }; - - // - // a positioning parameter - // -public: - class PositionSetup - { - public: - BYTE m_dX1pcnt,m_dX2pcnt, // how positioning should work (see docs) - m_dY1pcnt,m_dY2pcnt; - public: - PositionSetup(BYTE dX1pcnt = 0, BYTE dX2pcnt = 0, BYTE dY1pcnt = 0, BYTE dY2pcnt = 0) : m_dX1pcnt(dX1pcnt), m_dX2pcnt(dX2pcnt), m_dY1pcnt(dY1pcnt), m_dY2pcnt(dY2pcnt) {} - ~PositionSetup() {} - - // validity check - bool IsValid() const { return (m_dX1pcnt <= m_dX2pcnt) && (m_dY1pcnt <= m_dY2pcnt); } - - // transform - CRect Transform(const CRect & rectOriginal, const CSize & szDelta) const; - - // quick-use - CRect operator()(const CRect & rectOriginal, const CSize & szDelta) const { return Transform(rectOriginal,szDelta); } - }; - - // - // an astract handle to a sizeable control that you can - // use to add further controls to - // see discussion of AddSzControl() - // -public: - class ControlPosition - { - protected: - ControlPosition() {} - public: - virtual ~ControlPosition() {} - - public: - virtual bool IsMember(CWnd & ctrl) const = NULL; - virtual bool IsUsed() const = NULL; - - virtual void Add(CWnd & ctrl) = NULL; - virtual bool Rem(CWnd & ctrl) = NULL; - - virtual bool Modify(const CRect & rectOriginal, const PositionSetup & rSetup) = NULL; - virtual CRect GetCurrentPosition() const = NULL; - virtual CRect GetOriginalPosition() const = NULL; - virtual PositionSetup GetPositionSetup() const = NULL; - }; - - // - // internal storage class for controls and their - // original positions and their behaviour settings - // -private: - class ControlData : public ControlPosition - { - // - // all controls with the same positioning arguments - // (used by Add()) - // Note that the window is not need to be already created - // - private: - struct ControlEntry - { - private: - ControlData & m_rMaster; // container - ControlEntry *m_pNext,*m_pPrev; // next, prev - CWnd & m_rCtrl; // the control - - public: - ControlEntry(CWnd & ctrl, ControlData & rMaster); - virtual ~ControlEntry(); - - void Position(AFX_SIZEPARENTPARAMS *lpSz, int x, int y, int wid, int hi, bool bAll); - - void Add(CWnd & ctrl, int x, int y, int wid, int hi); - - ControlEntry *GetNext() { return m_pNext; } - CWnd & GetCWnd() { return m_rCtrl; } - const ControlEntry *GetNext() const { return m_pNext; } - const CWnd & GetCWnd() const { return m_rCtrl; } - - bool operator==(const CWnd & ctrl) const { return &m_rCtrl == &ctrl; } - }; - - friend struct ControlEntry; - - private: - cdxCDynamicControlsManager & m_rMaster; // the master class - ControlData *m_pNext,*m_pPrev; // a linked list (root in m_rMaster.m_pFirst) - - ControlEntry *m_pCtrl; // control link list - PositionSetup m_posSetup; - CRect m_rectOriginal; // original position of control(s) - - public: - ControlData(cdxCDynamicControlsManager & rMaster, CWnd & ctrl, const PositionSetup & rPosSetup); - virtual ~ControlData(); - - virtual bool IsUsed() const { return m_pCtrl != NULL; } - - // - // access to CWnds - // - - virtual bool IsMember(CWnd & ctrl) const; - virtual void Add(CWnd & ctrl) { new ControlEntry(ctrl,*this); } - virtual bool Rem(CWnd & ctrl); - - // - // positioning - // - - virtual bool Modify(const CRect & rectOriginal, const PositionSetup & rSetup); - virtual CRect GetCurrentPosition() const; - virtual CRect GetOriginalPosition() const { return CRect(m_rectOriginal); } - virtual PositionSetup GetPositionSetup() const { return PositionSetup(m_posSetup); } - - // - // helpers - // - - ControlData *GetNext() { return m_pNext; } - const ControlData *GetNext() const { return m_pNext; } - - // - // events - // - - void OnSize(const CSize & szDelta, AFX_SIZEPARENTPARAMS *lpSz, const CPoint *pOffset = NULL); - }; - - // - // my members - // - - friend class ControlData; - friend struct ControlData::ControlEntry; - -private: - ControlData *m_pFirst; - CWnd *m_pWnd; // Use Init() !!!!!!!!! - CSize m_szClientRelative, // original's window size (client !!) - used in OnSize() to calculate delta size - m_szMin, // minimum size (whole window) - m_szMax; // maximum (whole window) - Freedom m_Freedom; // what is allowed - cdxCSizeCtrl *m_pWndSizeIcon; // the icon control - int m_iDisabledCnt; // counts Disable() and Enable() - UINT m_iTotalCnt; // total counter of all ControlData::ControlEntry objects - -public: - UINT m_idSizeIcon; // ID of the icon control (you can set this to change the default, ICON_CONTROL_ID) - bool m_bApplyScrollPosition; // fix scroll position for controls (set this in your constructor) - -public: - cdxCDynamicControlsManager() : m_pFirst(NULL), m_pWnd(NULL), m_Freedom(fdAll), m_pWndSizeIcon(NULL), m_idSizeIcon(ICON_CONTROL_ID), m_iDisabledCnt(0), m_iTotalCnt(0), m_bApplyScrollPosition(false) {} - virtual ~cdxCDynamicControlsManager() { DoDestroyWindow(); } - - // - // check status - // - - bool IsReady() const { return (m_pWnd != NULL) && ::IsWindow(m_pWnd->m_hWnd); } - UINT GetTotalChildCnt() const { return m_iTotalCnt; } - - // - // get some basics - // - - const CSize & GetMinSize() const { return m_szMin; } - const CSize & GetMaxSize() const { return m_szMax; } - Freedom GetFreedom() const { return m_Freedom; } - - // - // wanna change some basics ? - // - bool SetMinMaxSize(const CSize & szMin, const CSize & szMax, bool bResizeIfNecessary = true); - bool FixWindowSize(); - void SetFreedom(Freedom fd) { m_Freedom = fd; } - void HideSizeIcon(); - void ShowSizeIcon(); - - // - // add controls to handle - // - ControlPosition *AddSzControl(CWnd & ctrl, Mode modeX, Mode modeY); - ControlPosition *AddSzXControl(CWnd & ctrl, Mode modeX) { return AddSzControl(ctrl,modeX,mdNone); } - ControlPosition *AddSzYControl(CWnd & ctrl, Mode modeY) { return AddSzControl(ctrl,mdNone,modeY); } - - ControlPosition *AddSzControlEx(CWnd & ctrl, BYTE dX1pcnt, BYTE dX2pcnt, BYTE dY1pcnt, BYTE dY2pcnt) { return AddSzControlEx(ctrl,PositionSetup(dX1pcnt,dX2pcnt,dY1pcnt,dY2pcnt)); } - ControlPosition *AddSzXControlEx(CWnd & ctrl, BYTE dX1pcnt, BYTE dX2pcnt) { return AddSzControlEx(ctrl,dX1pcnt,dX2pcnt,0,0); } - ControlPosition *AddSzYControlEx(CWnd & ctrl, BYTE dY1pcnt, BYTE dY2pcnt) { return AddSzControlEx(ctrl,0,0,dY1pcnt,dY2pcnt); } - - virtual ControlPosition *AddSzControlEx(CWnd & ctrl, const PositionSetup & rSetup); - - // - // advanced (new to V1.3) - // - ControlPosition *FindSzControl(CWnd & ctrl); - const ControlPosition *FindSzControl(CWnd & ctrl) const; - bool RemSzControl(CWnd & ctrl, bool bAutoDeleteUnusedControlPos = true); - - // - // advanced (new to V1,4) - // - virtual bool Enable(bool bForce = false) { if(!bForce) { --m_iDisabledCnt; ASSERT(m_iDisabledCnt >= 0); } else m_iDisabledCnt = 0; return m_iDisabledCnt == 0; } - virtual void Disable() { ++m_iDisabledCnt; } - virtual bool IsDisabled() const { return m_iDisabledCnt > 0; } - - // - // these must be called by the appropiate message handlers of the window - // class you're deriving from - // -public: - void DoInitWindow(CWnd & rWnd, Freedom fd = fdAll, bool bSizeIcon = false, const CSize * pBaseClientSize = NULL); - void DoOnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - void DoOnSize(UINT nType, int cx, int cy); - void DoDestroyWindow(); - - // - // some helpers - // - void ReorganizeControls(bool bRedraw = true); - void ReorganizeControlsAdvanced(const CRect & rectWin, CRect rectClient, bool bRedraw = true); - bool StretchWindow(const CSize & szDelta) { ASSERT(IsReady()); return StretchWindow(*m_pWnd,szDelta); } - bool StretchWindow(int iAddPcnt) { ASSERT(IsReady()); return StretchWindow(*m_pWnd,iAddPcnt); } - CSize GetWindowSize() { ASSERT(IsReady()); return GetWindowSize(*m_pWnd); } - bool RestoreWindowPosition(LPCTSTR lpszProfile, UINT restoreFlags = rflg_none) { ASSERT(IsReady()); return RestoreWindowPosition(*m_pWnd,lpszProfile,restoreFlags); } - bool StoreWindowPosition(LPCTSTR lpszProfile) { ASSERT(IsReady()); return StoreWindowPosition(*m_pWnd,lpszProfile); } - - // - // helpers; static - // -public: - static bool StretchWindow(CWnd & rWnd, const CSize & szDelta); - static bool StretchWindow(CWnd & rWnd, int iAddPcnt); - static CSize GetWindowSize(CWnd & rWnd); - static bool RestoreWindowPosition(CWnd & rWnd, LPCTSTR lpszProfile, UINT restoreFlags = rflg_none); - static bool StoreWindowPosition(CWnd & rWnd, LPCTSTR lpszProfile); - - // - // some virtuals - // -protected: - virtual void OnDeleteControlPosition(ControlPosition & rWillBeDeleted) {} - virtual CRect GetRealClientRect() const; - - // - // misc - // -public: - /* removed */ //static CBitmap & GetSizeIconBitmap(CSize * pSzBmp = NULL); - static CImageList & GetSizeIconImageList(CSize * pSzBmp = NULL) { if(pSzBmp) *pSzBmp = cdxCSizeIconCtrl::M_ilImage.Size(); return cdxCSizeIconCtrl::M_ilImage; } -}; - -/* - * cdxCSizeCtrl - * ============ - * Is now a typedef to cdxCSizeIconCtrl - see above. - */ - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::PositionSetup inlines -///////////////////////////////////////////////////////////////////////////// - -/* - * this function transforms a control's original position (rectOriginal) into - * its new rectangle by taking the the difference between the original window's - * size (szDelta). - */ - -inline CRect cdxCDynamicControlsManager::PositionSetup::Transform(const CRect & rectOriginal, const CSize & szDelta) const -{ - CRect rectNew; - - rectNew.left = rectOriginal.left + (szDelta.cx * (int)m_dX1pcnt) / 100; - rectNew.right = rectOriginal.right + (szDelta.cx * (int)m_dX2pcnt) / 100; - rectNew.top = rectOriginal.top + (szDelta.cy * (int)m_dY1pcnt) / 100; - rectNew.bottom = rectOriginal.bottom + (szDelta.cy * (int)m_dY2pcnt) / 100; - - return rectNew; -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::ControlData::ControlEntry inlines -///////////////////////////////////////////////////////////////////////////// - - -/* - * add a control that has the same coordinates as the - * control embedded in the ControlData object. - * The coordinates are needed to immediately place the - * control to the original control's position. - */ - -inline void cdxCDynamicControlsManager::ControlData::ControlEntry::Add(CWnd & ctrl, int x, int y, int wid, int hi) -{ - VERIFY( m_pNext = new ControlEntry(ctrl,m_rMaster) ); - m_pNext->Position(NULL,x,y,wid,hi,false); -} - -/* - * apply new position to all "ControlEntry" controls - * we don't change the z-order here ! - */ - -inline void cdxCDynamicControlsManager::ControlData::ControlEntry::Position(AFX_SIZEPARENTPARAMS *lpSz, int x, int y, int wid, int hi, bool bAll) -{ - if(::IsWindow(m_rCtrl.m_hWnd)) // those window don't need to exist :) - { - if (lpSz != NULL) - AfxRepositionWindow(lpSz, m_rCtrl.m_hWnd, CRect(CPoint(x,y),CSize(wid,hi))); - else - { - VERIFY( m_rCtrl.SetWindowPos(&CWnd::wndBottom,x,y,wid,hi, - SWP_NOCOPYBITS|SWP_NOOWNERZORDER| - SWP_NOACTIVATE|SWP_NOZORDER) ); - } - } - if(m_pNext && bAll) - m_pNext->Position(lpSz, x,y,wid,hi,true); -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager::ControlData inlines -///////////////////////////////////////////////////////////////////////////// -/* - * called by cdxCDynamicControlsManager::ReorganizeControls() if the size of the window has been changed. - * repositions all controls applied to this ControlData - */ - -inline void cdxCDynamicControlsManager::ControlData::OnSize(const CSize & szDelta, AFX_SIZEPARENTPARAMS *lpSz, const CPoint *pOffset) -{ - if(m_pCtrl) - { - CRect rectNew = m_posSetup(m_rectOriginal,szDelta); - if(pOffset) - rectNew += *pOffset; - m_pCtrl->Position(lpSz, rectNew.left,rectNew.top,rectNew.Width(),rectNew.Height(),true); - } -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicControlsManager inlines -///////////////////////////////////////////////////////////////////////////// - -/* - * add a control - we leave that work - * to the embedded ControlData class - */ - -inline cdxCDynamicControlsManager::ControlPosition *cdxCDynamicControlsManager::AddSzControlEx(CWnd & ctrl, const PositionSetup & rSetup) -{ - ASSERT(IsReady()); // don't called DoInitWindow() before ? - ASSERT(rSetup.IsValid()); - - ControlData *si = new ControlData(*this, ctrl, rSetup); - ASSERT(si != NULL); // if you don't throw exceptions :) - return si; -} - -/* - * find a control's ControlPosition - */ - -inline const cdxCDynamicControlsManager::ControlPosition *cdxCDynamicControlsManager::FindSzControl(CWnd & ctrl) const -{ - ASSERT(::IsWindow(ctrl.m_hWnd)); // will work for exiting windows only ! - - for(const ControlData *si = m_pFirst; si; si = si->GetNext()) - if(si->IsMember(ctrl)) - return si; - - return NULL; -} - -inline cdxCDynamicControlsManager::ControlPosition *cdxCDynamicControlsManager::FindSzControl(CWnd & ctrl) -{ - ASSERT(::IsWindow(ctrl.m_hWnd)); // will work for exiting windows only ! - - for(ControlData *si = m_pFirst; si; si = si->GetNext()) - if(si->IsMember(ctrl)) - return si; - - return NULL; -} - -/* - * delete an entry for a control - * ctrl - the control - * bAutoDeleteUnusedControlPos - if true, and unused ControlPosition (no more - * CWnds are bound to it) will be deleted. - * Note that you can use OnDeleteControlPosition() - * to find out which one will be deleted if any. - * - * returns true of the control has been found and deleted - */ - -inline bool cdxCDynamicControlsManager::RemSzControl(CWnd & ctrl, bool bAutoDeleteUnusedControlPos) -{ - for(ControlData *si = m_pFirst; si; si = si->GetNext()) - if(si->Rem(ctrl)) - { - if(!si->IsUsed() && bAutoDeleteUnusedControlPos) - { - OnDeleteControlPosition(*si); - delete si; - } - return true; - } - - return false; -} - -/* - * adding controls by my nice constants - */ - -inline cdxCDynamicControlsManager::ControlPosition *cdxCDynamicControlsManager::AddSzControl(CWnd & ctrl, Mode modeX, Mode modeY) -{ - BYTE dX1pcnt = 0, - dX2pcnt = 0, - dY1pcnt = 0, - dY2pcnt = 0; - - switch(modeX) - { - default : ASSERT(false); // unknown value for modeX - case mdNone : break; - case mdRepos : dX1pcnt = dX2pcnt = 100; - break; - case mdResize : dX2pcnt = 100; - break; - case mdRelative: dX1pcnt = dX2pcnt = 100 / 2; - break; - } - - switch(modeY) - { - default : ASSERT(false); // unknown value for modeY - case mdNone : break; - case mdRepos : dY1pcnt = dY2pcnt = 100; - break; - case mdResize : dY2pcnt = 100; - break; - case mdRelative: dY1pcnt = dY2pcnt = 100 / 2; - break; - } - - return AddSzControlEx(ctrl,dX1pcnt,dX2pcnt,dY1pcnt,dY2pcnt); -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * Reposition - */ - -inline void cdxCDynamicControlsManager::ReorganizeControls(bool bRedraw) -{ - ASSERT(IsReady()); - - CRect clrect,winrect; - m_pWnd->GetClientRect(clrect); - m_pWnd->GetWindowRect(&winrect); - - if(m_bApplyScrollPosition) - { - if(m_pWnd->IsKindOf(RUNTIME_CLASS(CScrollView))) - { - clrect += ((CScrollView *)m_pWnd)->GetDeviceScrollPosition(); - } - else - clrect += CPoint(m_pWnd->GetScrollPos(SB_HORZ),m_pWnd->GetScrollPos(SB_VERT)); - } - ReorganizeControlsAdvanced(winrect,clrect,bRedraw); -} - -/* - * get client rect - */ - -inline CRect cdxCDynamicControlsManager::GetRealClientRect() const -{ - ASSERT(IsReady()); - CRect r; - - return r; -} - -#endif // !defined(AFX_CDXCDYNAMICCONTROLSMANAGER_H__6517AE13_5D12_11D2_BE4C_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp deleted file mode 100644 index 2a95ef95..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// cdxCDynamicChildDlg.cpp : implementation file -// - -#include "stdafx.h" -#include "cdxCDynamicDialog.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicDialog dialog -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCDynamicDialog,CDialog); - -///////////////////////////////////////////////////////////////////////////// -// message map -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCDynamicDialog, CDialog) - //{{AFX_MSG_MAP(cdxCDynamicDialog) - ON_WM_GETMINMAXINFO() - ON_WM_DESTROY() - ON_WM_PARENTNOTIFY() - ON_WM_SIZE() - ON_WM_SIZING() - ON_WM_TIMER() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicDialog message handlers: redirect stuff to my class :)= -///////////////////////////////////////////////////////////////////////////// - -BOOL cdxCDynamicDialog::OnInitDialog() -{ - BOOL bOK = CDialog::OnInitDialog(); - DoInitWindow(*this); - - return bOK; -} - -BOOL cdxCDynamicDialog::DestroyWindow() -{ - DoOnDestroy(); - return CDialog::DestroyWindow(); -} - -void cdxCDynamicDialog::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - CDialog::OnGetMinMaxInfo(lpMMI); - DoOnGetMinMaxInfo(lpMMI); -} - -void cdxCDynamicDialog::OnDestroy() -{ - DoOnDestroy(); - CDialog::OnDestroy(); -} - -void cdxCDynamicDialog::OnParentNotify(UINT message, LPARAM lParam) -{ - CDialog::OnParentNotify(message, lParam); - DoOnParentNotify(message, lParam); -} - -void cdxCDynamicDialog::OnSize(UINT nType, int cx, int cy) -{ - CDialog::OnSize(nType, cx, cy); - DoOnSize(nType, cx, cy); -} - -void cdxCDynamicDialog::OnSizing(UINT fwSide, LPRECT pRect) -{ - CDialog::OnSizing(fwSide, pRect); - DoOnSizing(fwSide, pRect); -} - -void cdxCDynamicDialog::OnTimer(UINT idEvent) -{ - CDialog::OnTimer(idEvent); - DoOnTimer(idEvent); -} - - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicChildDlg dialog -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCDynamicChildDlg,cdxCDynamicDialog); - -///////////////////////////////////////////////////////////////////////////// -// message map -///////////////////////////////////////////////////////////////////////////// - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h deleted file mode 100644 index d8883136..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h +++ /dev/null @@ -1,121 +0,0 @@ -#if !defined(AFX_CDXCDYNAMICDIALOG_H__E8F2A005_63C6_11D3_802B_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICDIALOG_H__E8F2A005_63C6_11D3_802B_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// cdxCDynamicDialog.h : header file -// - -#include "cdxCDynamicWndEx.h" - -/* - * cdxCDynamicDialog - * ================= - * A new resizable dialog. - * This should be the base-class for your normal dialogs. - * This class supports: - * - A sizing icon - * - AutoPositioning (stores last position automatically and stuff) - * - Anti-Flickering system. - * - And of course, it provides - * the Dynamic child control system DcCS by codex design - */ - -class cdxCDynamicDialog : public CDialog, public cdxCDynamicWndEx -{ - DECLARE_DYNAMIC(cdxCDynamicDialog); - -public: - enum { flDefault = flAntiFlicker|flSizeIcon }; - -public: - cdxCDynamicDialog(UINT idd = 0, CWnd* pParent = NULL, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicDialog(LPCTSTR lpszTemplateName, CWnd* pParent = NULL, Freedom fd = fdAll, UINT nFlags = flDefault); - virtual ~cdxCDynamicDialog() { DoOnDestroy(); } - -public: - virtual BOOL DestroyWindow(); - -protected: - virtual BOOL OnInitDialog(); - afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - afx_msg void OnDestroy(); - afx_msg void OnParentNotify(UINT message, LPARAM lParam); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnTimer(UINT nIDEvent); - - DECLARE_MESSAGE_MAP(); -}; - -/* - * cdxCDynamicChildDlg - * =================== - * Use this dialog class instead of cdxCDynamicDialog if - * you create dialogs which you want to embedd as child - * controls. - * In that case, this dialog is far more straight forward. - * This class provides: - * - NO sizing icon - * - NO auto anti-flickering (since the dialog itself won't be moved by hand) - * - NO auto-positioning - * - But of course, it provides - * the Dynamic child control system DcCS by codex design - */ - -class cdxCDynamicChildDlg : public cdxCDynamicDialog -{ - DECLARE_DYNAMIC(cdxCDynamicChildDlg); - -public: - enum { flDefault = flAntiFlicker }; - -public: - cdxCDynamicChildDlg(UINT idd = 0, CWnd* pParent = NULL, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicChildDlg(LPCTSTR lpszTemplateName, CWnd* pParent = NULL, Freedom fd = fdAll, UINT nFlags = flDefault); - virtual ~cdxCDynamicChildDlg() { DoOnDestroy(); } -}; - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicDialog Inlines -///////////////////////////////////////////////////////////////////////////// - -inline cdxCDynamicDialog::cdxCDynamicDialog(UINT idd, CWnd* pParent, Freedom fd, UINT nFlags) -: CDialog(idd,pParent), - cdxCDynamicWndEx(fd,nFlags) -{ - if(idd) - ActivateAutoPos(idd); -} - -inline cdxCDynamicDialog::cdxCDynamicDialog(LPCTSTR lpszTemplateName, CWnd* pParent, Freedom fd, UINT nFlags) -: CDialog(lpszTemplateName,pParent), - cdxCDynamicWndEx(fd,nFlags) -{ - if(lpszTemplateName && *lpszTemplateName) - ActivateAutoPos(lpszTemplateName); -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicChildDlg Inlines -///////////////////////////////////////////////////////////////////////////// - -inline cdxCDynamicChildDlg::cdxCDynamicChildDlg(UINT idd, CWnd* pParent, Freedom fd, UINT nFlags) -: cdxCDynamicDialog(idd,pParent,fd,nFlags) -{ - m_bUseScrollPos = true; // if you create scollbars I will use them ;) - NoAutoPos(); // not in this case.... -} - -inline cdxCDynamicChildDlg::cdxCDynamicChildDlg(LPCTSTR lpszTemplateName, CWnd* pParent, Freedom fd, UINT nFlags) -: cdxCDynamicDialog(lpszTemplateName,pParent,fd,nFlags) -{ - m_bUseScrollPos = true; // if you create scollbars I will use them ;) - NoAutoPos(); // not in this case.... -} - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CDXCDYNAMICDIALOG_H__E8F2A005_63C6_11D3_802B_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.cpp deleted file mode 100644 index 6d98d753..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// cdxCDynamicFormView.cpp : implementation file -// - -#include "stdafx.h" -#include "cdxCDynamicFormView.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicFormView -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCDynamicFormView, CFormView) - -///////////////////////////////////////////////////////////////////////////// -// creation -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCDynamicFormView, CFormView) - //{{AFX_MSG_MAP(cdxCDynamicFormView) - ON_WM_SIZE() - ON_WM_SIZING() - ON_WM_TIMER() - ON_WM_GETMINMAXINFO() - ON_WM_PARENTNOTIFY() - ON_WM_DESTROY() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicFormView message handlers -///////////////////////////////////////////////////////////////////////////// - -/* - * OnInitialUpdate() - * ----------------- - * These functions set up the form view. - * New to this version is that the correct size will now be read - * automatically. - */ - -void cdxCDynamicFormView::OnInitialUpdate() -{ - CFormView::OnInitialUpdate(); - DoInitWindow(*this,GetTotalSize()); -} - -///////////////////////////////////////////////////////////////////////////// - -BOOL cdxCDynamicFormView::DestroyWindow() -{ - DoOnDestroy(); - return CFormView::DestroyWindow(); -} - -void cdxCDynamicFormView::OnSize(UINT nType, int cx, int cy) -{ - CFormView::OnSize(nType, cx, cy); - DoOnSize(nType, cx, cy); -} - -void cdxCDynamicFormView::OnSizing(UINT fwSide, LPRECT pRect) -{ - CFormView::OnSizing(fwSide, pRect); - DoOnSizing(fwSide, pRect); -} - -void cdxCDynamicFormView::OnTimer(UINT nIDEvent) -{ - CFormView::OnTimer(nIDEvent); - DoOnTimer(nIDEvent); -} - -void cdxCDynamicFormView::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - CFormView::OnGetMinMaxInfo(lpMMI); - DoOnGetMinMaxInfo(lpMMI); -} - -void cdxCDynamicFormView::OnParentNotify(UINT message, LPARAM lParam) -{ - CFormView::OnParentNotify(message, lParam); - DoOnParentNotify(message, lParam); -} - -void cdxCDynamicFormView::OnDestroy() -{ - DoOnDestroy(); - CFormView::OnDestroy(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.h deleted file mode 100644 index c6f6625f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.h +++ /dev/null @@ -1,51 +0,0 @@ -#if !defined(AFX_CDXCDYNAMICFORMVIEW_H__82427295_6456_11D3_802D_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICFORMVIEW_H__82427295_6456_11D3_802D_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// cdxCDynamicFormView.h : header file -// - -#include "cdxCDynamicWnd.h" - -/* - * cdxCDynamicFormView - * =================== - * My dynamic form view. - */ - -#ifndef __AFXEXT_H__ -#include -#endif - -class cdxCDynamicFormView : public CFormView, public cdxCDynamicWnd -{ - DECLARE_DYNCREATE(cdxCDynamicFormView); - - enum { flDefault = flAntiFlicker }; - -public: - cdxCDynamicFormView(UINT idd = 0, Freedom fd = fdAll, UINT nFlags = flDefault) : CFormView(idd), cdxCDynamicWnd(fd,nFlags) { m_bUseScrollPos = true; } - cdxCDynamicFormView(LPCTSTR lpszTemplateName, Freedom fd = fdAll, UINT nFlags = flDefault) : CFormView(lpszTemplateName), cdxCDynamicWnd(fd,nFlags) { m_bUseScrollPos = true; } - virtual ~cdxCDynamicFormView() { DoOnDestroy(); } - -public: - virtual void OnInitialUpdate(); - virtual BOOL DestroyWindow(); - -protected: - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnTimer(UINT nIDEvent); - afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - afx_msg void OnParentNotify(UINT message, LPARAM lParam); - afx_msg void OnDestroy(); - - DECLARE_MESSAGE_MAP(); -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CDXCDYNAMICFORMVIEW_H__82427295_6456_11D3_802D_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.cpp deleted file mode 100644 index 8935d007..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// cdxCDynamicPropSheet.cpp : implementation file -// - -#include "stdafx.h" -#include "cdxCDynamicPropSheet.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -#pragma warning(disable: 4706) - - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicPropSheet -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNCREATE(cdxCDynamicPropSheet, CPropertySheet) - -///////////////////////////////////////////////////////////////////////////// -// maps -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCDynamicPropSheet, CPropertySheet) - //{{AFX_MSG_MAP(cdxCDynamicPropSheet) - ON_WM_CLOSE() - ON_WM_DESTROY() - ON_WM_CREATE() - ON_WM_SIZE() - ON_WM_SIZING() - ON_WM_TIMER() - ON_WM_GETMINMAXINFO() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -/* - * we map the controls by our new dynamic map feature :) - */ - -BEGIN_DYNAMIC_MAP(cdxCDynamicPropSheet,cdxCDynamicWnd) - DYNAMIC_MAP_ENTRY( ID_WIZNEXT, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( ID_WIZFINISH, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( ID_WIZBACK, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( IDOK, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( IDCANCEL, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( ID_WIZNEXT, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( ID_APPLY_NOW, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( IDHELP, mdRepos,mdRepos ) - DYNAMIC_MAP_ENTRY( AFX_IDC_TAB_CONTROL, mdResize,mdResize ) - DYNAMIC_MAP_ENTRY( ID_WIZFINISH+1, mdResize,mdRepos ) -END_DYNAMIC_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicPropSheet message handlers -///////////////////////////////////////////////////////////////////////////// - -/* - * initialize window - */ - -BOOL cdxCDynamicPropSheet::OnInitDialog() -{ - // initialize window & dynamic manager - - BOOL b = CPropertySheet::OnInitDialog(); - DoInitWindow(*this); - - ModifyStyle(0,WS_CLIPSIBLINGS); - - ASSERT(GetPageCount() > 0); // NO pages ?? - cdxCDynamicPropPage *pActive = (cdxCDynamicPropPage *)GetActivePage(); - - ASSERT(pActive && pActive->IsKindOf(RUNTIME_CLASS(cdxCDynamicPropPage))); - AddSzControl(*pActive,mdResize,mdResize); - VERIFY( GetControlPosition(*pActive,m_PagePos) ); - m_bHasPos = true; - - return b; -} - -void cdxCDynamicPropSheet::AddPage( cdxCDynamicPropPage & rPage ) -{ - ASSERT(rPage.m_pSheet == NULL); - rPage.m_pSheet = this; - CPropertySheet::AddPage(&rPage); -} - -void cdxCDynamicPropSheet::RemovePage( cdxCDynamicPropPage & rPage ) -{ - ASSERT(rPage.m_pSheet == this); - rPage.m_pSheet = NULL; -} - -void cdxCDynamicPropSheet::OnInitPage(cdxCDynamicPropPage & rPage) -{ - ASSERT(::IsWindow(rPage)); - - if(m_bHasPos) - AddSzControl(rPage,m_PagePos); -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * map WM_CLOSE to IDCANCEL if it is a modal sheet - */ - -void cdxCDynamicPropSheet::OnClose() -{ - if(!PressButton(PSBTN_CANCEL)) - CPropertySheet::OnClose(); -} - -/* - * give us a resizable border - */ - -int cdxCDynamicPropSheet::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if(CPropertySheet::OnCreate(lpCreateStruct) == -1) - return -1; - - ModifyStyle(0,WS_THICKFRAME|WS_SYSMENU); - ModifyStyleEx(0,WS_CLIPCHILDREN); - return 0; -} - -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// - -BOOL cdxCDynamicPropSheet::DestroyWindow() -{ - DoOnDestroy(); - return CPropertySheet::DestroyWindow(); -} - -void cdxCDynamicPropSheet::OnDestroy() -{ - DoOnDestroy(); - CPropertySheet::OnDestroy(); -} - -void cdxCDynamicPropSheet::OnSize(UINT nType, int cx, int cy) -{ - CPropertySheet::OnSize(nType, cx, cy); - DoOnSize(nType, cx, cy); -} - -void cdxCDynamicPropSheet::OnSizing(UINT fwSide, LPRECT pRect) -{ - CPropertySheet::OnSizing(fwSide, pRect); - DoOnSizing(fwSide, pRect); -} - -void cdxCDynamicPropSheet::OnTimer(UINT nIDEvent) -{ - CPropertySheet::OnTimer(nIDEvent); - DoOnTimer(nIDEvent); -} - -void cdxCDynamicPropSheet::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - CPropertySheet::OnGetMinMaxInfo(lpMMI); - DoOnGetMinMaxInfo(lpMMI); -} - - - - - - - - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicPropSheet message handlers -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNCREATE(cdxCDynamicPropPage, CPropertyPage) - -///////////////////////////////////////////////////////////////////////////// -// creation -///////////////////////////////////////////////////////////////////////////// - -void cdxCDynamicPropPage::DoDataExchange(CDataExchange* pDX) -{ - CPropertyPage::DoDataExchange(pDX); - //{{AFX_DATA_MAP(cdxCDynamicPropPage) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(cdxCDynamicPropPage, CPropertyPage) - //{{AFX_MSG_MAP(cdxCDynamicPropPage) - ON_WM_SIZE() - ON_WM_TIMER() - ON_WM_DESTROY() - ON_WM_SIZING() - ON_WM_GETMINMAXINFO() - ON_WM_PARENTNOTIFY() - ON_WM_ACTIVATE() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// active/inactive stuff -///////////////////////////////////////////////////////////////////////////// - -BOOL cdxCDynamicPropPage::OnInitDialog() -{ - ASSERT(m_pSheet != NULL); - - BOOL b = CPropertyPage::OnInitDialog(); - DoInitWindow(*this); - - return b; -} - -BOOL cdxCDynamicPropPage::OnSetActive() -{ - BOOL bGetsActive = CPropertyPage::OnSetActive(); - if(bGetsActive && !m_bFirstHit) - { - m_pSheet->OnInitPage(*this); - m_bFirstHit = true; - } - if(m_pSheet) - m_pSheet->OnSetActive(*this,bGetsActive); - return bGetsActive; -} - -BOOL cdxCDynamicPropPage::OnKillActive() -{ - BOOL bGetsKilled = CPropertyPage::OnKillActive(); - if(m_pSheet) - m_pSheet->OnKillActive(*this,bGetsKilled); - return bGetsKilled; -} - -void cdxCDynamicPropPage::OnSize(UINT nType, int cx, int cy) -{ - CPropertyPage::OnSize(nType, cx, cy); - DoOnSize(nType, cx, cy); -} - -void cdxCDynamicPropPage::OnTimer(UINT nIDEvent) -{ - CPropertyPage::OnTimer(nIDEvent); - DoOnTimer(nIDEvent); -} - -void cdxCDynamicPropPage::OnDestroy() -{ - DoOnDestroy(); - CPropertyPage::OnDestroy(); -} - -void cdxCDynamicPropPage::OnSizing(UINT fwSide, LPRECT pRect) -{ - CPropertyPage::OnSizing(fwSide, pRect); - DoOnSizing(fwSide, pRect); -} - -void cdxCDynamicPropPage::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - CPropertyPage::OnGetMinMaxInfo(lpMMI); - DoOnGetMinMaxInfo(lpMMI); -} - -void cdxCDynamicPropPage::OnParentNotify(UINT message, LPARAM lParam) -{ - CPropertyPage::OnParentNotify(message, lParam); - DoOnParentNotify(message, lParam); -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.h deleted file mode 100644 index 73ea3508..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.h +++ /dev/null @@ -1,209 +0,0 @@ -#if !defined(AFX_CDXCDYNAMICPROPSHEET_H__82427297_6456_11D3_802D_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICPROPSHEET_H__82427297_6456_11D3_802D_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// cdxCDynamicPropSheet.h : header file -// - -#include "cdxCDynamicWndEx.h" -#pragma warning(disable: 4100) - -class cdxCDynamicPropPage; - -/* - * cdxCDynamicPropSheet - * ==================== - * Dynamic property sheet. - */ - -class cdxCDynamicPropSheet : public CPropertySheet, public cdxCDynamicWndEx -{ - DECLARE_DYNCREATE(cdxCDynamicPropSheet); - - enum { flDefault = flAntiFlicker|flSizeIcon|flSWPCopyBits }; - - friend class cdxCDynamicPropPage; - -private: - Position m_PagePos; - bool m_bHasPos; - -public: - cdxCDynamicPropSheet(Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(UINT sheetAutoPosID, UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(UINT sheetAutoPosID, LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(LPCTSTR lpszSheetAutoPosID, UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - cdxCDynamicPropSheet(LPCTSTR lpszSheetAutoPosID, LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0, Freedom fd = fdAll, UINT nFlags = flDefault); - virtual ~cdxCDynamicPropSheet() { DoOnDestroy(); } - - // ops -public: - virtual void AddPage( cdxCDynamicPropPage & rPage ); - virtual void RemovePage( cdxCDynamicPropPage & rPage ); - void AddPage( cdxCDynamicPropPage *pPage ) { ASSERT(pPage != NULL); AddPage(*pPage); } - void RemovePage( cdxCDynamicPropPage *pPage ) { ASSERT(pPage != NULL); RemovePage(*pPage); } - void RemovePage( int nPage ); - - BOOL IsWizard() const { return (m_psh.dwFlags & PSH_WIZARD) != 0; } - - // events -protected: - virtual void OnInitPage(cdxCDynamicPropPage & rPage); - virtual void OnSetActive(cdxCDynamicPropPage & rPage, BOOL bStatus) { if(IsWindow() && IsWizard()) Layout(); } - virtual void OnKillActive(cdxCDynamicPropPage & rPage, BOOL bStatus) {} - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(cdxCDynamicPropSheet) - public: - virtual BOOL DestroyWindow(); - //}}AFX_VIRTUAL - -// Implementation -public: - - // Generated message map functions -protected: - //{{AFX_MSG(cdxCDynamicPropSheet) - virtual BOOL OnInitDialog(); - afx_msg void OnClose(); - afx_msg void OnDestroy(); - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnTimer(UINT nIDEvent); - afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); - DECLARE_DYNAMIC_MAP(); -}; - -/* - * cdxCDynamicPropPage - * =================== - * The page for our sheet. - */ - -class cdxCDynamicPropPage : public CPropertyPage, public cdxCDynamicWnd -{ - DECLARE_DYNCREATE(cdxCDynamicPropPage) - - friend class cdxCDynamicPropSheet; - - enum { flDefault = flAntiFlicker }; - -private: - cdxCDynamicPropSheet *m_pSheet; - bool m_bFirstHit; - -public: - cdxCDynamicPropPage() : cdxCDynamicWnd(fdAll,flDefault), m_pSheet(NULL), m_bFirstHit(false) {} - cdxCDynamicPropPage(UINT nID, UINT nIDCaption = 0) : CPropertyPage(nID,nIDCaption), cdxCDynamicWnd(fdAll,flDefault), m_pSheet(NULL), m_bFirstHit(false) {} - cdxCDynamicPropPage(LPCTSTR lpszID, UINT nIDCaption = 0) : CPropertyPage(lpszID,nIDCaption), cdxCDynamicWnd(fdAll,flDefault), m_pSheet(NULL), m_bFirstHit(false) {} - virtual ~cdxCDynamicPropPage() { DoOnDestroy(); } - - cdxCDynamicPropSheet *GetSheet() const { return m_pSheet; } - -// Dialog Data - //{{AFX_DATA(cdxCDynamicPropPage) - // NOTE - ClassWizard will add data members here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_DATA - - -// Overrides - // ClassWizard generate virtual function overrides - //{{AFX_VIRTUAL(cdxCDynamicPropPage) - public: - virtual BOOL OnSetActive(); - virtual BOOL OnKillActive(); - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - // Generated message map functions - //{{AFX_MSG(cdxCDynamicPropPage) - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnTimer(UINT nIDEvent); - virtual BOOL OnInitDialog(); - afx_msg void OnDestroy(); - afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - afx_msg void OnParentNotify(UINT message, LPARAM lParam); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -}; - -////////////////////////////////////////////////////////////////////// -// inlines -////////////////////////////////////////////////////////////////////// - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(Freedom fd, UINT nFlags) -: cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(nIDCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(pszCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(UINT sheetAutoPosID, UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(nIDCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ - if(sheetAutoPosID) - ActivateAutoPos(sheetAutoPosID); -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(UINT sheetAutoPosID, LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(pszCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ - if(sheetAutoPosID) - ActivateAutoPos(sheetAutoPosID); -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(LPCTSTR lpszSheetAutoPosID, UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(nIDCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ - if(lpszSheetAutoPosID && *lpszSheetAutoPosID) - ActivateAutoPos(lpszSheetAutoPosID); -} - -inline cdxCDynamicPropSheet::cdxCDynamicPropSheet(LPCTSTR lpszSheetAutoPosID, LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage, Freedom fd, UINT nFlags) -: CPropertySheet(pszCaption,pParentWnd,iSelectPage), - cdxCDynamicWndEx(fd,nFlags), - m_bHasPos(false) -{ - if(lpszSheetAutoPosID && *lpszSheetAutoPosID) - ActivateAutoPos(lpszSheetAutoPosID); -} - -#pragma warning(default: 4100) - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CDXCDYNAMICPROPSHEET_H__82427297_6456_11D3_802D_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp deleted file mode 100644 index d35ebf54..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp +++ /dev/null @@ -1,747 +0,0 @@ -// cdxCDynamicWnd.cpp: implementation of the cdxCDynamicWnd class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "cdxCDynamicWnd.h" -#include "cdxCSizeIconCtrl.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - -#pragma warning(disable: 4100) -#pragma warning(disable: 4706) - - -IMPLEMENT_DYNAMIC(cdxCDynamicLayoutInfo,CObject); - -////////////////////////////////////////////////////////////////////// -// cdxCDynamicWnd::Position -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Positioning engine -////////////////////////////////////////////////////////////////////// - -/* - * Standard Controller's Position() routine - * This has the same functionality as known from the former - * cdxCDynamicControlsManager class. - * - * One exception is the new "szMin" property which allows - * the class to "hide" the control if it becomes too small - * (it will be moved outside the client area). - */ - -void cdxCDynamicWnd::Position::Apply(HWND hwnd, CRect & rectNewPos, const cdxCDynamicLayoutInfo & li) const -{ - if(li.m_bUseScrollPos) - { - rectNewPos.left = left - li.m_pntScrollPos.x; - rectNewPos.right = right - li.m_pntScrollPos.x; - rectNewPos.top = top - li.m_pntScrollPos.y; - rectNewPos.bottom = bottom - li.m_pntScrollPos.y; - - if(li.m_szDelta.cx >= 0) - { - rectNewPos.left += (m_Bytes[X1] * li.m_szDelta.cx) / 100; - rectNewPos.right += (m_Bytes[X2] * li.m_szDelta.cx) / 100; - } - if(li.m_szDelta.cy >= 0) - { - rectNewPos.top += (m_Bytes[Y1] * li.m_szDelta.cy) / 100; - rectNewPos.bottom += (m_Bytes[Y2] * li.m_szDelta.cy) / 100; - } - } - else - { - rectNewPos.left = left + (m_Bytes[X1] * li.m_szDelta.cx) / 100; - rectNewPos.right = right + (m_Bytes[X2] * li.m_szDelta.cx) / 100; - rectNewPos.top = top + (m_Bytes[Y1] * li.m_szDelta.cy) / 100; - rectNewPos.bottom = bottom + (m_Bytes[Y2] * li.m_szDelta.cy) / 100; - } - - if(rectNewPos.left + m_szMin.cx >= rectNewPos.right) - { - rectNewPos.right = -10; - rectNewPos.left = rectNewPos.right - m_szMin.cx; - } - if(rectNewPos.top + m_szMin.cy >= rectNewPos.bottom) - { - rectNewPos.bottom = -10; - rectNewPos.top = rectNewPos.bottom - m_szMin.cy; - } -} - -////////////////////////////////////////////////////////////////////// -// cdxCDynamicWnd -////////////////////////////////////////////////////////////////////// - -const CSize cdxCDynamicWnd::M_szNull(0,0); -const cdxCDynamicWnd::SBYTES cdxCDynamicWnd::TopLeft = { 0,0,0,0 }, - cdxCDynamicWnd::TopRight = { 100,0,100,0 }, - cdxCDynamicWnd::BotLeft = { 0,100,0,100 }, - cdxCDynamicWnd::BotRight = { 100,100,100,100 }; - - -////////////////////////////////////////////////////////////////////// -// construction -////////////////////////////////////////////////////////////////////// - -/* - * construction - */ - -cdxCDynamicWnd::cdxCDynamicWnd(Freedom fd, UINT nFlags) -: m_pWnd(NULL), - m_iDisabled(0), - m_Freedom(fd), - m_szInitial(M_szNull), - m_szMin(0,0), - m_szMax(0,0), - m_bUseScrollPos(false), - m_pSizeIcon(NULL), - m_idSizeIcon(AFX_IDW_SIZE_BOX), - m_nMyTimerID(0), - m_nFlags(nFlags) -{ -} - - -////////////////////////////////////////////////////////////////////// -// control work -////////////////////////////////////////////////////////////////////// - -/* - * AddSzControl() - * -------------- - * Add a control that will react on changes to the parent window's size. - * hwnd - the child control. - * pos - describes what to do at all. - * bReposNow - true to immediately make the control change its position - * if necessary, false if not - * In the latter case you may like to call Layout() afterwards. - * - * returns false if an invalid window has been passed to this funciton. - */ - -bool cdxCDynamicWnd::AddSzControl(HWND hwnd, const Position & pos, bool bReposNow) -{ - if(!IsWindow()) - { - ASSERT(IsWindow()); - return false; // NO assert if hwnd is invalid - } - - if(!::IsWindow(hwnd)) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::AddSzControl(HWND,const Position &,bool)]: Handle 0x%lx is not a valid window.\n"),(DWORD)hwnd); - return false; - } - - m_Map.SetAt(hwnd,pos); - - if(bReposNow) - UpdateControlPosition(hwnd); - - return true; -} - -/* - * AllControls() - * ------------- - * Apply positioning to all controls of the window. - * bytes - positioning data - * bOverwrite - overwrite any existing positioning data. - * bReposNow - true to immediately make the control change its position - * if necessary, false if not - * In the latter case you may like to call Layout() afterwards. - */ - -void cdxCDynamicWnd::AllControls(const SBYTES & bytes, bool bOverwrite, bool bReposNow) -{ - if(!IsWindow()) - { - ASSERT(false); - return; - } - - Position pos; - UINT nCnt = 0; - - for(HWND hwnd = ::GetWindow(m_pWnd->m_hWnd,GW_CHILD); hwnd; hwnd = ::GetNextWindow(hwnd,GW_HWNDNEXT)) - { - if(bOverwrite || !m_Map.Lookup(hwnd,pos)) - if(AddSzControl(hwnd,bytes,false)) - ++nCnt; - } - - if(nCnt && bReposNow) - Layout(); -} - -/* - * RemSzControl() - * -------------- - * Removes a control from the internal list. - * The control will remain at its initial position if bMoveToInitialPos is false - * Returns false if an error occured. - */ - -bool cdxCDynamicWnd::RemSzControl(HWND hwnd, bool bMoveToInitialPos) -{ - if(!::IsWindow(hwnd) || !IsWindow()) - return false; - - if(bMoveToInitialPos) - { - Position pos; - - if(!m_Map.Lookup(hwnd,pos)) - return false; - - VERIFY( ::SetWindowPos(hwnd,HWND_TOP, - pos.left,pos.top,pos.Width(),pos.Height(), - SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER) ); - } - - return m_Map.RemoveKey(hwnd) != FALSE; -} - -/* - * UpdateControlPosition() - * ======================= - * Move control to its desired position. - * returns false if HWND is not valid. - */ - -bool cdxCDynamicWnd::UpdateControlPosition(HWND hwnd) -{ - if(!IsWindow()) - { - ASSERT(IsWindow()); - return false; // NO assert if hwnd is invalid - } - - if(!::IsWindow(hwnd)) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::UpdateControlPosition()]: Handle 0x%lx is not a valid window.\n"),(DWORD)hwnd); - return false; - } - - cdxCDynamicLayoutInfo *pli = DoCreateLayoutInfo(); - ASSERT(pli != NULL); - - if(!pli || !pli->IsInitial()) - { - try - { - CRect rectNew; - WINDOWPLACEMENT wpl; - wpl.length = sizeof(WINDOWPLACEMENT); - VERIFY(::GetWindowPlacement(hwnd,&wpl) ); - - rectNew = wpl.rcNormalPosition; - - if(DoMoveCtrl(hwnd,::GetDlgCtrlID(hwnd),rectNew,*pli) && - (rectNew != wpl.rcNormalPosition) ) - { - VERIFY( ::SetWindowPos(hwnd,HWND_TOP, - rectNew.left,rectNew.top,rectNew.Width(),rectNew.Height(), - SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER) ); - } - } - catch(...) - { - delete pli; - throw; - } - } - - delete pli; - - return true; -} - - -////////////////////////////////////////////////////////////////////// -// main layout engine -////////////////////////////////////////////////////////////////////// - -/* - * Layout() - * -------- - * Iterates through all child windows and calls DoMoveCtrl() for them. - * This function is NOT virtual. - * To implement your own layout algorithm, please - * a) overwrite DoCreateLayoutInfo() to return an object of a class - * derived from cdxCDynamicLayoutInfo. - * You can put any user-data into your object; it will be passed - * on to the DoMoveCtrl() function. - * b) overwrite DoMoveCtrl() and implement the layout logic. - * An example can be found in the example project, anytime. - */ - -void cdxCDynamicWnd::Layout() -{ - if(!IsWindow()) - { - ASSERT(IsWindow()); - return; - } - - // resize stuff - - cdxCDynamicLayoutInfo *pli = DoCreateLayoutInfo(); - - if(!pli) - { - ASSERT(false); // YOU MUST PROVIDE A LAYOUT INFO BLOCK ! - return; - } - - try - { - HDWP hdwp = ::BeginDeferWindowPos(pli->m_nCtrlCnt); - HWND hwnd; - bool bRepeat; - CRect rectNew; - UINT id; - WINDOWPLACEMENT wpl; - DWORD swpFlags = SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|(!(m_nFlags & flSWPCopyBits) ? SWP_NOCOPYBITS : 0); - - if(!( hwnd = ::GetWindow(m_pWnd->m_hWnd,GW_CHILD) )) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::Layout()]: The window at 0x%lx does not have child windows.\n"),(DWORD)m_pWnd->m_hWnd); - return; - } - - do - { - bRepeat = false; - - for(; hwnd; hwnd = ::GetNextWindow(hwnd,GW_HWNDNEXT)) - { - wpl.length = sizeof(WINDOWPLACEMENT); - - if(!::GetWindowPlacement(hwnd,&wpl)) - { - ASSERT(false); // GetWindowPlacement() failed - continue; - } - - rectNew = wpl.rcNormalPosition; - ASSERT(rectNew.left >= 0); - id = ::GetDlgCtrlID(hwnd); - - if(!DoMoveCtrl(hwnd,id,rectNew,*pli) || - (rectNew == wpl.rcNormalPosition) ) - { - // window doesn't need to be moved - // (position is not been changed) - continue; - } - - if(hdwp) - { - if(!( hdwp = ::DeferWindowPos(hdwp,hwnd,HWND_TOP, - rectNew.left,rectNew.top,rectNew.Width(),rectNew.Height(), - swpFlags) )) - { - TRACE(_T("*** ERROR[cdxCDynamicWnd::ReorganizeControls()]: DeferWindowPos() failed ??\n")); - bRepeat = true; - break; // error; we'll repeat the loop by using SetWindòwPos() - // this won't look good, but work :) - } - } - else - { - VERIFY( ::SetWindowPos(hwnd,HWND_TOP, - rectNew.left,rectNew.top,rectNew.Width(),rectNew.Height(), - swpFlags) ); - } - } - } - while(bRepeat); - - if(hdwp) - { - VERIFY( ::EndDeferWindowPos(hdwp) ); - } - } - catch(...) - { - delete pli; - throw; - } - - delete pli; -} - -////////////////////////////////////////////////////////////////////// -// message work -////////////////////////////////////////////////////////////////////// - -/* - * DoMoveCtrl() - * ------------ - * This virtual function is used to calculate a child window's new position - * based on the some data (from the cdxCDynamicLayoutInfo object). - * This standard routine is made to implement the algorithm as known from - * the cdxCDynamicControlsManager. - * You can implement your own code if you are not satisfied with the - * following function. - * If you need global data, overwrite DoCreateLayoutInfo() which will - * be called by Layout() and which you can use to collect these data - * once for the entire layout process. - * - * PARAMETERS: - * - * hwnd - handle of the child control - * id - its id - * rectNewPos - write the new position here in. - * initially contains the current position - * li - Some information on the parent window. - * You can provide extra information here - * by overwriting DoCreateLayoutInfo(). - * - * RETURN CODES: - * - * return false if you don't want to move the control - * return true if you updated the control's position and stored it into "rectNewPos" - * If you don't change it, the control will not be moved. - * - * #### don't move the control by yourself. Layout() will do for you to ensure - * that as little flickering as possible will occur. - */ - -bool cdxCDynamicWnd::DoMoveCtrl(HWND hwnd, UINT id, CRect & rectNewPos, const cdxCDynamicLayoutInfo & li) -{ - Position pos; - - if(!GetControlPosition(hwnd,pos)) - return false; - - pos.Apply(hwnd,rectNewPos,li); - return true; -} - -/* - * DoDestroyCtrl() - * --------------- - * Called when a child window is about being destroyed. - * We use it to remove our "Position" data from our database. - */ - -void cdxCDynamicWnd::DoDestroyCtrl(HWND hwnd) -{ - m_Map.RemoveKey(hwnd); -} - -////////////////////////////////////////////////////////////////////// -// initialization & clean-uo -////////////////////////////////////////////////////////////////////// - -/* - * DoInitWindow() - * -------------- - * This function sets up the window pointer. - * It is recommended that "rWnd" points to an existing CWnd. - * However, it doesn't need to exist as long as you - * 1) provide a non-zero "szInitial" object. - * 2) don't want a size icon. - * - * PARAMETERS: - * - * rWnd - reference to your window ("*this") - * the window must exist (::IsWindow(rWnd.m_hWnd) must be true) - * fd - Freedom (in which direction(s) your window shall be sizable BY THE USER): - * Possible values: fdAll, fdHorz, fdVert and fdNone. - * This is only applied to user-actions; resizing + layout may work - * even if the freedom parameter is fdNone (in that case user cannot resize - * your window, but you can). - * flags - several flags: - * flSizeIcon - creates a size icon - * flAntiFlicker - activates anti-flickering stuff - * [szInitial - initial client size] - */ - -void cdxCDynamicWnd::DoInitWindow(CWnd & rWnd) -{ - ASSERT(::IsWindow(rWnd.m_hWnd)); // ensure the window exists ... - - m_pWnd = &rWnd; - DoInitWindow(rWnd,GetCurrentClientSize()); -} - -void cdxCDynamicWnd::DoInitWindow(CWnd & rWnd, const CSize & szInitial) -{ - ASSERT(::IsWindow(rWnd.m_hWnd) && szInitial.cx && szInitial.cy); // ensure the window exists ... - - m_pWnd = &rWnd; - m_szInitial = szInitial; - m_szMin = szInitial; - - /* - * this window will flicker somewhat deadly if you do not have the - * WS_CLIPCHILDREN style set for you window. - * You may like to use the following line anywhere - * to apply it: - - CWnd::ModifyStyle(0,WS_CLIPCHILDREN); - - */ - -#ifdef _DEBUG - if(!(rWnd.GetStyle() & WS_CLIPCHILDREN) && !(m_nFlags & flSWPCopyBits)) - { - TRACE(_T("***\n") - _T("*** cdxCDynamicWnd class note: If your window flickers too much, add the WS_CLIPCHILDREN style to it\n") - _T("*** or try to set the flSWPCopyBits flags !!!\n") - _T("***\n")); - } -#endif - - // - // now, if a DYNAMIC MAP is been defined, - // we start working with it - // - - const __dynEntry *pEntry,*pLast = NULL; - UINT nInitCnt = GetCtrlCount(); - - if(pLast = __getDynMap(pLast)) - { - HWND hwnd; - SBYTES bytes; - - for(pEntry = pLast; pEntry->type != __end; ++pEntry) - { - if((pEntry->id != DYNAMIC_MAP_DEFAULT_ID) - && !( hwnd = ::GetDlgItem(m_pWnd->m_hWnd,pEntry->id) )) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::DoInitWindow()]: Dynamic map initialization: There's no control with the id 0x%lx !\n"),pEntry->id); - continue; - } - - switch(pEntry->type) - { - case __bytes: - - bytes[X1] = pEntry->b1; - bytes[Y1] = pEntry->b2; - bytes[X2] = pEntry->b3; - bytes[Y2] = pEntry->b4; - break; - - case __modes: - - _translate((Mode)pEntry->b1,bytes[X1],bytes[X2]); - _translate((Mode)pEntry->b2,bytes[Y1],bytes[Y2]); - break; - - default: - - ASSERT(false); // never come here !!!!! - break; - } - - if(pEntry->id == DYNAMIC_MAP_DEFAULT_ID) - AllControls(bytes,false,false); - else - AddSzControl(hwnd,bytes,M_szNull,false); - } - } - - // - // handle creation flags - // - - if(m_nFlags & flSizeIcon) - { - m_pSizeIcon = new cdxCSizeIconCtrl; - VERIFY( m_pSizeIcon->Create(m_pWnd) ); - - AddSzControl(m_pSizeIcon->m_hWnd,BotRight,M_szNull,false); - m_pSizeIcon->ShowWindow(SW_SHOW); - } - - m_bIsAntiFlickering = false; - m_nMyTimerID = DEFAULT_TIMER_ID; - m_dwClassStyle = ::GetClassLong(*m_pWnd,GCL_STYLE) & (CS_VREDRAW|CS_HREDRAW); - - OnInitialized(); - - if(nInitCnt < GetCtrlCount()) - Layout(); -} - - -/* - * DoDestroyWindow() - * ----------------- - * Clean up. - */ - -void cdxCDynamicWnd::DoOnDestroy() -{ - if(IsWindow()) - OnDestroying(); - - m_iDisabled = 1; - m_pWnd = NULL; - m_Map.RemoveAll(); - - if(m_pSizeIcon) - { - m_pSizeIcon->DestroyWindow(); - delete m_pSizeIcon; - - m_pSizeIcon = NULL; - } -} - -////////////////////////////////////////////////////////////////////// -// message work -////////////////////////////////////////////////////////////////////// - -/* - * DoOnSize() - * ---------- - * Calls Layout() if necessary. - */ - -void cdxCDynamicWnd::DoOnSize(UINT nType, int cx, int cy) -{ - if(!IsDisabled() && - IsWindow() && - (nType != SIZE_MINIMIZED)) - { - Layout(); - } -} - -/* - * DoOnSizing() - * ------------ - * This is my turbo-new-super-duper anti-flickering function - * StartAntiFlickering() is called by the following handler. - */ - -void cdxCDynamicWnd::DoOnSizing(UINT fwSide, LPRECT pRect) -{ - if(m_nMyTimerID && !IsDisabled() && IsWindow() && (m_nFlags & flAntiFlicker)) - StartAntiFlickering( (fwSide == WMSZ_BOTTOM) || - (fwSide == WMSZ_BOTTOMRIGHT) || - (fwSide == WMSZ_RIGHT)); -} - -/* - * StartAntiFlickering() - * --------------------- - * This routine modifies the CS_VREDRAW and CS_HREDRAW CLASS style - * flags. - * If you don't like this, set "m_nMyTimerID" to 0. - * bIsBotRight - true if the window is sized in right, bottom or bot/right direction. - */ - -void cdxCDynamicWnd::StartAntiFlickering(bool bIsBotRight) -{ - if(IsWindow() && m_nMyTimerID) - { - DWORD dw = m_dwClassStyle; - if(bIsBotRight) - dw &= ~(CS_VREDRAW|CS_HREDRAW); - else - dw |= CS_VREDRAW|CS_HREDRAW; - - m_pWnd->KillTimer(m_nMyTimerID); - m_pWnd->SetTimer(m_nMyTimerID,120,NULL); - - if(!m_bIsAntiFlickering) - { - ::SetClassLong(*m_pWnd,GCL_STYLE,dw); - m_bIsAntiFlickering = true; - } - } -} - -/* - * DoOnTimer() - * ----------- - * Processes the timer associated to my DoOnSizing() routine. - * Changes back the class style. - */ - -void cdxCDynamicWnd::DoOnTimer(UINT nIDEvent) -{ - if(IsWindow() && (nIDEvent == m_nMyTimerID)) - { - m_pWnd->KillTimer(m_nMyTimerID); - if(m_bIsAntiFlickering) - { - ::SetClassLong(*m_pWnd,GCL_STYLE,m_dwClassStyle); - m_bIsAntiFlickering = false; - } - } -} - -////////////////////////////////////////////////////////////////////// - -/* - * DoOnGetMinMaxInfo() - * ------------------- - * fill in MINMAXINFO as requested - * Call your CWnd's OnGetMinMaxInfo first ! - * [changed due to a bug reported by Michel Wassink ] - */ - -void cdxCDynamicWnd::DoOnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - if(IsWindow() && !IsDisabled() && IsUp()) - { - CSize szDelta = GetBorderSize(); - - lpMMI->ptMinTrackSize.x = m_szMin.cx + szDelta.cx; - lpMMI->ptMinTrackSize.y = m_szMin.cy + szDelta.cy; - - if(m_Freedom & fdHoriz) - { - if(m_szMax.cx > 0) - lpMMI->ptMaxTrackSize.x = m_szMax.cx + szDelta.cx; - } - else - lpMMI->ptMaxTrackSize.x = lpMMI->ptMinTrackSize.x; - - if(m_Freedom & fdVert) - { - if(m_szMax.cy > 0) - lpMMI->ptMaxTrackSize.y = m_szMax.cy + szDelta.cy; - } - else - lpMMI->ptMaxTrackSize.y = lpMMI->ptMinTrackSize.y; - } -} - -////////////////////////////////////////////////////////////////////// - -/* - * DoOnParentNotify() - * ------------------ - * When a child window is been destroyed, we remove the appropiate - * HWND entries. - */ - -void cdxCDynamicWnd::DoOnParentNotify(UINT message, LPARAM lParam) -{ - if(!lParam || (message != WM_DESTROY)) - return; - - DoDestroyCtrl((HWND)lParam); -} - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h deleted file mode 100644 index 6f18a385..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h +++ /dev/null @@ -1,694 +0,0 @@ -// cdxCDynamicWnd.h: interface for the cdxCDynamicWnd class. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_CDXCDYNAMICWND_H__1FEFDD69_5C1C_11D3_800D_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICWND_H__1FEFDD69_5C1C_11D3_800D_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#include -#include - -class cdxCSizeIconCtrl; -class cdxCDynamicWnd; - -#ifndef DECLARE_CDX_HIDDENFUNC -#define DECLARE_CDX_HIDDENFUNC(name) name -#endif -#ifndef DECLARE_CDX_HIDDENENUM -#define DECLARE_CDX_HIDDENENUM(name) enum name -#endif -#ifndef DECLARE_CDX_HIDDENSTRUCT -#define DECLARE_CDX_HIDDENSTRUCT(name) struct name -#endif - -#pragma warning(disable: 4100) -#pragma warning(disable: 4706) - -/* - * --------------------------- - * cdxCDynamicWnd beta 1 fix 9 - * --------------------------- - * A) To make groupboxes work with WS_CLIPCHILDREN windows, set - * the WS_EX_TRANSPARENT flag for this child window. - * THIS IS NOT A PROBLEM WITH THIS CLASS BUT WITH MFC AT ALL - * (you can check it by test-viewing the group box in the - * resource editor). - * B) The property sheet now has the WS_CLIPCHILDREN flag and it - * uses flSWPCopyBits. - * C) The same applies to cdxCDynamicBar. - * --------------------------- - * cdxCDynamicWnd beta 1 fix 8 - * --------------------------- - * A) Flags flSWPCopyBits added (which will be cleared by default) - * This leads into far less flickering but ensures proper updates - * for all child controls. - * Some controls do need you to clear this flag. - * It ensures that I don't use SWP_NOCOPYBITS. - * (Michel Wassink) - * - * IMPORTANT: - * People should use the WS_CLIPCHILDREN flag for DIALOGS to - * avoid flickering !!!!! - * - * B) Added ModifyFlags() and GetFlags(). - * (To help people modifying my flags) - * --------------------------- - * cdxCDynamicWnd beta 1 fix 7 - * --------------------------- - * A) Bug in two overloads taking SBYTE parameters removed. - * (Uwe Keim) - * --------------------------- - * cdxCDynamicWnd beta 1 fix 6 - * --------------------------- - * A) Added some #pragma warning(disable) to avoid ugly warnings - * when compiling using warning level 4. - * (Rick Hullinger) - * --------------------------- - * cdxCDynamicWnd beta 1 fix 5 - * --------------------------- - * A) AddSzControl(...) overloads for control IDs added - * (Uwe Keim) - * B) Design issue: AddSzControl() with bRepos == true didn't used - * DoMoveCtrl() as it would supposed to be. - * (Hans Bühler, concerning an issue of Roberto del Noce. - * C) Layout-Algorithm little changed: - * If you now want to provide extra information by deriving - * a class from cdxCDynamicLayoutInfo, you no longer overwrite Layout() - * but DoCreateLayoutInfo(). - * (Hans Bühler) - * --------------------------- - * cdxCDynamicWnd beta 1 fix 4 - * --------------------------- - * A) BEGIN_DYNAMIC_MAP() now takes TWO parameters: - * The class itself and its base-class. - * This way even maps defined for bade-classes will work properly. - * (Rick Hullinger) - * If this feature offends your code, define _CDX_SIMPLE_DYNAMIC_MAPS in your - * project's settings to switch back to the old behaviour. - * However, it's strongly recommended to modify the BEGIN_DYNAMIC_MAP() - * declarations since the final release will surely have this feature. - * --------------------------- - * cdxCDynamicWnd beta 1 fix 3 - * --------------------------- - * A) The size icon is now displayed using the right colors. - * --------------------------- - * cdxCDynamicWnd beta 1 fix 2 - * --------------------------- - * A) changed cdxCDynamicWnd::BYTE to cdxCDynamicWnd::SBYTE - * changed cdxCDynamicWnd::BYTES to cdxCDynamicWnd::SBYTES - * to avoid conflicts with Window's BYTE data type. - * (Joshua Jensen) - * B) Dialogs will be centered and sized to 110% by default. - * (Hans Bühler) - * C) Bug when avoiding flAntiFlicker - * --------------------------- - * cdxCDynamicWnd beta 1 fix 1 - * --------------------------- - * A) ::Get/SetWindowPlacement() needs length in structure - * (Joshua Jensen) - */ - - -/* - * cdxCDynamicLayoutInfo - * ===================== - * Layout information class. - * This class is derived from CObject and made dynamic using - * DECLARE_DYNAMIC. - * You can derive your own class from it to provide more information - * to your own DoMoveCtrl() function (if you have one). - */ - -class cdxCDynamicLayoutInfo : public CObject -{ - DECLARE_DYNAMIC(cdxCDynamicLayoutInfo); - -public: - CSize m_szCurrent, // current client size - m_szInitial, // initial client size - m_szDelta; // current - initial - UINT m_nCtrlCnt; // number of controls (>=0) - CPoint m_pntScrollPos; // current scrolling position - bool m_bUseScrollPos; // use scroll pos if m_szDelta < 0 - -public: - cdxCDynamicLayoutInfo() : m_bUseScrollPos(false) - { - } - - cdxCDynamicLayoutInfo(cdxCDynamicWnd *pWnd) : m_bUseScrollPos(false) - { - operator=(pWnd); - } - - virtual ~cdxCDynamicLayoutInfo() - { - } - - bool operator=(cdxCDynamicWnd *pWnd); - - bool IsInitial() const { return !m_szDelta.cx && !m_szDelta.cy && (!m_bUseScrollPos || (!m_pntScrollPos.x && !m_pntScrollPos.y)); } -}; - -/* - * cdxCDynamicWnd - * ============== - * The dynamic window manager. - */ - -class cdxCDynamicWnd -{ -public: - // add sz control mode types - - enum Mode // flags for AddSzControl() - { - mdNone = 0, // does nothing - mdResize = 1, // resize in that dimension - mdRepos = 2, // reposition - mdRelative = 3, // center (size by delta/2 and repos by delta/2) - }; - - // freedom - - enum Freedom - { - fdNone = 0, // might be used but I don't imagine what you want from this ?? - fdHoriz = 0x01, // horizantally sizable only - fdVert = 0x02, // vertically sizable only - fdAll = fdHoriz|fdVert,// sizable in all directions - - fdHorz = fdHoriz, // synonyms - fdX = fdHoriz, - fdY = fdVert - }; - - // some flags - - enum Flags - { - flSizeIcon = 0x01, // create size icon - flAntiFlicker = 0x02, // some utility func - flSWPCopyBits = 0x04, // make SetWindowPos() don't use SWP_NOCOPYBITS. This may lead - // into improper results for SOME child controls but speeds up redrawing (less flickering) - - _fl_reserved_ = 0x0000ffff, // reserved - _fl_freeuse_ = 0xffff0000 // free 4 u - }; - - // some constants - - enum - { - DEFAULT_TIMER_ID = 0x7164 - }; - - // byte percentage - - enum { X1=0, Y1=1, X2=2, Y2=3 }; - - typedef signed char SBYTE; - typedef SBYTE SBYTES[4]; - - // some internal data; might be of any interest for you - - class Position : public CRect - { - public: - - public: - SBYTES m_Bytes; - CSize m_szMin; - - public: - Position() : CRect(0,0,0,0) {} - Position(const CRect & rect, const SBYTES & bytes, const CSize & szMin = M_szNull) : CRect(rect), m_szMin(szMin) { operator=(bytes); } - ~Position() {} - - void operator=(const CRect & rectInitial) { *this = rectInitial; } - void operator=(const SBYTES & bytes) { for(int i=0; i<4; ++i) m_Bytes[i] = bytes[i]; } - void operator=(const CSize & szMin) { m_szMin = szMin; } - - void Apply(HWND hwnd, CRect & rectNewPos, const cdxCDynamicLayoutInfo & li) const; - }; - -private: - CWnd *m_pWnd; // the parent window - cdxCSizeIconCtrl *m_pSizeIcon; // size icon (if wanted) - bool m_bIsAntiFlickering; - -protected: - int m_iDisabled; // disabled counter - DWORD m_dwClassStyle; // stored for AntiFlickering feature - CMap - m_Map; // controllers - -public: - Freedom m_Freedom; // in which direction may we modify the window's size ? - UINT m_nFlags; - CSize m_szInitial; // initial client size - CSize m_szMin, // min/max CLIENT size (set to zero to disable) - m_szMax; - UINT m_idSizeIcon; // id of size icon (default to AFX_IDW_SIZE_BOX) - UINT m_nMyTimerID; // id of the timer used by me - bool m_bUseScrollPos; // use scroll position when moving controls - -public: - cdxCDynamicWnd(Freedom fd, UINT nFlags); - virtual ~cdxCDynamicWnd() { DoOnDestroy(); } - - // - // status - // - - bool IsValid() const { return m_pWnd != NULL; } - bool IsWindow() const { return IsValid() && ::IsWindow(m_pWnd->m_hWnd); } - bool IsUp() const { return IsWindow() && !m_pWnd->IsIconic(); } - bool IsDisabled() const { return m_iDisabled > 0; } - CWnd *Window() const { return m_pWnd; } - - virtual UINT GetCtrlCount() const { return m_Map.GetCount(); } - - // - // basics - // - - bool Enable() { return --m_iDisabled <= 0; } - void Disable() { ++m_iDisabled; } - UINT ModifyFlags(UINT nAdd, UINT nRem = 0) { UINT n = m_nFlags; m_nFlags &= ~nRem; m_nFlags |= nAdd; return n; } - UINT GetFlags() const { return m_nFlags; } - - // - // client size stuff - // - - virtual CSize GetCurrentClientSize() const; - CSize GetBorderSize() const; - - // - // AddSzControl for HWNDs - // - - bool AddSzXControl(HWND hwnd, SBYTE x1, SBYTE x2, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(hwnd,x1,0,x2,0,szMin,bReposNow); } - bool AddSzXControl(HWND hwnd, Mode md, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(hwnd,md,mdNone,szMin,bReposNow); } - bool AddSzYControl(HWND hwnd, SBYTE y1, SBYTE y2, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(hwnd,0,y1,0,y2,szMin,bReposNow); } - bool AddSzYControl(HWND hwnd, Mode md, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(hwnd,mdNone,md,szMin,bReposNow); } - - bool AddSzControl(HWND hwnd, Mode mdX, Mode mdY, const CSize & szMin = M_szNull, bool bReposNow = true); - bool AddSzControl(HWND hwnd, SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2, const CSize & szMin = M_szNull, bool bReposNow = true); - - bool AddSzControl(HWND hwnd, HWND hLikeThis, bool bReposNow = true); - bool AddSzControl(HWND hwnd, const SBYTES & bytes, const CSize & szMin = M_szNull, bool bReposNow = true); - - virtual bool AddSzControl(HWND hwnd, const Position & pos, bool bReposNow = true); // virtual entry point - - // - // AddSzControl for IDss - // - - bool AddSzXControl(UINT id, SBYTE x1, SBYTE x2, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzXControl(GetSafeChildHWND(id),x1,x2,szMin,bReposNow); } - bool AddSzXControl(UINT id, Mode md, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzXControl(GetSafeChildHWND(id),md,szMin,bReposNow); } - bool AddSzYControl(UINT id, SBYTE y1, SBYTE y2, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzYControl(GetSafeChildHWND(id),y1,y2,szMin,bReposNow); } - bool AddSzYControl(UINT id, Mode md, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzYControl(GetSafeChildHWND(id),md,szMin,bReposNow); } - - bool AddSzControl(UINT id, Mode mdX, Mode mdY, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(GetSafeChildHWND(id),mdX,mdY,szMin,bReposNow); } - bool AddSzControl(UINT id, SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(GetSafeChildHWND(id),x1,y1,x2,y2,szMin,bReposNow); } - - bool AddSzControl(UINT id, HWND hLikeThis, bool bReposNow = true) { return AddSzControl(GetSafeChildHWND(id),hLikeThis,bReposNow); } - bool AddSzControl(UINT id, const SBYTES & bytes, const CSize & szMin = M_szNull, bool bReposNow = true) { return AddSzControl(GetSafeChildHWND(id),bytes,szMin,bReposNow); } - - bool AddSzControl(UINT id, const Position & pos, bool bReposNow = true) { return AddSzControl(GetSafeChildHWND(id),pos,bReposNow); } - - // - // all controls - // - - void AllControls(Mode mdX, Mode mdY, bool bOverwrite = false, bool bReposNow = true); - void AllControls(SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2, bool bOverwrite = false, bool bReposNow = true); - void AllControls(const SBYTES & bytes, bool bOverwrite = false, bool bReposNow = true); - - // etc - - bool GetControlPosition(HWND hwnd, Position & pos) { return m_Map.Lookup(hwnd,pos) != FALSE; } - bool RemSzControl(HWND hwnd, bool bMoveToInitialPos = false); - bool UpdateControlPosition(HWND hwnd); - - // - // operational - // - - virtual void Layout(); - - // - // you have to delegate work to these - // - -protected: - void DoInitWindow(CWnd & rWnd, const CSize & szInitial); - void DoInitWindow(CWnd & rWnd); // short-cut - void DoOnDestroy(); - - void DoOnParentNotify(UINT message, LPARAM lParam); - void DoOnTimer(UINT nIDEvent); - void DoOnSize(UINT nType, int cx, int cy); - void DoOnSizing(UINT fwSide, LPRECT pRect); - void DoOnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - - // - // some advanced virtuals - // - -protected: - virtual bool DoMoveCtrl(HWND hwnd, UINT id, CRect & rectNewPos, const cdxCDynamicLayoutInfo & li); - virtual void DoDestroyCtrl(HWND hwnd); - - virtual void OnInitialized() {} - virtual void OnDestroying() {} - - virtual cdxCDynamicLayoutInfo *DoCreateLayoutInfo() { return new cdxCDynamicLayoutInfo(this); } - - // - // misc utility functions - // - -public: - virtual void StartAntiFlickering(bool bIsBotRight); - HWND GetSafeChildHWND(UINT nID); - - // - // some operators - // -public: - operator CWnd * () const { return m_pWnd; } - - // - // private members (hidden from classview) - // -private: - // DON'T USE - DECLARE_CDX_HIDDENFUNC( cdxCDynamicWnd(const cdxCDynamicWnd & w) ) { ASSERT(false); } - void DECLARE_CDX_HIDDENFUNC( operator=(const cdxCDynamicWnd & w) ) { ASSERT(false); } - // helpers - void DECLARE_CDX_HIDDENFUNC( _translate(Mode md, SBYTE & b1, SBYTE & b2) ); - - // - // DYNAMIC_MAPping - // -public: - DECLARE_CDX_HIDDENENUM( __dynEntryType ) - { - __end, - __bytes, - __modes - }; - DECLARE_CDX_HIDDENSTRUCT( __dynEntry ) - { - __dynEntryType type; - UINT id; - SBYTE b1,b2,b3,b4; - }; -protected: - virtual const __dynEntry * DECLARE_CDX_HIDDENFUNC( __getDynMap(const __dynEntry *pLast) ) const { return NULL; } - -public: - static const CSize M_szNull; // for the "Config" class - static const SBYTES TopLeft, - TopRight, - BotLeft, - BotRight; -}; - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicLayoutInfo DYNAMIC MAP macros -///////////////////////////////////////////////////////////////////////////// - -/* - * Macros that can be used to implement an automatic setup - * for any dynamic window. - * If you use these, you don't need to use AddSzControl(): - */ - - -// declare map -#ifndef DECLARE_DYNAMIC_MAP -#define DECLARE_DYNAMIC_MAP() \ -protected: \ - virtual const __dynEntry *__getDynMap(const __dynEntry *pLast) const; \ -private: \ - static const __dynEntry __M_dynEntry[]; -#endif - -// begin the map and set freedom/size icon flags -#ifdef _CDX_SIMPLE_DYNAMIC_MAPS -#ifndef BEGIN_DYNAMIC_MAP -#define BEGIN_DYNAMIC_MAP(CLASS) \ - const cdxCDynamicWnd::__dynEntry *CLASS::__getDynMap(const __dynEntry *pLast) const { return __M_dynEntry; } \ - const cdxCDynamicWnd::__dynEntry CLASS::__M_dynEntry[] = { -#endif -#else - -// begin a dynamic map that even takes care of maps defined for base-class versions -#ifndef BEGIN_DYNAMIC_MAP -#define BEGIN_DYNAMIC_MAP(CLASS,BASECLASS) \ - const cdxCDynamicWnd::__dynEntry *CLASS::__getDynMap(const __dynEntry *pLast) const\ - { \ - if(pLast == __M_dynEntry) \ - return NULL; \ - return (pLast = BASECLASS::__getDynMap(pLast)) ? pLast : __M_dynEntry; \ - } \ - const cdxCDynamicWnd::__dynEntry CLASS::__M_dynEntry[] = { -#endif -#endif - -// end up map -#ifndef END_DYNAMIC_MAP -#define END_DYNAMIC_MAP() { cdxCDynamicWnd::__end } }; -#endif - -// declare operations -#ifndef DYNAMIC_MAP_ENTRY_EX -#define DYNAMIC_MAP_ENTRY_EX(ID,X1,Y1,X2,Y2) { cdxCDynamicWnd::__bytes, ID, X1,Y1,X2,Y2 }, -#define DYNAMIC_MAP_XENTRY_EX(ID,X1,X2) DYNAMIC_MAP_ENTRY_EX(ID,X1,0,X2,0) -#define DYNAMIC_MAP_YENTRY_EX(ID,Y1,Y2) DYNAMIC_MAP_ENTRY_EX(ID,0,Y1,0,Y2) -#define DYNAMIC_MAP_ENTRY(ID,MODEX,MODEY) { cdxCDynamicWnd::__modes, ID, cdxCDynamicWnd::##MODEX,cdxCDynamicWnd::##MODEY }, -#define DYNAMIC_MAP_XENTRY(ID,MODEX) DYNAMIC_MAP_XENTRY(ID,MODEX,mdNone) -#define DYNAMIC_MAP_YENTRY(ID,MODEY) DYNAMIC_MAP_YENTRY(ID,mdNone,MODEY) -#endif - -// use this ID for the default position at the head of your map -#ifndef DYNAMIC_MAP_DEFAULT_ID -#define DYNAMIC_MAP_DEFAULT_ID 0 -#endif - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicLayoutInfo inlines -///////////////////////////////////////////////////////////////////////////// - -/* - * auto-fill in struct - */ - -inline bool cdxCDynamicLayoutInfo::operator=(cdxCDynamicWnd *pWnd) -{ - if(!pWnd || !pWnd->IsUp()) - return false; - - m_szCurrent = pWnd->GetCurrentClientSize(); - m_szInitial = pWnd->m_szInitial; - m_szDelta = m_szCurrent - m_szInitial; - m_nCtrlCnt = pWnd->GetCtrlCount(); - - if(m_bUseScrollPos == pWnd->m_bUseScrollPos) - { - m_pntScrollPos.x = pWnd->Window()->GetScrollPos(SB_HORZ); - m_pntScrollPos.y = pWnd->Window()->GetScrollPos(SB_VERT); - } - - return true; -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicWnd inlines -///////////////////////////////////////////////////////////////////////////// - -/* - * Add a control - */ - -inline bool cdxCDynamicWnd::AddSzControl(HWND hwnd, const SBYTES & bytes, const CSize & szMin, bool bReposNow) -{ - if(!::IsWindow(hwnd)) - { - // Note that this might happen if you call - TRACE(_T("*** NOTE[cdxCDynamicWnd::AddSzControl(HWND,const SBYTES &,const CSize &,bool)]: Handle 0x%lx is not a valid window.\n"),(DWORD)hwnd); - return false; - } - - WINDOWPLACEMENT wpl; - wpl.length = sizeof(WINDOWPLACEMENT); - VERIFY( ::GetWindowPlacement(hwnd,&wpl) ); - - return AddSzControl(hwnd,Position(wpl.rcNormalPosition,bytes,szMin),bReposNow); -} - -/* - * Add control that behaves like another - */ - -inline bool cdxCDynamicWnd::AddSzControl(HWND hwnd, HWND hLikeThis, bool bReposNow) -{ - if(!::IsWindow(hwnd)) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::AddSzControl(HWND,HWND,bool)]: Handle 0x%lx is not a valid window.\n"),(DWORD)hwnd); - return false; - } - - Position pos; - - if(!m_Map.Lookup(hLikeThis,pos)) - { - TRACE(_T("*** NOTE[cdxCDynamicWnd::AddSzControl(HWND,HWND,bool)]: For the 'hLikeThis' handle 0x%lx there hasn't been made an entry for yet.\n"),(DWORD)hLikeThis); - return false; - } - - return AddSzControl(hwnd,pos); -} - -/* - * old - */ - -inline bool cdxCDynamicWnd::AddSzControl(HWND hwnd, Mode mdX, Mode mdY, const CSize & szMin, bool bReposNow) -{ - SBYTES b; - _translate(mdX,b[X1],b[X2]); - _translate(mdY,b[Y1],b[Y2]); - return AddSzControl(hwnd,b,szMin,bReposNow); -} - -/* - * old - */ - -inline bool cdxCDynamicWnd::AddSzControl(HWND hwnd, SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2, const CSize & szMin, bool bReposNow) -{ - SBYTES b; - b[X1] = x1, - b[X2] = x2, - b[Y1] = y1, - b[Y2] = y2; - return AddSzControl(hwnd,b,szMin,bReposNow); -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * short-cut - */ - -inline void cdxCDynamicWnd::AllControls(Mode mdX, Mode mdY, bool bOverwrite, bool bReposNow) -{ - SBYTES b; - _translate(mdX,b[X1],b[X2]); - _translate(mdY,b[Y1],b[Y2]); - AllControls(b,bOverwrite,bReposNow); -} - - -/* - * short-cut - */ - -inline void cdxCDynamicWnd::AllControls(SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2, bool bOverwrite, bool bReposNow) -{ - SBYTES b; - b[X1] = x1, - b[X2] = x2, - b[Y1] = y1, - b[Y2] = y2; - AllControls(b,bOverwrite,bReposNow); -} - - -///////////////////////////////////////////////////////////////////////////// - -/* - * get size of current client area - */ - -inline CSize cdxCDynamicWnd::GetCurrentClientSize() const -{ - if(!IsWindow()) - { - ASSERT(false); - return M_szNull; - } - - CRect rect; - m_pWnd->GetClientRect(rect); - - return rect.Size(); -} - -/* - * get difference between window and client size - */ - -inline CSize cdxCDynamicWnd::GetBorderSize() const -{ - if(!IsUp()) - { - ASSERT(false); - return M_szNull; - } - - CRect r1,r2; - m_pWnd->GetWindowRect(r1); - m_pWnd->GetClientRect(r2); - - return r1.Size() - r2.Size(); -} - -///////////////////////////////////////////////////////////////////////////// - -/* - * translates a "mode" into percentage - */ - -inline void cdxCDynamicWnd::_translate(Mode md, SBYTE & b1, SBYTE & b2) -{ - switch(md) - { - default : ASSERT(false); - case mdNone : b1 = 0; b2 = 0; break; - case mdResize : b1 = 0; b2 = 100; break; - case mdRepos : b1 = 100; b2 = 100; break; - case mdRelative : b1 = 50; b2 = 50; break; - } -} - -/* - * gets HWND of a child given by ID - */ - -inline HWND cdxCDynamicWnd::GetSafeChildHWND(UINT nID) -{ - if(!IsWindow()) - { - ASSERT(false); - return 0; - } - - HWND h = ::GetDlgItem(m_pWnd->m_hWnd,nID); - ASSERT(h!=0); - return h; -} - -#pragma warning(default: 4100) -#pragma warning(default: 4706) - -#endif // !defined(AFX_CDXCDYNAMICWND_H__1FEFDD69_5C1C_11D3_800D_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp deleted file mode 100644 index 1ba65a8d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp +++ /dev/null @@ -1,327 +0,0 @@ -// cdxCDynamicWndEx.cpp: implementation of the cdxCDynamicWndEx class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "cdxCDynamicWndEx.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - -///////////////////////////////////////////////////////////////////////////// -// Some static variables (taken from cdxCDynamicControlsManager) -///////////////////////////////////////////////////////////////////////////// - -#define REGVAL_NOSTATE -1 -#define REGVAL_VISIBLE 1 -#define REGVAL_HIDDEN 0 -#define REGVAL_MAXIMIZED 1 -#define REGVAL_ICONIC 0 -#define REGVAL_INVALID 0 -#define REGVAL_VALID 1 - -/* - * registry value names - * (for StoreWindowPosition()/RestoreWindowPosition()) - */ - -static LPCTSTR lpszRegVal_Left = _T("Left"), - lpszRegVal_Right = _T("Right"), - lpszRegVal_Top = _T("Top"), - lpszRegVal_Bottom = _T("Bottom"), - lpszRegVal_Visible = _T("Visibility"), - lpszRegVal_State = _T("State"), - lpszRegVal_Valid = _T("(valid)"); - -LPCTSTR cdxCDynamicWndEx::M_lpszAutoPosProfileSection = _T("WindowPositions"); - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicWndEx -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicWndEx stretches windows -///////////////////////////////////////////////////////////////////////////// - -static inline CString _makeFullProfile(LPCTSTR lpszBase, const CString & str) -{ - CString s = lpszBase; - - if(s.GetLength() && (s[s.GetLength()-1] != _T('\\'))) - s += _T('\\'); - - s += str; - return s; -} - -void cdxCDynamicWndEx::OnInitialized() -{ - ASSERT(IsWindow()); - - if(!m_strAutoPos.IsEmpty()) - { -#if _MSC_VER < 1300 // vc6 - if(!RestoreWindowPosition(_makeFullProfile(M_lpszAutoPosProfileSection,m_strAutoPos),rflg_all)) -#else // vc7 - if(!RestoreWindowPosition(_makeFullProfile(M_lpszAutoPosProfileSection,m_strAutoPos),"",rflg_all)) -#endif - { - Window()->CenterWindow(); - StretchWindow(10); - } - } -} - -void cdxCDynamicWndEx::OnDestroying() -{ - if(!m_strAutoPos.IsEmpty() && IsWindow()) - StoreWindowPosition(_makeFullProfile(M_lpszAutoPosProfileSection,m_strAutoPos)); -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicWndEx stretches windows -///////////////////////////////////////////////////////////////////////////// - -/* - * stretches the window by szDelta (i.e. if szDelta is 100, the window is enlarged by 100 pixels) - * stretching means that the center point of the window remains - * - * returns false if the window would be smaller than (1,1) - * - * NOTE: this function does NOT care of the min/max dimensions of a window - * Use MoveWindow() if you need to take care of it. - * - * STATIC - */ - -bool cdxCDynamicWndEx::StretchWindow(const CSize & szDelta) -{ - if(!IsWindow()) - { - ASSERT(false); - return false; - } - - CWnd *pWnd = Window(); - - WINDOWPLACEMENT wpl; - pWnd->GetWindowPlacement(&wpl); - - wpl.rcNormalPosition.left -= szDelta.cx / 2; - wpl.rcNormalPosition.right += (szDelta.cx + 1) / 2; - wpl.rcNormalPosition.top -= szDelta.cy / 2; - wpl.rcNormalPosition.bottom += (szDelta.cy + 1) / 2; -// wpl.flags = SW_SHOWNA|SW_SHOWNOACTIVATE; - - if((wpl.rcNormalPosition.left >= wpl.rcNormalPosition.right) || - (wpl.rcNormalPosition.top >= wpl.rcNormalPosition.bottom)) - return false; - - VERIFY( pWnd->SetWindowPos(NULL, - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.top, - wpl.rcNormalPosition.right - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.bottom - wpl.rcNormalPosition.top, - SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER) ); - - return true; -} - -/* - * stretch window by a percent value - * the algorithm calculates the new size for both dimensions by: - * - * newWid = oldWid + (oldWid * iAddPcnt) / 100 - * - * NOTE: iAddPcnt may even be nagtive, but it MUST be greater than -100. - * NOTE: this function does NOT care of the min/max dimensions of a window - * - * The function will return false if the new size would be empty. - */ - -bool cdxCDynamicWndEx::StretchWindow(int iAddPcnt) -{ - if(!IsWindow()) - { - ASSERT(false); - return false; - } - - CSize szDelta = GetCurrentClientSize() + GetBorderSize(); - - szDelta.cx = (szDelta.cx * iAddPcnt) / 100; - szDelta.cy = (szDelta.cy * iAddPcnt) / 100; - - return StretchWindow(szDelta); -} - - -///////////////////////////////////////////////////////////////////////////// -// cdxCDynamicWndEx registry positioning -///////////////////////////////////////////////////////////////////////////// - -/* - * stores a window's position and visiblity to the registry. - * return false if any error occured - */ - -bool cdxCDynamicWndEx::StoreWindowPosition(LPCTSTR lpszProfile, - const CString &entryPrefix) -{ - if(!IsWindow() || !lpszProfile || !*lpszProfile) - { - ASSERT(false); - return false; - } - - CWnd *pWnd = Window(); - - WINDOWPLACEMENT wpl; - VERIFY( pWnd->GetWindowPlacement(&wpl) ); - - BOOL bVisible = pWnd->IsWindowVisible(); - int iState = REGVAL_NOSTATE; - - if(pWnd->IsIconic()) - iState = REGVAL_ICONIC; - else - if(pWnd->IsZoomed()) - iState = REGVAL_MAXIMIZED; - - CWinApp *app = AfxGetApp(); - - if(!app->m_pszRegistryKey || !*app->m_pszRegistryKey) - { - TRACE(_T("*** NOTE[cdxCDynamicWndEx::StoreWindowPosition()]: To properly store and restore a window's position, please call CWinApp::SetRegistryKey() in you app's InitInstance() !\n")); - return false; - } - - return app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Valid, REGVAL_INVALID) && // invalidate first - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Left, wpl.rcNormalPosition.left) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Right, wpl.rcNormalPosition.right) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Top, wpl.rcNormalPosition.top) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Bottom, wpl.rcNormalPosition.bottom) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Visible, bVisible ? REGVAL_VISIBLE : REGVAL_HIDDEN) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_State, iState) && - app->WriteProfileInt(lpszProfile, entryPrefix+lpszRegVal_Valid, REGVAL_VALID); // validate position -} - -/* - * load the registry data stored by StoreWindowPosition() - * returns true if data have been found in the registry - */ - -bool cdxCDynamicWndEx::RestoreWindowPosition(LPCTSTR lpszProfile, - const CString &entryPrefix, - UINT restoreFlags) -{ - if(!IsWindow() || !lpszProfile || !*lpszProfile) - { - ASSERT(false); - return false; - } - - CWnd *pWnd = Window(); - CWinApp *app = AfxGetApp(); - - if(!app->m_pszRegistryKey || !*app->m_pszRegistryKey) - { - TRACE(_T("*** NOTE[cdxCDynamicWndEx::RestoreWindowPosition()]: To properly store and restore a window's position, please call CWinApp::SetRegistryKey() in you app's InitInstance() !\n")); - return false; - } - - // - // first, we check whether the position had been saved successful any time before - // - - if( app->GetProfileInt(lpszProfile,entryPrefix+lpszRegVal_Valid,REGVAL_INVALID) != REGVAL_VALID ) - return false; - - // - // get old position - // - - WINDOWPLACEMENT wpl; - VERIFY( pWnd->GetWindowPlacement(&wpl) ); - - // - // read registry - // - - int iState = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_State, REGVAL_NOSTATE); - - // - // get window's previous normal position - // - - wpl.rcNormalPosition.left = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_Left, wpl.rcNormalPosition.left); - wpl.rcNormalPosition.right = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_Right, wpl.rcNormalPosition.right); - wpl.rcNormalPosition.top = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_Top, wpl.rcNormalPosition.top); - wpl.rcNormalPosition.bottom = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_Bottom, wpl.rcNormalPosition.bottom); - - if(wpl.rcNormalPosition.left > wpl.rcNormalPosition.right) - { - long l = wpl.rcNormalPosition.right; - wpl.rcNormalPosition.right = wpl.rcNormalPosition.left; - wpl.rcNormalPosition.left = l; - } - if(wpl.rcNormalPosition.top > wpl.rcNormalPosition.bottom) - { - long l = wpl.rcNormalPosition.bottom; - wpl.rcNormalPosition.bottom = wpl.rcNormalPosition.top; - wpl.rcNormalPosition.top = l; - } - - // - // get restore stuff - // - - UINT showCmd = SW_SHOWNA; - - if(restoreFlags & rflg_state) - { - if(iState == REGVAL_MAXIMIZED) - showCmd = SW_MAXIMIZE; - else - if(iState == REGVAL_ICONIC) - showCmd = SW_MINIMIZE; - } - - // - // use MoveWindow() which takes care of WM_GETMINMAXINFO - // - - pWnd->MoveWindow( wpl.rcNormalPosition.left,wpl.rcNormalPosition.top, - wpl.rcNormalPosition.right - wpl.rcNormalPosition.left, - wpl.rcNormalPosition.bottom - wpl.rcNormalPosition.top, - showCmd == SW_SHOWNA); - - if(showCmd != SW_SHOWNA) - { - // read updated position - - VERIFY( pWnd->GetWindowPlacement(&wpl) ); - wpl.showCmd = showCmd; - pWnd->SetWindowPlacement(&wpl); - } - - // - // get visiblity - // - - if(restoreFlags & rflg_visibility) - { - int i = app->GetProfileInt(lpszProfile, entryPrefix+lpszRegVal_Visible, REGVAL_NOSTATE); - if(i == REGVAL_VISIBLE) - pWnd->ShowWindow(SW_SHOW); - else - if(i == REGVAL_HIDDEN) - pWnd->ShowWindow(SW_HIDE); - } - - return true; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.h deleted file mode 100644 index eb55baee..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.h +++ /dev/null @@ -1,72 +0,0 @@ -// cdxCDynamicWndEx.h: interface for the cdxCDynamicWndEx class. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_CDXCDYNAMICWNDEX_H__96C8C1D4_6524_11D3_8030_000000000000__INCLUDED_) -#define AFX_CDXCDYNAMICWNDEX_H__96C8C1D4_6524_11D3_8030_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#include "cdxCDynamicWnd.h" - -/* - * cdxCDynamicWndEx - * ================ - * A class extended to offer some useful additions. - */ - -class cdxCDynamicWndEx : public cdxCDynamicWnd -{ -public: - enum RestoreFlags - { - rflg_none = 0, // only load window position - rflg_state = 0x01, // make window iconic/zoomed if been before - rflg_visibility = 0x02, // hide/show window as been before - rflg_all = rflg_state|rflg_visibility - }; - - enum ExFlags - { - flAutoPos = 0x0100 - }; - -private: - CString m_strAutoPos; - -public: - cdxCDynamicWndEx(Freedom fd, UINT nFlags) : cdxCDynamicWnd(fd,nFlags) {} - virtual ~cdxCDynamicWndEx() {} - - // - // utilities - // - - bool StretchWindow(const CSize & szDelta); - bool StretchWindow(int iAddPcnt); - bool RestoreWindowPosition(LPCTSTR lpszProfile, const CString &entryPrefix = "", UINT restoreFlags = rflg_all); - bool StoreWindowPosition(LPCTSTR lpszProfile, const CString &entryPrefix = ""); - - // - // feature one: auto-positioning :) - // - - void ActivateAutoPos(UINT nID) { m_strAutoPos.Format(_T("ID=0x%08lx"),nID); } - void ActivateAutoPos(const CString & strID) { m_strAutoPos = strID; } - void NoAutoPos() { m_strAutoPos.Empty(); } - - // - // we need these - // - -protected: - virtual void OnInitialized(); - virtual void OnDestroying(); - -public: - static LPCTSTR M_lpszAutoPosProfileSection; -}; - -#endif // !defined(AFX_CDXCDYNAMICWNDEX_H__96C8C1D4_6524_11D3_8030_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp deleted file mode 100644 index ec15f2c5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// cdxCSizeIconCtrl.cpp : implementation file -// - -#include "stdafx.h" -#include "cdxCSizeIconCtrl.h" - -#include - -#ifndef OBM_SIZE -#define OBM_SIZE 32766 -#pragma message("*** NOTE[cdxCSizeIconCtrl.cpp]: Please define OEMRESOURCE in your project settings !") -// taken from WinresRc.h -// if not used for any reason -#endif - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -#pragma warning(disable: 4100) - -///////////////////////////////////////////////////////////////////////////// -// cdxCSizeIconCtrl::AutoOEMImageList -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// construction -///////////////////////////////////////////////////////////////////////////// - -/* - * one-step construction for my image list - * (allows to use the AutoOEMImageList as static member) - */ - -cdxCSizeIconCtrl::AutoOEMImageList::AutoOEMImageList(UINT nBitmapID, COLORREF crMask) -{ - CBitmap cbmp; - BITMAP bmp; - VERIFY( cbmp.LoadOEMBitmap(nBitmapID) ); - VERIFY( cbmp.GetBitmap(&bmp) ); - - m_szImage.cx = bmp.bmWidth; - m_szImage.cy = bmp.bmHeight; - - InitCommonControls(); - - VERIFY( Create(bmp.bmWidth,bmp.bmHeight,ILC_COLOR16|ILC_MASK,0,1) ); - int i = Add(&cbmp,crMask); - ASSERT(i == 0); -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCSizeIconCtrl -///////////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC(cdxCSizeIconCtrl,CScrollBar); - -///////////////////////////////////////////////////////////////////////////// - -cdxCSizeIconCtrl::AutoOEMImageList cdxCSizeIconCtrl::M_ilImage(OBM_SIZE,::GetSysColor(COLOR_BTNFACE)); -HCURSOR cdxCSizeIconCtrl::M_hcSize = ::LoadCursor(NULL,IDC_SIZENWSE); - -///////////////////////////////////////////////////////////////////////////// -// construction -///////////////////////////////////////////////////////////////////////////// - -BEGIN_MESSAGE_MAP(cdxCSizeIconCtrl, CScrollBar) - //{{AFX_MSG_MAP(cdxCSizeIconCtrl) - ON_WM_PAINT() - ON_WM_SETCURSOR() - ON_WM_LBUTTONDBLCLK() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// cdxCSizeIconCtrl inlines -///////////////////////////////////////////////////////////////////////////// - -/* - * create short-cut - */ - -BOOL cdxCSizeIconCtrl::Create(CWnd *pParent, UINT id) -{ - ASSERT(pParent != NULL); - CRect rect;pParent->GetClientRect(&rect); - if(!CScrollBar::Create( SBS_SIZEBOX|SBS_SIZEBOXBOTTOMRIGHTALIGN| - WS_CHILD, - rect, - pParent,id)) - return FALSE; - - VERIFY( ModifyStyleEx(0,WS_EX_TRANSPARENT) ); - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCSizeIconCtrl message handlers -///////////////////////////////////////////////////////////////////////////// - -/* - * draw icon - */ - -void cdxCSizeIconCtrl::OnPaint() -{ - CPaintDC dc(this); // device context for painting - - if(GetParent() && (!GetParent()->IsZoomed() || !m_bReflectParentState)) - { - CRect rect;GetClientRect(&rect); - CSize sz = M_ilImage.Size(); - - VERIFY( M_ilImage.Draw( &dc, - 0, - CPoint(rect.right - sz.cx,rect.bottom - sz.cy), - ILD_NORMAL|ILD_TRANSPARENT) ); - } -} - -///////////////////////////////////////////////////////////////////////////// -// cdxCSizeIconCtrl Cursor -///////////////////////////////////////////////////////////////////////////// - -/* - * set the cursor. - */ - -BOOL cdxCSizeIconCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) -{ - if(GetParent() && (!GetParent()->IsZoomed() || !m_bReflectParentState)) - ::SetCursor((nHitTest == HTCLIENT) ? M_hcSize : NULL); - return TRUE; -} - -/* - * catch Doubleclick - if you don't do that, - * the window will be maximized if you double-blick - * the control. - * Don't know why, but it's annoying. - */ - -void cdxCSizeIconCtrl::OnLButtonDblClk(UINT nFlags, CPoint point) -{ -// CScrollBar::OnLButtonDblClk(nFlags, point); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.h deleted file mode 100644 index 3672918b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.h +++ /dev/null @@ -1,95 +0,0 @@ -#if !defined(AFX_CDXCSIZEICONCTRL_H__9B4AD1C3_8AA5_11D2_BE9C_000000000000__INCLUDED_) -#define AFX_CDXCSIZEICONCTRL_H__9B4AD1C3_8AA5_11D2_BE9C_000000000000__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// cdxCSizeIconCtrl.h : header file -// - -// -// cdxCSizeIconCtrl.h : header file -// ----------------------------------------------------------------------- -// Author: Hans Bühler (hb@codex-design.de) -// codex design (http://www.codex-design.de) -// Version: 1.3 -// ----------------------------------------------------------------------- -// Changes for 1.1: -// - cdxCSizeIconCtrl catches left-mb-doubleclick what caused the window -// to get maximized for any reason. -// Changes for 1.2: -// - Ability to check parent's state: If it is zoomed, the control won't -// draw a sizing icon. -// Changes for 1.3: -// - Icon now has proper colors. -// ----------------------------------------------------------------------- -// Comments welcome. -// - -/* - * cdxCSizeIconCtrl - * ================ - * A simple class that is a size-icon. - * - * (w)Nov.1998 mailto:hans.buehler@student.hu-berlin.de, - * codex design - */ - -class cdxCSizeIconCtrl : public CScrollBar -{ - DECLARE_DYNAMIC(cdxCSizeIconCtrl); - -public: - class AutoOEMImageList : public CImageList - { - private: - CSize m_szImage; - - public: - AutoOEMImageList(UINT nBitmapID, COLORREF crMask); - virtual ~AutoOEMImageList() {} - - const CSize & Size() const { return m_szImage; } - }; - -private: - bool m_bCapture; -public: - bool m_bReflectParentState; - -public: - cdxCSizeIconCtrl(bool bReflectParentState = true) : m_bCapture(false), m_bReflectParentState(bReflectParentState) {} - virtual ~cdxCSizeIconCtrl() {} - - virtual BOOL Create(CWnd *pParent, UINT id = AFX_IDW_SIZE_BOX); - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(cdxCSizeIconCtrl) - //}}AFX_VIRTUAL - - // Generated message map functions -protected: - //{{AFX_MSG(cdxCSizeIconCtrl) - afx_msg void OnPaint(); - afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); - afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP(); - - // - // static members - // -public: - static AutoOEMImageList M_ilImage; - static HCURSOR M_hcSize; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CDXCSIZEICONCTRL_H__9B4AD1C3_8AA5_11D2_BE9C_000000000000__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-big.gif b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-big.gif deleted file mode 100644 index 76d580e0..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-big.gif and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-small.gif b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-small.gif deleted file mode 100644 index 7dd937f9..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-small.gif and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC.html b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC.html deleted file mode 100644 index 6b5798ff..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC.html +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - -

- -

cdxCDynamicWnd and -derived classes
-by Hans Bühler : codex -design

- -

documentation

- -

[ preface | about | techniques -| a dynamic dialog | finally -]

- -

1 | Preface, Definition

- -
-

Definiton:
- A dynamic window is a window that automatically - repositions its child controls when its size changes.
- The opposite behaviour is called static.

-

The classes described here will help you implementing dynamic dialogs, - formviews, property sheets and control bars.

-

It replaces my former class tree "cdxCSizingDialog, ...".

-
- -

2 | About this document

- -
-

Since I found out that not many of you seem to like - reading documentation, I shortened this documentation.
- If you have any suggestions, problems or questions that are - not covered by this text, feel free to write an email - to me.

-

As a result, I won't discuss all my member functions but - will give you a quick introduction in making windows dynamic.
- The basic example will be a dialog.
- The technique is nearly the same for property sheets, - formviews and control bars.

-

Here it is:

-
-

small window
- (picture#1)

-
-
- -
-

We want to make it dynamic i.e. it should - look like this if you change its size:

-
-

big window
- (picture #2)

-
-
- -

3 | Techniques

- -
-

The cdxCDynamicWnd class is a base class of all the ready-to-use classes as - cdxCDynamicDialog.
- To implement the resizing code, you need to tell the cdxCDynamicWnd object, - which of your child controls should react on a resizing of your windows and - how.

- -

To do so, there are now two techniques:

- -
    -
  • Using AddSzControl():
    -     As you may know from my former cdxCSizing... classes, you use one of - the AddSzControl() overloads to make the dynamic window known to a child - window of it.
    - In the upper example window, you would add the following lines to your - OnInitDialog() code:
    • -
-
-
-
-

AddSzControl(IDC_BOX_1,mdResize,mdResize);
- AddSzControl(IDC_LIST,mdResize,mdResize);
- AddSzControl(IDC_EDIT,mdResize,mdRepos);
- AddSzControl(IDC_NEW,mdRepos,mdRepos);
- AddSzControl(IDOK,mdRelative,mdRepos);
- AddSzControl(IDCANCEL,mdRelative,mdRepos);

-
-
-
    -
  • The first argument is the ID of the child control to make known to the - dynamic window (note that we do not assign IDC_CHECKBOX since this - control does not need to react on changes to the window's size).
    • -
  • The second argument defines how the control should be treated if the - window's width changes,
    - The third defines how to deal with height-changes:
    - You can choose among the following constants:
    - - mdNone (do nothing)
    - - mdRepos (move to left)
    - - mdResize (resize)
    - - mdRelative (keep relative position; e.g. keep centered if control was - centered before)
    • -
-

Among others, the following overloads of AddSzControl() are defined (the wnd - parameter might be either an ID or a HWND object while a CWnd casts properly - to a HWND):

-
-
-

AddSzControl(wnd, Mode mdX, Mode mdY);
- AddSzXControl(wnd, Mode md);
- AddSzYControl(hwnd, Mode md);

-
-
-

If you are not satisfied with my predefined modes, you can make your own:
- The following overload takes two bytes for each direction: They defined how - much percent of the change in width should be added to the left side of the - the child control (x1) and to the right side (x2) (equally for - height changes):

-
-
-

AddSzControl(wnd, SBYTE x1, SBYTE y1, SBYTE x2, SBYTE y2);
- AddSzXControl(wnd, SBYTE x1, SBYTE x2);
- AddSzYControl(wnd, SBYTE y1, SBYTE y2); -

-

My predefined modes have the following values:
- - mdNone is (x1=0,x2=0)
- - mdRepos is (100,100)
- - mdResize is (0,100)
- - mdRelative is (50,50)

-
-
-

Depending on the base class you use the following functions are suitable - places to call AddSzControl():

-
    -
  • Dialog: OnInitDialog()
    • -
  • FormView: OnInitialUpdate()
    • -
  • PropPage: OnInitDialog()
    • -
-
-
    -
  • Using my new dynamic maps:
    -     Some people noted that it is annoying to use the AddSzControl() method - since they don't need OnInitDialog() for example - only for the - AddSzControl() code.
    - Therefore I added the dynamic maps feature.
    - To use it, add the line DECLARE_DYNAMIC_MAP() to your class definition, - and add something like:
    • -
-
-
-

BEGIN_DYNAMIC_MAP(CTestDlg,cdxCDynamicDialog)
-     DYNAMIC_MAP_ENTRY(IDC_BOX_1, mdResize, mdResize)
-     DYNAMIC_MAP_ENTRY(IDC_LIST1, mdResize, mdResize)
-     DYNAMIC_MAP_ENTRY(IDC_EDIT, mdResize, mdRepos)
-     DYNAMIC_MAP_ENTRY(IDC_NEW, mdRepos, mdRepos)
-     DYNAMIC_MAP_ENTRY(IDOK, mdRelative, mdRepos)
-     DYNAMIC_MAP_ENTRY(IDCANCEL, mdRelative, mdRepos)
- END_DYNAMIC_MAP()

-
-

If you compare these lines to the above AddSzControl() statements, you'll - note that they act similarily.
- The following macros are defined:

-
-

DYNAMIC_MAP_ENTRY(ID,MODEX,MODEY)
- DYNAMIC_MAP_XENTRY(ID,MODEX)
- DYNAMIC_MAP_YENTRY(ID,MODEY)

-

DYNAMIC_MAP_ENTRY_EX(ID,X1,Y1,X2,Y2)
- DYNAMIC_MAP_XENTRY_EX(ID,X1,X2)
- DYNAMIC_MAP_YENTRY_EX(ID,Y1,Y2)

-
-
-
- -

4 | Example: How to create a dynamic dialog

- -
-
    -
  1. A dialog:
    - I suggest that you used your dialog resource editor - to design a dialog as shown in picture #1.
    - The names of the controls should indicate their - control IDs.
    - Important note #1: - Every control that should dynamically move need a - unique ID (=> it is not possible to move static - texts with IDC_STATIC). -
    -     Moreoever, I assume that you have created a - dialog class called "CTestDlg" for this - dialog.
    -
    -
    2. -
  2. Resizable border and WS_CLIPCHILDREN for your dialog:
    -     Please open your dialog's properties (in the - resource editor), go to the tab "Styles" - and change the "Border" into "resizing" - (otherwise use won't be able to resize your dialog - although it might be dynamic by code).
    - Then, switch to the first tab and activate "clip children".
    -
    - NOTE: If "clip children" is on and you use group - boxes, these boxes need the WS_EX_TRANSPARENT style (can be found - at the "extended styles" tab of the group box).
    - This is not a problem with these classes but with the MFC at all !
    -
    -
    3. -
  3. Changing the base-class of your dialog:
    - Open your dialog classes header file, add an
    - #include "cdxCDynamicDialog.h"
    - to its head and replace all "CDialog" by - "cdxCDynamicDialog" in both your header and - implementation file.
    -
    -
    4. -
  4. Define how childs should be moved:
    -     Since this release, you can choose among the two techniques - described above to implement this behaviour (they can - be mixed if you need that).
    -
    - See above to learn how to do so.
    -
    -
    5. -
  5. Compile and run.
    -
    -     -
    6. -
  6. Open your constructor and try to add  - - ModifyFlags(flSWPCopyBits,0)  to your code.
    - This is an anti-flickering option which does not work with all - childconstrols, unfortunately - thus you may need to disable it one - time.
    -
    7. -
-

Once your code runs, you can modify the behaviour of your class in many - ways.

-

The options you may want to make use of are:

-
    -
  • Disabling the size icon.
    • -
  • Setting a window's minimum and maximum size.
    • -
  • Advanced anti-flickering.
    • -
  • Advanced AddSzControl() code.
    • -
  • Virtual functions that you may like to overload for a more - sofisticated dynamic reaction.
    • -
  • Default resizing values and many more...
    • -
-

- Check the flags, available to you, check functions and if you don't make it - work, drop a note to me.

-
- -

5 | Finally

-
-

The classes described in this document have been written by

-
-

Hans Bühler, codex design (w)1997 - 2000
- hans.buehler@topmail.de

-
-

You are free to use and modify the code and the classes but I would like - you to note the author (that's me :) in your product's documentation at any - place, if possible.
- You use this code at your own risk.
- Any damange caused by the use or misuse of this code is the sole - responsibility of the user.

-

[ back to top of this document ]

-
- - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.cpp deleted file mode 100644 index 1a21d7eb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "StdAfx.h" -#include "ListCtrlFormatter.h" -#include - - -ListCtrlFormatter::ListCtrlFormatter( CListCtrl &list ) : - m_List( list ), - m_nColNo( 0 ) -{ -} - - -ListCtrlFormatter::~ListCtrlFormatter() -{ -} - - -void -ListCtrlFormatter::AddColumn( CString strHeading, - int nWidth, - int nFormat, - int nSubItemNo ) -{ - LVCOLUMN column; - column.mask = LVCF_FMT | LVCF_SUBITEM | LVCF_TEXT | LVCF_WIDTH; - column.cx = nWidth; - column.fmt = nFormat; - column.pszText = strHeading.GetBuffer( strHeading.GetLength() ); - column.iSubItem = nSubItemNo == -1 ? m_nColNo : nSubItemNo; - column.iImage = 0; - column.iOrder = 0; - VERIFY( m_List.InsertColumn( m_nColNo++, &column ) >= 0 ); - strHeading.ReleaseBuffer(); -/* - VERIFY( m_List.InsertColumn( m_nColNo++, - strHeading, - nFormat, - nWidth, - nSubItemNo ) >= 0 ); -*/ - } - - -void -ListCtrlFormatter::AddColumn( const std::string &strHeading, - int nWidth, - int nFormat, - int nSubItemNo ) -{ - AddColumn( CString( strHeading.c_str() ), nWidth, nFormat, nSubItemNo ); -} - - -void -ListCtrlFormatter::AddColumn( UINT nIdStringHeading, - int nWidth, - int nFormat, - int nSubItemNo ) -{ - CString strHeading; - VERIFY( strHeading.LoadString( nIdStringHeading ) ); - AddColumn( strHeading, nWidth, nFormat, nSubItemNo ); -} - - -int -ListCtrlFormatter::GetNextColumnIndex() const -{ - return m_nColNo; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.h deleted file mode 100644 index badb7aab..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlFormatter.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef LISTCTRLFORMATTER_H -#define LISTCTRLFORMATTER_H - -#include - -/*! \brief Helper to setup ListCtrl columns format. - */ -class ListCtrlFormatter -{ -public: - /*! - * Constructor. - * \param list List control to setup. - */ - ListCtrlFormatter( CListCtrl &list ); - - /*! - * Destructeur. - */ - virtual ~ListCtrlFormatter(); - - /*! Adds a column to the list control. - * \param strHeading Column title. - * \param nWidth Column width in pixel. (-1 if not defined). - * \param nFormat Text alignment (LVCFMT_LEFT, LVCFMT_RIGHT, LVCFMT_CENTER). - * \param nSubItemNo Index of the sub-item associates to the column. - */ - void AddColumn( const std::string &strHeading, - int nWidth =-1, - int nFormat = LVCFMT_LEFT, - int nSubItemNo =-1 ); - - /*! Adds a column to the list control. - * \param strHeading Column title. - * \param nWidth Column width in pixel. (-1 if not defined). - * \param nFormat Text alignment (LVCFMT_LEFT, LVCFMT_RIGHT, LVCFMT_CENTER). - * \param nSubItemNo Index of the sub-item associates to the column. - */ - void AddColumn( CString strHeading, - int nWidth =-1, - int nFormat = LVCFMT_LEFT, - int nSubItemNo =-1 ); - - /*! Adds a column to the list control. - * \param nIdStringHeading Resource ID of the column title string (IDS_xxx). - * \param nWidth Column width in pixel. (-1 if not defined). - * \param nFormat Text alignment (LVCFMT_LEFT, LVCFMT_RIGHT, LVCFMT_CENTER). - * \param nSubItemNo Index of the sub-item associates to the column. - */ - void AddColumn( UINT nIdStringHeading, - int nWidth =-1, - int nFormat = LVCFMT_LEFT, - int nSubItemNo =-1 ); - - /*! Gets the sub item index of the next column. - * \return Sub item index of the next column, starting with 0. - */ - int GetNextColumnIndex() const; - -private: - /*! Associated list control. - */ - CListCtrl &m_List; - - /*! Next column number. - */ - int m_nColNo; -}; - - -#endif //WILLISTCTRLFORMATTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.cpp deleted file mode 100644 index d06af540..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include "StdAfx.h" -#include "ListCtrlSetter.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -ListCtrlSetter::ListCtrlSetter( CListCtrl &list ) : - m_List( list ), - m_nLineNo( -1 ) -{ -} - - -ListCtrlSetter::~ListCtrlSetter() -{ -} - - -void -ListCtrlSetter::modifyLine( int nLineNo ) -{ - editLine( nLineNo, nLineNo >= m_List.GetItemCount() ); -} - - -void -ListCtrlSetter::addLine() -{ - editLine( m_List.GetItemCount(), true ); -} - - -void -ListCtrlSetter::insertLine( int nLineNo ) -{ - editLine( nLineNo, true ); -} - - -void -ListCtrlSetter::editLine( int nLineNo, - bool bInsertLine ) -{ - m_nLineNo = nLineNo; - m_bInsertLine = bInsertLine; - m_nNextSubItem = 0; -} - - -void -ListCtrlSetter::addSubItem( const CString &strText ) -{ - doAddSubItem( LVIF_TEXT, strText, 0 ); -} - - -void -ListCtrlSetter::addSubItem( const CString &strText, - void *lParam ) -{ - doAddSubItem( LVIF_TEXT | LVIF_PARAM, strText, 0, lParam ); -} - - -void -ListCtrlSetter::addSubItem( const CString &strText, - int nImage ) -{ - doAddSubItem( LVIF_TEXT | LVIF_IMAGE, strText, nImage ); -} - - -void -ListCtrlSetter::addSubItem( const CString &strText, - void *lParam, - int nImage ) -{ - doAddSubItem( LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM, strText, 0, lParam ); -} - - -void -ListCtrlSetter::doAddSubItem( UINT nMask, - CString strText, - int nImage, - void *lParam ) -{ - int textLength = strText.GetLength(); - - LVITEM item; - item.mask = nMask; - item.pszText = strText.GetBuffer( textLength ); - item.cchTextMax = textLength; - item.iImage = nImage; - item.lParam = (LPARAM)lParam; - item.iItem = m_nLineNo; - item.iSubItem = m_nNextSubItem++; - if ( m_nNextSubItem == 1 && - m_bInsertLine ) // First item & new line - { - m_nLineNo = m_List.InsertItem( &item ); - VERIFY( m_nLineNo >= 0 ); - } - else - { - VERIFY( m_List.SetItem( &item ) ); - } - - strText.ReleaseBuffer(); -} - - -int -ListCtrlSetter::getLineNo() const -{ - return m_nLineNo; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.h deleted file mode 100644 index 1965a797..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ListCtrlSetter.h +++ /dev/null @@ -1,90 +0,0 @@ -#ifndef LISTCTRLSETTER_H -#define LISTCTRLSETTER_H - -#include - - -/*! \brief Helper to set up the content of a list control. - */ -class ListCtrlSetter -{ -public: - /*! - * Constructor. - * \param list List control to fill. - */ - ListCtrlSetter( CListCtrl &list ); - - /*! - * Destructor. - */ - virtual ~ListCtrlSetter(); - - - /*! Modifies the specified line. - * \param nLineNo number of the line to modify. - */ - void modifyLine( int nLineNo ); - - /*! Adds a new line at the end of the list. - */ - void addLine(); - - /*! Insert a new line in the list. - * \param nLineNo Line number before the new line is insert. - */ - void insertLine( int nLineNo ); - - - void addSubItem( const CString &strText ); - - void addSubItem( const CString &strText, void *lParam ); - - void addSubItem( const CString &strText, int nImage ); - - void addSubItem( const CString &strText, void *lParam, int nImage ); - - /*! Gets the number of the line being modified. - * \return Number of the line being modified. - */ - int getLineNo() const; - -private: - /*! Edit a line. - * \param nLineNo Number of the line to edit. - * \param bInsertLine \c true if the line is inserted, \c false if it is modified. - */ - void editLine( int nLineNo, - bool bInsertLine ); - - /*! Add a sub-item. - * \param nMask Mask LV_IF... to set. - * \param strText Sub-item Text. - * \param nImage Image number. - * \param lParam Item data pointer. - */ - void doAddSubItem( UINT nMask, - CString strText, - int nImage, - void *lParam =NULL ); - -private: - /*! List control which content is being set up. - */ - CListCtrl &m_List; - - /*! Current line number (line being edited). - */ - int m_nLineNo; - - /*! Line should be inserted ? - */ - bool m_bInsertLine; - - /*! Next sub-item number. - */ - int m_nNextSubItem; -}; - - -#endif //LISTCTRLSETTER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcSynchronizationObject.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcSynchronizationObject.h deleted file mode 100644 index 34a6aa4c..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcSynchronizationObject.h +++ /dev/null @@ -1,39 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file LightweightSynchronizationObject.h for class LightweightSynchronizationObject -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2002/02/27 -// ////////////////////////////////////////////////////////////////////////// -#ifndef LIGHTWEIGHTSYNCHRONIZATIONOBJECT_H -#define LIGHTWEIGHTSYNCHRONIZATIONOBJECT_H - -#include - - -/*! \class LightweightSynchronizationObject - * \brief This class represents a lock object for synchronized object. - */ -class MfcSynchronizationObject - : public CPPUNIT_NS::SynchronizedObject::SynchronizationObject -{ - CCriticalSection m_syncObject; - -public: - void lock() - { - m_syncObject.Lock(); - } - - void unlock() - { - m_syncObject.Unlock(); - } -}; - - - -// Inlines methods for LightweightSynchronizationObject: -// ----------------------------------------------------- - - - -#endif // LIGHTWEIGHTSYNCHRONIZATIONOBJECT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcTestRunner.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcTestRunner.cpp deleted file mode 100644 index 0d383a16..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MfcTestRunner.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file MfcTestRunner.cpp for class MfcTestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/04/26 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include -#include -#include "TestRunnerModel.h" -#include "TestRunnerDlg.h" - - - -CPPUNIT_NS_BEGIN - - -MfcTestRunner::MfcTestRunner() - : m_suite( new CPPUNIT_NS::TestSuite() ) -{ -} - - -MfcTestRunner::~MfcTestRunner() -{ - delete m_suite; - - for ( Tests::iterator it = m_tests.begin(); it != m_tests.end(); ++it ) - delete *it; -} - - -void -MfcTestRunner::run() -{ - bool comInit = SUCCEEDED( CoInitialize( NULL) ); - - TestRunnerModel model( getRootTest() ); - TestRunnerDlg dlg( &model ); - dlg.DoModal (); - - if ( comInit) - CoUninitialize(); -} - - -void -MfcTestRunner::addTest( CPPUNIT_NS::Test *test ) -{ - m_tests.push_back( test ); -} - - -void -MfcTestRunner::addTests( const CppUnitVector &tests ) -{ - for ( Tests::const_iterator it=tests.begin(); - it != tests.end(); - ++it ) - { - addTest( *it ); - } -} - - -CPPUNIT_NS::Test * -MfcTestRunner::getRootTest() -{ - if ( m_tests.size() != 1 ) - { - for ( Tests::iterator it = m_tests.begin(); it != m_tests.end(); ++it ) - m_suite->addTest( *it ); - m_tests.clear(); - return m_suite; - } - return m_tests[0]; -} - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.cpp deleted file mode 100644 index e854bf38..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file MostRecentTests.cpp for class MostRecentTests -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/27 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "MostRecentTests.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -MostRecentTests::MostRecentTests() -{ -} - - -MostRecentTests::~MostRecentTests() -{ -} - - -void -MostRecentTests::setLastTestRun( CPPUNIT_NS::Test *test ) -{ - for ( TestRuns::iterator it = m_runs.begin(); it != m_runs.end(); ++it ) - { - if ( it->second == test ) - { - m_runs.erase( it ); - break; - } - } - - if ( test != NULL ) - m_runs.push_front( TestRun( test->getName(), test ) ); -} - - -CPPUNIT_NS::Test * -MostRecentTests::lastTestRun() const -{ - return m_runs.front().second; -} - - -int -MostRecentTests::getRunCount() const -{ - return m_runs.size(); -} - - -CPPUNIT_NS::Test * -MostRecentTests::getTestAt( int indexTest ) const -{ - return m_runs.at( indexTest ).second; -} - -std::string -MostRecentTests::getTestNameAt( int indexTest ) const -{ - return m_runs.at( indexTest ).first; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.h deleted file mode 100644 index 339c3b7e..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MostRecentTests.h +++ /dev/null @@ -1,50 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file MostRecentTests.h for class MostRecentTests -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/06/27 -// ////////////////////////////////////////////////////////////////////////// -#ifndef MOSTRECENTTESTS_H -#define MOSTRECENTTESTS_H - -#include -#include -#include - - -/*! \class MostRecentTests - * \brief This class represents a list of the tests most recently run. - */ -class MostRecentTests -{ -public: - /*! Constructs a MostRecentTests object. - */ - MostRecentTests(); - - /*! Destructor. - */ - virtual ~MostRecentTests(); - - void setLastTestRun( CPPUNIT_NS::Test *test ); - CPPUNIT_NS::Test *lastTestRun() const; - - int getRunCount() const; - CPPUNIT_NS::Test *getTestAt( int indexTest ) const; - std::string getTestNameAt( int indexTest ) const; - - -private: - /// Prevents the use of the copy constructor. - MostRecentTests( const MostRecentTests © ); - - /// Prevents the use of the copy operator. - void operator =( const MostRecentTests © ); - -private: - typedef std::pair TestRun; - typedef std::deque TestRuns; - TestRuns m_runs; -}; - - -#endif // MOSTRECENTTESTS_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.cpp deleted file mode 100644 index 5f94bd76..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// MsDevCallerListCtrl.cpp : implementation file -// - -#include "stdafx.h" -#include - -#include "MsDevCallerListCtrl.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -// VC6 IDE Handler -// ////////////////////////////////////////////////////////////////// -#if _MSC_VER == 1200 // VC++ 6 - -#include - - -namespace VC6IdeHandler { - static bool initialize() - { - return SUCCEEDED( CoInitialize(NULL) ); - } - - static void uninitialize( bool initialized ) - { - if ( initialized ) - CoUninitialize(); - } - - static void goToLineInSourceCode( CString fileName, int line ) - { - - CComPtr< ITestRunnerDSPlugin> pIDSPlugin; - HRESULT hr = CoCreateInstance( CLSID_DSAddIn, - NULL, - CLSCTX_LOCAL_SERVER, - IID_ITestRunnerDSPlugin, - reinterpret_cast< void**>(&pIDSPlugin) ); - if ( SUCCEEDED( hr ) ) - { - pIDSPlugin->goToLineInSourceCode( CComBSTR( fileName ), - line ); - } - } -} // namespace VC6IdeHandler - -namespace IDEHandler = VC6IdeHandler; - - -// VC7 IDE Handler -// ////////////////////////////////////////////////////////////////// - -#elif _MSC_VER >= 1300 // VC++ 7 or more - -#include -#include - -#pragma warning( disable : 4278 ) -#pragma warning( disable : 4146 ) -#import "libid:80cc9f66-e7d8-4ddd-85b6-d9e6cd0e93e2" version("7.0") lcid("0") raw_interfaces_only named_guids -#pragma warning( default : 4146 ) -#pragma warning( default : 4278 ) - - - -namespace VC7IdeHandler { - static bool initialize() - { - return true; - } - - static void uninitialize( bool initialized ) - { - } - - static void goToLineInSourceCode( CString fileName, int line ) - { - USES_CONVERSION; - - CComPtr< IRunningObjectTable > pIRunningObjectTable; - HRESULT hr = ::GetRunningObjectTable( 0, &pIRunningObjectTable ); - - CComPtr< IEnumMoniker > pIEnumMoniker; - hr = pIRunningObjectTable->EnumRunning( &pIEnumMoniker ); - - CComPtr< EnvDTE::_DTE > pIEnvDTE; - while ( true ) - { - ULONG celtFetched; - CComPtr< IMoniker > pIMoniker; - if ( S_OK != pIEnumMoniker->Next( 1, &pIMoniker, &celtFetched ) ) - break; - - CComPtr< IBindCtx > pIBindCtx; - hr = ::CreateBindCtx( NULL, &pIBindCtx ); - - LPOLESTR pszDisplayName; - pIMoniker->GetDisplayName( pIBindCtx, NULL, &pszDisplayName ); - - TRACE( "Moniker %s\n", W2A( pszDisplayName ) ); - - CString strDisplayName( pszDisplayName ); - CComPtr< IMalloc > pIMalloc; - ::CoGetMalloc( 1, &pIMalloc ); - pIMalloc->Free( pszDisplayName ); - - if ( strDisplayName.Right( 4 ) == _T(".sln") - || strDisplayName.Find( _T("VisualStudio.DTE") ) >= 0 ) - { - CComPtr< IUnknown > pIUnknown; - pIRunningObjectTable->GetObject( pIMoniker, &pIUnknown ); - pIUnknown->QueryInterface( &pIEnvDTE ); - if( pIEnvDTE.p ) - break; - } - } - - if ( pIEnvDTE.p ) - { - CComPtr< EnvDTE::Documents > pIDocuments; - HRESULT result = pIEnvDTE->get_Documents( &pIDocuments ); - if ( !SUCCEEDED( result ) ) - return; - - assert( pIDocuments.p ); - - CComPtr< EnvDTE::Document > pIDocument; - CComBSTR bstrFileName( fileName ); - CComVariant type=_T("Text"); - CComVariant read=_T("False"); - result = pIDocuments->Open( bstrFileName, - type.bstrVal, - read.bVal, - &pIDocument ); - if ( !SUCCEEDED( result ) ) - return; - - assert( pIDocument.p ); - - CComPtr< IDispatch > pIDispatch; - result = pIDocument->get_Selection( &pIDispatch ); - if ( !SUCCEEDED( result ) ) - return; - - CComPtr< EnvDTE::TextSelection > pITextSelection; - pIDispatch->QueryInterface( &pITextSelection ); - - assert( pITextSelection.p ); - - result = pITextSelection->GotoLine( line, TRUE ); - if ( !SUCCEEDED( result ) ) - return; - } - } - -} // namespace VC7IdeHandler - - -namespace IDEHandler = VC7IdeHandler; - - -#else -#error Unsupported VC++ version. -#endif - - - - - -///////////////////////////////////////////////////////////////////////////// -// MsDevCallerListCtrl - - - -MsDevCallerListCtrl::MsDevCallerListCtrl() - : m_lineNumberSubItem( 3 ) - , m_fileNameSubItem( 4 ) -{ - m_initialized = IDEHandler::initialize(); -} - -MsDevCallerListCtrl::~MsDevCallerListCtrl() -{ - IDEHandler::uninitialize( m_initialized ); -} - - -void -MsDevCallerListCtrl::setLineNumberSubItem( int subItemIndex ) -{ - m_lineNumberSubItem = subItemIndex; -} - - -void -MsDevCallerListCtrl::setFileNameSubItem( int fileNameItemIndex ) -{ - m_fileNameSubItem = fileNameItemIndex; -} - - -BEGIN_MESSAGE_MAP(MsDevCallerListCtrl, CListCtrl) - //{{AFX_MSG_MAP(MsDevCallerListCtrl) - ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// MsDevCallerListCtrl message handlers - -void MsDevCallerListCtrl::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult) -{ - // get index of selected item - POSITION pos = GetFirstSelectedItemPosition(); - int hotItem = GetNextSelectedItem(pos); - - CString lineNumber = GetItemText( hotItem, m_lineNumberSubItem); - CString fileName = GetItemText( hotItem, m_fileNameSubItem); - - IDEHandler::goToLineInSourceCode( fileName, _ttoi( lineNumber) ); - - *pResult = 0; -} \ No newline at end of file diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.h deleted file mode 100644 index 91e2aa41..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/MsDevCallerListCtrl.h +++ /dev/null @@ -1,56 +0,0 @@ -#if !defined(AFX_MSDEVCALLERLISTCTRL_H__4B5EE0C1_D251_45CF_BBD1_D5003C80B238__INCLUDED_) -#define AFX_MSDEVCALLERLISTCTRL_H__4B5EE0C1_D251_45CF_BBD1_D5003C80B238__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// MsDevCallerListCtrl.h : header file -// - -///////////////////////////////////////////////////////////////////////////// -// MsDevCallerListCtrl window - -class MsDevCallerListCtrl : public CListCtrl -{ -// Construction -public: - MsDevCallerListCtrl(); - - void setLineNumberSubItem( int subItemIndex ); - void setFileNameSubItem( int fileNameItemIndex ); - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(MsDevCallerListCtrl) - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~MsDevCallerListCtrl(); - - // Generated message map functions -protected: - //{{AFX_MSG(MsDevCallerListCtrl) - afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() - -private: - int m_lineNumberSubItem; - int m_fileNameSubItem; - bool m_initialized; -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MSDEVCALLERLISTCTRL_H__4B5EE0C1_D251_45CF_BBD1_D5003C80B238__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.cpp deleted file mode 100644 index 3697c0e6..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.cpp +++ /dev/null @@ -1,185 +0,0 @@ -#include "stdafx.h" -#include "ProgressBar.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -ProgressBar::ProgressBar() - : m_error( false ) - , m_total( 0 ) - , m_progress( 0 ) - , m_progressX( 0 ) -{ -} - - -ProgressBar::~ProgressBar() -{ -} - - -BEGIN_MESSAGE_MAP(ProgressBar, CWnd) - //{{AFX_MSG_MAP(ProgressBar) - ON_WM_PAINT() - ON_WM_SIZE() - ON_WM_ERASEBKGND() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - - -void -ProgressBar::OnPaint() -{ - CPaintDC dc(this); // device context for painting - paint( dc ); -} - - -// Paint the progress bar in response to a paint message -void -ProgressBar::paint( CDC &dc ) -{ - paintBackground( dc ); - paintStatus( dc ); -} - - -// Paint the background of the progress bar region -void -ProgressBar::paintBackground( CDC &dc ) -{ - CBrush brshBackground; - CPen penShade( PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW) ); - CPen penLight( PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT) ); - - VERIFY( brshBackground.CreateSolidBrush( ::GetSysColor (COLOR_BTNFACE) ) ); - - dc.FillRect( m_bounds, &brshBackground ); - - CPen *pOldPen = dc.SelectObject( &penShade ); - int xRight = m_bounds.left + m_bounds.Width() -1; - int yBottom = m_bounds.top + m_bounds.Height() -1; - { - dc.MoveTo( m_bounds.left, m_bounds.top ); - dc.LineTo( xRight, m_bounds.top ); - - dc.MoveTo( m_bounds.left, m_bounds.top ); - dc.LineTo( m_bounds.left, yBottom ); - } - - dc.SelectObject( &penLight ); - { - dc.MoveTo( xRight, m_bounds.top ); - dc.LineTo( xRight, yBottom ); - - dc.MoveTo( m_bounds.left, yBottom ); - dc.LineTo( xRight, yBottom ); - } - - dc.SelectObject( pOldPen ); -} - - -// Paint the actual status of the progress bar -void -ProgressBar::paintStatus( CDC &dc ) -{ - if ( m_progress <= 0 ) - return; - - CBrush brshStatus; - CRect rect( m_bounds.left, m_bounds.top, - m_bounds.left + m_progressX, m_bounds.bottom ); - - COLORREF statusColor = getStatusColor(); - - VERIFY( brshStatus.CreateSolidBrush( statusColor ) ); - - rect.DeflateRect( 1, 1 ); - dc.FillRect( rect, &brshStatus ); -} - - -// Paint the current step -void -ProgressBar::paintStep( int startX, - int endX ) -{ - CRect redrawBounds( m_bounds.left + startX-1, m_bounds.top, - m_bounds.left + endX, m_bounds.bottom ); - RedrawWindow( redrawBounds ); -} - - -// Setup the progress bar for execution over a total number of steps -void -ProgressBar::start( int total ) -{ - m_total = total; - reset (); -} - - -// Take one step, indicating whether it was a successful step -void -ProgressBar::step( bool successful ) -{ - m_progress++; - - int x = m_progressX; - - m_progressX = scale (m_progress); - - if ( !m_error && !successful ) - { - m_error = true; - x = 1; - } - - paintStep( x, m_progressX ); -} - - -// Map from steps to display units -int -ProgressBar::scale( int value ) -{ - if ( m_total > 0 ) - return max( 1, value * (m_bounds.Width() - 1) / m_total ); - - return value; -} - - -// Reset the progress bar -void -ProgressBar::reset() -{ - m_progressX = 1; - m_progress = 0; - m_error = false; - - RedrawWindow( m_bounds ); - UpdateWindow( ); -} - - -void -ProgressBar::OnSize(UINT nType, int cx, int cy) -{ - CWnd::OnSize(nType, cx, cy); - - GetClientRect( &m_bounds ); - m_progressX = scale (m_progress); - Invalidate(); -} - - -BOOL -ProgressBar::OnEraseBkgnd( CDC *pDC ) -{ - return FALSE; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.h deleted file mode 100644 index 0fb89e0a..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ProgressBar.h +++ /dev/null @@ -1,71 +0,0 @@ -#if !defined(AFX_PROGRESSBAR_H__F2CB2DBB_467B_4978_829B_CAD101EA4B8A__INCLUDED_) -#define AFX_PROGRESSBAR_H__F2CB2DBB_467B_4978_829B_CAD101EA4B8A__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - - -class ProgressBar : public CWnd -{ -public: - ProgressBar(); - virtual ~ProgressBar(); - - void step( bool successful ); - - int scale( int value ); - - void reset(); - - void start( int total ); - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(ProgressBar) - //}}AFX_VIRTUAL - -protected: - //{{AFX_MSG(ProgressBar) - afx_msg void OnPaint(); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg BOOL OnEraseBkgnd(CDC* pDC); - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); - - -protected: - void paint( CDC &dc ); - - void paintBackground( CDC &dc ); - - void paintStatus( CDC &dc ); - - COLORREF getStatusColor(); - - void paintStep( int startX, - int endX ); - -private: - CRect m_bounds; - bool m_error; - int m_total; - int m_progress; - int m_progressX; -}; - - - -// Get the current color -inline COLORREF -ProgressBar::getStatusColor () -{ - return m_error ? RGB (255, 0, 0) : - RGB (0, 255, 0); -} - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PROGRESSBAR_H__F2CB2DBB_467B_4978_829B_CAD101EA4B8A__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Resource.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Resource.h deleted file mode 100644 index 4b3ef4ca..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/Resource.h +++ /dev/null @@ -1,47 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by TestRunner.rc -// -#define IDS_ERROR_SELECT_TEST 1 -#define IDS_ERRORLIST_TYPE 2 -#define IDS_ERRORLIST_NAME 3 -#define IDS_ERRORLIST_FAILED_CONDITION 4 -#define IDS_ERRORLIST_LINE_NUMBER 5 -#define IDS_ERRORLIST_FILE_NAME 6 -#define IDS_STRING7 100 -#define IDR_ACCELERATOR_TEST_RUNNER 131 -#define IDC_LIST 1000 -#define ID_RUN 1001 -#define ID_STOP 1002 -#define IDC_PROGRESS 1003 -#define IDC_INDICATOR 1004 -#define IDC_COMBO_TEST 1005 -#define IDC_STATIC_RUNS 1007 -#define IDC_STATIC_ERRORS 1008 -#define IDC_STATIC_FAILURES 1009 -#define IDC_EDIT_TIME 1010 -#define IDC_BUTTON1 1011 -#define IDC_BROWSE_TEST 1011 -#define IDC_TREE_TEST 1012 -#define IDC_DETAILS 1012 -#define IDC_CHECK_AUTORUN 1013 -#define IDC_RUNNING_TEST_CASE_LABEL 1016 -#define IDC_STATIC_TEST_NAME 1017 -#define IDC_STATIC_PROGRESS 1018 -#define IDC_STATIC_LABEL_RUNS 1019 -#define IDC_STATIC_LABEL_ERRORS 1020 -#define IDC_STATIC_LABEL_FAILURES 1021 -#define IDC_STATIC_PROGRESS_BAR 1022 -#define IDC_STATIC_DETAILS 1023 -#define ID_QUIT_APPLICATION 32771 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 134 -#define _APS_NEXT_COMMAND_VALUE 32772 -#define _APS_NEXT_CONTROL_VALUE 1024 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.cpp deleted file mode 100644 index 17f48951..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "stdafx.h" - -#include "ResourceLoaders.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -extern HINSTANCE g_testRunnerResource; - -CString loadCString(UINT stringId) -{ - CString string; - - HRSRC stringRes = ::FindResource( g_testRunnerResource, - MAKEINTRESOURCE( (stringId>>4) + 1), - RT_STRING ); - if ( stringRes ) - { - int stringLen = ::SizeofResource( g_testRunnerResource, - stringRes) / sizeof(TCHAR); - if (stringLen > 0) - { - LPTSTR stringBuffer = string.GetBuffer( stringLen+2 ); - int realStringLen = ::LoadString( g_testRunnerResource, - stringId, - stringBuffer, - (stringLen+1)*2 ); - string.ReleaseBuffer( realStringLen ); - - ASSERT(realStringLen > 0); - } - } - - ASSERT( !string.IsEmpty() ); - return string; -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.h deleted file mode 100644 index b273e402..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/ResourceLoaders.h +++ /dev/null @@ -1,7 +0,0 @@ -#if !defined(AFX_RESOURCELOADERS_H) -#define AFX_RESOURCELOADERS_H - -/// loads a CString from the test runner DLL module -CString loadCString(UINT stringId); - -#endif // !defined(AFX_RESOURCELOADERS_H) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.cpp deleted file mode 100644 index e41bdff1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// TestRunner.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.h deleted file mode 100644 index eda08058..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/StdAfx.h +++ /dev/null @@ -1,43 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__D15A539F_17E8_11D2_A49B_00805FC1C042__INCLUDED_) -#define AFX_STDAFX_H__D15A539F_17E8_11D2_A49B_00805FC1C042__INCLUDED_ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#pragma warning( disable : 4786 ) // warning of hell: debug symbol too long... - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions - -#ifndef _AFX_NO_OLE_SUPPORT -#include // MFC OLE classes -#include // MFC OLE dialog classes -#include // MFC OLE automation classes -#endif // _AFX_NO_OLE_SUPPORT - - -#ifndef _AFX_NO_DB_SUPPORT -#include // MFC ODBC database classes -#endif // _AFX_NO_DB_SUPPORT - -#ifndef _AFX_NO_DAO_SUPPORT -#include // MFC DAO database classes -#endif // _AFX_NO_DAO_SUPPORT - -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__D15A539F_17E8_11D2_A49B_00805FC1C042__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/SynchronizedTestResult.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/SynchronizedTestResult.h deleted file mode 100644 index 322c3bad..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/SynchronizedTestResult.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef SYNCHRONIZEDTESTRESULTDECORATOR_H -#define SYNCHRONIZEDTESTRESULTDECORATOR_H - -#include -#include "TestResultDecorator.h" - -class SynchronizedTestResult : public TestResultDecorator -{ -public: - SynchronizedTestResult (TestResult *result); - ~SynchronizedTestResult (); - - - bool shouldStop (); - void addError (Test *test, CppUnitException *e); - void addFailure (Test *test, CppUnitException *e); - void startTest (Test *test); - void endTest (Test *test); - int runTests (); - int testErrors (); - int testFailures (); - bool wasSuccessful (); - void stop (); - - vector& errors (); - vector& failures (); - -private: - CCriticalSection m_criticalSection; - -}; - - -// Constructor -inline SynchronizedTestResult::SynchronizedTestResult (TestResult *result) -: TestResultDecorator (result) {} - -// Destructor -inline SynchronizedTestResult::~SynchronizedTestResult () -{} - -// Returns whether the test should stop -inline bool SynchronizedTestResult::shouldStop () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->shouldStop (); } - - -// Adds an error to the list of errors. The passed in exception -// caused the error -inline void SynchronizedTestResult::addError (Test *test, CppUnitException *e) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->addError (test, e); } - - -// Adds a failure to the list of failures. The passed in exception -// caused the failure. -inline void SynchronizedTestResult::addFailure (Test *test, CppUnitException *e) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->addFailure (test, e); } - - -// Informs the result that a test will be started. -inline void SynchronizedTestResult::startTest (Test *test) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->startTest (test); } - - -// Informs the result that a test was completed. -inline void SynchronizedTestResult::endTest (Test *test) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->endTest (test); } - - -// Gets the number of run tests. -inline int SynchronizedTestResult::runTests () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->runTests (); } - - -// Gets the number of detected errors. -inline int SynchronizedTestResult::testErrors () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->testErrors (); } - - -// Gets the number of detected failures. -inline int SynchronizedTestResult::testFailures () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->testFailures (); } - - -// Returns whether the entire test was successful or not. -inline bool SynchronizedTestResult::wasSuccessful () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->wasSuccessful (); } - - -// Marks that the test run should stop. -inline void SynchronizedTestResult::stop () -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->stop (); } - - -// Returns a vector of the errors. -inline vector& SynchronizedTestResult::errors () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->errors (); } - - -// Returns a vector of the failures. -inline vector& SynchronizedTestResult::failures () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->failures (); } - - -#endif - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestResultDecorator.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestResultDecorator.h deleted file mode 100644 index af2362c2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestResultDecorator.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef CPP_UNIT_TESTRESULTDECORATOR_H -#define CPP_UNIT_TESTRESULTDECORATOR_H - -#include "TestResult.h" - -class TestResultDecorator -{ -public: - TestResultDecorator (TestResult *result); - virtual ~TestResultDecorator (); - - - virtual bool shouldStop (); - virtual void addError (Test *test, CppUnitException *e); - virtual void addFailure (Test *test, CppUnitException *e); - virtual void startTest (Test *test); - virtual void endTest (Test *test); - virtual int runTests (); - virtual int testErrors (); - virtual int testFailures (); - virtual bool wasSuccessful (); - virtual void stop (); - - vector& errors (); - vector& failures (); - -protected: - TestResult *m_result; -}; - - -inline TestResultDecorator::TestResultDecorator (TestResult *result) -: m_result (result) {} - -inline TestResultDecorator::~TestResultDecorator () -{} - -// Returns whether the test should stop -inline bool TestResultDecorator::shouldStop () -{ return m_result->shouldStop (); } - - -// Adds an error to the list of errors. The passed in exception -// caused the error -inline void TestResultDecorator::addError (Test *test, CppUnitException *e) -{ m_result->addError (test, e); } - - -// Adds a failure to the list of failures. The passed in exception -// caused the failure. -inline void TestResultDecorator::addFailure (Test *test, CppUnitException *e) -{ m_result->addFailure (test, e); } - - -// Informs the result that a test will be started. -inline void TestResultDecorator::startTest (Test *test) -{ m_result->startTest (test); } - - -// Informs the result that a test was completed. -inline void TestResultDecorator::endTest (Test *test) -{ m_result->endTest (test); } - - -// Gets the number of run tests. -inline int TestResultDecorator::runTests () -{ return m_result->runTests (); } - - -// Gets the number of detected errors. -inline int TestResultDecorator::testErrors () -{ return m_result->testErrors (); } - - -// Gets the number of detected failures. -inline int TestResultDecorator::testFailures () -{ return m_result->testFailures (); } - - -// Returns whether the entire test was successful or not. -inline bool TestResultDecorator::wasSuccessful () -{ return m_result->wasSuccessful (); } - - -// Marks that the test run should stop. -inline void TestResultDecorator::stop () -{ m_result->stop (); } - - -// Returns a vector of the errors. -inline vector& TestResultDecorator::errors () -{ return m_result->errors (); } - - -// Returns a vector of the failures. -inline vector& TestResultDecorator::failures () -{ return m_result->failures (); } - - -#endif - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.def b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.def deleted file mode 100644 index d2eaca0d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.def +++ /dev/null @@ -1,7 +0,0 @@ -; TestRunner.def : Declares the module parameters for the DLL. - -;LIBRARY "TestRunner" -DESCRIPTION 'TestRunner Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.dsp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.dsp deleted file mode 100644 index d73cbed5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.dsp +++ /dev/null @@ -1,458 +0,0 @@ -# Microsoft Developer Studio Project File - Name="TestRunner" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=TestRunner - Win32 Debug Unicode -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TestRunner.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TestRunner.mak" CFG="TestRunner - Win32 Debug Unicode" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TestRunner - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "TestRunner - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "TestRunner - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "TestRunner - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TestRunner - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_AFXEXT" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "OEMRESOURCE" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\..\lib\cppunit.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /def:".\TestRunner.def" -# SUBTRACT LINK32 /pdb:none /incremental:yes -# Begin Special Build Tool -TargetDir=.\Release -TargetPath=.\Release\TestRunner.dll -TargetName=TestRunner -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_AFXEXT" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "OEMRESOURCE" /FR /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\..\lib\cppunitd.lib winmm.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /def:".\TestRunner.def" /out:"Debug\testrunnerd.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetDir=.\Debug -TargetPath=.\Debug\testrunnerd.dll -TargetName=testrunnerd -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Release Unicode" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "TestRunner___Win32_Release_Unicode" -# PROP BASE Intermediate_Dir "TestRunner___Win32_Release_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseUnicode" -# PROP Intermediate_Dir "ReleaseUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "NDEBUG" /D "_UNICODE" /D "_AFXEXT" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "OEMRESOURCE" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ..\..\..\lib\cppunit.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /def:".\TestRunner.def" /out:"..\..\..\lib\testrunner.dll" /implib:"..\..\..\lib\testrunner.lib" -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ..\..\..\lib\cppunit.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /def:".\TestRunner.def" /out:"ReleaseUnicode\testrunneru.dll" -# SUBTRACT LINK32 /pdb:none /incremental:yes -# Begin Special Build Tool -TargetDir=.\ReleaseUnicode -TargetPath=.\ReleaseUnicode\testrunneru.dll -TargetName=testrunneru -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Debug Unicode" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "TestRunner___Win32_Debug_Unicode" -# PROP BASE Intermediate_Dir "TestRunner___Win32_Debug_Unicode" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugUnicode" -# PROP Intermediate_Dir "DebugUnicode" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /FR /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_UNICODE" /D "_AFXEXT" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "WIN32" /D "OEMRESOURCE" /FR /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ..\..\..\lib\cppunitd.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\lib\testrunnerd.dll" /implib:"..\..\..\lib\testrunnerd.lib" /pdbtype:sept -# SUBTRACT BASE LINK32 /profile /pdb:none /map -# ADD LINK32 ..\..\..\lib\cppunitd.lib winmm.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /def:".\TestRunner.def" /out:"DebugUnicode\testrunnerud.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -TargetDir=.\DebugUnicode -TargetPath=.\DebugUnicode\testrunnerud.dll -TargetName=testrunnerud -SOURCE="$(InputPath)" -PostBuild_Desc=Copying target to lib/ -PostBuild_Cmds=copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll copy "$(TargetDir)\$(TargetName).lib" ..\..\..\lib\$(TargetName).lib -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "TestRunner - Win32 Release" -# Name "TestRunner - Win32 Debug" -# Name "TestRunner - Win32 Release Unicode" -# Name "TestRunner - Win32 Debug Unicode" -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\errortype.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\test_type.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\TestRunner.rc2 -# End Source File -# Begin Source File - -SOURCE=.\res\tfwkui_r.bmp -# End Source File -# End Group -# Begin Group "UserInterface" - -# PROP Default_Filter "" -# Begin Group "DynamicWindow" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicBar.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicBar.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicControlsManager.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicControlsManager.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicDialog.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicFormView.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicFormView.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicPropSheet.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicPropSheet.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicWnd.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicWnd.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicWndEx.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCDynamicWndEx.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCSizeIconCtrl.cpp -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\cdxCSizeIconCtrl.h -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\SizeCBar.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\DynamicWindow\SizeCBar.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ListCtrlFormatter.cpp -# End Source File -# Begin Source File - -SOURCE=.\ListCtrlFormatter.h -# End Source File -# Begin Source File - -SOURCE=.\ListCtrlSetter.cpp -# End Source File -# Begin Source File - -SOURCE=.\ListCtrlSetter.h -# End Source File -# Begin Source File - -SOURCE=.\MsDevCallerListCtrl.cpp -# End Source File -# Begin Source File - -SOURCE=.\MsDevCallerListCtrl.h -# End Source File -# Begin Source File - -SOURCE=.\ProgressBar.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProgressBar.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\ResourceLoaders.cpp -# End Source File -# Begin Source File - -SOURCE=.\ResourceLoaders.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\TestRunner.def - -!IF "$(CFG)" == "TestRunner - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Release Unicode" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "TestRunner - Win32 Debug Unicode" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\TestRunner.rc -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerApp.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerApp.h -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerDlg.h -# End Source File -# Begin Source File - -SOURCE=.\TreeHierarchyDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\TreeHierarchyDlg.h -# End Source File -# End Group -# Begin Group "Components" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\ActiveTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ActiveTest.h -# End Source File -# Begin Source File - -SOURCE=.\MfcSynchronizationObject.h -# End Source File -# Begin Source File - -SOURCE=.\MfcTestRunner.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\cppunit\ui\mfc\MfcTestRunner.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\cppunit\ui\mfc\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\msvc6\testrunner\TestRunner.h -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerModel.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestRunnerModel.h -# End Source File -# End Group -# Begin Group "NewFiles" - -# PROP Default_Filter "*.cpp;*.h" -# Begin Source File - -SOURCE=.\MostRecentTests.cpp -# End Source File -# Begin Source File - -SOURCE=.\MostRecentTests.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.rc b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.rc deleted file mode 100644 index 6d8077a4..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunner.rc +++ /dev/null @@ -1,217 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif\r\n" - "#include ""res\\TestRunner.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "TestRunner DLL\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "TestRunner\0" - VALUE "LegalCopyright", "Copyright (C) 1998\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "TestRunner.DLL\0" - VALUE "ProductName", "TestRunner Dynamic Link Library\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY DIALOG DISCARDABLE 0, 0, 259, 250 -STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Test hierarchy" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "Select",IDOK,202,7,50,14 - CONTROL "Tree1",IDC_TREE_TEST,"SysTreeView32",TVS_HASBUTTONS | - TVS_HASLINES | TVS_LINESATROOT | TVS_FULLROWSELECT | - WS_BORDER | WS_TABSTOP,7,7,189,236 - PUSHBUTTON "&Close",IDCANCEL,202,34,50,14 -END - -CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TESTRUNNER DIALOG DISCARDABLE 0, 0, 330, 226 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPCHILDREN | - WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "TestRunner" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "&Test:",IDC_STATIC_TEST_NAME,7,7,17,8 - COMBOBOX IDC_COMBO_TEST,28,7,235,157,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Browse",IDC_BROWSE_TEST,273,7,50,14 - DEFPUSHBUTTON "&Run",ID_RUN,273,23,50,14 - LTEXT "Progress:",IDC_STATIC_PROGRESS,7,23,33,9 - LTEXT "none",IDC_RUNNING_TEST_CASE_LABEL,43,23,220,9 - LTEXT "Progress Bar",IDC_STATIC_PROGRESS_BAR,7,34,256,15,NOT - WS_VISIBLE - LTEXT "Runs:",IDC_STATIC_LABEL_RUNS,7,55,29,10 - LTEXT "0",IDC_STATIC_RUNS,48,55,30,8 - LTEXT "Errors:",IDC_STATIC_LABEL_ERRORS,89,55,29,10 - LTEXT "0",IDC_STATIC_ERRORS,127,55,19,8 - LTEXT "Failures:",IDC_STATIC_LABEL_FAILURES,174,55,29,10 - LTEXT "0",IDC_STATIC_FAILURES,212,55,19,8 - LTEXT "&Errors and Failures:",IDC_STATIC,7,70,67,9 - CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | - WS_TABSTOP,7,81,257,60 - LTEXT "&Details:",IDC_STATIC_DETAILS,7,145,24,8 - EDITTEXT IDC_DETAILS,7,154,316,48,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_READONLY - CONTROL "&Autorun at startup",IDC_CHECK_AUTORUN,"Button", - BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,273,52,49,19 - PUSHBUTTON "&Stop",ID_STOP,273,82,50,14 - PUSHBUTTON "&Close",IDOK,273,98,50,14 - EDITTEXT IDC_EDIT_TIME,7,206,316,13,ES_AUTOHSCROLL | ES_READONLY -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -CPP_UNIT_TEST_RUNNER_IDB_TEST_TYPE BITMAP DISCARDABLE "res\\test_type.bmp" -CPP_UNIT_TEST_RUNNER_IDB_ERROR_TYPE BITMAP DISCARDABLE "res\\errortype.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR_TEST_RUNNER ACCELERATORS DISCARDABLE -BEGIN - "Q", ID_QUIT_APPLICATION, VIRTKEY, NOINVERT - VK_SPACE, ID_RUN, VIRTKEY, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ERROR_SELECT_TEST "You must select a test!" - IDS_ERRORLIST_TYPE "Type" - IDS_ERRORLIST_NAME "Name" - IDS_ERRORLIST_FAILED_CONDITION "Failed Condition" - IDS_ERRORLIST_LINE_NUMBER "Line Number" - IDS_ERRORLIST_FILE_NAME "File Name" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif -#include "res\TestRunner.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.cpp deleted file mode 100644 index 60d0fe90..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// TestRunner.cpp : Defines the initialization routines for the DLL. -// - -#include "stdafx.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - -static AFX_EXTENSION_MODULE TestRunnerDLL = { NULL, NULL }; - -HINSTANCE g_testRunnerResource; - -extern "C" int APIENTRY -DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) -{ - // Remove this if you use lpReserved - UNREFERENCED_PARAMETER(lpReserved); - - if (dwReason == DLL_PROCESS_ATTACH) - { - TRACE0("TESTRUNNER.DLL Initializing!\n"); - - // Extension DLL one-time initialization - if (!AfxInitExtensionModule(TestRunnerDLL, hInstance)) - return 0; - - // Can't find any other way to have LoadAccelerators working... - g_testRunnerResource = TestRunnerDLL.hResource; - - // Insert this DLL into the resource chain - // NOTE: If this Extension DLL is being implicitly linked to by - // an MFC Regular DLL (such as an ActiveX Control) - // instead of an MFC application, then you will want to - // remove this line from DllMain and put it in a separate - // function exported from this Extension DLL. The Regular DLL - // that uses this Extension DLL should then explicitly call that - // function to initialize this Extension DLL. Otherwise, - // the CDynLinkLibrary object will not be attached to the - // Regular DLL's resource chain, and serious problems will - // result. - - new CDynLinkLibrary(TestRunnerDLL); - } - else if (dwReason == DLL_PROCESS_DETACH) - { - TRACE0("TESTRUNNER.DLL Terminating!\n"); - // Terminate the library before destructors are called - AfxTermExtensionModule(TestRunnerDLL); - } - return 1; // ok -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.h deleted file mode 100644 index fa5c78ed..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerApp.h +++ /dev/null @@ -1,19 +0,0 @@ -// TestRunner.h : main header file for the TESTRUNNER application -// - -#if !defined(AFX_TESTRUNNER_H) -#define AFX_TESTRUNNER_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -// Handle to the instance to retreive module resource. -extern HINSTANCE g_testRunnerResource; - - -#endif // !defined(AFX_TESTRUNNER_H) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.cpp deleted file mode 100644 index 45d202cb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.cpp +++ /dev/null @@ -1,677 +0,0 @@ -// TestRunnerDlg.cpp : implementation file -// - -#include "stdafx.h" -#include "mmsystem.h" -#include "TestRunnerApp.h" -#include "TestRunnerDlg.h" -#include "Resource.h" -#include "ActiveTest.h" -#include "ProgressBar.h" -#include "TreeHierarchyDlg.h" -#include "ListCtrlFormatter.h" -#include "ListCtrlSetter.h" -#include "MfcSynchronizationObject.h" -#include "ResourceLoaders.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -/* Notes: - - code duplication between OnOK() and OnQuitApplication() - - the threading need to be rewrite, so that GUI update occures in the original - thread, not in the thread that is running the tests. This slow down the time - needed to run the test much... - */ - - -///////////////////////////////////////////////////////////////////////////// -// TestRunnerDlg dialog - -const CString TestRunnerDlg::ms_cppunitKey( "CppUnit" ); - - -TestRunnerDlg::TestRunnerDlg( TestRunnerModel *model, - int nDialogResourceId, - CWnd* pParent ) - : cdxCDynamicDialog( nDialogResourceId, pParent ) -{ - ASSERT(0); // this constructor should not be used because of possible resource problems - // => use the constructor with the string parameter - init(model); -} - -TestRunnerDlg::TestRunnerDlg( TestRunnerModel *model, - const TCHAR* szDialogResourceId, - CWnd* pParent ) - : cdxCDynamicDialog( szDialogResourceId == NULL ? - _T("CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TESTRUNNER") - : szDialogResourceId, - pParent) -{ - init(model); -} - -void -TestRunnerDlg::init(TestRunnerModel *model) -{ - m_model = model; - - //{{AFX_DATA_INIT(TestRunnerDlg) - m_bAutorunAtStartup = FALSE; - //}}AFX_DATA_INIT - - m_testsProgress = 0; - m_selectedTest = 0; - m_bAutorunAtStartup = true; - m_bIsRunning = false; - m_activeTest = 0; - m_result = 0; - m_testObserver = 0; - - ModifyFlags( flSWPCopyBits, 0 ); // anti-flickering option for resizing -} - -void -TestRunnerDlg::DoDataExchange(CDataExchange* pDX) -{ - cdxCDynamicDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(TestRunnerDlg) - DDX_Control(pDX, IDC_DETAILS, m_details); - DDX_Control(pDX, IDC_LIST, m_listCtrl); - DDX_Control(pDX, IDOK, m_buttonClose); - DDX_Control(pDX, ID_STOP, m_buttonStop); - DDX_Control(pDX, ID_RUN, m_buttonRun); - DDX_Control(pDX, IDC_BROWSE_TEST, m_buttonBrowse); - DDX_Check(pDX, IDC_CHECK_AUTORUN, m_bAutorunAtStartup); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(TestRunnerDlg, cdxCDynamicDialog) - //{{AFX_MSG_MAP(TestRunnerDlg) - ON_BN_CLICKED(ID_RUN, OnRun) - ON_BN_CLICKED(ID_STOP, OnStop) - ON_BN_CLICKED(IDC_BROWSE_TEST, OnBrowseTest) - ON_COMMAND(ID_QUIT_APPLICATION, OnQuitApplication) - ON_WM_CLOSE() - ON_WM_SIZE() - ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST, OnSelectedFailureChange) - ON_CBN_SELCHANGE(IDC_COMBO_TEST, OnSelectTestInHistoryCombo) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// TestRunnerDlg message handlers - -BOOL -TestRunnerDlg::OnInitDialog() -{ - cdxCDynamicDialog::OnInitDialog(); - -#ifdef CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD - m_hAccelerator = ::LoadAccelerators( AfxGetResourceHandle(), -#else - m_hAccelerator = ::LoadAccelerators( g_testRunnerResource, -#endif - MAKEINTRESOURCE( IDR_ACCELERATOR_TEST_RUNNER ) ); -// It always fails!!! I don't understand why. Complain about not finding the resource name! - ASSERT( m_hAccelerator !=NULL ); - - CComboBox *comboBox = (CComboBox *)GetDlgItem (IDC_COMBO_TEST); - - ASSERT (comboBox); - - VERIFY( m_errorListBitmap.Create( _T("CPP_UNIT_TEST_RUNNER_IDB_ERROR_TYPE"), - 16, 1, - RGB( 255,0,255 ) ) ); - - m_testsProgress = new ProgressBar(); - m_testsProgress->Create( NULL, NULL, WS_CHILD, CRect(), this, 0 ); - m_testsProgress->ShowWindow( SW_SHOW ); - m_testsProgress->MoveWindow( getItemClientRect( IDC_STATIC_PROGRESS_BAR ) ); - - initializeLayout(); - loadSettings(); - initializeFixedSizeFont(); - m_details.SetFont( &m_fixedSizeFont ); // Does not work. Need to investigate... - - m_listCtrl.SetImageList( &m_errorListBitmap, LVSIL_SMALL ); - m_listCtrl.SetExtendedStyle( m_listCtrl.GetExtendedStyle() | LVS_EX_FULLROWSELECT ); - - int total_col_1_4 = m_settings.col_1 + m_settings.col_2 + - m_settings.col_3 + m_settings.col_4; - - CRect listBounds; - m_listCtrl.GetClientRect(&listBounds); - int col_5_width = listBounds.Width() - total_col_1_4; // 5th column = rest of listview space - ListCtrlFormatter formatter( m_listCtrl ); - formatter.AddColumn( loadCString(IDS_ERRORLIST_TYPE), m_settings.col_1, LVCFMT_LEFT, 0 ); - formatter.AddColumn( loadCString(IDS_ERRORLIST_NAME), m_settings.col_2, LVCFMT_LEFT, 1 ); - formatter.AddColumn( loadCString(IDS_ERRORLIST_FAILED_CONDITION), m_settings.col_3, LVCFMT_LEFT, 2 ); - m_listCtrl.setLineNumberSubItem( formatter.GetNextColumnIndex() ); - formatter.AddColumn( loadCString(IDS_ERRORLIST_LINE_NUMBER), m_settings.col_4, LVCFMT_LEFT, 3 ); - m_listCtrl.setFileNameSubItem( formatter.GetNextColumnIndex() ); - formatter.AddColumn( loadCString(IDS_ERRORLIST_FILE_NAME), col_5_width, LVCFMT_LEFT, 4 ); - - reset (); - updateHistoryCombo(); - UpdateData( FALSE ); - - updateListColumnSize(); - - m_buttonRun.SetFocus(); - - if ( m_bAutorunAtStartup ) - OnRun(); - - return FALSE; // return TRUE unless you set the focus to a control - // EXCEPTION: OCX Property Pages should return FALSE -} - - -TestRunnerDlg::~TestRunnerDlg() -{ - freeState(); - delete m_testsProgress; -} - - -void -TestRunnerDlg::OnRun() -{ - if ( m_bIsRunning ) - return; - - m_selectedTest = m_model->selectedTest(); - - if ( m_selectedTest == 0 ) - return; - - freeState(); - reset(); - - beRunning(); - - int numberOfTests = m_selectedTest->countTestCases(); - - m_testsProgress->start( numberOfTests ); - - - m_result = new CPPUNIT_NS::TestResultCollector( new MfcSynchronizationObject() ); - m_testObserver = new CPPUNIT_NS::TestResult( new MfcSynchronizationObject() ); - m_testObserver->addListener( m_result ); - m_testObserver->addListener( this ); - m_activeTest = new ActiveTest( m_selectedTest ); - - m_testStartTime = timeGetTime(); - - m_activeTest->run( m_testObserver ); - - m_testEndTime = timeGetTime(); -} - - -void -TestRunnerDlg::addListEntry( const CPPUNIT_NS::TestFailure &failure ) -{ - CListCtrl *listCtrl = (CListCtrl *)GetDlgItem (IDC_LIST); - int currentEntry = m_result->testErrors() + - m_result->testFailures() -1; - - ErrorTypeBitmaps errorType; - if ( failure.isError() ) - errorType = errorTypeError; - else - errorType = errorTypeFailure; - - ListCtrlSetter setter( *listCtrl ); - setter.insertLine( currentEntry ); - setter.addSubItem( failure.isError() ? _T("Error") : _T("Failure"), errorType ); - - // Set test name - setter.addSubItem( failure.failedTestName().c_str(), errorType ); - - // Set the asserted text - CString message( failure.thrownException()->message().shortDescription().c_str() ); - message.Replace( '\n', ' ' ); // should only print the short description there, - setter.addSubItem( message ); // and dump the detail on an edit control when clicked. - - // Set the line number - if ( failure.sourceLine().isValid() ) - { - CString lineNumber; - lineNumber.Format( _T("%ld"), failure.sourceLine().lineNumber() ); - setter.addSubItem( lineNumber ); - } - else - setter.addSubItem( _T("") ); - - // Set the file name - setter.addSubItem( failure.sourceLine().fileName().c_str() ); - - if ( !listCtrl->GetFirstSelectedItemPosition() ) - { - // Select first entry => display details of first entry. - listCtrl->SetItemState( currentEntry, LVIS_SELECTED, LVIS_SELECTED ); - listCtrl->SetFocus(); // Does not work ?!? - } - - listCtrl->RedrawItems( currentEntry, currentEntry ); - listCtrl->UpdateWindow(); -} - - -void -TestRunnerDlg::startTest( CPPUNIT_NS::Test *test ) -{ - CWnd *runningTestCaseLabel = GetDlgItem(IDC_RUNNING_TEST_CASE_LABEL); - if ( runningTestCaseLabel ) - runningTestCaseLabel->SetWindowText( CString( test->getName().c_str() ) ); -} - - -void -TestRunnerDlg::addFailure( const CPPUNIT_NS::TestFailure &failure ) -{ - addListEntry( failure ); - if ( failure.isError() ) - m_errors++; - else - m_failures++; - - updateCountsDisplay(); -} - - -void -TestRunnerDlg::endTest( CPPUNIT_NS::Test *test ) -{ - if ( m_selectedTest == 0 ) - return; - - m_testsRun++; - updateCountsDisplay(); - m_testsProgress->step( m_failures == 0 && m_errors == 0 ); - - m_testEndTime = timeGetTime(); - - updateCountsDisplay(); - - if ( m_testsRun >= m_selectedTest->countTestCases() ) - beIdle (); -} - - -void -TestRunnerDlg::beRunning() -{ - m_bIsRunning = true; - m_buttonRun.EnableWindow( FALSE ); - m_buttonClose.EnableWindow( FALSE ); - m_buttonBrowse.EnableWindow( FALSE ); - -// m_buttonRun.SetButtonStyle( m_buttonRun.GetButtonStyle() & ~BS_DEFPUSHBUTTON ); -// m_buttonStop.SetButtonStyle( m_buttonStop.GetButtonStyle() | BS_DEFPUSHBUTTON ); -} - - -void -TestRunnerDlg::beIdle() -{ - m_bIsRunning = false; - m_buttonRun.EnableWindow( TRUE ); - m_buttonBrowse.EnableWindow( TRUE ); - m_buttonClose.EnableWindow( TRUE ); - - m_buttonRun.SetButtonStyle( m_buttonRun.GetButtonStyle() | BS_DEFPUSHBUTTON ); -// m_buttonStop.SetButtonStyle( m_buttonStop.GetButtonStyle() & ~BS_DEFPUSHBUTTON ); -} - - -void -TestRunnerDlg::beRunDisabled() -{ - m_bIsRunning = false; - m_buttonRun.EnableWindow( FALSE ); - m_buttonBrowse.EnableWindow( FALSE ); - m_buttonStop.EnableWindow( FALSE ); - m_buttonClose.EnableWindow( TRUE ); - -// m_buttonRun.SetButtonStyle( m_buttonRun.GetButtonStyle() | BS_DEFPUSHBUTTON ); -// m_buttonStop.SetButtonStyle( m_buttonStop.GetButtonStyle() & ~BS_DEFPUSHBUTTON ); -} - - -void -TestRunnerDlg::freeState() -{ - delete m_activeTest; - delete m_result; - delete m_testObserver; - m_activeTest = 0; - m_result = 0; - m_testObserver = 0; -} - - -void -TestRunnerDlg::reset() -{ - m_testsRun = 0; - m_errors = 0; - m_failures = 0; - m_testEndTime = m_testStartTime; - - updateCountsDisplay(); - - freeState(); - CListCtrl *listCtrl = (CListCtrl *)GetDlgItem (IDC_LIST); - - listCtrl->DeleteAllItems(); - m_testsProgress->reset(); - displayFailureDetailsFor( -1 ); -} - - -void -TestRunnerDlg::updateCountsDisplay() -{ - CStatic *statTestsRun = (CStatic *)GetDlgItem( IDC_STATIC_RUNS ); - CStatic *statErrors = (CStatic *)GetDlgItem( IDC_STATIC_ERRORS ); - CStatic *statFailures = (CStatic *)GetDlgItem( IDC_STATIC_FAILURES ); - CEdit *editTime = (CEdit *)GetDlgItem( IDC_EDIT_TIME ); - - CString argumentString; - - argumentString.Format( _T("%d"), m_testsRun ); - statTestsRun->SetWindowText (argumentString); - - argumentString.Format( _T("%d"), m_errors ); - statErrors->SetWindowText( argumentString ); - - argumentString.Format( _T("%d"), m_failures ); - statFailures->SetWindowText( argumentString ); - - argumentString.Format( _T("Execution time: %3.3lf seconds"), - (m_testEndTime - m_testStartTime) / 1000.0 ); - editTime->SetWindowText( argumentString ); -} - - -void -TestRunnerDlg::OnStop() -{ - if ( m_testObserver ) - m_testObserver->stop (); - - beIdle (); -} - - -void -TestRunnerDlg::OnOK() -{ - if ( m_testObserver ) - m_testObserver->stop (); - - UpdateData(); - saveSettings(); - - cdxCDynamicDialog::OnOK (); -} - - -void -TestRunnerDlg::OnSelectTestInHistoryCombo() -{ - unsigned int currentSelection = getHistoryCombo()->GetCurSel (); - - if ( currentSelection >= 0 && - currentSelection < m_model->history().size() ) - { - CPPUNIT_NS::Test *selectedTest = m_model->history()[currentSelection]; - m_model->selectHistoryTest( selectedTest ); - updateHistoryCombo(); - beIdle(); - } - else - beRunDisabled(); -} - - -void -TestRunnerDlg::updateHistoryCombo() -{ - getHistoryCombo()->LockWindowUpdate(); - - getHistoryCombo()->ResetContent(); - - const TestRunnerModel::History &history = m_model->history(); - for ( TestRunnerModel::History::const_iterator it = history.begin(); - it != history.end(); - ++it ) - { - CPPUNIT_NS::Test *test = *it; - getHistoryCombo()->AddString( CString(test->getName().c_str()) ); - } - - if ( history.size() > 0 ) - { - getHistoryCombo()->SetCurSel( 0 ); - beIdle(); - } - else - { - beRunDisabled(); - m_buttonBrowse.EnableWindow( TRUE ); - } - - getHistoryCombo()->UnlockWindowUpdate(); -} - - -void -TestRunnerDlg::OnBrowseTest() -{ - TreeHierarchyDlg dlg; - dlg.setRootTest( m_model->rootTest() ); - if ( dlg.DoModal() == IDOK ) - { - m_model->selectHistoryTest( dlg.getSelectedTest() ); - updateHistoryCombo(); - } -} - - -BOOL -TestRunnerDlg::PreTranslateMessage(MSG* pMsg) -{ - if ( ::TranslateAccelerator( m_hWnd, - m_hAccelerator, - pMsg ) ) - { - return TRUE; - } - return cdxCDynamicDialog::PreTranslateMessage(pMsg); -} - - -CComboBox * -TestRunnerDlg::getHistoryCombo() -{ - CComboBox *comboBox = (CComboBox *)GetDlgItem (IDC_COMBO_TEST); - ASSERT (comboBox); - return comboBox; -} - - -void -TestRunnerDlg::loadSettings() -{ - m_model->loadSettings(m_settings); - RestoreWindowPosition( TestRunnerModel::settingKey, - TestRunnerModel::settingMainDialogKey ); - - - m_bAutorunAtStartup = m_settings.autorunOnLaunch; -} - - -void -TestRunnerDlg::saveSettings() -{ - m_settings.autorunOnLaunch = ( m_bAutorunAtStartup != 0 ); - StoreWindowPosition( TestRunnerModel::settingKey, - TestRunnerModel::settingMainDialogKey ); - - m_settings.col_1 = m_listCtrl.GetColumnWidth(0); - m_settings.col_2 = m_listCtrl.GetColumnWidth(1); - m_settings.col_3 = m_listCtrl.GetColumnWidth(2); - m_settings.col_4 = m_listCtrl.GetColumnWidth(3); - - m_model->saveSettings(m_settings); -} - - -void -TestRunnerDlg::OnQuitApplication() -{ - if ( m_testObserver ) - m_testObserver->stop(); - - UpdateData(); - saveSettings(); - - CWinApp *app = AfxGetApp(); - ASSERT( app != NULL ); - app->PostThreadMessage( WM_QUIT, 0, 0 ); -} - - -TestRunnerModel & -TestRunnerDlg::model() -{ - ASSERT( m_model != NULL ); - return *m_model; -} - - -void -TestRunnerDlg::OnClose() -{ - OnOK(); -} - - -CRect -TestRunnerDlg::getItemWindowRect( unsigned int itemId ) -{ - CWnd * pItem = GetDlgItem( itemId ); - CRect rect; - if ( pItem ) - pItem->GetWindowRect( &rect ); - return rect; -} - - -CRect -TestRunnerDlg::getItemClientRect( unsigned int itemId ) -{ - CRect rect = getItemWindowRect( itemId ); - if ( !rect.IsRectNull() ) - { - CPoint clientTopLeft = rect.TopLeft(); - ScreenToClient( &clientTopLeft ); - rect = CRect( clientTopLeft, rect.Size() ); - } - - return rect; -} - - -void -TestRunnerDlg::initializeLayout() -{ - // see DynamicWindow/doc for documentation - const int listGrowthRatio = 30; - AddSzXControl( IDC_COMBO_TEST, mdResize ); - AddSzXControl( IDC_BROWSE_TEST, mdRepos ); - AddSzXControl( IDC_RUNNING_TEST_CASE_LABEL, mdResize ); - AddSzXControl( ID_RUN, mdRepos ); - AddSzXControl( *m_testsProgress, mdResize ); - AddSzXControl( IDC_CHECK_AUTORUN, mdRepos ); - AddSzControl( IDC_LIST, 0, 0, 100, listGrowthRatio ); - AddSzXControl( ID_STOP, mdRepos ); - AddSzXControl( IDOK, mdRepos ); - AddSzYControl( IDC_STATIC_DETAILS, listGrowthRatio, listGrowthRatio ); - AddSzControl( IDC_DETAILS, 0, listGrowthRatio, 100, 100 ); - AddSzControl( IDC_EDIT_TIME, mdResize, mdRepos ); -} - - -void -TestRunnerDlg::OnSize( UINT nType, int cx, int cy ) -{ - cdxCDynamicDialog::OnSize(nType, cx, cy); - updateListColumnSize(); -} - - -void -TestRunnerDlg::updateListColumnSize() -{ - if ( !m_listCtrl.GetSafeHwnd() ) - return; - - // resize to fit last column - CRect listBounds = getItemClientRect( IDC_LIST ); - - int width_1_4 = 0; - for (int i = 0; i < 4; ++i) - width_1_4 += m_listCtrl.GetColumnWidth( i ); - - // the 4 offset is so no horiz scroll bar will appear - m_listCtrl.SetColumnWidth(4, listBounds.Width() - width_1_4 - 4); -} - - -void -TestRunnerDlg::OnSelectedFailureChange( NMHDR* pNMHDR, - LRESULT* pResult ) -{ - NM_LISTVIEW *pNMListView = (NM_LISTVIEW*)pNMHDR; - - if ( (pNMListView->uNewState & LVIS_SELECTED) != 0 ) // item selected - displayFailureDetailsFor( pNMListView->iItem ); - - *pResult = 0; -} - - -void -TestRunnerDlg::displayFailureDetailsFor( unsigned int failureIndex ) -{ - CString details; - if ( m_result && failureIndex < m_result->failures().size() ) - details = m_result->failures()[ failureIndex ]->thrownException()->what(); - - details.Replace( _T("\n"), _T("\r\n") ); - - m_details.SetWindowText( details ); -} - - -void -TestRunnerDlg::initializeFixedSizeFont() -{ - LOGFONT font; - GetFont()->GetLogFont( &font ); - font.lfPitchAndFamily = FIXED_PITCH | //VARIABLE_PITCH - (font.lfPitchAndFamily & ~15); // font family - m_fixedSizeFont.CreateFontIndirect( &font ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.h deleted file mode 100644 index 5d5f9b4b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerDlg.h +++ /dev/null @@ -1,170 +0,0 @@ -#if !defined(AFX_TESTRUNNERDLG_H) -#define AFX_TESTRUNNERDLG_H - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// TestRunnerDlg.h : header file -// - -/* Refer to MSDN documentation: - mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll - to know how to write and use MFC extension DLL - Can be found in the index with "mfc extension" - => - Using: - - your application must link Multithreaded MFC DLL - - memory allocation is done using the same heap - - you must define the symbol _AFX_DLL - Building: - - you must define the symbol _AFX_DLL and _AFX_EXT - */ - -// Define the folowing symbol to subclass TestRunnerDlg -#ifndef CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD -#include "resource.h" -#else -#define IDD_DIALOG_TESTRUNNER 0 -#endif - -#include -#include -#include -#include -#include -#include - -#include "ActiveTest.h" -#include "MsDevCallerListCtrl.h" -#include "TestRunnerModel.h" -#include "DynamicWindow/cdxCDynamicDialog.h" - -class ProgressBar; -class TestRunnerModel; - - -///////////////////////////////////////////////////////////////////////////// -// TestRunnerDlg dialog - -class TestRunnerDlg : public cdxCDynamicDialog, - public CPPUNIT_NS::TestListener -{ -public: - TestRunnerDlg( TestRunnerModel *model, - int nDialogResourceId, - CWnd* pParent = NULL); - TestRunnerDlg( TestRunnerModel *model, - const TCHAR* szDialogResourceId = NULL, - CWnd* pParent = NULL); - virtual ~TestRunnerDlg(); - - // overrided from TestListener; - void startTest( CPPUNIT_NS::Test *test ); - void addFailure( const CPPUNIT_NS::TestFailure &failure ); - void endTest( CPPUNIT_NS::Test *test ); - - // IDD is not use, it is just there for the wizard. - //{{AFX_DATA(TestRunnerDlg) - CEdit m_details; - MsDevCallerListCtrl m_listCtrl; - CButton m_buttonClose; - CButton m_buttonStop; - CButton m_buttonRun; - CButton m_buttonBrowse; - BOOL m_bAutorunAtStartup; - //}}AFX_DATA - - //{{AFX_VIRTUAL(TestRunnerDlg) -public: - virtual BOOL PreTranslateMessage(MSG* pMsg); -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -protected: - - //{{AFX_MSG(TestRunnerDlg) - virtual BOOL OnInitDialog(); - afx_msg void OnRun(); - afx_msg void OnStop(); - virtual void OnOK(); - afx_msg void OnBrowseTest(); - afx_msg void OnQuitApplication(); - afx_msg void OnClose(); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnSelectedFailureChange(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnSelectTestInHistoryCombo(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - - typedef std::vector Tests; - ProgressBar *m_testsProgress; - CPPUNIT_NS::Test *m_selectedTest; - ActiveTest *m_activeTest; - CPPUNIT_NS::TestResult *m_testObserver; - CPPUNIT_NS::TestResultCollector *m_result; - int m_testsRun; - int m_errors; - int m_failures; - DWORD m_testStartTime; - DWORD m_testEndTime; - static const CString ms_cppunitKey; - HACCEL m_hAccelerator; - bool m_bIsRunning; - TestRunnerModel *m_model; - CImageList m_errorListBitmap; - CFont m_fixedSizeFont; - - enum ErrorTypeBitmaps - { - errorTypeFailure =0, - errorTypeError - }; - - void addListEntry( const CPPUNIT_NS::TestFailure &failure ); - void beIdle(); - void beRunning(); - void beRunDisabled(); - void reset(); - void freeState(); - void updateCountsDisplay(); - void setupHistoryCombo(); - CPPUNIT_NS::Test *findTestByName( std::string name ) const; - CPPUNIT_NS::Test *findTestByNameFor( const std::string &name, - CPPUNIT_NS::Test *test ) const; - void addNewTestToHistory( CPPUNIT_NS::Test *test ); - void addTestToHistoryCombo( CPPUNIT_NS::Test *test, - int idx =-1 ); - void removeTestFromHistory( CPPUNIT_NS::Test *test ); - CComboBox *getHistoryCombo(); - void updateSelectedItem(); - void saveHistory(); - void loadSettings(); - void saveSettings(); - TestRunnerModel &model(); - void updateHistoryCombo(); - void displayFailureDetailsFor( unsigned int failureIndex ); - - CRect getItemWindowRect( unsigned int itemId ); - CRect getItemClientRect( unsigned int itemId ); - - //CRect getDialogBounds(); - - virtual void initializeLayout(); - void updateListColumnSize(); - void initializeFixedSizeFont(); - - -private: - TestRunnerModel::Settings m_settings; - - /// do all initialization, that is usually done in the constructor, so that the - /// code is not duplicated in the two constructors - void TestRunnerDlg::init(TestRunnerModel *model); -}; - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TESTRUNNERDLG_H) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.cpp deleted file mode 100644 index 9b175b6f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerModel.cpp for class TestRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/04/26 -// ////////////////////////////////////////////////////////////////////////// - -#include "StdAfx.h" -#include "TestRunnerModel.h" -#include -#include -#include -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - - -const CString TestRunnerModel::settingKey( _T("CppUnit") ); -const CString TestRunnerModel::settingMainDialogKey( _T( "MainDialog" ) ); -const CString TestRunnerModel::settingBrowseDialogKey( _T( "BrowseDialog" ) ); - - -TestRunnerModel::TestRunnerModel( CPPUNIT_NS::Test *rootTest ) : - m_rootTest( rootTest ) -{ -} - - -TestRunnerModel::~TestRunnerModel() -{ -} - -const TestRunnerModel::History & -TestRunnerModel::history() const -{ - return m_history; -} - - -void -TestRunnerModel::selectHistoryTest( CPPUNIT_NS::Test *test ) -{ - CPPUNIT_NS::removeFromSequence( m_history, test ); - - if ( test != NULL ) - m_history.push_front( test ); -} - - -CPPUNIT_NS::Test * -TestRunnerModel::selectedTest() const -{ - if ( m_history.size() > 0 ) - return m_history[0]; - return NULL; -} - - -void -TestRunnerModel::loadSettings(Settings & s) -{ - CWinApp *app = AfxGetApp(); - ASSERT( app != NULL ); - - int autorun = app->GetProfileInt( _T("CppUnit"), - _T("AutorunAtStartup"), - 1 ); - s.autorunOnLaunch = (autorun == 1); - - s.col_1 = app->GetProfileInt( _T("CppUnit"), _T("Col_1"), 40 ); - s.col_2 = app->GetProfileInt( _T("CppUnit"), _T("Col_2"), 40 ); - s.col_3 = app->GetProfileInt( _T("CppUnit"), _T("Col_3"), 40 ); - s.col_4 = app->GetProfileInt( _T("CppUnit"), _T("Col_4"), 40 ); - - loadHistory(); -} - - -void -TestRunnerModel::loadHistory() -{ - m_history.clear(); - int idx = 1; - do - { - CString testName = loadHistoryEntry( idx++ ); - if ( testName.IsEmpty() ) - break; - - try - { - m_history.push_back( m_rootTest->findTest( toAnsiString(testName ) ) ); - } - catch ( std::invalid_argument &) - { - } - } - while ( true ); -} - - -CString -TestRunnerModel::loadHistoryEntry( int idx ) -{ - CWinApp *app = AfxGetApp(); - ASSERT( app != NULL ); - - return app->GetProfileString( _T("CppUnit"), getHistoryEntryName( idx ) ); -} - - -void -TestRunnerModel::saveSettings( const Settings & s ) -{ - CWinApp *app = AfxGetApp(); - ASSERT( app != NULL ); - - int autorun = s.autorunOnLaunch ? 1 : 0; - app->WriteProfileInt( _T("CppUnit"), _T("AutorunAtStartup"), autorun ); - - app->WriteProfileInt( _T("CppUnit"), _T("Col_1"), s.col_1 ); - app->WriteProfileInt( _T("CppUnit"), _T("Col_2"), s.col_2 ); - app->WriteProfileInt( _T("CppUnit"), _T("Col_3"), s.col_3 ); - app->WriteProfileInt( _T("CppUnit"), _T("Col_4"), s.col_4 ); - - int idx = 1; - for ( History::const_iterator it = m_history.begin(); - it != m_history.end(); - ++it , ++idx ) - { - CPPUNIT_NS::Test *test = *it; - saveHistoryEntry( idx, test->getName().c_str() ); - } -} - - -void -TestRunnerModel::saveHistoryEntry( int idx, - CString testName ) -{ - CWinApp *app = AfxGetApp(); - ASSERT( app != NULL ); - - app->WriteProfileString( _T("CppUnit"), - getHistoryEntryName( idx ), - testName ); -} - - -CString -TestRunnerModel::getHistoryEntryName( int idx ) const -{ - CString entry; - entry.Format( _T("HistoryTest%d"), idx ); - return entry; -} - - -CPPUNIT_NS::Test * -TestRunnerModel::rootTest() -{ - return m_rootTest; -} - - -void -TestRunnerModel::setRootTest( CPPUNIT_NS::Test *test ) -{ - m_rootTest = test; -} - - -CPPUNIT_NS::Test * -TestRunnerModel::findTestByName( CString name ) const -{ - return findTestByNameFor( name, m_rootTest ); -} - - -CPPUNIT_NS::Test * -TestRunnerModel::findTestByNameFor( const CString &name, - CPPUNIT_NS::Test *test ) const -{ - if ( name == test->getName().c_str() ) - return test; - - CPPUNIT_NS::TestSuite *suite = dynamic_cast(test); - if ( suite == NULL ) - return NULL; - - const std::vector &tests = suite->getTests(); - for ( std::vector::const_iterator it = tests.begin(); - it != tests.end(); - ++it ) - { - CPPUNIT_NS::Test *testFound = findTestByNameFor( name, *it ); - if ( testFound != NULL ) - return testFound; - } - return NULL; -} - - -// Utility method, should be moved somewhere else... -std::string -TestRunnerModel::toAnsiString( const CString &text ) -{ -#ifdef _UNICODE - int bufferLength = ::WideCharToMultiByte( CP_THREAD_ACP, 0, - text, text.GetLength(), - NULL, 0, NULL, NULL ) +1; - char *ansiString = new char[bufferLength]; - ::WideCharToMultiByte( CP_THREAD_ACP, 0, - text, text.GetLength(), - ansiString, bufferLength, - NULL, - NULL ); - - std::string str( ansiString, bufferLength-1 ); - delete[] ansiString; - - return str; -#else - return std::string( (LPCTSTR)text ); -#endif -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.h deleted file mode 100644 index ed123807..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TestRunnerModel.h +++ /dev/null @@ -1,87 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerModel.h for class TestRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/04/26 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERMODEL_H -#define TESTRUNNERMODEL_H - -#include -#include - - -/*! \class TestRunnerModel - * \brief This class represents a model for the test runner. - */ -class TestRunnerModel -{ -public: - static const CString settingKey; - static const CString settingMainDialogKey; - static const CString settingBrowseDialogKey; - - struct Settings - { - bool autorunOnLaunch; - int col_1; // 1st column width in list view - int col_2; // 2nd column width in list view - int col_3; // 3rd column width in list view - int col_4; // 4th column width in list view - }; - - typedef std::deque History; - - /*! Constructs a TestRunnerModel object. - */ - TestRunnerModel( CPPUNIT_NS::Test *rootTest ); - - /*! Destructor. - */ - virtual ~TestRunnerModel(); - - virtual void setRootTest( CPPUNIT_NS::Test *rootTest ); - - void loadSettings(Settings & s); - void saveSettings(const Settings & s); - - const History &history() const; - void selectHistoryTest( CPPUNIT_NS::Test *test ); - CPPUNIT_NS::Test *selectedTest() const; - - CPPUNIT_NS::Test *rootTest(); - -protected: - void loadHistory(); - CString loadHistoryEntry( int idx ); - CPPUNIT_NS::Test *findTestByName( CString name ) const; - CPPUNIT_NS::Test *findTestByNameFor( const CString &name, - CPPUNIT_NS::Test *test ) const; - - void saveHistoryEntry( int idx, - CString testName ); - - CString getHistoryEntryName( int idx ) const; - - static std::string toAnsiString( const CString &text ); - -private: - /// Prevents the use of the copy constructor. - TestRunnerModel( const TestRunnerModel © ); - - /// Prevents the use of the copy operator. - TestRunnerModel &operator =( const TestRunnerModel © ); - -protected: - History m_history; - - CPPUNIT_NS::Test *m_rootTest; -}; - - - -// Inlines methods for TestRunnerModel: -// ------------------------------------ - - - -#endif // TESTRUNNERMODEL_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.cpp deleted file mode 100644 index 1c0b6713..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// TreeHierarchyDlg.cpp : implementation file -// - -#include "stdafx.h" -#include "resource.h" -#include "TreeHierarchyDlg.h" -#include "TestRunnerModel.h" -#include "ResourceLoaders.h" -#include - - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// TreeHierarchyDlg dialog - - -TreeHierarchyDlg::TreeHierarchyDlg(CWnd* pParent ) - : cdxCDynamicDialog(_T("CPP_UNIT_TEST_RUNNER_IDD_DIALOG_TEST_HIERARCHY"), pParent) - , m_selectedTest( NULL ) -{ - ModifyFlags( flSWPCopyBits, 0 ); // anti-flickering option for resizing - - //{{AFX_DATA_INIT(TreeHierarchyDlg) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - - -void -TreeHierarchyDlg::DoDataExchange(CDataExchange* pDX) -{ - cdxCDynamicDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(TreeHierarchyDlg) - DDX_Control(pDX, IDC_TREE_TEST, m_treeTests); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(TreeHierarchyDlg, cdxCDynamicDialog) - //{{AFX_MSG_MAP(TreeHierarchyDlg) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - - - -void -TreeHierarchyDlg::setRootTest( CPPUNIT_NS::Test *test ) -{ - m_rootTest = test; -} - - -BOOL -TreeHierarchyDlg::OnInitDialog() -{ - cdxCDynamicDialog::OnInitDialog(); - - fillTree(); - initializeLayout(); - RestoreWindowPosition( TestRunnerModel::settingKey, - TestRunnerModel::settingBrowseDialogKey ); - - return TRUE; -} - - -void -TreeHierarchyDlg::initializeLayout() -{ - // see DynamicWindow/doc for documentation - AddSzControl( IDC_TREE_TEST, mdResize, mdResize ); - AddSzControl( IDOK, mdRepos, mdNone ); - AddSzControl( IDCANCEL, mdRepos, mdNone ); -} - - -void -TreeHierarchyDlg::fillTree() -{ - VERIFY( m_imageList.Create( _T("CPP_UNIT_TEST_RUNNER_IDB_TEST_TYPE"), - 16, 1, RGB( 255,0,255 ) ) ); - - m_treeTests.SetImageList( &m_imageList, TVSIL_NORMAL ); - - HTREEITEM hSuite = addTest( m_rootTest, TVI_ROOT ); - m_treeTests.Expand( hSuite, TVE_EXPAND ); -} - - -HTREEITEM -TreeHierarchyDlg::addTest( CPPUNIT_NS::Test *test, - HTREEITEM hParent ) -{ - int testType = isSuite( test ) ? imgSuite : imgUnitTest; - HTREEITEM hItem = m_treeTests.InsertItem( CString(test->getName().c_str()), - testType, - testType, - hParent ); - if ( hItem != NULL ) - { - VERIFY( m_treeTests.SetItemData( hItem, (DWORD)test ) ); - if ( isSuite( test ) ) - addTestSuiteChildrenTo( test, hItem ); - } - return hItem; -} - - -void -TreeHierarchyDlg::addTestSuiteChildrenTo( CPPUNIT_NS::Test *suite, - HTREEITEM hItemSuite ) -{ - Tests tests; - int childIndex = 0; - for ( ; childIndex < suite->getChildTestCount(); ++childIndex ) - tests.push_back( suite->getChildTestAt( childIndex ) ); - sortByName( tests ); - - for ( childIndex = 0; childIndex < suite->getChildTestCount(); ++childIndex ) - addTest( suite->getChildTestAt( childIndex ), hItemSuite ); -} - - -bool -TreeHierarchyDlg::isSuite( CPPUNIT_NS::Test *test ) -{ - return ( test->getChildTestCount() > 0 || // suite with test - test->countTestCases() == 0 ); // empty suite -} - - -struct PredSortTest -{ - bool operator()( CPPUNIT_NS::Test *test1, CPPUNIT_NS::Test *test2 ) const - { - bool isTest1Suite = TreeHierarchyDlg::isSuite( test1 ); - bool isTest2Suite = TreeHierarchyDlg::isSuite( test2 ); - if ( isTest1Suite && !isTest2Suite ) - return true; - if ( isTest1Suite && isTest2Suite ) - return test1->getName() < test2->getName(); - return false; - } -}; - -void -TreeHierarchyDlg::sortByName( Tests &tests ) const -{ - std::stable_sort( tests.begin(), tests.end(), PredSortTest() ); -} - - -void -TreeHierarchyDlg::OnOK() -{ - CPPUNIT_NS::Test *test = findSelectedTest(); - if ( test == NULL ) - { - AfxMessageBox( loadCString(IDS_ERROR_SELECT_TEST), MB_OK ); - return; - } - - m_selectedTest = test; - storeDialogBounds(); - cdxCDynamicDialog::OnOK(); -} - - -void -TreeHierarchyDlg::OnCancel() -{ - storeDialogBounds(); - cdxCDynamicDialog::OnCancel(); -} - - -CPPUNIT_NS::Test * -TreeHierarchyDlg::findSelectedTest() -{ - HTREEITEM hItem = m_treeTests.GetSelectedItem(); - if ( hItem != NULL ) - { - DWORD data; - VERIFY( data = m_treeTests.GetItemData( hItem ) ); - return reinterpret_cast( data ); - } - return NULL; -} - - -CPPUNIT_NS::Test * -TreeHierarchyDlg::getSelectedTest() const -{ - return m_selectedTest; -} - - -void -TreeHierarchyDlg::storeDialogBounds() -{ - StoreWindowPosition( TestRunnerModel::settingKey, - TestRunnerModel::settingBrowseDialogKey ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.h deleted file mode 100644 index b49126a2..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/TreeHierarchyDlg.h +++ /dev/null @@ -1,81 +0,0 @@ -#if !defined(AFX_TREEHIERARCHYDLG_H__81E65BC0_1F91_482C_A8BD_C1EC305CD6DA__INCLUDED_) -#define AFX_TREEHIERARCHYDLG_H__81E65BC0_1F91_482C_A8BD_C1EC305CD6DA__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// TreeHierarchyDlg.h : header file -// - -#include -#include -#include "DynamicWindow/cdxCDynamicDialog.h" - - -///////////////////////////////////////////////////////////////////////////// -// TreeHierarchyDlg dialog - -class TreeHierarchyDlg : public cdxCDynamicDialog -{ -// Construction -public: - TreeHierarchyDlg(CWnd* pParent = NULL); // standard constructor - - void setRootTest( CPPUNIT_NS::Test *test ); - CPPUNIT_NS::Test *getSelectedTest() const; - - static bool isSuite( CPPUNIT_NS::Test *test ); - - // Dialog Data - //{{AFX_DATA(TreeHierarchyDlg) - CTreeCtrl m_treeTests; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(TreeHierarchyDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - virtual void initializeLayout(); - void storeDialogBounds(); - - // Generated message map functions - //{{AFX_MSG(TreeHierarchyDlg) - virtual BOOL OnInitDialog(); - virtual void OnOK( ); - virtual void OnCancel(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP(); - -private: - typedef std::vector Tests; - - void fillTree(); - HTREEITEM addTest( CPPUNIT_NS::Test *test, - HTREEITEM hParent ); - void addTestSuiteChildrenTo( CPPUNIT_NS::Test *suite, - HTREEITEM hItemSuite ); - - void sortByName( Tests &tests ) const; - CPPUNIT_NS::Test *findSelectedTest(); - - enum - { - imgSuite =0, - imgUnitTest, - }; - - CImageList m_imageList; - CPPUNIT_NS::Test *m_selectedTest; - CPPUNIT_NS::Test *m_rootTest; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TREEHIERARCHYDLG_H__81E65BC0_1F91_482C_A8BD_C1EC305CD6DA__INCLUDED_) diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/TestRunner.rc2 b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/TestRunner.rc2 deleted file mode 100644 index 55dca09f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/TestRunner.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// TESTRUNNER.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/errortype.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/errortype.bmp deleted file mode 100644 index aa645bab..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/errortype.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/test_type.bmp b/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/test_type.bmp deleted file mode 100644 index 63e7fa0f..00000000 Binary files a/src/3rd_party/cppunit/cppunit-1.12.1/src/msvc6/testrunner/res/test_type.bmp and /dev/null differ diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/.cvsignore b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/.cvsignore deleted file mode 100644 index 970874fe..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -*.ncb -*.WW -Debug Release -moc_*.cpp -testbrowserdlg.cpp testbrowserdlg.h -testrunnerdlg.cpp testrunnerdlg.h -*.obj -Makefile -SunWS_cache -ir.out diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/Makefile b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/Makefile deleted file mode 100644 index 0feca249..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/Makefile +++ /dev/null @@ -1,315 +0,0 @@ -############################################################################# -# Makefile for building: libqttestrunnerd.a -# Generated by qmake (1.07a) (Qt 3.3.7) on: Thu Feb 7 02:43:30 2008 -# Project: qttestrunnerlib.pro -# Template: lib -# Command: $(QMAKE) -o Makefile qttestrunnerlib.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -LEX = flex -YACC = yacc -CFLAGS = -pipe -Wall -W -g -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -CXXFLAGS = -pipe -Wall -W -g -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -LEXFLAGS = -YACCFLAGS= -d -INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I. -I../../include -I../../../../../../../include/qt3 -I.moc/ -I.moc/ -AR = ar cqs -RANLIB = -MOC = /usr/share/qt3/bin/moc -UIC = /usr/share/qt3/bin/uic -QMAKE = qmake -TAR = tar -cf -GZIP = gzip -9f -COPY = cp -f -COPY_FILE= $(COPY) -COPY_DIR = $(COPY) -r -INSTALL_FILE= $(COPY_FILE) -INSTALL_DIR = $(COPY_DIR) -DEL_FILE = rm -f -SYMLINK = ln -sf -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = .obj_debug/ - -####### Files - -HEADERS = MostRecentTests.h \ - TestBrowserDlgImpl.h \ - TestFailureInfo.h \ - TestFailureListViewItem.h \ - TestListViewItem.h \ - TestRunnerDlgImpl.h \ - TestRunnerFailureEvent.h \ - TestRunnerModel.h \ - TestRunnerModelThreadInterface.h \ - TestRunnerTestCaseRunEvent.h \ - TestRunnerThread.h \ - TestRunnerThreadEvent.h \ - TestRunnerThreadFinishedEvent.h \ - ../../include/cppunit/ui/qt/TestRunner.h -SOURCES = MostRecentTests.cpp \ - TestBrowserDlgImpl.cpp \ - TestFailureInfo.cpp \ - TestFailureListViewItem.cpp \ - TestListViewItem.cpp \ - QtTestRunner.cpp \ - TestRunnerDlgImpl.cpp \ - TestRunnerFailureEvent.cpp \ - TestRunnerModel.cpp \ - TestRunnerModelThreadInterface.cpp \ - TestRunnerTestCaseRunEvent.cpp \ - TestRunnerThread.cpp \ - TestRunnerThreadEvent.cpp \ - TestRunnerThreadFinishedEvent.cpp -OBJECTS = .obj_debug/MostRecentTests.o \ - .obj_debug/TestBrowserDlgImpl.o \ - .obj_debug/TestFailureInfo.o \ - .obj_debug/TestFailureListViewItem.o \ - .obj_debug/TestListViewItem.o \ - .obj_debug/QtTestRunner.o \ - .obj_debug/TestRunnerDlgImpl.o \ - .obj_debug/TestRunnerFailureEvent.o \ - .obj_debug/TestRunnerModel.o \ - .obj_debug/TestRunnerModelThreadInterface.o \ - .obj_debug/TestRunnerTestCaseRunEvent.o \ - .obj_debug/TestRunnerThread.o \ - .obj_debug/TestRunnerThreadEvent.o \ - .obj_debug/TestRunnerThreadFinishedEvent.o \ - .obj_debug/testbrowserdlg.o \ - .obj_debug/testrunnerdlg.o -FORMS = testbrowserdlg.ui \ - testrunnerdlg.ui -UICDECLS = .moc/testbrowserdlg.h \ - .moc/testrunnerdlg.h -UICIMPLS = .moc/testbrowserdlg.cpp \ - .moc/testrunnerdlg.cpp -SRCMOC = .moc/moc_MostRecentTests.cpp \ - .moc/moc_TestBrowserDlgImpl.cpp \ - .moc/moc_TestRunnerDlgImpl.cpp \ - .moc/moc_TestRunnerModel.cpp \ - .moc/moc_testbrowserdlg.cpp \ - .moc/moc_testrunnerdlg.cpp -OBJMOC = .obj_debug/moc_MostRecentTests.o \ - .obj_debug/moc_TestBrowserDlgImpl.o \ - .obj_debug/moc_TestRunnerDlgImpl.o \ - .obj_debug/moc_TestRunnerModel.o \ - .obj_debug/moc_testbrowserdlg.o \ - .obj_debug/moc_testrunnerdlg.o -DIST = qttestrunnerlib.pro -QMAKE_TARGET = qttestrunnerd -DESTDIR = ../../lib/ -TARGET = libqttestrunnerd.a - -first: all -####### Implicit rules - -.SUFFIXES: .c .o .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -####### Build rules - -all: Makefile ../../lib/$(TARGET) - -staticlib: ../../lib/$(TARGET) - -../../lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP) - test -d ../../lib/ || mkdir -p ../../lib/ - -$(DEL_FILE) $(TARGET) - $(AR) $(TARGET) $(OBJECTS) $(OBJMOC) - -$(DEL_FILE) ../../lib/$(TARGET) - -$(MOVE) $(TARGET) ../../lib/ - - -mocables: $(SRCMOC) -uicables: $(UICDECLS) $(UICIMPLS) - -$(MOC): - ( cd $(QTDIR)/src/moc && $(MAKE) ) - -Makefile: qttestrunnerlib.pro /usr/share/qt3/mkspecs/default/qmake.conf ../../../../../../../share/qt3/lib/libqt-mt.prl - $(QMAKE) -o Makefile qttestrunnerlib.pro -qmake: - @$(QMAKE) -o Makefile qttestrunnerlib.pro - -dist: - @mkdir -p .obj_debug/qttestrunnerd && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj_debug/qttestrunnerd/ && ( cd `dirname .obj_debug/qttestrunnerd` && $(TAR) qttestrunnerd.tar qttestrunnerd && $(GZIP) qttestrunnerd.tar ) && $(MOVE) `dirname .obj_debug/qttestrunnerd`/qttestrunnerd.tar.gz . && $(DEL_FILE) -r .obj_debug/qttestrunnerd - -mocclean: - -$(DEL_FILE) $(OBJMOC) - -$(DEL_FILE) $(SRCMOC) - -uiclean: - -$(DEL_FILE) $(UICIMPLS) $(UICDECLS) - -yaccclean: -lexclean: -clean: mocclean uiclean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) ../../lib/$(TARGET) $(TARGET) - - -FORCE: - -####### Compile - -.obj_debug/MostRecentTests.o: MostRecentTests.cpp MostRecentTests.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/MostRecentTests.o MostRecentTests.cpp - -.obj_debug/TestBrowserDlgImpl.o: TestBrowserDlgImpl.cpp TestBrowserDlgImpl.h \ - TestListViewItem.h \ - .moc/testbrowserdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestBrowserDlgImpl.o TestBrowserDlgImpl.cpp - -.obj_debug/TestFailureInfo.o: TestFailureInfo.cpp TestFailureInfo.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestFailureInfo.o TestFailureInfo.cpp - -.obj_debug/TestFailureListViewItem.o: TestFailureListViewItem.cpp TestFailureListViewItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestFailureListViewItem.o TestFailureListViewItem.cpp - -.obj_debug/TestListViewItem.o: TestListViewItem.cpp TestListViewItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestListViewItem.o TestListViewItem.cpp - -.obj_debug/QtTestRunner.o: QtTestRunner.cpp TestRunnerDlgImpl.h \ - TestRunnerModel.h \ - .moc/testrunnerdlg.h \ - TestFailureInfo.h \ - TestRunnerModelThreadInterface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/QtTestRunner.o QtTestRunner.cpp - -.obj_debug/TestRunnerDlgImpl.o: TestRunnerDlgImpl.cpp TestRunnerDlgImpl.h \ - TestBrowserDlgImpl.h \ - MostRecentTests.h \ - TestRunnerModel.h \ - TestFailureListViewItem.h \ - .moc/testrunnerdlg.h \ - .moc/testbrowserdlg.h \ - TestFailureInfo.h \ - TestRunnerModelThreadInterface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerDlgImpl.o TestRunnerDlgImpl.cpp - -.obj_debug/TestRunnerFailureEvent.o: TestRunnerFailureEvent.cpp TestRunnerFailureEvent.h \ - TestRunnerModelThreadInterface.h \ - TestRunnerThreadEvent.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerFailureEvent.o TestRunnerFailureEvent.cpp - -.obj_debug/TestRunnerModel.o: TestRunnerModel.cpp TestRunnerFailureEvent.h \ - TestRunnerModel.h \ - TestRunnerTestCaseRunEvent.h \ - TestRunnerThread.h \ - TestRunnerThreadFinishedEvent.h \ - TestRunnerThreadEvent.h \ - TestFailureInfo.h \ - TestRunnerModelThreadInterface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerModel.o TestRunnerModel.cpp - -.obj_debug/TestRunnerModelThreadInterface.o: TestRunnerModelThreadInterface.cpp TestRunnerModelThreadInterface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerModelThreadInterface.o TestRunnerModelThreadInterface.cpp - -.obj_debug/TestRunnerTestCaseRunEvent.o: TestRunnerTestCaseRunEvent.cpp TestRunnerModelThreadInterface.h \ - TestRunnerTestCaseRunEvent.h \ - TestRunnerThreadEvent.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerTestCaseRunEvent.o TestRunnerTestCaseRunEvent.cpp - -.obj_debug/TestRunnerThread.o: TestRunnerThread.cpp TestRunnerThread.h \ - TestRunnerThreadFinishedEvent.h \ - TestRunnerThreadEvent.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerThread.o TestRunnerThread.cpp - -.obj_debug/TestRunnerThreadEvent.o: TestRunnerThreadEvent.cpp TestRunnerThreadEvent.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerThreadEvent.o TestRunnerThreadEvent.cpp - -.obj_debug/TestRunnerThreadFinishedEvent.o: TestRunnerThreadFinishedEvent.cpp TestRunnerThreadFinishedEvent.h \ - TestRunnerModelThreadInterface.h \ - TestRunnerThreadEvent.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/TestRunnerThreadFinishedEvent.o TestRunnerThreadFinishedEvent.cpp - -.moc/testbrowserdlg.h: testbrowserdlg.ui - $(UIC) testbrowserdlg.ui -o .moc/testbrowserdlg.h - -.moc/testbrowserdlg.cpp: .moc/testbrowserdlg.h testbrowserdlg.ui - $(UIC) testbrowserdlg.ui -i testbrowserdlg.h -o .moc/testbrowserdlg.cpp - -.moc/testrunnerdlg.h: testrunnerdlg.ui - $(UIC) testrunnerdlg.ui -o .moc/testrunnerdlg.h - -.moc/testrunnerdlg.cpp: .moc/testrunnerdlg.h testrunnerdlg.ui - $(UIC) testrunnerdlg.ui -i testrunnerdlg.h -o .moc/testrunnerdlg.cpp - -.obj_debug/testbrowserdlg.o: .moc/testbrowserdlg.cpp .moc/testbrowserdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/testbrowserdlg.o .moc/testbrowserdlg.cpp - -.obj_debug/testrunnerdlg.o: .moc/testrunnerdlg.cpp .moc/testrunnerdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/testrunnerdlg.o .moc/testrunnerdlg.cpp - -.obj_debug/moc_MostRecentTests.o: .moc/moc_MostRecentTests.cpp MostRecentTests.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_MostRecentTests.o .moc/moc_MostRecentTests.cpp - -.obj_debug/moc_TestBrowserDlgImpl.o: .moc/moc_TestBrowserDlgImpl.cpp TestBrowserDlgImpl.h .moc/testbrowserdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_TestBrowserDlgImpl.o .moc/moc_TestBrowserDlgImpl.cpp - -.obj_debug/moc_TestRunnerDlgImpl.o: .moc/moc_TestRunnerDlgImpl.cpp TestRunnerDlgImpl.h .moc/testrunnerdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_TestRunnerDlgImpl.o .moc/moc_TestRunnerDlgImpl.cpp - -.obj_debug/moc_TestRunnerModel.o: .moc/moc_TestRunnerModel.cpp TestRunnerModel.h TestFailureInfo.h \ - TestRunnerModelThreadInterface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_TestRunnerModel.o .moc/moc_TestRunnerModel.cpp - -.obj_debug/moc_testbrowserdlg.o: .moc/moc_testbrowserdlg.cpp .moc/testbrowserdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_testbrowserdlg.o .moc/moc_testbrowserdlg.cpp - -.obj_debug/moc_testrunnerdlg.o: .moc/moc_testrunnerdlg.cpp .moc/testrunnerdlg.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj_debug/moc_testrunnerdlg.o .moc/moc_testrunnerdlg.cpp - -.moc/moc_MostRecentTests.cpp: $(MOC) MostRecentTests.h - $(MOC) MostRecentTests.h -o .moc/moc_MostRecentTests.cpp - -.moc/moc_TestBrowserDlgImpl.cpp: $(MOC) TestBrowserDlgImpl.h - $(MOC) TestBrowserDlgImpl.h -o .moc/moc_TestBrowserDlgImpl.cpp - -.moc/moc_TestRunnerDlgImpl.cpp: $(MOC) TestRunnerDlgImpl.h - $(MOC) TestRunnerDlgImpl.h -o .moc/moc_TestRunnerDlgImpl.cpp - -.moc/moc_TestRunnerModel.cpp: $(MOC) TestRunnerModel.h - $(MOC) TestRunnerModel.h -o .moc/moc_TestRunnerModel.cpp - -.moc/moc_testbrowserdlg.cpp: $(MOC) .moc/testbrowserdlg.h - $(MOC) .moc/testbrowserdlg.h -o .moc/moc_testbrowserdlg.cpp - -.moc/moc_testrunnerdlg.cpp: $(MOC) .moc/testrunnerdlg.h - $(MOC) .moc/testrunnerdlg.h -o .moc/moc_testrunnerdlg.cpp - -####### Install - -install: - -uninstall: - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.cpp deleted file mode 100644 index e286ed11..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file MostRecentTests.cpp for class MostRecentTests -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// - -#include "MostRecentTests.h" - - -MostRecentTests::MostRecentTests() -{ -} - - -MostRecentTests::~MostRecentTests() -{ -} - - -void -MostRecentTests::setTestToRun( CPPUNIT_NS::Test *test ) -{ - m_tests.removeRef( test ); - m_tests.prepend( test ); - - const int maxRecentTest = 20; - if ( m_tests.count() > maxRecentTest ) - m_tests.remove( maxRecentTest ); - - emit listChanged(); - emit testToRunChanged( testToRun() ); -} - - -CPPUNIT_NS::Test * -MostRecentTests::testToRun() -{ - return testAt( 0 ); -} - - -void -MostRecentTests::selectTestToRun( int index ) -{ - if ( index < testCount() ) - setTestToRun( testAt( index ) ); -} - - -int -MostRecentTests::testCount() -{ - return m_tests.count(); -} - - -QString -MostRecentTests::testNameAt( int index ) -{ - return QString::fromLatin1( testAt( index )->getName().c_str() ); -} - - -CPPUNIT_NS::Test * -MostRecentTests::testAt( int index ) -{ - return m_tests.at( index ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.h deleted file mode 100644 index ebd95fc0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/MostRecentTests.h +++ /dev/null @@ -1,62 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file MostRecentTests.h for class MostRecentTests -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// -#ifndef MOSTRECENTTESTS_H -#define MOSTRECENTTESTS_H - -#include -#include -#include -#include - - -/*! \class MostRecentTests - * \brief This class represents the list of the recent tests. - */ -class MostRecentTests : public QObject -{ - Q_OBJECT -public: - /*! Constructs a MostRecentTests object. - */ - MostRecentTests(); - - /*! Destructor. - */ - virtual ~MostRecentTests(); - - void setTestToRun( CPPUNIT_NS::Test *test ); - CPPUNIT_NS::Test *testToRun(); - - int testCount(); - QString testNameAt( int index ); - CPPUNIT_NS::Test *testAt( int index ); - -signals: - void listChanged(); - void testToRunChanged( CPPUNIT_NS::Test *testToRun ); - -public slots: - void selectTestToRun( int index ); - -private: - /// Prevents the use of the copy constructor. - MostRecentTests( const MostRecentTests © ); - - /// Prevents the use of the copy operator. - void operator =( const MostRecentTests © ); - -private: - QList m_tests; -}; - - - -// Inlines methods for MostRecentTests: -// ------------------------------------ - - - -#endif // MOSTRECENTTESTS_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/QtTestRunner.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/QtTestRunner.cpp deleted file mode 100644 index 9f203cdb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/QtTestRunner.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file QtTestRunner.cpp for class QtTestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include "TestRunnerDlgImpl.h" -#include "TestRunnerModel.h" - - -CPPUNIT_NS_BEGIN - -QtTestRunner::QtTestRunner() : - _suite( new CPPUNIT_NS::TestSuite( "All Tests" ) ), - _tests( new Tests() ) -{ -} - - -QtTestRunner::~QtTestRunner() -{ - delete _suite; - - Tests::iterator it = _tests->begin(); - while ( it != _tests->end() ) - delete *it++; - - delete _tests; -} - - -Test * -QtTestRunner::getRootTest() -{ - if ( _tests->size() != 1 ) - { - Tests::iterator it = _tests->begin(); - while ( it != _tests->end() ) - _suite->addTest( *it++ ); - _tests->clear(); - return _suite; - } - return (*_tests)[0]; -} - - -void -QtTestRunner::run( bool autoRun ) -{ - TestRunnerDlg *dlg = new TestRunnerDlg( qApp->mainWidget(), - "QtTestRunner", - TRUE ); - dlg->setModel( new TestRunnerModel( getRootTest() ), - autoRun ); - dlg->exec(); - delete dlg; -} - - -void -QtTestRunner::addTest( CPPUNIT_NS::Test *test ) -{ - _tests->push_back( test ); -} - - -CPPUNIT_NS_END diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.cpp deleted file mode 100644 index cef7c528..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include -#include -#include -#include "TestBrowserDlgImpl.h" -#include "TestListViewItem.h" - - -/* - * Constructs a TestBrowser which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -TestBrowser::TestBrowser( QWidget* parent, const char* name, bool modal, WFlags fl ) - : TestBrowserBase( parent, name, modal, fl ), - _selectedTest( NULL ) -{ - _listTests->setRootIsDecorated( TRUE ); -} - -/* - * Destroys the object and frees any allocated resources - */ -TestBrowser::~TestBrowser() -{ - // no need to delete child widgets, Qt does it all for us -} - - -void -TestBrowser::setRootTest( CPPUNIT_NS::Test *rootTest ) -{ - QListViewItem *dummyRoot = new QListViewItem( _listTests ); - - insertItemFor( rootTest, dummyRoot ); - - dummyRoot->firstChild()->moveItem( dummyRoot ); - delete dummyRoot; - - _listTests->firstChild()->setOpen( TRUE ); - _listTests->triggerUpdate(); -} - - -void -TestBrowser::insertItemFor( CPPUNIT_NS::Test *test, - QListViewItem *parentItem ) -{ - QListViewItem *item = new TestListViewItem( test, parentItem ); - QString testName = QString::fromLatin1( test->getName().c_str() ); - item->setText( 0, testName ); - if ( test->getChildTestCount() > 0 || // suite with test - test->countTestCases() == 0 ) // empty suite - { - for ( int index =0; index < test->getChildTestCount(); ++index ) - insertItemFor( test->getChildTestAt( index ), item ); - } -} - - -CPPUNIT_NS::Test * -TestBrowser::selectedTest() -{ - return _selectedTest; -} - - -void -TestBrowser::accept() -{ - TestListViewItem *item = (TestListViewItem *)_listTests->selectedItem(); - if ( item == NULL ) - { - QMessageBox::information( this, tr("Selected test"), - tr( "You must select a test." ) ); - return; - } - - _selectedTest = item->test(); - - TestBrowserBase::accept(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.h deleted file mode 100644 index d4c113a0..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestBrowserDlgImpl.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef TESTBROWSER_H -#define TESTBROWSER_H - -#include -#include "testbrowserdlg.h" - -class QListViewItem; - -class TestBrowser : public TestBrowserBase -{ - Q_OBJECT - -public: - TestBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - ~TestBrowser(); - - void setRootTest( CPPUNIT_NS::Test *rootTest ); - - CPPUNIT_NS::Test *selectedTest(); - -protected slots: - void accept(); - -private: - void insertItemFor( CPPUNIT_NS::Test *test, - QListViewItem *parentItem ); - -private: - CPPUNIT_NS::Test *_selectedTest; -}; - -#endif // TESTBROWSER_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.cpp deleted file mode 100644 index 54c5b1df..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestFailureInfo.cpp for class TestFailureInfo -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestFailureInfo.h" -#include - - -TestFailureInfo::TestFailureInfo( CPPUNIT_NS::Test *failedTest, - CPPUNIT_NS::Exception *thrownException, - bool isError ) : - CPPUNIT_NS::TestFailure( failedTest, thrownException->clone(), isError ) -{ -} - - -TestFailureInfo::~TestFailureInfo() -{ -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.h deleted file mode 100644 index 64a2ceb5..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureInfo.h +++ /dev/null @@ -1,43 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestFailureInfo.h for class TestFailureInfo -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTFAILUREINFO_H -#define TESTFAILUREINFO_H - -#include - - -/*! \class TestFailureInfo - * \brief This class represents a test failure. - */ -class TestFailureInfo : public CPPUNIT_NS::TestFailure -{ -public: - /*! Constructs a TestFailureInfo object. - */ - TestFailureInfo( CPPUNIT_NS::Test *failedTest, - CPPUNIT_NS::Exception *thrownException, - bool isError ); - - /*! Destructor. - */ - virtual ~TestFailureInfo(); - -private: - /// Prevents the use of the copy constructor. - TestFailureInfo( const TestFailureInfo © ); - - /// Prevents the use of the copy operator. - void operator =( const TestFailureInfo © ); -}; - - - -// Inlines methods for TestFailureInfo: -// ------------------------------------ - - - -#endif // TESTFAILUREINFO_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.cpp deleted file mode 100644 index 387818f7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestFailureListViewItem.cpp for class TestFailureListViewItem -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestFailureListViewItem.h" - - -TestFailureListViewItem::TestFailureListViewItem( - TestFailureInfo *failure, - QListView *parent ) : - QListViewItem( parent ), - _failure( failure ) -{ - setMultiLinesEnabled (true); -} - - -TestFailureListViewItem::~TestFailureListViewItem() -{ -} - - -TestFailureInfo * -TestFailureListViewItem::failure() -{ - return _failure; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.h deleted file mode 100644 index 97d37169..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestFailureListViewItem.h +++ /dev/null @@ -1,48 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestFailureListViewItem.h for class TestFailureListViewItem -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTFAILURELISTVIEWITEM_H -#define TESTFAILURELISTVIEWITEM_H - -#include -class TestFailureInfo; - - -/*! \class TestFailureListViewItem - * \brief This class represents a test failure item. - */ -class TestFailureListViewItem : public QListViewItem -{ -public: - /*! Constructs a TestFailureListViewItem object. - */ - TestFailureListViewItem( TestFailureInfo *failure, - QListView *parent ); - - /*! Destructor. - */ - virtual ~TestFailureListViewItem(); - - TestFailureInfo *failure(); - -private: - /// Prevents the use of the copy constructor. - TestFailureListViewItem( const TestFailureListViewItem © ); - - /// Prevents the use of the copy operator. - void operator =( const TestFailureListViewItem © ); - -private: - TestFailureInfo *_failure; -}; - - - -// Inlines methods for TestFailureListViewItem: -// -------------------------------------------- - - - -#endif // TESTFAILURELISTVIEWITEM_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.cpp deleted file mode 100644 index b4032dc1..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestListViewItem.cpp for class TestListViewItem -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestListViewItem.h" - - -TestListViewItem::TestListViewItem( CPPUNIT_NS::Test *test, - QListViewItem *parent ) : - QListViewItem( parent ), - _test( test ) -{ -} - - -TestListViewItem::~TestListViewItem() -{ -} - - -CPPUNIT_NS::Test * -TestListViewItem::test() const -{ - return _test; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.h deleted file mode 100644 index 4032f688..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestListViewItem.h +++ /dev/null @@ -1,43 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestListViewItem.h for class TestListViewItem -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTLISTVIEWITEM_H -#define TESTLISTVIEWITEM_H - -#include -#include - - -/*! \class TestListViewItem - * \brief This class represents an list item pointing to a Test. - */ -class TestListViewItem : public QListViewItem -{ -public: - /*! Constructs a TestListViewItem object. - */ - TestListViewItem( CPPUNIT_NS::Test *test, - QListViewItem *parent ); - - /*! Destructor. - */ - virtual ~TestListViewItem(); - - CPPUNIT_NS::Test *test() const; - -private: - /// Prevents the use of the copy constructor. - TestListViewItem( const TestListViewItem © ); - - /// Prevents the use of the copy operator. - void operator =( const TestListViewItem © ); - -private: - CPPUNIT_NS::Test *_test; -}; - - - -#endif // TESTLISTVIEWITEM_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.cpp deleted file mode 100644 index c1c85343..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.cpp +++ /dev/null @@ -1,260 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "TestRunnerDlgImpl.h" -#include "TestBrowserDlgImpl.h" -#include "MostRecentTests.h" -#include "TestRunnerModel.h" -#include "TestFailureListViewItem.h" - - -/* - * Constructs a TestRunnerDlg which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -TestRunnerDlg::TestRunnerDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) - : TestRunnerDlgBase( parent, name, modal, fl ), - _model( NULL ), - _recentTests( new MostRecentTests() ) -{ -} - - -/* - * Destroys the object and frees any allocated resources - */ -TestRunnerDlg::~TestRunnerDlg() -{ - delete _model; - delete _recentTests; -} - - -void -TestRunnerDlg::setModel( TestRunnerModel *model, - bool autorunTest ) -{ - delete _model; - - _model = model; - - // update combo when recent list change - connect( _recentTests, SIGNAL( listChanged() ), - SLOT( refreshRecentTests() ) ); - - // make selected test in combo the "most recent" - connect( _comboTest, SIGNAL( activated(int) ), - _recentTests, SLOT( selectTestToRun(int) ) ); - - // refresh the test report counters when a test is selected - connect( _recentTests, SIGNAL( testToRunChanged(CPPUNIT_NS::Test *) ), - _model, SLOT( resetTestReportCounterFor(CPPUNIT_NS::Test *) ) ); - - // refresh progress bar - connect( _model, SIGNAL( numberOfTestCaseChanged(int) ), - _progressRun, SLOT( setTotalSteps(int) ) ); - connect( _model, SIGNAL( numberOfTestCaseRunChanged(int) ), - _progressRun, SLOT( setProgress(int) ) ); - - // refresh test report counters - connect( _model, SIGNAL( numberOfTestCaseChanged( int ) ), - SLOT( setNumberOfTestCase( int ) ) ); - connect( _model, SIGNAL( numberOfTestCaseRunChanged( int ) ), - SLOT( setNumberOfTestCaseRun( int ) ) ); - connect( _model, SIGNAL( numberOfTestCaseFailureChanged( int ) ), - SLOT( setNumberOfTestCaseFailure( int ) ) ); - - // clear failure list - connect( _model, SIGNAL( failuresCleared() ), - SLOT( clearTestFailureList() ) ); - - // clear failure detail list - connect( _model, SIGNAL( failuresCleared() ), - SLOT( clearFailureDetail() ) ); - - // add failure to failure list - connect( _model, SIGNAL( failureAdded(TestFailureInfo *) ), - SLOT( reportFailure(TestFailureInfo*) ) ); - - // show detail on failure selection - connect( _listFailures, SIGNAL( selectionChanged(QListViewItem*) ), - SLOT( showFailureDetailAt(QListViewItem*) ) ); - - // disable button when running test - connect( _model, SIGNAL( testRunStarted( CPPUNIT_NS::Test *, CPPUNIT_NS::TestResult *) ), - SLOT( beRunningTest() ) ); - - // enable button when finished running test - connect( _model, SIGNAL( testRunFinished() ), - SLOT( beCanRunTest() ) ); - - _recentTests->setTestToRun( model->rootTest() ); - beCanRunTest(); - - if ( autorunTest ) - runTest(); -} - - -void -TestRunnerDlg::browseForTest() -{ - TestBrowser *dlg = new TestBrowser( this, - "Test Browser", - TRUE ); - dlg->setRootTest( _model->rootTest() ); - - if ( dlg->exec() ) - _recentTests->setTestToRun( dlg->selectedTest() ); - - delete dlg; -} - - -void -TestRunnerDlg::runTest() -{ - CPPUNIT_NS::Test *testToRun = _recentTests->testToRun(); - if ( testToRun == NULL ) - return; - _model->runTest( testToRun ); -} - - -void -TestRunnerDlg::stopTest() -{ - _model->stopRunningTest(); - if ( _model->isTestRunning() ) - beStoppingTest(); -} - - -void -TestRunnerDlg::clearTestFailureList() -{ - _listFailures->clear(); -} - - -void -TestRunnerDlg::refreshRecentTests() -{ - _comboTest->clear(); - for ( int index =0; index < _recentTests->testCount(); ++index ) - _comboTest->insertItem( _recentTests->testNameAt( index ) ); -} - - -void -TestRunnerDlg::setNumberOfTestCase( int numberOfTestCase ) -{ - _labelTestCaseCount->setText( QString::number( numberOfTestCase ) ); -} - - -void -TestRunnerDlg::setNumberOfTestCaseRun( int numberOfRun ) -{ - _labelTestRunCount->setText( QString::number( numberOfRun ) ); -} - - -void -TestRunnerDlg::setNumberOfTestCaseFailure( int numberOfFailure ) -{ - _labelFailureCount->setText( QString::number( numberOfFailure ) ); -} - - -void -TestRunnerDlg::reportFailure( TestFailureInfo *failure ) -{ - QListViewItem *item = new TestFailureListViewItem( failure, - _listFailures ); - item->setText( indexType, - failure->isError() ? tr("Error") : tr("Failure") ); - std::string failedtestName = failure->failedTestName().c_str(); - item->setText( indexTestName, QString::fromLatin1( failedtestName.c_str() ) ); - - CPPUNIT_NS::Exception *thrownException = failure->thrownException(); -//2.0 item->setText( indexMessage, thrownException->what() ); - item->setText( indexMessage, QString(thrownException->what()).stripWhiteSpace() ); - item->setText( indexFilename, failure->sourceLine().fileName().c_str() ); - item->setText( indexLineNumber, - QString::number( failure->sourceLine().lineNumber() ) ); - - _listFailures->insertItem( item ); - _listFailures->triggerUpdate(); - - if ( _listFailures->childCount() == 1 ) - _listFailures->setSelected( item, TRUE ); -} - - -void -TestRunnerDlg::showFailureDetailAt( QListViewItem *selection ) -{ - TestFailureInfo *failure = ((TestFailureListViewItem*)selection)->failure(); - - QString title = tr("Failure detail for: "); - title += QString::fromLatin1( failure->failedTestName().c_str() ); - _groupFailureDetail->setTitle( title ); - - QString location( failure->sourceLine().fileName().c_str() ); - location += " (" + - QString::number( failure->sourceLine().lineNumber() ) + - ")"; - _labelFailureLocation->setText( location ); - - _editFailureMessage->setText( failure->thrownException()->what() ); -} - - -void -TestRunnerDlg::clearFailureDetail() -{ - _groupFailureDetail->setTitle( tr("Failure detail for:...") ); - _labelFailureLocation->setText( QString::null ); - _editFailureMessage->setText( QString::null ); -} - - -void -TestRunnerDlg::beCanRunTest() -{ - _buttonRunTest->setEnabled( true ); - _buttonBrowse->setEnabled( true ); - _comboTest->setEnabled( true ); - _buttonStop->setDisabled( true ); - _buttonStop->setText( tr("Stop") ); - _buttonClose->setEnabled( true ); -} - - -void -TestRunnerDlg::beRunningTest() -{ - _buttonRunTest->setDisabled( true ); - _buttonBrowse->setDisabled( true ); - _comboTest->setDisabled( true ); - _buttonStop->setEnabled( true ); - _buttonStop->setText( tr("Stop") ); - _buttonClose->setDisabled( true ); -} - - -void -TestRunnerDlg::beStoppingTest() -{ - _buttonStop->setDisabled( true ); - _buttonStop->setText( tr("Stopping") ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.h deleted file mode 100644 index a3befc6d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerDlgImpl.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef TESTRUNNERDLG_H -#define TESTRUNNERDLG_H - -#include "testrunnerdlg.h" -#include -class TestRunnerModel; -class MostRecentTests; -class TestFailureInfo; -class QListViewItem; - -class TestRunnerDlg : public TestRunnerDlgBase -{ - Q_OBJECT - -public: - TestRunnerDlg( QWidget* parent = 0, - const char* name = 0, - bool modal = FALSE, - WFlags fl = 0 ); - ~TestRunnerDlg(); - - void setModel( TestRunnerModel *model, - bool autorunTest ); - -public slots: - void refreshRecentTests(); - -protected slots: - void browseForTest(); - void runTest(); - void stopTest(); - void setNumberOfTestCase( int numberOfTestCase ); - void setNumberOfTestCaseRun( int numberOfRun ); - void setNumberOfTestCaseFailure( int numberOfFailure ); - void clearTestFailureList(); - void clearFailureDetail(); - void reportFailure( TestFailureInfo *failure ); - void showFailureDetailAt( QListViewItem *selection ); - void beCanRunTest(); - void beRunningTest(); - void beStoppingTest(); - -private: - - enum Columns - { - indexType =0, - indexTestName, - indexMessage, - indexFilename, - indexLineNumber - }; - - TestRunnerModel *_model; - MostRecentTests *_recentTests; -}; - -#endif // TESTRUNNERDLG_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.cpp deleted file mode 100644 index bceb2f61..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerFailureEvent.cpp for class TestRunnerFailureEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerFailureEvent.h" -#include "TestRunnerModelThreadInterface.h" - - -TestRunnerFailureEvent::TestRunnerFailureEvent( TestFailureInfo *failure, - int numberOfFailure ) : - _failure( failure ), - _numberOfFailure( numberOfFailure ) -{ -} - - -TestRunnerFailureEvent::~TestRunnerFailureEvent() -{ -} - - -void -TestRunnerFailureEvent::process( TestRunnerModelThreadInterface *target ) -{ - target->eventNewFailure( _failure, _numberOfFailure ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.h deleted file mode 100644 index fa6fef05..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerFailureEvent.h +++ /dev/null @@ -1,48 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerFailureEvent.h for class TestRunnerFailureEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERFAILUREEVENT_H -#define TESTRUNNERFAILUREEVENT_H - -#include "TestRunnerThreadEvent.h" -class TestFailureInfo; - - -/*! \class TestRunnerFailureEvent - * \brief This class represents a new TestCase failure event. - */ -class TestRunnerFailureEvent : public TestRunnerThreadEvent -{ -public: - /*! Constructs a TestRunnerFailureEvent object. - */ - TestRunnerFailureEvent( TestFailureInfo *failure, - int numberOfFailure ); - - /// Destructor. - virtual ~TestRunnerFailureEvent(); - -private: - /// Prevents the use of the copy constructor. - TestRunnerFailureEvent( const TestRunnerFailureEvent © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerFailureEvent © ); - - void process( TestRunnerModelThreadInterface *target ); - -private: - TestFailureInfo *_failure; - int _numberOfFailure; -}; - - - -// Inlines methods for TestRunnerFailureEvent: -// ------------------------------------------- - - - -#endif // TESTRUNNERFAILUREEVENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.cpp deleted file mode 100644 index b224a340..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerModel.cpp for class TestRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// - -#include -#include "TestRunnerFailureEvent.h" -#include "TestRunnerModel.h" -#include "TestRunnerTestCaseRunEvent.h" -#include "TestRunnerThread.h" -#include "TestRunnerThreadFinishedEvent.h" - - -TestRunnerModel::TestRunnerModel( CPPUNIT_NS::Test *rootTest ) : - _rootTest( rootTest ), - _runnerThread( NULL ), - _result( NULL ) -{ -} - - -TestRunnerModel::~TestRunnerModel() -{ - delete _runnerThread; -} - - -CPPUNIT_NS::Test * -TestRunnerModel::rootTest() -{ - return _rootTest; -} - - -void -TestRunnerModel::resetTestReportCounterFor( CPPUNIT_NS::Test *testToRun ) -{ - if ( isTestRunning() ) - return; - - { - LockGuard guard( _lock ); - _numberOfTestCase = testToRun->countTestCases(); - _numberOfTestCaseRun =0; - _numberOfTestCaseFailure =0; - _failures.clear(); - } - emit failuresCleared(); - - emit numberOfTestCaseChanged( _numberOfTestCase ); - emit numberOfTestCaseRunChanged( _numberOfTestCaseRun ); - emit numberOfTestCaseFailureChanged( _numberOfTestCaseFailure ); -} - - -int -TestRunnerModel::numberOfTestCase() -{ - LockGuard guard( _lock ); - return _numberOfTestCase; -} - - -int -TestRunnerModel::numberOfTestCaseFailure() -{ - LockGuard guard( _lock ); - return _numberOfTestCaseFailure; -} - - -int -TestRunnerModel::numberOfTestCaseRun() -{ - LockGuard guard( _lock ); - return _numberOfTestCaseRun; -} - - -TestFailureInfo * -TestRunnerModel::failureAt( int index ) -{ - LockGuard guard( _lock ); - return _failures.at( index ); -} - - -void -TestRunnerModel::runTest( CPPUNIT_NS::Test *testToRun ) -{ - if ( isTestRunning() ) - return; - - resetTestReportCounterFor( testToRun ); - - { - LockGuard guard( _lock ); - delete _result; - _result = new CPPUNIT_NS::TestResult(); - _result->addListener( this ); - } - - emit testRunStarted( testToRun, _result ); - - LockGuard guard( _lock ); - _runnerThread = new TestRunnerThread( testToRun, - _result, - this, - new TestRunnerThreadFinishedEvent() ); -} - - -bool -TestRunnerModel::isTestRunning() -{ - LockGuard guard( _lock ); - return _runnerThread != NULL && _runnerThread->running(); -} - - -void -TestRunnerModel::stopRunningTest() -{ - { - LockGuard guard( _lock ); - if ( _result == NULL ) - return; - } - if ( isTestRunning() ) - { - LockGuard guard( _lock ); - _result->stop(); - } -} - - -// Called from the TestRunnerThread. -void -TestRunnerModel::startTest( CPPUNIT_NS::Test * /*test*/ ) -{ -} - - -// Called from the TestRunnerThread. -void -TestRunnerModel::addFailure( const CPPUNIT_NS::TestFailure &failure ) -{ - addFailureInfo( new TestFailureInfo( failure.failedTest(), - failure.thrownException(), - failure.isError() ) ); -} - - -// Called from the TestRunnerThread. -void -TestRunnerModel::endTest( CPPUNIT_NS::Test * /*test*/ ) -{ - int numberOfTestCaseRun; - { - LockGuard guard( _lock ); - numberOfTestCaseRun = ++_numberOfTestCaseRun; - } - - // emit signal asynchronously - QThread::postEvent( this, - new TestRunnerTestCaseRunEvent( numberOfTestCaseRun ) ); -} - - -// Called from the TestRunnerThread. -void -TestRunnerModel::addFailureInfo( TestFailureInfo *failure ) -{ - int numberOfTestCaseFailure; - { - LockGuard guard( _lock ); - _failures.append( failure ); - numberOfTestCaseFailure = ++_numberOfTestCaseFailure; - } - - // emit signals asynchronously - QThread::postEvent( this, - new TestRunnerFailureEvent( failure, - numberOfTestCaseFailure ) ); -} - - -bool -TestRunnerModel::event( QEvent *event ) -{ - if ( event->type() != QEvent::User ) - return false; - - TestRunnerThreadEvent *threadEvent = (TestRunnerThreadEvent *)event; - threadEvent->process( this ); - return true; -} - - -void -TestRunnerModel::eventNewFailure( TestFailureInfo *failure, - int numberOfFailure ) -{ - emit numberOfTestCaseFailureChanged( numberOfFailure ); - emit failureAdded( failure ); -} - - -void -TestRunnerModel::eventNumberOfTestRunChanged( int numberOfRun ) -{ - emit numberOfTestCaseRunChanged( numberOfRun ); -} - - -void -TestRunnerModel::eventTestRunnerThreadFinished() -{ - emit testRunFinished(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.h deleted file mode 100644 index ebd3a57d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModel.h +++ /dev/null @@ -1,154 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerModel.h for class TestRunnerModel -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/20 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERMODEL_H -#define TESTRUNNERMODEL_H - -#include -#include -#include -#include -#include -#include "TestFailureInfo.h" -#include "TestRunnerModelThreadInterface.h" -class TestRunnerThread; - -/*! \class TestRunnerModel - * \brief This class represents the model for the TestRunner. - * - * Warning: methods that override CppUnit::TestListener are called - * from the TestRunner thread ! - * - * Warning: _lock is not recursive. Might want to introduce Doug Lea - * Thread Interface pattern for methods used while locked (isTestRunning()). - * - * Refactoring note: a large part of this object actually duplicate - * TestResult. - */ -class TestRunnerModel : public QObject, - private CPPUNIT_NS::TestListener, - private TestRunnerModelThreadInterface -{ - Q_OBJECT -public: - /*! Constructs a TestRunnerModel object. - */ - TestRunnerModel( CPPUNIT_NS::Test *rootTest ); - - /*! Destructor. - */ - virtual ~TestRunnerModel(); - - CPPUNIT_NS::Test *rootTest(); - - int numberOfTestCase(); - int numberOfTestCaseFailure(); - int numberOfTestCaseRun(); - - TestFailureInfo *failureAt( int index ); - - - bool isTestRunning(); - -signals: - void numberOfTestCaseChanged( int numberOfTestCase ); - void numberOfTestCaseRunChanged( int numberOfRun ); - void numberOfTestCaseFailureChanged( int numberOfFailure ); - void failureAdded( TestFailureInfo *failure ); - void failuresCleared(); - void testRunStarted( CPPUNIT_NS::Test *runningTest, - CPPUNIT_NS::TestResult *result ); - void testRunFinished(); - -public slots: - void resetTestReportCounterFor( CPPUNIT_NS::Test *testToRun ); - - /*! Request to run the specified test. - * Returns immedialty. If a test is already running, then - * the run request is ignored. - */ - void runTest( CPPUNIT_NS::Test *testToRun ); - - /*! Request to stop running test. - * This methods returns immediately. testRunFinished() signal - * should be used to now when the test actually stopped running. - */ - void stopRunningTest(); - -private: - /// Prevents the use of the copy constructor. - TestRunnerModel( const TestRunnerModel © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerModel © ); - - /// Called from the TestRunnerThread. - void startTest( CPPUNIT_NS::Test *test ); - - /// Called from the TestRunnerThread. - void addFailure( const CPPUNIT_NS::TestFailure &failure ); - - /// Called from the TestRunnerThread. - void endTest( CPPUNIT_NS::Test *test ); - - /// Called from the TestRunnerThread. - void addFailureInfo( TestFailureInfo *failure ); - - bool event( QEvent *event ); - - /*! Emits new failure signals. - * Called by the TestRunnerThreadEvent from the GUI thread to - * emit the following signals: - * - numberOfTestCaseFailureChanged() - * - failureAdded() - */ - void eventNewFailure( TestFailureInfo *failure, - int numberOfFailure ); - - /*! Emits numberOfTestCaseRunChanged() signal. - * Called by the TestRunnerThreadEvent from the GUI thread to - * emit the numberOfTestCaseRunChanged() signal. - */ - void eventNumberOfTestRunChanged( int numberOfRun ); - - void eventTestRunnerThreadFinished(); - -private: - class LockGuard - { - public: - LockGuard( QMutex &mutex ) : _mutex( mutex ) - { - _mutex.lock(); - } - - ~LockGuard() - { - _mutex.unlock(); - } - - private: - QMutex &_mutex; - }; - - - QMutex _lock; - CPPUNIT_NS::Test *_rootTest; - int _numberOfTestCase; - int _numberOfTestCaseRun; - int _numberOfTestCaseFailure; - QList _failures; - TestRunnerThread *_runnerThread; - CPPUNIT_NS::TestResult *_result; -}; - - - -// Inlines methods for TestRunnerModel: -// ------------------------------------ - - - -#endif // TESTRUNNERMODEL_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.cpp deleted file mode 100644 index 31960549..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerModelThreadInterface.cpp for class TestRunnerModelThreadInterface -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/21 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerModelThreadInterface.h" - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.h deleted file mode 100644 index 6a663a57..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerModelThreadInterface.h +++ /dev/null @@ -1,35 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerModelThreadInterface.h for class TestRunnerModelThreadInterface -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/21 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERMODELTHREADINTERFACE_H -#define TESTRUNNERMODELTHREADINTERFACE_H - -class TestFailureInfo; - -/*! \class TestRunnerModelThreadInterface - * \brief This class represents the interface used to process gui thread event. - */ -class TestRunnerModelThreadInterface -{ -public: - /// Destructor. - virtual ~TestRunnerModelThreadInterface() {} - - virtual void eventNewFailure( TestFailureInfo *failure, - int numberOfFailure ) =0; - - virtual void eventNumberOfTestRunChanged( int numberOfRun ) =0; - - virtual void eventTestRunnerThreadFinished() =0; -}; - - - -// Inlines methods for TestRunnerModelThreadInterface: -// --------------------------------------------------- - - - -#endif // TESTRUNNERMODELTHREADINTERFACE_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp deleted file mode 100644 index 177b3589..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerTestCaseRunEvent.cpp for class TestRunnerTestCaseRunEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerModelThreadInterface.h" -#include "TestRunnerTestCaseRunEvent.h" - - -TestRunnerTestCaseRunEvent::TestRunnerTestCaseRunEvent( int numberOfRun ) : - _numberOfRun( numberOfRun ) -{ -} - - -TestRunnerTestCaseRunEvent::~TestRunnerTestCaseRunEvent() -{ -} - - -void -TestRunnerTestCaseRunEvent::process( TestRunnerModelThreadInterface *target ) -{ - target->eventNumberOfTestRunChanged( _numberOfRun ); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.h deleted file mode 100644 index bd2c635d..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerTestCaseRunEvent.h +++ /dev/null @@ -1,45 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerTestCaseRunEvent.h for class TestRunnerTestCaseRunEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERTESTCASERUNEVENT_H -#define TESTRUNNERTESTCASERUNEVENT_H - -#include "TestRunnerThreadEvent.h" - - -/*! \class TestRunnerTestCaseRunEvent - * \brief This class represents a new TestCase run event. - */ -class TestRunnerTestCaseRunEvent : public TestRunnerThreadEvent -{ -public: - /*! Constructs a TestRunnerTestCaseRunEvent object. - */ - TestRunnerTestCaseRunEvent( int numberOfRun ); - - /// Destructor. - virtual ~TestRunnerTestCaseRunEvent(); - -private: - /// Prevents the use of the copy constructor. - TestRunnerTestCaseRunEvent( const TestRunnerTestCaseRunEvent © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerTestCaseRunEvent © ); - - void process( TestRunnerModelThreadInterface *target ); - -private: - int _numberOfRun; -}; - - - -// Inlines methods for TestRunnerTestCaseRunEvent: -// ----------------------------------------------- - - - -#endif // TESTRUNNERTESTCASERUNEVENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.cpp deleted file mode 100644 index cc455262..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerThread.cpp for class TestRunnerThread -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerThread.h" -#include "TestRunnerThreadFinishedEvent.h" - - -TestRunnerThread::TestRunnerThread( CPPUNIT_NS::Test *testToRun, - CPPUNIT_NS::TestResult *result, - QObject *eventTarget, - TestRunnerThreadFinishedEvent *finishedEvent ) : - _testToRun( testToRun ), - _result( result ), - _eventTarget( eventTarget ), - _finishedEvent( finishedEvent ) -{ - start(); -} - - -TestRunnerThread::~TestRunnerThread() -{ -} - - -void -TestRunnerThread::run() -{ - _testToRun->run( _result ); - - // Signal TestRunnerModel GUI thread - QThread::postEvent( _eventTarget, _finishedEvent ); - _eventTarget = NULL; - _finishedEvent = NULL; -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.h deleted file mode 100644 index 54cb4f17..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThread.h +++ /dev/null @@ -1,55 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerThread.h for class TestRunnerThread -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERTHREAD_H -#define TESTRUNNERTHREAD_H - -#include -#include -#include -class QObject; -class TestRunnerThreadFinishedEvent; - - -/*! \class TestRunnerThread - * \brief This class represents the thread used to run TestCase. - */ -class TestRunnerThread : public QThread -{ -public: - /*! Constructs a TestRunnerThread object. - */ - TestRunnerThread( CPPUNIT_NS::Test *testToRun, - CPPUNIT_NS::TestResult *result, - QObject *eventTarget, - TestRunnerThreadFinishedEvent *finishedEvent ); - - /// Destructor. - virtual ~TestRunnerThread(); - -private: - /// Prevents the use of the copy constructor. - TestRunnerThread( const TestRunnerThread © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerThread © ); - - void run(); - -private: - CPPUNIT_NS::Test *_testToRun; - CPPUNIT_NS::TestResult *_result; - QObject *_eventTarget; - TestRunnerThreadFinishedEvent *_finishedEvent; -}; - - - -// Inlines methods for TestRunnerThread: -// ------------------------------------- - - - -#endif // TESTRUNNERTHREAD_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.cpp deleted file mode 100644 index 17be770f..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerThreadEvent.cpp for class TestRunnerThreadEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/21 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerThreadEvent.h" - - -TestRunnerThreadEvent::TestRunnerThreadEvent() : - QCustomEvent( User ) -{ -} - - -TestRunnerThreadEvent::~TestRunnerThreadEvent() -{ -} - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.h deleted file mode 100644 index 32389bdd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadEvent.h +++ /dev/null @@ -1,37 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerThreadEvent.h for class TestRunnerThreadEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/21 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERTHREADEVENT_H -#define TESTRUNNERTHREADEVENT_H - -#include -class TestRunnerModelThreadInterface; - -/*! \class TestRunnerThreadEvent - * \brief This class represents an event send by the test runner thread. - */ -class TestRunnerThreadEvent : public QCustomEvent -{ -public: - /*! Constructs a TestRunnerThreadEvent object. - */ - TestRunnerThreadEvent(); - - /// Destructor. - virtual ~TestRunnerThreadEvent(); - - virtual void process( TestRunnerModelThreadInterface *target ) =0; - -private: - /// Prevents the use of the copy constructor. - TestRunnerThreadEvent( const TestRunnerThreadEvent © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerThreadEvent © ); -}; - - - -#endif // TESTRUNNERTHREADEVENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp deleted file mode 100644 index 5c2f2ba7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Implementation file TestRunnerThreadFinishedEvent.cpp for class TestRunnerThreadFinishedEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// - -#include "TestRunnerThreadFinishedEvent.h" -#include "TestRunnerModelThreadInterface.h" - - -TestRunnerThreadFinishedEvent::TestRunnerThreadFinishedEvent() -{ -} - - -TestRunnerThreadFinishedEvent::~TestRunnerThreadFinishedEvent() -{ -} - - -void -TestRunnerThreadFinishedEvent::process( TestRunnerModelThreadInterface *target ) -{ - target->eventTestRunnerThreadFinished(); -} diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.h b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.h deleted file mode 100644 index b390e7a7..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/TestRunnerThreadFinishedEvent.h +++ /dev/null @@ -1,42 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunnerThreadFinishedEvent.h for class TestRunnerThreadFinishedEvent -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/22 -// ////////////////////////////////////////////////////////////////////////// -#ifndef TESTRUNNERTHREADFINISHEDEVENT_H -#define TESTRUNNERTHREADFINISHEDEVENT_H - -#include "TestRunnerThreadEvent.h" - - -/*! \class TestRunnerThreadFinishedEvent - * \brief This class represents an event indicating that the TestRunnerThread finished. - */ -class TestRunnerThreadFinishedEvent : public TestRunnerThreadEvent -{ -public: - /*! Constructs a TestRunnerThreadFinishedEvent object. - */ - TestRunnerThreadFinishedEvent(); - - /// Destructor. - virtual ~TestRunnerThreadFinishedEvent(); - - void process( TestRunnerModelThreadInterface *target ); - -private: - /// Prevents the use of the copy constructor. - TestRunnerThreadFinishedEvent( const TestRunnerThreadFinishedEvent © ); - - /// Prevents the use of the copy operator. - void operator =( const TestRunnerThreadFinishedEvent © ); -}; - - - -// Inlines methods for TestRunnerThreadFinishedEvent: -// -------------------------------------------------- - - - -#endif // TESTRUNNERTHREADFINISHEDEVENT_H diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib deleted file mode 100644 index 2e7cb436..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/tcsh -########################################################################### -# FILE: make_lib -# PURPOSE: Create Makefile from project file and then make QtTestRunner -# library. -########################################################################### - -qmake qttestrunnerlib.pro -make distclean -make diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib.bat b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib.bat deleted file mode 100644 index 2952a016..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/make_lib.bat +++ /dev/null @@ -1,7 +0,0 @@ -@REM make_lib.bat -@REM -@REM Create Makefile from project file and then make QtTestRunner library. - -qmake qttestrunnerlib.pro -nmake distclean -nmake diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner.vcproj b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner.vcproj deleted file mode 100644 index f96ea7fd..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner.vcproj +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner_dll.vcproj b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner_dll.vcproj deleted file mode 100644 index 1eb4a49b..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunner_dll.vcproj +++ /dev/null @@ -1,415 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunnerlib.pro b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunnerlib.pro deleted file mode 100644 index 18870eeb..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/qttestrunnerlib.pro +++ /dev/null @@ -1,149 +0,0 @@ -#---------------------------------------------------------------------- -# File: qttestrunnerlib.pro -# Purpose: qmake config file for the QtTestRunner library. -# The library is built as debug staticlib. Set the CONFIG -# variable accordingly to build it differently. -#---------------------------------------------------------------------- - -TEMPLATE = lib -LANGUAGE = C++ - -# Get rid of possibly predefined options - -CONFIG -= debug -CONFIG -= release -CONFIG -= dll -CONFIG -= staticlib - -CONFIG += qt warn_on debug staticlib - -#CONFIG += qt warn_on release staticlib -#CONFIG += qt warn_on debug dll -#CONFIG += qt warn_on release dll - - -QTRUNNER_LIB = qttestrunner # Name of the library - - -#---------------------------------------------------------------------- -# MS Windows -#---------------------------------------------------------------------- - -win32 { - # Suppress program database creation (should better be done - # in the qmake spec file) - QMAKE_CXXFLAGS_DEBUG += /Z7 - QMAKE_CXXFLAGS_DEBUG -= -Gm - QMAKE_CXXFLAGS_DEBUG -= -Zi -} - -win32 { - MOC_DIR = tmp\moc - UI_DIR = tmp\moc - dll { - DEFINES += QTTESTRUNNER_DLL_BUILD - DLLDESTDIR = ..\..\lib - debug { - TARGET = $${QTRUNNER_LIB}d_dll - QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}d_dll.lib - OBJECTS_DIR = DebugDLL - LIBS += ..\..\lib\cppunitd_dll.lib - } - release { - TARGET = $${QTRUNNER_LIB}_dll - QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}_dll.lib - OBJECTS_DIR = ReleaseDLL - LIBS += ..\..\lib\cppunit_dll.lib - } - DESTDIR = $${OBJECTS_DIR} - QMAKE_CLEAN += $${QTRUNNER_IMPORTLIB} - - # Also copy the import library after build of the DLL - QTRUNNER_IMPORTLIB = $${DESTDIR}-SEP-$${QTRUNNER_IMPORTLIB} - QTRUNNER_IMPORTLIB ~= s/-SEP-/\/ - QMAKE_POST_LINK = copy $${QTRUNNER_IMPORTLIB} $${DLLDESTDIR} - } - staticlib { - DESTDIR = ..\..\lib - debug { - TARGET = $${QTRUNNER_LIB}d - OBJECTS_DIR = Debug - } - release { - TARGET = $${QTRUNNER_LIB} - OBJECTS_DIR = Release - } - } -} - -#---------------------------------------------------------------------- -# Linux/Unix -#---------------------------------------------------------------------- - -unix { - MOC_DIR = .moc - UI_DIR = .moc - DESTDIR = ../../lib - dll { - debug { - TARGET = $${QTRUNNER_LIB}d_shared - OBJECTS_DIR = .obj_debug_shared - LIBS += -L../../lib -lcppunit - } - release { - TARGET = $${QTRUNNER_LIB}_shared - OBJECTS_DIR = .obj_release_shared - LIBS += -L../../lib -lcppunit - } - } - staticlib { - debug { - TARGET = $${QTRUNNER_LIB}d - OBJECTS_DIR = .obj_debug - } - release { - TARGET = $${QTRUNNER_LIB} - OBJECTS_DIR = .obj_release - } - } -} - -#---------------------------------------------------------------------- - -HEADERS = \ - MostRecentTests.h \ - TestBrowserDlgImpl.h \ - TestFailureInfo.h \ - TestFailureListViewItem.h \ - TestListViewItem.h \ - TestRunnerDlgImpl.h \ - TestRunnerFailureEvent.h \ - TestRunnerModel.h \ - TestRunnerModelThreadInterface.h \ - TestRunnerTestCaseRunEvent.h \ - TestRunnerThread.h \ - TestRunnerThreadEvent.h \ - TestRunnerThreadFinishedEvent.h \ - ../../include/cppunit/ui/qt/TestRunner.h - -SOURCES = \ - MostRecentTests.cpp \ - TestBrowserDlgImpl.cpp \ - TestFailureInfo.cpp \ - TestFailureListViewItem.cpp \ - TestListViewItem.cpp \ - QtTestRunner.cpp \ - TestRunnerDlgImpl.cpp \ - TestRunnerFailureEvent.cpp \ - TestRunnerModel.cpp \ - TestRunnerModelThreadInterface.cpp \ - TestRunnerTestCaseRunEvent.cpp \ - TestRunnerThread.cpp \ - TestRunnerThreadEvent.cpp \ - TestRunnerThreadFinishedEvent.cpp - -INTERFACES = \ - testbrowserdlg.ui \ - testrunnerdlg.ui - -INCLUDEPATH += . ../../include diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testbrowserdlg.ui b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testbrowserdlg.ui deleted file mode 100644 index 4daedf89..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testbrowserdlg.ui +++ /dev/null @@ -1,148 +0,0 @@ - -TestBrowserBase - - QDialog - - name - TestBrowserBase - - - geometry - - 0 - 0 - 352 - 292 - - - - caption - TestBrowser - - - sizeGripEnabled - true - - - - margin - 11 - - - spacing - 6 - - - QListView - - - text - Test Name - - - clickable - true - - - resizeable - true - - - - name - _listTests - - - - QLayoutWidget - - name - Layout6 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - buttonOk - - - caption - - - - text - &Select - - - autoDefault - true - - - default - true - - - - QPushButton - - name - buttonCancel - - - text - &Cancel - - - autoDefault - true - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - - - buttonOk - clicked() - TestBrowserBase - accept() - - - buttonCancel - clicked() - TestBrowserBase - reject() - - - diff --git a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testrunnerdlg.ui b/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testrunnerdlg.ui deleted file mode 100644 index 9727fb17..00000000 --- a/src/3rd_party/cppunit/cppunit-1.12.1/src/qttestrunner/testrunnerdlg.ui +++ /dev/null @@ -1,687 +0,0 @@ - -TestRunnerDlgBase - - QDialog - - name - TestRunnerDlgBase - - - geometry - - 0 - 0 - 429 - 370 - - - - caption - Qt Test Runner - - - sizeGripEnabled - true - - - - margin - 11 - - - spacing - 6 - - - QLayoutWidget - - name - Layout25 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout24 - - - - margin - 0 - - - spacing - 6 - - - QComboBox - - name - _comboTest - - - enabled - true - - - sizePolicy - - 3 - 0 - - - - autoResize - false - - - - - name - Spacer27 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout8 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel2 - - - text - TestCases: - - - - QLabel - - name - _labelTestCaseCount - - - text - 999999 - - - - - - - name - Spacer3 - - - orientation - Horizontal - - - sizeType - Fixed - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel2_2 - - - text - Run: - - - - QLabel - - name - _labelTestRunCount - - - text - 999999 - - - - - - - name - Spacer4 - - - orientation - Horizontal - - - sizeType - Fixed - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout6 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel1 - - - text - Failure: - - - - QLabel - - name - _labelFailureCount - - - text - 999999 - - - - - - - name - Spacer5 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QProgressBar - - name - _progressRun - - - - - - QLayoutWidget - - name - Layout18 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - _buttonBrowse - - - text - &Browse... - - - - QPushButton - - name - _buttonRunTest - - - text - Run &Test - - - accel - 276824148 - - - - QPushButton - - name - _buttonStop - - - text - &Stop - - - - QPushButton - - name - _buttonClose - - - caption - - - - text - &Close - - - accel - 276824131 - - - autoDefault - true - - - default - true - - - - - - - - QListView - - - text - Type - - - clickable - true - - - resizeable - true - - - - - text - Test Name - - - clickable - true - - - resizeable - true - - - - - text - Message - - - clickable - true - - - resizeable - true - - - - - text - Filename - - - clickable - true - - - resizeable - true - - - - - text - Line Number - - - clickable - true - - - resizeable - true - - - - name - _listFailures - - - resizePolicy - AutoOneFit - - - allColumnsShowFocus - true - - - showSortIndicator - true - - - - QGroupBox - - name - _groupFailureDetail - - - title - Failure detail... - - - - margin - 11 - - - spacing - 6 - - - QLayoutWidget - - name - Layout17 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel3 - - - text - Location: - - - - QLabel - - name - _labelFailureLocation - - - text - ... - - - - - name - Spacer18 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout15 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout14 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel5 - - - text - Message: - - - - - name - Spacer11 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QMultiLineEdit - - name - _editFailureMessage - - - wordWrap - WidgetWidth - - - readOnly - true - - - - - - - - - - - _buttonClose - clicked() - TestRunnerDlgBase - accept() - - - _buttonBrowse - clicked() - TestRunnerDlgBase - browseForTest() - - - _buttonRunTest - clicked() - TestRunnerDlgBase - runTest() - - - _buttonStop - clicked() - TestRunnerDlgBase - stopTest() - - browseForTest() - stopTest() - runTest() - - - _comboTest - _buttonBrowse - _buttonRunTest - _listFailures - _editFailureMessage - _buttonClose - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/.gitignore b/src/3rd_party/cryptopp/cryptopp-5.6.1/.gitignore deleted file mode 100644 index 29065414..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.o -*.a -*.exe -*.so diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/3way.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/3way.cpp deleted file mode 100644 index 725b682e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/3way.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// 3way.cpp - modifed by Wei Dai from Joan Daemen's 3way.c -// The original code and all modifications are in the public domain. - -#include "pch.h" -#include "3way.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void ThreeWay_TestInstantiations() -{ - ThreeWay::Encryption x1; - ThreeWay::Decryption x2; -} - -static const word32 START_E = 0x0b0b; // round constant of first encryption round -static const word32 START_D = 0xb1b1; // round constant of first decryption round -static const word32 RC_MODULUS = 0x11011; - -static inline word32 reverseBits(word32 a) -{ - a = ((a & 0xAAAAAAAA) >> 1) | ((a & 0x55555555) << 1); - a = ((a & 0xCCCCCCCC) >> 2) | ((a & 0x33333333) << 2); - return ((a & 0xF0F0F0F0) >> 4) | ((a & 0x0F0F0F0F) << 4); -} - -#define mu(a0, a1, a2) \ -{ \ - a1 = reverseBits(a1); \ - word32 t = reverseBits(a0); \ - a0 = reverseBits(a2); \ - a2 = t; \ -} - -#define pi_gamma_pi(a0, a1, a2) \ -{ \ - word32 b0, b2; \ - b2 = rotlFixed(a2, 1U); \ - b0 = rotlFixed(a0, 22U); \ - a0 = rotlFixed(b0 ^ (a1|(~b2)), 1U); \ - a2 = rotlFixed(b2 ^ (b0|(~a1)), 22U);\ - a1 ^= (b2|(~b0)); \ -} - -// thanks to Paulo Barreto for this optimized theta() -#define theta(a0, a1, a2) \ -{ \ - word32 b0, b1, c; \ - c = a0 ^ a1 ^ a2; \ - c = rotlFixed(c, 16U) ^ rotlFixed(c, 8U); \ - b0 = (a0 << 24) ^ (a2 >> 8) ^ (a1 << 8) ^ (a0 >> 24); \ - b1 = (a1 << 24) ^ (a0 >> 8) ^ (a2 << 8) ^ (a1 >> 24); \ - a0 ^= c ^ b0; \ - a1 ^= c ^ b1; \ - a2 ^= c ^ (b0 >> 16) ^ (b1 << 16); \ -} - -#define rho(a0, a1, a2) \ -{ \ - theta(a0, a1, a2); \ - pi_gamma_pi(a0, a1, a2); \ -} - -void ThreeWay::Base::UncheckedSetKey(const byte *uk, unsigned int length, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(length); - - m_rounds = GetRoundsAndThrowIfInvalid(params, this); - - for (unsigned int i=0; i<3; i++) - m_k[i] = (word32)uk[4*i+3] | ((word32)uk[4*i+2]<<8) | ((word32)uk[4*i+1]<<16) | ((word32)uk[4*i]<<24); - - if (!IsForwardTransformation()) - { - theta(m_k[0], m_k[1], m_k[2]); - mu(m_k[0], m_k[1], m_k[2]); - m_k[0] = ByteReverse(m_k[0]); - m_k[1] = ByteReverse(m_k[1]); - m_k[2] = ByteReverse(m_k[2]); - } -} - -void ThreeWay::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - typedef BlockGetAndPut Block; - - word32 a0, a1, a2; - Block::Get(inBlock)(a0)(a1)(a2); - - word32 rc = START_E; - - for(unsigned i=0; i Block; - - word32 a0, a1, a2; - Block::Get(inBlock)(a0)(a1)(a2); - - word32 rc = START_D; - - mu(a0, a1, a2); - for(unsigned i=0; i, public FixedKeyLength<12>, public VariableRounds<11> -{ - static const char *StaticAlgorithmName() {return "3-Way";} -}; - -/// 3-Way -class ThreeWay : public ThreeWay_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - - protected: - unsigned int m_rounds; - FixedSizeSecBlock m_k; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef ThreeWay::Encryption ThreeWayEncryption; -typedef ThreeWay::Decryption ThreeWayDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/Doxyfile b/src/3rd_party/cryptopp/cryptopp-5.6.1/Doxyfile deleted file mode 100644 index c221fdf5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/Doxyfile +++ /dev/null @@ -1,1634 +0,0 @@ -# Doxyfile 1.7.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 = Crypto++ - -# 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 = - -# 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 = 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 = - -# 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 = YES - -# 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 = NO - -# 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 = - -# 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 = - -# 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 = YES - -# 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 = 8 - -# 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, CSharp, 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 = NO - -# 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 = YES - -# 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 = NO - -# 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 = YES - -# 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 FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# 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 = NO - -# 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 = NO - -# 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 = NO - -# 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 = . - -# 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 = *.h \ - *.cpp - -# 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 = NO - -# 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 = adhoc.cpp - -# 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 = YES - -# 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 = NO - -# 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 = YES - -# 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 = YES - -# 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 = YES - -# 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 = 3 - -# 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 = - -# 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 = - -# 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 = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the stylesheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = YES - -# 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 - -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. - -DOCSET_PUBLISHER_NAME = Publisher - -# 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 = YES - -# 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 = org.doxygen.Project - -# 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 = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# 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 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. - -EXT_LINKS_IN_WINDOW = NO - -# 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 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. - -FORMULA_TRANSPARENT = YES - -# When the SEARCHENGINE tag is enabled 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), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# 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 = - -# 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. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -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 = a4 - -# 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 = NO - -# 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 = NO - -# 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 = - -# 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 = YES - -# 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 = _WIN32 \ - _WINDOWS \ - __FreeBSD__ \ - CRYPTOPP_DOXYGEN_PROCESSING - -# 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 - -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance -# between CPU load and processing speed. - -DOT_NUM_THREADS = 0 - -# 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.ttf - -# 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 = YES - -# 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 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/GNUmakefile b/src/3rd_party/cryptopp/cryptopp-5.6.1/GNUmakefile deleted file mode 100644 index d45c69fd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/GNUmakefile +++ /dev/null @@ -1,244 +0,0 @@ -CXXFLAGS = -DNDEBUG -g -O2 -#CXXFLAGS = -g -# -fPIC is supported. Please report any breakage of -fPIC as a bug. -CXXFLAGS += -fPIC -# the following options reduce code size, but breaks link or makes link very slow on some systems -# CXXFLAGS += -ffunction-sections -fdata-sections -# LDFLAGS += -Wl,--gc-sections -ARFLAGS = -cr # ar needs the dash on OpenBSD -RANLIB = ranlib -CP = cp -MKDIR = mkdir -EGREP = egrep -UNAME = $(shell uname) -ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64") - -# Default prefix for make install -ifeq ($(PREFIX),) -PREFIX = /usr -endif - -ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4 -CXX = g++ -endif - -ifeq ($(ISX86),1) - -GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])") -INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)") -ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])") -IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun") -GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])") -GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])") -GAS219_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") -ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw") - -ifneq ($(GCC42_OR_LATER),0) -ifeq ($(UNAME),Darwin) -CXXFLAGS += -arch x86_64 -arch i386 -else -# Disabled due to errors of architecture detection on some of our testing environments. PIlin, 02.08.2012 -#CXXFLAGS += -march=native -endif -endif - -ifneq ($(INTEL_COMPILER),0) -CXXFLAGS += -wd68 -wd186 -wd279 -wd327 -ifeq ($(ICC111_OR_LATER),0) -# "internal error: backend signals" occurs on some x86 inline assembly with ICC 9 and some x64 inline assembly with ICC 11.0 -# if you want to use Crypto++'s assembly code with ICC, try enabling it on individual files -CXXFLAGS += -DCRYPTOPP_DISABLE_ASM -endif -endif - -ifeq ($(GAS210_OR_LATER),0) # .intel_syntax wasn't supported until GNU assembler 2.10 -CXXFLAGS += -DCRYPTOPP_DISABLE_ASM -else -ifeq ($(GAS217_OR_LATER),0) -CXXFLAGS += -DCRYPTOPP_DISABLE_SSSE3 -else -ifeq ($(GAS219_OR_LATER),0) -CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI -endif -endif -ifeq ($(UNAME),SunOS) -CXXFLAGS += -Wa,--divide # allow use of "/" operator -endif -endif - -ifeq ($(ISMINGW),1) -LDLIBS += -lws2_32 -endif - -endif # ISX86 - -ifeq ($(UNAME),) # for DJGPP, where uname doesn't exist -CXXFLAGS += -mbnu210 -else -CXXFLAGS += -pipe -endif - -ifeq ($(UNAME),Linux) -LDFLAGS += -pthread -ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0) -M32OR64 = -m64 -endif -endif - -ifeq ($(UNAME),Darwin) -AR = libtool -ARFLAGS = -static -o -CXX = c++ -IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) -ifeq ($(IS_GCC2),1) -CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables -LDLIBS += -lstdc++ -LDFLAGS += -flat_namespace -undefined suppress -m -endif -endif - -ifeq ($(UNAME),SunOS) -LDLIBS += -lnsl -lsocket -M32OR64 = -m$(shell isainfo -b) -endif - -ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler -CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64) -LDFLAGS = -AR = $(CXX) -ARFLAGS = -xar -o -RANLIB = true -SUN_CC10_BUGGY = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun .* 5\.10 .* (2009|2010/0[1-4])") -ifneq ($(SUN_CC10_BUGGY),0) -# -DCRYPTOPP_INCLUDE_VECTOR_CC is needed for Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 and was fixed in May 2010 -# remove it if you get "already had a body defined" errors in vector.cc -CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC -endif -endif - -SRCS = $(wildcard *.cpp) -ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77 -SRCS = $(shell echo *.cpp) -endif - -OBJS = $(SRCS:.cpp=.o) -# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?) -TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o -LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS)) - -DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp -DLLOBJS = $(DLLSRCS:.cpp=.export.o) -LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o) -TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o) -DLLTESTOBJS = dlltest.dllonly.o - -LIBSRCS_RSA := -LIBSRCS_RSA += algebra.cpp -LIBSRCS_RSA += algparam.cpp -LIBSRCS_RSA += asn.cpp -LIBSRCS_RSA += basecode.cpp -LIBSRCS_RSA += cpu.cpp -LIBSRCS_RSA += cryptlib.cpp -LIBSRCS_RSA += dll.cpp -LIBSRCS_RSA += dsa.cpp -LIBSRCS_RSA += ec2n.cpp -LIBSRCS_RSA += ecp.cpp -LIBSRCS_RSA += filters.cpp -LIBSRCS_RSA += fips140.cpp -LIBSRCS_RSA += gf2n.cpp -LIBSRCS_RSA += gfpcrypt.cpp -LIBSRCS_RSA += hex.cpp -LIBSRCS_RSA += hmac.cpp -LIBSRCS_RSA += hrtimer.cpp -LIBSRCS_RSA += integer.cpp -LIBSRCS_RSA += iterhash.cpp -LIBSRCS_RSA += misc.cpp -LIBSRCS_RSA += modes.cpp -LIBSRCS_RSA += mqueue.cpp -LIBSRCS_RSA += nbtheory.cpp -LIBSRCS_RSA += oaep.cpp -LIBSRCS_RSA += osrng.cpp -LIBSRCS_RSA += pkcspad.cpp -LIBSRCS_RSA += pubkey.cpp -LIBSRCS_RSA += queue.cpp -LIBSRCS_RSA += randpool.cpp -LIBSRCS_RSA += rdtables.cpp -LIBSRCS_RSA += rijndael.cpp -LIBSRCS_RSA += rng.cpp -LIBSRCS_RSA += rsa.cpp -LIBSRCS_RSA += sha.cpp - -LIBOBJS_RSA = $(LIBSRCS_RSA:.cpp=.o) - -all: cryptest.exe - -rsa: libcryptopp_rsa.a libcryptopp_rsa.so - -test: cryptest.exe - ./cryptest.exe v - -clean: - $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) - -install: - $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin - $(CP) *.h $(PREFIX)/include/cryptopp - $(CP) *.a $(PREFIX)/lib - $(CP) *.so $(PREFIX)/lib - $(CP) *.exe $(PREFIX)/bin - -libcryptopp_rsa.a: $(LIBOBJS_RSA) - $(AR) $(ARFLAGS) $@ $(LIBOBJS_RSA) - $(RANLIB) $@ - -libcryptopp_rsa.so: $(LIBOBJS_RSA) - $(CXX) -shared -Wl,--no-undefined -o $@ $(LIBOBJS_RSA) - -libcryptopp.a: $(LIBOBJS) - $(AR) $(ARFLAGS) $@ $(LIBOBJS) - $(RANLIB) $@ - -libcryptopp.so: $(LIBOBJS) - $(CXX) -shared -o $@ $(LIBOBJS) - -cryptest.exe: libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) - -nolib: $(OBJS) # makes it faster to test changes - $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) - -dll: cryptest.import.exe dlltest.exe - -cryptopp.dll: $(DLLOBJS) - $(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a - -libcryptopp.import.a: $(LIBIMPORTOBJS) - $(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS) - $(RANLIB) $@ - -cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS) - -dlltest.exe: cryptopp.dll $(DLLTESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS) - -adhoc.cpp: adhoc.cpp.proto -ifeq ($(wildcard adhoc.cpp),) - cp adhoc.cpp.proto adhoc.cpp -else - touch adhoc.cpp -endif - -%.dllonly.o : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@ - -%.import.o : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@ - -%.export.o : %.cpp - $(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@ - -%.o : %.cpp - $(CXX) $(CXXFLAGS) -c $< - -.PHONY: all rsa test clean install nolib dll diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/License.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/License.txt deleted file mode 100644 index 043e4b69..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/License.txt +++ /dev/null @@ -1,62 +0,0 @@ -Compilation Copyright (c) 1995-2010 by Wei Dai. All rights reserved. -This copyright applies only to this software distribution package -as a compilation, and does not imply a copyright on any particular -file in the package. - -All individual files in this compilation are placed in the public domain by -Wei Dai and other contributors. - -I would like to thank the following authors for placing their works into -the public domain: - -Joan Daemen - 3way.cpp -Leonard Janke - cast.cpp, seal.cpp -Steve Reid - cast.cpp -Phil Karn - des.cpp -Andrew M. Kuchling - md2.cpp, md4.cpp -Colin Plumb - md5.cpp -Seal Woods - rc6.cpp -Chris Morgan - rijndael.cpp -Paulo Baretto - rijndael.cpp, skipjack.cpp, square.cpp -Richard De Moliner - safer.cpp -Matthew Skala - twofish.cpp -Kevin Springle - camellia.cpp, shacal2.cpp, ttmac.cpp, whrlpool.cpp, ripemd.cpp - -Permission to use, copy, modify, and distribute this compilation for -any purpose, including commercial applications, is hereby granted -without fee, subject to the following restrictions: - -1. Any copy or modification of this compilation in any form, except -in object code form as part of an application software, must include -the above copyright notice and this license. - -2. Users of this software agree that any modification or extension -they provide to Wei Dai will be considered public domain and not -copyrighted unless it includes an explicit copyright notice. - -3. Wei Dai makes no warranty or representation that the operation of the -software in this compilation will be error-free, and Wei Dai is under no -obligation to provide any services, by way of maintenance, update, or -otherwise. THE SOFTWARE AND ANY DOCUMENTATION ARE PROVIDED "AS IS" -WITHOUT EXPRESS OR IMPLIED WARRANTY INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. IN NO EVENT WILL WEI DAI OR ANY OTHER CONTRIBUTOR BE LIABLE FOR -DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -4. Users will not use Wei Dai or any other contributor's name in any -publicity or advertising, without prior written consent in each case. - -5. Export of this software from the United States may require a -specific license from the United States Government. It is the -responsibility of any person or organization contemplating export -to obtain such a license before exporting. - -6. Certain parts of this software may be protected by patents. It -is the users' responsibility to obtain the appropriate -licenses before using those parts. - -If this compilation is used in object code form in an application -software, acknowledgement of the author is not required but would be -appreciated. The contribution of any useful modifications or extensions -to Wei Dai is not required but would also be appreciated. diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/Readme.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/Readme.txt deleted file mode 100644 index 1b26794a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/Readme.txt +++ /dev/null @@ -1,444 +0,0 @@ -Crypto++: a C++ Class Library of Cryptographic Schemes -Version 5.6.1 (8/9/2010, SVN r520) - -Crypto++ Library is a free C++ class library of cryptographic schemes. -Currently the library contains the following algorithms: - - algorithm type name - - authenticated encryption schemes GCM, CCM, EAX - - high speed stream ciphers Panama, Sosemanuk, Salsa20, XSalsa20 - - AES and AES candidates AES (Rijndael), RC6, MARS, Twofish, Serpent, - CAST-256 - - IDEA, Triple-DES (DES-EDE2 and DES-EDE3), - other block ciphers Camellia, SEED, RC5, Blowfish, TEA, XTEA, - Skipjack, SHACAL-2 - - block cipher modes of operation ECB, CBC, CBC ciphertext stealing (CTS), - CFB, OFB, counter mode (CTR) - - message authentication codes VMAC, HMAC, GMAC, CMAC, CBC-MAC, DMAC, - Two-Track-MAC - - SHA-1, SHA-2 (SHA-224, SHA-256, SHA-384, and - hash functions SHA-512), Tiger, WHIRLPOOL, RIPEMD-128, - RIPEMD-256, RIPEMD-160, RIPEMD-320 - - RSA, DSA, ElGamal, Nyberg-Rueppel (NR), - public-key cryptography Rabin-Williams (RW), LUC, LUCELG, - DLIES (variants of DHAES), ESIGN - - padding schemes for public-key PKCS#1 v2.0, OAEP, PSS, PSSR, IEEE P1363 - systems EMSA2 and EMSA5 - - Diffie-Hellman (DH), Unified Diffie-Hellman - key agreement schemes (DH2), Menezes-Qu-Vanstone (MQV), LUCDIF, - XTR-DH - - elliptic curve cryptography ECDSA, ECNR, ECIES, ECDH, ECMQV - - insecure or obsolescent MD2, MD4, MD5, Panama Hash, DES, ARC4, SEAL -algorithms retained for backwards 3.0, WAKE, WAKE-OFB, DESX (DES-XEX3), RC2, - compatibility and historical SAFER, 3-WAY, GOST, SHARK, CAST-128, Square - value - -Other features include: - - * pseudo random number generators (PRNG): ANSI X9.17 appendix C, RandomPool - * password based key derivation functions: PBKDF1 and PBKDF2 from PKCS #5, - PBKDF from PKCS #12 appendix B - * Shamir's secret sharing scheme and Rabin's information dispersal algorithm - (IDA) - * fast multi-precision integer (bignum) and polynomial operations - * finite field arithmetics, including GF(p) and GF(2^n) - * prime number generation and verification - * useful non-cryptographic algorithms - + DEFLATE (RFC 1951) compression/decompression with gzip (RFC 1952) and - zlib (RFC 1950) format support - + hex, base-32, and base-64 coding/decoding - + 32-bit CRC and Adler32 checksum - * class wrappers for these operating system features (optional): - + high resolution timers on Windows, Unix, and Mac OS - + Berkeley and Windows style sockets - + Windows named pipes - + /dev/random, /dev/urandom, /dev/srandom - + Microsoft's CryptGenRandom on Windows - * A high level interface for most of the above, using a filter/pipeline - metaphor - * benchmarks and validation testing - * x86, x86-64 (x64), MMX, and SSE2 assembly code for the most commonly used - algorithms, with run-time CPU feature detection and code selection - * some versions are available in FIPS 140-2 validated form - -You are welcome to use it for any purpose without paying me, but see -License.txt for the fine print. - -The following compilers are supported for this release. Please visit -http://www.cryptopp.com the most up to date build instructions and porting notes. - - * MSVC 6.0 - 2010 - * GCC 3.3 - 4.5 - * C++Builder 2010 - * Intel C++ Compiler 9 - 11.1 - * Sun Studio 12u1, Express 11/08, Express 06/10 - -*** Important Usage Notes *** - -1. If a constructor for A takes a pointer to an object B (except primitive -types such as int and char), then A owns B and will delete B at A's -destruction. If a constructor for A takes a reference to an object B, -then the caller retains ownership of B and should not destroy it until -A no longer needs it. - -2. Crypto++ is thread safe at the class level. This means you can use -Crypto++ safely in a multithreaded application, but you must provide -synchronization when multiple threads access a common Crypto++ object. - -*** MSVC-Specific Information *** - -On Windows, Crypto++ can be compiled into 3 forms: a static library -including all algorithms, a DLL with only FIPS Approved algorithms, and -a static library with only algorithms not in the DLL. -(FIPS Approved means Approved according to the FIPS 140-2 standard.) -The DLL may be used by itself, or it may be used together with the second -form of the static library. MSVC project files are included to build -all three forms, and sample applications using each of the three forms -are also included. - -To compile Crypto++ with MSVC, open the "cryptest.dsw" (for MSVC 6 and MSVC .NET -2003) or "cryptest.sln" (for MSVC 2005 - 2010) workspace file and build one or -more of the following projects: - -cryptopp - This builds the DLL. Please note that if you wish to use Crypto++ - as a FIPS validated module, you must use a pre-built DLL that has undergone - the FIPS validation process instead of building your own. -dlltest - This builds a sample application that only uses the DLL. -cryptest Non-DLL-Import Configuration - This builds the full static library - along with a full test driver. -cryptest DLL-Import Configuration - This builds a static library containing - only algorithms not in the DLL, along with a full test driver that uses - both the DLL and the static library. - -To use the Crypto++ DLL in your application, #include "dll.h" before including -any other Crypto++ header files, and place the DLL in the same directory as -your .exe file. dll.h includes the line #pragma comment(lib, "cryptopp") -so you don't have to explicitly list the import library in your project -settings. To use a static library form of Crypto++, make the "cryptlib" -project a dependency of your application project, or specify it as -an additional library to link with in your project settings. -In either case you should check the compiler options to -make sure that the library and your application are using the same C++ -run-time libraries and calling conventions. - -*** DLL Memory Management *** - -Because it's possible for the Crypto++ DLL to delete objects allocated -by the calling application, they must use the same C++ memory heap. Three -methods are provided to achieve this. -1. The calling application can tell Crypto++ what heap to use. This method - is required when the calling application uses a non-standard heap. -2. Crypto++ can tell the calling application what heap to use. This method - is required when the calling application uses a statically linked C++ Run - Time Library. (Method 1 does not work in this case because the Crypto++ DLL - is initialized before the calling application's heap is initialized.) -3. Crypto++ can automatically use the heap provided by the calling application's - dynamically linked C++ Run Time Library. The calling application must - make sure that the dynamically linked C++ Run Time Library is initialized - before Crypto++ is loaded. (At this time it is not clear if it is possible - to control the order in which DLLs are initialized on Windows 9x machines, - so it might be best to avoid using this method.) - -When Crypto++ attaches to a new process, it searches all modules loaded -into the process space for exported functions "GetNewAndDeleteForCryptoPP" -and "SetNewAndDeleteFromCryptoPP". If one of these functions is found, -Crypto++ uses methods 1 or 2, respectively, by calling the function. -Otherwise, method 3 is used. - -*** GCC-Specific Information *** - -A makefile is included for you to compile Crypto++ with GCC. Make sure -you are using GNU Make and GNU ld. The make process will produce two files, -libcryptopp.a and cryptest.exe. Run "cryptest.exe v" for the validation -suite. - -*** Documentation and Support *** - -Crypto++ is documented through inline comments in header files, which are -processed through Doxygen to produce an HTML reference manual. You can find -a link to the manual from http://www.cryptopp.com. Also at that site is -the Crypto++ FAQ, which you should browse through before attempting to -use this library, because it will likely answer many of questions that -may come up. - -If you run into any problems, please try the Crypto++ mailing list. -The subscription information and the list archive are available on -http://www.cryptopp.com. You can also email me directly by visiting -http://www.weidai.com, but you will probably get a faster response through -the mailing list. - -*** History *** - -1.0 - First public release. Withdrawn at the request of RSA DSI. - - included Blowfish, BBS, DES, DH, Diamond, DSA, ElGamal, IDEA, - MD5, RC4, RC5, RSA, SHA, WAKE, secret sharing, DEFLATE compression - - had a serious bug in the RSA key generation code. - -1.1 - Removed RSA, RC4, RC5 - - Disabled calls to RSAREF's non-public functions - - Minor bugs fixed - -2.0 - a completely new, faster multiprecision integer class - - added MD5-MAC, HAVAL, 3-WAY, TEA, SAFER, LUC, Rabin, BlumGoldwasser, - elliptic curve algorithms - - added the Lucas strong probable primality test - - ElGamal encryption and signature schemes modified to avoid weaknesses - - Diamond changed to Diamond2 because of key schedule weakness - - fixed bug in WAKE key setup - - SHS class renamed to SHA - - lots of miscellaneous optimizations - -2.1 - added Tiger, HMAC, GOST, RIPE-MD160, LUCELG, LUCDIF, XOR-MAC, - OAEP, PSSR, SHARK - - added precomputation to DH, ElGamal, DSA, and elliptic curve algorithms - - added back RC5 and a new RSA - - optimizations in elliptic curves over GF(p) - - changed Rabin to use OAEP and PSSR - - changed many classes to allow copy constructors to work correctly - - improved exception generation and handling - -2.2 - added SEAL, CAST-128, Square - - fixed bug in HAVAL (padding problem) - - fixed bug in triple-DES (decryption order was reversed) - - fixed bug in RC5 (couldn't handle key length not a multiple of 4) - - changed HMAC to conform to RFC-2104 (which is not compatible - with the original HMAC) - - changed secret sharing and information dispersal to use GF(2^32) - instead of GF(65521) - - removed zero knowledge prover/verifier for graph isomorphism - - removed several utility classes in favor of the C++ standard library - -2.3 - ported to EGCS - - fixed incomplete workaround of min/max conflict in MSVC - -3.0 - placed all names into the "CryptoPP" namespace - - added MD2, RC2, RC6, MARS, RW, DH2, MQV, ECDHC, CBC-CTS - - added abstract base classes PK_SimpleKeyAgreementDomain and - PK_AuthenticatedKeyAgreementDomain - - changed DH and LUCDIF to implement the PK_SimpleKeyAgreementDomain - interface and to perform domain parameter and key validation - - changed interfaces of PK_Signer and PK_Verifier to sign and verify - messages instead of message digests - - changed OAEP to conform to PKCS#1 v2.0 - - changed benchmark code to produce HTML tables as output - - changed PSSR to track IEEE P1363a - - renamed ElGamalSignature to NR and changed it to track IEEE P1363 - - renamed ECKEP to ECMQVC and changed it to track IEEE P1363 - - renamed several other classes for clarity - - removed support for calling RSAREF - - removed option to compile old SHA (SHA-0) - - removed option not to throw exceptions - -3.1 - added ARC4, Rijndael, Twofish, Serpent, CBC-MAC, DMAC - - added interface for querying supported key lengths of symmetric ciphers - and MACs - - added sample code for RSA signature and verification - - changed CBC-CTS to be compatible with RFC 2040 - - updated SEAL to version 3.0 of the cipher specification - - optimized multiprecision squaring and elliptic curves over GF(p) - - fixed bug in MARS key setup - - fixed bug with attaching objects to Deflator - -3.2 - added DES-XEX3, ECDSA, DefaultEncryptorWithMAC - - renamed DES-EDE to DES-EDE2 and TripleDES to DES-EDE3 - - optimized ARC4 - - generalized DSA to allow keys longer than 1024 bits - - fixed bugs in GF2N and ModularArithmetic that can cause calculation errors - - fixed crashing bug in Inflator when given invalid inputs - - fixed endian bug in Serpent - - fixed padding bug in Tiger - -4.0 - added Skipjack, CAST-256, Panama, SHA-2 (SHA-256, SHA-384, and SHA-512), - and XTR-DH - - added a faster variant of Rabin's Information Dispersal Algorithm (IDA) - - added class wrappers for these operating system features: - - high resolution timers on Windows, Unix, and MacOS - - Berkeley and Windows style sockets - - Windows named pipes - - /dev/random and /dev/urandom on Linux and FreeBSD - - Microsoft's CryptGenRandom on Windows - - added support for SEC 1 elliptic curve key format and compressed points - - added support for X.509 public key format (subjectPublicKeyInfo) for - RSA, DSA, and elliptic curve schemes - - added support for DER and OpenPGP signature format for DSA - - added support for ZLIB compressed data format (RFC 1950) - - changed elliptic curve encryption to use ECIES (as defined in SEC 1) - - changed MARS key schedule to reflect the latest specification - - changed BufferedTransformation interface to support multiple channels - and messages - - changed CAST and SHA-1 implementations to use public domain source code - - fixed bug in StringSource - - optmized multi-precision integer code for better performance - -4.1 - added more support for the recommended elliptic curve parameters in SEC 2 - - added Panama MAC, MARC4 - - added IV stealing feature to CTS mode - - added support for PKCS #8 private key format for RSA, DSA, and elliptic - curve schemes - - changed Deflate, MD5, Rijndael, and Twofish to use public domain code - - fixed a bug with flushing compressed streams - - fixed a bug with decompressing stored blocks - - fixed a bug with EC point decompression using non-trinomial basis - - fixed a bug in NetworkSource::GeneralPump() - - fixed a performance issue with EC over GF(p) decryption - - fixed syntax to allow GCC to compile without -fpermissive - - relaxed some restrictions in the license - -4.2 - added support for longer HMAC keys - - added MD4 (which is not secure so use for compatibility purposes only) - - added compatibility fixes/workarounds for STLport 4.5, GCC 3.0.2, - and MSVC 7.0 - - changed MD2 to use public domain code - - fixed a bug with decompressing multiple messages with the same object - - fixed a bug in CBC-MAC with MACing multiple messages with the same object - - fixed a bug in RC5 and RC6 with zero-length keys - - fixed a bug in Adler32 where incorrect checksum may be generated - -5.0 - added ESIGN, DLIES, WAKE-OFB, PBKDF1 and PBKDF2 from PKCS #5 - - added key validation for encryption and signature public/private keys - - renamed StreamCipher interface to SymmetricCipher, which is now implemented - by both stream ciphers and block cipher modes including ECB and CBC - - added keying interfaces to support resetting of keys and IVs without - having to destroy and recreate objects - - changed filter interface to support non-blocking input/output - - changed SocketSource and SocketSink to use overlapped I/O on Microsoft Windows - - grouped related classes inside structs to help templates, for example - AESEncryption and AESDecryption are now AES::Encryption and AES::Decryption - - where possible, typedefs have been added to improve backwards - compatibility when the CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY macro is defined - - changed Serpent, HAVAL and IDEA to use public domain code - - implemented SSE2 optimizations for Integer operations - - fixed a bug in HMAC::TruncatedFinal() - - fixed SKIPJACK byte ordering following NIST clarification dated 5/9/02 - -5.01 - added known answer test for X9.17 RNG in FIPS 140 power-up self test - - submitted to NIST/CSE, but not publicly released - -5.02 - changed EDC test to MAC integrity check using HMAC/SHA1 - - improved performance of integrity check - - added blinding to defend against RSA timing attack - -5.03 - created DLL version of Crypto++ for FIPS 140-2 validation - - fixed vulnerabilities in GetNextIV for CTR and OFB modes - -5.0.4 - Removed DES, SHA-256, SHA-384, SHA-512 from DLL - -5.1 - added PSS padding and changed PSSR to track IEEE P1363a draft standard - - added blinding for RSA and Rabin to defend against timing attacks - on decryption operations - - changed signing and decryption APIs to support the above - - changed WaitObjectContainer to allow waiting for more than 64 - objects at a time on Win32 platforms - - fixed a bug in CBC and ECB modes with processing non-aligned data - - fixed standard conformance bugs in DLIES (DHAES mode) and RW/EMSA2 - signature scheme (these fixes are not backwards compatible) - - fixed a number of compiler warnings, minor bugs, and portability problems - - removed Sapphire - -5.2 - merged in changes for 5.01 - 5.0.4 - - added support for using encoding parameters and key derivation parameters - with public key encryption (implemented by OAEP and DL/ECIES) - - added Camellia, SHACAL-2, Two-Track-MAC, Whirlpool, RIPEMD-320, - RIPEMD-128, RIPEMD-256, Base-32 coding, FIPS variant of CFB mode - - added ThreadUserTimer for timing thread CPU usage - - added option for password-based key derivation functions - to iterate until a mimimum elapsed thread CPU time is reached - - added option (on by default) for DEFLATE compression to detect - uncompressible files and process them more quickly - - improved compatibility and performance on 64-bit platforms, - including Alpha, IA-64, x86-64, PPC64, Sparc64, and MIPS64 - - fixed ONE_AND_ZEROS_PADDING to use 0x80 instead 0x01 as padding. - - fixed encoding/decoding of PKCS #8 privateKeyInfo to properly - handle optional attributes - -5.2.1 - fixed bug in the "dlltest" DLL testing program - - fixed compiling with STLport using VC .NET - - fixed compiling with -fPIC using GCC - - fixed compiling with -msse2 on systems without memalign() - - fixed inability to instantiate PanamaMAC - - fixed problems with inline documentation - -5.2.2 - added SHA-224 - - put SHA-256, SHA-384, SHA-512, RSASSA-PSS into DLL - -5.2.3 - fixed issues with FIPS algorithm test vectors - - put RSASSA-ISO into DLL - -5.3 - ported to MSVC 2005 with support for x86-64 - - added defense against AES timing attacks, and more AES test vectors - - changed StaticAlgorithmName() of Rijndael to "AES", CTR to "CTR" - -5.4 - added Salsa20 - - updated Whirlpool to version 3.0 - - ported to GCC 4.1, Sun C++ 5.8, and Borland C++Builder 2006 - -5.5 - added VMAC and Sosemanuk (with x86-64 and SSE2 assembly) - - improved speed of integer arithmetic, AES, SHA-512, Tiger, Salsa20, - Whirlpool, and PANAMA cipher using assembly (x86-64, MMX, SSE2) - - optimized Camellia and added defense against timing attacks - - updated benchmarks code to show cycles per byte and to time key/IV setup - - started using OpenMP for increased multi-core speed - - enabled GCC optimization flags by default in GNUmakefile - - added blinding and computational error checking for RW signing - - changed RandomPool, X917RNG, GetNextIV, DSA/NR/ECDSA/ECNR to reduce - the risk of reusing random numbers and IVs after virtual machine state - rollback - - changed default FIPS mode RNG from AutoSeededX917RNG to - AutoSeededX917RNG - - fixed PANAMA cipher interface to accept 256-bit key and 256-bit IV - - moved MD2, MD4, MD5, PanamaHash, ARC4, WAKE_CFB into the namespace "Weak" - - removed HAVAL, MD5-MAC, XMAC - -5.5.1 - fixed VMAC validation failure on 32-bit big-endian machines - -5.5.2 - ported x64 assembly language code for AES, Salsa20, Sosemanuk, and Panama - to MSVC 2005 (using MASM since MSVC doesn't support inline assembly on x64) - - fixed Salsa20 initialization crash on non-SSE2 machines - - fixed Whirlpool crash on Pentium 2 machines - - fixed possible branch prediction analysis (BPA) vulnerability in - MontgomeryReduce(), which may affect security of RSA, RW, LUC - - fixed link error with MSVC 2003 when using "debug DLL" form of runtime library - - fixed crash in SSE2_Add on P4 machines when compiled with - MSVC 6.0 SP5 with Processor Pack - - ported to MSVC 2008, GCC 4.2, Sun CC 5.9, Intel C++ Compiler 10.0, - and Borland C++Builder 2007 - -5.6.0 - added AuthenticatedSymmetricCipher interface class and Filter wrappers - - added CCM, GCM (with SSE2 assembly), EAX, CMAC, XSalsa20, and SEED - - added support for variable length IVs - - added OIDs for Brainpool elliptic curve parameters - - improved AES and SHA-256 speed on x86 and x64 - - changed BlockTransformation interface to no longer assume data alignment - - fixed incorrect VMAC computation on message lengths - that are >64 mod 128 (x86 assembly version is not affected) - - fixed compiler error in vmac.cpp on x86 with GCC -fPIC - - fixed run-time validation error on x86-64 with GCC 4.3.2 -O2 - - fixed HashFilter bug when putMessage=true - - fixed AES-CTR data alignment bug that causes incorrect encryption on ARM - - removed WORD64_AVAILABLE; compiler support for 64-bit int is now required - - ported to GCC 4.3, C++Builder 2009, Sun CC 5.10, Intel C++ Compiler 11 - -5.6.1 - added support for AES-NI and CLMUL instruction sets in AES and GMAC/GCM - - removed WAKE-CFB - - fixed several bugs in the SHA-256 x86/x64 assembly code: - * incorrect hash on non-SSE2 x86 machines on non-aligned input - * incorrect hash on x86 machines when input crosses 0x80000000 - * incorrect hash on x64 when compiled with GCC with optimizations enabled - - fixed bugs in AES x86 and x64 assembly causing crashes in some MSVC build configurations - - switched to a public domain implementation of MARS - - ported to MSVC 2010, GCC 4.5.1, Sun Studio 12u1, C++Builder 2010, Intel C++ Compiler 11.1 - - renamed the MSVC DLL project to "cryptopp" for compatibility with MSVC 2010 - -Written by Wei Dai diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3desval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3desval.dat deleted file mode 100644 index 1d5883ed..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3desval.dat +++ /dev/null @@ -1,3 +0,0 @@ -0123456789abcdeffedcba9876543210 0123456789abcde7 7f1d0a77826b8aff -0123456789abcdeffedcba987654321089abcdef01234567 0123456789abcde7 de0b7c06ae5e0ed5 -0123456789ABCDEF01010101010101011011121314151617 94DBE082549A14EF 9011121314151617 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3wayval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3wayval.dat deleted file mode 100644 index 51bb6c16..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/3wayval.dat +++ /dev/null @@ -1,5 +0,0 @@ -000000000000000000000000 000000010000000100000001 4059c76e83ae9dc4ad21ecf7 -000000060000000500000004 000000030000000200000001 d2f05b5ed6144138cab920cd -def01234456789abbcdef012 234567899abcdef001234567 0aa55dbb9cdddb6d7cdb76b2 -d2f05b5ed6144138cab920cd 4059c76e83ae9dc4ad21ecf7 478ea8716b13f17c15b155ed - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/camellia.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/camellia.dat deleted file mode 100644 index c4fcc125..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/camellia.dat +++ /dev/null @@ -1,45 +0,0 @@ -0123456789ABCDEFFEDCBA9876543210 0123456789ABCDEFFEDCBA9876543210 67673138549669730857065648EABE43 -80000000000000000000000000000000 00000000000000000000000000000000 6C227F749319A3AA7DA235A9BBA05A2C -00000000000000000000000000000001 00000000000000000000000000000000 41E0E6DC2DDEC65D8B8120E60977B82D -00000000000000000000000000000000 80000000000000000000000000000000 07923A39EB0A817D1C4D87BDB82D1F1C -00000000000000000000000000000000 00000000000000000000000000000001 F5574ACC3148DFCB9015200631024DF9 -00000000000000000000000000000000 00000000000000000000000000000000 3D028025B156327C17F762C1F2CBCA71 -01010101010101010101010101010101 01010101010101010101010101010101 637084CB1120D6F25DB618893040AA27 -02020202020202020202020202020202 02020202020202020202020202020202 612834AAC9EF906BAEAA076E1C75179D -04040404040404040404040404040404 04040404040404040404040404040404 B24FAF8A579E4EFE986571FB2F68B5B4 -08080808080808080808080808080808 08080808080808080808080808080808 3E5CAFBB70545AABB1109293A1C44C14 -10101010101010101010101010101010 10101010101010101010101010101010 E1FA5FD3F40B766BBE3DF469AF41B420 -20202020202020202020202020202020 20202020202020202020202020202020 7E724027BB2F591C63254D936FCC4B43 -40404040404040404040404040404040 40404040404040404040404040404040 538ADCBE104A3483B3C2A3D8CE72FBD6 -80808080808080808080808080808080 80808080808080808080808080808080 AA7627F70F6B54C217C3EF232D362459 -FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 25DD9EB9DD67FBC6E8431F56F4FBE651 -0123456789ABCDEFFEDCBA98765432100011223344556677 0123456789ABCDEFFEDCBA9876543210 B4993401B3E996F84EE5CEE7D79B09B9 -800000000000000000000000000000000000000000000000 00000000000000000000000000000000 1B6220D365C2176C1D41A5826520FCA1 -000000000000000000000000000000000000000000000001 00000000000000000000000000000000 E37577F71E0E643C4D3F55219ABA1394 -000000000000000000000000000000000000000000000000 80000000000000000000000000000000 3EB6CC5618EFC98455B5992050D474E7 -000000000000000000000000000000000000000000000000 00000000000000000000000000000001 BA9AE89FDDCE4B51131E17C4D65CE587 -000000000000000000000000000000000000000000000000 00000000000000000000000000000000 56E1E129CA5C02C7F9AC6AFDEF86ADC3 -010101010101010101010101010101010101010101010101 01010101010101010101010101010101 8F764397C10BE84BA876CEEFA4225BFF -020202020202020202020202020202020202020202020202 02020202020202020202020202020202 60B00674BFD444D07B5A19851E6151CD -040404040404040404040404040404040404040404040404 04040404040404040404040404040404 81B26FF4F6B4377CC555873504B3A38B -080808080808080808080808080808080808080808080808 08080808080808080808080808080808 A2AA1C6693DC2B70D75C9B39B9B214D0 -101010101010101010101010101010101010101010101010 10101010101010101010101010101010 A907BFDAEEF8C81D05855235E8D3BE08 -202020202020202020202020202020202020202020202020 20202020202020202020202020202020 87F8EA30332036F17CEAC0097CE33BC1 -404040404040404040404040404040404040404040404040 40404040404040404040404040404040 A2C32EA499E41A248565253BACC11E3B -808080808080808080808080808080808080808080808080 80808080808080808080808080808080 F602BA7F515B082983B8F7A27F92408F -FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 3F8D5676F51CE23DC3BDB627F8B3883E -0123456789ABCDEFFEDCBA987654321000112233445566778899AABBCCDDEEFF 0123456789ABCDEFFEDCBA9876543210 9ACC237DFF16D76C20EF7C919E3A7509 -8000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000 2136FABDA091DFB5171B94B8EFBB5D08 -0000000000000000000000000000000000000000000000000000000000000001 00000000000000000000000000000000 AFCD38B195E0A736304E89B9AE3019D3 -0000000000000000000000000000000000000000000000000000000000000000 80000000000000000000000000000000 B0C6B88AEA518AB09E847248E91B1B9D -0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000001 9CDB269B5D293BC5DB9C55B057D9B591 -0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000 396154111ADEFC500CF6E5C99038BC17 -0101010101010101010101010101010101010101010101010101010101010101 01010101010101010101010101010101 438D0C2E7E86869B56EBA23B66086A01 -0202020202020202020202020202020202020202020202020202020202020202 02020202020202020202020202020202 D4F553BFA794F55EF3B7A578629F6DEA -0404040404040404040404040404040404040404040404040404040404040404 04040404040404040404040404040404 5E858730ABC9823A93CA4CAB67F0B423 -0808080808080808080808080808080808080808080808080808080808080808 08080808080808080808080808080808 F9A9C1540AE1B314DBEDF9A49054DC9D -1010101010101010101010101010101010101010101010101010101010101010 10101010101010101010101010101010 6693FC130669F194F81E8D175194DDA2 -2020202020202020202020202020202020202020202020202020202020202020 20202020202020202020202020202020 F3E1FDA6B9C8314799F4654C29F1C690 -4040404040404040404040404040404040404040404040404040404040404040 40404040404040404040404040404040 4A30476F1141FBF303ED63FCD3CB0536 -8080808080808080808080808080808080808080808080808080808080808080 80808080808080808080808080808080 0C765AA494E048FC8BB23139F2124CB6 -FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 4F05F28CA23EEAE205B67B1C95CD5280 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast128v.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast128v.dat deleted file mode 100644 index 4445305b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast128v.dat +++ /dev/null @@ -1,11 +0,0 @@ -01 23 45 67 12 34 56 78 23 45 67 89 34 56 78 9A -01 23 45 67 89 AB CD EF -23 8B 4F E5 84 7E 44 B2 - -01 23 45 67 12 34 56 78 23 45 -01 23 45 67 89 AB CD EF -EB 6A 71 1A 2C 02 27 1B - -01 23 45 67 12 -01 23 45 67 89 AB CD EF -7A C8 16 D1 6E 9B 30 2E diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast256v.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast256v.dat deleted file mode 100644 index 65a15dc2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/cast256v.dat +++ /dev/null @@ -1,11 +0,0 @@ -2342bb9efa38542c0af75647f29f615d -00000000000000000000000000000000 -c842a08972b43d20836c91d1b7530f6b - -2342bb9efa38542cbed0ac83940ac298bac77a7717942863 -00000000000000000000000000000000 -1b386c0210dcadcbdd0e41aa08a7a7e8 - -2342bb9efa38542cbed0ac83940ac2988d7c47ce264908461cc1b5137ae6b604 -00000000000000000000000000000000 -4f6a2038286897b9c9870136553317fa diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/descert.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/descert.dat deleted file mode 100644 index 5d3ddc7d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/descert.dat +++ /dev/null @@ -1,171 +0,0 @@ -0101010101010101 95F8A5E5DD31D900 8000000000000000 -0101010101010101 DD7F121CA5015619 4000000000000000 -0101010101010101 2E8653104F3834EA 2000000000000000 -0101010101010101 4BD388FF6CD81D4F 1000000000000000 -0101010101010101 20B9E767B2FB1456 0800000000000000 -0101010101010101 55579380D77138EF 0400000000000000 -0101010101010101 6CC5DEFAAF04512F 0200000000000000 -0101010101010101 0D9F279BA5D87260 0100000000000000 -0101010101010101 D9031B0271BD5A0A 0080000000000000 -0101010101010101 424250B37C3DD951 0040000000000000 -0101010101010101 B8061B7ECD9A21E5 0020000000000000 -0101010101010101 F15D0F286B65BD28 0010000000000000 -0101010101010101 ADD0CC8D6E5DEBA1 0008000000000000 -0101010101010101 E6D5F82752AD63D1 0004000000000000 -0101010101010101 ECBFE3BD3F591A5E 0002000000000000 -0101010101010101 F356834379D165CD 0001000000000000 -0101010101010101 2B9F982F20037FA9 0000800000000000 -0101010101010101 889DE068A16F0BE6 0000400000000000 -0101010101010101 E19E275D846A1298 0000200000000000 -0101010101010101 329A8ED523D71AEC 0000100000000000 -0101010101010101 E7FCE22557D23C97 0000080000000000 -0101010101010101 12A9F5817FF2D65D 0000040000000000 -0101010101010101 A484C3AD38DC9C19 0000020000000000 -0101010101010101 FBE00A8A1EF8AD72 0000010000000000 -0101010101010101 750D079407521363 0000008000000000 -0101010101010101 64FEED9C724C2FAF 0000004000000000 -0101010101010101 F02B263B328E2B60 0000002000000000 -0101010101010101 9D64555A9A10B852 0000001000000000 -0101010101010101 D106FF0BED5255D7 0000000800000000 -0101010101010101 E1652C6B138C64A5 0000000400000000 -0101010101010101 E428581186EC8F46 0000000200000000 -0101010101010101 AEB5F5EDE22D1A36 0000000100000000 -0101010101010101 E943D7568AEC0C5C 0000000080000000 -0101010101010101 DF98C8276F54B04B 0000000040000000 -0101010101010101 B160E4680F6C696F 0000000020000000 -0101010101010101 FA0752B07D9C4AB8 0000000010000000 -0101010101010101 CA3A2B036DBC8502 0000000008000000 -0101010101010101 5E0905517BB59BCF 0000000004000000 -0101010101010101 814EEB3B91D90726 0000000002000000 -0101010101010101 4D49DB1532919C9F 0000000001000000 -0101010101010101 25EB5FC3F8CF0621 0000000000800000 -0101010101010101 AB6A20C0620D1C6F 0000000000400000 -0101010101010101 79E90DBC98F92CCA 0000000000200000 -0101010101010101 866ECEDD8072BB0E 0000000000100000 -0101010101010101 8B54536F2F3E64A8 0000000000080000 -0101010101010101 EA51D3975595B86B 0000000000040000 -0101010101010101 CAFFC6AC4542DE31 0000000000020000 -0101010101010101 8DD45A2DDF90796C 0000000000010000 -0101010101010101 1029D55E880EC2D0 0000000000008000 -0101010101010101 5D86CB23639DBEA9 0000000000004000 -0101010101010101 1D1CA853AE7C0C5F 0000000000002000 -0101010101010101 CE332329248F3228 0000000000001000 -0101010101010101 8405D1ABE24FB942 0000000000000800 -0101010101010101 E643D78090CA4207 0000000000000400 -0101010101010101 48221B9937748A23 0000000000000200 -0101010101010101 DD7C0BBD61FAFD54 0000000000000100 -0101010101010101 2FBC291A570DB5C4 0000000000000080 -0101010101010101 E07C30D7E4E26E12 0000000000000040 -0101010101010101 0953E2258E8E90A1 0000000000000020 -0101010101010101 5B711BC4CEEBF2EE 0000000000000010 -0101010101010101 CC083F1E6D9E85F6 0000000000000008 -0101010101010101 D2FD8867D50D2DFE 0000000000000004 -0101010101010101 06E7EA22CE92708F 0000000000000002 -0101010101010101 166B40B44ABA4BD6 0000000000000001 -8001010101010101 0000000000000000 95A8D72813DAA94D -4001010101010101 0000000000000000 0EEC1487DD8C26D5 -2001010101010101 0000000000000000 7AD16FFB79C45926 -1001010101010101 0000000000000000 D3746294CA6A6CF3 -0801010101010101 0000000000000000 809F5F873C1FD761 -0401010101010101 0000000000000000 C02FAFFEC989D1FC -0201010101010101 0000000000000000 4615AA1D33E72F10 -0180010101010101 0000000000000000 2055123350C00858 -0140010101010101 0000000000000000 DF3B99D6577397C8 -0120010101010101 0000000000000000 31FE17369B5288C9 -0110010101010101 0000000000000000 DFDD3CC64DAE1642 -0108010101010101 0000000000000000 178C83CE2B399D94 -0104010101010101 0000000000000000 50F636324A9B7F80 -0102010101010101 0000000000000000 A8468EE3BC18F06D -0101800101010101 0000000000000000 A2DC9E92FD3CDE92 -0101400101010101 0000000000000000 CAC09F797D031287 -0101200101010101 0000000000000000 90BA680B22AEB525 -0101100101010101 0000000000000000 CE7A24F350E280B6 -0101080101010101 0000000000000000 882BFF0AA01A0B87 -0101040101010101 0000000000000000 25610288924511C2 -0101020101010101 0000000000000000 C71516C29C75D170 -0101018001010101 0000000000000000 5199C29A52C9F059 -0101014001010101 0000000000000000 C22F0A294A71F29F -0101012001010101 0000000000000000 EE371483714C02EA -0101011001010101 0000000000000000 A81FBD448F9E522F -0101010801010101 0000000000000000 4F644C92E192DFED -0101010401010101 0000000000000000 1AFA9A66A6DF92AE -0101010201010101 0000000000000000 B3C1CC715CB879D8 -0101010180010101 0000000000000000 19D032E64AB0BD8B -0101010140010101 0000000000000000 3CFAA7A7DC8720DC -0101010120010101 0000000000000000 B7265F7F447AC6F3 -0101010110010101 0000000000000000 9DB73B3C0D163F54 -0101010108010101 0000000000000000 8181B65BABF4A975 -0101010104010101 0000000000000000 93C9B64042EAA240 -0101010102010101 0000000000000000 5570530829705592 -0101010101800101 0000000000000000 8638809E878787A0 -0101010101400101 0000000000000000 41B9A79AF79AC208 -0101010101200101 0000000000000000 7A9BE42F2009A892 -0101010101100101 0000000000000000 29038D56BA6D2745 -0101010101080101 0000000000000000 5495C6ABF1E5DF51 -0101010101040101 0000000000000000 AE13DBD561488933 -0101010101020101 0000000000000000 024D1FFA8904E389 -0101010101018001 0000000000000000 D1399712F99BF02E -0101010101014001 0000000000000000 14C1D7C1CFFEC79E -0101010101012001 0000000000000000 1DE5279DAE3BED6F -0101010101011001 0000000000000000 E941A33F85501303 -0101010101010801 0000000000000000 DA99DBBC9A03F379 -0101010101010401 0000000000000000 B7FC92F91D8E92E9 -0101010101010201 0000000000000000 AE8E5CAA3CA04E85 -0101010101010180 0000000000000000 9CC62DF43B6EED74 -0101010101010140 0000000000000000 D863DBB5C59A91A0 -0101010101010120 0000000000000000 A1AB2190545B91D7 -0101010101010110 0000000000000000 0875041E64C570F7 -0101010101010108 0000000000000000 5A594528BEBEF1CC -0101010101010104 0000000000000000 FCDB3291DE21F0C0 -0101010101010102 0000000000000000 869EFD7F9F265A09 -1046913489980131 0000000000000000 88D55E54F54C97B4 -1007103489988020 0000000000000000 0C0CC00C83EA48FD -10071034C8980120 0000000000000000 83BC8EF3A6570183 -1046103489988020 0000000000000000 DF725DCAD94EA2E9 -1086911519190101 0000000000000000 E652B53B550BE8B0 -1086911519580101 0000000000000000 AF527120C485CBB0 -5107B01519580101 0000000000000000 0F04CE393DB926D5 -1007B01519190101 0000000000000000 C9F00FFC74079067 -3107915498080101 0000000000000000 7CFD82A593252B4E -3107919498080101 0000000000000000 CB49A2F9E91363E3 -10079115B9080140 0000000000000000 00B588BE70D23F56 -3107911598090140 0000000000000000 406A9A6AB43399AE -1007D01589980101 0000000000000000 6CB773611DCA9ADA -9107911589980101 0000000000000000 67FD21C17DBB5D70 -9107D01589190101 0000000000000000 9592CB4110430787 -1007D01598980120 0000000000000000 A6B7FF68A318DDD3 -1007940498190101 0000000000000000 4D102196C914CA16 -0107910491190401 0000000000000000 2DFA9F4573594965 -0107910491190101 0000000000000000 B46604816C0E0774 -0107940491190401 0000000000000000 6E7E6221A4F34E87 -19079210981A0101 0000000000000000 AA85E74643233199 -1007911998190801 0000000000000000 2E5A19DB4D1962D6 -10079119981A0801 0000000000000000 23A866A809D30894 -1007921098190101 0000000000000000 D812D961F017D320 -100791159819010B 0000000000000000 055605816E58608F -1004801598190101 0000000000000000 ABD88E8B1B7716F1 -1004801598190102 0000000000000000 537AC95BE69DA1E1 -1004801598190108 0000000000000000 AED0F6AE3C25CDD8 -1002911598100104 0000000000000000 B3E35A5EE53E7B8D -1002911598190104 0000000000000000 61C79C71921A2EF8 -1002911598100201 0000000000000000 E2F5728F0995013C -1002911698100101 0000000000000000 1AEAC39A61F0A464 -7CA110454A1A6E57 01A1D6D039776742 690F5B0D9A26939B -0131D9619DC1376E 5CD54CA83DEF57DA 7A389D10354BD271 -07A1133E4A0B2686 0248D43806F67172 868EBB51CAB4599A -3849674C2602319E 51454B582DDF440A 7178876E01F19B2A -04B915BA43FEB5B6 42FD443059577FA2 AF37FB421F8C4095 -0113B970FD34F2CE 059B5E0851CF143A 86A560F10EC6D85B -0170F175468FB5E6 0756D8E0774761D2 0CD3DA020021DC09 -43297FAD38E373FE 762514B829BF486A EA676B2CB7DB2B7A -07A7137045DA2A16 3BDD119049372802 DFD64A815CAF1A0F -04689104C2FD3B2F 26955F6835AF609A 5C513C9C4886C088 -37D06BB516CB7546 164D5E404F275232 0A2AEEAE3FF4AB77 -1F08260D1AC2465E 6B056E18759F5CCA EF1BF03E5DFA575A -584023641ABA6176 004BD6EF09176062 88BF0DB6D70DEE56 -025816164629B007 480D39006EE762F2 A1F9915541020B56 -49793EBC79B3258F 437540C8698F3CFA 6FBF1CAFCFFD0556 -4FB05E1515AB73A7 072D43A077075292 2F22E49BAB7CA1AC -49E95D6D4CA229BF 02FE55778117F12A 5A6B612CC26CCE4A -018310DC409B26D6 1D9D5C5018F728C2 5F4C038ED12B2E41 -1C587F1C13924FEF 305532286D6F295A 63FAC0D034D9F793 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh1024.dat deleted file mode 100644 index 86a95518..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh1024.dat +++ /dev/null @@ -1 +0,0 @@ -30818702818100DA9A18547FF03B385CC16508C173A7EF4EB61CB40EF8FEF3B31F145051676166BCDC3FE6B799FC394D08C26385F9413F896E09117E46209D6923602683CEA100924A6EE695281775C619DAA94EA8CB3691B4275B0183F1D39639EBC92995FE645D6C1BC28D409E585549BBD2C5DCDD6C208B04EADD8B7A6D997F72CBAD88390F020102 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh2048.dat deleted file mode 100644 index bd5255fa..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dh2048.dat +++ /dev/null @@ -1 +0,0 @@ -308201080282010100EB60DBD494AAFBCD2EAC6A36DB8E7DD4A2A64512A5BBB15B9BFB581C7C1CAFB647D4612973C3770C2166D75EEA695F67EA8261557591DB78BCF5A886AA5294F3AEE4D25B57C8EE8C7FE8DBF70C132CD7FFCB6F89426F807F552C5DAE2FB1F329E340094E4B30D8EF6265AB4D350E9837B151C86AC524DE4E1FC04746C668BE318275E420D51AEDDFBDF887D435CDEEF6AC81293DB45287132F8236A43AD8F4D6642D7CA6732DA06A1DE008259008C9D74403B68ADAC788CF8AB5BEFFC310DCCCD32901D1F290E5B7A993D2CF6A652AF81B6DA0FD2E70678D1AE086150E41444522F20621195AD2A1F0975652B4AF7DE5261A9FD46B9EA8B443641F3BBA695B9B020103 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie1024.dat deleted file mode 100644 index 892128b3..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie1024.dat +++ /dev/null @@ -1 +0,0 @@ -308201370201003082011706072A8648CE3804013082010A02818100D4EC6B7A18416519C76766726B3D2D5F054D107B30E97691B15EB0DCDF452B77F10E12C14450AB107BE349C2DF3A2DBD9D844A24ABA21B328D568E8EC6B959E70BADE5C49879AE4447F643360523469B55AFDC459B45634F657AA79918772F2BA9508ACD43C95C16650A1251B8173EBA1B9B59FE8C57F6240EA49A4FE8855CEF0281806A7635BD0C20B28CE3B3B339359E96AF82A6883D9874BB48D8AF586E6FA295BBF8870960A22855883DF1A4E16F9D16DECEC2251255D10D9946AB4747635CACF385D6F2E24C3CD72223FB219B0291A34DAAD7EE22CDA2B1A7B2BD53CC8C3B9795D4A84566A1E4AE0B32850928DC0B9F5D0DCDACFF462BFB1207524D27F442AE77020102041702150C9C14EEFA749DCE9A2A4B7065768767BA48BBB62F \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie2048.dat deleted file mode 100644 index 06351c7a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dlie2048.dat +++ /dev/null @@ -1 +0,0 @@ -308202410201003082021906072A8648CE3804013082020C0282010100A8E87254E7F56CB5857786364ACC39F2A0F79FFF8ED6C62C64EE45FC1C775CDDBFD9CBCEF8262DBD2CECE4E5AFECA239B9B4B7D3CBA228366500F5B2203CA6C0CB0AB6698F73921B4831BA598DFA8268A07368A64774C77808AB7CB7978F839304B10567F8C9C34F8DBDB66BB928EDE6327773AA6C20A8F4E9C2AE0C66A0516E057BBC87760CF39270726F1863260CD5ADDAF366318E7029851A6F85B2349DF29629319A3662354DBCAD0789D02AC6BD804C06523900166501041963BD7EFFE0069694A54F4542172A29B1F09D26E3F052AE5274A898058BE549650BC2066DDFDB84D582E6503AF42BCB2B674F2A2A77C54678FD622FFCA2D9718BF8B0525AEF028201005474392A73FAB65AC2BBC31B25661CF9507BCFFFC76B6316327722FE0E3BAE6EDFECE5E77C1316DE96767272D7F6511CDCDA5BE9E5D1141B32807AD9101E536065855B34C7B9C90DA418DD2CC6FD41345039B45323BA63BC0455BE5BCBC7C1C9825882B3FC64E1A7C6DEDB35DC9476F3193BB9D53610547A74E15706335028B702BDDE43BB0679C93839378C3193066AD6ED79B318C73814C28D37C2D91A4EF94B1498CD1B311AA6DE5683C4E815635EC02603291C800B3280820CB1DEBF7FF0034B4A52A7A2A10B9514D8F84E9371F82957293A544C02C5F2A4B285E10336EFEDC26AC173281D7A15E595B3A795153BE2A33C7EB117FE516CB8C5FC58292D77020102041F021D031D7EC405D3E11D031B7B66DF9EFFCC5173B9B1639E4EC920731484EE \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024.dat deleted file mode 100644 index 8e591202..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082014A0201003082012B06072A8648CE3804013082011E02818100F468699A6F6EBCC0120D3B34C8E007F125EC7D81F763B8D0F33869AE3BD6B9F2ECCC7DF34DF84C0307449E9B85D30D57194BCCEB310F48141914DD13A077AAF9B624A6CBE666BBA1D7EBEA95B5BA6F54417FD5D4E4220C601E071D316A24EA814E8B0122DBF47EE8AEEFD319EBB01DD95683F10DBB4FEB023F8262A07EAEB7FD02150082AD4E034DA6EEACDFDAE68C36F2BAD614F9E53B02818071AAF73361A26081529F7D84078ADAFCA48E031DB54AD57FB1A833ADBD8672328AABAA0C756247998D7A5B10DACA359D231332CE8120B483A784FE07D46EEBFF0D7D374A10691F78653E6DC29E27CCB1B174923960DFE5B959B919B2C3816C19251832AFD8E35D810E598F82877ABF7D40A041565168BD7F0E21E3FE2A8D8C1C0416021426EBA66E846E755169F84A1DA981D86502405DDF \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024b.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024b.dat deleted file mode 100644 index edfb808a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa1024b.dat +++ /dev/null @@ -1 +0,0 @@ -308201B73082012B06072A8648CE3804013082011E02818100F468699A6F6EBCC0120D3B34C8E007F125EC7D81F763B8D0F33869AE3BD6B9F2ECCC7DF34DF84C0307449E9B85D30D57194BCCEB310F48141914DD13A077AAF9B624A6CBE666BBA1D7EBEA95B5BA6F54417FD5D4E4220C601E071D316A24EA814E8B0122DBF47EE8AEEFD319EBB01DD95683F10DBB4FEB023F8262A07EAEB7FD02150082AD4E034DA6EEACDFDAE68C36F2BAD614F9E53B02818071AAF73361A26081529F7D84078ADAFCA48E031DB54AD57FB1A833ADBD8672328AABAA0C756247998D7A5B10DACA359D231332CE8120B483A784FE07D46EEBFF0D7D374A10691F78653E6DC29E27CCB1B174923960DFE5B959B919B2C3816C19251832AFD8E35D810E598F82877ABF7D40A041565168BD7F0E21E3FE2A8D8C1C0381850002818100D30312B7179661DA4691EDE39A71CB961199CD792C50AED6EA7E1A24C53590B6BCD92F26509D3372B2849A17C99C0962FBE4A2606CA37E6DF10244805363450FFAA24A7C274DF0B5D24AE7F31A8319FD2AA6E98AC6E7E3364E7AEDE575A9993609B0DFA387084141EA0B5B2D59B6DE718C0DAB4F86BC59F0DBE8602AED933494 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa512.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa512.dat deleted file mode 100644 index 0d63cfdb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/dsa512.dat +++ /dev/null @@ -1 +0,0 @@ -3081C60201003081A806072A8648CE38040130819C0241008DF2A494492276AA3D25759BB06869CBEAC0D83AFB8D0CF7CBB8324F0D7882E5D0762FC5B7210EAFC2E9ADAC32AB7AAC49693DFBF83724C2EC0736EE31C80291021500C773218C737EC8EE993B4F2DED30F48EDACE915F0240626D027839EA0A13413163A55B4CB500299D5522956CEFCB3BFF10F399CE2C2E71CB9DE5FA24BABF58E5B79521925C9CC42E9F6F464B088CC572AF53E6D78802041602142070B3223DBA372FDE1C0FFC7B2E3B498B260614 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/elgc1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/elgc1024.dat deleted file mode 100644 index 37518b6f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/elgc1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082018E028181008B333697371663F8869E3EC80A414E46BBAFE41F6D40E754A01ADA60FE7D12ACD16DE311C4115293114F6B92A54195909276380F04BCD4ED5CD993ED7F516DF7A752B928E5035E0D3A1A979A1CDE8387734338793C02001D59B662D4FC8F2BF0EABB1F553F9F46F57E74BCABCBA4E458812DB601FCD04609D435317181236B9702010202818038FBC56751763146BC107ECC59E9BAD3852EBC38799B41B40EF5745810BCF9DCC6D569B7E61063EA358B0DF2A194910029B72A9CFD11AD240681D3F976EDCB18D79C0530AB2944DC1E314C2B520BE23066C802754C19BF2EC15DE0439E2663383CEA5163DC857B6A5F91079F54FB47C9B33F23A9EB6B3FCBA8581524B3EC5C75028181008B333697371663F8869E3EC80A414E46BBAFE41F6D40E754A01ADA60FE7D12ACD16DE311C4115293114F6B92A54195909276380F04BCD4ED5CD993ED7F516DF7A752B928E5035E0D3A1A979A1CDE8387734338793C02001D59B662D4FC8F2BF0EABB1F553F9F46F57E74BC7F3EC6725F2FC0A6155ADCA43CEE7319E623824852 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1023.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1023.dat deleted file mode 100644 index 4e43ad46..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1023.dat +++ /dev/null @@ -1 +0,0 @@ -3081E00281807040653BA4FCD5C66E3318B31E82654C5A62957F68D2EE6AE10BD6678D7A14EEF8EBF0C85F28FE22056C12B2A2DD4E9C897EB2FF06D57DB03B872C049ED2806DC3E4D86F2947D134065AC642F233F95FBCB55C533274FA91FFDC0CEB9E71B8795B71A977C7956001FC19E28DE18A80B20E4AE8F775B952CEEA0DEFEAE8E93D7F020120022B1EC74E9FC5EEA090E8DDF4BDB64861C7DC3F8EC7E64286EC2FE39DA55B4763C582DB48146521BDEF0146D5022B1E559EB15755298408E4E4C6F4791BF075C7A8C9B3C7F5B7FA3E8C322BA0A160C09A9DB6BBC4974BE0F877 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1536.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1536.dat deleted file mode 100644 index 8e10d134..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig1536.dat +++ /dev/null @@ -1 +0,0 @@ -3082014D0281C100E2A6788AB3CC986AEC06C51690143D3677141645D0628165EE924B9AFB7E6EDD52D90145B2F6031522C7A6CEC05E358F42B7837DACEA589F868F8DCA1C0F5FD8E5EDB8BBBAFCFF6D64CFCFBE68F46FBA6EFF45BC9D0CBB4F7F6075F5FFC2049C2F304B51C417764E18D182926E02D4116CE5C5C010E3D0AA6872A49B0D1FF4B37D54689C31F5821D04E9D4DB34D7536EE7F88B8C481B0EC1F93193A0B70567E6FD76E9FAC4F67BB47DACD356D0C8015261E068DDF8C34C0CAFCF3FA775577FEB020120024100FAF0F292EE96D4F449024F86C0A104E0633C722586EC00AD33E0234629825D2081BA337597889CAC55DC6BEBDD8F13FE3AA2133D6371601A37D195DA7BC45EF3024100EBE16F88887A425AA08E271467CC2220DC44012AB24ED4FF3512A96E8CB600C8BBCB771459FF0EE63D4B6786952A83A7143A775073F0A1D69B6D0B5817755673 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig2046.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig2046.dat deleted file mode 100644 index 1c318540..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/esig2046.dat +++ /dev/null @@ -1 +0,0 @@ -308201B70282010028B1F9CDF87EF6D74F3AC2EA83C17CE376215FB2B3B4817145F1A137FB86B0F7BF0F9BA1BDCF7CC15DF1884DD1B150A983279B90F7A1E4392CB3C16390771DA5668E68621C3898DF66BD254F3787ECFB64B3435E707D5C237A6C09F407D8CD618CC3BBFBAB3DEBA38A0D1A88B2A4E09AE32FF2064EF1896348D5B83047EC2E079D85662EED4A66FBB9C159A617EE3C333BAED66989740F54C3CB336C0EF71130786E70648F2698F4F4192DA06C1578FDB065F8E320EFB63049E4BA664F215924B3E89F69131C5987F357C54593BE173A7AED2D37BE69F90CB574EF83AD49145EB15950FADE9E848DA83BC2CACBEDCAFC4A3B31BFFBBFC4DD03B8E47A218A51410201200256033F9C3F8BDDC021503A687BEC90438F38FF9C0E4C050DD95E46BACA370F478B843611A94BC37B5E838AABFD4ECCCE757BAC967DF8A7DD219B3A71A4DA64D54AB367622B7EB9B4282E898755F02036E91D2A12C81F41025603DB3DE2AE2B52889148C98D68F2B7606B0E5112E60E6A6FF5FD98E5D74143C000B43BEC77082F17C1EF4C82127010B12438D498AAFE8521E21EE6391627D464B54D1BE31F57FFF18C27EC38F08093EA65139A61A2C1 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/gostval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/gostval.dat deleted file mode 100644 index f89c98bd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/gostval.dat +++ /dev/null @@ -1,23 +0,0 @@ -BE5EC2006CFF9DCF52354959F1FF0CBFE95061B5A648C10387069C25997C0672 -0DF82802B741A292 07F9027DF7F7DF89 - -B385272AC8D72A5A8B344BC80363AC4D09BF58F41F540624CBCB8FDCF55307D7 -1354EE9C0A11CD4C 4FB50536F960A7B1 - -AEE02F609A35660E4097E546FD3026B032CD107C7D459977ADF489BEF2652262 -6693D492C4B0CC39 670034AC0FA811B5 - -320E9D8422165D58911DFC7D8BBB1F81B0ECD924023BF94D9DF7DCF7801240E0 -99E2D13080928D79 8118FF9D3B3CFE7D - -C9F703BBBFC63691BFA3B7B87EA8FD5E8E8EF384EF733F1A61AEF68C8FFA265F -D1E787749C72814C A083826A790D3E0C - -728FEE32F04B4C654AD7F607D71C660C2C2670D7C999713233149A1C0C17A1F0 -D4C05323A4F7A7B5 4D1F2E6B0D9DE2CE - -35FC96402209500FCFDEF5352D1ABB038FE33FC0D9D58512E56370B22BAA133B -8742D9A05F6A3AF6 2F3BB84879D11E52 - -D416F630BE65B7FE150656183370E07018234EE5DA3D89C4CE9152A03E5BFB77 -F86506DA04E41CB8 96F0A5C77A04F5CE diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/ideaval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/ideaval.dat deleted file mode 100644 index f7cd6fe1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/ideaval.dat +++ /dev/null @@ -1,11 +0,0 @@ -00010002000300040005000600070008 0000000100020003 11FBED2B01986DE5 -00010002000300040005000600070008 0102030405060708 540E5FEA18C2F8B1 -00010002000300040005000600070008 0019324B647D96AF 9F0A0AB6E10CED78 -00010002000300040005000600070008 F5202D5B9C671B08 CF18FD7355E2C5C5 -00010002000300040005000600070008 FAE6D2BEAA96826E 85DF52005608193D -00010002000300040005000600070008 0A141E28323C4650 2F7DE750212FB734 -00010002000300040005000600070008 050A0F14191E2328 7B7314925DE59C09 -0005000A000F00140019001E00230028 0102030405060708 3EC04780BEFF6E20 -3A984E2000195DB32EE501C8C47CEA60 0102030405060708 97BCD8200780DA86 -006400C8012C019001F4025802BC0320 05320A6414C819FA 65BE87E7A2538AED -9D4075C103BC322AFB03E7BE6AB30006 0808080808080808 F5DB1AC45E5EF9F9 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc1024.dat deleted file mode 100644 index f81dea0c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082015202010002818100B7FE59813AF3A5DA48144EF03E5D229E3CFB55B0E3CEB63F9F973AC8655651409C3B36BBBE83698516F42A2E0FDC87DD83541697249D67FB5A91FA73470089C4997667811283CF22C74856F1E71129DB70FB23620A60E532B7931B7F93C0B9AA6B9D60E87529002BF2204B743773F501F6C370D067C7B22F6AD9DC07E8097347020111024100CFEA6177386C04D1668C984C39A7F889B36BB2B3BED2C7B83241D267F8D2038529AEB56D82CDE43264168873375C8D1F0897666CCC3F617C2F6B52E5143303C7024100E28BAB645993166EE1A984967AE8839EA41685F1E6392DBEB83EE6CA85A54396505DBD4E5C9024BAFCF27AD24D571DC6A3795CE7F0432669BCE742AF8FAF1481024078C6F402C266595B4F85098370528C2C0309BE93F6C45FC049F6AD987471A979FE215CC41455AA85F5A5B664F59E2F8E33C97C211698D14AD05FC65044F99510 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc2048.dat deleted file mode 100644 index a4b3cefb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/luc2048.dat +++ /dev/null @@ -1 +0,0 @@ -308202960201000282010100EF8E1C8C8FB330A26C2449F1A50F7BD457D131C66D3194ECA20CE06138CC95CBE32E1DF910E13FF2D74823363286E3461E4BA3037EA32D4728F262C2364692E5948B8577F651292D72EF42445C2AAF11A526D2235DCE172A6E762EB86178BB5B4A06B8736567DB1525C8BDEB7242C81CC9090F5EF7CFC193FABEA3E5B5407E7DFDDF2D557487C65302148969F28DEC68AC3166FD52D44F1DE2EA74451A4BA0508F09E2F4AB85D89E7D68EEE4E8F9BD5A4858BAE8BF36E3A31FF06DDECDD40AE70932ECD09B65617B3208FF203EFBB0D822CDC1887EF343EBECBB762FA9C5D9F9339C80C96D6F3D8E4F7298FF6C94581C3CBC21C8CA94015F2E48400C0556B70502011102818100FDAD5D856662FC0284BEEF8470DC328B3B853F5819F037EBC786EB0225FD5C45B5BF99073F6E6CE31E4D1BC31105A4BAABA3BEC3C28F40E5912E7D3D6E6BE6178164E52F615C65FED1AE61D9D8F858282AF3C59C25A650A9CA72DD2105D95219CFEFEDDEB067647FDBABB659FBF2FF82F33C1A3A8BA73FB5F3D0C5509DFD38FF02818100F1BFA4A7A9506E020F9A57019F4326AE3D974DE9CCEF9BCA284B313DE287378411BDF1C9A1859D9165604EFF2EB1C9A685C0B317A08CF50E5F45AF570EE2C79B35BEA60B38109B4A450E87811CB10D6873F50726248055FE645C5C74FD0482F22CB541D77ED93F8B44CA72C9F550331C516BD061816325F9EF543C4995832BFB0281805184D4DC8796329003CF0EDC79048A12C4C78A1F44D8DE37A5939776A4E19CAA1ADBC4B78BE72EF23F1A5EFFF7377439138ED19D166285D1325CE6C2A7CFA182BDD7B82B2AB63A041C80B17A4D78161C240EDB2D6A494BEB27D28168E02DAE83C50C01EE8384E31111B756DA9B5423A6817F9078E8A750D0DE2CE62CF223601D \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc1024.dat deleted file mode 100644 index 4366892c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082013F0201003082011706072A8648CE3804013082010A02818100E16B572E39DB4D90689753D09CEA97B9CAE9C0AF04203AE5BC7FC985B85D5BB50B1EDEA30CAAD003B455640FEEA79E342F3E8CFF6761051B38D6931A2B0FD0DF8E2210E7DA74CAC5DC1A79D80CD8C0F9FC09D81BAEC94E2F3663F25B0140DF6B3D5AD04CBA27BCF24A92963319FB992E39544370FD28642FE07EB17EDA4D47B902818070B5AB971CEDA6C8344BA9E84E754BDCE574E05782101D72DE3FE4C2DC2EADDA858F6F5186556801DA2AB207F753CF1A179F467FB3B0828D9C6B498D1587E86FC7110873ED3A6562EE0D3CEC066C607CFE04EC0DD764A7179B31F92D80A06FB59EAD68265D13DE7925494B198CFDCC971CAA21B87E943217F03F58BF6D26A3DD020107041F021D03BDAFBB087B5A628730212217B01F15B303A0133D6AF4FC3CAF7286A8 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc512.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc512.dat deleted file mode 100644 index 9c2cf1ab..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucc512.dat +++ /dev/null @@ -1 +0,0 @@ -3081B302010030819406072A8648CE380401308188024100B89A4AD4826B8FDDBFE3A6C0F5C8F805B7093AFF9BB2BD697C7D113C236BAC99ABF69000E169575CA2A2DDCDD1C7D9D06C63DCCC880121D933DCF598DD85C52102405C4D256A4135C7EEDFF1D3607AE47C02DB849D7FCDD95EB4BE3E889E11B5D64CD5FB480070B4ABAE51516EE6E8E3ECE83631EE66440090EC99EE7ACC6EC2E291020107041702150268EA4C567B18D0E35B1DA9D517CE5D359CD06779 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd1024.dat deleted file mode 100644 index 7c2c79f7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd1024.dat +++ /dev/null @@ -1,4 +0,0 @@ -30818702818100EE9C91E2C1D8B0AB999B3F32B3115A36AA95A36B23CC8507D2340FA21EAAF6F6EB -1B900839CD9F8AFBFC155467F91FD8917DD46EAC55A266B246DFFFEDDDA79D674F77884D34709DB3 -452C2C1E2578CCC0CCA91C504039C52762F23F2A391A58B2CAD2DB05666DDF5B9E3C1AC33DB487B7 -70C82B7E7DCDEE4381562FCEE427FD02010A diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd512.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd512.dat deleted file mode 100644 index 9c97005b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucd512.dat +++ /dev/null @@ -1,2 +0,0 @@ -3046024100C339D027E5812ED5D9DE044F3697D0273625E5EA9EC4EF3FB89ADBFA9CD1FBF4D8C0EC -1118C44609F499EF644EEAECE2F38B3F67FAC81A075F31A60B5757A87D020109 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs1024.dat deleted file mode 100644 index 13931998..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082015B0201003082013306072A8648CE3804013082012602818100D57B7B758DC8041CE6CFC57DFE0AAA33FC8FEC48BEEA37562AD13359236FFFF6EED3CEB3A7BBC4269A384ED9A296160F12BC666066548E28201CE293B1791F951C8D2C5965696D82B336EFADCF1E0D619EDA43DBB86415BF3EE6F721C0AB17E770EA7B2360A054D3E4E878647245FCF87B2335098303004CDDC2B9DCDA57DB51021D034E48F160EC5855CCCD9F995988AD1B554AD1B591E64283E91A07D151028180017324ADC1F93CF002FA2B0619C60F897CDED488E457685625E1565377483C0FA4A7FD1CAE848C727E76654434CE3CCAF81EC6E6AAA156EEBBEA095F642FD0DA2D043996ACC14A1B1A6110B19C094638E29890B89AF5812E97C5F96F33B1FD7415079947994442295CA34447807662FB70621F069A98AE274D01B2777BF4E97E041F021D00F9F02A2BC1930F1AC93198F3D532BC937941D7C9A1E16F0EB932476E \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs512.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs512.dat deleted file mode 100644 index f8fd288b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/lucs512.dat +++ /dev/null @@ -1 +0,0 @@ -3081C70201003081A806072A8648CE38040130819C024100E64283E91A07D10F557B7B758DC8041CE6CFC57DFE0AAA33FC8FEC48BEEA37562AD13359236FFFF6EED3FB921690D2FD1339F8E1DD406EED70D7EE3085E3AADD02150F4E48F160EC5855CCCD9F995988AD1B554AD1B5F3024062503DFB092F0FD0D8BBD90B50A834A6BD5B0995BCFC1CC8C8C83103AA6837F3FBFF3E042E1B25E36963DB2FCFD7AD24A6626E65A1F6EECBB399F5CE73659F29041702150450A037413E9A711E601318AF21D32A498C0C501E \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/marsval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/marsval.dat deleted file mode 100644 index 661872fc..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/marsval.dat +++ /dev/null @@ -1,9 +0,0 @@ -00000000000000000000000000000000 00000000000000000000000000000000 DCC07B8DFB0738D6E30A22DFCF27E886 -00000000000000000000000000000000 DCC07B8DFB0738D6E30A22DFCF27E886 33CAFFBDDC7F1DDA0F9C15FA2F30E2FF -CB14A1776ABBC1CDAFE7243DEF2CEA02 F94512A9B42D034EC4792204D708A69B 225DA2CB64B73F79069F21A5E3CB8522 -86EDF4DA31824CABEF6A4637C40B0BAB 4DF955AD5B398D66408D620A2B27E1A9 A4B737340AE6D2CAFD930BA97D86129F -000000000000000000000000000000000000000000000000 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 97778747D60E425C2B4202599DB856FB -D158860838874D9500000000000000000000000000000000 93A953A82C10411DD158860838874D95 4FA0E5F64893131712F01408D233E9F7 -791739A58B04581A93A953A82C10411DD158860838874D95 6761C42D3E6142D2A84FBFADB383158F F706BC0FD97E28B6F1AF4E17D8755FFF -0000000000000000000000000000000000000000000000000000000000000000 62E45B4CF3477F1DD65063729D9ABA8F 0F4B897EA014D21FBC20F1054A42F719 -FBA167983E7AEF22317CE28C02AAE1A3E8E5CC3CEDBEA82A99DBC39AD65E7227 1344ABA4D3C44708A8A72116D4F49384 458335D95EA42A9F4DCCD41AECC2390D diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv1024.dat deleted file mode 100644 index 415377ac..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082011E028181009A21FC66469293103CEF66960B17880F905C738DB692B7481922FC2D454D14067C6BFC158B93FCC1B8D128D4D86D893082F8A3592238EE8B693B6245F26F55968D7D13752D6BFBA271E8E36E11482815D887BB9F6B600E820E7E2AF2EE6ECDBC1CB35B12A4EF48A8907C090482DE7D49B751BB3A50F78BE29506114BC85D3A6102150C896422EC558A74B883BA85E2F10D4A58F28D2B09028180350C4BB19C0A9B224E5E1BACCC1B1952A97628021B4673831C851C3280F06D3EFA73DAE27E5D4E4A0499E0B2B9A369649E883A1F260EF250B5CCF3E3C922332B210EEA07D3BF92210BA7A7374A30DDDE3D1B3D575B77CD36B001EAE4A2A3BFAFF12FCE74F3330B30ACF6DCFF580ECBFB5B00FD5DD2B8EA9DB09C7E1C7100BD67 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv2048.dat deleted file mode 100644 index ef324566..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/mqv2048.dat +++ /dev/null @@ -1 +0,0 @@ -308202280282010100A5C07CE5BF0894C0BA8752F4D9A6D0BF6556D325B618A655CCFE3EEC85B56D47DBDF5A9A5C8588AE6F4C44BBCB339E869A21BE057A243DC797B912C547FBA359C4FC9965C72278370AB6C0DD246197A8D83A08C69425786482D1744C41FBB3C36BEA5963C05B0778AAEF9230C3E2E12072268038E5ADB6433542F94D8C25A6A1785E4D2D97AF119F2139E69AECA46F11B344785A0B1B280CF8D678AB9627780271A350A9B15B92E105F14733C5F15C1753F7C48A645FAAAC1BFA266B5AD6F7C46350465DA31150ABB10FF63FD6C01C849DFCD5645C5D1AF8B967372449DF90D02177E12439BD36A1EED1FAEDB8166927F755B71A5368CC27CD00AB5CF04601E7021D03134944D9AA15697107F48AC5621A1531649AD5EE8EEC1D1F282B5481028201003468652FBB1E3C7F2FBB99A89EA14FB9205F534943034CDE9D9CC57A790D9713EC7B21032EAA8ED2B24FFABD612EDADFC9265964C753AE276380294D4D16C63389A4C392A0058EF1549F6C0D13C4A09759C67650A51F7362B38C61AF2942A6004BB8C3CD4C489E66DE1567E2306821788A519727CD27945DBC5778AC6E8B1DFC05573D76DF9E9AA4F1CE657A2A07BEF833091614C0A6065507BD51099C54148327903626DE6D01FEC9A7F5F9A901C90E219D452C2E2A90AA2303A52776EF174CC85C1AA4F28924B1DFF3E3C5538D820A422374DCFB0D14D620AE282A72416C6506F02D3ED1E6208F66B9DB49294D8D605D7D146BB6A970211289B1BE7AB12531 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr1024.dat deleted file mode 100644 index 6778ccfb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082014C0201003082012C06072A8648CE3804013082011F02818100F89F4EBE58E222B517D218D615BDC00611501CD18417886BD3FCBD22578C4611B1E8C06EB0FE9D473A5589BC277AA58C1979DC2869B728D78EC38B4C044A790A60314E7BD3DFDC0BBD8B770A9271D7D048F3E13C73866D096C7304782125847C70EDD721B36F1C379CF7CCEE0A728DD66336ED5F93E8A1BD3EDB22C8761EB987021526A578AB11C3A0812A636D24D120BE544B7973E4D302818100BF927ACE4D175A44622494E37F9552E97B74303321FFEF9B76CDECB14F7D612608DDFEA77C04A8FCACCF7F16CB01AE05AD5EDB65C3B9A380D720F34C7D96C8817E2EFF7D0049EE149DF61C52D7C80271206155CDAEBC8A7F4A8DCE5196E3C18FD5EDF11A394C43A5D59BC65D976817438CA0A7F01713548F61355E976DE75E1E04170215247B2531CFF01D1B1665F0CFD2A836446798353330 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr2048.dat deleted file mode 100644 index d9f11f16..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/nr2048.dat +++ /dev/null @@ -1 +0,0 @@ -3082025D0201003082023506072A8648CE38040130820228028201010083C69F32A1F3A67B201D7A92BA204281681DAAD29F50BD866D70A2E01438653B18602AFE606AA925389381682EC0E2CE5D5D366793917879860799ECEDDB4831ED4A4E76D9C34FFDD0BC786588F00E8A19705B997C4298F9CAF9AEE46E0A5677AA1240DC141BD78A8720A829F64C912FA3D961ADE698C5344F18FE4CE70CF7B94F45258C6A9553830FFB80B6BB7E1C510D4526C1904C1D6E2F1B8C1CA6499DBD291438717131804FA2F5F42E5C06293D6DA493C88A38EBC6A6DCF40B2BAB0BF7C7FA0F9C070F1C48FD12CA2B7337E9C58EB9AFDAC6FEEAB0BD62415B26D405D6BF47F11D70B1740BC398A76BE70723A829082EB548D35F4D78E4E015DAD12D5B021D083118E4DC11622CB53E7E4D7634BFBDE45A2D8F8B097A251803505315028201005BAC6CBFE089F75274A532564735786477478F19BE099AB38E0F843393D6D81964CBCFF4B68C5DA2614F06BB844672288F0A65216954990051BA691CA6796AFAAE91A79350F53D9DF3CC688387306EFFDCEF70A14A672E2103B8C861523703157D05DF6EB42DCD81506C88300ED8D8ED40D41AB6D669D309C976B84D82C8D18747578358CBA1EF4B00118B0DEEF11409DD8CB0D83399A33E10C18249574FA2242AE4241CD789C891FEC1C63771EE4517274493240EDAAC44AEDC42F318A5122B052244DFA9A282B8D94BC4BAB360D44E4D0204F8D28817B5B6F808047C92032AA94926D697CFA2FC211FAAE26A5F1FC2B1EB03DA68AD5E01EAC489FB64A66EA3041F021D042ADA16929DA18A7A3C8FDCDD8FC46A6D8AAB79FF33D60E2BF09DEF4F \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi1024.dat deleted file mode 100644 index ef841375..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082015202818100D132EDB1360E31D7B8DD84BB03111FDE0243FFE4031ED12B440E7FF36A634E57772EC81FFDC065607494717C6E16A5AB642283553442CC22569535C7A20E3D1C3E2B3747B26E9856D4A13D0325DC116DAAF8554B000321A753E5CFA730CA60F3E3FE2CA9750C6734A2A113AD4A76B6DAC5E199AB55F34CE6984BF56F6DFAC51D020105020102024100F90CBF726FA70ACB5074BD8E79932B74E9949057B627ABB29F41E5057AE699A03BC240EBB9637E956ABC0B6A20F633F78168A908086E2011FC5D030B9B94B51B024100D7097ACACD8BF8ED641A7D8A17A23F8FB385B92B760EEEB9A1233E1D25892F742315DE23DA0751F24EAE4C0C5B696D0AA0D16EAE94194193DC89D479A9626A2702403B5475CD2A7F519EF08433407826D89983C104AF1E74B44B79B31770149D224089300F828E0DF4CBC864BDB394C0F32CCF055F7B2B8872BF0B5F148020637B9C \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi2048.dat deleted file mode 100644 index cb638ef7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rabi2048.dat +++ /dev/null @@ -1 +0,0 @@ -308202970282010100B8F2A74040753A7706CB98B80DD9EE33FB7969FCA65A2025E96853267AEF80ABB184FE463B9475F5166307FAFA988F6CA4BBC7122E9555755191AA408BAF4464221394342104ED2762EEA4FED8B5CDB4234442AB979A487446AB37C4A4FD67C259EB942E28B50DD54F3AA14447931821291D4C21BB8BD58C41302F3E1D2E6FF84F84AACEC02196282C492E0354985A66EBA50B1903EDF70D98BD9837E694876505760C58C186F0B5F6500711500297956C9825EBDCCF90633239484F9A3572271D3CD585BFC195BED0D5FFCABE785B25BFF6ACFF2B7C125D54B26CFEF60B1B077B2F953960DAEB57F102B6A1E30AA88B643090BC4D8971077C1B54EA61E4E45102011302010D02818100D02603BBFDB55F1063DFCEBB4CA32F551330E0F2901D87DF2A395EF6AF340F6352CE3514FCE85705652DC6BD401CD0D5D13855B124DA172D5183A7474B85B683AA03382775F3D8DC600F33E696246F9F2134E2DA061923F47B85A923EBB375B07DE3B43EE4FD71D3E24B4B416DAE6E4C2B6D32A9B45BF04296AECAD60C33DA0702818100E3773B5D8B828BEA922392100C54CDF41D0CD26B4C34A64F483B7975AB35920DA0E3F6AE238E72E26F8A498D9AD0C4A75C52F25421E1E2E3865ADD1A0FCEA4DE932DBE6EBEFA689494855B11714B960F57C5102C0E8876D253ABA8C2D6A511DBC0F30589A0FBE66AD6BCEFDFC4F67F8347726A52736274B7F744ECACFF6198E702818100BF84B25DB607930F80ED57C7AF89E7604B7E8E0D341C9C4A0C94FFE6D4B38810553B1E92F7BF9651D3D0149A9188E1FFD1FB86753A327ABC6169AF92271E7204A2C76488FBC781984BA99C3C48C8A799054DA34A201743C3064B4609831B35FBA2B8B1BC67FFD0C685DBA92FE688AD51D1F161C06EC0B9E0D0E187863BFBBEC0 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc2val.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc2val.dat deleted file mode 100644 index b4f82a31..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc2val.dat +++ /dev/null @@ -1,48 +0,0 @@ -08 -3F -00000000 00000000 -00000000 00000000 -ebb773f9 93278eff - -08 -40 -ffffffff ffffffff -ffffffff ffffffff -278b27e4 2e2f0d49 - -08 -40 -30000000 00000000 -10000000 00000001 -30649edf 9be7d2c2 - -01 -40 -88 -00000000 00000000 -61a8a244 adacccf0 - -07 -40 -88bca90e 90875a -00000000 00000000 -6ccf4308 974c267f - -10 -40 -88bca90e 90875a7f 0f79c384 627bafb2 -00000000 00000000 -1a807d27 2bbe5db1 - -10 -80 -88bca90e 90875a7f 0f79c384 627bafb2 -00000000 00000000 -2269552a b0f85ca6 - -21 -81 -88bca90e 90875a7f 0f79c384 627bafb2 16f80a6f 85920584 - c42fceb0 be255daf 1e -00000000 00000000 -5b78d3a4 3dfff1f1 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc5val.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc5val.dat deleted file mode 100644 index ea2b617f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc5val.dat +++ /dev/null @@ -1,5 +0,0 @@ -00000000000000000000000000000000 0000000000000000 21A5DBEE154B8F6D -915F4619BE41B2516355A50110A9CE91 21A5DBEE154B8F6D F7C013AC5B2B8952 -783348E75AEB0F2FD7B169BB8DC16787 F7C013AC5B2B8952 2F42B3B70369FC92 -DC49DB1375A5584F6485B413B5F12BAF 2F42B3B70369FC92 65C178B284D197CC -5269F149D41BA0152497574D7F153125 65C178B284D197CC EB44E415DA319824 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc6val.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc6val.dat deleted file mode 100644 index 3efa3c9f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rc6val.dat +++ /dev/null @@ -1,17 +0,0 @@ -00000000000000000000000000000000 - 00000000000000000000000000000000 8FC3A53656B1F778C129DF4E9848A41E - -0123456789ABCDEF0112233445566778 - 02132435465768798A9BACBDCEDFE0F1 524E192F4715C6231F51F6367EA43F18 - -000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 6cd61bcb190b30384e8a3f168690ae82 - -0123456789abcdef0112233445566778899aabbccddeeff0 - 02132435465768798a9bacbdcedfe0f1 688329d019e505041e52e92af95291d4 - -0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 8f5fbd0510d15fa893fa3fda6e857ec2 - -0123456789abcdef0112233445566778899aabbccddeeff01032547698badcfe - 02132435465768798a9bacbdcedfe0f1 c8241816f0d7e48920ad16a1674e5d48 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rijndael.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rijndael.dat deleted file mode 100644 index c3e43f04..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rijndael.dat +++ /dev/null @@ -1,9 +0,0 @@ -000102030405060708090A0B0C0D0E0F 000102030405060708090A0B0C0D0E0F 0A940BB5416EF045F1C39458C653EA5A -00010203050607080A0B0C0D0F101112 506812A45F08C889B97F5980038B8359 D8F532538289EF7D06B506A4FD5BE9C9 -14151617191A1B1C1E1F202123242526 5C6D71CA30DE8B8B00549984D2EC7D4B 59AB30F4D4EE6E4FF9907EF65B1FB68C -28292A2B2D2E2F30323334353738393A 53F3F4C64F8616E4E7C56199F48F21F6 BF1ED2FCB2AF3FD41443B56D85025CB1 -00010203050607080A0B0C0D0F10111214151617191A1B1C 2D33EEF2C0430A8A9EBF45E809C40BB6 DFF4945E0336DF4C1C56BC700EFF837F -1E1F20212324252628292A2B2D2E2F30323334353738393A 6AA375D1FA155A61FB72353E0A5A8756 B6FDDEF4752765E347D5D2DC196D1252 -3C3D3E3F41424344464748494B4C4D4E5051525355565758 BC3736518B9490DCB8ED60EB26758ED4 D23684E3D963B3AFCF1A114ACA90CBD6 -00010203050607080A0B0C0D0F10111214151617191A1B1C1E1F202123242526 834EADFCCAC7E1B30664B1ABA44815AB 1946DABF6A03A2A2C3D0B05080AED6FC -28292A2B2D2E2F30323334353738393A3C3D3E3F41424344464748494B4C4D4E D9DC4DBA3021B05D67C0518F72B62BF1 5ED301D747D3CC715445EBDEC62F2FB4 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa1024.dat deleted file mode 100644 index 70fb1724..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa1024.dat +++ /dev/null @@ -1,32 +0,0 @@ -30820274020100300D06092A864886F70D010101 -05000482025E3082025A02010002818100A39D4F -72D1BCFF65A47545C2897C0464CE9181E8703421 -2EC04407C4C24D569AA20C58B8138C85E17510BC -6B861CADA9034C3ECE3B050B546E97D2BDC07A07 -CF8A612F7D3646739633041893EF18C411264E45 -C9E033A1BD5EE5FA02D95E9A9ADA2D0C6DF480E3 -2FA3FCE02889798455CE53F084AAB4C5549266F7 -CE8C77DF1D0201110281800E6FC33ED64561D443 -378627C0D63C9F7BA36D584622B7A23E241ECD98 -AC78952C6A804C7A320BD020EAE372E62FB4F853 -1D50D5F6261796823A929845B06A19B35A5227CB -C819852A9CBE588CC2D1CEE07F426D13C2BF2FCA -1C99FDEEFDFE387859E2B3F654E85A71481A71E9 -D5256583B1200F29C1AA0F437CFDC2AEAF218102 -4100D5DDB104AD074F6C1B8192D9AC8AED4DE05C -F5C6509490DA8CCFC91FDF7B3A1323E03894DCAA -B2587716D652A56904F86244E10C1B8FA597C389 -2591C55DBD65024100C3D930B583B8AD9A349218 -795C988CF0004F09DA04FFEF6FDF7CB4FA654F74 -B262521FE185693CD6290A337589F62CDEECE24E -CCB5E79865275540F3B603FB59024064A48F89BA -D6437E2B0FCCA2AB8CABE86995285D5318BCA315 -167CC3B47639726B3C56DCA41417B128FBB026E4 -6DA7FC6A7AC441EEDA2FCEF29AE480D5594A1102 -40228FBD4D355CD35772B05EAC014818DF0F1D01 -BD0FF0EE04AEF7E3B3B7867E015CA514AF53C746 -F89DD49FAB5494DABDED9159332F28DEA8705A56 -C198974A79024100D1DCA40FBD19036F0E2A9438 -7D03C090DDF0A677CDE0B8634A81F247752A355E -C1CEA2482A4887767145C2BA703C9C10228FDA1E -BB2EBEA73D23AA9C34182179 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa2048.dat deleted file mode 100644 index 83200c27..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa2048.dat +++ /dev/null @@ -1,61 +0,0 @@ -308204BB020100300D06092A864886F70D010101 -0500048204A5308204A10201000282010100BB25 -80EB6B368287A0A3BDDF6AAA9EDA2EEF15D92C5F -E0B1C21473175C39B685A6FB0B0DB611092C19B4 -FA3CA5BB20F311E35B2E1097F48B077DF7684BEB -9A34EB78C7B5F02ADFAEA3F3A66F1EF91B0C47DE -68F0501F80A7E9603F794E928949F152C049A011 -D7E58C72F9303781E4FE7129DD7B87B5448D440A -62CE8E9C801F245039E2724A9C37CB17457950B7 -B3C4C9BE4D17A29EFC1EA1EF464FBD21DABE9F10 -ED0EB132405D68E4304008083BB675DA97CB6219 -147A1EB93D38A9C4023540F871272A85B45447B3 -6DE9A708E412CD31B1CB6470E4A37CBEA6000F36 -632DF86FD3C34466C63BD80F1350E4DD5081597F -F34F94F07AE6430DCC0563B1F7CF020111028201 -00034D763A5DC03580E33616ED5ABABA855B2E62 -4495DD8D002009656B5473772C85F55F10CE81CE -77BE31E04657410B1F6535B4CF1E6914E152F4AB -84DA2FD409F81BBB3DF0A96A58EACC9501F60162 -5C1356BF97D139C78A7E18496708EA7DE7B47266 -C81363B3FF888085E7403A028901FF3BA04C2EDE -930EC0EFAC4DCF8FD054C1119562A1C7CA455D79 -36CB95A16CE611ABC97918961DE6720CE171CC69 -A590E9A041EC1DAC6FDCF2E04946C100E03DEFCA -29FF480C926CD48589EB832D4476CF38AB320754 -D97BE77FDB9E5F2DCA1A2ABBC33D0790FE8C22CF -694BB8E0265733A5A17CC5D07DB54515DC80216A -A23A43EB12783888FF424EDB26FAF7DCB9028181 -00EB4C87F67AEA3F2047BF9DF61947DF2BA7E1C1 -64A03A8E3ED5F3BC6CDEE99FC6251C6A28F9502F -0A4B5A0CFA8038A12A2270AAE2C9342EDBA207CE -0F170B6D07550670CFEAE730B9411E66CD2D485F -3FC3E9C5348D32C768F68A53C756E66BE0FAC7E8 -FDC9FBE22644961782DA5DDC19D75B64D2E8B660 -052DDC95AD186633E902818100CB9C7830223B78 -FC28A6D2B77C50C3D389F32FC4DEF33341741205 -5102F8D852663DB44E1EA5E5E58A71D30D33C168 -E94855D79CC19CC7DFBAFBDFF7710490064A1375 -1CD75466219956B9D4C0AF0CC13E7D075F54E6AF -8CD67FBE3F4AB90425B039410686A168421E2E24 -FF0319D9D3F1C685BB650BC7B5BD12090CBDC392 -F702818060E3470B238DA185C330C89282E15BE4 -CCA84092D89094ECB2736BB45BC99C2469A249D4 -A2E4C8134C34237634CC06206888BED5DA60C800 -158ABE4272E6964E502FD41960B98C888439B1DC -039645567DD8BA9D2B14E8B2BFDE9AF7BA5EE120 -674341D1E9C211D385A736DB871796DD76CB47A2 -239663C5E5B52E9291937EC902818053D704500E -187D1C8935A20F514E6EC08418D76F2EA060663E -DA3E6CA6DEEFA97564B3A7B2444F9AC08938C933 -6DC1C9782358C8137CCAC5893A8965E33E1D2FC4 -262129FE4FEDD1997E10488B935F9ADD7EC6CCE6 -B957581C167B83791F01B52A71ED99467EB27593 -F4E20EA6EC86DECCF7643E1A8C614AD561C77DB7 -8CC40B02818100AF950A287679E6C55020400E8A -AD0642DB1C11D9AD5AE85F1B6FD2829D869453C9 -F67C0210D0847A4BD47C57FAECD9BE540BD66989 -E6C43F62D725B3D841B4F1DB7C28A722337358C8 -D1CD55F5CA6E31FAD6F827756BA074944D345C8D -2FCE759F4244B948D06F5AC863DEAAEF279B2F69 -955ADAD1F39DEA9DA028B94EF22F11 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pb.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pb.dat deleted file mode 100644 index ccbc6ae2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pb.dat +++ /dev/null @@ -1,10 +0,0 @@ -30 4c 30 0d 06 09 2a 86 -48 86 f7 0d 01 01 01 05 -00 03 3b 00 30 38 02 33 -00 a3 07 9a 90 df 0d fd -72 ac 09 0c cc 2a 78 b8 -74 13 13 3e 40 75 9c 98 -fa f8 20 4f 35 8a 0b 26 -3c 67 70 e7 83 a9 3b 69 -71 b7 37 79 d2 71 7b e8 -34 77 cf 02 01 03 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pv.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pv.dat deleted file mode 100644 index 2a731234..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa400pv.dat +++ /dev/null @@ -1,41 +0,0 @@ - 30 81 fb - 02 01 00 - 02 - 33 00 a3 07 9a 90 df 0d - fd 72 ac 09 0c cc 2a 78 - b8 74 13 13 3e 40 75 9c - 98 fa f8 20 4f 35 8a 0b - 26 3c 67 70 e7 83 a9 3b - 69 71 b7 37 79 d2 71 7b - e8 34 77 cf - 02 01 03 - 02 - 32 6c af bc 60 94 b3 fe - 4c 72 b0 b3 32 c6 fb 25 - a2 b7 62 29 80 4e 68 65 - fc a4 5a 74 df 0f 8f b8 - 41 3b 52 c0 d0 e5 3d 9b - 59 0f f1 9b e7 9f 49 dd - 21 e5 eb - 02 1a 00 cf 20 - 35 02 8b 9d 86 98 40 b4 - 16 66 b4 2e 92 ea 0d a3 - b4 32 04 b5 cf ce 91 - 02 - 1a 00 c9 7f b1 f0 27 f4 - 53 f6 34 12 33 ea aa d1 - d9 35 3f 6c 42 d0 88 66 - b1 d0 5f - 02 1a 00 8a 15 - 78 ac 5d 13 af 10 2b 22 - b9 99 cd 74 61 f1 5e 6d - 22 cc 03 23 df df 0b - 02 - 1a 00 86 55 21 4a c5 4d - 8d 4e cd 61 77 f1 c7 36 - 90 ce 2a 48 2c 8b 05 99 - cb e0 3f - 02 1a 00 83 ef - ef b8 a9 a4 0d 1d b6 ed - 98 ad 84 ed 13 35 dc c1 - 08 f3 22 d0 57 cf 8d \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa512a.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa512a.dat deleted file mode 100644 index e7edefae..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rsa512a.dat +++ /dev/null @@ -1,35 +0,0 @@ -30 82 01 50 - 02 01 00 - 30 0d - 06 09 - 2a 86 48 86 f7 0d 01 01 01 - 05 00 - 04 82 01 3a - 30 82 01 36 - 02 01 00 - 02 40 - 0a 66 79 1d c6 98 81 68 de 7a b7 74 19 bb 7f b0 - c0 01 c6 27 10 27 00 75 14 29 42 e1 9a 8d 8c 51 - d0 53 b3 e3 78 2a 1d e5 dc 5a f4 eb e9 94 68 17 - 01 14 a1 df e6 7c dc 9a 9a f5 5d 65 56 20 bb ab - 02 03 01 00 01 - 02 40 - 01 23 c5 b6 1b a3 6e db 1d 36 79 90 41 99 a8 9e - a8 0c 09 b9 12 2e 14 00 c0 9a dc f7 78 46 76 d0 - 1d 23 35 6a 7d 44 d6 bd 8b d5 0e 94 bf c7 23 fa - 87 d8 86 2b 75 17 76 91 c1 1d 75 76 92 df 88 81 - 02 20 - 33 d4 84 45 c8 59 e5 23 40 de 70 4b cd da 06 5f - bb 40 58 d7 40 bd 1d 67 d2 9e 9c 14 6c 11 cf 61 - 02 20 - 33 5e 84 08 86 6b 0f d3 8d c7 00 2d 3f 97 2c 67 - 38 9a 65 d5 d8 30 65 66 d5 c4 f2 a5 aa 52 62 8b - 02 20 - 04 5e c9 00 71 52 53 25 d3 d4 6d b7 96 95 e9 af - ac c4 52 39 64 36 0e 02 b1 19 ba a3 66 31 62 41 - 02 20 - 15 eb 32 73 60 c7 b6 0d 12 e5 e2 d1 6b dc d9 79 - 81 d1 7f ba 6b 70 db 13 b2 0b 43 6e 24 ea da 59 - 02 20 - 2c a6 36 6d 72 78 1d fa 24 d3 4a 9a 24 cb c2 ae - 92 7a 99 58 af 42 65 63 ff 63 fb 11 65 8a 46 1d diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw1024.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw1024.dat deleted file mode 100644 index dcd0209b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw1024.dat +++ /dev/null @@ -1 +0,0 @@ -3082014D02818100BECF1F40456801F6965E603BEBB61F530F0B17BBCB00E3A8866EB9BC84AE3892A4CB040280F568FC650B1734014CA78A200D5E4AB394CBB75C0034DCC47643E6F576A39F850C5F4528048165B084C82E9BA6BA4CFBCB3980F1EB47EC2C348EF52A6225A85AF743DFCEF5CD4583EB0B9C0DA77ABEBEB5BCC513D81BD768B579AD024100F06CA9C1FBE20EE2440F3AB2F9A9787D820943EAF59B6B8D103CFAB1C2F595DDC99D05DC73F9D1DB780B6F8B26CF87E58EB870DD983A2515600DF80C3EBB7B1B024100CB2B9BDEB0D508E21E646C86D836442FC16910D68C8D1D18BB1327899A506C16C1162E93EA7C2CB576B750AEAB152255D5AB22632025CFFAD927A070CBAEA2D7024100C90A853BEC7C25D773FDDB95C11CEF9BB3F487953773F07E42DB9D011325AE2725663478FB7F0EC1A5608280D9656BF3B9F463FF8B23F1CA1B543508D51826E2 \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw2048.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw2048.dat deleted file mode 100644 index 5547c88b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/rw2048.dat +++ /dev/null @@ -1 +0,0 @@ -3082029002820101008F2975B4DA54179A6C81764DB9E6B50AD925C91568DFE2C245DF9103AF39370BD5F25CD26BF6E41B6FEB0E24473BBFAE89343BC20743057B056BD2189C01258650567A3EC24040EED7EEAF94B77BDD39529807D1FCF5FF4A90E6B42BA58FF1FDCDACF981C641B8F077ABBB41BEFD53CCABF06745CD009A7F9DFAA61ED03F11466E4B5370DFA18C7DFEA1689B60F98012CDE9131FE86F74BFC6B93AC449DA73A2366EA2AE2233AFFBFF0CDE1899B1F852C179639B31CEE11991AA8D46DB5067B0C5FFB3D913612668F0C43CA134B11875F271C0BC8722AF4AD6CC93A43CE165EF31C1EB542ECC7CA1A38BFDF66F3A2175E4EA7159E168FFE3A549535B90C7BBDD02818100C5CEBA84E8B7C20BAA6F450000803F15C1160EB7E0875EBBC15F11DC7E3CAFE55973234FF4C74589406D2950B0C236ABE1B5A5B70D55C035F45D87AF089847C0E2A2DEF23EA4CC19FB5419DF43577523248BEF80B94C59F7342C717F12DE68FEEADAD97BA2DD436834D8559D0A7A31D6F9D9480F852C285EFC75BCA8AF32590302818100B947440D272629155C2B3E0E62B76124281155F7A189650D36C8F7D742F7DBC571ADDCC582ED2ED283C2E8A1CD8C996D3D8A50F33C56581285C5016A16DEDA533715DF519CAB7777F3DCB9F5335552F315B44FF8126DFDDF60B66850AA8FD108ED3A248D18E7473D7967F0F15C740C67476A75273DA254AE5C7B94FB059DD19F0281801EE99173837363981E0988DE22B2E36BFC9713EDC8454BF1CB764D767DFDA985B9DBAA346C0C39B1A9F83D849502AFDD80AE33F588C114BC4DE5FA949125FF56908F8C66CDFF6BF601F1CBF463B0C807DEABB1290C358FC0433ED74EBA074CB211C4D75538ED017F497C9722D8C3D3E082BB4A8A92D5768B5D5963BBDB1DB24D \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/saferval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/saferval.dat deleted file mode 100644 index cdcad06f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/saferval.dat +++ /dev/null @@ -1,16 +0,0 @@ -0000000000000000 0000000000000000 032808C90EE7AB7F -0000000000000000 0102030405060708 7D28038633B92EB4 -0102030405060708 1011121314151617 71E5CF7F083A59C5 -0102030405060708 18191A1B1C1D1E1F 356F702CC7FA8161 -08070605040302010807060504030201 5051525354555657 38E64DBF6E0F896E -08070605040302010807060504030201 58595A5B5C5D5E5F 7D8F014A902480FE -01020304050607080807060504030201 6061626364656667 113511C22E7936DF -01020304050607080807060504030201 68696A6B6C6D6E6F 9EEB2D17C0581437 -0000000000000001 7071727374757677 9ABE2C85BE2D7614 -0000000000000001 78797A7B7C7D7E7F EBC4A9C6C25CF215 -0102030405060708 8081828384858687 54E72BA2D744C566 -0102030405060708 88898A8B8C8D8E8F 57F55D0F7EB6F8FE -00000000000000010000000000000001 9091929394959697 9EAA4DF1E0EFF445 -00000000000000010000000000000001 98999A9B9C9D9E9F 4CC14838399E532D -01020304050607080000000000000000 A0A1A2A3A4A5A6A7 41246B65F1DC6AFA -00000000000000000102030405060708 A0A1A2A3A4A5A6A7 5CBD77B03626FE3B diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/serpentv.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/serpentv.dat deleted file mode 100644 index 06e863aa..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/serpentv.dat +++ /dev/null @@ -1,9 +0,0 @@ -00000000000000000000000000000000 d29d576fcea3a3a7ed9099f29273d78e b2288b968ae8b08648d1ce9606fd992d -00000000000000000000000000000000 d29d576fcea3a3a7ed9099f26d8c2871 563a8403ff5309d62370b1dcf5a11edd -ffeeddccbbaa99887766554433221100 1032547698badcfeefcdab8967452301 d5baa00a4bb9d8a7c981c8dc90d89d92 -ffeeddccbbaa99887766554433221100 145f0b8b663176b95dcab7e9dcd5cc24 1032547698badcfeefcdab8967452301 -000000000000000000000000000000000000000000000000 d29d576fceaba3a7ed9899f2927bd78e 130e353e1037c22405e8faefb2c3c3e9 -8899aabbccddeeffffeeddccbbaa99887766554433221100 1032547698badcfeefcdab8967452301 da860842b720802bf404a4c71034879a -8899aabbccddeeffffeeddccbbaa99887766554433221100 b2696bd0d98c17953e4239225d27202c 1032547698badcfeefcdab8967452301 -0000000000000000000000000000000000000000000000000000000000000000 92074732d84e1841a013a0034c52bf50 81c4eb7b8ad9a8d0f2aa5d7bd626b560 -00112233445566778899aabbccddeeffffeeddccbbaa99887766554433221100 1032547698badcfeefcdab8967452301 93df9a3cafe387bd999eebe393a17fca diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/shacal2v.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/shacal2v.dat deleted file mode 100644 index 169b55f0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/shacal2v.dat +++ /dev/null @@ -1,14 +0,0 @@ -80000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 361AB6322FA9E7A7BB23818D839E01BDDAFDF47305426EDD297AEDB9F6202BAE -00000000000000000000000000000001 0000000000000000000000000000000000000000000000000000000000000000 7308AEC23D25A231B26448AFE78D5047804C5011B9B5F95C16DF2670551F0001 -00000000000000000000000000000000 8000000000000000000000000000000000000000000000000000000000000000 2CAE7C0460EE2FC3200923A1B6C2ABEEA746C8B44F6C3FB941BD3AF02A3E6E3E -00000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000001 45D43E9288738C5AD1A683D8DE59CEDD22D666A2B7078EB1301B532A272D570B -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 7CA51614425C3BA8CE54DD2FC2020AE7B6E574D198136D0FAE7E26CCBF0BE7A6 -01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101 0101010101010101010101010101010101010101010101010101010101010101 C4B7C6A9738C77EE28F7E685C8358E0AF88FB6D23955EE6DF49FE3F5DA16F826 -02020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202 0202020202020202020202020202020202020202020202020202020202020202 CD108DD9EC1000B79C75AA3DCC88F913E6F52773853035A5C44F3245B134CBFF -04040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404 0404040404040404040404040404040404040404040404040404040404040404 6AA777340200C1B65AB25193A8BB267C233DAC7E1B3C523D406FC5B567B7B586 -08080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808 0808080808080808080808080808080808080808080808080808080808080808 A23BE32D37FA4054EC45D6A9CC643AF9124EDAA4AD9ABC7FAAB449D39D11B128 -10101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010 1010101010101010101010101010101010101010101010101010101010101010 F64819DFBEBE0A6DB650E7072CE28EA606586418B317785FF0AD44212A84C82C -20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020 2020202020202020202020202020202020202020202020202020202020202020 E267D6113C27170A3EE6DF496E801A6131BBD3444365D7C03791E25610F1A0E4 -40404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040 4040404040404040404040404040404040404040404040404040404040404040 C97909916EE86FFDCE8A92903046109B53F788A53039434DF1A394DAD6F697A2 -80808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080 8080808080808080808080808080808080808080808080808080808080808080 C3C1CD5F3060B3EC4E6ABC0818B68449E1750FB482368C8F3305270E16F98735 -FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF 0598127BAF11706F77402000D730C54A0B84C868A98C6CA4D7F3C0FA06A78B7A diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/sharkval.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/sharkval.dat deleted file mode 100644 index 637387a9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/sharkval.dat +++ /dev/null @@ -1,7 +0,0 @@ -00000000000000000000000000000000 0000000000000000 214BCF4E7716420A -000102030405060708090A0B0C0D0E0F 0000000000000000 C76C696289898137 -000102030405060708090A0B0C0D0E0F C76C696289898137 077A4A59FAEEEA4D -915F4619BE41B2516355A50110A9CE91 21A5DBEE154B8F6D 6FF33B98F448E95A -783348E75AEB0F2FD7B169BB8DC16787 F7C013AC5B2B8952 E5E554ABE9CED2D2 -DC49DB1375A5584F6485B413B5F12BAF 2F42B3B70369FC92 9AE068313F343A7A -5269F149D41BA0152497574D7F153125 65C178B284D197CC D3F111A282F17F29 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/skipjack.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/skipjack.dat deleted file mode 100644 index 6991a1e0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/skipjack.dat +++ /dev/null @@ -1 +0,0 @@ -11223344556677889900 aabbccdd00112233 00d3127ae2ca8725 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/squareva.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/squareva.dat deleted file mode 100644 index 4eddd1a0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/squareva.dat +++ /dev/null @@ -1,8 +0,0 @@ -00000000000000000000000000000000 00000000000000000000000000000000 3C00428F8ABBC0B84F057CC19C26F8CF -000102030405060708090A0B0C0D0E0F 00000000000000000000000000000000 FF596FA668BFC3014200AE01E2BBA0A0 -000102030405060708090A0B0C0D0E0F 000102030405060708090A0B0C0D0E0F 7C3491D94994E70F0EC2E7A5CCB5A14F -000102030405060708090A0B0C0D0E0F C76C696289898137077A4A59FAEEEA4D 88C6FF4B92604C6E66656B02DDAF9F40 -915F4619BE41B2516355A50110A9CE91 21A5DBEE154B8F6D6FF33B98F448E95A 3388801F66E7FCC0BCE522A23A4F0C7F -783348E75AEB0F2FD7B169BB8DC16787 F7C013AC5B2B8952E5E554ABE9CED2D2 A1C0E9215141343DEC2B556942C92BDE -DC49DB1375A5584F6485B413B5F12BAF 2F42B3B70369FC929AE068313F343A7A 3FBE6811B998CDF3E50ABDE2F3C075E3 -5269F149D41BA0152497574D7F153125 65C178B284D197CCD3F111A282F17F29 D7B7209E0879744C782809B6D2E0B1B0 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/twofishv.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/twofishv.dat deleted file mode 100644 index 54fbc379..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/twofishv.dat +++ /dev/null @@ -1,9 +0,0 @@ -00000000000000000000000000000000 00000000000000000000000000000000 9F589F5CF6122C32B6BFEC2F2AE8C35A -00000000000000000000000000000000 9F589F5CF6122C32B6BFEC2F2AE8C35A D491DB16E7B1C39E86CB086B789F5419 -9F589F5CF6122C32B6BFEC2F2AE8C35A D491DB16E7B1C39E86CB086B789F5419 019F9809DE1711858FAAC3A3BA20FBC3 -D491DB16E7B1C39E86CB086B789F5419 019F9809DE1711858FAAC3A3BA20FBC3 6363977DE839486297E661C6C9D668EB -000000000000000000000000000000000000000000000000 00000000000000000000000000000000 EFA71F788965BD4453F860178FC19101 -EFA71F788965BD4453F860178FC191010000000000000000 88B2B2706B105E36B446BB6D731A1E88 39DA69D6BA4997D585B6DC073CA341B2 -88B2B2706B105E36B446BB6D731A1E88EFA71F788965BD44 39DA69D6BA4997D585B6DC073CA341B2 182B02D81497EA45F9DAACDC29193A65 -0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000 57FF739D4DC92C1BD7FC01700CC8216F -D43BB7556EA32E46F2A282B7D45B4E0D57FF739D4DC92C1BD7FC01700CC8216F 90AFE91BB288544F2C32DC239B2635E6 6CB4561C40BF0A9705931CB6D408E7FA diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/usage.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/usage.dat deleted file mode 100644 index 7830f0c3..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/usage.dat +++ /dev/null @@ -1,81 +0,0 @@ -Test Driver for Crypto++(R) Library, a C++ Class Library of Cryptographic Schemes - -- To generate an RSA key - cryptest g - -- To encrypt and decrypt a string using RSA - cryptest r - -- To sign a file using RSA - cryptest rs privatekeyfile messagefile signaturefile - -- To verify a signature of a file using RSA - cryptest rv publickeyfile messagefile signaturefile - -- To digest a file using several hash functions in parallel - cryptest m file - -- To encrypt and decrypt a string using DES-EDE in CBC mode - cryptest t - -- To encrypt or decrypt a file - cryptest e|d input output - -- To secret share a file (shares will be named file.000, file.001, etc) - cryptest ss threshold number-of-shares file - -- To reconstruct a secret-shared file - cryptest sr file share1 share2 [....] - (number of shares given must be equal to threshold) - -- To information disperse a file (shares will be named file.000, file.001, etc) - cryptest id threshold number-of-shares file - -- To reconstruct an information-dispersed file - cryptest ir file share1 share2 [....] - (number of shares given must be equal to threshold) - -- To gzip a file - cryptest z compression-level input output - -- To gunzip a file - cryptest u input output - -- To encrypt a file with AES in CTR mode - cryptest ae input output - -- To base64 encode a file - cryptest e64 input output - -- To base64 decode a file - cryptest d64 input output - -- To hex encode a file - cryptest e16 input output - -- To hex decode a file - cryptest d16 input output - -- To forward a TCP connection - cryptest ft source-port destination-host destination-port - -- To run the FIPS 140-2 sample application - cryptest fips - -- To generate 100000 random files using FIPS Approved X.917 RNG - cryptest fips-rand - -- To run Maurer's randomness test on a file - cryptest mt input - -- To run a test script (available in TestVectors subdirectory) - cryptest tv filename - -- To run validation tests - cryptest v - -- To display version number - cryptest V - -- To run benchmarks - cryptest b [time allocated for each benchmark in seconds] [frequency of CPU in gigahertz] diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh171.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh171.dat deleted file mode 100644 index c75ff48d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh171.dat +++ /dev/null @@ -1,3 +0,0 @@ -305F02160559DCD66A95A57249A15BAD6B431BF2CD58615B901D02153365CFA0D3B1B6577B2DB243 -DDE45EDB91C18B0F5F0216032F4EBA0911B3D0B14F6F1292A74DFFD4A8FCF22C1802160211CB3EDA -809FA0FF8C3A8AE691EC4C95A06A3395CF diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh342.dat b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh342.dat deleted file mode 100644 index ce67aaaf..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestData/xtrdh342.dat +++ /dev/null @@ -1,5 +0,0 @@ -3081A6022B28E3FED51D3D861D962B0A16A92ACDB380ADAFB478CA555004C3AF387F853F9DE9921C -7DCB40098D25C757021D03094844F135A3A50049A848C3FC02412FCBED6040FB1BDE99A4D93E3B02 -2B13F411960B85F9B031A247E072046892B1EE6C95A47242A839F8E24B96B88F37B4BDA2C6D253BC -0AAF29F1022B0D2AFE639D324E558B2B312E435E03957769D745C881D259DDFD2F48F9C08F82ECCF -F4E7ADD47C705896D0 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/Readme.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/Readme.txt deleted file mode 100644 index 755a0461..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/Readme.txt +++ /dev/null @@ -1,72 +0,0 @@ -Test Data Format - -A test data file is an ASCII text file composed of sections separated by -blank lines. Each section is stand-alone and independent of other -sections that may be in the same file, and contains one or more tests. - -A section is composed of a sequence of fields. Each field is one or more -lines composed of a field name, followed by a colon (":"), followed by a -field body. All but the last line of a field must end with a backslash -("\"). If any line contains a hash mark ("#"), the hash mark and -everything after it on the same line is not considered part of the field -body. - -Each section must contain fields named AlgorithmType, Name, Source, and -Test. The presence and semantics of other fields depend on the algorithm -being tested and the tests to be run. - -Each section may contain more than one test and therefore more than one -field named Test. In that case the order of the fields is significant. A -test should always use the last field with any given name that occurs -before the Test field. - -Data Types - -int - small integer (less than 2^32) in decimal representation -string - human readable string -encoded string - can be one of the following - - quoted string: "message" means "message" without the quotes - or terminating '\0' - - hex encoded string: 0x74657374 or 74657374 means "test" - - repeated string: r100 "message" to repeat "message" 100 times, or - r256 0x0011 to repeat 0x0011 256 times - -Field Types - -AlgorithmType - string, for example "Signature", "AsymmetricCipher", -"SymmetricCipher", "MAC", "MessageDigest", or "KeyFactory" -Name - string, an algorithm name from SCAN -Test - string, identifies the test to run -Source - string, text explaining where the test data came from -Comment - string, other comments about the test data -KeyFormat - string, specifies the key format. "Component" here means -each component of the key or key pair is specified separately as a name, -value pair, with the names depending on the algorithm being tested. -Otherwise the value names "Key", or "PublicKey" and "PrivateKey" are -used. -Key - encoded string -PublicKey - encoded string -PrivateKey - encoded string -Message - encoded string, message to be signed or verified -Signature - encoded string, signature to be verified or compared -with -Plaintext - encoded string -Ciphertext - encoded string -Digest - encoded string -TruncatedSize - int, size of truncated digest in bytes -Seek - int, seek location for random access ciphers -(more to come here) - -Possible Tests - -KeyPairValidAndConsistent - public and private keys are both valid and -consistent with each other -PublicKeyInvalid - public key validation should not pass -PrivateKeyInvalid - private key validation should not pass -Verify - signature/digest/MAC verification should pass -VerifyTruncated - truncated digest/MAC verification should pass -NotVerify - signature/digest/MAC verification should not pass -DeterministicSign - sign message using given seed, and the resulting -signature should be equal to the given signature -DecryptMatch - ciphertext decrypts to plaintext -(more to come here) diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/aes.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/aes.txt deleted file mode 100644 index 5f967f42..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/aes.txt +++ /dev/null @@ -1,241 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: AES/ECB -Source: NIST Special Publication 800-38A -Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710 -Comment: F.1.1 ECB-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 3ad77bb40d7a3660a89ecaf32466ef97 f5d3d58503b9699de785895a96fdbaaf 43b1cd7f598ece23881b00e3ed030688 7b0c785e27e8ad3f8223207104725dd4 -Test: Encrypt -Comment: F.1.3 ECB-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: bd334f1d6e45f25ff712a214571fa5cc 974104846d0ad3ad7734ecb3ecee4eef ef7afd2270e2e60adce0ba2face6444e 9a4b41ba738d6c72fb16691603c18e0e -Test: Encrypt -Comment: F.1.5 ECB-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: f3eed1bdb5d2a03c064b5a7e3db181f8 591ccb10d410ed26dc5ba74a31362870 b6ed21b99ca6f4f9f153e7b1beafed1d 23304b7a39f9f3ff067d8d8f9e24ecc7 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/ECB -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector -Plaintext: r8 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c371000 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 84C6CBDC2B5A39985774B23BAB066A6AF8CB66C08E4F058E5D3E7C351EA845CEC7B209210EE7EFD38269628687F21CB9BCEA349DC0418ADBA2BF2364DF4DB1A11AD84CF6A422CE95C37B2CF81196245CD857D0B954B83985C1888230F3C301847AAF714253EF768C17E89E4F5513DBD5BEE1266A2B2D7063CE3D0BA8716252C5BCBB9922CD46F374B52FDFF1FEBF155FF4AFEE18788999BC74234A3FFBA7B2858BB2552F172E56EC47456878440ABB5ADAE49941C1E43616AC5D6E31A011611B829F6A77BE1F50754F81F35D24ED89FDE804B17363F9A81C3F12AE067FDD41A2984912CAE1926C5FB3AC18E541FA4AD1E171888E61428F2A8F2E981AE16D0D4E41D33E5E675F446DAE0F454FC4CA056F41F3CC4744A9E948428B2280F96663B7230C09692503C95B3E34F8DE8DF23157F45BDF689B258D994D9E6CE5D4DD6BDB96763CCC41DBBE57A4778D5A9E90226D614C335E44CA8AB41EFEA898BC170C65412F77194A43A1305EF23AC70B059E6E047796EF518D7696BC3DAD5E2634F92DD1C90D206A2B6D3A7CE88668BEAD64614E9000ACFBA79EB3601606214E21E08F14CE77E36BB66FE4A0FCD2A21BCAA2391A9C2016AC3BC7CDF1438EB6DD26696644583E2B0A0C68629D736F6723DF66859CF80B4E5B5C5BF03F334D65C48DB3B2660E2CE33B510FD60C912B85D16AEE7CDBFDF6285B0A77BAE07D987F9CE172A548E6BF0A30CF099AA82BE0A25E0E8919 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CBC -Source: NIST Special Publication 800-38A -IV: 000102030405060708090a0b0c0d0e0f -Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710 -Comment: F.2.1 CBC-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 7649abac8119b246cee98e9b12e9197d 5086cb9b507219ee95db113a917678b2 73bed6b8e3c1743b7116e69e22229516 3ff1caa1681fac09120eca307586e1a7 -Test: Encrypt -Comment: F.2.3 CBC-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: 4f021db243bc633d7178183a9fa071e8 b4d9ada9ad7dedf4e5e738763f69145a 571b242012fb7ae07fa9baac3df102e0 08b0e27988598881d920a9e64f5615cd -Test: Encrypt -Comment: F.2.5 CBC-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: f58c4c04d6e5f1ba779eabfb5f7bfbd6 9cfc4e967edb808d679f777bc6702c7d 39f23369a9d9bacfa530e26304231461 b2eb05e2c39be9fcda6c19078c6a9d1b -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CBC -Source: RFC 3602 -Comment: Case 1: Encrypting 16 bytes (1 block) using AES-CBC with 128-bit key -Key : 0x06a9214036b8a15b512e03d534120006 -IV : 0x3dafba429d9eb430b422da802c9fac41 -Plaintext : "Single block msg" -Ciphertext: 0xe353779c1079aeb82708942dbe77181a -Test: Encrypt -Comment: Case 2: Encrypting 32 bytes (2 blocks) using AES-CBC with 128-bit key -Key : 0xc286696d887c9aa0611bbb3e2025a45a -IV : 0x562e17996d093d28ddb3ba695a2e6f58 -Plaintext : 0x000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f -Ciphertext: 0xd296cd94c2cccf8a3a863028b5e1dc0a 7586602d253cfff91b8266bea6d61ab1 -Test: Encrypt -Comment: Case 3: Encrypting 48 bytes (3 blocks) using AES-CBC with 128-bit key -Key : 0x6c3ea0477630ce21a2ce334aa746c2cd -IV : 0xc782dc4c098c66cbd9cd27d825682c81 -Plaintext : "This is a 48-byte message (exactly 3 AES blocks)" -Ciphertext: 0xd0a02b3836451753d493665d33f0e886 2dea54cdb293abc7506939276772f8d5 021c19216bad525c8579695d83ba2684 -Test: Encrypt -Comment: Case 4: Encrypting 64 bytes (4 blocks) using AES-CBC with 128-bit key -Key : 0x56e47a38c5598974bc46903dba290349 -IV : 0x8ce82eefbea0da3c44699ed7db51b7d9 -Plaintext : 0xa0a1a2a3a4a5a6a7a8a9aaabacadaeaf b0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf -Ciphertext: 0xc30e32ffedc0774e6aff6af0869f71aa 0f3af07a9a31a9c684db207eb0ef8e4e 35907aa632c3ffdf868bb7b29d3d46ad 83ce9f9a102ee99d49a53e87f4c3da55 -Test: Encrypt - - -AlgorithmType: SymmetricCipher -Name: AES/CBC -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: r8 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c371000 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 6544CCA076C4D67C1A69DD7E504C6586FBD22912505E187D8628E19FA067D6C339D078E3032B8596DA74BB0E23434F83E153D5ACD5DEF7D264F58EC685317BF50C93430791718D6E09CCC4804FFE4EEB5C6AD8E9B5DFD456EDE81081627A97FC2FAE9F1955377D7774E68EAB541B20CE3C915185BCA208EE08428C400043F2DC90B0390756762C9271946FCE214B9576F74399E466DAC48C6DD10B420F302941DCC27D55CF1FB59D71954950CAD893FFFA70970D128C77BFA34F3C84B0B64A01194A086ACDD9847D6B91B7F870D0E7591CA07F0B407005F1473C37A648F6E18044336F30418BA43FD7AA5B5BAE01A0E33B1EDA4487730F043E202DE44CB901BD3AED13D790D05F325C414831EB601BD918678C1B8E116877CE1167F87204B49619D323713F95C04CA9621FDCF44BD21C5E36A299C486C8FC0D3043EDFF424B9A7AA5500DC3BD7BF6FAB256E6B45B458058DC933F1FF8C5E841BFC7F405761E14B12B48C1C108F33BF8D65BB8DBB9ED7E92398E779333730F4C68922AA76409E842E76B649B981B8269186220ACFF9DFA198D62CBF4CFA0FE05C1427CE63A345A61FE460D14EF25D7A89E2E228B415757B4E4110B6AFA7D85D48C3BCF184FDD7366F06D9E3D29896B0D3C0D83FCFA881E6EC5F29B0294628EDFF284E58B7BE19D37A6B28D70DC0F165A4B60CE5536D76D1A71849C36B0837E4E5082A05208CEEB320C57F0F5B86DC3CAAC8A32DEA9552D -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CFB -Source: NIST Special Publication 800-38A -IV: 000102030405060708090a0b0c0d0e0f -Plaintext: 6bc1bee22e409f96e93d7e117393172aae2d8 -FeedbackSize: 1 -Comment: F.3.7 CFB8-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 3b79424c9c0dd436bace9e0ed4586a4f32b9 -Test: Encrypt -Comment: F.3.9 CFB8-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: cda2521ef0a905ca44cd057cbf0d47a0678a -Test: Encrypt -Comment: F.3.11 CFB8-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: dc1f1a8520a64db55fcc8ac554844e889700 -Test: Encrypt -Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710 -FeedbackSize: 16 -Comment: F.3.13 CFB128-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 3b3fd92eb72dad20333449f8e83cfb4a c8a64537a0b3a93fcde3cdad9f1ce58b 26751f67a3cbb140b1808cf187a4f4df c04b05357c5d1c0eeac4c66f9ff7f2e6 -Test: Encrypt -Comment: F.3.15 CFB128-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: cdc80d6fddf18cab34c25909c99a4174 67ce7f7f81173621961a2b70171d3d7a 2e1e8a1dd59b88b1c8e60fed1efac4c9 c05f9f9ca9834fa042ae8fba584b09ff -Test: Encrypt -Comment: F.3.17 CFB128-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: dc7e84bfda79164b7ecd8486985d3860 39ffed143b28b1c832113c6331e5407b df10132415e54b92a13ed0a8267ae2f9 75a385741ab9cef82031623d55b1e471 -Test: Encrypt - - -AlgorithmType: SymmetricCipher -Name: AES/CFB -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector with odd length -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F365C96D626048D13C65962ED08445B5EE74B11203E24C0ACCD3CC13F39963632D8F4B8F8BB16B7901373C32FFD27472957A8448E414A26BB10CAE9BCFBF332BA677D59C0CCD4CCE5B34298E2B1F3250092CF602B5476922D9FA13D4AE9F54841D889FE71D67A79315A621BDAECB2FD3F1ECDAB0DC9FBDFB85AE1633038A44E15DEF1B6DDBC4AB47BB128E1C2DE8A17FD1107D8587CE96088709E17DA23DE6993973A43DFB59801A9691B7EBF5565C4FF842F5132E99288FA4CE3E6CE9333DEE052212E71EF08C5E2E385A787F1567C0CD05A4D11BF40CA19B8D49A231AA55CDE1B8C531C9FCD3B9C70AABD65372E582FCE7528B6BD8F89AA6489B1F085AE024D5A964CAEC4F3F5726CBACDB5D8429F6741FE102BC27E10724C30A64A7D3ED11F6FF41908920A1326793C7C7EDDDD2F79D8A3CE804AE53E59E43B2E0E69AF69A79D7A97A12C0A1AC7331369FCE4072879AA998CD1DC6296CB02D4B97803F1F3713F922796148E2263AFA6A72CF30C3C00297ABF2AD2D559AC4D0011A839FAAA261BB17966E80FF243B65B6209C2732F294F33936A3B8FE7C9BEBE50686BBE7F0FDCF9E24281242B10844037D9AB8A342B954B69E6456243CC13959E1B014A1389BA69B9C4E1C0869C7FE3292ED72FCF183B216F7F5EB5A7CD0A2493BCA160AE6142F4CF03110CA4782CA6C8ED558CA8AF4B14ADC4C368FF0C0CD014F7E117F56D797EF45294C8D3BCED9D5D4E3FA60592031E2925ABA72DFE5AC1D88081DB6CF68DCB256A822CE891AD12F5BB34F39CE974F7D23C0B7AB3BF12D854DA60617EB5E479A9740E00A1DCA267A3D1D212F25A06B83106CBD624CC745ACB31E0EA774F6E0D765D6134F74A3AF5B3846649C14539B7C01B484C54F71B2C5016C2EA57B16472145511130D79E23271151F370DB8A626DB218F73FF0ABFE066E2782696F6984923AA074AEA9E059AEC18F50D4E03F4B17BAD856E6C962604A02 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/OFB -Source: NIST Special Publication 800-38A -IV: 000102030405060708090a0b0c0d0e0f -Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710 -Comment: F.4.1 OFB-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 3b3fd92eb72dad20333449f8e83cfb4a 7789508d16918f03f53c52dac54ed825 9740051e9c5fecf64344f7a82260edcc 304c6528f659c77866a510d9c1d6ae5e -Test: Encrypt -Comment: F.4.3 OFB-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: cdc80d6fddf18cab34c25909c99a4174 fcc28b8d4c63837c09e81700c1100401 8d9a9aeac0f6596f559c6d4daf59a5f2 6d9f200857ca6c3e9cac524bd9acc92a -Test: Encrypt -Comment: F.4.5 OFB-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: dc7e84bfda79164b7ecd8486985d3860 4febdc6740d20b3ac88f6ad82a4fb08d 71ab47a086e86eedf39d1c5bba97c408 0126141d67f37be8538f5a8be740e484 -Test: Encrypt - - -AlgorithmType: SymmetricCipher -Name: AES/OFB -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector with odd length -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F3B3D63D91F8B99D5EA9D0AA2D977A8675EDD972802EB60B3D8FA629EF94358D46861CF60D9F89F481632F937182C78E49D53D132260CFC3A80943E0FD169C6091FF4BBBBDEC35F4A31DDB61AFA087750D6CFCF86DAB13330125D60A2732E43A2AF3E47ABE4824C5B17DD747F267149A321ADA13409D51D4FC685ADA6789D5785FCA5EF199FD96A03879B4147C4936CC32DE864520C98DD55408CA8ED4AF1BE1F133ED53CA9FF58E6862D3E900AE66EEF75272B547BBC8919CE5503981684FEBA088F5E73BF272C820656CC9627FB4E4FC3A92A6B815CAC558B3257614AA9BB2CF2409D3633B6570EEF67A9343502D2B528078E561782917D977E6F76B13CD6526512D3D4C803BBB58E54EED5B4057EAF85DE83A7EC53FACBCA7E03EB7E027910C8DA25B75BE33B41C0C594DF6D781E821193963C9F658D380A460561B2F0C9C3D7639A4E4EE2DA87653DA86FAD6D5280857CEC28CC40D082C81C672D9B36CD169A6803ACA4C8DAAD77953B296FBAF480FA146F8B41DCBD487A368851A207C90228DBF7BAEEB38F23F98520E52145D809DB530D3E690C2A91B8367B815C4FFC0AE7171582169D6A7FD073A1F9DE1182FC98D1D5B3E39B44E054218B80091333D5B751C0530BADF4361C5A95CB26634AE788F7B6D2CCA543FDE48172A24E4D991F9262CFB8ED09FFE4E1506DA6478EF879847F8CE44569A9AC66E124CEE5944D2DC87742CA1B598B3C7D54662F8A5783A0C6689C949C54E148C2C88DFBA4F10F0234BA62E4DDEA30F5AD3D209829CCB73C22141D56050FB75E0E7D1B822F6FFC6AB92E8DB12A5C6B62064B692F8B118CC38F0436433B5370CE5A79D09A7081703EEA59F64B7361AA50476DD2F7074CA37C51935DCBC78A806F92C1186033070D5C3FABACAAE39CB7FBA0654D13413E94F6E9FDDB7D2D4EC1985CCF2E2011C186BD0C16AA95A0C7FDDF1B36490780EB646EEB7B0B377E970FD7D2E9A06 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CTR -Source: NIST Special Publication 800-38A -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710 -Comment: F.5.1 CTR-AES128.Encrypt -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: 874d6191b620e3261bef6864990db6ce 9806f66b7970fdff8617187bb9fffdff 5ae4df3edbd5d35e5b4f09020db03eab 1e031dda2fbe03d1792170a0f3009cee -Test: Encrypt -Comment: F.5.3 CTR-AES192.Encrypt -Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b -Ciphertext: 1abc932417521ca24f2b0459fe7e6e0b 090339ec0aa6faefd5ccc2c6f4ce8e94 1e36b26bd1ebc670d1bd1d665620abf7 4f78a7f6d29809585a97daec58c6b050 -Test: Encrypt -Comment: F.5.5 CTR-AES256.Encrypt -Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 -Ciphertext: 601ec313775789a5b7a7f504bbf3d228 f443e3ca4d62b59aca84e990cacaf5c5 2b0930daa23de94ce87017ba2d84988d dfc9c58db67aada613c2dd08457941a6 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CTR -Source: RFC 3686 -#Test Vector #1: Encrypting 16 octets using AES-CTR with 128-bit key -Key : AE 68 52 F8 12 10 67 CC 4B F7 A5 76 55 77 F3 9E -Plaintext : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67 -IV: 00 00 00 30 00 00 00 00 00 00 00 00 00 00 00 01 -Ciphertext : E4 09 5D 4F B7 A7 B3 79 2D 61 75 A3 26 13 11 B8 -Test: Encrypt -#Test Vector #2: Encrypting 32 octets using AES-CTR with 128-bit key -Key : 7E 24 06 78 17 FA E0 D7 43 D6 CE 1F 32 53 91 63 -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -IV: 00 6C B6 DB C0 54 3B 59 DA 48 D9 0B 00 00 00 01 -Ciphertext : 51 04 A1 06 16 8A 72 D9 79 0D 41 EE 8E DA D3 88 EB 2E 1E FC 46 DA 57 C8 FC E6 30 DF 91 41 BE 28 -Test: Encrypt -#Test Vector #3: Encrypting 36 octets using AES-CTR with 128-bit key -Key : 76 91 BE 03 5E 50 20 A8 AC 6E 61 85 29 F9 A0 DC -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 -IV: 00 E0 01 7B 27 77 7F 3F 4A 17 86 F0 00 00 00 01 -Ciphertext : C1 CF 48 A8 9F 2F FD D9 CF 46 52 E9 EF DB 72 D7 45 40 A4 2B DE 6D 78 36 D5 9A 5C EA AE F3 10 53 25 B2 07 2F -Test: Encrypt -#Test Vector #4: Encrypting 16 octets using AES-CTR with 192-bit key -Key : 16 AF 5B 14 5F C9 F5 79 C1 75 F9 3E 3B FB 0E ED 86 3D 06 CC FD B7 85 15 -Plaintext : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67 -IV: 00 00 00 48 36 73 3C 14 7D 6D 93 CB 00 00 00 01 -Ciphertext : 4B 55 38 4F E2 59 C9 C8 4E 79 35 A0 03 CB E9 28 -Test: Encrypt -#Test Vector #5: Encrypting 32 octets using AES-CTR with 192-bit key -Key : 7C 5C B2 40 1B 3D C3 3C 19 E7 34 08 19 E0 F6 9C 67 8C 3D B8 E6 F6 A9 1A -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -IV: 00 96 B0 3B 02 0C 6E AD C2 CB 50 0D 00 00 00 01 -Ciphertext : 45 32 43 FC 60 9B 23 32 7E DF AA FA 71 31 CD 9F 84 90 70 1C 5A D4 A7 9C FC 1F E0 FF 42 F4 FB 00 -Test: Encrypt -#Test Vector #6: Encrypting 36 octets using AES-CTR with 192-bit key -Key : 02 BF 39 1E E8 EC B1 59 B9 59 61 7B 09 65 27 9B F5 9B 60 A7 86 D3 E0 FE -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 -IV: 00 07 BD FD 5C BD 60 27 8D CC 09 12 00 00 00 01 -Ciphertext : 96 89 3F C5 5E 5C 72 2F 54 0B 7D D1 DD F7 E7 58 D2 88 BC 95 C6 91 65 88 45 36 C8 11 66 2F 21 88 AB EE 09 35 -Test: Encrypt -#Test Vector #7: Encrypting 16 octets using AES-CTR with 256-bit key -Key : 77 6B EF F2 85 1D B0 6F 4C 8A 05 42 C8 69 6F 6C 6A 81 AF 1E EC 96 B4 D3 7F C1 D6 89 E6 C1 C1 04 -Plaintext : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67 -IV: 00 00 00 60 DB 56 72 C9 7A A8 F0 B2 00 00 00 01 -Ciphertext : 14 5A D0 1D BF 82 4E C7 56 08 63 DC 71 E3 E0 C0 -Test: Encrypt -#Test Vector #8: Encrypting 32 octets using AES-CTR with 256-bit key -Key : F6 D6 6D 6B D5 2D 59 BB 07 96 36 58 79 EF F8 86 C6 6D D5 1A 5B 6A 99 74 4B 50 59 0C 87 A2 38 84 -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -IV: 00 FA AC 24 C1 58 5E F1 5A 43 D8 75 00 00 00 01 -Ciphertext : F0 5E 23 1B 38 94 61 2C 49 EE 00 0B 80 4E B2 A9 B8 30 6B 50 8F 83 9D 6A 55 30 83 1D 93 44 AF 1C -Test: Encrypt -#Test Vector #9: Encrypting 36 octets using AES-CTR with 256-bit key -Key : FF 7A 61 7C E6 91 48 E4 F1 72 6E 2F 43 58 1D E2 AA 62 D9 F8 05 53 2E DF F1 EE D6 87 FB 54 15 3D -Plaintext : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 -IV: 00 1C C5 B7 51 A5 1D 70 A1 C1 11 48 00 00 00 01 -Ciphertext : EB 6C 52 82 1D 0B BB F7 CE 75 94 46 2A CA 4F AA B4 07 DF 86 65 69 FD 07 F4 8C C0 B5 83 D6 07 1F 1E C0 E6 B8 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: AES/CTR -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector with odd length -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F31C8551B6306D52CF843EC0B85015DC203B1C0B643E2A6BABAF5133DA0EA06616076AA6BBB52ED75DC3A71A9A6E8AC7C9A00D2C39AA68BF4E6FFED9AAEE5AD6914FB3EA77C7B61FF6BF564F2F1225ACB4B5889CB1559888A5817849C382E168482F75381F63868C468E4D1583B1FE71DD808CB94D8150AAB9D530A0FC17CDE748E95545D8A033B2F61F1954D0C0226168022E1CD7E031C57D048AC560F152960F47705E174D956D4BB53AE80BFFCD1BD569ED8EFFA223C00558B702405F33E6E0EDB2D9B0C148A1441CC80D6ABBCE785AA1B9DAB7CB8832F1B12D2EE60EE2DFCA37942CA1724E5602B7B70525AC9662028A22DB234676615DB474538CBC8D197F38C88BCC4F9E8D207538CA18DE5F095420A2E4D5868CEBB8B34A9377DC52D119790B65210F1B346F5E00D9BD00A8847048913D80726B9B745D565E6284B986DBAEA997FFC5A0DE5051527D44B2C1266DBC9130A6EB15F37A0F00B6286D6678CA651C07743BD37F2E8F6A94F5ED8C63428AE4883A9695183807E104BC335C64FEAAC40A605913DF98FF44E0801B31A968CCE5DCAFADE1E017FA711E05FF5A54BFA1999C2C463F97A3A66B30211BD306C8911C98F8EE5EF47A54746A4D16B7C7424A6954B4FC3BCF1A41BDE8A19CE1027AE86A320D0E5E7D3C7E50CFD0C4665B811D86C313F09ADE5B4DBE017231859881E5873E9EDB2011CF5920D2F7277C4DE1AC430A1849F0B870A69ABE701B6D0B5123E5FF53395409177CF84BF41EC33C5E4BCC2CF29258DC7C260471AABDA49FDE62915758EE4E578D0F7698E6456BC144573739D5D508CC76B389359D2A0ECB5B7EE5FCB4C3151D5AF7C71819EA3DD5F36C7B27E551FD2373D07FFDC76A13FC4B10A6F29A83D6F465ACB6960671EACF21A3E1CB4411C4DAA0C2A87DAED28AEE60B7EC0258A9AF125F2DDC80B9877EFE0F372D9B832C786770A84EA1A07CB6E1A9907D651BBD0EFDEF2AFFC3 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/all.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/all.txt deleted file mode 100644 index b4c18d3d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/all.txt +++ /dev/null @@ -1,30 +0,0 @@ -AlgorithmType: FileList -Name: all.txt collection -Test: TestVectors/tea.txt -Test: TestVectors/wake.txt -Test: TestVectors/camellia.txt -Test: TestVectors/shacal2.txt -Test: TestVectors/ttmac.txt -Test: TestVectors/whrlpool.txt -Test: TestVectors/dlies.txt -Test: TestVectors/dsa.txt -Test: TestVectors/dsa_1363.txt -Test: TestVectors/esign.txt -Test: TestVectors/hmac.txt -Test: TestVectors/nr.txt -Test: TestVectors/rsa_oaep.txt -Test: TestVectors/rsa_pkcs1_1_5.txt -Test: TestVectors/rsa_pss.txt -Test: TestVectors/rw.txt -Test: TestVectors/seal.txt -Test: TestVectors/sha.txt -Test: TestVectors/panama.txt -Test: TestVectors/aes.txt -Test: TestVectors/salsa.txt -Test: TestVectors/vmac.txt -Test: TestVectors/sosemanuk.txt -Test: TestVectors/ccm.txt -Test: TestVectors/gcm.txt -Test: TestVectors/cmac.txt -Test: TestVectors/eax.txt -Test: TestVectors/mars.txt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/camellia.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/camellia.txt deleted file mode 100644 index f88d05b7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/camellia.txt +++ /dev/null @@ -1,8646 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: Camellia/ECB -Source: NESSIE submission -Comment: Tests with 128-bit keys -Comment: Set 1, vector 0 -Key: 80000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6C227F749319A3AA7DA235A9BBA05A2C -Test: Encrypt -Comment: Set 1, vector 1 -Key: 40000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F04D51E45E70FB6DEE0D16A204FBBA16 -Test: Encrypt -Comment: Set 1, vector 2 -Key: 20000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: ED44242E619F8C32EAA2D3641DA47EA4 -Test: Encrypt -Comment: Set 1, vector 3 -Key: 10000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AC640BBBF84CD3B8E8258BF66C210AE2 -Test: Encrypt -Comment: Set 1, vector 4 -Key: 08000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8A42BDA76C84B8960B23530100AFB748 -Test: Encrypt -Comment: Set 1, vector 5 -Key: 04000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1D20D15F3EE21EE6051803ADF83E31D7 -Test: Encrypt -Comment: Set 1, vector 6 -Key: 02000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6896B2FB85D26A243BB5697F6A764307 -Test: Encrypt -Comment: Set 1, vector 7 -Key: 01000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 43A865A61E1117008372932EA9CE8BB2 -Test: Encrypt -Comment: Set 1, vector 8 -Key: 00800000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CB5ECC200DDE8E9076A8AEA2250F49E4 -Test: Encrypt -Comment: Set 1, vector 9 -Key: 00400000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0B2A489718DC0B0E11F11C1D3913F4A8 -Test: Encrypt -Comment: Set 1, vector 10 -Key: 00200000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1D28A0A70B3C72ADC5B77487AD442873 -Test: Encrypt -Comment: Set 1, vector 11 -Key: 00100000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 26D344959095765A3DD6986B656F353D -Test: Encrypt -Comment: Set 1, vector 12 -Key: 00080000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 048248D32A74DB80DAF5642417F7832A -Test: Encrypt -Comment: Set 1, vector 13 -Key: 00040000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 44D400F8752F16B20DB95A959917B650 -Test: Encrypt -Comment: Set 1, vector 14 -Key: 00020000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E885DD9B2794459B2133BC84B59C2DED -Test: Encrypt -Comment: Set 1, vector 15 -Key: 00010000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 89D6E4182FD0DD7E4038710F597DD242 -Test: Encrypt -Comment: Set 1, vector 16 -Key: 00008000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7FE5BA5FF1D0EB81132A3DA0CD8E829D -Test: Encrypt -Comment: Set 1, vector 17 -Key: 00004000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 470FEDAAA6FFFCBC48AF8B3859B1E45F -Test: Encrypt -Comment: Set 1, vector 18 -Key: 00002000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B6FA2D9F41110E6914890AF888C36091 -Test: Encrypt -Comment: Set 1, vector 19 -Key: 00001000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 46D2C0FD0C3A4D2B5CA6BA5E14382DCA -Test: Encrypt -Comment: Set 1, vector 20 -Key: 00000800000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 730D700DCC5AB632DD9D92C6D1C18E5A -Test: Encrypt -Comment: Set 1, vector 21 -Key: 00000400000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 067D56D80AF5D2F24D84F518B8FC7920 -Test: Encrypt -Comment: Set 1, vector 22 -Key: 00000200000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 027F6EE9F54534E4C21F9263B68BAEA0 -Test: Encrypt -Comment: Set 1, vector 23 -Key: 00000100000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D115CB2324E8FDA3576DEE57E49CC315 -Test: Encrypt -Comment: Set 1, vector 24 -Key: 00000080000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0976DB57B27E4136743E58BCECFBC056 -Test: Encrypt -Comment: Set 1, vector 25 -Key: 00000040000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0C889DF89972EB42DB2BD2AAC335CCC8 -Test: Encrypt -Comment: Set 1, vector 26 -Key: 00000020000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CB6B80177047A3B2AC290A41B94174EF -Test: Encrypt -Comment: Set 1, vector 27 -Key: 00000010000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F816631F8FBC54ECDC1AB5323FF8424E -Test: Encrypt -Comment: Set 1, vector 28 -Key: 00000008000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 40CB64DF57D2A6BBCBD82DFCC749707D -Test: Encrypt -Comment: Set 1, vector 29 -Key: 00000004000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 885BD3C2DD560765B11F5A2D238E9F9A -Test: Encrypt -Comment: Set 1, vector 30 -Key: 00000002000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 877AAEF064555DE89C99B7C5A1326C62 -Test: Encrypt -Comment: Set 1, vector 31 -Key: 00000001000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AA4FBBE7A02020F5D81030E0EF7A460D -Test: Encrypt -Comment: Set 1, vector 32 -Key: 00000000800000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AA2759BC215E49F26008206F6F65B7AC -Test: Encrypt -Comment: Set 1, vector 33 -Key: 00000000400000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 419A8069C3D531475FF7F29AE049D57C -Test: Encrypt -Comment: Set 1, vector 34 -Key: 00000000200000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 455588067DB9088130C861F5BE9E15BF -Test: Encrypt -Comment: Set 1, vector 35 -Key: 00000000100000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FDD6967ADA65ED3E20718C451AE5AE34 -Test: Encrypt -Comment: Set 1, vector 36 -Key: 00000000080000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1C74228D2A82248CD29800B64BEFF97A -Test: Encrypt -Comment: Set 1, vector 37 -Key: 00000000040000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4B88B7FFB32B05840BE7B497377AFDAA -Test: Encrypt -Comment: Set 1, vector 38 -Key: 00000000020000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4D4EC4C728524DA2F366FC272AB2666A -Test: Encrypt -Comment: Set 1, vector 39 -Key: 00000000010000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4FA8A27ED16BF36FA296D8AB2B423C77 -Test: Encrypt -Comment: Set 1, vector 40 -Key: 00000000008000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 943B9D570D371A3D823B680BBDA9477D -Test: Encrypt -Comment: Set 1, vector 41 -Key: 00000000004000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DCC390F5E1CAADBE061D02929473D084 -Test: Encrypt -Comment: Set 1, vector 42 -Key: 00000000002000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9655F00C4A5C40DF401A3FF806575834 -Test: Encrypt -Comment: Set 1, vector 43 -Key: 00000000001000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FCC9F6B36DE6DD6AA578AD0B59DF5996 -Test: Encrypt -Comment: Set 1, vector 44 -Key: 00000000000800000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F573FF52ACAA16609E5B3C3C7353DA75 -Test: Encrypt -Comment: Set 1, vector 45 -Key: 00000000000400000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 203EF49006A7FC856FF7A7A3B953D999 -Test: Encrypt -Comment: Set 1, vector 46 -Key: 00000000000200000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 16659E823D942E99C83926C4055D896D -Test: Encrypt -Comment: Set 1, vector 47 -Key: 00000000000100000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 139D5DB9EF0119F4E5D11256C5ECB8B0 -Test: Encrypt -Comment: Set 1, vector 48 -Key: 00000000000080000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 63FB244962CCE915425EF1B31DE6AAE2 -Test: Encrypt -Comment: Set 1, vector 49 -Key: 00000000000040000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6F771C2DC848A106E907A990DABA0272 -Test: Encrypt -Comment: Set 1, vector 50 -Key: 00000000000020000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CFA1F114CF0D9C7DAD301B833962ABF2 -Test: Encrypt -Comment: Set 1, vector 51 -Key: 00000000000010000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 58A3BE61DA53D0AA8F33DE95E6F38A3F -Test: Encrypt -Comment: Set 1, vector 52 -Key: 00000000000008000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2FE96FCB3D845B568AE804B217F3498F -Test: Encrypt -Comment: Set 1, vector 53 -Key: 00000000000004000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FD74EB6621127D58FA44BA3E6EE7835D -Test: Encrypt -Comment: Set 1, vector 54 -Key: 00000000000002000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 834C0C5D8D88EE63C989AA1E66F4E18C -Test: Encrypt -Comment: Set 1, vector 55 -Key: 00000000000001000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FEF8E0097B9EB5CE6DE710F5742F7E4F -Test: Encrypt -Comment: Set 1, vector 56 -Key: 00000000000000800000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 75FCC55F284311B81D967618C2D35700 -Test: Encrypt -Comment: Set 1, vector 57 -Key: 00000000000000400000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 91AE4E35623A7F10383BF7448F1F74AD -Test: Encrypt -Comment: Set 1, vector 58 -Key: 00000000000000200000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8928B2B6967BA1B4230AA1EBA49D1A08 -Test: Encrypt -Comment: Set 1, vector 59 -Key: 00000000000000100000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 707EA08174ED5C0AD0A74363B403F02D -Test: Encrypt -Comment: Set 1, vector 60 -Key: 00000000000000080000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7C0C13410DDE30C0AD3565FFAA33E8AD -Test: Encrypt -Comment: Set 1, vector 61 -Key: 00000000000000040000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 56DA72C545C490A749C66BCC5D90AACD -Test: Encrypt -Comment: Set 1, vector 62 -Key: 00000000000000020000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2CC0CF6E2AAA7916AF636B1546BA1179 -Test: Encrypt -Comment: Set 1, vector 63 -Key: 00000000000000010000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A19FE617883D409B1F78882E0D5EF39C -Test: Encrypt -Comment: Set 1, vector 64 -Key: 00000000000000008000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2B8586BBB979CFFAC5A76C25D77C1E2C -Test: Encrypt -Comment: Set 1, vector 65 -Key: 00000000000000004000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5A08C9B5A2940E3ACD1086867E3E4733 -Test: Encrypt -Comment: Set 1, vector 66 -Key: 00000000000000002000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7443F1072833BFC8AA38CBF6963CF880 -Test: Encrypt -Comment: Set 1, vector 67 -Key: 00000000000000001000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6809A1F2D2B5367D5E8442E7972BD1D4 -Test: Encrypt -Comment: Set 1, vector 68 -Key: 00000000000000000800000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A61D4FE41D5DBB7A6BCE5984502CD767 -Test: Encrypt -Comment: Set 1, vector 69 -Key: 00000000000000000400000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 30D86F43B81F4D2098A4D43AB2637549 -Test: Encrypt -Comment: Set 1, vector 70 -Key: 00000000000000000200000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5B16E9033FA40BF141D3EE73FF7E2564 -Test: Encrypt -Comment: Set 1, vector 71 -Key: 00000000000000000100000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 15574EF70C880682DBFBD93FAE8023F6 -Test: Encrypt -Comment: Set 1, vector 72 -Key: 00000000000000000080000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0D8D220DB69B15FFE2001B3F42E910EA -Test: Encrypt -Comment: Set 1, vector 73 -Key: 00000000000000000040000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 030AB24DA9E4ADD4E350E692077A948C -Test: Encrypt -Comment: Set 1, vector 74 -Key: 00000000000000000020000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7F6509A9FD8525126BFB69AFE8624A96 -Test: Encrypt -Comment: Set 1, vector 75 -Key: 00000000000000000010000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9600EB0B7E38A5ABEBBDADD3DFC70298 -Test: Encrypt -Comment: Set 1, vector 76 -Key: 00000000000000000008000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3CF0F71B4687AAABEB9FA8CDE00B17D7 -Test: Encrypt -Comment: Set 1, vector 77 -Key: 00000000000000000004000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8B1C549A655C0041D866B7875A2736CB -Test: Encrypt -Comment: Set 1, vector 78 -Key: 00000000000000000002000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8F507233FBC9E1DBF716FB4C828DBF06 -Test: Encrypt -Comment: Set 1, vector 79 -Key: 00000000000000000001000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 14A45A121DC8996020C29A040FE8E52D -Test: Encrypt -Comment: Set 1, vector 80 -Key: 00000000000000000000800000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 32390FB6FC15BB4B37D1CD8817BAEB09 -Test: Encrypt -Comment: Set 1, vector 81 -Key: 00000000000000000000400000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9E61986F3F4C31132D436CCFCF751043 -Test: Encrypt -Comment: Set 1, vector 82 -Key: 00000000000000000000200000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 24E63FAD370974C60330F7C3071938F1 -Test: Encrypt -Comment: Set 1, vector 83 -Key: 00000000000000000000100000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3CE71D4E9F2F7EF9A6F9F2548C5489CC -Test: Encrypt -Comment: Set 1, vector 84 -Key: 00000000000000000000080000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E42436B8E076A00600DFD67B8C427DB1 -Test: Encrypt -Comment: Set 1, vector 85 -Key: 00000000000000000000040000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5C2577FA8104DCC58ACE852B4D11FE24 -Test: Encrypt -Comment: Set 1, vector 86 -Key: 00000000000000000000020000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 12FC9DD7132B3BB346C53FD193531638 -Test: Encrypt -Comment: Set 1, vector 87 -Key: 00000000000000000000010000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5D91F775E26599F26B21F9FB1F67DA38 -Test: Encrypt -Comment: Set 1, vector 88 -Key: 00000000000000000000008000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D4B3683AA62D2EF0331A960A0BF01A29 -Test: Encrypt -Comment: Set 1, vector 89 -Key: 00000000000000000000004000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EE32582D35DDF3A82142ED18FEE38014 -Test: Encrypt -Comment: Set 1, vector 90 -Key: 00000000000000000000002000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 148632AE69514D5776DA4AF38E1AE4FD -Test: Encrypt -Comment: Set 1, vector 91 -Key: 00000000000000000000001000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 30A3EE1AA1CA17B128DAAF06AF9025BD -Test: Encrypt -Comment: Set 1, vector 92 -Key: 00000000000000000000000800000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 88D82D9E508CBFB392E47E524BB33019 -Test: Encrypt -Comment: Set 1, vector 93 -Key: 00000000000000000000000400000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0C20870A9FC751F6E41F92305B7C4D92 -Test: Encrypt -Comment: Set 1, vector 94 -Key: 00000000000000000000000200000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6A4EDE5FD13F3676C1BCF8B73AB273CB -Test: Encrypt -Comment: Set 1, vector 95 -Key: 00000000000000000000000100000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5A62CE50EA837CA4FD0F7304D1572D22 -Test: Encrypt -Comment: Set 1, vector 96 -Key: 00000000000000000000000080000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 84DB8599B48ED4F39E872F13F7FCDF0B -Test: Encrypt -Comment: Set 1, vector 97 -Key: 00000000000000000000000040000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CDD25F8276411E892035C9703C7588EE -Test: Encrypt -Comment: Set 1, vector 98 -Key: 00000000000000000000000020000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 73BCFB16436B5C52CD4BC9629F75C5C8 -Test: Encrypt -Comment: Set 1, vector 99 -Key: 00000000000000000000000010000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 03752D935029B09699C29CA5C6E79553 -Test: Encrypt -Comment: Set 1, vector 100 -Key: 00000000000000000000000008000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EF439A1B86698409E91D992BDB3F54E5 -Test: Encrypt -Comment: Set 1, vector 101 -Key: 00000000000000000000000004000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2A34BDE7EC74221BFF58B251E54F089F -Test: Encrypt -Comment: Set 1, vector 102 -Key: 00000000000000000000000002000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 35FBB78716B78FB57F96BC8A5D869B72 -Test: Encrypt -Comment: Set 1, vector 103 -Key: 00000000000000000000000001000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AC3A7363DFB6C3F06CCCA1A46F44A5F8 -Test: Encrypt -Comment: Set 1, vector 104 -Key: 00000000000000000000000000800000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4895E1B7E54CA168CE42E3994D564B62 -Test: Encrypt -Comment: Set 1, vector 105 -Key: 00000000000000000000000000400000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E98956EFC457FE8AA103DB303A3B1DF1 -Test: Encrypt -Comment: Set 1, vector 106 -Key: 00000000000000000000000000200000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 276646992D6E752A649183DB05073422 -Test: Encrypt -Comment: Set 1, vector 107 -Key: 00000000000000000000000000100000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 82F36DE401E21D01A476A163A92F4B16 -Test: Encrypt -Comment: Set 1, vector 108 -Key: 00000000000000000000000000080000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E54DD90800B92153C314F8B1590B17E5 -Test: Encrypt -Comment: Set 1, vector 109 -Key: 00000000000000000000000000040000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F4A146DFB33405EC6B8F37AEB10F5198 -Test: Encrypt -Comment: Set 1, vector 110 -Key: 00000000000000000000000000020000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C332ADBC2D44FA1A1A4F7C8EAE2CED29 -Test: Encrypt -Comment: Set 1, vector 111 -Key: 00000000000000000000000000010000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 21AA542624DA9F2363404CE42BC2BAEF -Test: Encrypt -Comment: Set 1, vector 112 -Key: 00000000000000000000000000008000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E101DBEF627038AE819441D133AEE068 -Test: Encrypt -Comment: Set 1, vector 113 -Key: 00000000000000000000000000004000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7A9B635E6AA5D273DE697747FE6BB08E -Test: Encrypt -Comment: Set 1, vector 114 -Key: 00000000000000000000000000002000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0541AA347D36F03D9177FC91398874DB -Test: Encrypt -Comment: Set 1, vector 115 -Key: 00000000000000000000000000001000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BE27D6FE099AB98BF07A74A1ABF5C945 -Test: Encrypt -Comment: Set 1, vector 116 -Key: 00000000000000000000000000000800 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 472ACD81A6626822E220F431C4491704 -Test: Encrypt -Comment: Set 1, vector 117 -Key: 00000000000000000000000000000400 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2D5152F19E29AD7D5823CDCA188E0CD8 -Test: Encrypt -Comment: Set 1, vector 118 -Key: 00000000000000000000000000000200 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 875C90B3669DF8F4867B6769689656E7 -Test: Encrypt -Comment: Set 1, vector 119 -Key: 00000000000000000000000000000100 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 59641CA52EEBC2C229930CE42529277F -Test: Encrypt -Comment: Set 1, vector 120 -Key: 00000000000000000000000000000080 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A3B4D666AC56C284D40DC27FDB0F787C -Test: Encrypt -Comment: Set 1, vector 121 -Key: 00000000000000000000000000000040 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0511D526FC5F255F51F1914B4B12AD84 -Test: Encrypt -Comment: Set 1, vector 122 -Key: 00000000000000000000000000000020 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2D14332989F629DA4720ECC916B4DAF0 -Test: Encrypt -Comment: Set 1, vector 123 -Key: 00000000000000000000000000000010 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C44EAC8457E2F17E9BC86EB4C436E8DB -Test: Encrypt -Comment: Set 1, vector 124 -Key: 00000000000000000000000000000008 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 022F3EB45AAA39F785FF80B6A3006BF6 -Test: Encrypt -Comment: Set 1, vector 125 -Key: 00000000000000000000000000000004 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B8A714C8F8427767B384B0E2F6BAF619 -Test: Encrypt -Comment: Set 1, vector 126 -Key: 00000000000000000000000000000002 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 01F745A7C09FECD3497F087BD52A9A0F -Test: Encrypt -Comment: Set 1, vector 127 -Key: 00000000000000000000000000000001 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 41E0E6DC2DDEC65D8B8120E60977B82D -Test: Encrypt -Comment: Set 2, vector 0 -Key: 00000000000000000000000000000000 -Plaintext: 80000000000000000000000000000000 -Ciphertext: 07923A39EB0A817D1C4D87BDB82D1F1C -Test: Encrypt -Comment: Set 2, vector 1 -Key: 00000000000000000000000000000000 -Plaintext: 40000000000000000000000000000000 -Ciphertext: 48CD6419809672D2349260D89A08D3D3 -Test: Encrypt -Comment: Set 2, vector 2 -Key: 00000000000000000000000000000000 -Plaintext: 20000000000000000000000000000000 -Ciphertext: D07493CCB2E95CE0B4945A05ACC97D82 -Test: Encrypt -Comment: Set 2, vector 3 -Key: 00000000000000000000000000000000 -Plaintext: 10000000000000000000000000000000 -Ciphertext: 5DBE1EAC9F7080A88DBED7F6DA101448 -Test: Encrypt -Comment: Set 2, vector 4 -Key: 00000000000000000000000000000000 -Plaintext: 08000000000000000000000000000000 -Ciphertext: F01EE477D199DF2701027034B229622F -Test: Encrypt -Comment: Set 2, vector 5 -Key: 00000000000000000000000000000000 -Plaintext: 04000000000000000000000000000000 -Ciphertext: C841587ABD9A912E563774CB569D051E -Test: Encrypt -Comment: Set 2, vector 6 -Key: 00000000000000000000000000000000 -Plaintext: 02000000000000000000000000000000 -Ciphertext: 1D9BC0C04546F0915C8CCD11391A455C -Test: Encrypt -Comment: Set 2, vector 7 -Key: 00000000000000000000000000000000 -Plaintext: 01000000000000000000000000000000 -Ciphertext: 05E6EBB4BA167F5C479CEFF3152F943B -Test: Encrypt -Comment: Set 2, vector 8 -Key: 00000000000000000000000000000000 -Plaintext: 00800000000000000000000000000000 -Ciphertext: 93211E0F788845B9FC0E4551FFE92AC9 -Test: Encrypt -Comment: Set 2, vector 9 -Key: 00000000000000000000000000000000 -Plaintext: 00400000000000000000000000000000 -Ciphertext: B6D35701CD8FADDE383BBE8E6B70BAF7 -Test: Encrypt -Comment: Set 2, vector 10 -Key: 00000000000000000000000000000000 -Plaintext: 00200000000000000000000000000000 -Ciphertext: 8358F9F4EBCFEE348CB30551ACB151A0 -Test: Encrypt -Comment: Set 2, vector 11 -Key: 00000000000000000000000000000000 -Plaintext: 00100000000000000000000000000000 -Ciphertext: D57516EB5AD93C523E40521BF447AFCE -Test: Encrypt -Comment: Set 2, vector 12 -Key: 00000000000000000000000000000000 -Plaintext: 00080000000000000000000000000000 -Ciphertext: 66B2534C279C439133F52E5AD8B439A9 -Test: Encrypt -Comment: Set 2, vector 13 -Key: 00000000000000000000000000000000 -Plaintext: 00040000000000000000000000000000 -Ciphertext: A71C69184A9F63C2992A5F18F77C1FE9 -Test: Encrypt -Comment: Set 2, vector 14 -Key: 00000000000000000000000000000000 -Plaintext: 00020000000000000000000000000000 -Ciphertext: 1ADCBE49AEACB9ECEBBD492B10E82C7B -Test: Encrypt -Comment: Set 2, vector 15 -Key: 00000000000000000000000000000000 -Plaintext: 00010000000000000000000000000000 -Ciphertext: 27E3BCFB227C5561DB6CF7FC30387036 -Test: Encrypt -Comment: Set 2, vector 16 -Key: 00000000000000000000000000000000 -Plaintext: 00008000000000000000000000000000 -Ciphertext: F4AE20365CC9D06B0CAE6B695ED2CEC1 -Test: Encrypt -Comment: Set 2, vector 17 -Key: 00000000000000000000000000000000 -Plaintext: 00004000000000000000000000000000 -Ciphertext: 3DD682F0B641ED32AD3D43EA2A0456E4 -Test: Encrypt -Comment: Set 2, vector 18 -Key: 00000000000000000000000000000000 -Plaintext: 00002000000000000000000000000000 -Ciphertext: 6E5D14A95ECC290B509EA6B673652E3A -Test: Encrypt -Comment: Set 2, vector 19 -Key: 00000000000000000000000000000000 -Plaintext: 00001000000000000000000000000000 -Ciphertext: F1CDF0F8D7B3FFD95422D7CC0CF40B7B -Test: Encrypt -Comment: Set 2, vector 20 -Key: 00000000000000000000000000000000 -Plaintext: 00000800000000000000000000000000 -Ciphertext: A9253D459A34C385A1F1B2CFFA3935C5 -Test: Encrypt -Comment: Set 2, vector 21 -Key: 00000000000000000000000000000000 -Plaintext: 00000400000000000000000000000000 -Ciphertext: 291024D99FF09A47A1DEE45BA700AE52 -Test: Encrypt -Comment: Set 2, vector 22 -Key: 00000000000000000000000000000000 -Plaintext: 00000200000000000000000000000000 -Ciphertext: 49241D9459B277187BB10081C60361C0 -Test: Encrypt -Comment: Set 2, vector 23 -Key: 00000000000000000000000000000000 -Plaintext: 00000100000000000000000000000000 -Ciphertext: AD9BA365CC4DD5553D2D9FE303841D88 -Test: Encrypt -Comment: Set 2, vector 24 -Key: 00000000000000000000000000000000 -Plaintext: 00000080000000000000000000000000 -Ciphertext: C2ECA616664A249DC622CC11196B4AE1 -Test: Encrypt -Comment: Set 2, vector 25 -Key: 00000000000000000000000000000000 -Plaintext: 00000040000000000000000000000000 -Ciphertext: 6E1A2D4794BB0DC08777A0BC7523E70E -Test: Encrypt -Comment: Set 2, vector 26 -Key: 00000000000000000000000000000000 -Plaintext: 00000020000000000000000000000000 -Ciphertext: 6DB1F0CF59656BDD235E82B8CEF0BE8E -Test: Encrypt -Comment: Set 2, vector 27 -Key: 00000000000000000000000000000000 -Plaintext: 00000010000000000000000000000000 -Ciphertext: 52F239C5EAF401EBDC54D2F011FF4B6A -Test: Encrypt -Comment: Set 2, vector 28 -Key: 00000000000000000000000000000000 -Plaintext: 00000008000000000000000000000000 -Ciphertext: 6B58A08F648414B67FD6847D2AA51CBF -Test: Encrypt -Comment: Set 2, vector 29 -Key: 00000000000000000000000000000000 -Plaintext: 00000004000000000000000000000000 -Ciphertext: 2959DD5367885A75EB48053CF3251A36 -Test: Encrypt -Comment: Set 2, vector 30 -Key: 00000000000000000000000000000000 -Plaintext: 00000002000000000000000000000000 -Ciphertext: 630B292E3B88EF641CDFD531E206605E -Test: Encrypt -Comment: Set 2, vector 31 -Key: 00000000000000000000000000000000 -Plaintext: 00000001000000000000000000000000 -Ciphertext: 4BBB88EF82B70593FCC56AFD91540FDB -Test: Encrypt -Comment: Set 2, vector 32 -Key: 00000000000000000000000000000000 -Plaintext: 00000000800000000000000000000000 -Ciphertext: 0A13055B118A45C606999257BD191426 -Test: Encrypt -Comment: Set 2, vector 33 -Key: 00000000000000000000000000000000 -Plaintext: 00000000400000000000000000000000 -Ciphertext: 5CF8E5C9F15D7E4F865020224853EB77 -Test: Encrypt -Comment: Set 2, vector 34 -Key: 00000000000000000000000000000000 -Plaintext: 00000000200000000000000000000000 -Ciphertext: 3898805042C7A4315C5EE51AF2DE47E2 -Test: Encrypt -Comment: Set 2, vector 35 -Key: 00000000000000000000000000000000 -Plaintext: 00000000100000000000000000000000 -Ciphertext: 8D3F96372E87CBB0B375425B3A10B9E7 -Test: Encrypt -Comment: Set 2, vector 36 -Key: 00000000000000000000000000000000 -Plaintext: 00000000080000000000000000000000 -Ciphertext: 4D9510A378BD784A70A66BCC75B7D3C8 -Test: Encrypt -Comment: Set 2, vector 37 -Key: 00000000000000000000000000000000 -Plaintext: 00000000040000000000000000000000 -Ciphertext: 70DB1902D37CFBDFB98F7C516F79D416 -Test: Encrypt -Comment: Set 2, vector 38 -Key: 00000000000000000000000000000000 -Plaintext: 00000000020000000000000000000000 -Ciphertext: 383C6C2AABEF7FDE25CD470BF774A331 -Test: Encrypt -Comment: Set 2, vector 39 -Key: 00000000000000000000000000000000 -Plaintext: 00000000010000000000000000000000 -Ciphertext: 47CBCB5288349B1A15DC9F81FBEE6B8F -Test: Encrypt -Comment: Set 2, vector 40 -Key: 00000000000000000000000000000000 -Plaintext: 00000000008000000000000000000000 -Ciphertext: 21DA34D4468EEB13AED95DAE0FF48310 -Test: Encrypt -Comment: Set 2, vector 41 -Key: 00000000000000000000000000000000 -Plaintext: 00000000004000000000000000000000 -Ciphertext: 021C9A8E6BD36FBD036411E5D852A80F -Test: Encrypt -Comment: Set 2, vector 42 -Key: 00000000000000000000000000000000 -Plaintext: 00000000002000000000000000000000 -Ciphertext: 6A459E2F839AF60ACDE83774D0BB5574 -Test: Encrypt -Comment: Set 2, vector 43 -Key: 00000000000000000000000000000000 -Plaintext: 00000000001000000000000000000000 -Ciphertext: C19255121F1B933CAE09E58AEC0E9977 -Test: Encrypt -Comment: Set 2, vector 44 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000800000000000000000000 -Ciphertext: 7BA949E27B2BE148A6B801F9305F43D5 -Test: Encrypt -Comment: Set 2, vector 45 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000400000000000000000000 -Ciphertext: E8CEB1026BCF7BCEA32E8A380EA76DB7 -Test: Encrypt -Comment: Set 2, vector 46 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000200000000000000000000 -Ciphertext: 63F97747ED56A8F521B20CC65F6F9465 -Test: Encrypt -Comment: Set 2, vector 47 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000100000000000000000000 -Ciphertext: 2091CFDC629819106188424AC694F75B -Test: Encrypt -Comment: Set 2, vector 48 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000080000000000000000000 -Ciphertext: A91BDF8E8B88407942423CCE000527C4 -Test: Encrypt -Comment: Set 2, vector 49 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000040000000000000000000 -Ciphertext: 73F9B44B9635A3FD683DBF8D49E9825B -Test: Encrypt -Comment: Set 2, vector 50 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000020000000000000000000 -Ciphertext: 9DC64B2133FAD5069FD9A7CC2FFFD1CC -Test: Encrypt -Comment: Set 2, vector 51 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000010000000000000000000 -Ciphertext: 28240F81FEC36B71E13F1FEA7A7641E3 -Test: Encrypt -Comment: Set 2, vector 52 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000008000000000000000000 -Ciphertext: 20DD39FEE96CD2EFF972872A692B28FD -Test: Encrypt -Comment: Set 2, vector 53 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000004000000000000000000 -Ciphertext: 47A9E40483EC1925B635E47E964E8E93 -Test: Encrypt -Comment: Set 2, vector 54 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000002000000000000000000 -Ciphertext: 9C0EBD822C49FB3D853DF5B315A87BA0 -Test: Encrypt -Comment: Set 2, vector 55 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000001000000000000000000 -Ciphertext: C18D813FDB45A594C6DC24E5A1F6CE32 -Test: Encrypt -Comment: Set 2, vector 56 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000800000000000000000 -Ciphertext: 7E5467FF245ECF80CB55C2D8E91F0711 -Test: Encrypt -Comment: Set 2, vector 57 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000400000000000000000 -Ciphertext: 394D4365B77954FDEA4145FCF7A7A041 -Test: Encrypt -Comment: Set 2, vector 58 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000200000000000000000 -Ciphertext: B1D8311A492ED11F11E57B29221610C4 -Test: Encrypt -Comment: Set 2, vector 59 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000100000000000000000 -Ciphertext: E5FBB947A63AEA90163AF04AD6951EF8 -Test: Encrypt -Comment: Set 2, vector 60 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000080000000000000000 -Ciphertext: CA0627DDF580F0E7D59562825C9D0492 -Test: Encrypt -Comment: Set 2, vector 61 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000040000000000000000 -Ciphertext: EF98FFD1AED295AAE1860F0274C8F555 -Test: Encrypt -Comment: Set 2, vector 62 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000020000000000000000 -Ciphertext: 8C698E5CFFF08FACE10C2DC5FF1E2A81 -Test: Encrypt -Comment: Set 2, vector 63 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000010000000000000000 -Ciphertext: 35A7767E02032C35B5CE1A6F49C57C28 -Test: Encrypt -Comment: Set 2, vector 64 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000008000000000000000 -Ciphertext: AB36F8734E76EBA306CF00D6763D90B0 -Test: Encrypt -Comment: Set 2, vector 65 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000004000000000000000 -Ciphertext: E854EB66D4EC66889B5E6CD4F44A5806 -Test: Encrypt -Comment: Set 2, vector 66 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000002000000000000000 -Ciphertext: 15B66DF1455ACD640B8716BCF5DB2D69 -Test: Encrypt -Comment: Set 2, vector 67 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000001000000000000000 -Ciphertext: 4C57AB5333E5C2D4B7E30A007E449F48 -Test: Encrypt -Comment: Set 2, vector 68 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000800000000000000 -Ciphertext: BA3E7FF28EB38EA09D8DB1440A9A3552 -Test: Encrypt -Comment: Set 2, vector 69 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000400000000000000 -Ciphertext: 64E60227AFD80C40C70186CC94804C1A -Test: Encrypt -Comment: Set 2, vector 70 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000200000000000000 -Ciphertext: CEB4423C20B4C91C2551F6FC227C9514 -Test: Encrypt -Comment: Set 2, vector 71 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000100000000000000 -Ciphertext: F736894B843EF32DA28576DE500D448C -Test: Encrypt -Comment: Set 2, vector 72 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000080000000000000 -Ciphertext: 58FDA98B678D15053D4B6C060368108C -Test: Encrypt -Comment: Set 2, vector 73 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000040000000000000 -Ciphertext: E28CAE384E578F47657755EBCD97996C -Test: Encrypt -Comment: Set 2, vector 74 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000020000000000000 -Ciphertext: 0A64617BD4B5B166668240D105B7B6A2 -Test: Encrypt -Comment: Set 2, vector 75 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000010000000000000 -Ciphertext: 4BD090C7E3D365B5EA80F19B4798881E -Test: Encrypt -Comment: Set 2, vector 76 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000008000000000000 -Ciphertext: BC7B6CB9BFF4F72973BB2CD20A512C06 -Test: Encrypt -Comment: Set 2, vector 77 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000004000000000000 -Ciphertext: 4C7ADDC5C867594E9EE75F0AA6AB9C23 -Test: Encrypt -Comment: Set 2, vector 78 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000002000000000000 -Ciphertext: 1FBD05C71A36691AC6566A5298101D53 -Test: Encrypt -Comment: Set 2, vector 79 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000001000000000000 -Ciphertext: 42D7D6B1F499D412F8793972BD968DA2 -Test: Encrypt -Comment: Set 2, vector 80 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000800000000000 -Ciphertext: 260EC86E2786FC68824576B934F32814 -Test: Encrypt -Comment: Set 2, vector 81 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000400000000000 -Ciphertext: 576C26DFD7046F9357F34BEA7DFB26A0 -Test: Encrypt -Comment: Set 2, vector 82 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000200000000000 -Ciphertext: 6D55E54BFB6F927174A02294C95E0F8F -Test: Encrypt -Comment: Set 2, vector 83 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000100000000000 -Ciphertext: 1A6CE91DD458229C7675A34950D10E23 -Test: Encrypt -Comment: Set 2, vector 84 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000080000000000 -Ciphertext: DAD0D5E7E000652825AA34D228EA8D8F -Test: Encrypt -Comment: Set 2, vector 85 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000040000000000 -Ciphertext: E68013F48D75EAD2BBC0B0BDA5E690BF -Test: Encrypt -Comment: Set 2, vector 86 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000020000000000 -Ciphertext: A07D92312FBAE37BFE8A834210AE4F9C -Test: Encrypt -Comment: Set 2, vector 87 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000010000000000 -Ciphertext: 6EEE5F8544CD7D456366EB448813989A -Test: Encrypt -Comment: Set 2, vector 88 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000008000000000 -Ciphertext: F8E5C7FF4B79D7ABE8BFA2DD148820A8 -Test: Encrypt -Comment: Set 2, vector 89 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000004000000000 -Ciphertext: C6349D75C7472BBD66F95B3A07C79C91 -Test: Encrypt -Comment: Set 2, vector 90 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000002000000000 -Ciphertext: B85713C12D8658951CD1AD21C74D2CD2 -Test: Encrypt -Comment: Set 2, vector 91 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000001000000000 -Ciphertext: 907AA00B9F7D47A97623FB55BA911F29 -Test: Encrypt -Comment: Set 2, vector 92 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000800000000 -Ciphertext: DC3CD0ED23D11776FAB43A2A6A8F3557 -Test: Encrypt -Comment: Set 2, vector 93 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000400000000 -Ciphertext: 4BFE58A8FD69179C14765B09AB70B705 -Test: Encrypt -Comment: Set 2, vector 94 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000200000000 -Ciphertext: A23996E0EA67EC280356E5F77130A551 -Test: Encrypt -Comment: Set 2, vector 95 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000100000000 -Ciphertext: CDEADE859B3AACD273CCA85A3E2E45F2 -Test: Encrypt -Comment: Set 2, vector 96 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000080000000 -Ciphertext: E0FC78489857D84DA03F40CE97147174 -Test: Encrypt -Comment: Set 2, vector 97 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000040000000 -Ciphertext: 7615EA6351F6BB12855E8579C6995D8E -Test: Encrypt -Comment: Set 2, vector 98 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000020000000 -Ciphertext: 13E184344FE28C2E70ED0E4D0A8037F9 -Test: Encrypt -Comment: Set 2, vector 99 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000010000000 -Ciphertext: A5FE395F568482B87BC3EB208C81C942 -Test: Encrypt -Comment: Set 2, vector 100 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000008000000 -Ciphertext: B3103E11AF06C85565823F8CAA3159F6 -Test: Encrypt -Comment: Set 2, vector 101 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000004000000 -Ciphertext: 7EBC2234D271B89C519C396985300030 -Test: Encrypt -Comment: Set 2, vector 102 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000002000000 -Ciphertext: 0661D338F2E0C939BA1687820A768467 -Test: Encrypt -Comment: Set 2, vector 103 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000001000000 -Ciphertext: EC2B42667C0195A90715499617884DA5 -Test: Encrypt -Comment: Set 2, vector 104 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000800000 -Ciphertext: AE077BA19D24E7188DDD3682FF196892 -Test: Encrypt -Comment: Set 2, vector 105 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000400000 -Ciphertext: 98823C24B9C65A66073C7952DC2B4B5E -Test: Encrypt -Comment: Set 2, vector 106 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000200000 -Ciphertext: 6AB58432CBB3C2F503DA2D16796CC297 -Test: Encrypt -Comment: Set 2, vector 107 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000100000 -Ciphertext: EEB5EBB3A53E4196C2F22BC1A4DDF5E8 -Test: Encrypt -Comment: Set 2, vector 108 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000080000 -Ciphertext: 33DC40AC5FDC126D38878416AF6C0FA6 -Test: Encrypt -Comment: Set 2, vector 109 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000040000 -Ciphertext: 38EDDC08E18B4AD982CEA921D2765A9A -Test: Encrypt -Comment: Set 2, vector 110 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000020000 -Ciphertext: 7D6BEA038E9347C642E18631660A9558 -Test: Encrypt -Comment: Set 2, vector 111 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000010000 -Ciphertext: FDA57921A473B5EE3700AD5ADF035019 -Test: Encrypt -Comment: Set 2, vector 112 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000008000 -Ciphertext: 699B4812E200337E9C1D2C397F0DFE4E -Test: Encrypt -Comment: Set 2, vector 113 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000004000 -Ciphertext: 7A1EADF68B0807145D6C414852DECFC8 -Test: Encrypt -Comment: Set 2, vector 114 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000002000 -Ciphertext: 1645FFAA8AD76689C01DA8C40882781F -Test: Encrypt -Comment: Set 2, vector 115 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000001000 -Ciphertext: BA0C053BE702FA62FC66D8FEB12FC97E -Test: Encrypt -Comment: Set 2, vector 116 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000800 -Ciphertext: 841FD8AF69CF2C31F7D4D7B6959662B5 -Test: Encrypt -Comment: Set 2, vector 117 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000400 -Ciphertext: F675D59BDB33231861268F539829DA0B -Test: Encrypt -Comment: Set 2, vector 118 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000200 -Ciphertext: A4967F45ABB4E8C7DC5E3806680F35E0 -Test: Encrypt -Comment: Set 2, vector 119 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000100 -Ciphertext: 4D7E08081CC82F92ABA7C58C99F8343F -Test: Encrypt -Comment: Set 2, vector 120 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000080 -Ciphertext: 9AEFDB287C119B82353612B60ECCBFD8 -Test: Encrypt -Comment: Set 2, vector 121 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000040 -Ciphertext: 979BB6A1553A17592A86E78DF144A699 -Test: Encrypt -Comment: Set 2, vector 122 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000020 -Ciphertext: A6FA8CAB06FD2E5BF3A858983C01757A -Test: Encrypt -Comment: Set 2, vector 123 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000010 -Ciphertext: BE8511254C31E25420B91D6FEF1710ED -Test: Encrypt -Comment: Set 2, vector 124 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000008 -Ciphertext: F589A908D18A21894971C0433581E1A5 -Test: Encrypt -Comment: Set 2, vector 125 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000004 -Ciphertext: 4237585130E7C9F715235EB1D8C94DE7 -Test: Encrypt -Comment: Set 2, vector 126 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000002 -Ciphertext: DEFE3E0B5C54C94B4F2A0F5A46F6210D -Test: Encrypt -Comment: Set 2, vector 127 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000001 -Ciphertext: F5574ACC3148DFCB9015200631024DF9 -Test: Encrypt -Comment: Set 3, vector 0 -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3D028025B156327C17F762C1F2CBCA71 -Test: Encrypt -Comment: Set 3, vector 1 -Key: 01010101010101010101010101010101 -Plaintext: 01010101010101010101010101010101 -Ciphertext: 637084CB1120D6F25DB618893040AA27 -Test: Encrypt -Comment: Set 3, vector 2 -Key: 02020202020202020202020202020202 -Plaintext: 02020202020202020202020202020202 -Ciphertext: 612834AAC9EF906BAEAA076E1C75179D -Test: Encrypt -Comment: Set 3, vector 3 -Key: 03030303030303030303030303030303 -Plaintext: 03030303030303030303030303030303 -Ciphertext: AECEE4C59E91366360923654C17140A9 -Test: Encrypt -Comment: Set 3, vector 4 -Key: 04040404040404040404040404040404 -Plaintext: 04040404040404040404040404040404 -Ciphertext: B24FAF8A579E4EFE986571FB2F68B5B4 -Test: Encrypt -Comment: Set 3, vector 5 -Key: 05050505050505050505050505050505 -Plaintext: 05050505050505050505050505050505 -Ciphertext: C102E40B5E584CF6AA16108D93DA26E3 -Test: Encrypt -Comment: Set 3, vector 6 -Key: 06060606060606060606060606060606 -Plaintext: 06060606060606060606060606060606 -Ciphertext: 962F98098E6CEA968FA568C5A32ADA50 -Test: Encrypt -Comment: Set 3, vector 7 -Key: 07070707070707070707070707070707 -Plaintext: 07070707070707070707070707070707 -Ciphertext: 27E9AB0117A37D228B77B29B38B3836F -Test: Encrypt -Comment: Set 3, vector 8 -Key: 08080808080808080808080808080808 -Plaintext: 08080808080808080808080808080808 -Ciphertext: 3E5CAFBB70545AABB1109293A1C44C14 -Test: Encrypt -Comment: Set 3, vector 9 -Key: 09090909090909090909090909090909 -Plaintext: 09090909090909090909090909090909 -Ciphertext: E4AC7417ECB8B2871B0EF12CECD20F46 -Test: Encrypt -Comment: Set 3, vector 10 -Key: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Plaintext: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Ciphertext: B29D18DD34C1CC00257838F1B8BD43DB -Test: Encrypt -Comment: Set 3, vector 11 -Key: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Plaintext: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Ciphertext: FC1094A0A2850499D874B6DDC1EBA0B7 -Test: Encrypt -Comment: Set 3, vector 12 -Key: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Plaintext: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Ciphertext: AD062A5D53BB0478F17DA5528839F9FF -Test: Encrypt -Comment: Set 3, vector 13 -Key: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Plaintext: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Ciphertext: 2C9DFEC27363BD0E651CC91FC05FDADF -Test: Encrypt -Comment: Set 3, vector 14 -Key: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Plaintext: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Ciphertext: 487C72BD251D4566AE6119A70A95B79F -Test: Encrypt -Comment: Set 3, vector 15 -Key: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Plaintext: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Ciphertext: 18CE9F8E752F787051CB8E407EB16C12 -Test: Encrypt -Comment: Set 3, vector 16 -Key: 10101010101010101010101010101010 -Plaintext: 10101010101010101010101010101010 -Ciphertext: E1FA5FD3F40B766BBE3DF469AF41B420 -Test: Encrypt -Comment: Set 3, vector 17 -Key: 11111111111111111111111111111111 -Plaintext: 11111111111111111111111111111111 -Ciphertext: 09628EDC6CD69F4F85483DC37633F732 -Test: Encrypt -Comment: Set 3, vector 18 -Key: 12121212121212121212121212121212 -Plaintext: 12121212121212121212121212121212 -Ciphertext: 2E6C94A96F6744C4E8D4146B4ECCD815 -Test: Encrypt -Comment: Set 3, vector 19 -Key: 13131313131313131313131313131313 -Plaintext: 13131313131313131313131313131313 -Ciphertext: 800996B5B363ACAB3FB8982F9BBE767F -Test: Encrypt -Comment: Set 3, vector 20 -Key: 14141414141414141414141414141414 -Plaintext: 14141414141414141414141414141414 -Ciphertext: C254C27642167B8FF363EAAD41A165A8 -Test: Encrypt -Comment: Set 3, vector 21 -Key: 15151515151515151515151515151515 -Plaintext: 15151515151515151515151515151515 -Ciphertext: 0B43A548CFFE916BAD7AB58B5F51B1E2 -Test: Encrypt -Comment: Set 3, vector 22 -Key: 16161616161616161616161616161616 -Plaintext: 16161616161616161616161616161616 -Ciphertext: 6C753853277756B8E0578FDC371A8738 -Test: Encrypt -Comment: Set 3, vector 23 -Key: 17171717171717171717171717171717 -Plaintext: 17171717171717171717171717171717 -Ciphertext: A278A500B02D8B2C7E829F1816872B1A -Test: Encrypt -Comment: Set 3, vector 24 -Key: 18181818181818181818181818181818 -Plaintext: 18181818181818181818181818181818 -Ciphertext: 67DD5353E13CDD51FC52716BC6BAB258 -Test: Encrypt -Comment: Set 3, vector 25 -Key: 19191919191919191919191919191919 -Plaintext: 19191919191919191919191919191919 -Ciphertext: 1B2DF65083662590F49719D7721D7C61 -Test: Encrypt -Comment: Set 3, vector 26 -Key: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Plaintext: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Ciphertext: B12E384030DE7B77866E758FB251CCFF -Test: Encrypt -Comment: Set 3, vector 27 -Key: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Plaintext: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Ciphertext: C37B3145C36FE5B95AC1392BEB81C9D8 -Test: Encrypt -Comment: Set 3, vector 28 -Key: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Plaintext: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Ciphertext: 5C25502EF79A5792DEE9359EDF7BA8BC -Test: Encrypt -Comment: Set 3, vector 29 -Key: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Plaintext: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Ciphertext: F0D899AEF42F226605E6A61A650F00A1 -Test: Encrypt -Comment: Set 3, vector 30 -Key: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Plaintext: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Ciphertext: 12096937A3474FE4D87C77581C09380B -Test: Encrypt -Comment: Set 3, vector 31 -Key: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Plaintext: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Ciphertext: CFC3A30819A45111983ABBF16CC61E9A -Test: Encrypt -Comment: Set 3, vector 32 -Key: 20202020202020202020202020202020 -Plaintext: 20202020202020202020202020202020 -Ciphertext: 7E724027BB2F591C63254D936FCC4B43 -Test: Encrypt -Comment: Set 3, vector 33 -Key: 21212121212121212121212121212121 -Plaintext: 21212121212121212121212121212121 -Ciphertext: FC9893DACCE806419957685270D5BF13 -Test: Encrypt -Comment: Set 3, vector 34 -Key: 22222222222222222222222222222222 -Plaintext: 22222222222222222222222222222222 -Ciphertext: F6C372A2AE2C03D7A9E0597DBEDFE961 -Test: Encrypt -Comment: Set 3, vector 35 -Key: 23232323232323232323232323232323 -Plaintext: 23232323232323232323232323232323 -Ciphertext: 4EE3CD585BD7A498DE93DDE42FDCBE73 -Test: Encrypt -Comment: Set 3, vector 36 -Key: 24242424242424242424242424242424 -Plaintext: 24242424242424242424242424242424 -Ciphertext: 71D0FFA714D70B5A3CDCE26BC91D93EE -Test: Encrypt -Comment: Set 3, vector 37 -Key: 25252525252525252525252525252525 -Plaintext: 25252525252525252525252525252525 -Ciphertext: 918EB6A7FA54EE795DE68EB5C0011BFD -Test: Encrypt -Comment: Set 3, vector 38 -Key: 26262626262626262626262626262626 -Plaintext: 26262626262626262626262626262626 -Ciphertext: 3A3DBFD37FB057816485BA948034E25E -Test: Encrypt -Comment: Set 3, vector 39 -Key: 27272727272727272727272727272727 -Plaintext: 27272727272727272727272727272727 -Ciphertext: 1FAD9F63890CF5475F3557B83924427C -Test: Encrypt -Comment: Set 3, vector 40 -Key: 28282828282828282828282828282828 -Plaintext: 28282828282828282828282828282828 -Ciphertext: 63F70DD87B9D63FC79628DECC6F34605 -Test: Encrypt -Comment: Set 3, vector 41 -Key: 29292929292929292929292929292929 -Plaintext: 29292929292929292929292929292929 -Ciphertext: D8FE7DF75B51024B69BDAB4844233CBB -Test: Encrypt -Comment: Set 3, vector 42 -Key: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Plaintext: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Ciphertext: D927B8DB454BEECFEE2F89ACD2D26F1A -Test: Encrypt -Comment: Set 3, vector 43 -Key: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Plaintext: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Ciphertext: 958B7CFABED67123D21541083FA90EB8 -Test: Encrypt -Comment: Set 3, vector 44 -Key: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Plaintext: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Ciphertext: 2F220AA3BB400736F3D0295E3C6D9052 -Test: Encrypt -Comment: Set 3, vector 45 -Key: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Plaintext: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Ciphertext: A14F57CE4D9EA4C5E282108DF8FDE00E -Test: Encrypt -Comment: Set 3, vector 46 -Key: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Plaintext: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Ciphertext: 23E437F93E0BE22B4C54BC187D70BCC1 -Test: Encrypt -Comment: Set 3, vector 47 -Key: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Plaintext: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Ciphertext: 615B6706E39E4A55EA8BFA4EFB8EBAEA -Test: Encrypt -Comment: Set 3, vector 48 -Key: 30303030303030303030303030303030 -Plaintext: 30303030303030303030303030303030 -Ciphertext: 5354CC9F7CAA08298C9A8AD471B39235 -Test: Encrypt -Comment: Set 3, vector 49 -Key: 31313131313131313131313131313131 -Plaintext: 31313131313131313131313131313131 -Ciphertext: DA2512B115E748580B7D198BFF01A537 -Test: Encrypt -Comment: Set 3, vector 50 -Key: 32323232323232323232323232323232 -Plaintext: 32323232323232323232323232323232 -Ciphertext: AEF890FCDEC04BFB0C4724558688810B -Test: Encrypt -Comment: Set 3, vector 51 -Key: 33333333333333333333333333333333 -Plaintext: 33333333333333333333333333333333 -Ciphertext: AEC153899584F8B9FC9836B86A40BA4A -Test: Encrypt -Comment: Set 3, vector 52 -Key: 34343434343434343434343434343434 -Plaintext: 34343434343434343434343434343434 -Ciphertext: E86D0DBEBD69030C0654656E0D348A8E -Test: Encrypt -Comment: Set 3, vector 53 -Key: 35353535353535353535353535353535 -Plaintext: 35353535353535353535353535353535 -Ciphertext: 3EFFEE758220F7138D31564D5CDA82EF -Test: Encrypt -Comment: Set 3, vector 54 -Key: 36363636363636363636363636363636 -Plaintext: 36363636363636363636363636363636 -Ciphertext: A0A57A825008700B246CEE9821803321 -Test: Encrypt -Comment: Set 3, vector 55 -Key: 37373737373737373737373737373737 -Plaintext: 37373737373737373737373737373737 -Ciphertext: 318692397CD421D958D142299AE24E5E -Test: Encrypt -Comment: Set 3, vector 56 -Key: 38383838383838383838383838383838 -Plaintext: 38383838383838383838383838383838 -Ciphertext: 1B949505033DB5554BBBBBB9488970DE -Test: Encrypt -Comment: Set 3, vector 57 -Key: 39393939393939393939393939393939 -Plaintext: 39393939393939393939393939393939 -Ciphertext: 20600DB3471001F93837F8EB50F7EB2B -Test: Encrypt -Comment: Set 3, vector 58 -Key: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Plaintext: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Ciphertext: 004C126190B7D20ADCA7331EA26AC487 -Test: Encrypt -Comment: Set 3, vector 59 -Key: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Plaintext: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Ciphertext: 7F535656FE3113A61D21BE216365D9FD -Test: Encrypt -Comment: Set 3, vector 60 -Key: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Plaintext: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Ciphertext: A7DA48E8AD71B1DC583A895A8CC85FF2 -Test: Encrypt -Comment: Set 3, vector 61 -Key: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Plaintext: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Ciphertext: 02E8CB85E9DDEDFAB4D9DB7106C6C38F -Test: Encrypt -Comment: Set 3, vector 62 -Key: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Plaintext: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Ciphertext: 44ACE8B20DF2DBA70C0287362D51ED5C -Test: Encrypt -Comment: Set 3, vector 63 -Key: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Plaintext: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Ciphertext: 8ABDD80D977FAF208FDFC69AA70E9810 -Test: Encrypt -Comment: Set 3, vector 64 -Key: 40404040404040404040404040404040 -Plaintext: 40404040404040404040404040404040 -Ciphertext: 538ADCBE104A3483B3C2A3D8CE72FBD6 -Test: Encrypt -Comment: Set 3, vector 65 -Key: 41414141414141414141414141414141 -Plaintext: 41414141414141414141414141414141 -Ciphertext: 7F757894F1A04645BCB523E925A937C7 -Test: Encrypt -Comment: Set 3, vector 66 -Key: 42424242424242424242424242424242 -Plaintext: 42424242424242424242424242424242 -Ciphertext: FA4304C7D16E164E000461B2550207B1 -Test: Encrypt -Comment: Set 3, vector 67 -Key: 43434343434343434343434343434343 -Plaintext: 43434343434343434343434343434343 -Ciphertext: 5B8E43BF0CACBCB80933B4061F9702B2 -Test: Encrypt -Comment: Set 3, vector 68 -Key: 44444444444444444444444444444444 -Plaintext: 44444444444444444444444444444444 -Ciphertext: 4DB11630D8CD9390797EE30EE9A25CB3 -Test: Encrypt -Comment: Set 3, vector 69 -Key: 45454545454545454545454545454545 -Plaintext: 45454545454545454545454545454545 -Ciphertext: 61150375D22621E9DD7AB45227E4ADC1 -Test: Encrypt -Comment: Set 3, vector 70 -Key: 46464646464646464646464646464646 -Plaintext: 46464646464646464646464646464646 -Ciphertext: 825AA0A2275496EA00BE2C75982EC24E -Test: Encrypt -Comment: Set 3, vector 71 -Key: 47474747474747474747474747474747 -Plaintext: 47474747474747474747474747474747 -Ciphertext: 1EA3F70E26F079CE37801787B5F3655C -Test: Encrypt -Comment: Set 3, vector 72 -Key: 48484848484848484848484848484848 -Plaintext: 48484848484848484848484848484848 -Ciphertext: F46E712267A6CA8DA8AC044A4E3ADC69 -Test: Encrypt -Comment: Set 3, vector 73 -Key: 49494949494949494949494949494949 -Plaintext: 49494949494949494949494949494949 -Ciphertext: 00FCF96BD11DB90E045B948C2658FC07 -Test: Encrypt -Comment: Set 3, vector 74 -Key: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Plaintext: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Ciphertext: 08E264CCDA07442DD6FB5BC8AF05A9C1 -Test: Encrypt -Comment: Set 3, vector 75 -Key: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Plaintext: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Ciphertext: 35C189E86440D125B0CAF6C62CA0E4F9 -Test: Encrypt -Comment: Set 3, vector 76 -Key: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Plaintext: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Ciphertext: 7FC2F545C0DE78664218F4F635CC8D10 -Test: Encrypt -Comment: Set 3, vector 77 -Key: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Plaintext: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Ciphertext: 9DC067581AD80555C6E46C6594A626F5 -Test: Encrypt -Comment: Set 3, vector 78 -Key: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Plaintext: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Ciphertext: D33A3E8035B42D76A483BE06B62054A6 -Test: Encrypt -Comment: Set 3, vector 79 -Key: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Plaintext: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Ciphertext: 7CA26FD5D6DB7EAA785FCCA1E2854910 -Test: Encrypt -Comment: Set 3, vector 80 -Key: 50505050505050505050505050505050 -Plaintext: 50505050505050505050505050505050 -Ciphertext: E9A672BD5401539C1C8F2AB21A83B26B -Test: Encrypt -Comment: Set 3, vector 81 -Key: 51515151515151515151515151515151 -Plaintext: 51515151515151515151515151515151 -Ciphertext: 2948CB8989780E74BA525CC2FDDC42CF -Test: Encrypt -Comment: Set 3, vector 82 -Key: 52525252525252525252525252525252 -Plaintext: 52525252525252525252525252525252 -Ciphertext: A3A8308145C318D42F4E8310DF6D97E0 -Test: Encrypt -Comment: Set 3, vector 83 -Key: 53535353535353535353535353535353 -Plaintext: 53535353535353535353535353535353 -Ciphertext: 1757125D19851062D7782A2200A813E9 -Test: Encrypt -Comment: Set 3, vector 84 -Key: 54545454545454545454545454545454 -Plaintext: 54545454545454545454545454545454 -Ciphertext: 9BC4FC94FF7A09F9D4C23A3BDEAF498E -Test: Encrypt -Comment: Set 3, vector 85 -Key: 55555555555555555555555555555555 -Plaintext: 55555555555555555555555555555555 -Ciphertext: B36C8A8DC251A4D08B38160011498AB2 -Test: Encrypt -Comment: Set 3, vector 86 -Key: 56565656565656565656565656565656 -Plaintext: 56565656565656565656565656565656 -Ciphertext: 6C6058C8D5F2A32E31988239C4A657F1 -Test: Encrypt -Comment: Set 3, vector 87 -Key: 57575757575757575757575757575757 -Plaintext: 57575757575757575757575757575757 -Ciphertext: B8B914785FD465FB0F83FE4A676C3A6B -Test: Encrypt -Comment: Set 3, vector 88 -Key: 58585858585858585858585858585858 -Plaintext: 58585858585858585858585858585858 -Ciphertext: 00BBEEC24412F8A2C4291B5F1F32E662 -Test: Encrypt -Comment: Set 3, vector 89 -Key: 59595959595959595959595959595959 -Plaintext: 59595959595959595959595959595959 -Ciphertext: AF8353C84504526068884176D45CC8A0 -Test: Encrypt -Comment: Set 3, vector 90 -Key: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Plaintext: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Ciphertext: F84DF1519736174F6F23B4CC3FC939F1 -Test: Encrypt -Comment: Set 3, vector 91 -Key: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Plaintext: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Ciphertext: 320326E1024C9156B0E4C483065F0D94 -Test: Encrypt -Comment: Set 3, vector 92 -Key: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Plaintext: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Ciphertext: 80AFE13AEC30894E8B772E73F367A148 -Test: Encrypt -Comment: Set 3, vector 93 -Key: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Plaintext: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Ciphertext: 5F0D8BE9294D27DB7E6CD4D4F8A08D48 -Test: Encrypt -Comment: Set 3, vector 94 -Key: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Plaintext: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Ciphertext: B6D8E7EF37171F6271AC274411E26867 -Test: Encrypt -Comment: Set 3, vector 95 -Key: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Plaintext: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Ciphertext: 23DEBDDF60703AE0F8E9337C73C6FDC3 -Test: Encrypt -Comment: Set 3, vector 96 -Key: 60606060606060606060606060606060 -Plaintext: 60606060606060606060606060606060 -Ciphertext: D03B4696B0DCC56C37F7038747BEF222 -Test: Encrypt -Comment: Set 3, vector 97 -Key: 61616161616161616161616161616161 -Plaintext: 61616161616161616161616161616161 -Ciphertext: 201E6A1FA7898892DA1D3148766F7939 -Test: Encrypt -Comment: Set 3, vector 98 -Key: 62626262626262626262626262626262 -Plaintext: 62626262626262626262626262626262 -Ciphertext: D9643DBC3C373D300DB5AC3E699F7DDE -Test: Encrypt -Comment: Set 3, vector 99 -Key: 63636363636363636363636363636363 -Plaintext: 63636363636363636363636363636363 -Ciphertext: 1B04DAF08A764C09DFFE140403F4EC5D -Test: Encrypt -Comment: Set 3, vector 100 -Key: 64646464646464646464646464646464 -Plaintext: 64646464646464646464646464646464 -Ciphertext: 0510AA045E35862885AEEB1752328032 -Test: Encrypt -Comment: Set 3, vector 101 -Key: 65656565656565656565656565656565 -Plaintext: 65656565656565656565656565656565 -Ciphertext: 894E5FE4164A0B9CC2C50D95F18329E6 -Test: Encrypt -Comment: Set 3, vector 102 -Key: 66666666666666666666666666666666 -Plaintext: 66666666666666666666666666666666 -Ciphertext: 99D16D251893E474CD8A18C10798D418 -Test: Encrypt -Comment: Set 3, vector 103 -Key: 67676767676767676767676767676767 -Plaintext: 67676767676767676767676767676767 -Ciphertext: B41A0DEEA15FCB419E00318752503FA8 -Test: Encrypt -Comment: Set 3, vector 104 -Key: 68686868686868686868686868686868 -Plaintext: 68686868686868686868686868686868 -Ciphertext: 8BDDFBD29844F3EED1E02FB76628E877 -Test: Encrypt -Comment: Set 3, vector 105 -Key: 69696969696969696969696969696969 -Plaintext: 69696969696969696969696969696969 -Ciphertext: E71C41B95412E2ED6BC6B5693BC445E5 -Test: Encrypt -Comment: Set 3, vector 106 -Key: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Plaintext: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Ciphertext: 566E5667E9BDDCE13F3B6DE0DEF06305 -Test: Encrypt -Comment: Set 3, vector 107 -Key: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Plaintext: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Ciphertext: 49372FDCE8DC81E45A9E6FBFB8952F76 -Test: Encrypt -Comment: Set 3, vector 108 -Key: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Plaintext: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Ciphertext: 034EAB9E0E881ABF0C4F9B7933E7F1B2 -Test: Encrypt -Comment: Set 3, vector 109 -Key: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Plaintext: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Ciphertext: 56FFE171E45816C5808380530F3F9F23 -Test: Encrypt -Comment: Set 3, vector 110 -Key: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Plaintext: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Ciphertext: 5FE59EE65A0321F3B09A1748CF18CC02 -Test: Encrypt -Comment: Set 3, vector 111 -Key: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Plaintext: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Ciphertext: 8C13790203280B652614D224178C4289 -Test: Encrypt -Comment: Set 3, vector 112 -Key: 70707070707070707070707070707070 -Plaintext: 70707070707070707070707070707070 -Ciphertext: 52D7C5111B52E5356C8EF2B629BA6166 -Test: Encrypt -Comment: Set 3, vector 113 -Key: 71717171717171717171717171717171 -Plaintext: 71717171717171717171717171717171 -Ciphertext: 4FB997235548FB5C202A1514FF408068 -Test: Encrypt -Comment: Set 3, vector 114 -Key: 72727272727272727272727272727272 -Plaintext: 72727272727272727272727272727272 -Ciphertext: 8DDE9345FEDAB8D8D2DE5E2577756F16 -Test: Encrypt -Comment: Set 3, vector 115 -Key: 73737373737373737373737373737373 -Plaintext: 73737373737373737373737373737373 -Ciphertext: C1B39136F69B2044C30E38023EB6E7D2 -Test: Encrypt -Comment: Set 3, vector 116 -Key: 74747474747474747474747474747474 -Plaintext: 74747474747474747474747474747474 -Ciphertext: 6032D1B3844BEA4ACE81142A013C42BC -Test: Encrypt -Comment: Set 3, vector 117 -Key: 75757575757575757575757575757575 -Plaintext: 75757575757575757575757575757575 -Ciphertext: 985A9D8DDE048107368028AA24F5D70B -Test: Encrypt -Comment: Set 3, vector 118 -Key: 76767676767676767676767676767676 -Plaintext: 76767676767676767676767676767676 -Ciphertext: 5343E03D587A538475BB92F23E96FDF8 -Test: Encrypt -Comment: Set 3, vector 119 -Key: 77777777777777777777777777777777 -Plaintext: 77777777777777777777777777777777 -Ciphertext: 98253AF78B8DA7E5AE98E7B4E9FA74F9 -Test: Encrypt -Comment: Set 3, vector 120 -Key: 78787878787878787878787878787878 -Plaintext: 78787878787878787878787878787878 -Ciphertext: 8404DDA01CC702790B8B31408205E128 -Test: Encrypt -Comment: Set 3, vector 121 -Key: 79797979797979797979797979797979 -Plaintext: 79797979797979797979797979797979 -Ciphertext: C782C96911F30723AB90E3A0BA59B808 -Test: Encrypt -Comment: Set 3, vector 122 -Key: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Plaintext: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Ciphertext: 471270191B1BB659804CEAE818793167 -Test: Encrypt -Comment: Set 3, vector 123 -Key: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Plaintext: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Ciphertext: 2B27BBF7E47DA05F72EED52D038A3241 -Test: Encrypt -Comment: Set 3, vector 124 -Key: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Plaintext: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Ciphertext: 0BD3B3F3F6F404B6B7C6D436605640B7 -Test: Encrypt -Comment: Set 3, vector 125 -Key: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Plaintext: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Ciphertext: 74578268B9D9AD5D9819E51CA288F81D -Test: Encrypt -Comment: Set 3, vector 126 -Key: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Plaintext: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Ciphertext: A77A67CC08111CE41B817176859675B5 -Test: Encrypt -Comment: Set 3, vector 127 -Key: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Plaintext: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Ciphertext: 9BE99EFDAF9CCCB4D879173EA2197FEF -Test: Encrypt -Comment: Set 3, vector 128 -Key: 80808080808080808080808080808080 -Plaintext: 80808080808080808080808080808080 -Ciphertext: AA7627F70F6B54C217C3EF232D362459 -Test: Encrypt -Comment: Set 3, vector 129 -Key: 81818181818181818181818181818181 -Plaintext: 81818181818181818181818181818181 -Ciphertext: EE41F8DC661C2A8B95667CB1F908367A -Test: Encrypt -Comment: Set 3, vector 130 -Key: 82828282828282828282828282828282 -Plaintext: 82828282828282828282828282828282 -Ciphertext: AF2D71AC4D7E482E8134A65F2841101A -Test: Encrypt -Comment: Set 3, vector 131 -Key: 83838383838383838383838383838383 -Plaintext: 83838383838383838383838383838383 -Ciphertext: 98CFCAA37D3B1825C55FA94825BBC91A -Test: Encrypt -Comment: Set 3, vector 132 -Key: 84848484848484848484848484848484 -Plaintext: 84848484848484848484848484848484 -Ciphertext: 2ACFCBC772417EBD445F8B272857578C -Test: Encrypt -Comment: Set 3, vector 133 -Key: 85858585858585858585858585858585 -Plaintext: 85858585858585858585858585858585 -Ciphertext: 424DE49A69767A539E26581A19CD4F17 -Test: Encrypt -Comment: Set 3, vector 134 -Key: 86868686868686868686868686868686 -Plaintext: 86868686868686868686868686868686 -Ciphertext: F25ED7239B234E58AE40F7612E3CE6BA -Test: Encrypt -Comment: Set 3, vector 135 -Key: 87878787878787878787878787878787 -Plaintext: 87878787878787878787878787878787 -Ciphertext: 4BF44DBA1E6E80DE3554F7EEF0621EBF -Test: Encrypt -Comment: Set 3, vector 136 -Key: 88888888888888888888888888888888 -Plaintext: 88888888888888888888888888888888 -Ciphertext: 6B87409975816BC8480985D079B08594 -Test: Encrypt -Comment: Set 3, vector 137 -Key: 89898989898989898989898989898989 -Plaintext: 89898989898989898989898989898989 -Ciphertext: D026A866DD55C02EE77DF1E93405A751 -Test: Encrypt -Comment: Set 3, vector 138 -Key: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Plaintext: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Ciphertext: A45F7212DD04352DEF319D58922C44CE -Test: Encrypt -Comment: Set 3, vector 139 -Key: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Plaintext: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Ciphertext: 4600AD219EE97A7BFF629D8F6E337C79 -Test: Encrypt -Comment: Set 3, vector 140 -Key: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Plaintext: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Ciphertext: A26CEFEC7612A89E8543503A678D921F -Test: Encrypt -Comment: Set 3, vector 141 -Key: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Plaintext: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Ciphertext: 5CA126B9342723816C82AC1D41F97EFB -Test: Encrypt -Comment: Set 3, vector 142 -Key: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Plaintext: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Ciphertext: 76DC82C091F5691C35E8735EB901B788 -Test: Encrypt -Comment: Set 3, vector 143 -Key: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Plaintext: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Ciphertext: 2F8AA5E8D7D90B3E7FCC20128F462AAD -Test: Encrypt -Comment: Set 3, vector 144 -Key: 90909090909090909090909090909090 -Plaintext: 90909090909090909090909090909090 -Ciphertext: 67B8B189FCD886FD2160005C93D9F3B2 -Test: Encrypt -Comment: Set 3, vector 145 -Key: 91919191919191919191919191919191 -Plaintext: 91919191919191919191919191919191 -Ciphertext: 8DFBD0B7D8B614E15B56571A6A5B443D -Test: Encrypt -Comment: Set 3, vector 146 -Key: 92929292929292929292929292929292 -Plaintext: 92929292929292929292929292929292 -Ciphertext: F10DA9ABD28359461A3BB271C2037D1A -Test: Encrypt -Comment: Set 3, vector 147 -Key: 93939393939393939393939393939393 -Plaintext: 93939393939393939393939393939393 -Ciphertext: 5A53C6ADF38E807BC03CC53193133CDE -Test: Encrypt -Comment: Set 3, vector 148 -Key: 94949494949494949494949494949494 -Plaintext: 94949494949494949494949494949494 -Ciphertext: 298AF9909A89241F34DB6BF6ACC6A909 -Test: Encrypt -Comment: Set 3, vector 149 -Key: 95959595959595959595959595959595 -Plaintext: 95959595959595959595959595959595 -Ciphertext: DAA5C134BDD34A775DEC219F6DE219BE -Test: Encrypt -Comment: Set 3, vector 150 -Key: 96969696969696969696969696969696 -Plaintext: 96969696969696969696969696969696 -Ciphertext: 2514903F8ABA0F65CA22C8AD82FF2574 -Test: Encrypt -Comment: Set 3, vector 151 -Key: 97979797979797979797979797979797 -Plaintext: 97979797979797979797979797979797 -Ciphertext: 11696CB06D2F97B1A2CB380E2887AB7E -Test: Encrypt -Comment: Set 3, vector 152 -Key: 98989898989898989898989898989898 -Plaintext: 98989898989898989898989898989898 -Ciphertext: E70BAE913D953A66AC35DE9CAA6D205D -Test: Encrypt -Comment: Set 3, vector 153 -Key: 99999999999999999999999999999999 -Plaintext: 99999999999999999999999999999999 -Ciphertext: 20BC3C8F4E81EEA320189E6063017706 -Test: Encrypt -Comment: Set 3, vector 154 -Key: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Plaintext: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Ciphertext: 53A956A32B4B532F5E9BE8C94278EC57 -Test: Encrypt -Comment: Set 3, vector 155 -Key: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Plaintext: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Ciphertext: 2562236E541426B29A4232E592237CAD -Test: Encrypt -Comment: Set 3, vector 156 -Key: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Plaintext: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Ciphertext: 0F8A9DEDA85B0A1CF7487C6ED823B869 -Test: Encrypt -Comment: Set 3, vector 157 -Key: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Plaintext: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Ciphertext: 8917CF4F1A25A500440CF0665BB517A0 -Test: Encrypt -Comment: Set 3, vector 158 -Key: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Plaintext: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Ciphertext: F5C065F3821FA664724BF6AFF1039430 -Test: Encrypt -Comment: Set 3, vector 159 -Key: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Plaintext: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Ciphertext: F5D5131F0D2F4859EC38F8999A93E74D -Test: Encrypt -Comment: Set 3, vector 160 -Key: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Plaintext: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Ciphertext: 9A02DF44F2194E94B7E34F1DCC234685 -Test: Encrypt -Comment: Set 3, vector 161 -Key: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Plaintext: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Ciphertext: 59491E467432E6147EAFE37BCD93DA01 -Test: Encrypt -Comment: Set 3, vector 162 -Key: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Plaintext: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Ciphertext: 4D0B317CE4AE577CF87B225C53DDF352 -Test: Encrypt -Comment: Set 3, vector 163 -Key: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Plaintext: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Ciphertext: 73E082DC996995BDDD1F5544326D56D6 -Test: Encrypt -Comment: Set 3, vector 164 -Key: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Plaintext: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Ciphertext: 46C5C6E23A72C9DF410EF979F93CF266 -Test: Encrypt -Comment: Set 3, vector 165 -Key: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Plaintext: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Ciphertext: 1F55093C234648C5C9C781E8C9FD42C4 -Test: Encrypt -Comment: Set 3, vector 166 -Key: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Plaintext: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Ciphertext: BFA2702CF3DAE25705D1DE1CCDBDC49E -Test: Encrypt -Comment: Set 3, vector 167 -Key: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Plaintext: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Ciphertext: 3223365425C1ADE87FF766AB048D9ADB -Test: Encrypt -Comment: Set 3, vector 168 -Key: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Plaintext: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Ciphertext: 5449889254C565DF3ADDFB7A86A93DA9 -Test: Encrypt -Comment: Set 3, vector 169 -Key: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Plaintext: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Ciphertext: 7D21880CCA919B0CE3917A8C598025FA -Test: Encrypt -Comment: Set 3, vector 170 -Key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Ciphertext: 5EE203A6739E822A54D9678B604EFD4F -Test: Encrypt -Comment: Set 3, vector 171 -Key: ABABABABABABABABABABABABABABABAB -Plaintext: ABABABABABABABABABABABABABABABAB -Ciphertext: 07038EFBEFDE2228F79A6B526306483A -Test: Encrypt -Comment: Set 3, vector 172 -Key: ACACACACACACACACACACACACACACACAC -Plaintext: ACACACACACACACACACACACACACACACAC -Ciphertext: 78447EBF959FFBD120283CE319FF6005 -Test: Encrypt -Comment: Set 3, vector 173 -Key: ADADADADADADADADADADADADADADADAD -Plaintext: ADADADADADADADADADADADADADADADAD -Ciphertext: 76769D40A286F0FD1C1C6F8895000DE8 -Test: Encrypt -Comment: Set 3, vector 174 -Key: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Plaintext: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Ciphertext: 7E163343CA44FADFAFDE5386CC111437 -Test: Encrypt -Comment: Set 3, vector 175 -Key: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Plaintext: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Ciphertext: 4B1E7FE684222BF783142B5DC396F61D -Test: Encrypt -Comment: Set 3, vector 176 -Key: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Plaintext: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Ciphertext: 4ECF97472658AC941EC99B255CF95535 -Test: Encrypt -Comment: Set 3, vector 177 -Key: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Plaintext: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Ciphertext: 23EE9DF24C8DC126A04586EFF27DBEAC -Test: Encrypt -Comment: Set 3, vector 178 -Key: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Plaintext: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Ciphertext: 4B06EE28B7769C4318D509F91D691F39 -Test: Encrypt -Comment: Set 3, vector 179 -Key: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Plaintext: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Ciphertext: 51994EF8283D1D29711F602A7ACDA3CA -Test: Encrypt -Comment: Set 3, vector 180 -Key: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Plaintext: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Ciphertext: DCBFBE6BE3234BBB61EA68218C89D098 -Test: Encrypt -Comment: Set 3, vector 181 -Key: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Plaintext: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Ciphertext: B84BFA0883546D912BD14807253F8892 -Test: Encrypt -Comment: Set 3, vector 182 -Key: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Plaintext: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Ciphertext: 90C1745C0DB97E70BA362CF2C1D376DF -Test: Encrypt -Comment: Set 3, vector 183 -Key: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Plaintext: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Ciphertext: 064743C2E8293C1B7619F6E6DEC13B04 -Test: Encrypt -Comment: Set 3, vector 184 -Key: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Plaintext: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Ciphertext: 38D913C68ABEE287368CBA38D8FE9F0D -Test: Encrypt -Comment: Set 3, vector 185 -Key: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Plaintext: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Ciphertext: B2279D520B33258B7DB221ECDD3C4EBB -Test: Encrypt -Comment: Set 3, vector 186 -Key: BABABABABABABABABABABABABABABABA -Plaintext: BABABABABABABABABABABABABABABABA -Ciphertext: 8AD710DDAE51BE6D4BE7ABC5443B7F9B -Test: Encrypt -Comment: Set 3, vector 187 -Key: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Plaintext: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Ciphertext: 246BA7624BBF83702764CC1B214A0691 -Test: Encrypt -Comment: Set 3, vector 188 -Key: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Plaintext: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Ciphertext: 80E0360B03FA048A892CD47BD7FE948A -Test: Encrypt -Comment: Set 3, vector 189 -Key: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Plaintext: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Ciphertext: 09D5D35BB6DBAE0CC9982D6955EAA01C -Test: Encrypt -Comment: Set 3, vector 190 -Key: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Plaintext: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Ciphertext: EEBDCE2BDE1F25A40184B9C57DD4E49D -Test: Encrypt -Comment: Set 3, vector 191 -Key: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Plaintext: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Ciphertext: 22706CFCCD2B0BB15ED30E373FA4E945 -Test: Encrypt -Comment: Set 3, vector 192 -Key: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Plaintext: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Ciphertext: D2A4EEACB5F41D12908DD1E069EC14DC -Test: Encrypt -Comment: Set 3, vector 193 -Key: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Plaintext: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Ciphertext: E78F614BC7F53C9298098DFEE8ADFB09 -Test: Encrypt -Comment: Set 3, vector 194 -Key: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Plaintext: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Ciphertext: B53E3865A8B28A36EF3A505102A6329D -Test: Encrypt -Comment: Set 3, vector 195 -Key: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Plaintext: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Ciphertext: 9B32AA8673DFFC47CF8C9B35DDE08DD3 -Test: Encrypt -Comment: Set 3, vector 196 -Key: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Plaintext: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Ciphertext: CE70E7257E6C8686C7407E22ACB3E94B -Test: Encrypt -Comment: Set 3, vector 197 -Key: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Plaintext: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Ciphertext: 677DB939CA272D717DB4B03EFB70F988 -Test: Encrypt -Comment: Set 3, vector 198 -Key: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Plaintext: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Ciphertext: 6582B069058FA86898A3B12B617C27FD -Test: Encrypt -Comment: Set 3, vector 199 -Key: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Plaintext: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Ciphertext: 4DFB68486ECF9833FCE74BD663E20768 -Test: Encrypt -Comment: Set 3, vector 200 -Key: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Plaintext: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Ciphertext: 6A3840D2780BABD68A73FAC89C4E8D91 -Test: Encrypt -Comment: Set 3, vector 201 -Key: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Plaintext: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Ciphertext: 44C79926D7EAB9DE5A2B95472A79A7BC -Test: Encrypt -Comment: Set 3, vector 202 -Key: CACACACACACACACACACACACACACACACA -Plaintext: CACACACACACACACACACACACACACACACA -Ciphertext: 3813E774EE9EFA8FDB2646E607B2A434 -Test: Encrypt -Comment: Set 3, vector 203 -Key: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Plaintext: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Ciphertext: FCA748E6AE5678A047E806F8FF103A65 -Test: Encrypt -Comment: Set 3, vector 204 -Key: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Plaintext: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Ciphertext: 3E3CC9CBE6952AB968FBBEE0C08BF667 -Test: Encrypt -Comment: Set 3, vector 205 -Key: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Plaintext: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Ciphertext: 4FFF3EDC7BCB70E7846DCC4688F9CB3A -Test: Encrypt -Comment: Set 3, vector 206 -Key: CECECECECECECECECECECECECECECECE -Plaintext: CECECECECECECECECECECECECECECECE -Ciphertext: 5728481E82E0DC1631EC611F63B9DD3C -Test: Encrypt -Comment: Set 3, vector 207 -Key: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Plaintext: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Ciphertext: 182BB0D3C52E56248FDA1D343844891D -Test: Encrypt -Comment: Set 3, vector 208 -Key: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Plaintext: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Ciphertext: 6B984FC45D0352F3336E7895ECB6DE0E -Test: Encrypt -Comment: Set 3, vector 209 -Key: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Plaintext: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Ciphertext: 8DD24A1B23D845E7A6C6D416C7C5B595 -Test: Encrypt -Comment: Set 3, vector 210 -Key: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Plaintext: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Ciphertext: 4F4D69B4563373962007945C3197806C -Test: Encrypt -Comment: Set 3, vector 211 -Key: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Plaintext: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Ciphertext: DD333390213EB632A51EAE0334A5AEA2 -Test: Encrypt -Comment: Set 3, vector 212 -Key: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Plaintext: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Ciphertext: D352ACE83BF6A3BC39EA10D751853009 -Test: Encrypt -Comment: Set 3, vector 213 -Key: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Plaintext: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Ciphertext: F2E118276BFCCF6DCDD47E1EAB919BDC -Test: Encrypt -Comment: Set 3, vector 214 -Key: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Plaintext: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Ciphertext: 688E877D8B69050F2736D0768571E9A0 -Test: Encrypt -Comment: Set 3, vector 215 -Key: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Plaintext: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Ciphertext: DE6F098E56985B7DCFEC52C897F2E735 -Test: Encrypt -Comment: Set 3, vector 216 -Key: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Plaintext: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Ciphertext: 398FA1FE47E3971DA3F9DFD479C9B1AA -Test: Encrypt -Comment: Set 3, vector 217 -Key: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Plaintext: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Ciphertext: 6F17B7D7C899B48DAEAD1E90F22AB180 -Test: Encrypt -Comment: Set 3, vector 218 -Key: DADADADADADADADADADADADADADADADA -Plaintext: DADADADADADADADADADADADADADADADA -Ciphertext: D39EBBA5B742F15FCB75D6E656BBF2DA -Test: Encrypt -Comment: Set 3, vector 219 -Key: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Plaintext: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Ciphertext: 1C6D82247D0BAB18B52CA5293A2C1050 -Test: Encrypt -Comment: Set 3, vector 220 -Key: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Plaintext: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Ciphertext: B54F248DF57060E40A6A2FA4688C7082 -Test: Encrypt -Comment: Set 3, vector 221 -Key: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Plaintext: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Ciphertext: 1BB5EB8732CBAB2E3FC334FAAB8BBFBC -Test: Encrypt -Comment: Set 3, vector 222 -Key: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Plaintext: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Ciphertext: 3734B4B21B50C4740B90FD863EF8627B -Test: Encrypt -Comment: Set 3, vector 223 -Key: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Plaintext: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Ciphertext: E22E22E60F981D64B7CB341F12F2B362 -Test: Encrypt -Comment: Set 3, vector 224 -Key: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Plaintext: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Ciphertext: A2A40EB448D87E39B20460E8CB07515A -Test: Encrypt -Comment: Set 3, vector 225 -Key: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Plaintext: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Ciphertext: 88E6AC929D4D7858015B35D509882C5C -Test: Encrypt -Comment: Set 3, vector 226 -Key: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Plaintext: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Ciphertext: FFE4B3B5D0E8229F5428FA2945DBD5EE -Test: Encrypt -Comment: Set 3, vector 227 -Key: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Plaintext: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Ciphertext: FCD5F897398A7796A0DAA1809CA7D870 -Test: Encrypt -Comment: Set 3, vector 228 -Key: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Plaintext: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Ciphertext: 7F3556B18EC8F04D953DCD27549AF1FC -Test: Encrypt -Comment: Set 3, vector 229 -Key: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Plaintext: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Ciphertext: 4433546A8E63AE841CD78B074ED0B91F -Test: Encrypt -Comment: Set 3, vector 230 -Key: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Plaintext: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Ciphertext: 2E04671C718BD6C3D115DB2D827A6669 -Test: Encrypt -Comment: Set 3, vector 231 -Key: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Plaintext: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Ciphertext: AAE7DA4B977F5EED28F9AF01F8FD47B4 -Test: Encrypt -Comment: Set 3, vector 232 -Key: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Plaintext: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Ciphertext: 84AD8F52D51BD3D8E4D8318AF6DB9786 -Test: Encrypt -Comment: Set 3, vector 233 -Key: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Plaintext: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Ciphertext: 95EFA65090BD603A1F65A21A43104F79 -Test: Encrypt -Comment: Set 3, vector 234 -Key: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Plaintext: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Ciphertext: 1B83F51E157BBA004CC5BD05986017C8 -Test: Encrypt -Comment: Set 3, vector 235 -Key: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Plaintext: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Ciphertext: A0C37A641126D5801C4259DFD38E8E8A -Test: Encrypt -Comment: Set 3, vector 236 -Key: ECECECECECECECECECECECECECECECEC -Plaintext: ECECECECECECECECECECECECECECECEC -Ciphertext: 3153A212C2E4727C1032223134342B31 -Test: Encrypt -Comment: Set 3, vector 237 -Key: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Plaintext: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Ciphertext: C680D98CAF4409CF31BABCF67352E1D5 -Test: Encrypt -Comment: Set 3, vector 238 -Key: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Plaintext: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Ciphertext: A7FC85C8459274B836B6F0CBED80AF49 -Test: Encrypt -Comment: Set 3, vector 239 -Key: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Plaintext: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Ciphertext: 5CA8B8A4B8AF15A6184259831B18BBB5 -Test: Encrypt -Comment: Set 3, vector 240 -Key: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Plaintext: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Ciphertext: F118089963B9AB37776B10B0D4CCEBA4 -Test: Encrypt -Comment: Set 3, vector 241 -Key: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Plaintext: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Ciphertext: C233B864E78E9EC272112A34FF7AADBA -Test: Encrypt -Comment: Set 3, vector 242 -Key: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Plaintext: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Ciphertext: 2B1C503E7F755A47CC4C57BEB4135B46 -Test: Encrypt -Comment: Set 3, vector 243 -Key: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Plaintext: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Ciphertext: 60D8177BE1044FC5F46DA2B3CAA33102 -Test: Encrypt -Comment: Set 3, vector 244 -Key: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Plaintext: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Ciphertext: BA1CBC06977ECE57C5CBC12D99324E00 -Test: Encrypt -Comment: Set 3, vector 245 -Key: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Plaintext: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Ciphertext: 01C8561E24A32F53FBAF8864AEE803E3 -Test: Encrypt -Comment: Set 3, vector 246 -Key: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Plaintext: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Ciphertext: 797ECFA429014F26B9E62D58B4C1B84E -Test: Encrypt -Comment: Set 3, vector 247 -Key: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Plaintext: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Ciphertext: 6AD7FA698A7F3EA8AE13B1DF537BF6EA -Test: Encrypt -Comment: Set 3, vector 248 -Key: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Plaintext: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Ciphertext: 49157343BE8B8ED4E59C1AEC3CAB1B94 -Test: Encrypt -Comment: Set 3, vector 249 -Key: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Plaintext: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Ciphertext: D33C742DEA4A2C64983766E3068EC200 -Test: Encrypt -Comment: Set 3, vector 250 -Key: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Plaintext: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Ciphertext: 66AE1EAFB45091982E40000BADE002C9 -Test: Encrypt -Comment: Set 3, vector 251 -Key: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Plaintext: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Ciphertext: B6614B0FF5924D0C1EB2C461560BFC01 -Test: Encrypt -Comment: Set 3, vector 252 -Key: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Plaintext: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Ciphertext: 5B4DFBE2BB7666425A858C4769D8DAD0 -Test: Encrypt -Comment: Set 3, vector 253 -Key: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Plaintext: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Ciphertext: 2F142B9044DEC39915ED9347E7B0ED1E -Test: Encrypt -Comment: Set 3, vector 254 -Key: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Plaintext: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Ciphertext: 17E02528D6655CEA7BE6B8548FC2DA65 -Test: Encrypt -Comment: Set 3, vector 255 -Key: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Plaintext: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Ciphertext: 25DD9EB9DD67FBC6E8431F56F4FBE651 -Test: Encrypt -Comment: Tests with 192-bit keys -Comment: Set 1, vector 0 -Key: 800000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1B6220D365C2176C1D41A5826520FCA1 -Test: Encrypt -Comment: Set 1, vector 1 -Key: 400000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0F6DAEEA95CFC8925F23AFA932DF489B -Test: Encrypt -Comment: Set 1, vector 2 -Key: 200000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7330199225AD384F8DD39582D61389BB -Test: Encrypt -Comment: Set 1, vector 3 -Key: 100000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2CC5A47D5C62F70634E27BA332D37D53 -Test: Encrypt -Comment: Set 1, vector 4 -Key: 080000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CDF1D23AB15E20AE8E9A2FE380920897 -Test: Encrypt -Comment: Set 1, vector 5 -Key: 040000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CE995A8AF1FD7E0F5FA07ED654841EEE -Test: Encrypt -Comment: Set 1, vector 6 -Key: 020000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0678BA4335E44354363005F278AF83A4 -Test: Encrypt -Comment: Set 1, vector 7 -Key: 010000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6162ED593434D738B44D642254066FB4 -Test: Encrypt -Comment: Set 1, vector 8 -Key: 008000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F7F146E61396EC9AB9F7D04BFA6D37F5 -Test: Encrypt -Comment: Set 1, vector 9 -Key: 004000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8BF96FE41906AF2CC702726B963E56A6 -Test: Encrypt -Comment: Set 1, vector 10 -Key: 002000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B164168F7D6BADBCCBE19B2BCF4EAA91 -Test: Encrypt -Comment: Set 1, vector 11 -Key: 001000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5A81508260797F7BCFD4E0DB62F5E3A7 -Test: Encrypt -Comment: Set 1, vector 12 -Key: 000800000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 36641169D53E61CB32B97B98C37DF262 -Test: Encrypt -Comment: Set 1, vector 13 -Key: 000400000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EFFEC137ECEE5D439F8B21ACE1D863F8 -Test: Encrypt -Comment: Set 1, vector 14 -Key: 000200000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7462DEB8C153EECB6C78CE690E764B53 -Test: Encrypt -Comment: Set 1, vector 15 -Key: 000100000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 34F873BD3D6FF62B18C3778B123B15C5 -Test: Encrypt -Comment: Set 1, vector 16 -Key: 000080000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9850C8E08F952EE1D173B1A4A78686F5 -Test: Encrypt -Comment: Set 1, vector 17 -Key: 000040000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3285534795E8547B68580343DC5BF330 -Test: Encrypt -Comment: Set 1, vector 18 -Key: 000020000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E0495AA72CB3C27233850F3192254232 -Test: Encrypt -Comment: Set 1, vector 19 -Key: 000010000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 33ED350E83B7FE34E74C22A883EC6728 -Test: Encrypt -Comment: Set 1, vector 20 -Key: 000008000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 912D73428CBA7F631AE577854C111C91 -Test: Encrypt -Comment: Set 1, vector 21 -Key: 000004000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 76E747DC49B25D8E6EBE5DE83980AB57 -Test: Encrypt -Comment: Set 1, vector 22 -Key: 000002000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 82A2ED3BE0371C98C176AA7E7DF9FF8D -Test: Encrypt -Comment: Set 1, vector 23 -Key: 000001000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 96282A04DD3405294F9714B396D5219A -Test: Encrypt -Comment: Set 1, vector 24 -Key: 000000800000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 86ECD349003006A6DE29D4AAC1ACE296 -Test: Encrypt -Comment: Set 1, vector 25 -Key: 000000400000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7A9A9F2BBEA203ECE7C9F531B6D41B6A -Test: Encrypt -Comment: Set 1, vector 26 -Key: 000000200000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BA5FE8CD976DEA118728C2950D325042 -Test: Encrypt -Comment: Set 1, vector 27 -Key: 000000100000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 46F29ADE35C839AE69454CB0C9EEBF71 -Test: Encrypt -Comment: Set 1, vector 28 -Key: 000000080000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E5B83E23535FC32DD8153C46EC894FAD -Test: Encrypt -Comment: Set 1, vector 29 -Key: 000000040000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 877CC6280A8E7740F710AEA535DADFD4 -Test: Encrypt -Comment: Set 1, vector 30 -Key: 000000020000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 284D6EEC89721D40BDCFD260AF4FF052 -Test: Encrypt -Comment: Set 1, vector 31 -Key: 000000010000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6482ED6C71B60F1ED92B9913B5EAF6B3 -Test: Encrypt -Comment: Set 1, vector 32 -Key: 000000008000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 30135C97C9C23C8C64612D6BB813AD61 -Test: Encrypt -Comment: Set 1, vector 33 -Key: 000000004000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 336F70CF867920BBC00699CA8DBDF6DA -Test: Encrypt -Comment: Set 1, vector 34 -Key: 000000002000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3F4003C9600469670DE0B1B20ED5F33D -Test: Encrypt -Comment: Set 1, vector 35 -Key: 000000001000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9D5FFEDF7166F74DCAF2D643E2934ABE -Test: Encrypt -Comment: Set 1, vector 36 -Key: 000000000800000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9BFAC0EEB78A21F006DB6847CC7D7929 -Test: Encrypt -Comment: Set 1, vector 37 -Key: 000000000400000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B64332DC813BE982897C1E14DA808F5D -Test: Encrypt -Comment: Set 1, vector 38 -Key: 000000000200000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AB8FCEB76C37E5FE5737DA4382F14347 -Test: Encrypt -Comment: Set 1, vector 39 -Key: 000000000100000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C9C121859975147145AF6CAE313BA00D -Test: Encrypt -Comment: Set 1, vector 40 -Key: 000000000080000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9B1307BF36B6FF5BA4AD9C6574B63955 -Test: Encrypt -Comment: Set 1, vector 41 -Key: 000000000040000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8842C3EBB26C1863440D52DC3B26414B -Test: Encrypt -Comment: Set 1, vector 42 -Key: 000000000020000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: ADEADD3E035D591B2197D5B9C9B06ADA -Test: Encrypt -Comment: Set 1, vector 43 -Key: 000000000010000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4F36AD57F9BA5FB6624E504D0FC2DC93 -Test: Encrypt -Comment: Set 1, vector 44 -Key: 000000000008000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 92A364EEB2D964949210C7FF14BAE7B5 -Test: Encrypt -Comment: Set 1, vector 45 -Key: 000000000004000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EA027B9653456B8A41910FE19A90FD50 -Test: Encrypt -Comment: Set 1, vector 46 -Key: 000000000002000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 254A41CA04427C9E87F65BB52A0ACF74 -Test: Encrypt -Comment: Set 1, vector 47 -Key: 000000000001000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F935FD318C08AC6CD57A028384FA447B -Test: Encrypt -Comment: Set 1, vector 48 -Key: 000000000000800000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E5BA10850CBCFF8F42FEC0E658685096 -Test: Encrypt -Comment: Set 1, vector 49 -Key: 000000000000400000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6F145C7015923CE515D78CEF0157CCC6 -Test: Encrypt -Comment: Set 1, vector 50 -Key: 000000000000200000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3A6FCA03EA6DBF6996FD2CE99EC17C31 -Test: Encrypt -Comment: Set 1, vector 51 -Key: 000000000000100000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 21E2ED82498B110EAEAD90F1BBEA03A6 -Test: Encrypt -Comment: Set 1, vector 52 -Key: 000000000000080000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6B16ED3CBADC3151323891C373C43DFB -Test: Encrypt -Comment: Set 1, vector 53 -Key: 000000000000040000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B621A20E0CA41620C2A483154DB6102C -Test: Encrypt -Comment: Set 1, vector 54 -Key: 000000000000020000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8C754011BD3B87AA1EB3607B98E6CE86 -Test: Encrypt -Comment: Set 1, vector 55 -Key: 000000000000010000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FEEE2DFBA1DD3DBF4017B13833117816 -Test: Encrypt -Comment: Set 1, vector 56 -Key: 000000000000008000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 62A9C6CC76519FCF8FAD9EED0552CEB3 -Test: Encrypt -Comment: Set 1, vector 57 -Key: 000000000000004000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FF822FAFB79035AB813246BA5234D675 -Test: Encrypt -Comment: Set 1, vector 58 -Key: 000000000000002000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F3E17F2406DF31E7074DF97B062396B9 -Test: Encrypt -Comment: Set 1, vector 59 -Key: 000000000000001000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3F4F81B3573B6756ADD3005087EDE501 -Test: Encrypt -Comment: Set 1, vector 60 -Key: 000000000000000800000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 65A03A1A1C44191B73D576B7C75B5C32 -Test: Encrypt -Comment: Set 1, vector 61 -Key: 000000000000000400000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B08EBB2097DA76C34E2D8A869DCD3D7D -Test: Encrypt -Comment: Set 1, vector 62 -Key: 000000000000000200000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BA7B88E1B1FCFA03C3DBB2EDE047F5DC -Test: Encrypt -Comment: Set 1, vector 63 -Key: 000000000000000100000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1B3CB3884C12691CC66202EDB0838106 -Test: Encrypt -Comment: Set 1, vector 64 -Key: 000000000000000080000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4A85BE25546958B1E91801A35C7386E2 -Test: Encrypt -Comment: Set 1, vector 65 -Key: 000000000000000040000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F14CAACDD919872396DBCDCBEF9A384C -Test: Encrypt -Comment: Set 1, vector 66 -Key: 000000000000000020000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 23B0D4FC870309DFEF7AFC04C46AF26A -Test: Encrypt -Comment: Set 1, vector 67 -Key: 000000000000000010000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C93604723C3DBBC66AFF87AB1864C76C -Test: Encrypt -Comment: Set 1, vector 68 -Key: 000000000000000008000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6C14E822857BA0983AAC42995D973092 -Test: Encrypt -Comment: Set 1, vector 69 -Key: 000000000000000004000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 700AFEA175DBEAE688F90B8D32990560 -Test: Encrypt -Comment: Set 1, vector 70 -Key: 000000000000000002000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 54AE9EFA09FC70A852212752B83AF1F2 -Test: Encrypt -Comment: Set 1, vector 71 -Key: 000000000000000001000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2474EF8E660333FC9763E137DDB1AA1F -Test: Encrypt -Comment: Set 1, vector 72 -Key: 000000000000000000800000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E52ECE1281186644B6A2228A89BD2304 -Test: Encrypt -Comment: Set 1, vector 73 -Key: 000000000000000000400000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 610A02ECEC1B5BA0C6EC7CE8D6197722 -Test: Encrypt -Comment: Set 1, vector 74 -Key: 000000000000000000200000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8A8AB3DA5CE37E1D68B496F110E4F941 -Test: Encrypt -Comment: Set 1, vector 75 -Key: 000000000000000000100000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6961F3A7E6550753C55E4C03FA7869E9 -Test: Encrypt -Comment: Set 1, vector 76 -Key: 000000000000000000080000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D8F149C207FAD4480BA2FC609BEB4471 -Test: Encrypt -Comment: Set 1, vector 77 -Key: 000000000000000000040000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DE9DC95336F2088935881DD57C0A4B98 -Test: Encrypt -Comment: Set 1, vector 78 -Key: 000000000000000000020000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DC4EA3B0F76439DB8847FE61C1A64F7A -Test: Encrypt -Comment: Set 1, vector 79 -Key: 000000000000000000010000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 21D4802EB72232AD2B0B46C50C98445B -Test: Encrypt -Comment: Set 1, vector 80 -Key: 000000000000000000008000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D6C32522B546BAC316E5F3A07F83FFE6 -Test: Encrypt -Comment: Set 1, vector 81 -Key: 000000000000000000004000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4B07B02C86B579A0C68D916DF8A1EB76 -Test: Encrypt -Comment: Set 1, vector 82 -Key: 000000000000000000002000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 060B15735C978DF9F4F3ED503B95D6C3 -Test: Encrypt -Comment: Set 1, vector 83 -Key: 000000000000000000001000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3040B3C9C560C968FE14664E3496D5D1 -Test: Encrypt -Comment: Set 1, vector 84 -Key: 000000000000000000000800000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8971CFB236598BBD46E47E172B0690F7 -Test: Encrypt -Comment: Set 1, vector 85 -Key: 000000000000000000000400000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8D7FAB4985A0BAC4CAEE341972D49CF4 -Test: Encrypt -Comment: Set 1, vector 86 -Key: 000000000000000000000200000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: ED29003D83CB7D7747C17A8691323021 -Test: Encrypt -Comment: Set 1, vector 87 -Key: 000000000000000000000100000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 98EBFDA32C99438F0A549B7BFAAC0635 -Test: Encrypt -Comment: Set 1, vector 88 -Key: 000000000000000000000080000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A59AB8EAF03BCDFD7CB0A9650E59F27B -Test: Encrypt -Comment: Set 1, vector 89 -Key: 000000000000000000000040000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 71422297CE93952D46FFC27530D6255D -Test: Encrypt -Comment: Set 1, vector 90 -Key: 000000000000000000000020000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 519E2607543C3AFE49190EBCA12ADBBC -Test: Encrypt -Comment: Set 1, vector 91 -Key: 000000000000000000000010000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8989C908C50E008E70EA5B897DC3544C -Test: Encrypt -Comment: Set 1, vector 92 -Key: 000000000000000000000008000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 981C174277F29F8DD06E1D4C97D9816F -Test: Encrypt -Comment: Set 1, vector 93 -Key: 000000000000000000000004000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0279DEC16A532E160AA5B4FF7682F696 -Test: Encrypt -Comment: Set 1, vector 94 -Key: 000000000000000000000002000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C3BFFB31FCB0A61188DE9AA606CB286C -Test: Encrypt -Comment: Set 1, vector 95 -Key: 000000000000000000000001000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5C1C4966B387A41D52F83BBF322D25DF -Test: Encrypt -Comment: Set 1, vector 96 -Key: 000000000000000000000000800000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6602ECC6AF62EF1EB4D17E2487A64F7A -Test: Encrypt -Comment: Set 1, vector 97 -Key: 000000000000000000000000400000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2DA725366BD7774BA235183CC9B273B4 -Test: Encrypt -Comment: Set 1, vector 98 -Key: 000000000000000000000000200000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 71B29CF87C313F0B89B75251EFC4FF7F -Test: Encrypt -Comment: Set 1, vector 99 -Key: 000000000000000000000000100000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4D9BDBCBA04C54AEAA7F48470428ECA2 -Test: Encrypt -Comment: Set 1, vector 100 -Key: 000000000000000000000000080000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C6BC53A3C6D6C8A6F12B97B151BFBB3F -Test: Encrypt -Comment: Set 1, vector 101 -Key: 000000000000000000000000040000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FD3E8D6732BBC2AA13F03F9AB0BCEC14 -Test: Encrypt -Comment: Set 1, vector 102 -Key: 000000000000000000000000020000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7D5ED8FEF289FF7F8953278E0A0297A1 -Test: Encrypt -Comment: Set 1, vector 103 -Key: 000000000000000000000000010000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 84A20023EF5E31771802E8A2FFBA485B -Test: Encrypt -Comment: Set 1, vector 104 -Key: 000000000000000000000000008000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7BD6E573AE79F0FA9FE38ECF6011D756 -Test: Encrypt -Comment: Set 1, vector 105 -Key: 000000000000000000000000004000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EB58EA6B6DE1282A7BB9EA1A2254A542 -Test: Encrypt -Comment: Set 1, vector 106 -Key: 000000000000000000000000002000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 30A697E325C4D3BEC8E69A2DAD2AE5BB -Test: Encrypt -Comment: Set 1, vector 107 -Key: 000000000000000000000000001000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3205F6FEAA38500AC74BE66FEDF3231E -Test: Encrypt -Comment: Set 1, vector 108 -Key: 000000000000000000000000000800000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 83C007676041E81B836886ABED807A71 -Test: Encrypt -Comment: Set 1, vector 109 -Key: 000000000000000000000000000400000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 24B33B3138855437CC11D3792A1FD00F -Test: Encrypt -Comment: Set 1, vector 110 -Key: 000000000000000000000000000200000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 26324D7E2C055366910464699D73608A -Test: Encrypt -Comment: Set 1, vector 111 -Key: 000000000000000000000000000100000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F9A94A959AE7CD2A9D5FB7274703906B -Test: Encrypt -Comment: Set 1, vector 112 -Key: 000000000000000000000000000080000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AD13D85E47EFC76B67ED25791E119A5C -Test: Encrypt -Comment: Set 1, vector 113 -Key: 000000000000000000000000000040000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5FB689176B296F2E579FC69A18FA07EB -Test: Encrypt -Comment: Set 1, vector 114 -Key: 000000000000000000000000000020000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 936DFBA0A052A299C195F34A66C0CEDF -Test: Encrypt -Comment: Set 1, vector 115 -Key: 000000000000000000000000000010000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 486C03278BB30F26D25AE0D6348C9491 -Test: Encrypt -Comment: Set 1, vector 116 -Key: 000000000000000000000000000008000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FCE14E6CE2073B5E8D1572A1EC1BD502 -Test: Encrypt -Comment: Set 1, vector 117 -Key: 000000000000000000000000000004000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5F15B8A64EDBF0E55C3B8BB67BC9B2E1 -Test: Encrypt -Comment: Set 1, vector 118 -Key: 000000000000000000000000000002000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7BDC738A342891C7BE06E87E12F71418 -Test: Encrypt -Comment: Set 1, vector 119 -Key: 000000000000000000000000000001000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 31C6FEDABBC8C8AD64C27505F02BC7CC -Test: Encrypt -Comment: Set 1, vector 120 -Key: 000000000000000000000000000000800000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 33CCD97EB8C3C06B7BCD16659E1F9837 -Test: Encrypt -Comment: Set 1, vector 121 -Key: 000000000000000000000000000000400000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 12C3089895D4A1C1D03DB0071F88AB1B -Test: Encrypt -Comment: Set 1, vector 122 -Key: 000000000000000000000000000000200000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8EB4796C7F7C3B0858750EBE3BAA335C -Test: Encrypt -Comment: Set 1, vector 123 -Key: 000000000000000000000000000000100000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 67169AF324151E92C6B7C31687B83783 -Test: Encrypt -Comment: Set 1, vector 124 -Key: 000000000000000000000000000000080000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AB0E10564D41594B55CE3D5B088D93B4 -Test: Encrypt -Comment: Set 1, vector 125 -Key: 000000000000000000000000000000040000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 45228986B08E63728239ADC9C249E475 -Test: Encrypt -Comment: Set 1, vector 126 -Key: 000000000000000000000000000000020000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CA7E48D5A4CD15984CA9EF99EC789EFD -Test: Encrypt -Comment: Set 1, vector 127 -Key: 000000000000000000000000000000010000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B4DD56FF85F7ABBEB9E0F5AE6B0E491D -Test: Encrypt -Comment: Set 1, vector 128 -Key: 000000000000000000000000000000008000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 044BE36D2F5A3D0FEA74443538F55393 -Test: Encrypt -Comment: Set 1, vector 129 -Key: 000000000000000000000000000000004000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 531EC401FB7C3BFADF64BB08E0DD9992 -Test: Encrypt -Comment: Set 1, vector 130 -Key: 000000000000000000000000000000002000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EA8D6B6963EC2267050F8CF5D1D1D939 -Test: Encrypt -Comment: Set 1, vector 131 -Key: 000000000000000000000000000000001000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CF5D7F27462FF7415D4E5ECBAEE0797C -Test: Encrypt -Comment: Set 1, vector 132 -Key: 000000000000000000000000000000000800000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DF28B8322D4B8606FF3EFF09D39697B0 -Test: Encrypt -Comment: Set 1, vector 133 -Key: 000000000000000000000000000000000400000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 956EF889AAB218E21FAF8E9CC2AE41F9 -Test: Encrypt -Comment: Set 1, vector 134 -Key: 000000000000000000000000000000000200000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AD0CF3C46F420E96B876DD55515B4B80 -Test: Encrypt -Comment: Set 1, vector 135 -Key: 000000000000000000000000000000000100000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EC8620D3B9B456633AD174573CF82ABD -Test: Encrypt -Comment: Set 1, vector 136 -Key: 000000000000000000000000000000000080000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A7CC6C810C1433B8D130594A48A36F69 -Test: Encrypt -Comment: Set 1, vector 137 -Key: 000000000000000000000000000000000040000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B02C5AF13D523A2A62E9F3829F9E3364 -Test: Encrypt -Comment: Set 1, vector 138 -Key: 000000000000000000000000000000000020000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5AC8368EC6150F08CC2C44DBA8A9D84F -Test: Encrypt -Comment: Set 1, vector 139 -Key: 000000000000000000000000000000000010000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3BD51735D6087217EEF17B40750D701F -Test: Encrypt -Comment: Set 1, vector 140 -Key: 000000000000000000000000000000000008000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 330CC76A5529364B08F722C6206214E7 -Test: Encrypt -Comment: Set 1, vector 141 -Key: 000000000000000000000000000000000004000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 13CA2152CB81267D8429670A8D983592 -Test: Encrypt -Comment: Set 1, vector 142 -Key: 000000000000000000000000000000000002000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3943D67CE79CB8519EB9A5D1021988ED -Test: Encrypt -Comment: Set 1, vector 143 -Key: 000000000000000000000000000000000001000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 642858D825E8640718ABE6174BD04A32 -Test: Encrypt -Comment: Set 1, vector 144 -Key: 000000000000000000000000000000000000800000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F22616DE88A4CCBF97CF2DB709237EC7 -Test: Encrypt -Comment: Set 1, vector 145 -Key: 000000000000000000000000000000000000400000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B90D7F6BF0D9FC11A01F2B33194806DB -Test: Encrypt -Comment: Set 1, vector 146 -Key: 000000000000000000000000000000000000200000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C161D350DC897B210D0D0CE8CE78F4B4 -Test: Encrypt -Comment: Set 1, vector 147 -Key: 000000000000000000000000000000000000100000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 66E46482150E7CF9BCBE60AF7BCA6892 -Test: Encrypt -Comment: Set 1, vector 148 -Key: 000000000000000000000000000000000000080000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B17C912E085D8854F220555EB0FA89BD -Test: Encrypt -Comment: Set 1, vector 149 -Key: 000000000000000000000000000000000000040000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6FD6A99633FBD3A6D238CADF37824AD2 -Test: Encrypt -Comment: Set 1, vector 150 -Key: 000000000000000000000000000000000000020000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9DE6D76D9A7E4AAB7A58EECE0E153D73 -Test: Encrypt -Comment: Set 1, vector 151 -Key: 000000000000000000000000000000000000010000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B4716A7DB10E3B8D1475C7EFB929F93A -Test: Encrypt -Comment: Set 1, vector 152 -Key: 000000000000000000000000000000000000008000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3D0F65F16AD143FB2FABDF4DFE621398 -Test: Encrypt -Comment: Set 1, vector 153 -Key: 000000000000000000000000000000000000004000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 249F1415D963DE146F4141C200B81D1D -Test: Encrypt -Comment: Set 1, vector 154 -Key: 000000000000000000000000000000000000002000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 454CD7040ED3851C3894F6259CE0D3FE -Test: Encrypt -Comment: Set 1, vector 155 -Key: 000000000000000000000000000000000000001000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4D613EE6FA78A573ECBE989A64193E0C -Test: Encrypt -Comment: Set 1, vector 156 -Key: 000000000000000000000000000000000000000800000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B39384E429291B9C22005BC9B3FF2DEF -Test: Encrypt -Comment: Set 1, vector 157 -Key: 000000000000000000000000000000000000000400000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 957D0B27740C952E45DB97C8814F49C0 -Test: Encrypt -Comment: Set 1, vector 158 -Key: 000000000000000000000000000000000000000200000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2879F58F238865D877D8C276CA9E9102 -Test: Encrypt -Comment: Set 1, vector 159 -Key: 000000000000000000000000000000000000000100000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EA5B920037608FC9D51F39488D4666F7 -Test: Encrypt -Comment: Set 1, vector 160 -Key: 000000000000000000000000000000000000000080000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7659A705ABCA25205078541E713088BC -Test: Encrypt -Comment: Set 1, vector 161 -Key: 000000000000000000000000000000000000000040000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 47E340BB8BF2E8E1015BEFB68C7B1100 -Test: Encrypt -Comment: Set 1, vector 162 -Key: 000000000000000000000000000000000000000020000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 777E3E572CA33076B2CB34226CC70158 -Test: Encrypt -Comment: Set 1, vector 163 -Key: 000000000000000000000000000000000000000010000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1FEC7C6719C7CA2E9A981851C5CEE204 -Test: Encrypt -Comment: Set 1, vector 164 -Key: 000000000000000000000000000000000000000008000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9AF07DABE083EFDA75708A36AEB74CAF -Test: Encrypt -Comment: Set 1, vector 165 -Key: 000000000000000000000000000000000000000004000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5D1482F8EF9CB18911BB7F78BC3B89FC -Test: Encrypt -Comment: Set 1, vector 166 -Key: 000000000000000000000000000000000000000002000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5242753E01D470DD8C2B73A986BA009F -Test: Encrypt -Comment: Set 1, vector 167 -Key: 000000000000000000000000000000000000000001000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 83AE5BC112B73AB7978D13DD534B770B -Test: Encrypt -Comment: Set 1, vector 168 -Key: 000000000000000000000000000000000000000000800000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 848EB7330A82B91D36FBEFF6E6CE1347 -Test: Encrypt -Comment: Set 1, vector 169 -Key: 000000000000000000000000000000000000000000400000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F1B14465EFFD3E14DD1BAC6E0FA4E5BD -Test: Encrypt -Comment: Set 1, vector 170 -Key: 000000000000000000000000000000000000000000200000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5ACD25AA05AFD21F43F6A51709FD0B6A -Test: Encrypt -Comment: Set 1, vector 171 -Key: 000000000000000000000000000000000000000000100000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 12321AEFA53F1503E3A473F729388CBD -Test: Encrypt -Comment: Set 1, vector 172 -Key: 000000000000000000000000000000000000000000080000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1602DBA20E2ACFDDCC78390B473B322B -Test: Encrypt -Comment: Set 1, vector 173 -Key: 000000000000000000000000000000000000000000040000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 14C1853C3CF3CDFCE3799D5C130138EC -Test: Encrypt -Comment: Set 1, vector 174 -Key: 000000000000000000000000000000000000000000020000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DC17F9E8236350BDC285F9B2F88F670F -Test: Encrypt -Comment: Set 1, vector 175 -Key: 000000000000000000000000000000000000000000010000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: ABA03FEE8133DD4ED9B8194B643E20CE -Test: Encrypt -Comment: Set 1, vector 176 -Key: 000000000000000000000000000000000000000000008000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5822E80530C7CECCE4F56CF1691B386F -Test: Encrypt -Comment: Set 1, vector 177 -Key: 000000000000000000000000000000000000000000004000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 25CFA6F1B9BE5E14DFAF87A44B3B2E3D -Test: Encrypt -Comment: Set 1, vector 178 -Key: 000000000000000000000000000000000000000000002000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5ED866CBC298B4DEE46C1A02F958F1F5 -Test: Encrypt -Comment: Set 1, vector 179 -Key: 000000000000000000000000000000000000000000001000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BD2B63C026EB0E58D26ED16D2ED64A3E -Test: Encrypt -Comment: Set 1, vector 180 -Key: 000000000000000000000000000000000000000000000800 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9FFCFF9CF9E1483BC7971888246AF9FE -Test: Encrypt -Comment: Set 1, vector 181 -Key: 000000000000000000000000000000000000000000000400 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 367C409AEE218E02DEAC8751698BA1B8 -Test: Encrypt -Comment: Set 1, vector 182 -Key: 000000000000000000000000000000000000000000000200 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 248E3A3C0360B44C512A9AC3CAAEC21B -Test: Encrypt -Comment: Set 1, vector 183 -Key: 000000000000000000000000000000000000000000000100 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 49B47C542CA396260B53A34372985612 -Test: Encrypt -Comment: Set 1, vector 184 -Key: 000000000000000000000000000000000000000000000080 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CE35FDBDBE086EA8A501A4571925A95F -Test: Encrypt -Comment: Set 1, vector 185 -Key: 000000000000000000000000000000000000000000000040 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 873442FAE891B0767220742B84A32A4E -Test: Encrypt -Comment: Set 1, vector 186 -Key: 000000000000000000000000000000000000000000000020 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2C90E17AD13E4E84686BC5B369F0FA8F -Test: Encrypt -Comment: Set 1, vector 187 -Key: 000000000000000000000000000000000000000000000010 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0E7AAAA67D8593A9DFC55083B48B381A -Test: Encrypt -Comment: Set 1, vector 188 -Key: 000000000000000000000000000000000000000000000008 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1D8B58EE529AB17B10AC15D0E6E7ECB2 -Test: Encrypt -Comment: Set 1, vector 189 -Key: 000000000000000000000000000000000000000000000004 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1C10FAC725B905AD93B6F4B2430A8D18 -Test: Encrypt -Comment: Set 1, vector 190 -Key: 000000000000000000000000000000000000000000000002 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D36CF625EE94AB029CD23253C77C0E15 -Test: Encrypt -Comment: Set 1, vector 191 -Key: 000000000000000000000000000000000000000000000001 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E37577F71E0E643C4D3F55219ABA1394 -Test: Encrypt -Comment: Set 2, vector 0 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 80000000000000000000000000000000 -Ciphertext: 3EB6CC5618EFC98455B5992050D474E7 -Test: Encrypt -Comment: Set 2, vector 1 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 40000000000000000000000000000000 -Ciphertext: A2C645044CBC74DE5A4A161C6B2E98B9 -Test: Encrypt -Comment: Set 2, vector 2 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 20000000000000000000000000000000 -Ciphertext: 36A9A8C164BD90D4972AB1BE56C96A0B -Test: Encrypt -Comment: Set 2, vector 3 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 10000000000000000000000000000000 -Ciphertext: 38965592D728F9B765140C0A36A1BCCD -Test: Encrypt -Comment: Set 2, vector 4 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 08000000000000000000000000000000 -Ciphertext: 94CDECA78E10827914A49B5AE7F15643 -Test: Encrypt -Comment: Set 2, vector 5 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 04000000000000000000000000000000 -Ciphertext: 11C0DF672B45CDCD311EB86A7560EDA1 -Test: Encrypt -Comment: Set 2, vector 6 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 02000000000000000000000000000000 -Ciphertext: 030CAA9B8DE6F8AB88882F9596D9B1B4 -Test: Encrypt -Comment: Set 2, vector 7 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 01000000000000000000000000000000 -Ciphertext: FA02C8D1CDDD08B1FE3650DBD8E43C4F -Test: Encrypt -Comment: Set 2, vector 8 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00800000000000000000000000000000 -Ciphertext: 10ACEC25736340600D712338357C7FD4 -Test: Encrypt -Comment: Set 2, vector 9 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00400000000000000000000000000000 -Ciphertext: BBEF172E9E18679C6546EA2D9357BDD1 -Test: Encrypt -Comment: Set 2, vector 10 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00200000000000000000000000000000 -Ciphertext: 707CF6F582F5921765DBC6E1C79C45B6 -Test: Encrypt -Comment: Set 2, vector 11 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00100000000000000000000000000000 -Ciphertext: 3E9206A85F9FE99CD5538FA196E58147 -Test: Encrypt -Comment: Set 2, vector 12 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00080000000000000000000000000000 -Ciphertext: 6758B118659E9BB40BB7DC8C3D15ECEC -Test: Encrypt -Comment: Set 2, vector 13 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00040000000000000000000000000000 -Ciphertext: 9BCA6C88B928C1B0F57F99866583A9BC -Test: Encrypt -Comment: Set 2, vector 14 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00020000000000000000000000000000 -Ciphertext: 53D60CF8CA0B41B3991EF892917FA26F -Test: Encrypt -Comment: Set 2, vector 15 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00010000000000000000000000000000 -Ciphertext: 49E438685E189FB95791C655FBF40B3B -Test: Encrypt -Comment: Set 2, vector 16 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00008000000000000000000000000000 -Ciphertext: 6BFE6661C074077EF95DC499CA30A6B9 -Test: Encrypt -Comment: Set 2, vector 17 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00004000000000000000000000000000 -Ciphertext: FE82A6754DD56ACBD1895F8257597B74 -Test: Encrypt -Comment: Set 2, vector 18 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00002000000000000000000000000000 -Ciphertext: AF4551CFCEAEF2AEE1933C4AB5F036F5 -Test: Encrypt -Comment: Set 2, vector 19 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00001000000000000000000000000000 -Ciphertext: 5175E53EA4CA77E085363B2948B77B17 -Test: Encrypt -Comment: Set 2, vector 20 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000800000000000000000000000000 -Ciphertext: 19F544B2B2AAE4AF00DE2853F83349A5 -Test: Encrypt -Comment: Set 2, vector 21 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000400000000000000000000000000 -Ciphertext: 45A4379AC855738F6FEE3AFFBB2D839F -Test: Encrypt -Comment: Set 2, vector 22 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000200000000000000000000000000 -Ciphertext: 73A390407DD07D4ABEB299A5051A8DD1 -Test: Encrypt -Comment: Set 2, vector 23 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000100000000000000000000000000 -Ciphertext: 923B1E3525217E5C7A41CE3BCAE7C083 -Test: Encrypt -Comment: Set 2, vector 24 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000080000000000000000000000000 -Ciphertext: F58098D6E68E975C922B05354C0E2094 -Test: Encrypt -Comment: Set 2, vector 25 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000040000000000000000000000000 -Ciphertext: 371631601CE2BED9B7706FA4254BBAE5 -Test: Encrypt -Comment: Set 2, vector 26 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000020000000000000000000000000 -Ciphertext: 794F34CD64B44095BAB5C470B36E60BE -Test: Encrypt -Comment: Set 2, vector 27 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000010000000000000000000000000 -Ciphertext: 1A4CE8CBFEDB4F64B1A64D926B9BE3A1 -Test: Encrypt -Comment: Set 2, vector 28 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000008000000000000000000000000 -Ciphertext: 11C391C85F8FCF72EB03E1C4CC40B529 -Test: Encrypt -Comment: Set 2, vector 29 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000004000000000000000000000000 -Ciphertext: 9D8ADDC48EC36BB449234C7C06BEDC0F -Test: Encrypt -Comment: Set 2, vector 30 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000002000000000000000000000000 -Ciphertext: 952A1FAD7FAEA148FA31B50C244CF5C4 -Test: Encrypt -Comment: Set 2, vector 31 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000001000000000000000000000000 -Ciphertext: 613E5E9BBBF1B9943B3B5CBD3E69C98F -Test: Encrypt -Comment: Set 2, vector 32 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000800000000000000000000000 -Ciphertext: 5ABF9CB600BB50DB64211DE2DEAEEDBA -Test: Encrypt -Comment: Set 2, vector 33 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000400000000000000000000000 -Ciphertext: 14697658FDA5B1F14C3303F5951CAE70 -Test: Encrypt -Comment: Set 2, vector 34 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000200000000000000000000000 -Ciphertext: 2A29179C05F2F5F5909A34130B92BB25 -Test: Encrypt -Comment: Set 2, vector 35 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000100000000000000000000000 -Ciphertext: 60A9DAB8068CC085F3B9853D0C1FCF07 -Test: Encrypt -Comment: Set 2, vector 36 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000080000000000000000000000 -Ciphertext: D625356ACCE7B9F874754AE52FD1C7BF -Test: Encrypt -Comment: Set 2, vector 37 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000040000000000000000000000 -Ciphertext: 31196A29DAA0A41E982819C26AF0567A -Test: Encrypt -Comment: Set 2, vector 38 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000020000000000000000000000 -Ciphertext: D1763FC019D77CC930BFF2A56F7C9364 -Test: Encrypt -Comment: Set 2, vector 39 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000010000000000000000000000 -Ciphertext: BBC9D3C96666B01D0C33CC067ADDA228 -Test: Encrypt -Comment: Set 2, vector 40 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000008000000000000000000000 -Ciphertext: 4FC9284574F433DD6C5ADEAB6DC64A06 -Test: Encrypt -Comment: Set 2, vector 41 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000004000000000000000000000 -Ciphertext: 7176B9E3628380ADDCF02493DB254B01 -Test: Encrypt -Comment: Set 2, vector 42 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000002000000000000000000000 -Ciphertext: C6B124A17B3AB55A983DC2B6E8253FF1 -Test: Encrypt -Comment: Set 2, vector 43 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000001000000000000000000000 -Ciphertext: 5853A6B6AB0FC47DEBA33526B628DF6E -Test: Encrypt -Comment: Set 2, vector 44 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000800000000000000000000 -Ciphertext: 416945C1D1902238C42955CFF166D705 -Test: Encrypt -Comment: Set 2, vector 45 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000400000000000000000000 -Ciphertext: 2478F40DC7B7FA98E59DA21F1D2140F9 -Test: Encrypt -Comment: Set 2, vector 46 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000200000000000000000000 -Ciphertext: 6A912316499FBECA17D1683EAF79FDC9 -Test: Encrypt -Comment: Set 2, vector 47 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000100000000000000000000 -Ciphertext: 8A41DB2271FD345BC1DDE61A427E4E3E -Test: Encrypt -Comment: Set 2, vector 48 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000080000000000000000000 -Ciphertext: B6C62C6A14D2276C8FE8D1062C1E8080 -Test: Encrypt -Comment: Set 2, vector 49 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000040000000000000000000 -Ciphertext: D23F90169810210A45BD9B8681B24C34 -Test: Encrypt -Comment: Set 2, vector 50 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000020000000000000000000 -Ciphertext: EDB2A77815A074B50D88C6C2B15AF814 -Test: Encrypt -Comment: Set 2, vector 51 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000010000000000000000000 -Ciphertext: 2D6D81C8FDD2C7D5B98317488846969D -Test: Encrypt -Comment: Set 2, vector 52 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000008000000000000000000 -Ciphertext: 92F2805613A82EE25568B32ED7550DCC -Test: Encrypt -Comment: Set 2, vector 53 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000004000000000000000000 -Ciphertext: E321480A1DE5F36040F1FD170F24802B -Test: Encrypt -Comment: Set 2, vector 54 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000002000000000000000000 -Ciphertext: 3188FFADE35652067E6E2228130762D6 -Test: Encrypt -Comment: Set 2, vector 55 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000001000000000000000000 -Ciphertext: B3A3A43D68A82EC54B5D437346375584 -Test: Encrypt -Comment: Set 2, vector 56 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000800000000000000000 -Ciphertext: 023ECF3BD9FEB4891366ABE45EC1728B -Test: Encrypt -Comment: Set 2, vector 57 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000400000000000000000 -Ciphertext: 50D8160676748E1718A030F4F512C1C2 -Test: Encrypt -Comment: Set 2, vector 58 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000200000000000000000 -Ciphertext: 30DF20541978D9C96D43D609DEF39C00 -Test: Encrypt -Comment: Set 2, vector 59 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000100000000000000000 -Ciphertext: BA1AA1682750C0CEB2A87E1A46A7CE0E -Test: Encrypt -Comment: Set 2, vector 60 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000080000000000000000 -Ciphertext: 03AC8261D8F98C90B9CE9C9E47A39AA5 -Test: Encrypt -Comment: Set 2, vector 61 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000040000000000000000 -Ciphertext: 4C6C2FDC2693F2A43EAEB180AD8190F8 -Test: Encrypt -Comment: Set 2, vector 62 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000020000000000000000 -Ciphertext: B65D2C8CEE12BB4FA127356632CB0ECA -Test: Encrypt -Comment: Set 2, vector 63 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000010000000000000000 -Ciphertext: 6D785867F379BCE03580ED9DE83C0EFD -Test: Encrypt -Comment: Set 2, vector 64 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000008000000000000000 -Ciphertext: D2B25B3EECB454DCE070D11C408D73B2 -Test: Encrypt -Comment: Set 2, vector 65 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000004000000000000000 -Ciphertext: 8035FF5E625955D6328F570D53188C0C -Test: Encrypt -Comment: Set 2, vector 66 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000002000000000000000 -Ciphertext: A8BECF868B0D964E04012BE5F8121A9C -Test: Encrypt -Comment: Set 2, vector 67 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000001000000000000000 -Ciphertext: AA76DF2E83C0D31ECFE66A62E16A91D3 -Test: Encrypt -Comment: Set 2, vector 68 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000800000000000000 -Ciphertext: BAA324177EA5AF61ADBD27F594297278 -Test: Encrypt -Comment: Set 2, vector 69 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000400000000000000 -Ciphertext: 40BBEB33938AFA9BD566991B53B0FDA7 -Test: Encrypt -Comment: Set 2, vector 70 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000200000000000000 -Ciphertext: 6F58204780BEA9102506C477CBB3C8FE -Test: Encrypt -Comment: Set 2, vector 71 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000100000000000000 -Ciphertext: D296BCA9261A3410E47FA289BD70B955 -Test: Encrypt -Comment: Set 2, vector 72 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000080000000000000 -Ciphertext: 4C57FB4234A64462C6D441A782723777 -Test: Encrypt -Comment: Set 2, vector 73 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000040000000000000 -Ciphertext: 33478DE51DBDA949E17CB82373DAF866 -Test: Encrypt -Comment: Set 2, vector 74 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000020000000000000 -Ciphertext: 7CC11B9A6A9E2CE13D3596686C624AF0 -Test: Encrypt -Comment: Set 2, vector 75 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000010000000000000 -Ciphertext: 0C55ACA2BDA80E8F84A3879FF077802A -Test: Encrypt -Comment: Set 2, vector 76 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000008000000000000 -Ciphertext: 885B84843BADC6501CBDCBEA4386AB7F -Test: Encrypt -Comment: Set 2, vector 77 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000004000000000000 -Ciphertext: DCF23815FEF1697B0618E205B637648A -Test: Encrypt -Comment: Set 2, vector 78 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000002000000000000 -Ciphertext: BF5EBE09157E65743AAD033473B0DFED -Test: Encrypt -Comment: Set 2, vector 79 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000001000000000000 -Ciphertext: 1E9E5E1032307B75915E9BD48205FEB8 -Test: Encrypt -Comment: Set 2, vector 80 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000800000000000 -Ciphertext: 0EB8AC09A10303A7CE9762C1B029F0E0 -Test: Encrypt -Comment: Set 2, vector 81 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000400000000000 -Ciphertext: 2A42627713BFC603A88AD1D66292B80C -Test: Encrypt -Comment: Set 2, vector 82 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000200000000000 -Ciphertext: D7E9512485B9E5E409FB51E26D269795 -Test: Encrypt -Comment: Set 2, vector 83 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000100000000000 -Ciphertext: 57CC59F8B92D73E1B38EEE405A8EC12F -Test: Encrypt -Comment: Set 2, vector 84 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000080000000000 -Ciphertext: 161783F5FFC9A383E36B80A2032A71F1 -Test: Encrypt -Comment: Set 2, vector 85 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000040000000000 -Ciphertext: F5B24CE20FFD8702AC63F9C844BC5730 -Test: Encrypt -Comment: Set 2, vector 86 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000020000000000 -Ciphertext: 440930601D4013076587D882A1958280 -Test: Encrypt -Comment: Set 2, vector 87 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000010000000000 -Ciphertext: AEA4C3F9E520651C5FE38B915423843F -Test: Encrypt -Comment: Set 2, vector 88 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000008000000000 -Ciphertext: E300D7417C4F547DBCD5FC84E3833A7B -Test: Encrypt -Comment: Set 2, vector 89 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000004000000000 -Ciphertext: 5543860CE9247B38E8D0E7B216C0B5A5 -Test: Encrypt -Comment: Set 2, vector 90 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000002000000000 -Ciphertext: C20449053BF90C899899EE02794DB3C5 -Test: Encrypt -Comment: Set 2, vector 91 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000001000000000 -Ciphertext: AC0CB3B34AC32244CF196AE49E94D380 -Test: Encrypt -Comment: Set 2, vector 92 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000800000000 -Ciphertext: 0CDF3F25852287E3BAFAF490DE18D125 -Test: Encrypt -Comment: Set 2, vector 93 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000400000000 -Ciphertext: 583BB44512CE75268F72E6BC6682901B -Test: Encrypt -Comment: Set 2, vector 94 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000200000000 -Ciphertext: 217140522F0C505FDAC4BFDE6E9D9A81 -Test: Encrypt -Comment: Set 2, vector 95 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000100000000 -Ciphertext: CFA59EB13DDD780A2EAEF89E83737C9A -Test: Encrypt -Comment: Set 2, vector 96 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000080000000 -Ciphertext: 75E473CCD4D116426753B44900D919A6 -Test: Encrypt -Comment: Set 2, vector 97 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000040000000 -Ciphertext: E15E4627F7F8A3F09424D3D5CAC1C777 -Test: Encrypt -Comment: Set 2, vector 98 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000020000000 -Ciphertext: B83E20A23802D8755A2E850242B64EEF -Test: Encrypt -Comment: Set 2, vector 99 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000010000000 -Ciphertext: E6790AF3911360F28FD17886DD311F88 -Test: Encrypt -Comment: Set 2, vector 100 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000008000000 -Ciphertext: 0A6304DF33E409C8A21E1C19187183FF -Test: Encrypt -Comment: Set 2, vector 101 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000004000000 -Ciphertext: 51966561DA7ED5F30130B55CD108B5BE -Test: Encrypt -Comment: Set 2, vector 102 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000002000000 -Ciphertext: 0ECA40693BF4CB41FDD15BCFD8C9D9B9 -Test: Encrypt -Comment: Set 2, vector 103 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000001000000 -Ciphertext: 8731B42742ADBA2D89C9BA90EBD4E42A -Test: Encrypt -Comment: Set 2, vector 104 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000800000 -Ciphertext: BE4C6C18AA231E9BB13909242CC92EE3 -Test: Encrypt -Comment: Set 2, vector 105 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000400000 -Ciphertext: 39AC45537E9AFDC6C8BDD4204039A218 -Test: Encrypt -Comment: Set 2, vector 106 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000200000 -Ciphertext: AEA354F16E1E8EECEB5A98D88418B1A0 -Test: Encrypt -Comment: Set 2, vector 107 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000100000 -Ciphertext: 4F5D37D7D0DC7714E62BE4A0331DB07B -Test: Encrypt -Comment: Set 2, vector 108 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000080000 -Ciphertext: 9603F03C3CAA8C2F0ECFBA1374891007 -Test: Encrypt -Comment: Set 2, vector 109 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000040000 -Ciphertext: C58768944996884B46A8FFDDB9AB87EF -Test: Encrypt -Comment: Set 2, vector 110 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000020000 -Ciphertext: 3BCCF2396A97FC1C0CFFFB6ED41716DB -Test: Encrypt -Comment: Set 2, vector 111 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000010000 -Ciphertext: DC299278DCA45AC1B6B08ED4B62D9BC9 -Test: Encrypt -Comment: Set 2, vector 112 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000008000 -Ciphertext: E195AECA31E10241BD0EC4AC5418A25D -Test: Encrypt -Comment: Set 2, vector 113 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000004000 -Ciphertext: B397A4983ED647A0EB806ACDFE7BCB34 -Test: Encrypt -Comment: Set 2, vector 114 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000002000 -Ciphertext: BC8F7224B0447E8A1CF0F5506A060F3C -Test: Encrypt -Comment: Set 2, vector 115 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000001000 -Ciphertext: FFD3ED02E7F64A5D6B37A9DC5E531646 -Test: Encrypt -Comment: Set 2, vector 116 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000800 -Ciphertext: BC6019EB208B7AF8EFA6AE7B4CA0556B -Test: Encrypt -Comment: Set 2, vector 117 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000400 -Ciphertext: D2915AE2779F8F70E17CE953C6C1A380 -Test: Encrypt -Comment: Set 2, vector 118 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000200 -Ciphertext: B2AA4B1ED2285C9DA4088B6E9681C690 -Test: Encrypt -Comment: Set 2, vector 119 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000100 -Ciphertext: BE0D64EA88A3FF27C8DFCE13F13A4E1F -Test: Encrypt -Comment: Set 2, vector 120 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000080 -Ciphertext: D7629F1DD395A985AF9497F6ACB4EDA1 -Test: Encrypt -Comment: Set 2, vector 121 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000040 -Ciphertext: 33FDF72DA1D8815DE2DBE81D97DDC6F8 -Test: Encrypt -Comment: Set 2, vector 122 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000020 -Ciphertext: D35742045F3DF8D184D6CC58EB9DE323 -Test: Encrypt -Comment: Set 2, vector 123 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000010 -Ciphertext: DE6469D10C044ED53CFEB523C8DF34A2 -Test: Encrypt -Comment: Set 2, vector 124 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000008 -Ciphertext: 2FAEAC3A41CCEABA8140BDA9C7AC7740 -Test: Encrypt -Comment: Set 2, vector 125 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000004 -Ciphertext: 7BA6691787BF0C526F3697E2ED659B0D -Test: Encrypt -Comment: Set 2, vector 126 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000002 -Ciphertext: 8F9C0AA2549714C88BB2665E8AF86D41 -Test: Encrypt -Comment: Set 2, vector 127 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000001 -Ciphertext: BA9AE89FDDCE4B51131E17C4D65CE587 -Test: Encrypt -Comment: Set 3, vector 0 -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 56E1E129CA5C02C7F9AC6AFDEF86ADC3 -Test: Encrypt -Comment: Set 3, vector 1 -Key: 010101010101010101010101010101010101010101010101 -Plaintext: 01010101010101010101010101010101 -Ciphertext: 8F764397C10BE84BA876CEEFA4225BFF -Test: Encrypt -Comment: Set 3, vector 2 -Key: 020202020202020202020202020202020202020202020202 -Plaintext: 02020202020202020202020202020202 -Ciphertext: 60B00674BFD444D07B5A19851E6151CD -Test: Encrypt -Comment: Set 3, vector 3 -Key: 030303030303030303030303030303030303030303030303 -Plaintext: 03030303030303030303030303030303 -Ciphertext: CF431D70E25D5450B9979C52E4ECF590 -Test: Encrypt -Comment: Set 3, vector 4 -Key: 040404040404040404040404040404040404040404040404 -Plaintext: 04040404040404040404040404040404 -Ciphertext: 81B26FF4F6B4377CC555873504B3A38B -Test: Encrypt -Comment: Set 3, vector 5 -Key: 050505050505050505050505050505050505050505050505 -Plaintext: 05050505050505050505050505050505 -Ciphertext: 8C864C445E6B9312E6F3843C53BF7870 -Test: Encrypt -Comment: Set 3, vector 6 -Key: 060606060606060606060606060606060606060606060606 -Plaintext: 06060606060606060606060606060606 -Ciphertext: 28C1EABB23C2A04E7A37BB0EF42D45A2 -Test: Encrypt -Comment: Set 3, vector 7 -Key: 070707070707070707070707070707070707070707070707 -Plaintext: 07070707070707070707070707070707 -Ciphertext: 0068C08827CBD904A3C0AF89A35CD8E6 -Test: Encrypt -Comment: Set 3, vector 8 -Key: 080808080808080808080808080808080808080808080808 -Plaintext: 08080808080808080808080808080808 -Ciphertext: A2AA1C6693DC2B70D75C9B39B9B214D0 -Test: Encrypt -Comment: Set 3, vector 9 -Key: 090909090909090909090909090909090909090909090909 -Plaintext: 09090909090909090909090909090909 -Ciphertext: 0423A756A133734C66944536033B978C -Test: Encrypt -Comment: Set 3, vector 10 -Key: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Plaintext: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Ciphertext: 279B7FA09352F4194B2C33089267BD2E -Test: Encrypt -Comment: Set 3, vector 11 -Key: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Plaintext: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Ciphertext: 7788EEE46AC2927434A93D3B5D295DF3 -Test: Encrypt -Comment: Set 3, vector 12 -Key: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Plaintext: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Ciphertext: 3A2D0C1F30AE1E50A61102D2DF5BEAE5 -Test: Encrypt -Comment: Set 3, vector 13 -Key: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Plaintext: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Ciphertext: 320FB708B47319484538CD73F8773526 -Test: Encrypt -Comment: Set 3, vector 14 -Key: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Plaintext: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Ciphertext: 6213EB688C8CDA5152A65BFC007BCAEA -Test: Encrypt -Comment: Set 3, vector 15 -Key: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Plaintext: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Ciphertext: D1904ACDB021DDCCCBE436CA7B5A4264 -Test: Encrypt -Comment: Set 3, vector 16 -Key: 101010101010101010101010101010101010101010101010 -Plaintext: 10101010101010101010101010101010 -Ciphertext: A907BFDAEEF8C81D05855235E8D3BE08 -Test: Encrypt -Comment: Set 3, vector 17 -Key: 111111111111111111111111111111111111111111111111 -Plaintext: 11111111111111111111111111111111 -Ciphertext: DB23D9326A998A4CB06AE04A8C592217 -Test: Encrypt -Comment: Set 3, vector 18 -Key: 121212121212121212121212121212121212121212121212 -Plaintext: 12121212121212121212121212121212 -Ciphertext: 472427C234EAE3082E84F493C9559792 -Test: Encrypt -Comment: Set 3, vector 19 -Key: 131313131313131313131313131313131313131313131313 -Plaintext: 13131313131313131313131313131313 -Ciphertext: EE4E318D27820F691BD3BDA9617561A0 -Test: Encrypt -Comment: Set 3, vector 20 -Key: 141414141414141414141414141414141414141414141414 -Plaintext: 14141414141414141414141414141414 -Ciphertext: 221E909D7B259C098480DBDE71BCF9BF -Test: Encrypt -Comment: Set 3, vector 21 -Key: 151515151515151515151515151515151515151515151515 -Plaintext: 15151515151515151515151515151515 -Ciphertext: 8702C6A150F2DD2E1736F09518C1A267 -Test: Encrypt -Comment: Set 3, vector 22 -Key: 161616161616161616161616161616161616161616161616 -Plaintext: 16161616161616161616161616161616 -Ciphertext: 7E8DAEBBA15C7B9705B501998F61CC6E -Test: Encrypt -Comment: Set 3, vector 23 -Key: 171717171717171717171717171717171717171717171717 -Plaintext: 17171717171717171717171717171717 -Ciphertext: 3DD555C7277FA156330D05CD621394D5 -Test: Encrypt -Comment: Set 3, vector 24 -Key: 181818181818181818181818181818181818181818181818 -Plaintext: 18181818181818181818181818181818 -Ciphertext: E5575CDC315F1C244441E6D1DE25ED20 -Test: Encrypt -Comment: Set 3, vector 25 -Key: 191919191919191919191919191919191919191919191919 -Plaintext: 19191919191919191919191919191919 -Ciphertext: 434859EB42087F83B9849DC23ABB7C1D -Test: Encrypt -Comment: Set 3, vector 26 -Key: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Plaintext: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Ciphertext: 1EA1A5CC662DCA0B56B2BBF560A1B032 -Test: Encrypt -Comment: Set 3, vector 27 -Key: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Plaintext: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Ciphertext: A3AC0CD9342242A72005F8E6DBF50DE8 -Test: Encrypt -Comment: Set 3, vector 28 -Key: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Plaintext: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Ciphertext: AF6251A285EBEA9408315822F2072D86 -Test: Encrypt -Comment: Set 3, vector 29 -Key: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Plaintext: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Ciphertext: FA084220DB82A88E6D7B6E7849550183 -Test: Encrypt -Comment: Set 3, vector 30 -Key: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Plaintext: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Ciphertext: E7AABEAA3F669E0D963A19C3BDE43676 -Test: Encrypt -Comment: Set 3, vector 31 -Key: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Plaintext: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Ciphertext: ED7C11A689A72FF834A777013DBEC50A -Test: Encrypt -Comment: Set 3, vector 32 -Key: 202020202020202020202020202020202020202020202020 -Plaintext: 20202020202020202020202020202020 -Ciphertext: 87F8EA30332036F17CEAC0097CE33BC1 -Test: Encrypt -Comment: Set 3, vector 33 -Key: 212121212121212121212121212121212121212121212121 -Plaintext: 21212121212121212121212121212121 -Ciphertext: E83CC178B21703D1BDFA0A1350A587F3 -Test: Encrypt -Comment: Set 3, vector 34 -Key: 222222222222222222222222222222222222222222222222 -Plaintext: 22222222222222222222222222222222 -Ciphertext: 581CF260A93B67E27BBA6D6D68C645B6 -Test: Encrypt -Comment: Set 3, vector 35 -Key: 232323232323232323232323232323232323232323232323 -Plaintext: 23232323232323232323232323232323 -Ciphertext: D7155FD4BABA5DAA1E0576BAF4BB3BDE -Test: Encrypt -Comment: Set 3, vector 36 -Key: 242424242424242424242424242424242424242424242424 -Plaintext: 24242424242424242424242424242424 -Ciphertext: 0C2382377892DC0CA4B1C7753CDB2753 -Test: Encrypt -Comment: Set 3, vector 37 -Key: 252525252525252525252525252525252525252525252525 -Plaintext: 25252525252525252525252525252525 -Ciphertext: 9E568ACFE44E1926BE207D25107EBD90 -Test: Encrypt -Comment: Set 3, vector 38 -Key: 262626262626262626262626262626262626262626262626 -Plaintext: 26262626262626262626262626262626 -Ciphertext: 1F9C7FEF0BA7D4C38555B957FA9FDAC8 -Test: Encrypt -Comment: Set 3, vector 39 -Key: 272727272727272727272727272727272727272727272727 -Plaintext: 27272727272727272727272727272727 -Ciphertext: 2C00730AAB18247D4F79C8BA0107E759 -Test: Encrypt -Comment: Set 3, vector 40 -Key: 282828282828282828282828282828282828282828282828 -Plaintext: 28282828282828282828282828282828 -Ciphertext: 26150BB68C5529903D3624CB8F36D717 -Test: Encrypt -Comment: Set 3, vector 41 -Key: 292929292929292929292929292929292929292929292929 -Plaintext: 29292929292929292929292929292929 -Ciphertext: C6F9CD75F9DC3DF5C945E028038660AB -Test: Encrypt -Comment: Set 3, vector 42 -Key: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Plaintext: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Ciphertext: 9D90F692A1149E3E7F19BE419038F42F -Test: Encrypt -Comment: Set 3, vector 43 -Key: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Plaintext: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Ciphertext: 9981F6F8C071F4CAF3E25884B8749FD3 -Test: Encrypt -Comment: Set 3, vector 44 -Key: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Plaintext: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Ciphertext: 62957FC449C78B7EABA9C41B335F731E -Test: Encrypt -Comment: Set 3, vector 45 -Key: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Plaintext: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Ciphertext: 265E17BD08B2E34BC879D5BC801D1217 -Test: Encrypt -Comment: Set 3, vector 46 -Key: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Plaintext: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Ciphertext: 55BBE8CE99907AC77D4F009EABA6B8D9 -Test: Encrypt -Comment: Set 3, vector 47 -Key: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Plaintext: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Ciphertext: EECB495C2F81243857D0A1A8919F9C7E -Test: Encrypt -Comment: Set 3, vector 48 -Key: 303030303030303030303030303030303030303030303030 -Plaintext: 30303030303030303030303030303030 -Ciphertext: E3BA996DF81895C86E30500CE9F7ED01 -Test: Encrypt -Comment: Set 3, vector 49 -Key: 313131313131313131313131313131313131313131313131 -Plaintext: 31313131313131313131313131313131 -Ciphertext: E507914B7CDDB2A3A915EB5663CE43CE -Test: Encrypt -Comment: Set 3, vector 50 -Key: 323232323232323232323232323232323232323232323232 -Plaintext: 32323232323232323232323232323232 -Ciphertext: AA2E53FC2D073DE62554691F507B23FF -Test: Encrypt -Comment: Set 3, vector 51 -Key: 333333333333333333333333333333333333333333333333 -Plaintext: 33333333333333333333333333333333 -Ciphertext: 875707D7E4FA8028D878DFB8338160FF -Test: Encrypt -Comment: Set 3, vector 52 -Key: 343434343434343434343434343434343434343434343434 -Plaintext: 34343434343434343434343434343434 -Ciphertext: 1158285A6787F8B6500E9FB046D88FB7 -Test: Encrypt -Comment: Set 3, vector 53 -Key: 353535353535353535353535353535353535353535353535 -Plaintext: 35353535353535353535353535353535 -Ciphertext: 6BFF4FB554ADD3F4321E6BA6029CD48A -Test: Encrypt -Comment: Set 3, vector 54 -Key: 363636363636363636363636363636363636363636363636 -Plaintext: 36363636363636363636363636363636 -Ciphertext: 8F2077CE672419A3AE15CA8800D5ACF8 -Test: Encrypt -Comment: Set 3, vector 55 -Key: 373737373737373737373737373737373737373737373737 -Plaintext: 37373737373737373737373737373737 -Ciphertext: 80ECE69E3EEBD391FCAEA8B3B38578D9 -Test: Encrypt -Comment: Set 3, vector 56 -Key: 383838383838383838383838383838383838383838383838 -Plaintext: 38383838383838383838383838383838 -Ciphertext: A23A2ADDE21BDB44EF99072331FA8EAB -Test: Encrypt -Comment: Set 3, vector 57 -Key: 393939393939393939393939393939393939393939393939 -Plaintext: 39393939393939393939393939393939 -Ciphertext: 8E41065415264354D4DC276F6ED582B9 -Test: Encrypt -Comment: Set 3, vector 58 -Key: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Plaintext: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Ciphertext: D591D51BA578836C7D3945991FD0184A -Test: Encrypt -Comment: Set 3, vector 59 -Key: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Plaintext: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Ciphertext: B88105C11F9FFCA9037E1F90FAE1C61E -Test: Encrypt -Comment: Set 3, vector 60 -Key: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Plaintext: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Ciphertext: F8A1A047994B4363028BC1B3B6339954 -Test: Encrypt -Comment: Set 3, vector 61 -Key: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Plaintext: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Ciphertext: EFB57CEA359E1F9F68729B156BEBDCB8 -Test: Encrypt -Comment: Set 3, vector 62 -Key: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Plaintext: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Ciphertext: 2323D15570873D4E5616CDDC466B1D34 -Test: Encrypt -Comment: Set 3, vector 63 -Key: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Plaintext: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Ciphertext: 842C7B6C67BB38B508558058531B37FE -Test: Encrypt -Comment: Set 3, vector 64 -Key: 404040404040404040404040404040404040404040404040 -Plaintext: 40404040404040404040404040404040 -Ciphertext: A2C32EA499E41A248565253BACC11E3B -Test: Encrypt -Comment: Set 3, vector 65 -Key: 414141414141414141414141414141414141414141414141 -Plaintext: 41414141414141414141414141414141 -Ciphertext: CF72033A0BA3E03A8B1E336F85100489 -Test: Encrypt -Comment: Set 3, vector 66 -Key: 424242424242424242424242424242424242424242424242 -Plaintext: 42424242424242424242424242424242 -Ciphertext: 0A194208C1B722A5719C14231EE4C532 -Test: Encrypt -Comment: Set 3, vector 67 -Key: 434343434343434343434343434343434343434343434343 -Plaintext: 43434343434343434343434343434343 -Ciphertext: 7365018F7A2564165EC162F948C4824A -Test: Encrypt -Comment: Set 3, vector 68 -Key: 444444444444444444444444444444444444444444444444 -Plaintext: 44444444444444444444444444444444 -Ciphertext: 20AC87CE21C47D99D6D2202B0C62E52D -Test: Encrypt -Comment: Set 3, vector 69 -Key: 454545454545454545454545454545454545454545454545 -Plaintext: 45454545454545454545454545454545 -Ciphertext: 72D32F7C4D03529C7DBF6865E36E7C84 -Test: Encrypt -Comment: Set 3, vector 70 -Key: 464646464646464646464646464646464646464646464646 -Plaintext: 46464646464646464646464646464646 -Ciphertext: 18E88EF941A7D1793B8D545323CCBD7E -Test: Encrypt -Comment: Set 3, vector 71 -Key: 474747474747474747474747474747474747474747474747 -Plaintext: 47474747474747474747474747474747 -Ciphertext: C87B12CD28646842FCE0C8658EA8A6C9 -Test: Encrypt -Comment: Set 3, vector 72 -Key: 484848484848484848484848484848484848484848484848 -Plaintext: 48484848484848484848484848484848 -Ciphertext: 03347AC4B4D0AE9C208B1B12802E6562 -Test: Encrypt -Comment: Set 3, vector 73 -Key: 494949494949494949494949494949494949494949494949 -Plaintext: 49494949494949494949494949494949 -Ciphertext: A5F9E726E53A74C9CF59E7CBBCE507D1 -Test: Encrypt -Comment: Set 3, vector 74 -Key: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Plaintext: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Ciphertext: 228C852461BBB0BB12B3F9192311DFDD -Test: Encrypt -Comment: Set 3, vector 75 -Key: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Plaintext: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Ciphertext: DFD5B30B1401FBE49EA0C725E64B91A3 -Test: Encrypt -Comment: Set 3, vector 76 -Key: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Plaintext: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Ciphertext: 38D59DD18C98488451070B28F91A15C0 -Test: Encrypt -Comment: Set 3, vector 77 -Key: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Plaintext: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Ciphertext: E6A73709A37C7B00484BD54EED3A6128 -Test: Encrypt -Comment: Set 3, vector 78 -Key: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Plaintext: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Ciphertext: 12A6AD3ED9A3BA4FBA285B64D4823706 -Test: Encrypt -Comment: Set 3, vector 79 -Key: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Plaintext: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Ciphertext: CCB3FFAD253207DFB312A8B4FE0F390D -Test: Encrypt -Comment: Set 3, vector 80 -Key: 505050505050505050505050505050505050505050505050 -Plaintext: 50505050505050505050505050505050 -Ciphertext: A1C7DFA83502CE5558242F83CC12BF82 -Test: Encrypt -Comment: Set 3, vector 81 -Key: 515151515151515151515151515151515151515151515151 -Plaintext: 51515151515151515151515151515151 -Ciphertext: C9C8FCD1E4E482AF47555FEA823DE62A -Test: Encrypt -Comment: Set 3, vector 82 -Key: 525252525252525252525252525252525252525252525252 -Plaintext: 52525252525252525252525252525252 -Ciphertext: 5F9DD3265B6B043BF4CE8E11A3DAE4E1 -Test: Encrypt -Comment: Set 3, vector 83 -Key: 535353535353535353535353535353535353535353535353 -Plaintext: 53535353535353535353535353535353 -Ciphertext: 79D02BFAD35C67C8586694A068662F1D -Test: Encrypt -Comment: Set 3, vector 84 -Key: 545454545454545454545454545454545454545454545454 -Plaintext: 54545454545454545454545454545454 -Ciphertext: 361AC03A4827F590A5DDE28A5FFF723A -Test: Encrypt -Comment: Set 3, vector 85 -Key: 555555555555555555555555555555555555555555555555 -Plaintext: 55555555555555555555555555555555 -Ciphertext: 1758AC2E8DDE2126621AEB5759FC93D0 -Test: Encrypt -Comment: Set 3, vector 86 -Key: 565656565656565656565656565656565656565656565656 -Plaintext: 56565656565656565656565656565656 -Ciphertext: 14422A052A86DC0033B70F77D46A7E3C -Test: Encrypt -Comment: Set 3, vector 87 -Key: 575757575757575757575757575757575757575757575757 -Plaintext: 57575757575757575757575757575757 -Ciphertext: 154457A732BC11F0A4C43BEC607B9B91 -Test: Encrypt -Comment: Set 3, vector 88 -Key: 585858585858585858585858585858585858585858585858 -Plaintext: 58585858585858585858585858585858 -Ciphertext: 789BBC53CBE8A7D6119F61C8DC5DAEAB -Test: Encrypt -Comment: Set 3, vector 89 -Key: 595959595959595959595959595959595959595959595959 -Plaintext: 59595959595959595959595959595959 -Ciphertext: 6F8CDA92BF849BE59858544689DA2ACE -Test: Encrypt -Comment: Set 3, vector 90 -Key: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Plaintext: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Ciphertext: CCA696D494AF8877C0753106D5AD07A6 -Test: Encrypt -Comment: Set 3, vector 91 -Key: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Plaintext: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Ciphertext: E76884CA9F00DCF95BBB15C5FBB26D1C -Test: Encrypt -Comment: Set 3, vector 92 -Key: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Plaintext: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Ciphertext: CD3FA7BC9EC9EC0B0CF4F5A82A98550E -Test: Encrypt -Comment: Set 3, vector 93 -Key: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Plaintext: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Ciphertext: BC2FB535DC0D8C86682E32AC3761F299 -Test: Encrypt -Comment: Set 3, vector 94 -Key: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Plaintext: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Ciphertext: AB19152E1788D8B2878357484832BB27 -Test: Encrypt -Comment: Set 3, vector 95 -Key: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Plaintext: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Ciphertext: 87D1D7E297CED2C6606A171794FE1BB2 -Test: Encrypt -Comment: Set 3, vector 96 -Key: 606060606060606060606060606060606060606060606060 -Plaintext: 60606060606060606060606060606060 -Ciphertext: 6BF6F1728474F1050F712A0FF3F59319 -Test: Encrypt -Comment: Set 3, vector 97 -Key: 616161616161616161616161616161616161616161616161 -Plaintext: 61616161616161616161616161616161 -Ciphertext: 46646FF0ED8A8EDB395BA4B3DC97A35F -Test: Encrypt -Comment: Set 3, vector 98 -Key: 626262626262626262626262626262626262626262626262 -Plaintext: 62626262626262626262626262626262 -Ciphertext: F558C5F67CDF59374F5426D5846A622E -Test: Encrypt -Comment: Set 3, vector 99 -Key: 636363636363636363636363636363636363636363636363 -Plaintext: 63636363636363636363636363636363 -Ciphertext: E06CC0A3436C80F5F0271ACFC8F535D3 -Test: Encrypt -Comment: Set 3, vector 100 -Key: 646464646464646464646464646464646464646464646464 -Plaintext: 64646464646464646464646464646464 -Ciphertext: 903AA2EA9F99C3CCDD1EF1CD906FC800 -Test: Encrypt -Comment: Set 3, vector 101 -Key: 656565656565656565656565656565656565656565656565 -Plaintext: 65656565656565656565656565656565 -Ciphertext: EAE1010E86CF45476CEB180E78608841 -Test: Encrypt -Comment: Set 3, vector 102 -Key: 666666666666666666666666666666666666666666666666 -Plaintext: 66666666666666666666666666666666 -Ciphertext: 341F33B7FB7C5807BFB4C2C497565817 -Test: Encrypt -Comment: Set 3, vector 103 -Key: 676767676767676767676767676767676767676767676767 -Plaintext: 67676767676767676767676767676767 -Ciphertext: 4DA345AB1B3F7575F8D01BED5C17AF26 -Test: Encrypt -Comment: Set 3, vector 104 -Key: 686868686868686868686868686868686868686868686868 -Plaintext: 68686868686868686868686868686868 -Ciphertext: 1613C2DE21E7082312BF414C88310FAB -Test: Encrypt -Comment: Set 3, vector 105 -Key: 696969696969696969696969696969696969696969696969 -Plaintext: 69696969696969696969696969696969 -Ciphertext: 474D73001BD4BF9A9B79CFF79198E2F3 -Test: Encrypt -Comment: Set 3, vector 106 -Key: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Plaintext: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Ciphertext: 9C487E0BFB6FE07C521C663D03F175CF -Test: Encrypt -Comment: Set 3, vector 107 -Key: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Plaintext: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Ciphertext: 39F5672BEFCFCC072F292D47AD481DC7 -Test: Encrypt -Comment: Set 3, vector 108 -Key: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Plaintext: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Ciphertext: D9B86F02C3CB07CEF53834924A01DF14 -Test: Encrypt -Comment: Set 3, vector 109 -Key: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Plaintext: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Ciphertext: B42C9F4A33C5425FB20425889ECFFB9D -Test: Encrypt -Comment: Set 3, vector 110 -Key: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Plaintext: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Ciphertext: 832D535E3B4C40113C82AE10A7E1B78A -Test: Encrypt -Comment: Set 3, vector 111 -Key: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Plaintext: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Ciphertext: E9A8F63AAF1B1FFF05CFEB7E22E519DF -Test: Encrypt -Comment: Set 3, vector 112 -Key: 707070707070707070707070707070707070707070707070 -Plaintext: 70707070707070707070707070707070 -Ciphertext: C61B4EF13F07576701B1018AC9F01863 -Test: Encrypt -Comment: Set 3, vector 113 -Key: 717171717171717171717171717171717171717171717171 -Plaintext: 71717171717171717171717171717171 -Ciphertext: B098DBE07C3528931F14D40AC9F99ACC -Test: Encrypt -Comment: Set 3, vector 114 -Key: 727272727272727272727272727272727272727272727272 -Plaintext: 72727272727272727272727272727272 -Ciphertext: 3FCC0182E96BC01863EB161967D6482A -Test: Encrypt -Comment: Set 3, vector 115 -Key: 737373737373737373737373737373737373737373737373 -Plaintext: 73737373737373737373737373737373 -Ciphertext: D8F20E80F4AC4666066B0E3F1966C8DA -Test: Encrypt -Comment: Set 3, vector 116 -Key: 747474747474747474747474747474747474747474747474 -Plaintext: 74747474747474747474747474747474 -Ciphertext: 4E96D8CC1A34E3C38C37B5339CF26A5D -Test: Encrypt -Comment: Set 3, vector 117 -Key: 757575757575757575757575757575757575757575757575 -Plaintext: 75757575757575757575757575757575 -Ciphertext: 266EDB14B89857636C0F8E8C7D2FACD8 -Test: Encrypt -Comment: Set 3, vector 118 -Key: 767676767676767676767676767676767676767676767676 -Plaintext: 76767676767676767676767676767676 -Ciphertext: 1D060BD61CFA82764CE4DF283FCB2278 -Test: Encrypt -Comment: Set 3, vector 119 -Key: 777777777777777777777777777777777777777777777777 -Plaintext: 77777777777777777777777777777777 -Ciphertext: 4734355A933BFC1F2918CDF1A4E2BAAE -Test: Encrypt -Comment: Set 3, vector 120 -Key: 787878787878787878787878787878787878787878787878 -Plaintext: 78787878787878787878787878787878 -Ciphertext: DADBACBB42FEB35635A8DEBBFA93F5BA -Test: Encrypt -Comment: Set 3, vector 121 -Key: 797979797979797979797979797979797979797979797979 -Plaintext: 79797979797979797979797979797979 -Ciphertext: 8BB5C2E0B44B986EF523870C41721B7D -Test: Encrypt -Comment: Set 3, vector 122 -Key: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Plaintext: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Ciphertext: F66844E5DC500F43FF95E05965BAFD63 -Test: Encrypt -Comment: Set 3, vector 123 -Key: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Plaintext: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Ciphertext: ECC75A2BE7E27481907621A1796DC821 -Test: Encrypt -Comment: Set 3, vector 124 -Key: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Plaintext: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Ciphertext: D195666137F49B67F80EBC8C3ED824BF -Test: Encrypt -Comment: Set 3, vector 125 -Key: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Plaintext: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Ciphertext: 2F1ACC482BE5DEFD3EC1AD1F3A064A60 -Test: Encrypt -Comment: Set 3, vector 126 -Key: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Plaintext: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Ciphertext: 5FDDFA05A7F72D294DC386260DC59009 -Test: Encrypt -Comment: Set 3, vector 127 -Key: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Plaintext: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Ciphertext: FE94D733BABEB5A5382C2816311E515E -Test: Encrypt -Comment: Set 3, vector 128 -Key: 808080808080808080808080808080808080808080808080 -Plaintext: 80808080808080808080808080808080 -Ciphertext: F602BA7F515B082983B8F7A27F92408F -Test: Encrypt -Comment: Set 3, vector 129 -Key: 818181818181818181818181818181818181818181818181 -Plaintext: 81818181818181818181818181818181 -Ciphertext: 48E95062B889D83CC72767E303329710 -Test: Encrypt -Comment: Set 3, vector 130 -Key: 828282828282828282828282828282828282828282828282 -Plaintext: 82828282828282828282828282828282 -Ciphertext: 0D98319B8ED1E612F063591AAFA95962 -Test: Encrypt -Comment: Set 3, vector 131 -Key: 838383838383838383838383838383838383838383838383 -Plaintext: 83838383838383838383838383838383 -Ciphertext: 6D987B21F8072C09514C711819BDF42D -Test: Encrypt -Comment: Set 3, vector 132 -Key: 848484848484848484848484848484848484848484848484 -Plaintext: 84848484848484848484848484848484 -Ciphertext: 56C6CA23BC6A52C9967D70C6471A0788 -Test: Encrypt -Comment: Set 3, vector 133 -Key: 858585858585858585858585858585858585858585858585 -Plaintext: 85858585858585858585858585858585 -Ciphertext: 03C1004551B9B74D96CC3F9F7D11B04A -Test: Encrypt -Comment: Set 3, vector 134 -Key: 868686868686868686868686868686868686868686868686 -Plaintext: 86868686868686868686868686868686 -Ciphertext: 6356481250E8D52A0D922985BB2BED27 -Test: Encrypt -Comment: Set 3, vector 135 -Key: 878787878787878787878787878787878787878787878787 -Plaintext: 87878787878787878787878787878787 -Ciphertext: BC51A66892A956F44BF75168E935720E -Test: Encrypt -Comment: Set 3, vector 136 -Key: 888888888888888888888888888888888888888888888888 -Plaintext: 88888888888888888888888888888888 -Ciphertext: 73FAAAFB0517BD4D459A250E2CA4F017 -Test: Encrypt -Comment: Set 3, vector 137 -Key: 898989898989898989898989898989898989898989898989 -Plaintext: 89898989898989898989898989898989 -Ciphertext: 160C7D6510CCEB35318629FFFE1E8BA7 -Test: Encrypt -Comment: Set 3, vector 138 -Key: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Plaintext: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Ciphertext: 785ECC6F1A9415EBB05A4990786865A5 -Test: Encrypt -Comment: Set 3, vector 139 -Key: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Plaintext: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Ciphertext: 210498B4AC4D909CC7D6DAD6B8851C1A -Test: Encrypt -Comment: Set 3, vector 140 -Key: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Plaintext: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Ciphertext: 7094C31A06ED2AA0B3B63C210DEB96E2 -Test: Encrypt -Comment: Set 3, vector 141 -Key: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Plaintext: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Ciphertext: F8426DAE3B7C3FF568456EB4D4EB623B -Test: Encrypt -Comment: Set 3, vector 142 -Key: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Plaintext: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Ciphertext: 090487421369DED8EAC9812B544A29BE -Test: Encrypt -Comment: Set 3, vector 143 -Key: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Plaintext: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Ciphertext: 1AFA1FC5ECA8EAD74F9FE9B67993CB6F -Test: Encrypt -Comment: Set 3, vector 144 -Key: 909090909090909090909090909090909090909090909090 -Plaintext: 90909090909090909090909090909090 -Ciphertext: 38124FCE77189341DE7B225951CDE6E9 -Test: Encrypt -Comment: Set 3, vector 145 -Key: 919191919191919191919191919191919191919191919191 -Plaintext: 91919191919191919191919191919191 -Ciphertext: 059A775350A44BB880A750B32B19E179 -Test: Encrypt -Comment: Set 3, vector 146 -Key: 929292929292929292929292929292929292929292929292 -Plaintext: 92929292929292929292929292929292 -Ciphertext: 7CFA631E8BABF7DEE00DAB0754C385DD -Test: Encrypt -Comment: Set 3, vector 147 -Key: 939393939393939393939393939393939393939393939393 -Plaintext: 93939393939393939393939393939393 -Ciphertext: 0632ED71BA440232DECE4F1B38F94323 -Test: Encrypt -Comment: Set 3, vector 148 -Key: 949494949494949494949494949494949494949494949494 -Plaintext: 94949494949494949494949494949494 -Ciphertext: D049FF03ACF47C866A4209E7588E0CFA -Test: Encrypt -Comment: Set 3, vector 149 -Key: 959595959595959595959595959595959595959595959595 -Plaintext: 95959595959595959595959595959595 -Ciphertext: 910408E331C64A71D50A149DFD50C242 -Test: Encrypt -Comment: Set 3, vector 150 -Key: 969696969696969696969696969696969696969696969696 -Plaintext: 96969696969696969696969696969696 -Ciphertext: 0829C2DD4AF8F06C30978A0199A43C3C -Test: Encrypt -Comment: Set 3, vector 151 -Key: 979797979797979797979797979797979797979797979797 -Plaintext: 97979797979797979797979797979797 -Ciphertext: C70D286C18D2A0EA5D16FEB97F35DE6F -Test: Encrypt -Comment: Set 3, vector 152 -Key: 989898989898989898989898989898989898989898989898 -Plaintext: 98989898989898989898989898989898 -Ciphertext: A220CD3CD177BDD73D44B6D4A7A9ED0E -Test: Encrypt -Comment: Set 3, vector 153 -Key: 999999999999999999999999999999999999999999999999 -Plaintext: 99999999999999999999999999999999 -Ciphertext: 74EC1A68010A0D5FA9688F1552E70EF5 -Test: Encrypt -Comment: Set 3, vector 154 -Key: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Plaintext: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Ciphertext: C1C0EE9EEA079CCE8544BA9940963720 -Test: Encrypt -Comment: Set 3, vector 155 -Key: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Plaintext: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Ciphertext: 500418F7142C273CCADBDAD8831619D2 -Test: Encrypt -Comment: Set 3, vector 156 -Key: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Plaintext: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Ciphertext: 703A0223D3ABA658C531F9BE03F6E842 -Test: Encrypt -Comment: Set 3, vector 157 -Key: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Plaintext: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Ciphertext: EBC65558CD43197D87CFF645FDBA1661 -Test: Encrypt -Comment: Set 3, vector 158 -Key: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Plaintext: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Ciphertext: 6F6E140E44934DA754F008EB5597BDA3 -Test: Encrypt -Comment: Set 3, vector 159 -Key: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Plaintext: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Ciphertext: 3D533A98B85CDD624541956E348ACBD3 -Test: Encrypt -Comment: Set 3, vector 160 -Key: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Plaintext: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Ciphertext: 13833D60F1D247019258C457E9F2292A -Test: Encrypt -Comment: Set 3, vector 161 -Key: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Plaintext: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Ciphertext: FC13CECE4F5E2467427582595EDB6B87 -Test: Encrypt -Comment: Set 3, vector 162 -Key: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Plaintext: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Ciphertext: 2772A4E636F01514949D47B037825AF9 -Test: Encrypt -Comment: Set 3, vector 163 -Key: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Plaintext: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Ciphertext: F13DC1CCF105212AF8BC4F73F0AEF272 -Test: Encrypt -Comment: Set 3, vector 164 -Key: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Plaintext: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Ciphertext: A6EB0CABBBA03DB1B2425E6FC559B06A -Test: Encrypt -Comment: Set 3, vector 165 -Key: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Plaintext: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Ciphertext: 32222D875D9E73DE72848EA88AC9B259 -Test: Encrypt -Comment: Set 3, vector 166 -Key: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Plaintext: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Ciphertext: 7DA6BC64D1E71FFE2D24C1A2FF7405BF -Test: Encrypt -Comment: Set 3, vector 167 -Key: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Plaintext: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Ciphertext: AD5129092054880300AFCF09A2921DAF -Test: Encrypt -Comment: Set 3, vector 168 -Key: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Plaintext: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Ciphertext: FCF2E0AA207754597C8C00A4615B5B5B -Test: Encrypt -Comment: Set 3, vector 169 -Key: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Plaintext: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Ciphertext: 83D1475128C93C79BFE2AC9DA7E5D7BC -Test: Encrypt -Comment: Set 3, vector 170 -Key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Ciphertext: 9BA09846E13568B746B7D6A43364915F -Test: Encrypt -Comment: Set 3, vector 171 -Key: ABABABABABABABABABABABABABABABABABABABABABABABAB -Plaintext: ABABABABABABABABABABABABABABABAB -Ciphertext: 387BDB77D285F9E59CB88CD830CB31E2 -Test: Encrypt -Comment: Set 3, vector 172 -Key: ACACACACACACACACACACACACACACACACACACACACACACACAC -Plaintext: ACACACACACACACACACACACACACACACAC -Ciphertext: 82BFCC439310DD5DC411CCD4451E789B -Test: Encrypt -Comment: Set 3, vector 173 -Key: ADADADADADADADADADADADADADADADADADADADADADADADAD -Plaintext: ADADADADADADADADADADADADADADADAD -Ciphertext: 34C4240853DA191DF1D63E83401CE0E2 -Test: Encrypt -Comment: Set 3, vector 174 -Key: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Plaintext: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Ciphertext: B3CE3C38C10A667F5FD67BC8B7037283 -Test: Encrypt -Comment: Set 3, vector 175 -Key: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Plaintext: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Ciphertext: BEF04E726DC1D5D1D4AB0A025CFDFD7D -Test: Encrypt -Comment: Set 3, vector 176 -Key: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Plaintext: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Ciphertext: 725D70D564E78095739EA7980B481056 -Test: Encrypt -Comment: Set 3, vector 177 -Key: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Plaintext: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Ciphertext: CAB9293C9E3A82D40E85558F9DA488C1 -Test: Encrypt -Comment: Set 3, vector 178 -Key: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Plaintext: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Ciphertext: B433CACA5FF9F5AADB6BAFB7D4BE81FC -Test: Encrypt -Comment: Set 3, vector 179 -Key: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Plaintext: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Ciphertext: 3910F153098B638696101E04022A7849 -Test: Encrypt -Comment: Set 3, vector 180 -Key: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Plaintext: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Ciphertext: 1D7FF785CFC6AF98C5C81CDA2ABC9816 -Test: Encrypt -Comment: Set 3, vector 181 -Key: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Plaintext: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Ciphertext: 4A30C5521BAC28E5942808CB536376C7 -Test: Encrypt -Comment: Set 3, vector 182 -Key: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Plaintext: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Ciphertext: 17B908EF18EB7703DDB667C7A8DBA777 -Test: Encrypt -Comment: Set 3, vector 183 -Key: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Plaintext: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Ciphertext: 3222E0228F29C9F27467CB7047838E39 -Test: Encrypt -Comment: Set 3, vector 184 -Key: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Plaintext: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Ciphertext: E422497D1FD54DF8F9CEE11548D77303 -Test: Encrypt -Comment: Set 3, vector 185 -Key: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Plaintext: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Ciphertext: B26A00606A375B1A64B7F0C333D81A50 -Test: Encrypt -Comment: Set 3, vector 186 -Key: BABABABABABABABABABABABABABABABABABABABABABABABA -Plaintext: BABABABABABABABABABABABABABABABA -Ciphertext: D5032B06E290F6B76327E47E519F8F6D -Test: Encrypt -Comment: Set 3, vector 187 -Key: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Plaintext: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Ciphertext: 2CED7355B82DF3B88C4417149FFA1783 -Test: Encrypt -Comment: Set 3, vector 188 -Key: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Plaintext: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Ciphertext: FC7B4D95C62CA6D33862D56768EA9A1A -Test: Encrypt -Comment: Set 3, vector 189 -Key: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Plaintext: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Ciphertext: 375A9C1E1FCFA6F2369306D966F82156 -Test: Encrypt -Comment: Set 3, vector 190 -Key: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Plaintext: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Ciphertext: BA4C218D8691D5D9CE15ECCC75C75D8B -Test: Encrypt -Comment: Set 3, vector 191 -Key: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Plaintext: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Ciphertext: 4D5C53279B76A6F74195C65F09DF85D9 -Test: Encrypt -Comment: Set 3, vector 192 -Key: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Plaintext: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Ciphertext: 75CF5E6B3B0BFFF2290A5E58A85CF994 -Test: Encrypt -Comment: Set 3, vector 193 -Key: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Plaintext: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Ciphertext: 3482A5C83234E75CB443E09BA17EE3A0 -Test: Encrypt -Comment: Set 3, vector 194 -Key: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Plaintext: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Ciphertext: DA592D849C1BFBBEF5C3D0D8DA0F4B9A -Test: Encrypt -Comment: Set 3, vector 195 -Key: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Plaintext: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Ciphertext: 6656047376A76ED53FFF8C5DE1B6F886 -Test: Encrypt -Comment: Set 3, vector 196 -Key: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Plaintext: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Ciphertext: F86FD06864804515B17B453F8A42A44D -Test: Encrypt -Comment: Set 3, vector 197 -Key: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Plaintext: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Ciphertext: E57CD8E81BBF5B42446A7880B32A9A2F -Test: Encrypt -Comment: Set 3, vector 198 -Key: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Plaintext: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Ciphertext: A17219F7DEFF2985BDFADD62A6854947 -Test: Encrypt -Comment: Set 3, vector 199 -Key: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Plaintext: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Ciphertext: FF288A92FB408DA875531D163CE0105A -Test: Encrypt -Comment: Set 3, vector 200 -Key: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Plaintext: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Ciphertext: 11828CD066FD12620DFA16358CF1A705 -Test: Encrypt -Comment: Set 3, vector 201 -Key: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Plaintext: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Ciphertext: 6FA5DCBD14D2520E7F8147EDBEBBEAEE -Test: Encrypt -Comment: Set 3, vector 202 -Key: CACACACACACACACACACACACACACACACACACACACACACACACA -Plaintext: CACACACACACACACACACACACACACACACA -Ciphertext: F365CE3849AFB23AF3B62D7CFF80B19B -Test: Encrypt -Comment: Set 3, vector 203 -Key: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Plaintext: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Ciphertext: 74BE047CAAE10D095B3BDA14016EA262 -Test: Encrypt -Comment: Set 3, vector 204 -Key: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Plaintext: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Ciphertext: DC7A7D66AD1ABF1C7AA28891BE685AB5 -Test: Encrypt -Comment: Set 3, vector 205 -Key: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Plaintext: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Ciphertext: 8BED9C5BAD5C4A4AFB41CDFD7E88BB97 -Test: Encrypt -Comment: Set 3, vector 206 -Key: CECECECECECECECECECECECECECECECECECECECECECECECE -Plaintext: CECECECECECECECECECECECECECECECE -Ciphertext: 915FF93DC6A3984F11AB60BD2AA3DC61 -Test: Encrypt -Comment: Set 3, vector 207 -Key: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Plaintext: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Ciphertext: 43DFEEBBFB3692763752E6EA8931A9B8 -Test: Encrypt -Comment: Set 3, vector 208 -Key: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Plaintext: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Ciphertext: 2BB966115263DF2296C5D23E02D9C335 -Test: Encrypt -Comment: Set 3, vector 209 -Key: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Plaintext: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Ciphertext: FCCA1E3616236F0D5A1A9D035A35049D -Test: Encrypt -Comment: Set 3, vector 210 -Key: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Plaintext: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Ciphertext: 2E7246518C923B2AE23C61C99D7E6CE7 -Test: Encrypt -Comment: Set 3, vector 211 -Key: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Plaintext: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Ciphertext: 8D19232494905BAF83F4230395C8E09B -Test: Encrypt -Comment: Set 3, vector 212 -Key: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Plaintext: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Ciphertext: 6BC0BBCC76A7F8DF2A03BAB1CDE47FB6 -Test: Encrypt -Comment: Set 3, vector 213 -Key: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Plaintext: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Ciphertext: BD3D30B62DC0B0FEED0CC760879DB806 -Test: Encrypt -Comment: Set 3, vector 214 -Key: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Plaintext: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Ciphertext: 647388D8E6A9C8D09828041F4E338D47 -Test: Encrypt -Comment: Set 3, vector 215 -Key: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Plaintext: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Ciphertext: 4861CFC3FDDC434F2742E45B97FBB270 -Test: Encrypt -Comment: Set 3, vector 216 -Key: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Plaintext: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Ciphertext: 4426BC1C3990A5DE10760D0C10A3BB9A -Test: Encrypt -Comment: Set 3, vector 217 -Key: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Plaintext: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Ciphertext: 805211D0BD914F07AB1579EF9E3827EE -Test: Encrypt -Comment: Set 3, vector 218 -Key: DADADADADADADADADADADADADADADADADADADADADADADADA -Plaintext: DADADADADADADADADADADADADADADADA -Ciphertext: 519DB5AA8DA219224EDA77F77B96C135 -Test: Encrypt -Comment: Set 3, vector 219 -Key: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Plaintext: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Ciphertext: 7A96F769BF260E6D91A070BA7766D3E3 -Test: Encrypt -Comment: Set 3, vector 220 -Key: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Plaintext: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Ciphertext: 902222F1779476A44CEEDACEDA72B3EC -Test: Encrypt -Comment: Set 3, vector 221 -Key: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Plaintext: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Ciphertext: 99859E56FE0DAB67CDE755E4790ED51D -Test: Encrypt -Comment: Set 3, vector 222 -Key: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Plaintext: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Ciphertext: C2F4EE121941873763F302ECE6D8DF9E -Test: Encrypt -Comment: Set 3, vector 223 -Key: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Plaintext: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Ciphertext: FE1E93DBF071E2280130E169C9E5254A -Test: Encrypt -Comment: Set 3, vector 224 -Key: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Plaintext: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Ciphertext: 58F45B5E30D9DE7038EC405B601521AB -Test: Encrypt -Comment: Set 3, vector 225 -Key: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Plaintext: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Ciphertext: 8783BD662F65899EF61E113B7CC6505D -Test: Encrypt -Comment: Set 3, vector 226 -Key: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Plaintext: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Ciphertext: A3F6BBB2C3403F433203E0E18DB3E4C0 -Test: Encrypt -Comment: Set 3, vector 227 -Key: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Plaintext: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Ciphertext: D3EE663795362A0D2E7A8DB784F95A33 -Test: Encrypt -Comment: Set 3, vector 228 -Key: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Plaintext: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Ciphertext: 1B75895E7FCEEEA5ECA62E14F77ECF6A -Test: Encrypt -Comment: Set 3, vector 229 -Key: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Plaintext: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Ciphertext: 5040525E4F3B78D2036539C1C463A48B -Test: Encrypt -Comment: Set 3, vector 230 -Key: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Plaintext: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Ciphertext: A48E63494241AEACB0EF7B18A431E50D -Test: Encrypt -Comment: Set 3, vector 231 -Key: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Plaintext: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Ciphertext: 9DAF4DBBBC81465BC4270129C522ABCB -Test: Encrypt -Comment: Set 3, vector 232 -Key: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Plaintext: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Ciphertext: 20B118C870AF1A85C683C60A31ED24E4 -Test: Encrypt -Comment: Set 3, vector 233 -Key: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Plaintext: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Ciphertext: 52FF30830000A72FA2CB030539550F06 -Test: Encrypt -Comment: Set 3, vector 234 -Key: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Plaintext: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Ciphertext: 797ED3DB1B9A4BF4122EA0FF667BC36D -Test: Encrypt -Comment: Set 3, vector 235 -Key: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Plaintext: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Ciphertext: 708CE40FC810F5E84B6EE8FC2E0A46FA -Test: Encrypt -Comment: Set 3, vector 236 -Key: ECECECECECECECECECECECECECECECECECECECECECECECEC -Plaintext: ECECECECECECECECECECECECECECECEC -Ciphertext: 0BA7446B1D3D803BB80CDE94E096E79C -Test: Encrypt -Comment: Set 3, vector 237 -Key: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Plaintext: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Ciphertext: 6B0E95AED4DC9E923EDF3DDD5BAEEA0C -Test: Encrypt -Comment: Set 3, vector 238 -Key: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Plaintext: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Ciphertext: DE45D435FD6F8A240AD8DCE5A4BD8CC3 -Test: Encrypt -Comment: Set 3, vector 239 -Key: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Plaintext: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Ciphertext: 8823002161D635ADA686D85B087F3022 -Test: Encrypt -Comment: Set 3, vector 240 -Key: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Plaintext: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Ciphertext: C00F367B98CC819F5F6ADADEA8513DD8 -Test: Encrypt -Comment: Set 3, vector 241 -Key: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Plaintext: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Ciphertext: 9C25269FB7FA889FBD9E55AAD4C92DE0 -Test: Encrypt -Comment: Set 3, vector 242 -Key: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Plaintext: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Ciphertext: 5DD1D60A62B551FFA18CFF8263C5FCE4 -Test: Encrypt -Comment: Set 3, vector 243 -Key: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Plaintext: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Ciphertext: D183A9113393C1EEC7170331C65D2547 -Test: Encrypt -Comment: Set 3, vector 244 -Key: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Plaintext: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Ciphertext: FADF9E4AF6C1D7A6965D5DBA03194F18 -Test: Encrypt -Comment: Set 3, vector 245 -Key: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Plaintext: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Ciphertext: F2E9E5BE04D7B47B93D2B81DBCDA8BF3 -Test: Encrypt -Comment: Set 3, vector 246 -Key: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Plaintext: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Ciphertext: 7A04D513A59636ECA8A8608F10F21910 -Test: Encrypt -Comment: Set 3, vector 247 -Key: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Plaintext: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Ciphertext: 659552FCEF0E90F77050CF3902A22475 -Test: Encrypt -Comment: Set 3, vector 248 -Key: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Plaintext: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Ciphertext: F81709C989061D4439BDD47E71DBB457 -Test: Encrypt -Comment: Set 3, vector 249 -Key: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Plaintext: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Ciphertext: E05425C950E298F31FC6751375B48B66 -Test: Encrypt -Comment: Set 3, vector 250 -Key: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Plaintext: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Ciphertext: 6E90B365BEBAFA5C49DC4D6AB1593F94 -Test: Encrypt -Comment: Set 3, vector 251 -Key: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Plaintext: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Ciphertext: B2469C08D0F878579E162E8ACC5EF802 -Test: Encrypt -Comment: Set 3, vector 252 -Key: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Plaintext: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Ciphertext: C1DCAB694C7FDBEC88C6FC2597EAC180 -Test: Encrypt -Comment: Set 3, vector 253 -Key: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Plaintext: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Ciphertext: 6651FFBD3C30A496D072493A519D44D9 -Test: Encrypt -Comment: Set 3, vector 254 -Key: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Plaintext: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Ciphertext: A2F5A98929658AF4A9700B9923DAF014 -Test: Encrypt -Comment: Set 3, vector 255 -Key: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Plaintext: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Ciphertext: 3F8D5676F51CE23DC3BDB627F8B3883E -Test: Encrypt -Comment: Tests with 256-bit keys -Comment: Set 1, vector 0 -Key: 8000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2136FABDA091DFB5171B94B8EFBB5D08 -Test: Encrypt -Comment: Set 1, vector 1 -Key: 4000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6EBC4F33B3EADA5DBF25130F3D02CD34 -Test: Encrypt -Comment: Set 1, vector 2 -Key: 2000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3A7BCDC53A1F02EF20C79CFCE107D38B -Test: Encrypt -Comment: Set 1, vector 3 -Key: 1000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 88A96052B61C5A621EE9A6316A42ED4A -Test: Encrypt -Comment: Set 1, vector 4 -Key: 0800000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CBD7A2D8354B2DA972A0950BDFFF2CBD -Test: Encrypt -Comment: Set 1, vector 5 -Key: 0400000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 690BEB5FBEA12A4861E826F568E9F8F3 -Test: Encrypt -Comment: Set 1, vector 6 -Key: 0200000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 799A6FA3B78846E424F41370654ABD6F -Test: Encrypt -Comment: Set 1, vector 7 -Key: 0100000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DD7E24E12F391C5FEDE40136F8DE3731 -Test: Encrypt -Comment: Set 1, vector 8 -Key: 0080000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F7412D526E9244574F9933F602595385 -Test: Encrypt -Comment: Set 1, vector 9 -Key: 0040000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FD9D0174A83BEC3E7E1C3372CB5E7C9B -Test: Encrypt -Comment: Set 1, vector 10 -Key: 0020000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FCA62D360A7DFE54DB8D53819A407E71 -Test: Encrypt -Comment: Set 1, vector 11 -Key: 0010000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AC821C68913DCE3E74A20DB8E902CC4C -Test: Encrypt -Comment: Set 1, vector 12 -Key: 0008000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 80633F6CB8F10863E0A7FDE4C35D50E9 -Test: Encrypt -Comment: Set 1, vector 13 -Key: 0004000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D417D1D94869EE2364FCE869C0C1114E -Test: Encrypt -Comment: Set 1, vector 14 -Key: 0002000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0FA96DCEA2ACB849490CD5A1488A2FD9 -Test: Encrypt -Comment: Set 1, vector 15 -Key: 0001000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3E99BCB51CAEB9147DCF8643771D1C83 -Test: Encrypt -Comment: Set 1, vector 16 -Key: 0000800000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 25EA413BBC3C2579D3F7CBFD9E378091 -Test: Encrypt -Comment: Set 1, vector 17 -Key: 0000400000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C0433C1AD2E468FC679988CFBFCA5CD4 -Test: Encrypt -Comment: Set 1, vector 18 -Key: 0000200000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 05108B7D7C2871D9DE1F22232CF6966B -Test: Encrypt -Comment: Set 1, vector 19 -Key: 0000100000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8ABE085B75333946450F2D1D162E8650 -Test: Encrypt -Comment: Set 1, vector 20 -Key: 0000080000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 487A9C50152B44F5B009D8682EA1FD22 -Test: Encrypt -Comment: Set 1, vector 21 -Key: 0000040000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 739207A812F142B545798BA85170AF25 -Test: Encrypt -Comment: Set 1, vector 22 -Key: 0000020000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E40B90A5840591FEC98A24B23E73892B -Test: Encrypt -Comment: Set 1, vector 23 -Key: 0000010000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0258BFB0DC942F6A9139D3C00EBBEB35 -Test: Encrypt -Comment: Set 1, vector 24 -Key: 0000008000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 650CD6035752320B8252F44AEEBEC9E4 -Test: Encrypt -Comment: Set 1, vector 25 -Key: 0000004000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FABFFBB7028B53E0BB88E3E4462ACF0D -Test: Encrypt -Comment: Set 1, vector 26 -Key: 0000002000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C48D3416904896E2F2307EA26FB8CF1C -Test: Encrypt -Comment: Set 1, vector 27 -Key: 0000001000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2237452352F488F1DA3F1619FC6A7F85 -Test: Encrypt -Comment: Set 1, vector 28 -Key: 0000000800000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D3E6ECF4A3F70E672AABEE0C2ECA3960 -Test: Encrypt -Comment: Set 1, vector 29 -Key: 0000000400000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7A3EFC8AC6A82E8AEF377D8D96D8E830 -Test: Encrypt -Comment: Set 1, vector 30 -Key: 0000000200000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7278F0441F5AA34C0B7CDB076B453225 -Test: Encrypt -Comment: Set 1, vector 31 -Key: 0000000100000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 382E61EAC044E2151906F936CC9D33AE -Test: Encrypt -Comment: Set 1, vector 32 -Key: 0000000080000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C51147F4AD33C35647DF7E856C2965D4 -Test: Encrypt -Comment: Set 1, vector 33 -Key: 0000000040000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DAFE261154ADF63EA3F75B1253A9F77C -Test: Encrypt -Comment: Set 1, vector 34 -Key: 0000000020000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B1A0B0E765C1D0379CA538ED0EFB9649 -Test: Encrypt -Comment: Set 1, vector 35 -Key: 0000000010000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 78F7D01D7795ACA0846CCE835E71FBC2 -Test: Encrypt -Comment: Set 1, vector 36 -Key: 0000000008000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E001A545AC71F53D3AD99C84D7F5B062 -Test: Encrypt -Comment: Set 1, vector 37 -Key: 0000000004000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 58E3907C56BF5ADFDBAE61C172B8F488 -Test: Encrypt -Comment: Set 1, vector 38 -Key: 0000000002000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 16F77C9515B473167BD7ABA7C97B1CCA -Test: Encrypt -Comment: Set 1, vector 39 -Key: 0000000001000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4BC9F687C7757CDF5A5E94D69E5EA173 -Test: Encrypt -Comment: Set 1, vector 40 -Key: 0000000000800000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 804261A34F26A87694F70C35F338989D -Test: Encrypt -Comment: Set 1, vector 41 -Key: 0000000000400000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E8D8BF002738D7067CD06437C4459365 -Test: Encrypt -Comment: Set 1, vector 42 -Key: 0000000000200000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E131137F7EA2AEAB37F72AF3644FFCCE -Test: Encrypt -Comment: Set 1, vector 43 -Key: 0000000000100000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 542A1FD5CB4BE8485FA83AA14FAAD4A8 -Test: Encrypt -Comment: Set 1, vector 44 -Key: 0000000000080000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BEC6C8C1A9E5E7982A990B8F9BA0ADE3 -Test: Encrypt -Comment: Set 1, vector 45 -Key: 0000000000040000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DE55BE1AA823A9F7474C65BD50D55095 -Test: Encrypt -Comment: Set 1, vector 46 -Key: 0000000000020000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D67CC199AF361A07A0DBD8F6700A4744 -Test: Encrypt -Comment: Set 1, vector 47 -Key: 0000000000010000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DBAD180017184EF80D398D8D22AAC4A1 -Test: Encrypt -Comment: Set 1, vector 48 -Key: 0000000000008000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 27E68691F10EEFD1B594682DC3EF65A5 -Test: Encrypt -Comment: Set 1, vector 49 -Key: 0000000000004000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6D4EF0587B948AD62B703D3D7CCEA229 -Test: Encrypt -Comment: Set 1, vector 50 -Key: 0000000000002000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C0F443758F239E3A3E31E6F93AD4766B -Test: Encrypt -Comment: Set 1, vector 51 -Key: 0000000000001000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BEB5CB1D8EB3A9EA795A4B43CA1567A9 -Test: Encrypt -Comment: Set 1, vector 52 -Key: 0000000000000800000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D89A97957F1979C63459A385E21B4A84 -Test: Encrypt -Comment: Set 1, vector 53 -Key: 0000000000000400000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 39A6615147FF571F2FABAD5BE9800A10 -Test: Encrypt -Comment: Set 1, vector 54 -Key: 0000000000000200000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E18B0CB1980124504B46A46A6F4273F3 -Test: Encrypt -Comment: Set 1, vector 55 -Key: 0000000000000100000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1E13C8034ED53FD4E3F433E1CF4B5CE1 -Test: Encrypt -Comment: Set 1, vector 56 -Key: 0000000000000080000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 71FA53EAADBA0C9BCF86A3071408966D -Test: Encrypt -Comment: Set 1, vector 57 -Key: 0000000000000040000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E50502EC84BB024C7466FE225C7FD8BA -Test: Encrypt -Comment: Set 1, vector 58 -Key: 0000000000000020000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DEB33581D79C9D4294E315998377BCBF -Test: Encrypt -Comment: Set 1, vector 59 -Key: 0000000000000010000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A713C2503CE44A04C9108FA160659945 -Test: Encrypt -Comment: Set 1, vector 60 -Key: 0000000000000008000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 520E9E8DB8A67601B02E369916FAB8CC -Test: Encrypt -Comment: Set 1, vector 61 -Key: 0000000000000004000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8FDC11B74D17D79C6B2DFF2D6A561258 -Test: Encrypt -Comment: Set 1, vector 62 -Key: 0000000000000002000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3EA497AD2FC8F2587EFAA7D49121F26C -Test: Encrypt -Comment: Set 1, vector 63 -Key: 0000000000000001000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3340905F7413C979E5AED11D71B9294E -Test: Encrypt -Comment: Set 1, vector 64 -Key: 0000000000000000800000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 067FAC22E16205FF209B1760ABDE0565 -Test: Encrypt -Comment: Set 1, vector 65 -Key: 0000000000000000400000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BECA010BAB7BDD7E8A8084DA9853A0F4 -Test: Encrypt -Comment: Set 1, vector 66 -Key: 0000000000000000200000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 146F5A4A7B2880F5AF57333C7F129028 -Test: Encrypt -Comment: Set 1, vector 67 -Key: 0000000000000000100000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F773C1BD724955109A8B4EA3DA1C2197 -Test: Encrypt -Comment: Set 1, vector 68 -Key: 0000000000000000080000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B427EFAC8C656AB6F4DF7F420A177B8E -Test: Encrypt -Comment: Set 1, vector 69 -Key: 0000000000000000040000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B3D1BDB29010DB5FC81B66E2F7189D54 -Test: Encrypt -Comment: Set 1, vector 70 -Key: 0000000000000000020000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 676EEA415693F303ACF5CD84C50816AB -Test: Encrypt -Comment: Set 1, vector 71 -Key: 0000000000000000010000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BA21C564E52961DEB4B3A3CA9E0B70EF -Test: Encrypt -Comment: Set 1, vector 72 -Key: 0000000000000000008000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A60FB5DBD17EA92E303492E3F54D0BF2 -Test: Encrypt -Comment: Set 1, vector 73 -Key: 0000000000000000004000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F4F5A0540107D66F32FB289B14EF4299 -Test: Encrypt -Comment: Set 1, vector 74 -Key: 0000000000000000002000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8D9B4A19F391175CF7DA42FEF313EDD8 -Test: Encrypt -Comment: Set 1, vector 75 -Key: 0000000000000000001000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B0AFAB0183A9FC69DA8BBE9B8FAF653A -Test: Encrypt -Comment: Set 1, vector 76 -Key: 0000000000000000000800000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 68FFD91FD5AD1F1AC176D639694FEA29 -Test: Encrypt -Comment: Set 1, vector 77 -Key: 0000000000000000000400000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 97EC38070014494A2E97EFE354BA2865 -Test: Encrypt -Comment: Set 1, vector 78 -Key: 0000000000000000000200000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E3EC51F889C63AD2C708F22AFC42D18C -Test: Encrypt -Comment: Set 1, vector 79 -Key: 0000000000000000000100000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8CC5BDB49037DC1D3D8DADFA0B8ECD96 -Test: Encrypt -Comment: Set 1, vector 80 -Key: 0000000000000000000080000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 14F5C3D75BA0397D7436E1479F78435B -Test: Encrypt -Comment: Set 1, vector 81 -Key: 0000000000000000000040000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FF3B01851C8254967E4DFAA2A0F0C057 -Test: Encrypt -Comment: Set 1, vector 82 -Key: 0000000000000000000020000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B8C8E9AFF66FFEC9D0342FF297A543B1 -Test: Encrypt -Comment: Set 1, vector 83 -Key: 0000000000000000000010000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A95A113F088FFE17A79050C46377545E -Test: Encrypt -Comment: Set 1, vector 84 -Key: 0000000000000000000008000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EA4C3AFA65016D057EC1DFDD0411ED06 -Test: Encrypt -Comment: Set 1, vector 85 -Key: 0000000000000000000004000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7D535C84DFAD692D0F89AB73C1F42F60 -Test: Encrypt -Comment: Set 1, vector 86 -Key: 0000000000000000000002000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E857DF0CEBAB1E03CB9AF73CBF9C19D1 -Test: Encrypt -Comment: Set 1, vector 87 -Key: 0000000000000000000001000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7A59BCF6FAC80379EB7E8E2EFAB147D4 -Test: Encrypt -Comment: Set 1, vector 88 -Key: 0000000000000000000000800000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 43EF17F87BAF7536DDE734F885C4CE85 -Test: Encrypt -Comment: Set 1, vector 89 -Key: 0000000000000000000000400000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2B71CE14089741A1EF1E99DC9E22E739 -Test: Encrypt -Comment: Set 1, vector 90 -Key: 0000000000000000000000200000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9283885622781998186B7DACBFF68ED2 -Test: Encrypt -Comment: Set 1, vector 91 -Key: 0000000000000000000000100000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 756A184F392D8C821479EFF930338C0A -Test: Encrypt -Comment: Set 1, vector 92 -Key: 0000000000000000000000080000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CE848D49BB76CA30B607C9539793DA41 -Test: Encrypt -Comment: Set 1, vector 93 -Key: 0000000000000000000000040000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 50F2D5238991EEA9654C8895AFC0AC37 -Test: Encrypt -Comment: Set 1, vector 94 -Key: 0000000000000000000000020000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 561564103E13F4CBB58A9E096DB1958B -Test: Encrypt -Comment: Set 1, vector 95 -Key: 0000000000000000000000010000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EF2BB05AC6868C15D66D956BD580D467 -Test: Encrypt -Comment: Set 1, vector 96 -Key: 0000000000000000000000008000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C7B1A5A3A201DF25FD97A47B1FC3569E -Test: Encrypt -Comment: Set 1, vector 97 -Key: 0000000000000000000000004000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0A1873FF47B38095CF6A8BABF3901FF2 -Test: Encrypt -Comment: Set 1, vector 98 -Key: 0000000000000000000000002000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A96F8F977DC45ABF55518EA10C598E10 -Test: Encrypt -Comment: Set 1, vector 99 -Key: 0000000000000000000000001000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 778C644278689EC0577BDDB2154AE635 -Test: Encrypt -Comment: Set 1, vector 100 -Key: 0000000000000000000000000800000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DEF97DBCF02648E7BCE6A368F7F34C14 -Test: Encrypt -Comment: Set 1, vector 101 -Key: 0000000000000000000000000400000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 71B85362022D53AF03A17870D8F66614 -Test: Encrypt -Comment: Set 1, vector 102 -Key: 0000000000000000000000000200000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3593FC550A2950C2EF94F6E8F6E90BB3 -Test: Encrypt -Comment: Set 1, vector 103 -Key: 0000000000000000000000000100000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 29E64004DBF1E7833A7CD82EDACD932A -Test: Encrypt -Comment: Set 1, vector 104 -Key: 0000000000000000000000000080000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 715E700DF74A8680F04A48B18AEDB99C -Test: Encrypt -Comment: Set 1, vector 105 -Key: 0000000000000000000000000040000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 72E3288FFB02D1100F84FA605855D812 -Test: Encrypt -Comment: Set 1, vector 106 -Key: 0000000000000000000000000020000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9021082D3C4CB202936FD76F1392446B -Test: Encrypt -Comment: Set 1, vector 107 -Key: 0000000000000000000000000010000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1552BD181EE0FB914558053F2662F9AE -Test: Encrypt -Comment: Set 1, vector 108 -Key: 0000000000000000000000000008000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 599D87052322E19141057F0EF3C47508 -Test: Encrypt -Comment: Set 1, vector 109 -Key: 0000000000000000000000000004000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 505AC03CEB2ECA1C9D411B4A1CF2011C -Test: Encrypt -Comment: Set 1, vector 110 -Key: 0000000000000000000000000002000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DD639574D8FFCD24EA68B2243C5AA7D6 -Test: Encrypt -Comment: Set 1, vector 111 -Key: 0000000000000000000000000001000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 45F5371B714D2652BA4AD083EDB65BEE -Test: Encrypt -Comment: Set 1, vector 112 -Key: 0000000000000000000000000000800000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DEAB9C368B21FE41E709554340E87C0B -Test: Encrypt -Comment: Set 1, vector 113 -Key: 0000000000000000000000000000400000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3A981045526766BD13943F11CE917AF9 -Test: Encrypt -Comment: Set 1, vector 114 -Key: 0000000000000000000000000000200000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 35CDF30A485CE21F0D005EE0C2BCF315 -Test: Encrypt -Comment: Set 1, vector 115 -Key: 0000000000000000000000000000100000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F561A8C91820252580317385F8336305 -Test: Encrypt -Comment: Set 1, vector 116 -Key: 0000000000000000000000000000080000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0789680D27735220798079572BF4ECF6 -Test: Encrypt -Comment: Set 1, vector 117 -Key: 0000000000000000000000000000040000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B4F16729D7AB16C9AE44FB61291920DE -Test: Encrypt -Comment: Set 1, vector 118 -Key: 0000000000000000000000000000020000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FB83BF9B1D983CA7FB3718E22D9A2155 -Test: Encrypt -Comment: Set 1, vector 119 -Key: 0000000000000000000000000000010000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CEC5C5D13E59508D3DA431F1479730F3 -Test: Encrypt -Comment: Set 1, vector 120 -Key: 0000000000000000000000000000008000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 09BEA932E60A4AD34271FF11A2B2AA02 -Test: Encrypt -Comment: Set 1, vector 121 -Key: 0000000000000000000000000000004000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B102F72FD89452C0CD1C6897071F903E -Test: Encrypt -Comment: Set 1, vector 122 -Key: 0000000000000000000000000000002000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A469F9411F0A3A6E1A8076416C6B55CB -Test: Encrypt -Comment: Set 1, vector 123 -Key: 0000000000000000000000000000001000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6C3F88FCB538699547A1CF07A529993F -Test: Encrypt -Comment: Set 1, vector 124 -Key: 0000000000000000000000000000000800000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 493E8CC2A63534632A6456ED47BF233C -Test: Encrypt -Comment: Set 1, vector 125 -Key: 0000000000000000000000000000000400000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1FD81E905F7055C4B04DB1F9718A6861 -Test: Encrypt -Comment: Set 1, vector 126 -Key: 0000000000000000000000000000000200000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B22882E01D7A1BF2D7F0E3BFBFC87156 -Test: Encrypt -Comment: Set 1, vector 127 -Key: 0000000000000000000000000000000100000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 86C9822E849322FB00DF89233D33935D -Test: Encrypt -Comment: Set 1, vector 128 -Key: 0000000000000000000000000000000080000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 12012E8E028D0D3D8DC00847130D424C -Test: Encrypt -Comment: Set 1, vector 129 -Key: 0000000000000000000000000000000040000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 182A96CC3BF10035B9DB292D1399F993 -Test: Encrypt -Comment: Set 1, vector 130 -Key: 0000000000000000000000000000000020000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 91E0E6991989D1FC4CBD754E4E7D0590 -Test: Encrypt -Comment: Set 1, vector 131 -Key: 0000000000000000000000000000000010000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F3EFC4E6F207E370C8CAE39408C4BF1B -Test: Encrypt -Comment: Set 1, vector 132 -Key: 0000000000000000000000000000000008000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AA767AB2EC6FA2FA183DAF9C0F3BAE5E -Test: Encrypt -Comment: Set 1, vector 133 -Key: 0000000000000000000000000000000004000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: D1FF11F4D1AEEAAE01A115081AF886EF -Test: Encrypt -Comment: Set 1, vector 134 -Key: 0000000000000000000000000000000002000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5390139711090B56B28338FEA98FCC82 -Test: Encrypt -Comment: Set 1, vector 135 -Key: 0000000000000000000000000000000001000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 13E693CCF6EBF0E6061B92B7ED0B95B6 -Test: Encrypt -Comment: Set 1, vector 136 -Key: 0000000000000000000000000000000000800000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 588FB2F95861D3C427669C68D04ADB25 -Test: Encrypt -Comment: Set 1, vector 137 -Key: 0000000000000000000000000000000000400000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F472ECDF8DEBC416313AAF7C8AAFB43E -Test: Encrypt -Comment: Set 1, vector 138 -Key: 0000000000000000000000000000000000200000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EAA654BE38E857941A921C70AC7FC7CE -Test: Encrypt -Comment: Set 1, vector 139 -Key: 0000000000000000000000000000000000100000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F2A4E47AE80CDF506B9513C510EA0954 -Test: Encrypt -Comment: Set 1, vector 140 -Key: 0000000000000000000000000000000000080000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F08EC7ED8FBB99F175A990C3E4DECB6B -Test: Encrypt -Comment: Set 1, vector 141 -Key: 0000000000000000000000000000000000040000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5C767BC584CA3653EDE27CD8B209A0AD -Test: Encrypt -Comment: Set 1, vector 142 -Key: 0000000000000000000000000000000000020000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AFF9A8BA92A40B2BF42FDB4089B1F9CC -Test: Encrypt -Comment: Set 1, vector 143 -Key: 0000000000000000000000000000000000010000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BFC1E9198BBE22266712EB1ECB17D748 -Test: Encrypt -Comment: Set 1, vector 144 -Key: 0000000000000000000000000000000000008000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 235184136A29208BD041E60BCB9F7464 -Test: Encrypt -Comment: Set 1, vector 145 -Key: 0000000000000000000000000000000000004000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 83DC48F9177C5C94CBC22E83A2B76829 -Test: Encrypt -Comment: Set 1, vector 146 -Key: 0000000000000000000000000000000000002000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 72CD31ACB7A1A459E4D27C1F26039FA7 -Test: Encrypt -Comment: Set 1, vector 147 -Key: 0000000000000000000000000000000000001000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 139AC4734C3136FD9982FCC7A569B9D3 -Test: Encrypt -Comment: Set 1, vector 148 -Key: 0000000000000000000000000000000000000800000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 12FFA3EF4346F4C57A03A36F9938B251 -Test: Encrypt -Comment: Set 1, vector 149 -Key: 0000000000000000000000000000000000000400000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 43DDB100CE22E5553CF4DCF814BF3CAC -Test: Encrypt -Comment: Set 1, vector 150 -Key: 0000000000000000000000000000000000000200000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: ABDADF4C948BB61C0A917885ADE4C7C5 -Test: Encrypt -Comment: Set 1, vector 151 -Key: 0000000000000000000000000000000000000100000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 197391E089DE173B522DDD8CBEEC3118 -Test: Encrypt -Comment: Set 1, vector 152 -Key: 0000000000000000000000000000000000000080000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 43FBE8BF2728C55C9368D01E40C1CF96 -Test: Encrypt -Comment: Set 1, vector 153 -Key: 0000000000000000000000000000000000000040000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0F5DE5F67EC84F2CB253A0BC48991C71 -Test: Encrypt -Comment: Set 1, vector 154 -Key: 0000000000000000000000000000000000000020000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 52BA4666B972EAE3D2E960D7372D3C48 -Test: Encrypt -Comment: Set 1, vector 155 -Key: 0000000000000000000000000000000000000010000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0735AE765BC079A93B451D873FA93702 -Test: Encrypt -Comment: Set 1, vector 156 -Key: 0000000000000000000000000000000000000008000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 89D988508A4569E2232F72412AE50B65 -Test: Encrypt -Comment: Set 1, vector 157 -Key: 0000000000000000000000000000000000000004000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BCF0EE2403BC9344030C0FF065B6FD88 -Test: Encrypt -Comment: Set 1, vector 158 -Key: 0000000000000000000000000000000000000002000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 25D76D36F3376D6FD835BA012C7DD2E5 -Test: Encrypt -Comment: Set 1, vector 159 -Key: 0000000000000000000000000000000000000001000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EF364A31E8551732D4B2098281D4E2C9 -Test: Encrypt -Comment: Set 1, vector 160 -Key: 0000000000000000000000000000000000000000800000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 64B1F927C0A7315EA60BC5F2A0DCCFE2 -Test: Encrypt -Comment: Set 1, vector 161 -Key: 0000000000000000000000000000000000000000400000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CA99E0EDFA0E121F27659346BCDCC443 -Test: Encrypt -Comment: Set 1, vector 162 -Key: 0000000000000000000000000000000000000000200000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1816D9D23D1069BC6DEC195F60994C05 -Test: Encrypt -Comment: Set 1, vector 163 -Key: 0000000000000000000000000000000000000000100000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9819575F6890E093091378AED0612051 -Test: Encrypt -Comment: Set 1, vector 164 -Key: 0000000000000000000000000000000000000000080000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 41903DE72A486B823842FBA2840E265C -Test: Encrypt -Comment: Set 1, vector 165 -Key: 0000000000000000000000000000000000000000040000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 30651D416912A01EDEC4290D34B4A605 -Test: Encrypt -Comment: Set 1, vector 166 -Key: 0000000000000000000000000000000000000000020000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0949AD8AB2E85995686D6D495ABA1028 -Test: Encrypt -Comment: Set 1, vector 167 -Key: 0000000000000000000000000000000000000000010000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3789C2D08E122BE204662FE9A0FDF77A -Test: Encrypt -Comment: Set 1, vector 168 -Key: 0000000000000000000000000000000000000000008000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A0C66EE031FF045123475E6F5FA64F57 -Test: Encrypt -Comment: Set 1, vector 169 -Key: 0000000000000000000000000000000000000000004000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1BACCDD314AF39124709013C94CAD1AC -Test: Encrypt -Comment: Set 1, vector 170 -Key: 0000000000000000000000000000000000000000002000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2FB5DF5527A8E06AED03D683EDF14E9A -Test: Encrypt -Comment: Set 1, vector 171 -Key: 0000000000000000000000000000000000000000001000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FF2C61AD63CDA6207605C18C888B383D -Test: Encrypt -Comment: Set 1, vector 172 -Key: 0000000000000000000000000000000000000000000800000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 71CE4A5B48671AB9A6561B7109FB8345 -Test: Encrypt -Comment: Set 1, vector 173 -Key: 0000000000000000000000000000000000000000000400000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 37299C12377E9CB8DF5FE730DFFCB5CA -Test: Encrypt -Comment: Set 1, vector 174 -Key: 0000000000000000000000000000000000000000000200000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C5454350A7CB0EC5CA3932A3948F48BC -Test: Encrypt -Comment: Set 1, vector 175 -Key: 0000000000000000000000000000000000000000000100000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8AB40D09FFBD0C82E9091FC80D2A63C9 -Test: Encrypt -Comment: Set 1, vector 176 -Key: 0000000000000000000000000000000000000000000080000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9CB3FE43EAE3DC7AC4F97E609FDE9F10 -Test: Encrypt -Comment: Set 1, vector 177 -Key: 0000000000000000000000000000000000000000000040000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 51369DC689B25C3AC593B578BAEA046E -Test: Encrypt -Comment: Set 1, vector 178 -Key: 0000000000000000000000000000000000000000000020000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 13D9D885A24AE8B859F239890DF438C9 -Test: Encrypt -Comment: Set 1, vector 179 -Key: 0000000000000000000000000000000000000000000010000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CEACAE376290D5C62D2DAE422CA6E5C0 -Test: Encrypt -Comment: Set 1, vector 180 -Key: 0000000000000000000000000000000000000000000008000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6AE17D621F97B62F4571AB165CE0A11F -Test: Encrypt -Comment: Set 1, vector 181 -Key: 0000000000000000000000000000000000000000000004000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C91318F8FD17E9BC656E639A0D648B3A -Test: Encrypt -Comment: Set 1, vector 182 -Key: 0000000000000000000000000000000000000000000002000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BFF1BC1C935E40FB0C20DED5985F1910 -Test: Encrypt -Comment: Set 1, vector 183 -Key: 0000000000000000000000000000000000000000000001000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 96F0B387F487BBDD5227B595A506F963 -Test: Encrypt -Comment: Set 1, vector 184 -Key: 0000000000000000000000000000000000000000000000800000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 62265B7EFB73A77205ECBBFD166B3EAE -Test: Encrypt -Comment: Set 1, vector 185 -Key: 0000000000000000000000000000000000000000000000400000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 016E8F3087757E8F576B19A58D356FB6 -Test: Encrypt -Comment: Set 1, vector 186 -Key: 0000000000000000000000000000000000000000000000200000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 456FAF632EA07797CEC23DC6553988F9 -Test: Encrypt -Comment: Set 1, vector 187 -Key: 0000000000000000000000000000000000000000000000100000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 147694E2231FA00D6B62D3E51CC8201D -Test: Encrypt -Comment: Set 1, vector 188 -Key: 0000000000000000000000000000000000000000000000080000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2299D31F3D747838C65FE7C6C0C59214 -Test: Encrypt -Comment: Set 1, vector 189 -Key: 0000000000000000000000000000000000000000000000040000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: C5A669612A23E4F7551D79650071E040 -Test: Encrypt -Comment: Set 1, vector 190 -Key: 0000000000000000000000000000000000000000000000020000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F0A32D722EDFD2BA628C781DACD5FC50 -Test: Encrypt -Comment: Set 1, vector 191 -Key: 0000000000000000000000000000000000000000000000010000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 422C8E2A0DFF095E40654CB2B7176A9B -Test: Encrypt -Comment: Set 1, vector 192 -Key: 0000000000000000000000000000000000000000000000008000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 99DEF168961D4AB9E63157E60F76399C -Test: Encrypt -Comment: Set 1, vector 193 -Key: 0000000000000000000000000000000000000000000000004000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 49C92ACC622A00BCFF7DFDCABF33CB4C -Test: Encrypt -Comment: Set 1, vector 194 -Key: 0000000000000000000000000000000000000000000000002000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 517117A096B2EE66D4BEF2D1EE570CE7 -Test: Encrypt -Comment: Set 1, vector 195 -Key: 0000000000000000000000000000000000000000000000001000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9DAECC0E82559BC2CDB8A01AB30BA605 -Test: Encrypt -Comment: Set 1, vector 196 -Key: 0000000000000000000000000000000000000000000000000800000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 50B2882928DAB54488413ABA5743535E -Test: Encrypt -Comment: Set 1, vector 197 -Key: 0000000000000000000000000000000000000000000000000400000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E6725F73ED920F473E1442ABEC7DB722 -Test: Encrypt -Comment: Set 1, vector 198 -Key: 0000000000000000000000000000000000000000000000000200000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CB4F06002C5864E40C80F97157452575 -Test: Encrypt -Comment: Set 1, vector 199 -Key: 0000000000000000000000000000000000000000000000000100000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8DF72D7C8AE547F2AA3E9AFAAD1D62F0 -Test: Encrypt -Comment: Set 1, vector 200 -Key: 0000000000000000000000000000000000000000000000000080000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0DA429E486F5ED9460B7C54460B0A699 -Test: Encrypt -Comment: Set 1, vector 201 -Key: 0000000000000000000000000000000000000000000000000040000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 24832DB462328D93306C6714E100ADAB -Test: Encrypt -Comment: Set 1, vector 202 -Key: 0000000000000000000000000000000000000000000000000020000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3170D82FEC3D2A58C7D2F28BAC4C7809 -Test: Encrypt -Comment: Set 1, vector 203 -Key: 0000000000000000000000000000000000000000000000000010000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 638A46425AEA9C808AC752EE69F56822 -Test: Encrypt -Comment: Set 1, vector 204 -Key: 0000000000000000000000000000000000000000000000000008000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F98954D90C5E3DB2EEC8A86078D70763 -Test: Encrypt -Comment: Set 1, vector 205 -Key: 0000000000000000000000000000000000000000000000000004000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8D5868451617FB145B8F7F91712A7AA0 -Test: Encrypt -Comment: Set 1, vector 206 -Key: 0000000000000000000000000000000000000000000000000002000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2292BA337A4F465E0DFB85DAAC266AE6 -Test: Encrypt -Comment: Set 1, vector 207 -Key: 0000000000000000000000000000000000000000000000000001000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F2560D5063A2F928D699005012A0C839 -Test: Encrypt -Comment: Set 1, vector 208 -Key: 0000000000000000000000000000000000000000000000000000800000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 44968AEABB2852075F83FB942E05099D -Test: Encrypt -Comment: Set 1, vector 209 -Key: 0000000000000000000000000000000000000000000000000000400000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EB339742AB40B5627A7CB60D4F54DD2E -Test: Encrypt -Comment: Set 1, vector 210 -Key: 0000000000000000000000000000000000000000000000000000200000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9AAA6FC3BBDE523E9FCD9D5C0255F912 -Test: Encrypt -Comment: Set 1, vector 211 -Key: 0000000000000000000000000000000000000000000000000000100000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E6E25CBAFF57F4C6056706FD13E6A2E3 -Test: Encrypt -Comment: Set 1, vector 212 -Key: 0000000000000000000000000000000000000000000000000000080000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 8A9628166922E8EC6FC28F5E847B9C71 -Test: Encrypt -Comment: Set 1, vector 213 -Key: 0000000000000000000000000000000000000000000000000000040000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 97CF8FF5D1337DA8602F8AB6C0224AF7 -Test: Encrypt -Comment: Set 1, vector 214 -Key: 0000000000000000000000000000000000000000000000000000020000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DDBBE09A93364599E9233969ADBEBA63 -Test: Encrypt -Comment: Set 1, vector 215 -Key: 0000000000000000000000000000000000000000000000000000010000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: E772954B9DA3DA8A005582C4E9E5B6FA -Test: Encrypt -Comment: Set 1, vector 216 -Key: 0000000000000000000000000000000000000000000000000000008000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 507DFD30F7EEF807F994B298D487FDE6 -Test: Encrypt -Comment: Set 1, vector 217 -Key: 0000000000000000000000000000000000000000000000000000004000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6FF09F69AED61F091F92503547A19B68 -Test: Encrypt -Comment: Set 1, vector 218 -Key: 0000000000000000000000000000000000000000000000000000002000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 1141E6BB725E09640DD6971F4EF1A886 -Test: Encrypt -Comment: Set 1, vector 219 -Key: 0000000000000000000000000000000000000000000000000000001000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9C0E8061BA0361B730D24675EF128705 -Test: Encrypt -Comment: Set 1, vector 220 -Key: 0000000000000000000000000000000000000000000000000000000800000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7D0137240D0D3D086198E83BC0CF22D0 -Test: Encrypt -Comment: Set 1, vector 221 -Key: 0000000000000000000000000000000000000000000000000000000400000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: BC4460FF55EBFAA1171B0CE249830281 -Test: Encrypt -Comment: Set 1, vector 222 -Key: 0000000000000000000000000000000000000000000000000000000200000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CDBE93ADCF1867B952FB82C42DF60CFD -Test: Encrypt -Comment: Set 1, vector 223 -Key: 0000000000000000000000000000000000000000000000000000000100000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 007AA375E4402B8A5657C01259AF3D49 -Test: Encrypt -Comment: Set 1, vector 224 -Key: 0000000000000000000000000000000000000000000000000000000080000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: F5C2B13998E5687C773017C14EB01FE4 -Test: Encrypt -Comment: Set 1, vector 225 -Key: 0000000000000000000000000000000000000000000000000000000040000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0AE71BFDD72FBC4576305E4B0807E17C -Test: Encrypt -Comment: Set 1, vector 226 -Key: 0000000000000000000000000000000000000000000000000000000020000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 35FB1CE6CB7449DF115D3AC6BA656439 -Test: Encrypt -Comment: Set 1, vector 227 -Key: 0000000000000000000000000000000000000000000000000000000010000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6D64CEC5D9D74BD40FBC0BE69C70B777 -Test: Encrypt -Comment: Set 1, vector 228 -Key: 0000000000000000000000000000000000000000000000000000000008000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7257851ACD3E3E3AE50048973C3A2AE8 -Test: Encrypt -Comment: Set 1, vector 229 -Key: 0000000000000000000000000000000000000000000000000000000004000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 50852661D5BD7960412B29A86F549619 -Test: Encrypt -Comment: Set 1, vector 230 -Key: 0000000000000000000000000000000000000000000000000000000002000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CDF3561D971D40521CD46BAE98F5867A -Test: Encrypt -Comment: Set 1, vector 231 -Key: 0000000000000000000000000000000000000000000000000000000001000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FA3C84185B9ABF9887DD501B3B0F52D3 -Test: Encrypt -Comment: Set 1, vector 232 -Key: 0000000000000000000000000000000000000000000000000000000000800000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 40A5B434F81574733D00F25511109E08 -Test: Encrypt -Comment: Set 1, vector 233 -Key: 0000000000000000000000000000000000000000000000000000000000400000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DA0D248315C527572F1673BDE26A475E -Test: Encrypt -Comment: Set 1, vector 234 -Key: 0000000000000000000000000000000000000000000000000000000000200000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0F8366D8EFB9AB63B0299F278C55CFB4 -Test: Encrypt -Comment: Set 1, vector 235 -Key: 0000000000000000000000000000000000000000000000000000000000100000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 25A089C523CD153EC094862B5923F492 -Test: Encrypt -Comment: Set 1, vector 236 -Key: 0000000000000000000000000000000000000000000000000000000000080000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7268A4628C6A0BE6A8391ABE70986176 -Test: Encrypt -Comment: Set 1, vector 237 -Key: 0000000000000000000000000000000000000000000000000000000000040000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7C11E6478CC688FE707454DF4AB5B666 -Test: Encrypt -Comment: Set 1, vector 238 -Key: 0000000000000000000000000000000000000000000000000000000000020000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 7601B6EBD5CE578973E949C21BFA8CAA -Test: Encrypt -Comment: Set 1, vector 239 -Key: 0000000000000000000000000000000000000000000000000000000000010000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0FCE9CCDF89F2EB139DBEB09B55375D5 -Test: Encrypt -Comment: Set 1, vector 240 -Key: 0000000000000000000000000000000000000000000000000000000000008000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AAABFDD9E28A3ADCA1212F3D7F53A269 -Test: Encrypt -Comment: Set 1, vector 241 -Key: 0000000000000000000000000000000000000000000000000000000000004000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: FC6B4304423917E41677768BD7A8D402 -Test: Encrypt -Comment: Set 1, vector 242 -Key: 0000000000000000000000000000000000000000000000000000000000002000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2AA3239D19ADBA9A4190E3653875C589 -Test: Encrypt -Comment: Set 1, vector 243 -Key: 0000000000000000000000000000000000000000000000000000000000001000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 4F4AB0DB2F3D3EA1E5FCBF99651485DC -Test: Encrypt -Comment: Set 1, vector 244 -Key: 0000000000000000000000000000000000000000000000000000000000000800 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B542CEF08D13E300B282CE6A74C51C96 -Test: Encrypt -Comment: Set 1, vector 245 -Key: 0000000000000000000000000000000000000000000000000000000000000400 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 9955E16433B0D58BFC4B35EE9F44734C -Test: Encrypt -Comment: Set 1, vector 246 -Key: 0000000000000000000000000000000000000000000000000000000000000200 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 5027A7DDC6F99A112E45D3090C7C3465 -Test: Encrypt -Comment: Set 1, vector 247 -Key: 0000000000000000000000000000000000000000000000000000000000000100 -Plaintext: 00000000000000000000000000000000 -Ciphertext: CB14EBD24FC63194495FACFFB5C3A07B -Test: Encrypt -Comment: Set 1, vector 248 -Key: 0000000000000000000000000000000000000000000000000000000000000080 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 2BCBE64545A08F59178242452566B997 -Test: Encrypt -Comment: Set 1, vector 249 -Key: 0000000000000000000000000000000000000000000000000000000000000040 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DE428FF12360A0C8FAE73E9D8E6A0657 -Test: Encrypt -Comment: Set 1, vector 250 -Key: 0000000000000000000000000000000000000000000000000000000000000020 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 6425603FCB0F088D87D3AC7078C7014C -Test: Encrypt -Comment: Set 1, vector 251 -Key: 0000000000000000000000000000000000000000000000000000000000000010 -Plaintext: 00000000000000000000000000000000 -Ciphertext: A837813C9436F4C48C45B6C85A4EAF84 -Test: Encrypt -Comment: Set 1, vector 252 -Key: 0000000000000000000000000000000000000000000000000000000000000008 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B95F9010E694BA44B812D6A7A59E027A -Test: Encrypt -Comment: Set 1, vector 253 -Key: 0000000000000000000000000000000000000000000000000000000000000004 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DF2746A2D9ED707DCC686BB64B77C9DD -Test: Encrypt -Comment: Set 1, vector 254 -Key: 0000000000000000000000000000000000000000000000000000000000000002 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 40DD304C3FC8FEF5D7D08FD467E018F6 -Test: Encrypt -Comment: Set 1, vector 255 -Key: 0000000000000000000000000000000000000000000000000000000000000001 -Plaintext: 00000000000000000000000000000000 -Ciphertext: AFCD38B195E0A736304E89B9AE3019D3 -Test: Encrypt -Comment: Set 2, vector 0 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 80000000000000000000000000000000 -Ciphertext: B0C6B88AEA518AB09E847248E91B1B9D -Test: Encrypt -Comment: Set 2, vector 1 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 40000000000000000000000000000000 -Ciphertext: B8D7684E35FA1DB15BDCEE7A48659858 -Test: Encrypt -Comment: Set 2, vector 2 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 20000000000000000000000000000000 -Ciphertext: F0CAD59AF92FBB79F36951E697492750 -Test: Encrypt -Comment: Set 2, vector 3 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 10000000000000000000000000000000 -Ciphertext: 117100F6635389560DC4A2DA24EBA70F -Test: Encrypt -Comment: Set 2, vector 4 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 08000000000000000000000000000000 -Ciphertext: DBDD62355553019ED84C35886421E532 -Test: Encrypt -Comment: Set 2, vector 5 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 04000000000000000000000000000000 -Ciphertext: 9CB8D04FA506F19848F7B9110518BFC8 -Test: Encrypt -Comment: Set 2, vector 6 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 02000000000000000000000000000000 -Ciphertext: E4308E253BC3444D293500701BA82C6A -Test: Encrypt -Comment: Set 2, vector 7 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 01000000000000000000000000000000 -Ciphertext: EA2FAE53F7F30C0170A20E95A068503E -Test: Encrypt -Comment: Set 2, vector 8 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00800000000000000000000000000000 -Ciphertext: 14B14839EA221880B2C64D1FE000B93D -Test: Encrypt -Comment: Set 2, vector 9 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00400000000000000000000000000000 -Ciphertext: A5CFC075B342D5101AACC334E73058BB -Test: Encrypt -Comment: Set 2, vector 10 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00200000000000000000000000000000 -Ciphertext: 477EA56B2EBAD0F8AC5E1936866560FF -Test: Encrypt -Comment: Set 2, vector 11 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00100000000000000000000000000000 -Ciphertext: 107E8598418404196EC59F63E45B7F6D -Test: Encrypt -Comment: Set 2, vector 12 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00080000000000000000000000000000 -Ciphertext: FF6A891E7C1C074A68FEC291928FDD8D -Test: Encrypt -Comment: Set 2, vector 13 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00040000000000000000000000000000 -Ciphertext: F64C250A13F45D377ADB7545B2B157A9 -Test: Encrypt -Comment: Set 2, vector 14 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00020000000000000000000000000000 -Ciphertext: FAD0F252086F11C830C65B63197CBC38 -Test: Encrypt -Comment: Set 2, vector 15 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00010000000000000000000000000000 -Ciphertext: 9DCB89B209441F02AD0D25C6AB826629 -Test: Encrypt -Comment: Set 2, vector 16 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00008000000000000000000000000000 -Ciphertext: E62E4ED4E4F34EDC563710D960E09D4C -Test: Encrypt -Comment: Set 2, vector 17 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00004000000000000000000000000000 -Ciphertext: 98A1B926BA06895C3F2E84CCBACBC356 -Test: Encrypt -Comment: Set 2, vector 18 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00002000000000000000000000000000 -Ciphertext: 29BE0BE4DB7F4D196718AEA38F3B0BFD -Test: Encrypt -Comment: Set 2, vector 19 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00001000000000000000000000000000 -Ciphertext: F670C4EBECBA0B43E71F6D752BFD4854 -Test: Encrypt -Comment: Set 2, vector 20 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000800000000000000000000000000 -Ciphertext: 7D7666B4484CDB7E3605468E093A787C -Test: Encrypt -Comment: Set 2, vector 21 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000400000000000000000000000000 -Ciphertext: 562D06B181C091DA6C43642AE99460C6 -Test: Encrypt -Comment: Set 2, vector 22 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000200000000000000000000000000 -Ciphertext: AB0EFB5975E6186B7D76BC9672453488 -Test: Encrypt -Comment: Set 2, vector 23 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000100000000000000000000000000 -Ciphertext: 10C0756538E7BFF88D19AE2B1F7B859A -Test: Encrypt -Comment: Set 2, vector 24 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000080000000000000000000000000 -Ciphertext: AF7FCD5248F8C72F1695AA05DD1CADE0 -Test: Encrypt -Comment: Set 2, vector 25 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000040000000000000000000000000 -Ciphertext: 9841E555655609A75D7BE20B8A90EF1E -Test: Encrypt -Comment: Set 2, vector 26 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000020000000000000000000000000 -Ciphertext: 27F9546E6A1B7464780000561783569C -Test: Encrypt -Comment: Set 2, vector 27 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000010000000000000000000000000 -Ciphertext: 8671D935D7A8354EECB7288803D42D7A -Test: Encrypt -Comment: Set 2, vector 28 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000008000000000000000000000000 -Ciphertext: 0DA44F508DEBC6F044394624FCEB8EBE -Test: Encrypt -Comment: Set 2, vector 29 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000004000000000000000000000000 -Ciphertext: AB137369BE6D93FBB18006BDB236EC09 -Test: Encrypt -Comment: Set 2, vector 30 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000002000000000000000000000000 -Ciphertext: EB90C4E597A7E1779FFA260886E26F75 -Test: Encrypt -Comment: Set 2, vector 31 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000001000000000000000000000000 -Ciphertext: 618CF3588D5C128EAF252616230E08F7 -Test: Encrypt -Comment: Set 2, vector 32 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000800000000000000000000000 -Ciphertext: 98DC4DB49D197AB9152D12B9DE2D73CA -Test: Encrypt -Comment: Set 2, vector 33 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000400000000000000000000000 -Ciphertext: 5BDDE24B15702A35E1F140C57D206443 -Test: Encrypt -Comment: Set 2, vector 34 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000200000000000000000000000 -Ciphertext: CF755809882BED8BA2F9F1A4ED296A2B -Test: Encrypt -Comment: Set 2, vector 35 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000100000000000000000000000 -Ciphertext: F1A8DBB999538AE89D16F92A7F4D1DF1 -Test: Encrypt -Comment: Set 2, vector 36 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000080000000000000000000000 -Ciphertext: 775222FDDAAECB81CF675C4E0B98179E -Test: Encrypt -Comment: Set 2, vector 37 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000040000000000000000000000 -Ciphertext: 12A648CADCD153C760A965826683119A -Test: Encrypt -Comment: Set 2, vector 38 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000020000000000000000000000 -Ciphertext: 0503FB10AB241E7CF45D8CDEEE474335 -Test: Encrypt -Comment: Set 2, vector 39 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000010000000000000000000000 -Ciphertext: 3D299C0070CBBD831B802690B8E7CA24 -Test: Encrypt -Comment: Set 2, vector 40 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000008000000000000000000000 -Ciphertext: 33105BD4D11D66753DC34D128BEFE3F4 -Test: Encrypt -Comment: Set 2, vector 41 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000004000000000000000000000 -Ciphertext: 5EFCE2B4B987C0F77D27B44836881682 -Test: Encrypt -Comment: Set 2, vector 42 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000002000000000000000000000 -Ciphertext: 7835449454128035D7F0EA99E327577B -Test: Encrypt -Comment: Set 2, vector 43 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000001000000000000000000000 -Ciphertext: 27BEDDA0601BE35122FB1D272D73AB3E -Test: Encrypt -Comment: Set 2, vector 44 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000800000000000000000000 -Ciphertext: 54C3F99FF48E318CC515EDE75800C4B3 -Test: Encrypt -Comment: Set 2, vector 45 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000400000000000000000000 -Ciphertext: C627C329F8E48299F6FDB23B9DBEA0BB -Test: Encrypt -Comment: Set 2, vector 46 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000200000000000000000000 -Ciphertext: 1B6578F9E23BD8C1845A02431C5F9AA3 -Test: Encrypt -Comment: Set 2, vector 47 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000100000000000000000000 -Ciphertext: 6DB2FB8C0B9344D0547C0FF1292020C6 -Test: Encrypt -Comment: Set 2, vector 48 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000080000000000000000000 -Ciphertext: 4FAD9B2C37C131493FBEF53581FA4F83 -Test: Encrypt -Comment: Set 2, vector 49 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000040000000000000000000 -Ciphertext: 47502A01E93D2C87BD5584F6AFD3D99D -Test: Encrypt -Comment: Set 2, vector 50 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000020000000000000000000 -Ciphertext: 056E1C6F651BFE50271B3B7A18E76D84 -Test: Encrypt -Comment: Set 2, vector 51 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000010000000000000000000 -Ciphertext: 5632BAF6627B3D96AD4E06FA6A561F55 -Test: Encrypt -Comment: Set 2, vector 52 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000008000000000000000000 -Ciphertext: E29807CAACDFA2D41A7D9E91FA7FD8EB -Test: Encrypt -Comment: Set 2, vector 53 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000004000000000000000000 -Ciphertext: 81DD44BB5D1822DEE605F9E6FF01D7B3 -Test: Encrypt -Comment: Set 2, vector 54 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000002000000000000000000 -Ciphertext: 5C3649925E47D7FF96482A8FBD9666FD -Test: Encrypt -Comment: Set 2, vector 55 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000001000000000000000000 -Ciphertext: 695415A836E66E737887845EC08A1ADB -Test: Encrypt -Comment: Set 2, vector 56 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000800000000000000000 -Ciphertext: F5416BCE292D9E2CEA5D1CC70BBAEED1 -Test: Encrypt -Comment: Set 2, vector 57 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000400000000000000000 -Ciphertext: 7AEC4F1388FC29C47F7FED74ADDE8485 -Test: Encrypt -Comment: Set 2, vector 58 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000200000000000000000 -Ciphertext: 82A9F1A6CE08BC4876E649D8A8EA7EB6 -Test: Encrypt -Comment: Set 2, vector 59 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000100000000000000000 -Ciphertext: B6296C88ADF1A792908B065EEB04BFC2 -Test: Encrypt -Comment: Set 2, vector 60 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000080000000000000000 -Ciphertext: E766A39AECCA40BDBFBE6FF3FA292913 -Test: Encrypt -Comment: Set 2, vector 61 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000040000000000000000 -Ciphertext: C6D081454EA00D83C23B5A62C84359E1 -Test: Encrypt -Comment: Set 2, vector 62 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000020000000000000000 -Ciphertext: 85D259A79CCA80484504D1603F7A8F53 -Test: Encrypt -Comment: Set 2, vector 63 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000010000000000000000 -Ciphertext: D8291FA1C6DC250078824B2D0A20883F -Test: Encrypt -Comment: Set 2, vector 64 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000008000000000000000 -Ciphertext: 95387CB74C48FFBD1F8D64A6CC45E074 -Test: Encrypt -Comment: Set 2, vector 65 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000004000000000000000 -Ciphertext: A17F975F538F56CDF629B516011DE837 -Test: Encrypt -Comment: Set 2, vector 66 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000002000000000000000 -Ciphertext: B50B615A1654C6E1CB6AB33716C097FE -Test: Encrypt -Comment: Set 2, vector 67 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000001000000000000000 -Ciphertext: 7BBB2CBB874DF6C8B821DA7FB0F9011B -Test: Encrypt -Comment: Set 2, vector 68 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000800000000000000 -Ciphertext: E9EFE074D096A275E47CD2E6206DF6A1 -Test: Encrypt -Comment: Set 2, vector 69 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000400000000000000 -Ciphertext: 88F2F8D5A836406AE8BBB98C65BBDA55 -Test: Encrypt -Comment: Set 2, vector 70 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000200000000000000 -Ciphertext: F64620D8D87585A3EF038B9AD58F5EA0 -Test: Encrypt -Comment: Set 2, vector 71 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000100000000000000 -Ciphertext: 694438EC141C8ED5F2F898B4554A298F -Test: Encrypt -Comment: Set 2, vector 72 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000080000000000000 -Ciphertext: 3E6226EC7726A1EE5F5FA9B18CCE8C44 -Test: Encrypt -Comment: Set 2, vector 73 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000040000000000000 -Ciphertext: 8AB6949E79911647800B9E87362AB97A -Test: Encrypt -Comment: Set 2, vector 74 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000020000000000000 -Ciphertext: 093C5CF24EDAF7F9F1C8A80DE4FF50A9 -Test: Encrypt -Comment: Set 2, vector 75 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000010000000000000 -Ciphertext: 28A36E50061F19E240351ED0E378CBF4 -Test: Encrypt -Comment: Set 2, vector 76 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000008000000000000 -Ciphertext: B93BB36CB88BF26EA79198652AA51D3C -Test: Encrypt -Comment: Set 2, vector 77 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000004000000000000 -Ciphertext: DE4948083D044FAC9BCA6DA8CD67B8A6 -Test: Encrypt -Comment: Set 2, vector 78 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000002000000000000 -Ciphertext: 6E778B5BDA6CA118117E47470D080D3C -Test: Encrypt -Comment: Set 2, vector 79 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000001000000000000 -Ciphertext: 0A9107324DA32B4281D032A3487EF875 -Test: Encrypt -Comment: Set 2, vector 80 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000800000000000 -Ciphertext: 18ED5635312D71ABD123CCE779D4D68A -Test: Encrypt -Comment: Set 2, vector 81 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000400000000000 -Ciphertext: 2E3C63F95C4BC1F944BAB06DEDC9AA8E -Test: Encrypt -Comment: Set 2, vector 82 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000200000000000 -Ciphertext: ACCC869EF07004C8C3C709083BE7BA2F -Test: Encrypt -Comment: Set 2, vector 83 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000100000000000 -Ciphertext: DF60B34FB1A59147CC1FB049C1578206 -Test: Encrypt -Comment: Set 2, vector 84 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000080000000000 -Ciphertext: 4228DC636C08E41021054AA0E1E2227A -Test: Encrypt -Comment: Set 2, vector 85 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000040000000000 -Ciphertext: 7CE27F66EFD735FFD6B3E1738C50495B -Test: Encrypt -Comment: Set 2, vector 86 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000020000000000 -Ciphertext: F8E74B33A9CDE351DA0BBC06D69093D7 -Test: Encrypt -Comment: Set 2, vector 87 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000010000000000 -Ciphertext: AE0D22A5B37B8DC5D81CC641EED334D0 -Test: Encrypt -Comment: Set 2, vector 88 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000008000000000 -Ciphertext: C181C6CA5E163743458B9167A0B6A16A -Test: Encrypt -Comment: Set 2, vector 89 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000004000000000 -Ciphertext: 5171F4F6095E4B276CFBA1F07223FBE6 -Test: Encrypt -Comment: Set 2, vector 90 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000002000000000 -Ciphertext: 2732F4D3A8C9D1D8D493840D6E0B864F -Test: Encrypt -Comment: Set 2, vector 91 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000001000000000 -Ciphertext: 3EF04E0059A061D973532CA5C1DFBE7B -Test: Encrypt -Comment: Set 2, vector 92 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000800000000 -Ciphertext: 6D9A8F23579E4978EBAA87B5ADEB77E5 -Test: Encrypt -Comment: Set 2, vector 93 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000400000000 -Ciphertext: BBD08873CC44BA4253C0C41FEEB7F124 -Test: Encrypt -Comment: Set 2, vector 94 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000200000000 -Ciphertext: 72E4B2437CBD283F3809CE686F6A591E -Test: Encrypt -Comment: Set 2, vector 95 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000100000000 -Ciphertext: 6E5580514B92512B1BF4B1B987B9AA1B -Test: Encrypt -Comment: Set 2, vector 96 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000080000000 -Ciphertext: 5EF5D0C5BCBDCB604D3A083B68CE0FA3 -Test: Encrypt -Comment: Set 2, vector 97 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000040000000 -Ciphertext: 9D991FDD723AD2182777A15CA0E0F665 -Test: Encrypt -Comment: Set 2, vector 98 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000020000000 -Ciphertext: 24440626EFC8F86BEA7DE78085AB8A22 -Test: Encrypt -Comment: Set 2, vector 99 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000010000000 -Ciphertext: 17C3630D62D13C1E826C0FCCBD74A864 -Test: Encrypt -Comment: Set 2, vector 100 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000008000000 -Ciphertext: 4CF5AB86A56AB134A7FE46CCE3F9FCE9 -Test: Encrypt -Comment: Set 2, vector 101 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000004000000 -Ciphertext: 3E6B9C0388F6D9B8F458F30221907607 -Test: Encrypt -Comment: Set 2, vector 102 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000002000000 -Ciphertext: AD9C926B8A5CD98EEE88200617E59958 -Test: Encrypt -Comment: Set 2, vector 103 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000001000000 -Ciphertext: AFF8AED5E075E02AF720CA4BF0028B3B -Test: Encrypt -Comment: Set 2, vector 104 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000800000 -Ciphertext: D90EAFF909202BB209BB3BB8C7F9A954 -Test: Encrypt -Comment: Set 2, vector 105 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000400000 -Ciphertext: 2C709B00E6A22F00F64A7D8EE341853F -Test: Encrypt -Comment: Set 2, vector 106 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000200000 -Ciphertext: CCEC598F0D9F0BF201B2F487136D54A4 -Test: Encrypt -Comment: Set 2, vector 107 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000100000 -Ciphertext: 73B2883A0A166AAE1BF14E60A5195FA3 -Test: Encrypt -Comment: Set 2, vector 108 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000080000 -Ciphertext: E676867BD9AD5EF915143388496779D7 -Test: Encrypt -Comment: Set 2, vector 109 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000040000 -Ciphertext: CDCB73D1BFCFD4BE7F1DAA9B1C6A4055 -Test: Encrypt -Comment: Set 2, vector 110 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000020000 -Ciphertext: 02A3A5C89DAA24CD2C517F7A73286A89 -Test: Encrypt -Comment: Set 2, vector 111 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000010000 -Ciphertext: C0FA2AC9E92EE58C2DD12D6D43AB7035 -Test: Encrypt -Comment: Set 2, vector 112 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000008000 -Ciphertext: EDC2CB1F7291353BDBF2385519E6AE16 -Test: Encrypt -Comment: Set 2, vector 113 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000004000 -Ciphertext: B4B62D16D197A98CD3B978812B9D9884 -Test: Encrypt -Comment: Set 2, vector 114 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000002000 -Ciphertext: 5CDFC95A529A905101CEA26BC1B891ED -Test: Encrypt -Comment: Set 2, vector 115 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000001000 -Ciphertext: CC7150CD3650B98363296C7C4ED368D1 -Test: Encrypt -Comment: Set 2, vector 116 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000800 -Ciphertext: CC57706B0C6526B8E25A5DBD32EACBDB -Test: Encrypt -Comment: Set 2, vector 117 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000400 -Ciphertext: 30D30456AD98B182D64C649648F6AEC9 -Test: Encrypt -Comment: Set 2, vector 118 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000200 -Ciphertext: D7E9DA7F631938EB649A08AF82FBD75F -Test: Encrypt -Comment: Set 2, vector 119 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000100 -Ciphertext: B8DA2AF6600B07895B5D0FFAF4991469 -Test: Encrypt -Comment: Set 2, vector 120 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000080 -Ciphertext: 0F6F64F930BA6C178943322B98114599 -Test: Encrypt -Comment: Set 2, vector 121 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000040 -Ciphertext: 8B1F247802E47C91BEE2AA34ECFD7A01 -Test: Encrypt -Comment: Set 2, vector 122 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000020 -Ciphertext: 7A6985778D3A66E97F23E01F0D0E45E7 -Test: Encrypt -Comment: Set 2, vector 123 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000010 -Ciphertext: BA664AC39855518DFDEE10D1B3111FAE -Test: Encrypt -Comment: Set 2, vector 124 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000008 -Ciphertext: 7C92854D801A1648F65CA81813DDBF83 -Test: Encrypt -Comment: Set 2, vector 125 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000004 -Ciphertext: 6A3F25AAB7E92D9CF378E5D9C040F26B -Test: Encrypt -Comment: Set 2, vector 126 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000002 -Ciphertext: 3D4B2CDE666761BA5DFB305178E667FB -Test: Encrypt -Comment: Set 2, vector 127 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000001 -Ciphertext: 9CDB269B5D293BC5DB9C55B057D9B591 -Test: Encrypt -Comment: Set 3, vector 0 -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 396154111ADEFC500CF6E5C99038BC17 -Test: Encrypt -Comment: Set 3, vector 1 -Key: 0101010101010101010101010101010101010101010101010101010101010101 -Plaintext: 01010101010101010101010101010101 -Ciphertext: 438D0C2E7E86869B56EBA23B66086A01 -Test: Encrypt -Comment: Set 3, vector 2 -Key: 0202020202020202020202020202020202020202020202020202020202020202 -Plaintext: 02020202020202020202020202020202 -Ciphertext: D4F553BFA794F55EF3B7A578629F6DEA -Test: Encrypt -Comment: Set 3, vector 3 -Key: 0303030303030303030303030303030303030303030303030303030303030303 -Plaintext: 03030303030303030303030303030303 -Ciphertext: B1EB06630CF3E25AEF18FA34709232F7 -Test: Encrypt -Comment: Set 3, vector 4 -Key: 0404040404040404040404040404040404040404040404040404040404040404 -Plaintext: 04040404040404040404040404040404 -Ciphertext: 5E858730ABC9823A93CA4CAB67F0B423 -Test: Encrypt -Comment: Set 3, vector 5 -Key: 0505050505050505050505050505050505050505050505050505050505050505 -Plaintext: 05050505050505050505050505050505 -Ciphertext: 9FC988D43FE3712CF6D2DB552FE3C80F -Test: Encrypt -Comment: Set 3, vector 6 -Key: 0606060606060606060606060606060606060606060606060606060606060606 -Plaintext: 06060606060606060606060606060606 -Ciphertext: 6109500D59414C9974D15818A2BA6DD0 -Test: Encrypt -Comment: Set 3, vector 7 -Key: 0707070707070707070707070707070707070707070707070707070707070707 -Plaintext: 07070707070707070707070707070707 -Ciphertext: 5F6BF9AC53A680EACAE7583A8933DA8E -Test: Encrypt -Comment: Set 3, vector 8 -Key: 0808080808080808080808080808080808080808080808080808080808080808 -Plaintext: 08080808080808080808080808080808 -Ciphertext: F9A9C1540AE1B314DBEDF9A49054DC9D -Test: Encrypt -Comment: Set 3, vector 9 -Key: 0909090909090909090909090909090909090909090909090909090909090909 -Plaintext: 09090909090909090909090909090909 -Ciphertext: 6D66755ACDB9D90BEC599A0BC0C7BF48 -Test: Encrypt -Comment: Set 3, vector 10 -Key: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Plaintext: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Ciphertext: 5527F328AF93C2D5CCC80AF7A3E8DF3D -Test: Encrypt -Comment: Set 3, vector 11 -Key: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Plaintext: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Ciphertext: 27AA99F8E6EA08D8E8D5A528EE4774B6 -Test: Encrypt -Comment: Set 3, vector 12 -Key: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Plaintext: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Ciphertext: 46F7D660A22232F5E3664EF355098CE4 -Test: Encrypt -Comment: Set 3, vector 13 -Key: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Plaintext: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Ciphertext: BDC0AEC72B53B747AB5C7BD62062826A -Test: Encrypt -Comment: Set 3, vector 14 -Key: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Plaintext: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Ciphertext: A0CAB391DC8BFF0281F3E1C70C1CE33B -Test: Encrypt -Comment: Set 3, vector 15 -Key: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Plaintext: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Ciphertext: 5CBFB3E894AE1428549CCF777A9F0A73 -Test: Encrypt -Comment: Set 3, vector 16 -Key: 1010101010101010101010101010101010101010101010101010101010101010 -Plaintext: 10101010101010101010101010101010 -Ciphertext: 6693FC130669F194F81E8D175194DDA2 -Test: Encrypt -Comment: Set 3, vector 17 -Key: 1111111111111111111111111111111111111111111111111111111111111111 -Plaintext: 11111111111111111111111111111111 -Ciphertext: A6A72472F8C04329C0E2FB56982A33C7 -Test: Encrypt -Comment: Set 3, vector 18 -Key: 1212121212121212121212121212121212121212121212121212121212121212 -Plaintext: 12121212121212121212121212121212 -Ciphertext: 6321875C5F89CCE16C6FF5E85E759C9A -Test: Encrypt -Comment: Set 3, vector 19 -Key: 1313131313131313131313131313131313131313131313131313131313131313 -Plaintext: 13131313131313131313131313131313 -Ciphertext: 8819C97D05C91A23062E9851F07EF6F7 -Test: Encrypt -Comment: Set 3, vector 20 -Key: 1414141414141414141414141414141414141414141414141414141414141414 -Plaintext: 14141414141414141414141414141414 -Ciphertext: F894FEB12164BB32AC846DD9530604CE -Test: Encrypt -Comment: Set 3, vector 21 -Key: 1515151515151515151515151515151515151515151515151515151515151515 -Plaintext: 15151515151515151515151515151515 -Ciphertext: 61B02392CD3F571B35C862E703DB2053 -Test: Encrypt -Comment: Set 3, vector 22 -Key: 1616161616161616161616161616161616161616161616161616161616161616 -Plaintext: 16161616161616161616161616161616 -Ciphertext: 6269E137F8480D555D1B24F392162DBA -Test: Encrypt -Comment: Set 3, vector 23 -Key: 1717171717171717171717171717171717171717171717171717171717171717 -Plaintext: 17171717171717171717171717171717 -Ciphertext: B6662F56AA3D23DE1DFDE165B2D63FA0 -Test: Encrypt -Comment: Set 3, vector 24 -Key: 1818181818181818181818181818181818181818181818181818181818181818 -Plaintext: 18181818181818181818181818181818 -Ciphertext: C8271ACE969013EE2C9EF1512FFABAE5 -Test: Encrypt -Comment: Set 3, vector 25 -Key: 1919191919191919191919191919191919191919191919191919191919191919 -Plaintext: 19191919191919191919191919191919 -Ciphertext: 6982E764E750CDF3E5F9C4E40A5DFE28 -Test: Encrypt -Comment: Set 3, vector 26 -Key: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Plaintext: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Ciphertext: 23172E86AF4A140A78CB1DC776270FFF -Test: Encrypt -Comment: Set 3, vector 27 -Key: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Plaintext: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Ciphertext: BA0BD958FC1DE142EC40326B2C315AA5 -Test: Encrypt -Comment: Set 3, vector 28 -Key: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Plaintext: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Ciphertext: 7FB2B8A4B95CBFB74BFD5F7A5641261C -Test: Encrypt -Comment: Set 3, vector 29 -Key: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Plaintext: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Ciphertext: 56B261D89F8978041E2602DF97386BF7 -Test: Encrypt -Comment: Set 3, vector 30 -Key: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Plaintext: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Ciphertext: A2D74F5148C84C1F990290E17DD3EDFA -Test: Encrypt -Comment: Set 3, vector 31 -Key: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Plaintext: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Ciphertext: 7D8BC76F1D941FC3C7E4C6F17AC03FF4 -Test: Encrypt -Comment: Set 3, vector 32 -Key: 2020202020202020202020202020202020202020202020202020202020202020 -Plaintext: 20202020202020202020202020202020 -Ciphertext: F3E1FDA6B9C8314799F4654C29F1C690 -Test: Encrypt -Comment: Set 3, vector 33 -Key: 2121212121212121212121212121212121212121212121212121212121212121 -Plaintext: 21212121212121212121212121212121 -Ciphertext: 9BB8499B8631F6211D22DE555010E482 -Test: Encrypt -Comment: Set 3, vector 34 -Key: 2222222222222222222222222222222222222222222222222222222222222222 -Plaintext: 22222222222222222222222222222222 -Ciphertext: B098D857086ABC425B437BD63E8A53D2 -Test: Encrypt -Comment: Set 3, vector 35 -Key: 2323232323232323232323232323232323232323232323232323232323232323 -Plaintext: 23232323232323232323232323232323 -Ciphertext: F157E2B1298A205C7EF526F3E3196BF4 -Test: Encrypt -Comment: Set 3, vector 36 -Key: 2424242424242424242424242424242424242424242424242424242424242424 -Plaintext: 24242424242424242424242424242424 -Ciphertext: 91FE4F664ED2FE0097D8B95703694BBE -Test: Encrypt -Comment: Set 3, vector 37 -Key: 2525252525252525252525252525252525252525252525252525252525252525 -Plaintext: 25252525252525252525252525252525 -Ciphertext: 742EF3C2DC4490F7D1BDB3031137B6C1 -Test: Encrypt -Comment: Set 3, vector 38 -Key: 2626262626262626262626262626262626262626262626262626262626262626 -Plaintext: 26262626262626262626262626262626 -Ciphertext: 79302D9C8DBBBDAD7B8D8B9E7A60E42D -Test: Encrypt -Comment: Set 3, vector 39 -Key: 2727272727272727272727272727272727272727272727272727272727272727 -Plaintext: 27272727272727272727272727272727 -Ciphertext: 4F4DA48026B809452E7FFB1C3DAFBD99 -Test: Encrypt -Comment: Set 3, vector 40 -Key: 2828282828282828282828282828282828282828282828282828282828282828 -Plaintext: 28282828282828282828282828282828 -Ciphertext: 6D9DF175ED0DAFE550619CF8362B98E8 -Test: Encrypt -Comment: Set 3, vector 41 -Key: 2929292929292929292929292929292929292929292929292929292929292929 -Plaintext: 29292929292929292929292929292929 -Ciphertext: 5D4A406E3C89612AA89A9D38A80ECFEF -Test: Encrypt -Comment: Set 3, vector 42 -Key: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Plaintext: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Ciphertext: 51CE933AD1EB3117A129788D3D0B815A -Test: Encrypt -Comment: Set 3, vector 43 -Key: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Plaintext: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Ciphertext: DD39326230AC02767866ADE07AED1DAA -Test: Encrypt -Comment: Set 3, vector 44 -Key: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Plaintext: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Ciphertext: DC493BAD40D435273B18026DE5412278 -Test: Encrypt -Comment: Set 3, vector 45 -Key: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Plaintext: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Ciphertext: 8A61E9750E1DAC58C92F5E243CA7465B -Test: Encrypt -Comment: Set 3, vector 46 -Key: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Plaintext: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Ciphertext: 57A7641E6A7B61A86AFD7A23578DFBC5 -Test: Encrypt -Comment: Set 3, vector 47 -Key: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Plaintext: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Ciphertext: 019A8F9D38B4B92B077D08B025C15550 -Test: Encrypt -Comment: Set 3, vector 48 -Key: 3030303030303030303030303030303030303030303030303030303030303030 -Plaintext: 30303030303030303030303030303030 -Ciphertext: 9F6EEA9C215C273135C53A3F4208469E -Test: Encrypt -Comment: Set 3, vector 49 -Key: 3131313131313131313131313131313131313131313131313131313131313131 -Plaintext: 31313131313131313131313131313131 -Ciphertext: 7BF3D63D790CAB57EA8354B10FEBDE18 -Test: Encrypt -Comment: Set 3, vector 50 -Key: 3232323232323232323232323232323232323232323232323232323232323232 -Plaintext: 32323232323232323232323232323232 -Ciphertext: AB30751ED4052A1D916E50C4073DFCB5 -Test: Encrypt -Comment: Set 3, vector 51 -Key: 3333333333333333333333333333333333333333333333333333333333333333 -Plaintext: 33333333333333333333333333333333 -Ciphertext: C39180F205BBA8BEE9832BF56FCC75C0 -Test: Encrypt -Comment: Set 3, vector 52 -Key: 3434343434343434343434343434343434343434343434343434343434343434 -Plaintext: 34343434343434343434343434343434 -Ciphertext: 3BEDE5E09CB9CCFC8BE38F8378D49AE9 -Test: Encrypt -Comment: Set 3, vector 53 -Key: 3535353535353535353535353535353535353535353535353535353535353535 -Plaintext: 35353535353535353535353535353535 -Ciphertext: 448AE4ADF7070A8B8C4AB0FE7277E8D7 -Test: Encrypt -Comment: Set 3, vector 54 -Key: 3636363636363636363636363636363636363636363636363636363636363636 -Plaintext: 36363636363636363636363636363636 -Ciphertext: 095A361F2243FC39F4ECD94A5AC0F94A -Test: Encrypt -Comment: Set 3, vector 55 -Key: 3737373737373737373737373737373737373737373737373737373737373737 -Plaintext: 37373737373737373737373737373737 -Ciphertext: AD77D7D2A7F3AF5732CE5A51E83D7025 -Test: Encrypt -Comment: Set 3, vector 56 -Key: 3838383838383838383838383838383838383838383838383838383838383838 -Plaintext: 38383838383838383838383838383838 -Ciphertext: 930DA09C18DF5F6D072AA662CC8F7751 -Test: Encrypt -Comment: Set 3, vector 57 -Key: 3939393939393939393939393939393939393939393939393939393939393939 -Plaintext: 39393939393939393939393939393939 -Ciphertext: F3B3871B66FE8A1FA4AE2150EC8B7060 -Test: Encrypt -Comment: Set 3, vector 58 -Key: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Plaintext: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Ciphertext: 62DD93CFA7EFC223A822A6F754B6298D -Test: Encrypt -Comment: Set 3, vector 59 -Key: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Plaintext: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Ciphertext: C86A0377B3C45C2B1896829D7B0610F3 -Test: Encrypt -Comment: Set 3, vector 60 -Key: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Plaintext: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Ciphertext: 8CCFC961EBAB55C0ECB1B10EDEDD9C61 -Test: Encrypt -Comment: Set 3, vector 61 -Key: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Plaintext: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Ciphertext: D828E857BDBD6192300764A2084E0680 -Test: Encrypt -Comment: Set 3, vector 62 -Key: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Plaintext: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Ciphertext: 24C0DC84D72EA678201534CE8DC22A45 -Test: Encrypt -Comment: Set 3, vector 63 -Key: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Plaintext: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Ciphertext: D65F340A25D35E5D0B08C63FA44F9898 -Test: Encrypt -Comment: Set 3, vector 64 -Key: 4040404040404040404040404040404040404040404040404040404040404040 -Plaintext: 40404040404040404040404040404040 -Ciphertext: 4A30476F1141FBF303ED63FCD3CB0536 -Test: Encrypt -Comment: Set 3, vector 65 -Key: 4141414141414141414141414141414141414141414141414141414141414141 -Plaintext: 41414141414141414141414141414141 -Ciphertext: 78246080B38B5283960E0253E2FF6A5E -Test: Encrypt -Comment: Set 3, vector 66 -Key: 4242424242424242424242424242424242424242424242424242424242424242 -Plaintext: 42424242424242424242424242424242 -Ciphertext: 475E8388EE3D3EE111DD0E816B244DD2 -Test: Encrypt -Comment: Set 3, vector 67 -Key: 4343434343434343434343434343434343434343434343434343434343434343 -Plaintext: 43434343434343434343434343434343 -Ciphertext: D40D3FECE8B05875F2FCD23526CCD6B2 -Test: Encrypt -Comment: Set 3, vector 68 -Key: 4444444444444444444444444444444444444444444444444444444444444444 -Plaintext: 44444444444444444444444444444444 -Ciphertext: CD9846E1B120482E6B6D71C4F5D704FE -Test: Encrypt -Comment: Set 3, vector 69 -Key: 4545454545454545454545454545454545454545454545454545454545454545 -Plaintext: 45454545454545454545454545454545 -Ciphertext: E707C35474257CE52617B5889ECB974B -Test: Encrypt -Comment: Set 3, vector 70 -Key: 4646464646464646464646464646464646464646464646464646464646464646 -Plaintext: 46464646464646464646464646464646 -Ciphertext: 9A79D57FD89D938F4B4CACA52E8CB544 -Test: Encrypt -Comment: Set 3, vector 71 -Key: 4747474747474747474747474747474747474747474747474747474747474747 -Plaintext: 47474747474747474747474747474747 -Ciphertext: 34F9B98AC130F7E7B123ECBF8910735C -Test: Encrypt -Comment: Set 3, vector 72 -Key: 4848484848484848484848484848484848484848484848484848484848484848 -Plaintext: 48484848484848484848484848484848 -Ciphertext: BF75CC83FE76E8A15981DA738E5A8513 -Test: Encrypt -Comment: Set 3, vector 73 -Key: 4949494949494949494949494949494949494949494949494949494949494949 -Plaintext: 49494949494949494949494949494949 -Ciphertext: 4A452EFBE634441444FB50641CB2EFC1 -Test: Encrypt -Comment: Set 3, vector 74 -Key: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Plaintext: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Ciphertext: 3D5ED11F0C81E81BAB97B7148D67BA55 -Test: Encrypt -Comment: Set 3, vector 75 -Key: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Plaintext: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Ciphertext: DBBAE78B177C27954DEDBAD5D98E7BEE -Test: Encrypt -Comment: Set 3, vector 76 -Key: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Plaintext: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Ciphertext: F52D16EFC5DE991430F6E7D13983DEB8 -Test: Encrypt -Comment: Set 3, vector 77 -Key: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Plaintext: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Ciphertext: B6C98EBC320B3BDD927C2FE57F8180B5 -Test: Encrypt -Comment: Set 3, vector 78 -Key: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Plaintext: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Ciphertext: D510C35680C9B958C81599F3665FBEC1 -Test: Encrypt -Comment: Set 3, vector 79 -Key: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Plaintext: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Ciphertext: 72DAD08BF510CDFEEC76FEAB908829B4 -Test: Encrypt -Comment: Set 3, vector 80 -Key: 5050505050505050505050505050505050505050505050505050505050505050 -Plaintext: 50505050505050505050505050505050 -Ciphertext: AC7B447EDB38F935469309E766BCB1F6 -Test: Encrypt -Comment: Set 3, vector 81 -Key: 5151515151515151515151515151515151515151515151515151515151515151 -Plaintext: 51515151515151515151515151515151 -Ciphertext: 18B937F666BF580F9CDB60A935427459 -Test: Encrypt -Comment: Set 3, vector 82 -Key: 5252525252525252525252525252525252525252525252525252525252525252 -Plaintext: 52525252525252525252525252525252 -Ciphertext: 6A08B38202685E610CA9584725D6092A -Test: Encrypt -Comment: Set 3, vector 83 -Key: 5353535353535353535353535353535353535353535353535353535353535353 -Plaintext: 53535353535353535353535353535353 -Ciphertext: 1CA09E9C14C2A833A7B7ACB1C9C12AC1 -Test: Encrypt -Comment: Set 3, vector 84 -Key: 5454545454545454545454545454545454545454545454545454545454545454 -Plaintext: 54545454545454545454545454545454 -Ciphertext: 8AB7ED64FE477B7D9A6B5B5056EA1E02 -Test: Encrypt -Comment: Set 3, vector 85 -Key: 5555555555555555555555555555555555555555555555555555555555555555 -Plaintext: 55555555555555555555555555555555 -Ciphertext: D610D6199D4FE03ED09AD568664F709A -Test: Encrypt -Comment: Set 3, vector 86 -Key: 5656565656565656565656565656565656565656565656565656565656565656 -Plaintext: 56565656565656565656565656565656 -Ciphertext: D400C1E6109F04AE50C1C341BA4E3175 -Test: Encrypt -Comment: Set 3, vector 87 -Key: 5757575757575757575757575757575757575757575757575757575757575757 -Plaintext: 57575757575757575757575757575757 -Ciphertext: DF888CBB7DBD8DE3F0BE6C6EDC72060F -Test: Encrypt -Comment: Set 3, vector 88 -Key: 5858585858585858585858585858585858585858585858585858585858585858 -Plaintext: 58585858585858585858585858585858 -Ciphertext: 9C3B100466C63AA93D420EDF54381BF4 -Test: Encrypt -Comment: Set 3, vector 89 -Key: 5959595959595959595959595959595959595959595959595959595959595959 -Plaintext: 59595959595959595959595959595959 -Ciphertext: 0BE794F0233BE9A7DB7C41A1CA4BA7E3 -Test: Encrypt -Comment: Set 3, vector 90 -Key: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Plaintext: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Ciphertext: 2C8D04D6B9DA81D07174729A07F25BB9 -Test: Encrypt -Comment: Set 3, vector 91 -Key: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Plaintext: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Ciphertext: FFCEB69835E2E5EF4C867CE28540F91F -Test: Encrypt -Comment: Set 3, vector 92 -Key: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Plaintext: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Ciphertext: A7F7F8437918BEFF5DCFCFB366CDFABD -Test: Encrypt -Comment: Set 3, vector 93 -Key: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Plaintext: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Ciphertext: 14C9736F407AE78D7D3ED18B875B940D -Test: Encrypt -Comment: Set 3, vector 94 -Key: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Plaintext: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Ciphertext: 1668A0C6A5734B98D9D641E0B6FAD80C -Test: Encrypt -Comment: Set 3, vector 95 -Key: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Plaintext: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Ciphertext: DA8775267C9722BA743A085F8591F06D -Test: Encrypt -Comment: Set 3, vector 96 -Key: 6060606060606060606060606060606060606060606060606060606060606060 -Plaintext: 60606060606060606060606060606060 -Ciphertext: 5F8172C28603C80206C276E0979EA40E -Test: Encrypt -Comment: Set 3, vector 97 -Key: 6161616161616161616161616161616161616161616161616161616161616161 -Plaintext: 61616161616161616161616161616161 -Ciphertext: E4938D0078D29E0247BF2EA0C1FCB85F -Test: Encrypt -Comment: Set 3, vector 98 -Key: 6262626262626262626262626262626262626262626262626262626262626262 -Plaintext: 62626262626262626262626262626262 -Ciphertext: A48FEE4F9FA4597303C2CF92061304A1 -Test: Encrypt -Comment: Set 3, vector 99 -Key: 6363636363636363636363636363636363636363636363636363636363636363 -Plaintext: 63636363636363636363636363636363 -Ciphertext: 3C8F6CF66C73684DDB09D1AA57CD0950 -Test: Encrypt -Comment: Set 3, vector 100 -Key: 6464646464646464646464646464646464646464646464646464646464646464 -Plaintext: 64646464646464646464646464646464 -Ciphertext: B3D9EE0337253E9C4027FEA938AB399C -Test: Encrypt -Comment: Set 3, vector 101 -Key: 6565656565656565656565656565656565656565656565656565656565656565 -Plaintext: 65656565656565656565656565656565 -Ciphertext: 3BE933A85E5997573077903CEB481AFA -Test: Encrypt -Comment: Set 3, vector 102 -Key: 6666666666666666666666666666666666666666666666666666666666666666 -Plaintext: 66666666666666666666666666666666 -Ciphertext: 06AFED96C6E7130EB3311D81CCE69F9C -Test: Encrypt -Comment: Set 3, vector 103 -Key: 6767676767676767676767676767676767676767676767676767676767676767 -Plaintext: 67676767676767676767676767676767 -Ciphertext: 183C3606139211F90F4849E93DB7DDEE -Test: Encrypt -Comment: Set 3, vector 104 -Key: 6868686868686868686868686868686868686868686868686868686868686868 -Plaintext: 68686868686868686868686868686868 -Ciphertext: 217C34184950DE7B43E46EE4BE88A9BE -Test: Encrypt -Comment: Set 3, vector 105 -Key: 6969696969696969696969696969696969696969696969696969696969696969 -Plaintext: 69696969696969696969696969696969 -Ciphertext: CA447ED204F2A4B2ED6B82E3926967B1 -Test: Encrypt -Comment: Set 3, vector 106 -Key: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Plaintext: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Ciphertext: B447F4BEBA7D88A5C62E5F9C316A4523 -Test: Encrypt -Comment: Set 3, vector 107 -Key: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Plaintext: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Ciphertext: DEDF599C54D0009795303013CD933B49 -Test: Encrypt -Comment: Set 3, vector 108 -Key: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Plaintext: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Ciphertext: B06280650C77C83AF3D71874AE00D3DA -Test: Encrypt -Comment: Set 3, vector 109 -Key: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Plaintext: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Ciphertext: 1BB5B9E9C7DC8AD690F5FC217B7B53C1 -Test: Encrypt -Comment: Set 3, vector 110 -Key: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Plaintext: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Ciphertext: FEECFCF0C172C6152F33E4DEE206EBCF -Test: Encrypt -Comment: Set 3, vector 111 -Key: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Plaintext: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Ciphertext: FA4C7EA42C425F37588CD273320940C9 -Test: Encrypt -Comment: Set 3, vector 112 -Key: 7070707070707070707070707070707070707070707070707070707070707070 -Plaintext: 70707070707070707070707070707070 -Ciphertext: 563AE5884FC374C4E45B96A6431E51E3 -Test: Encrypt -Comment: Set 3, vector 113 -Key: 7171717171717171717171717171717171717171717171717171717171717171 -Plaintext: 71717171717171717171717171717171 -Ciphertext: 0669E609578A33DBE637C5B86C7F425D -Test: Encrypt -Comment: Set 3, vector 114 -Key: 7272727272727272727272727272727272727272727272727272727272727272 -Plaintext: 72727272727272727272727272727272 -Ciphertext: B2AD99D3941924DDD2A73C4725A08EC3 -Test: Encrypt -Comment: Set 3, vector 115 -Key: 7373737373737373737373737373737373737373737373737373737373737373 -Plaintext: 73737373737373737373737373737373 -Ciphertext: 72C8239B5F4E5319EE05B6E39C9BD336 -Test: Encrypt -Comment: Set 3, vector 116 -Key: 7474747474747474747474747474747474747474747474747474747474747474 -Plaintext: 74747474747474747474747474747474 -Ciphertext: BAD014C4B0A5734AA48E7E80A42E80AF -Test: Encrypt -Comment: Set 3, vector 117 -Key: 7575757575757575757575757575757575757575757575757575757575757575 -Plaintext: 75757575757575757575757575757575 -Ciphertext: BBE294CDB3582B3C1F61ACD43A0E5DB5 -Test: Encrypt -Comment: Set 3, vector 118 -Key: 7676767676767676767676767676767676767676767676767676767676767676 -Plaintext: 76767676767676767676767676767676 -Ciphertext: C231DC35D38F5857BD3449D3E0A1EF1F -Test: Encrypt -Comment: Set 3, vector 119 -Key: 7777777777777777777777777777777777777777777777777777777777777777 -Plaintext: 77777777777777777777777777777777 -Ciphertext: B19E0BACBF3EC295AA6F99B0817B99F3 -Test: Encrypt -Comment: Set 3, vector 120 -Key: 7878787878787878787878787878787878787878787878787878787878787878 -Plaintext: 78787878787878787878787878787878 -Ciphertext: 0E81D1133E74F1A9425237377890584C -Test: Encrypt -Comment: Set 3, vector 121 -Key: 7979797979797979797979797979797979797979797979797979797979797979 -Plaintext: 79797979797979797979797979797979 -Ciphertext: E1149AA17A8B6499E0FA5C45F05D6582 -Test: Encrypt -Comment: Set 3, vector 122 -Key: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Plaintext: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Ciphertext: D9208954D8D28335E6F45FFB9D1B92D4 -Test: Encrypt -Comment: Set 3, vector 123 -Key: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Plaintext: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Ciphertext: DFABDB0594208A2902703E85C4A657FF -Test: Encrypt -Comment: Set 3, vector 124 -Key: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Plaintext: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Ciphertext: E05B6C6E90E852229BF0EFDC4FEB851E -Test: Encrypt -Comment: Set 3, vector 125 -Key: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Plaintext: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Ciphertext: 6834CCFDC940452CF40A0866009E58CC -Test: Encrypt -Comment: Set 3, vector 126 -Key: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Plaintext: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Ciphertext: 91449066A1966246636D9085E02002B0 -Test: Encrypt -Comment: Set 3, vector 127 -Key: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Plaintext: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Ciphertext: 235C2D836B2025CCCDAE4B26264132E2 -Test: Encrypt -Comment: Set 3, vector 128 -Key: 8080808080808080808080808080808080808080808080808080808080808080 -Plaintext: 80808080808080808080808080808080 -Ciphertext: 0C765AA494E048FC8BB23139F2124CB6 -Test: Encrypt -Comment: Set 3, vector 129 -Key: 8181818181818181818181818181818181818181818181818181818181818181 -Plaintext: 81818181818181818181818181818181 -Ciphertext: ED970D660C84642D0EAFF188F55CC33C -Test: Encrypt -Comment: Set 3, vector 130 -Key: 8282828282828282828282828282828282828282828282828282828282828282 -Plaintext: 82828282828282828282828282828282 -Ciphertext: E124EB4A8BE05CA633238DD69E81E057 -Test: Encrypt -Comment: Set 3, vector 131 -Key: 8383838383838383838383838383838383838383838383838383838383838383 -Plaintext: 83838383838383838383838383838383 -Ciphertext: 4653FBDD6CA7C13CE2DF31B1279B3D5A -Test: Encrypt -Comment: Set 3, vector 132 -Key: 8484848484848484848484848484848484848484848484848484848484848484 -Plaintext: 84848484848484848484848484848484 -Ciphertext: 2D4D87CFB763C3974CEBF6AE1C6269D4 -Test: Encrypt -Comment: Set 3, vector 133 -Key: 8585858585858585858585858585858585858585858585858585858585858585 -Plaintext: 85858585858585858585858585858585 -Ciphertext: F153B13F57F1AE16186EF3B1E98549B8 -Test: Encrypt -Comment: Set 3, vector 134 -Key: 8686868686868686868686868686868686868686868686868686868686868686 -Plaintext: 86868686868686868686868686868686 -Ciphertext: 5451DB2B141B894B4892C7F12BE3F389 -Test: Encrypt -Comment: Set 3, vector 135 -Key: 8787878787878787878787878787878787878787878787878787878787878787 -Plaintext: 87878787878787878787878787878787 -Ciphertext: 61B2185653CFF14EE873DBD3CB663E79 -Test: Encrypt -Comment: Set 3, vector 136 -Key: 8888888888888888888888888888888888888888888888888888888888888888 -Plaintext: 88888888888888888888888888888888 -Ciphertext: C17ACB243808B86349D4176EECF602DF -Test: Encrypt -Comment: Set 3, vector 137 -Key: 8989898989898989898989898989898989898989898989898989898989898989 -Plaintext: 89898989898989898989898989898989 -Ciphertext: 6FCE3ED2207D58A5976FE8B20B247275 -Test: Encrypt -Comment: Set 3, vector 138 -Key: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Plaintext: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Ciphertext: 403F73CC70C7F9A5E96CD77D61140961 -Test: Encrypt -Comment: Set 3, vector 139 -Key: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Plaintext: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Ciphertext: DE2B34DECB33550C97D6C074032F3333 -Test: Encrypt -Comment: Set 3, vector 140 -Key: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Plaintext: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Ciphertext: FB395AE4F537F8FB7C98BAD54BDB86A0 -Test: Encrypt -Comment: Set 3, vector 141 -Key: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Plaintext: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Ciphertext: 258E83BB639D0BEDE648F3AF96CC8E75 -Test: Encrypt -Comment: Set 3, vector 142 -Key: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Plaintext: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Ciphertext: A1B5E73720E43FA0871EAAE245B55A0E -Test: Encrypt -Comment: Set 3, vector 143 -Key: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Plaintext: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Ciphertext: 774A9ABE1FAB9E3B85A91C0F86758B0E -Test: Encrypt -Comment: Set 3, vector 144 -Key: 9090909090909090909090909090909090909090909090909090909090909090 -Plaintext: 90909090909090909090909090909090 -Ciphertext: 0A6EC1CF2056076933259AE6A337B185 -Test: Encrypt -Comment: Set 3, vector 145 -Key: 9191919191919191919191919191919191919191919191919191919191919191 -Plaintext: 91919191919191919191919191919191 -Ciphertext: C96729F87D62104F941DC21448756F95 -Test: Encrypt -Comment: Set 3, vector 146 -Key: 9292929292929292929292929292929292929292929292929292929292929292 -Plaintext: 92929292929292929292929292929292 -Ciphertext: 1CB85A610C2250A78143A31BB1C19094 -Test: Encrypt -Comment: Set 3, vector 147 -Key: 9393939393939393939393939393939393939393939393939393939393939393 -Plaintext: 93939393939393939393939393939393 -Ciphertext: 16194ABEDEA340C6D57E4C4F50640FBE -Test: Encrypt -Comment: Set 3, vector 148 -Key: 9494949494949494949494949494949494949494949494949494949494949494 -Plaintext: 94949494949494949494949494949494 -Ciphertext: 379A5A54C198FB03178EE841D67F3502 -Test: Encrypt -Comment: Set 3, vector 149 -Key: 9595959595959595959595959595959595959595959595959595959595959595 -Plaintext: 95959595959595959595959595959595 -Ciphertext: A25119AD8A0F6654ECDB2696CF4F8225 -Test: Encrypt -Comment: Set 3, vector 150 -Key: 9696969696969696969696969696969696969696969696969696969696969696 -Plaintext: 96969696969696969696969696969696 -Ciphertext: 264B7FAAD26DEC203D0DE29CE4F0F45B -Test: Encrypt -Comment: Set 3, vector 151 -Key: 9797979797979797979797979797979797979797979797979797979797979797 -Plaintext: 97979797979797979797979797979797 -Ciphertext: 2EBD2A2CD16284D206D81ACF18122E2E -Test: Encrypt -Comment: Set 3, vector 152 -Key: 9898989898989898989898989898989898989898989898989898989898989898 -Plaintext: 98989898989898989898989898989898 -Ciphertext: 25FB2B75B6915C0543412DF9EBD20FC3 -Test: Encrypt -Comment: Set 3, vector 153 -Key: 9999999999999999999999999999999999999999999999999999999999999999 -Plaintext: 99999999999999999999999999999999 -Ciphertext: 21B89B53845A828E0A14F4AE45940284 -Test: Encrypt -Comment: Set 3, vector 154 -Key: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Plaintext: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Ciphertext: 4CE809A241E8E59E231F2D00BE0EA285 -Test: Encrypt -Comment: Set 3, vector 155 -Key: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Plaintext: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Ciphertext: F914E06D9F7889DC71974DFF104F94D4 -Test: Encrypt -Comment: Set 3, vector 156 -Key: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Plaintext: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Ciphertext: AF08BADB48FF961FD5EB663FA3766FC6 -Test: Encrypt -Comment: Set 3, vector 157 -Key: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Plaintext: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Ciphertext: 05DDDE95AE659D6BBBD2B4E394399B53 -Test: Encrypt -Comment: Set 3, vector 158 -Key: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Plaintext: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Ciphertext: 25E6FE1C89F811D827BDF8D4E977071C -Test: Encrypt -Comment: Set 3, vector 159 -Key: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Plaintext: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Ciphertext: 3D00A9143A1829D05F787A904C48C75B -Test: Encrypt -Comment: Set 3, vector 160 -Key: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Plaintext: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Ciphertext: 391DF944B0E0BCB84483AF5C4F34D754 -Test: Encrypt -Comment: Set 3, vector 161 -Key: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Plaintext: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Ciphertext: BB2D2E556210A7C0EBA3165F63A74967 -Test: Encrypt -Comment: Set 3, vector 162 -Key: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Plaintext: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Ciphertext: A1B0BB24291B259AC4A1CDE9A3B817C9 -Test: Encrypt -Comment: Set 3, vector 163 -Key: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Plaintext: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Ciphertext: 6F798763B6ED7F8BB234D2CA78D026DC -Test: Encrypt -Comment: Set 3, vector 164 -Key: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Plaintext: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Ciphertext: 038443760056AB3D23BC70ECE6FB4397 -Test: Encrypt -Comment: Set 3, vector 165 -Key: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Plaintext: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Ciphertext: C75ECE40A7AE9BB38F604615C873EF02 -Test: Encrypt -Comment: Set 3, vector 166 -Key: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Plaintext: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Ciphertext: 2D308C2078842EDBBB35ABCA3F41E467 -Test: Encrypt -Comment: Set 3, vector 167 -Key: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Plaintext: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Ciphertext: 393C0E3350B3219DD8FD851C48E28C63 -Test: Encrypt -Comment: Set 3, vector 168 -Key: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Plaintext: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Ciphertext: 964BD4A28DB1434570E27FB3AD880398 -Test: Encrypt -Comment: Set 3, vector 169 -Key: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Plaintext: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Ciphertext: B668D17C027B550C0C22BDE151EB6EB1 -Test: Encrypt -Comment: Set 3, vector 170 -Key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Ciphertext: E14186F8205957B243CE522C16453621 -Test: Encrypt -Comment: Set 3, vector 171 -Key: ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB -Plaintext: ABABABABABABABABABABABABABABABAB -Ciphertext: 0E352BEB6B6BCAFDAE61BBE86F8F1D0E -Test: Encrypt -Comment: Set 3, vector 172 -Key: ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC -Plaintext: ACACACACACACACACACACACACACACACAC -Ciphertext: 4BCF038D9458EAAA3D279CCAC3F5D693 -Test: Encrypt -Comment: Set 3, vector 173 -Key: ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD -Plaintext: ADADADADADADADADADADADADADADADAD -Ciphertext: D5EF17646A481C3B79AAB3C08B4F1611 -Test: Encrypt -Comment: Set 3, vector 174 -Key: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Plaintext: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Ciphertext: 37642DA589775C2FFA40A7274E9D56E2 -Test: Encrypt -Comment: Set 3, vector 175 -Key: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Plaintext: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Ciphertext: F829FA6B756F1B1D16B49CB7C8AFFA22 -Test: Encrypt -Comment: Set 3, vector 176 -Key: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Plaintext: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Ciphertext: 6FE1450D48D611031E81C70478DB5326 -Test: Encrypt -Comment: Set 3, vector 177 -Key: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Plaintext: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Ciphertext: 68C5ECE7F525F69DABF63288533C5C60 -Test: Encrypt -Comment: Set 3, vector 178 -Key: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Plaintext: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Ciphertext: 5DF627500627E59A5BAB5D30B6C93219 -Test: Encrypt -Comment: Set 3, vector 179 -Key: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Plaintext: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Ciphertext: AD3A4AC8F666C0FCA5D7995783D0986D -Test: Encrypt -Comment: Set 3, vector 180 -Key: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Plaintext: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Ciphertext: A3AEE54D09357B187622109296534F88 -Test: Encrypt -Comment: Set 3, vector 181 -Key: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Plaintext: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Ciphertext: 7D1D9A73DB386A717862C4F5089970E1 -Test: Encrypt -Comment: Set 3, vector 182 -Key: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Plaintext: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Ciphertext: 916347935FBD0D868A0127D602B91BD5 -Test: Encrypt -Comment: Set 3, vector 183 -Key: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Plaintext: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Ciphertext: 4F167893651993D9150ED9E0B780BF82 -Test: Encrypt -Comment: Set 3, vector 184 -Key: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Plaintext: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Ciphertext: 488352470ACF9361F22FAC1B3ED67003 -Test: Encrypt -Comment: Set 3, vector 185 -Key: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Plaintext: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Ciphertext: 4BBD307FCDE0F89C9A663A0F9C9358C5 -Test: Encrypt -Comment: Set 3, vector 186 -Key: BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA -Plaintext: BABABABABABABABABABABABABABABABA -Ciphertext: E402E706D262078113D6626E7071589E -Test: Encrypt -Comment: Set 3, vector 187 -Key: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Plaintext: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Ciphertext: 422D6FA4519F2E72420685CD4ED2CC8E -Test: Encrypt -Comment: Set 3, vector 188 -Key: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Plaintext: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Ciphertext: 6D14CC5F618DF7E0B2210F6C5DD62C92 -Test: Encrypt -Comment: Set 3, vector 189 -Key: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Plaintext: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Ciphertext: 5CC4A5E81F7D7EC528C150437AC2B027 -Test: Encrypt -Comment: Set 3, vector 190 -Key: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Plaintext: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Ciphertext: B3BE0F996494323504946446EDE489FC -Test: Encrypt -Comment: Set 3, vector 191 -Key: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Plaintext: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Ciphertext: ABC7DB10FE04BEE94F5887E539C1D235 -Test: Encrypt -Comment: Set 3, vector 192 -Key: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Plaintext: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Ciphertext: B18BE6FB1D04E76F21C0678A4333D255 -Test: Encrypt -Comment: Set 3, vector 193 -Key: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Plaintext: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Ciphertext: FC5802BAFEDC03088BBA0A5F22402968 -Test: Encrypt -Comment: Set 3, vector 194 -Key: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Plaintext: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Ciphertext: 8EA96801643AE7BF649EAC22812214D5 -Test: Encrypt -Comment: Set 3, vector 195 -Key: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Plaintext: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Ciphertext: F7683FCDDC2BB0BCFD1350F8E3D76602 -Test: Encrypt -Comment: Set 3, vector 196 -Key: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Plaintext: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Ciphertext: 08D0345431AE120CAD6C6D4275E00CA8 -Test: Encrypt -Comment: Set 3, vector 197 -Key: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Plaintext: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Ciphertext: 7CD50A623DA79EC84D61CD7FBDBA4153 -Test: Encrypt -Comment: Set 3, vector 198 -Key: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Plaintext: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Ciphertext: 42ACA2B048E5C58D8F004F0E8A2C6DEF -Test: Encrypt -Comment: Set 3, vector 199 -Key: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Plaintext: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Ciphertext: E03AD353225F76121D130740C75B839B -Test: Encrypt -Comment: Set 3, vector 200 -Key: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Plaintext: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Ciphertext: 26807D0A6D6330A77804B4B1AE84432B -Test: Encrypt -Comment: Set 3, vector 201 -Key: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Plaintext: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Ciphertext: 864CE880AE89660474F64B93AF4CE043 -Test: Encrypt -Comment: Set 3, vector 202 -Key: CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA -Plaintext: CACACACACACACACACACACACACACACACA -Ciphertext: 82EAD2C033986CAC1F4C3EEEEA1D1892 -Test: Encrypt -Comment: Set 3, vector 203 -Key: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Plaintext: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Ciphertext: 53F1A5C39DD062DF8D133B3A0FB3DA02 -Test: Encrypt -Comment: Set 3, vector 204 -Key: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Plaintext: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Ciphertext: E913208594B288125EEAE0EFEC764D39 -Test: Encrypt -Comment: Set 3, vector 205 -Key: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Plaintext: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Ciphertext: 7DAE4BD638A36A794A73E9B945BEF4D4 -Test: Encrypt -Comment: Set 3, vector 206 -Key: CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE -Plaintext: CECECECECECECECECECECECECECECECE -Ciphertext: 04E8155E3E81C261D3A9D4A800182A62 -Test: Encrypt -Comment: Set 3, vector 207 -Key: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Plaintext: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Ciphertext: F466172A8C4C7854F59388474098F441 -Test: Encrypt -Comment: Set 3, vector 208 -Key: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Plaintext: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Ciphertext: E95DBB0B366E77D7BC1BF206B95DAEBA -Test: Encrypt -Comment: Set 3, vector 209 -Key: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Plaintext: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Ciphertext: 76490E6DD8380855E26BCACF8746978F -Test: Encrypt -Comment: Set 3, vector 210 -Key: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Plaintext: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Ciphertext: 3C3B73C8FBDA8CAE5E0D7D0070735DA1 -Test: Encrypt -Comment: Set 3, vector 211 -Key: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Plaintext: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Ciphertext: B039EBC9C48828C3913A3BC346CAEAE3 -Test: Encrypt -Comment: Set 3, vector 212 -Key: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Plaintext: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Ciphertext: 0AFCC6A58BD3ADB2C0B2A1586C9FA8DE -Test: Encrypt -Comment: Set 3, vector 213 -Key: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Plaintext: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Ciphertext: C2187D0E74CE2307BC4DF249EA6E57F1 -Test: Encrypt -Comment: Set 3, vector 214 -Key: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Plaintext: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Ciphertext: F3F4AEA2492106A45C12D0029F58ACE1 -Test: Encrypt -Comment: Set 3, vector 215 -Key: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Plaintext: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Ciphertext: 3FFADF96B37B67D62D71387C52C41AE9 -Test: Encrypt -Comment: Set 3, vector 216 -Key: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Plaintext: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Ciphertext: 4C1644AD69F7D0D3A1E2B4B0E7F0A592 -Test: Encrypt -Comment: Set 3, vector 217 -Key: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Plaintext: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Ciphertext: 68FD6F6592AE5BD9245FA959FE1CA849 -Test: Encrypt -Comment: Set 3, vector 218 -Key: DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA -Plaintext: DADADADADADADADADADADADADADADADA -Ciphertext: 7AB97B70C2CCC7D0D1AA7A6D8B7C48CA -Test: Encrypt -Comment: Set 3, vector 219 -Key: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Plaintext: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Ciphertext: 961BF9E037E303B9B494C2EE063FC4CC -Test: Encrypt -Comment: Set 3, vector 220 -Key: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Plaintext: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Ciphertext: 0FBF042B227603DB4A1CC8EE62E93DF3 -Test: Encrypt -Comment: Set 3, vector 221 -Key: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Plaintext: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Ciphertext: 71360ED44C9FAF8F1139D31252A35F49 -Test: Encrypt -Comment: Set 3, vector 222 -Key: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Plaintext: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Ciphertext: 5E806BD29351AE456549E73B8DDC0026 -Test: Encrypt -Comment: Set 3, vector 223 -Key: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Plaintext: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Ciphertext: C7908A288B86C1C4FCE5A8A59457EFD3 -Test: Encrypt -Comment: Set 3, vector 224 -Key: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Plaintext: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Ciphertext: AAC45B53F6292082B93F949BD77E5776 -Test: Encrypt -Comment: Set 3, vector 225 -Key: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Plaintext: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Ciphertext: 231150ED4D85B4217B3EFC3E71A522C6 -Test: Encrypt -Comment: Set 3, vector 226 -Key: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Plaintext: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Ciphertext: 639D9C5EEC8D9569C6DF24630CA8257D -Test: Encrypt -Comment: Set 3, vector 227 -Key: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Plaintext: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Ciphertext: 0E7F8C538946D87A01AD49A8CC981B58 -Test: Encrypt -Comment: Set 3, vector 228 -Key: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Plaintext: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Ciphertext: 09A293907E499502D78569230D3F1A97 -Test: Encrypt -Comment: Set 3, vector 229 -Key: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Plaintext: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Ciphertext: ACF67CC086E386DA064EDBF97F7E889A -Test: Encrypt -Comment: Set 3, vector 230 -Key: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Plaintext: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Ciphertext: E7C44DB1A9FCAC410253A7E2674C54F6 -Test: Encrypt -Comment: Set 3, vector 231 -Key: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Plaintext: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Ciphertext: B99BA33ECB86DA790FF0CC4F0D41A065 -Test: Encrypt -Comment: Set 3, vector 232 -Key: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Plaintext: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Ciphertext: 73405114FDBDB81B1A54C4EFED1BB3FE -Test: Encrypt -Comment: Set 3, vector 233 -Key: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Plaintext: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Ciphertext: 80152E139834B3CC01EBF7E6417C5537 -Test: Encrypt -Comment: Set 3, vector 234 -Key: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Plaintext: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Ciphertext: 05CE579D4804FF3C7874571730D81CEC -Test: Encrypt -Comment: Set 3, vector 235 -Key: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Plaintext: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Ciphertext: F984801E7A806A130325E152DF60012E -Test: Encrypt -Comment: Set 3, vector 236 -Key: ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC -Plaintext: ECECECECECECECECECECECECECECECEC -Ciphertext: 92CBB121474A307505425B4DD1B7F803 -Test: Encrypt -Comment: Set 3, vector 237 -Key: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Plaintext: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Ciphertext: 2DEB2F282D60EFCDB300EADB15C798D8 -Test: Encrypt -Comment: Set 3, vector 238 -Key: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Plaintext: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Ciphertext: 0F4D7D59B535E29D315D2A5C7BFE4973 -Test: Encrypt -Comment: Set 3, vector 239 -Key: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Plaintext: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Ciphertext: 61E391F7C29B5AD705121CF9559E5C04 -Test: Encrypt -Comment: Set 3, vector 240 -Key: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Plaintext: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Ciphertext: 65BCBE179D19A5BCF12D141A21E0F7A8 -Test: Encrypt -Comment: Set 3, vector 241 -Key: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Plaintext: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Ciphertext: FDB75C659B72AE81E51204CFCB86E631 -Test: Encrypt -Comment: Set 3, vector 242 -Key: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Plaintext: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Ciphertext: 5643ED3A3679B9E33E21CD0F95580877 -Test: Encrypt -Comment: Set 3, vector 243 -Key: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Plaintext: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Ciphertext: 618EFEB4C6E4270B81FF7DE786E68420 -Test: Encrypt -Comment: Set 3, vector 244 -Key: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Plaintext: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Ciphertext: 75A2A9CC91F006059CA873E5D73C2CCC -Test: Encrypt -Comment: Set 3, vector 245 -Key: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Plaintext: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Ciphertext: B55840B5001D1875C29A56EDFDE10E55 -Test: Encrypt -Comment: Set 3, vector 246 -Key: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Plaintext: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Ciphertext: 6DD9BDEA7EC0E622DE8B83460BDEA719 -Test: Encrypt -Comment: Set 3, vector 247 -Key: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Plaintext: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Ciphertext: D164075BD4CDC95288D896C7CC98285D -Test: Encrypt -Comment: Set 3, vector 248 -Key: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Plaintext: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Ciphertext: 8420071C55241802D88FB7AF17EBE43F -Test: Encrypt -Comment: Set 3, vector 249 -Key: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Plaintext: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Ciphertext: 03D1D5646E4B2B8A924AB242E485C5D1 -Test: Encrypt -Comment: Set 3, vector 250 -Key: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Plaintext: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Ciphertext: 29106DFB63F4CD6EF5D82CF07C0DBB3A -Test: Encrypt -Comment: Set 3, vector 251 -Key: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Plaintext: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Ciphertext: E9DC1CDD5011E00E0C5699201E1EA002 -Test: Encrypt -Comment: Set 3, vector 252 -Key: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Plaintext: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Ciphertext: 8006C8BD5B210F2FC5B3538F66A6BE0B -Test: Encrypt -Comment: Set 3, vector 253 -Key: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Plaintext: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Ciphertext: 2C6386229480E806D0CD21CDA0EA6B53 -Test: Encrypt -Comment: Set 3, vector 254 -Key: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Plaintext: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Ciphertext: ACDBB0F5A00E3CF63A89D9C09B44A058 -Test: Encrypt -Comment: Set 3, vector 255 -Key: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Plaintext: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Ciphertext: 4F05F28CA23EEAE205B67B1C95CD5280 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ccm.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ccm.txt deleted file mode 100644 index f23f0843..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ccm.txt +++ /dev/null @@ -1,240 +0,0 @@ -AlgorithmType: AuthenticatedSymmetricCipher -Name: AES/CCM -Source: aes-modes-src-07-10-08/Testvals/ccm.1, Basic Tests for CCM (compiled by B. R. Gladman) -Key: 404142434445464748494a4b4c4d4e4f -IV: 10111213141516 -Header: 0001020304050607 -Plaintext: 20212223 -Ciphertext: 7162015b -MAC: 4dac255d -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f -IV: 1011121314151617 -Header: 000102030405060708090a0b0c0d0e0f -Plaintext: 202122232425262728292a2b2c2d2e2f -Ciphertext: d2a1f0e051ea5f62081a7792073d593d -MAC: 1fc64fbfaccd -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f -IV: 101112131415161718191a1b -Header: 000102030405060708090a0b0c0d0e0f10111213 -Plaintext: 202122232425262728292a2b2c2d2e2f3031323334353637 -Ciphertext: e3b201a9f5b71a7a9b1ceaeccd97e70b6176aad9a4428aa5 -MAC: 484392fbc1b09951 -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f -IV: 101112131415161718191a1b1c -Header: r256 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f -Ciphertext: 69915dad1e84c6376a68c2967e4dab615ae0fd1faec44cc484828529463ccf72 -MAC: b4ac6bec93e8598e7f0dadbcea5b -Test: Encrypt -Key: c97c1f67ce371185514a8a19f2bdd52f -IV: 005030f1844408b5039776e70c -Header: 08400fd2e128a57c5030f1844408abaea5b8fcba0000 -Plaintext: f8ba1a55d02f85ae967bb62fb6cda8eb7e78a050 -Ciphertext: f3d0a2fe9a3dbf2342a643e43246e80c3c04d019 -MAC: 7845ce0b16f97623 -Test: Encrypt -Key: 8f7a053fa577a5597529272097a603d5 -IV: 00eec1762c88de31f3cbba97ea -Header: 08c0ea100c846850eec1762c88deaf2ee9f46a070000 -Plaintext: 83a0634b5ed7627eb9df225e05740342de194117 -Ciphertext: 814b6965d05bf2b2ed38d4beb069fe82714a610b -MAC: 542fbf8da06aa4ae -Test: Encrypt -Key: 40cfb7a62e88013bd6d3affcc191041e -IV: 00b6a88adf36912fdca0f3a5ae -Header: 88c0d9577df763c8b6a88adf3691dc4a8bca94dd00000000 -Plaintext: 2c1bd036831c95496c5f4dbf3d559e72de802a18 -Ciphertext: 89d8580340b626a0b6d4d013bf18f291b89646c8 -MAC: fd1f1f61a9fb4bb3 -Test: Encrypt -Key: 8c89a2ebc96c7602707fcf24b32d3833 -IV: 078ef822734701f670a55a0fe3 -Header: 88c2712a9ddf11db8ef82273470159140dd646a200000700 -Plaintext: 4fad2b1c290fa5ebd872fbc3f3a074898f8b2fbb -Ciphertext: 9d59b15f371448c230f4d739052e13ab3b1a7b10 -MAC: 31fc88004f35ee3d -Test: Encrypt -Key: a574d5143bb25efddeff30122fdfd066 -IV: 0bf351946bc96ba7ffe03c0e37 -Header: 88c245dec69a7480f351946bc96be276fbe6c12700000b00 -Plaintext: 28969b954f263a8018a9ef70a8b051462481922e -Ciphertext: eb4ae4956a801da9624b7e0c18b23e615ec03af6 -MAC: ce0c3be197d305eb -Test: Encrypt -Key: f71eea4e1f58804b9717230ad0614641 -IV: 0dbff943b9f9a66b81eca48989 -Header: 88425af28430fdabbff943b9f9a6ab1d98c7fe7300000d00 -Plaintext: abfda22d3a0bfc9cc1fc079363c2fca143e6eb1d -Ciphertext: 9a709b60a39d40b1dfb612e18b5f114badb6cc86 -MAC: 309a8d5c466bbb71 -Test: Encrypt -Key: 1bdb34980e038124a1db1a892bec366a -IV: 00efec952016915eec4073e723 -Header: 08419b50f4fd56f6efec9520169183570c4ccdee0000 -Plaintext: 98beca86f4b38da20cfdf24724c58eb835665339 -Ciphertext: 12c537ebf3ab584ef1fef9a1f3547a8c13b3225a -MAC: 2d0957ecfabe95b9 -Test: Encrypt -Key: 6eac1bf54bd54edb2321754303024c71 -IV: 0aca3f3aae60c4cefd996eccdd -Header: 88c1552d5f72bb70ca3f3aae60c48ba9b5f82c2f00000a00 -Plaintext: 57cb5c0e5fcd885e9a4239e9b9cad60d64375979 -Ciphertext: 4bf281ef8ec7739f91591b97a87dc14b3fa17462 -MAC: 6dba8ef7f08087dd -Test: Encrypt -Key: 494b501e194675971a48d08c5bc353cb -IV: 0aa4ad6d319985ba82e93437b3 -Header: 88c19afb798b8a4ba4ad6d319985bc429e8f0afa00000a00 -Plaintext: 25a98f9c1bd9c93cf383ab9d98152d76cb4a32c6 -Ciphertext: 561a0d068eac2eadb0c57fe2d0a6cc7398b6ddbf -MAC: cfe438cbea61fa9a -Test: Encrypt -Key: 489e49bc3cfe3fce3895820e872ee1a3 -IV: 0053f869fe279acf1d3e75fea9 -Header: 084340ec29fa759b53f869fe279af0f9f8a65416000052bfd2703d24 -Plaintext: 7f91f2472d7a121c9cdd4b6c9080675a1020aa00 -Ciphertext: 25df5173835e4fba23bc05a253885ebed3ac4871 -MAC: c868a725552c5565 -Test: Encrypt -Key: 02be5c4545672a07e4e314d70f1f9e85 -IV: 0d347ceb9aabffd2d6596e55d4 -Header: 88c3298c0baa9190347ceb9aabffd83d4886e5c20000e29d524ae1960d00 -Plaintext: f9a812e4a28af7f3714d4bf6622e5932f2184509 -Ciphertext: 6315500f924295cd3eafbdc3e151b1df46465b71 -MAC: 681fdee8513c62dc -Test: Encrypt -Key: 77077ed79453e4a18d60438cc6484d6e -IV: 00d8ac5a7ec44450b01e77fd8e -Header: 0843aa288b8435bcd8ac5a7ec444e8b46250538b0000e81402c2ee11 -Plaintext: 431981a2336d02f8cb8448d5428916be95293537 -Ciphertext: cf71b2ccbd590b20800792f359ed1cfd74d800b4 -MAC: fd0f41f426bb8f30 -Test: Encrypt -Source: aes-modes-src-07-10-08/Testvals/ccm.2, Vectors for IEEE P1619.1 CCM Mode -Header: -Key: 0000000000000000000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: c1944044c8e7aa95d2de9513c7f3dd8c -MAC: 4b0a3e5e51f151eb0ffae7c43d010fdb -Test: Encrypt -Plaintext: -Ciphertext: -Key: 0000000000000000000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -Header: 00000000000000000000000000000000 -MAC: 904704e89fb216443cb9d584911fc3c2 -Test: Encrypt -Key: 0000000000000000000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -Header: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: c1944044c8e7aa95d2de9513c7f3dd8c -MAC: 87314e9c1fa01abe6a6415943dc38521 -Test: Encrypt -Header: -Key: fb7615b23d80891dd470980bc79584c8b2fb64ce60978f4d17fce45a49e830b7 -IV: dbd1a3636024b7b402da7d6f -Plaintext: a845348ec8c5b5f126f50e76fefd1b1e -Ciphertext: cc881261c6a7fa72b96a1739176b277f -MAC: 3472e1145f2c0cbe146349062cf0e423 -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f -IV: 101112131415161718191a1b -Header: 000102030405060708090a0b0c0d0e0f10111213 -Plaintext: 202122232425262728292a2b2c2d2e2f3031323334353637 -Ciphertext: 04f883aeb3bd0730eaf50bb6de4fa2212034e4e41b0e75e5 -MAC: 9bba3f3a107f3239bd63902923f80371 -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f -IV: 101112131415161718191a1b -Header: r256 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f -Ciphertext: 04f883aeb3bd0730eaf50bb6de4fa2212034e4e41b0e75e577f6bf2422c0f6d2 -MAC: 3376d2cf256ef613c56454cbb5265834 -Test: Encrypt -Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f -IV: 101112131415161718191a1b -Header: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f -Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf e0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Ciphertext: 24d8a38e939d2710cad52b96fe6f82010014c4c43b2e55c557d69f0402e0d6f2 06c53d6cbd3f1c3c6de5dcdcad9fb74f25741dea741149fe4278a0cc24741e86 58cc0523b8d7838c60fb1de4b7c3941f5b26dea9322aa29656ec37ac18a9b108 a6f38b7917f5a9c398838b22afbd17252e96694a9e6237964a0eae21c0a6e152 15a0e82022926be97268249599e456e05029c3ebc07d78fc5b4a0862e04e68c2 9514c7bdafc4b52e04833bf30622e4eb42504a44a9dcbc774752de7bb82891ad 1eba9dc3281422a8aba8654268d3d9c81705f4c5a531ef856df5609a159af738 eb753423ed2001b8f20c23725f2bef18c409f7e52132341f27cb8f0e79894dd9 -MAC: ebb1fa9d28ccfe21bdfea7e6d91e0bab -Test: Encrypt -Key: fb7615b23d80891dd470980bc79584c8b2fb64ce6097878d17fce45a49e830b7 -IV: dbd1a3636024b7b402da7d6f -Header: 36 -Plaintext: a9 -Ciphertext: 9d -MAC: 3261b1cf931431e99a32806738ecbd2a -Test: Encrypt -Key: f8d476cfd646ea6c2384cb1c27d6195dfef1a9f37b9c8d21a79c21f8cb90d289 -IV: dbd1a3636024b7b402da7d6f -Header: 7bd859a247961a21823b380e9fe8b65082ba61d3 -Plaintext: 90ae61cf7baebd4cade494c54a29ae70269aec71 -Ciphertext: 6c05313e45dc8ec10bea6c670bd94f31569386a6 -MAC: 8f3829e8e76ee23c04f566189e63c686 -Test: Encrypt -Source: RFC 3610 -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 03 02 01 00 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 -Plaintext: 08 09 0A 0B 0C 0D 0E 0F\ - 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E -Ciphertext: 58 8C 97 9A 61 C6 63 D2\ - F0 66 D0 C2 C0 F9 89 80 6D 5F 6B 61 DA C3 84 -MAC: 17 E8 D1 2C FD F9 26 E0 -Test: Encrypt -MAC: 17 E8 D1 2C FD F9 26 00 -Test: NotVerify -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 04 03 02 01 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 -Plaintext: 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -Ciphertext: 72 C9 1A 36 E1 35 F8 CF 29 1C A8 94 08 5C 87 E3 CC 15 C4 39 C9 E4 3A 3B -MAC: A0 91 D5 6E 10 40 09 16 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 05 04 03 02 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 -Plaintext: 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 -Ciphertext: 51 B1 E5 F4 4A 19 7D 1D A4 6B 0F 8E 2D 28 2A E8 71 E8 38 BB 64 DA 85 96 57 -MAC: 4A DA A7 6F BD 9F B0 C5 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 06 05 04 03 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 08 09 0A 0B -Plaintext: 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E -Ciphertext: A2 8C 68 65 93 9A 9A 79 FA AA 5C 4C 2A 9D 4A 91 CD AC 8C -MAC: 96 C8 61 B9 C9 E6 1E F1 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 07 06 05 04 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 08 09 0A 0B -Plaintext: 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -Ciphertext: DC F1 FB 7B 5D 9E 23 FB 9D 4E 13 12 53 65 8A D8 6E BD CA 3E -MAC: 51 E8 3F 07 7D 9C 2D 93 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 08 07 06 05 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 08 09 0A 0B -Plaintext: 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 -Ciphertext: 6F C1 B0 11 F0 06 56 8B 51 71 A4 2D 95 3D 46 9B 25 70 A4 BD 87 -MAC: 40 5A 04 43 AC 91 CB 94 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 09 08 07 06 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 -Plaintext: 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E -Ciphertext: 01 35 D1 B2 C9 5F 41 D5 D1 D4 FE C1 85 D1 66 B8 09 4E 99 9D FE D9 6C -MAC: 04 8C 56 60 2C 97 AC BB 74 90 -Test: Encrypt -Key: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF -IV: 00 00 00 0A 09 08 07 A0 A1 A2 A3 A4 A5 -Header: 00 01 02 03 04 05 06 07 -Plaintext: 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F -Ciphertext: 7B 75 39 9A C0 83 1D D2 F0 BB D7 58 79 A2 FD 8F 6C AE 6B 6C D9 B7 DB 24 -MAC: C1 7B 44 33 F4 34 96 3F 34 B4 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/cmac.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/cmac.txt deleted file mode 100644 index 4fa6c41b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/cmac.txt +++ /dev/null @@ -1,38 +0,0 @@ -AlgorithmType: MAC -Name: CMAC(AES) -Source: RFC 4493 -Key: 2b7e1516 28aed2a6 abf71588 09cf4f3c -Message: -MAC: bb1d6929 e9593728 7fa37d12 9b756746 -Test: Verify -Message: 6bc1bee2 2e409f96 e93d7e11 7393172a -MAC: 070a16b4 6b4d4144 f79bdd9d d04a287c -Test: Verify -Message: 6bc1bee2 2e409f96 e93d7e11 7393172a ae2d8a57 1e03ac9c 9eb76fac 45af8e51 30c81c46 a35ce411 -MAC: dfa66747 de9ae630 30ca3261 1497c827 -Test: Verify -Message: 6bc1bee2 2e409f96 e93d7e11 7393172a ae2d8a57 1e03ac9c 9eb76fac 45af8e51 30c81c46 a35ce411 e5fbc119 1a0a52ef f69f2445 df4f9b17 ad2b417b e66c3710 -MAC: 51f0bebf 7e3b9d92 fc497417 79363cfe -Test: Verify -MAC: 51f0bebf 7e3b9d92 fc497417 79363cff -Test: NotVerify - -AlgorithmType: MAC -Name: CMAC(DES-EDE3) -Source: http://csrc.nist.gov/groups/STM/cavp/documents/mac/cmactestvectors.zip -Key: f8fba7b9b3e9d68a 2f70bfd304d32a15 9e13453e0d16928a -Message: -MAC: eb61515b -Test: VerifyTruncated -Key: 344a6732dc5e5431 e98a4f7c323dc1c4 6b0275dc150e68e9 -Message: 25db0710fb165d316e7c32dd25648ed0 -MAC: 862f0e2b -Test: VerifyTruncated -Key: 20ae32c49bab3bf8 f86bb66173fb54d5 3e700868c46bc291 -Message: 582bd9c8c36ec815d0a9 -MAC: 0d62f14f -Test: VerifyTruncated -Key: 62232501b9e9c1b5 54209d7c075d2c31 73a2f289a84c49ce -Message: adaf4bfffab79ffb60b94647faac634929c56e694052881881e60b1149b6 -MAC: a05674f2c905d153 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dlies.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dlies.txt deleted file mode 100644 index aa711552..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dlies.txt +++ /dev/null @@ -1,542 +0,0 @@ -AlgorithmType: AsymmetricCipher -Name: DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES) -Source: generated by Wei Dai using Crypto++ 5.1 -Comment: keys are encoded as DSA keys, with OID id-dsa -KeyFormat: DER -Comment: 1024-bit DLIES key -PrivateKey: \ - 308201370201003082011706072a8648ce3804013082010a02818100ba3ed941\ - 10332be99b77a345da72a33146ca960498a6fc2e0e207fdeaadf69c3e5650df7\ - 3255475854900b75af7f6aac021de687a1c166ecb2ab6ec6b9da82ad4fb0f48a\ - 966a2b968406e18ba50947d7ee3bb1f13511cb4dde191f0ade1933d089c5e82a\ - b8d283943d85ef0102e173abf2635aeac2f84cfc9ec6c4e8f3fbc4130281805d\ - 1f6ca0881995f4cdbbd1a2ed395198a3654b024c537e1707103fef556fb4e1f2\ - b286fb992aa3ac2a4805bad7bfb556010ef343d0e0b3765955b7635ced4156a7\ - d87a454b3515cb420370c5d284a3ebf71dd8f89a88e5a6ef0c8f856f0c99e844\ - e2f4155c6941ca1ec2f7808170b9d5f931ad75617c267e4f63627479fde20902\ - 01030417021501fdc788cd93f07dba3af2de42ae5aa3ede219919d -PublicKey: \ - 308201a23082011706072a8648ce3804013082010a02818100ba3ed94110332b\ - e99b77a345da72a33146ca960498a6fc2e0e207fdeaadf69c3e5650df7325547\ - 5854900b75af7f6aac021de687a1c166ecb2ab6ec6b9da82ad4fb0f48a966a2b\ - 968406e18ba50947d7ee3bb1f13511cb4dde191f0ade1933d089c5e82ab8d283\ - 943d85ef0102e173abf2635aeac2f84cfc9ec6c4e8f3fbc4130281805d1f6ca0\ - 881995f4cdbbd1a2ed395198a3654b024c537e1707103fef556fb4e1f2b286fb\ - 992aa3ac2a4805bad7bfb556010ef343d0e0b3765955b7635ced4156a7d87a45\ - 4b3515cb420370c5d284a3ebf71dd8f89a88e5a6ef0c8f856f0c99e844e2f415\ - 5c6941ca1ec2f7808170b9d5f931ad75617c267e4f63627479fde20902010303\ - 81840002818029eaa5b193357c200e0d42f374d4c003c633c77f4778fe40ad0b\ - d035b87ae5da4e74110ec2b15eefe1bd8b9357534c85328382946d314e15b79f\ - 7b854227012dfaac9bd862e73a5630e01327b36319765a3eb1434e108ef6421c\ - 659e3f9223966759611429b3c86ed9937563efbfad8bfedcfa92db3d7d2157fe\ - 2c8a33f08636 -Test: KeyPairValidAndConsistent -Plaintext: 76 -Ciphertext: B11D906CC5A8E71CA8962A8CC0AC4CAFF2DA00DC130C370F42D11FCF5C37DE046EBC07C7D457CA351CE456A043695D14ED055ADAD2B58BE0DF992685EF8B0D21597A43D7B3D9634A077CB70C4590CD73C20FAAACBC5649413EECA0C7B3CBF469E531299398F61496C51FE9FFE48AE9FE6034F104EFC562DE9529C776B86ADD4025AD6B0C3687B012F92C7B9E82F794E4FBE247D644 -Test: DecryptMatch -Plaintext: 89338CE80AFB62E9577A310E40311BB3F77F -Ciphertext: 8A33B0E212DB8155CA796B472F55CD77267C9106229B6055141EA3AAAE42AD27249D90E70F892B0CDC80D29D3D586A5CA6FE67D4BB44C58B03496708F80681125DCEF983B7453B1E4F927438BD2E3E506C1951E9F19BA70F9B687012440CD75C0BB78BDCFAB22AF535D3E2670ABD1F4D44ED95F3360536612B1A7DF35E2A88F66BD6E8C813EB9DC89D93A85C9A0BA13E4862B91171B681E64A0750197C6467B22566BC640E11 -Test: DecryptMatch -Plaintext: 0835455ABD53E6FB11ED9B0C00485D3C6845DB -Ciphertext: A81181517BD270B0D921AF735052898932008DF00D501EDE0D2D564871D61A6A837776E8D7C7F9B0E5F9181C1FC68BC430F30ABB1A64D62B444C0AC5AAE588B4481AEF08B38E466155F10CA04C8202F281186016AE35212A2C7815A22DB2750ABD526D285BDBC598672BFB52E95CE33A0D3E5DCF4CF5F46224CFBB85297F3AB170C8B9478994E32D9A21A452B095D3D902E92C7E444A3307FDD7256FE49341142E5FF7A616475A -Test: DecryptMatch -Plaintext: 1EBED48EC47B6987091C52BC -Ciphertext: 1DF446FF43AAAAAC8E3F7D70C912E2D45AB832BCA3D0FBD17AF864B9EA878C45B9E2902804171A739A0552BB7CE0CD46DC16343714CC9C2E71AE26304885EEEB242665814DD9E33C480ABA214755D5449F16CD8870D1AB3A8E64E45E463AB3F4D3031FA3ECD395B61B372602665FCF218D9C51E8C791FA1E5BCC2916EFBB482E1814632CDF0F1852EE4943D9652DAA4E1F3B22F17F57F51D52A0997BED5B04ED -Test: DecryptMatch -Plaintext: 65D8 -Ciphertext: 4385797FD38AD5DFBB4F613BC87637B0051501E57699A5880E235DB7A6994A04A1613D0C8E07E36AFD08F2E47D018951B22E7625DA647AA1A0791DB3B2FA794610892D9A3D3F173CF95277B4B1EB92579A229510B67E171CB5BBA8B3AA732047BA038816A30124AF1C4C57CA80E93AACCC8EC70BCF7867914E7DE2C403568F9778F8DBEAF08FDB9F48452054C9735DC84F012DF8FE17 -Test: DecryptMatch -Plaintext: F86D8ED91E9934125DA6E9B4E97545C83A -Ciphertext: 13B0AE03AB532D5E31C9384B4E726A9AC73583CFBB0643EC322E3D2D45D9358CAF745B0541C136E8AA2220C42CEC9E1ED174886475538732AA6D6417DA89FA411AEDEADCD9F15D25D27D0AE252F77E888470AE696D5805CE8CCCB40B45D4AA835E97C7BF2CD6A2B4FEC6FCF858606CE4695DCE998C518360068ED028FC882478BF96096D92C166899EB51778BC4B7DA1BA8C4B6CEBA1139F17CEE484EA104A0325420A3D56 -Test: DecryptMatch -Comment: 1025-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b028181015dd79808\ - 07a15e557e3a39466eb2987828c536a871d4fc7f3723d52f8145a0d10d996295\ - 64aca54fd567c0509ef3c428fac68d916551e77a5ca0ed6d9f12cc96262b1f11\ - 49f398ef9f0f17fc0ed92bb917f890d1e6a4f62b91a7978d0aa1bf53b89805c1\ - 06ebebd0924cb99a4168a38dad65238236d4d166d38a3dfd5359ec5f02818100\ - aeebcc0403d0af2abf1d1ca337594c3c14629b5438ea7e3f9b91ea97c0a2d068\ - 86ccb14ab25652a7eab3e0284f79e2147d6346c8b2a8f3bd2e5076b6cf89664b\ - 13158f88a4f9cc77cf878bfe076c95dc8bfc4868f3527b15c8d3cbc68550dfa9\ - dc4c02e08375f5e849265ccd20b451c6d6b291c11b6a68b369c51efea9acf62f\ - 020102041702150f514282f489098f1df0c7be02ccbb3f23bed00376 -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b028181015dd7980807a15e\ - 557e3a39466eb2987828c536a871d4fc7f3723d52f8145a0d10d99629564aca5\ - 4fd567c0509ef3c428fac68d916551e77a5ca0ed6d9f12cc96262b1f1149f398\ - ef9f0f17fc0ed92bb917f890d1e6a4f62b91a7978d0aa1bf53b89805c106ebeb\ - d0924cb99a4168a38dad65238236d4d166d38a3dfd5359ec5f02818100aeebcc\ - 0403d0af2abf1d1ca337594c3c14629b5438ea7e3f9b91ea97c0a2d06886ccb1\ - 4ab25652a7eab3e0284f79e2147d6346c8b2a8f3bd2e5076b6cf89664b13158f\ - 88a4f9cc77cf878bfe076c95dc8bfc4868f3527b15c8d3cbc68550dfa9dc4c02\ - e08375f5e849265ccd20b451c6d6b291c11b6a68b369c51efea9acf62f020102\ - 038185000281810107143658b98a3725010d3631a3f4f7448cb967ac0118e4ca\ - 8fc8871eb4fb872d55c52d93a4f21eed98b6499db74315956a268f38a288958b\ - f7c4d548662c668669d69375e0cb710ff3a1a9f43e49add1f7ae58b836b6444e\ - 419e40474c27066cb03aae8132e65f3fead0109307ab1c7f0254eb14e9d76639\ - 1a66ca1ba442b425 -Test: KeyPairValidAndConsistent -Plaintext: 256F07E0D37D69BE542BD17FA98CE4CFC3DA849B -Ciphertext: 01269CE30DE12430904CEC9D8B91A6D8860B4F8D37FCE7DBDCE8FA18AC521684F4C1CD5C38BF3B42C259033CD36A53F0376A0CDD801979CF1B76ADD72AFDD27830BD85B373C4D451B84926ABA34012EB98331F0B81CCF8E801ACCDEE88A35DF60EFADABA1F395250A15463203FDCCEDAB7DD6CD1271B38A5E0946F8D189B225E8A307D198AC5E4EB33BCF26A02C0C602AA14592AEA01452E4F8AE46E7A032BABD1BA8ACB0919F2EA18 -Test: DecryptMatch -Plaintext: A992 -Ciphertext: 007822B0BDF45CC5B15102B5E21F7656C8896E98FAD6C2AF6CD55D0DB90B7A6B05E36D260C7A5C070526813290BCA722959B9B9BF00041B4B7F3E3EAFA9B5376A1E02944EDA55B99202601AE6D402D56617B56B28BAC1B405016053CDC78AB4D372B0D58E7380D50F1CD0E31B8CB77FD2F6BA3E7A436A5B35552B9974EA5AB30AC0C4989E34F5FD7D272417FF2094B97119BEB2C73C68B -Test: DecryptMatch -Plaintext: 1D20C118C894EFDC67DAC33E56179C5D262C83 -Ciphertext: 001587AFEC265C244875371B680521FF93F0B1196901A7D580785B62A257B1736C86D1D9E59A31E62F53B92B209B45A7952776C6AC839243B0BBF3A059E6CEE99B120BBD45922B4E813DDE0F5793A42B3AF2DDDAA357136A010519D884589A1F9912110020A8C16E9B91C753EB8842B3224FE9C9A22AE2B82251CFF7799E78885B0B67B27DAAC6A7B58013C31115C2B8C0C0176BC2A7B96A299CC75693B4F2138B2B4053CB5320D5 -Test: DecryptMatch -Plaintext: 83BC82A4F7A4DFC96CD7798BAC52254CD6E9 -Ciphertext: 0085E83465997BFED9CAE63B04B0419578D0BD85B1A65285E5537F4367E5E7E11DD8762BD3335916A13B8CF9D5BC651E762458E9879363B06748BEA0CA86D32CBC4F1B0C0BF67E616B872A64F7356241CD052944F6594A570522EF2BCC53D90E3326D2ECFA036C46256D9B678C93BE5877749AF8FF8FEDB6E1E17B67C7B6C6098D0C71D5B2AB503AFD7739ABCC8DE67DAC056AFE99D8A107230BA88C282FB8FD46E9E9E2C6874A -Test: DecryptMatch -Plaintext: 157597899A950A32 -Ciphertext: 013623199FFDD0D4689A4C50A9FEA3C2250D0C73F209F33BF3EF13E6035976D6F3EAFBA3D83A3862E4B6DFC7581EA43B62F49BC85392B7EAB854F92DA8DD5921A6A4C42777E89004EB7E6D479BD028F758171C324168DC0814369C6BCD8471D9620C4E9BED785A220EF9C0DCF1201311A16C51341E0551043C6EAB45E04A81C9280633F58621D8D3492864FFF6A39EDC48450ABFE0C7AABAEB9A86CFFD -Test: DecryptMatch -Plaintext: CDE651 -Ciphertext: 0040308CCDAB105426597D84A64665200A93208713004DB38594C490F7B85F08ADB67BBE47B7FB7BBDA435A6B6A2CA0B4CBE0FDCBD4FF078FD052213CBCAA4580D1C7962A3505DAA9BEA2957718AB36D061E61B9DEB3D7DD726975C6E7FD79AADBF649F5ABE51AC384E967D3CDAFD9EAA18EEB69774961E439F54844FA22DA1B6892E86471DAE6F7E74CACC944123234826621C7634AE34E -Test: DecryptMatch -Comment: 1026-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b028181031e7d8589\ - b9fa11e77204b8c1b27ad66b39863978d26912a65de306dcb32a0c7c96bb431d\ - c4a14204a8f01a65b0fe56a4d016716914c21576f10d63dac5f49287636519ac\ - f9be56c9f58eeb90ba3240d4cce26f647bfd86360cf0f6b8ff609ae2ef736558\ - 155a1498adf4e92dc90f34169123a5fcd8ddfc763c81658a4d08383702818101\ - 8f3ec2c4dcfd08f3b9025c60d93d6b359cc31cbc693489532ef1836e5995063e\ - 4b5da18ee250a10254780d32d87f2b52680b38b48a610abb7886b1ed62fa4943\ - b1b28cd67cdf2b64fac775c85d19206a667137b23dfec31b06787b5c7fb04d71\ - 77b9b2ac0aad0a4c56fa7496e4879a0b4891d2fe6c6efe3b1e40b2c526841c1b\ - 020102041702151fa3003b00efad22ecc26c5115e6d036d13d3b2f7e -PublicKey: \ - 308201a33082011806072a8648ce3804013082010b028181031e7d8589b9fa11\ - e77204b8c1b27ad66b39863978d26912a65de306dcb32a0c7c96bb431dc4a142\ - 04a8f01a65b0fe56a4d016716914c21576f10d63dac5f49287636519acf9be56\ - c9f58eeb90ba3240d4cce26f647bfd86360cf0f6b8ff609ae2ef736558155a14\ - 98adf4e92dc90f34169123a5fcd8ddfc763c81658a4d083837028181018f3ec2\ - c4dcfd08f3b9025c60d93d6b359cc31cbc693489532ef1836e5995063e4b5da1\ - 8ee250a10254780d32d87f2b52680b38b48a610abb7886b1ed62fa4943b1b28c\ - d67cdf2b64fac775c85d19206a667137b23dfec31b06787b5c7fb04d7177b9b2\ - ac0aad0a4c56fa7496e4879a0b4891d2fe6c6efe3b1e40b2c526841c1b020102\ - 038184000281802c6360e6e3eba6da6efb5bce8d07a99e42949b68b3c2900583\ - c2eb34498081c7212d8dc95a631d63edeafc625f8faf063e57b41d7b662ba9c1\ - a99b3f2506fdf5e59116a0e93e7e94aab55691abae75eaac9637a713949360a4\ - 5f6908f23ba5503d4760bcd6f7abceb8351a66bb14fae05f03b1494e7ef4154c\ - 99a9cb6a9bfe12 -Test: KeyPairValidAndConsistent -Plaintext: DEC85711F12C0D1D6C26797E91B0F39B37 -Ciphertext: 0215D75DD99B8A59DEA3FBA9B0F8A621EFFBFD831E9543749B04B495147CE9B56D519EE71BDF56D86FD1D9C1AE8BC1D7F29DC469A05221E4A31C726971731CF627E63FAB269FC92DEDDFF3319819373F299D55F4CABE08DADF29A7C60E9B4E2806899371B93A853F828EC4312D94CFDADFDEF2037D9C1FCE21A3E451006AC542E1BC36D3C33AEAC0D1666C26AA886F4C118836EDCA7C5A428E407C4ACD62A885C03202230FA6 -Test: DecryptMatch -Plaintext: 0E665CD2CF75C2E6E24908448F29E9A198EF -Ciphertext: 00A4583FF3A9451C6F8970E53D95EC74F41F709F5156B4FC9C698B1E43C7B5F3230D5417AED2C7447455009CE8381A30BE400EC15BBB1D7BCB9461E593D416421157541479FE1DCEAAE635728C68C58D260337A25D0CF9FA291D84E9E1DF4FF96822CA1F05CDD247AD14E5AFB231A0AF0F2E79FB9A0528CA2FE9431724C0AC9F0A2ABCED9A20EC1203DE2A835D90EA5FB1447EC722456B6F4C75D0645CEC5BECCE35B79FF3071A -Test: DecryptMatch -Plaintext: BE2A -Ciphertext: 02823CB4ABD598FC5D36300306460886BBECFAE6F56E02708A96EFB27EF7E3D8F08442FC819EAB1DC35CC70A074984A149F209EB285C6064DDDBC7781CEF7358F384D592BFC75D346A6D97D8524CB35060A35E3B3145199F4968677FA22BB468DBFF63E3E366D778B3042D5858699D9FE5D6F53D0CB084E107111B572AE9B933B94FF37F2681DC50CDED2714668375DA90787CF0144F1B -Test: DecryptMatch -Plaintext: 20D57B7E074BFFF8F54AF3E69C9B632253B3B5C0 -Ciphertext: 00D18C24BF39CD527455737B4B214BADDE99B070181C1E4729CC7B6EAC82298417FFAE7BDA1F41A7D74D6969BF9CAF3A7F9EC9397DB75F5E53D0282F793D601A28E8B3CA8730CD9D7A0ABA338E2DB3EB5314321EEBA2F16C8072DA6AD9A887AA5AED0EC5EF3DC7E5726626511F8F23B0BA4D83BA358DF0951B07399C7515349E3DE2938D2AA53AB11A4D1C07213E091CD3FB6453AF7DFB6799D45DA44B060F7BF5ACA5A25B3892BBB6 -Test: DecryptMatch -Plaintext: CC47935F7976 -Ciphertext: 02366250DE032B147BCEABCB576ED39F4993251D25010FAEEB41BDDA4301B890063247EEDC041539488E70B977091BF581033EE6EF75C224C8046EE3E7D2330383A30BA07FF33D10F07FF6E1EE20FA4D112CAB1BF457B50DC301DE5C6DBFACE227903379A41DC4D92517A547968D3F147D6435C3DF6A3D0D13635360716CBAC322EBD295593865C3A117050059FBEC83D112C5C3727377EBA7778A -Test: DecryptMatch -Plaintext: 3A370FAFD82869FEC40117 -Ciphertext: 026AE53843D3EFE36D8E52D9FD55DC6F0A0F51584BF81529914DAB6E380A6C9716828A7254307440B6A0CD16BF0D9D713939AE7F6C4D82D5AA70F33C9531E4071B9CB415C7622A23DBF4C81820BE04272874549F081B57D40B27BC1879BF134A2CF5D15203D326F9F97BCAC8606082A50A755CAE6FE2B72060EB1E0B72EF5AFAE8A823B3F0F91877C931CA64A06F3888DD4E2C823B3FCF529407255BE2AAD36A -Test: DecryptMatch -Comment: 1027-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b028181072c45d24e\ - de76df2a03270413d8ab37645c8d6301ea76bb6cedea97142df7aa422b83043f\ - 8cfd8874dd684f47138433f5832c83c8c811d3c6d477b088006381ffb066402c\ - 951670f1927b1b67883451202f456bdb975d8bb2cde9b43c178ecfe788a0a0ab\ - df2cbfc700fbb97ef71e52221bc054fbd3cf8c04175e4841a45b89cf02818103\ - 9622e9276f3b6f9501938209ec559bb22e46b180f53b5db676f54b8a16fbd521\ - 15c1821fc67ec43a6eb427a389c219fac19641e46408e9e36a3bd8440031c0ff\ - d83320164a8b3878c93d8db3c41a289017a2b5edcbaec5d966f4da1e0bc767f3\ - c4505055ef965fe3807ddcbf7b8f29110de02a7de9e7c6020baf2420d22dc4e7\ - 0201020417021506533f6f0886a8a44137598adb93aeee548c9af303 -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b028181072c45d24ede76df\ - 2a03270413d8ab37645c8d6301ea76bb6cedea97142df7aa422b83043f8cfd88\ - 74dd684f47138433f5832c83c8c811d3c6d477b088006381ffb066402c951670\ - f1927b1b67883451202f456bdb975d8bb2cde9b43c178ecfe788a0a0abdf2cbf\ - c700fbb97ef71e52221bc054fbd3cf8c04175e4841a45b89cf028181039622e9\ - 276f3b6f9501938209ec559bb22e46b180f53b5db676f54b8a16fbd52115c182\ - 1fc67ec43a6eb427a389c219fac19641e46408e9e36a3bd8440031c0ffd83320\ - 164a8b3878c93d8db3c41a289017a2b5edcbaec5d966f4da1e0bc767f3c45050\ - 55ef965fe3807ddcbf7b8f29110de02a7de9e7c6020baf2420d22dc4e7020102\ - 03818500028181056bf5dcced97da0ddd23c1f1294f97431e323f9719fc9bed6\ - 352d08a88ceb13a06b559b8ef7dc04c5a04a761a9631aa1000f32f885fb0de56\ - 505524ae89462079631f438284c8e5225c021d7731087ec0aad11aba9bba95de\ - 03f5c99ac228861a3ee6a7b47617cec687a58255321694b923e63ed247e65ff1\ - 4c279bec5282bc1b -Test: KeyPairValidAndConsistent -Plaintext: D391B4F3B53EB9B035C3AB1E3C6E -Ciphertext: 05D90F9892F6DD3DC3654130CAA312D2287D9E57607C301BE58607BB19FC78D67F2082C907FACA819A0D946AD16B46FE1E7264BE7D25D4EAB4F80D136E89EE7BC53B65CC1692581E3ABFA3C15482A6FEEB607AD1765897E67BCEDAED0E03FDE18E05330A99BEBB8710C77E7735CBB747EB507FE1EC04F239E964B509A4FEE8463478E28BF5338AE016DED9FE6B2DDBD3FDE467C45F0FA619E039FEF085D2F1544EA3CD -Test: DecryptMatch -Plaintext: 28 -Ciphertext: 066BBCB2D9E474A2C6CD514663BDA7AECA1F79136A00C1F9BDBAEDE344872093E67102307C96BF824999D86543121CC3D99B5CC4B511153A42E8A1569D063C27788E105858AF8EEB0766FAD9E0EDEFAEFFC733BE6824644CEE03AEE5FF15860CB3CBF4A46F95988D5E010FB844F944628043C830E575964EC36E2C38326C771085D796F2C22C0969E58665626415463A3CA1F56C357B -Test: DecryptMatch -Plaintext: D2C349F40A24230689EA15736C3AEFB1588A -Ciphertext: 019A66A4ADFED556BBD1E58728A3B7A3631458DCF677BB155DA989827C2240A586783D8C5DB98E266C39FCDF6FB016BBB25D53A6B30F3BC9D1109CB908B54F1932335F3DFC2C80847D94D13C5933953EA1D212107AB42189536171069621403681CAAB2A13EEAEC847193FA6A0234FA8F107E2C1747425584EBB4F4D702E29A3A09580E25B34413208009F9643327A636DF622B7F0267D3169A64646F301C584F64066801383ED -Test: DecryptMatch -Plaintext: 85D75863811C6F574222B577 -Ciphertext: 02C6FFDB38965F3061C736E633B497192862677CB247A37C5FA1FEB4F2C021EA94C65AD9506C73C2E98ADF0F340DAFAD2BF6F6CC906C93655594D093D4B0F6867755013C25ED0AD75DC9A04DD0666E6340BDD6C1E748479F3D64129F76B5BAB37D26319287EC9D65CE9E2243D4CCC7BCEA4065623C4D388A7BD779941EE541DD29E070F7356ED1A1ADAE947D79F8421FA717F933F08CBB8B699B551F1EFF75B8F5 -Test: DecryptMatch -Plaintext: DD07A91D32C26D3258AA4ABBD82E81 -Ciphertext: 05669E0777B003CC2EBE9BF3981160806A8B416A2DEAB4058497C5AF6A5C8F8D1ADF1225CC6FF7D292320E9C98CEDA144862FB4E32EE11AD9CC76A5C85FAE56A2567E6C9D168586F288CF4D525C94FF9F0ED6C3DBD08787768B90F8CD776520EFB920E61FB0E4463BE8D5AAE2683D31F392229A9554E0977BF25BCBBAAC7BB4FCCB009630D0203451A7A2AF847BA60AA0CE8C4D656DBED02353B92025925E1A0A6DF490F -Test: DecryptMatch -Plaintext: 0AA6B9FB846D1230F521F2624127 -Ciphertext: 01A9D56F1547728782D4F80BB0EBC8890BAEFE994900F41D56094F4734ABA2BB371060B2A69C6B7BC8944358519D141FC277E1195B3A78F7068731C3AF3C604A062A0D551397CD804168B7F400F786BC5CC3F912457AEAD56873AEF1A2378F34E953E240C20FFD7DDA229D4C020BDC68684A53C0AB3ACF9B44581353C60CE9854E3451645A604BB7AB3EB44088A07F59CE0FEB6454CC5A83BE5E939B317D4D8537CAFA -Test: DecryptMatch -Comment: 1028-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b0281810cb31a78b6\ - 6dafe2dd020483aec0cad421e4a3df2a81b827009dd74f5ef0468fc508477190\ - f628033471ee2d56f913d45a94a8ad1582b29785a7ead06c88ce73812e653797\ - 921d3c4a8fba91c1423d6609e85625b2f41494546500237151958b13d1cc0f90\ - 586b0233290d052a18c2aa3ec2bdc32adb4676cbeb30309e330b823702818106\ - 598d3c5b36d7f16e810241d760656a10f251ef9540dc13804eeba7af782347e2\ - 8423b8c87b14019a38f716ab7c89ea2d4a54568ac1594bc2d3f56836446739c0\ - 97329bcbc90e9e2547dd48e0a11eb304f42b12d97a0a4a2a328011b8a8cac589\ - e8e607c82c358119948682950c61551f615ee1956da33b65f598184f1985c11b\ - 020102041702151c0cefd22a713385985cacb5fe84cd40e724ce9587 -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b0281810cb31a78b66dafe2\ - dd020483aec0cad421e4a3df2a81b827009dd74f5ef0468fc508477190f62803\ - 3471ee2d56f913d45a94a8ad1582b29785a7ead06c88ce73812e653797921d3c\ - 4a8fba91c1423d6609e85625b2f41494546500237151958b13d1cc0f90586b02\ - 33290d052a18c2aa3ec2bdc32adb4676cbeb30309e330b823702818106598d3c\ - 5b36d7f16e810241d760656a10f251ef9540dc13804eeba7af782347e28423b8\ - c87b14019a38f716ab7c89ea2d4a54568ac1594bc2d3f56836446739c097329b\ - cbc90e9e2547dd48e0a11eb304f42b12d97a0a4a2a328011b8a8cac589e8e607\ - c82c358119948682950c61551f615ee1956da33b65f598184f1985c11b020102\ - 038185000281810aacd80676c540b97f74d2a94c2f389795c9f696d2a1fa934d\ - 20e93d49d0099d9312552e6e310da5d97cef87c9a5a4c47e7acd195293b09adf\ - db8e0cac95139446aba60fd625d17eaa102c7c26568b34891edb38226f949656\ - 44a9d52ff299cd007ab3dbc15779d4388431a66774ffaae5c6be04526b28c620\ - ac97e8618cb09d46 -Test: KeyPairValidAndConsistent -Plaintext: -Ciphertext: 0194C64DEB9CB401573730A29359456F4E9528347ED80F24E5AEC4441E896E38047EF95AAD9AD7A25AED6CC89FD95CAAEF27F3C814C26FE43F6D65288D87E372A204D1A66C3BCF0346CE89E9D2D7646E90BACB9A85022ACFEF8903C72A663BAED9A346E1A6B2B2FCF70E239EE70A34385F8C76CDD121F6B190085BAB3300E6B811906CE38AC740FE88A3DF8DCA1C6DF73A03236D51 -Test: DecryptMatch -Plaintext: 9498EB7300 -Ciphertext: 0A38C373F6A96D87528D2D55F6391A9E801252A65F622F36A130ABD140E1858024E31F247C3BC8C07D9500CBE7A8A3D6C0670AF0FA14D020DC54B201E657C233F8031DF990AE801077D4D3AD9B861F4C32D36FFB9E8BD5E2651169BC4560CC7FD02159929AA50882F8B4C8508BB98F6BE8A6A7C0E21A2A81AF781447ABEC85C170F3F6256C3B6C5E2D3A01BB5EA8B502D37561C06F1DA536BD59 -Test: DecryptMatch -Plaintext: F07FFAC9794BD8D528F750D50C05 -Ciphertext: 03DAF7F6C2BEBF8D0B380EB71BD8BEE9D649AD7647DF6DE4CBCE00D0363E31F11E0DC0331409863E3C069EE3F975E7F623B55D7F4690C7419C5AD97EB52BBC0212D3FF0A83A031591A31481116B2CD232A9C86A20EA40BD13A53BB73E644A6C7DC1E6C767756E7235538E9D5B155B3173416E99F121E96E02034C6DB9129489A050740F603DEFF96EF1D99E7EB4A32083D0D946670B1AEF30E1E38D3F076D6BCB57255 -Test: DecryptMatch -Plaintext: 85916A46E0965C69C4773C7DF9AF -Ciphertext: 053D29F0878C68FF55FFC8E6E0E03044AE23B79588034F0236A49A5B6D00EFE8C564D2D29ACB61FE49C0E984EFC3A48A96EAF22AF3032D8D0FD3B3BB16A0157C161F2B3D3DF802FDD6B61899212F44493383DDDEA8B2463BACD0C5E1F4F9E4063DE5E52032E7DA8B79E04C5F03144CD710ADA74506CEC2D448BEA0F2B59AB63FCC443BBE920748E122DDD6123BDDAE484DBD02088817D999FDF80D5ED4B308AF4C2DCC -Test: DecryptMatch -Plaintext: EB632C72F563174E680961BCF26EC7 -Ciphertext: 0BBE666C02191F668A2DB000646A14385A8E9199BD887913BA587DA4C683535801853186673AD7C43EFA5B65902559BA5345EFA111E0514D461C1B1EFFAE58708EE6C17F1758EBED31F0B3206B0EC1B4BEB2EF911C589E25CDC3B0020C47119B5F33EA2FB7C332CA6B1FDA2F350A4CB0D6844637F2CCA71EFB036C7400957AE093B21BE90E30A8672847C9BA5266EBBF9D62341F67A4D09FFA196A817DD2F5EE1A9654EC -Test: DecryptMatch -Plaintext: 42B5D2DB89374231 -Ciphertext: 0085B6894D887B59393F9D7365411DF239BE1104FD86CC63A52C990A84FC4660FF9B60CF0641E44A8224C169A9FD1B35EAF78008E34F14B5311CB5D725096D9DE92F35BE6E71E3AC3E3B3D68BDD5351A5AF93F0B3BCDB00B9B126D8DA07E5F42107181F9580CCD0D6F086C94177FD48ECFAE3FCF2F26D64940D749E8A964275290A247AF700210500517BEB2175326F4CD3016AB175B352F9BD3289079 -Test: DecryptMatch -Comment: 1029-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b0281811b02fc18f7\ - ba0ae7f84ebcaf319294fa2bad52e47e1926267ad38b2f1b2566145bbc190cb5\ - c39a8d6229eb238d3742bbd234b0f28eac92363a31ac96c5b08eaeb1963de59a\ - 3b2d0295c0266a7da4ca92b64f96c497f262e98df7f20ec55814b8441acfb639\ - 7abf9c4e42ab9bd6dda6ae180b12e12ead68672f9d56b98ee40e2b630281810d\ - 817e0c7bdd0573fc275e5798c94a7d15d6a9723f0c93133d69c5978d92b30a2d\ - de0c865ae1cd46b114f591c69ba15de91a58794756491b1d18d64b62d8475758\ - cb1ef2cd1d96814ae013353ed265495b27cb624bf93174c6fbf90762ac0a5c22\ - 0d67db1cbd5fce272155cdeb6ed3570c0589709756b43397ceab5cc7720715b1\ - 020103041702152c7c60166a1bfebb17831e65b8e1f61f3ef9ed9ff7 -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b0281811b02fc18f7ba0ae7\ - f84ebcaf319294fa2bad52e47e1926267ad38b2f1b2566145bbc190cb5c39a8d\ - 6229eb238d3742bbd234b0f28eac92363a31ac96c5b08eaeb1963de59a3b2d02\ - 95c0266a7da4ca92b64f96c497f262e98df7f20ec55814b8441acfb6397abf9c\ - 4e42ab9bd6dda6ae180b12e12ead68672f9d56b98ee40e2b630281810d817e0c\ - 7bdd0573fc275e5798c94a7d15d6a9723f0c93133d69c5978d92b30a2dde0c86\ - 5ae1cd46b114f591c69ba15de91a58794756491b1d18d64b62d8475758cb1ef2\ - cd1d96814ae013353ed265495b27cb624bf93174c6fbf90762ac0a5c220d67db\ - 1cbd5fce272155cdeb6ed3570c0589709756b43397ceab5cc7720715b1020103\ - 038185000281810e6e9c7b74e33a1f4683ddfa35509c39a75b75c10f438efad0\ - 82caad08a7418990983150a9a5ffe3f8e340443dfbabf82fe060da487f94afdd\ - 1e713d491b983fc4fb69d4405a12e356808c5cf6a7bd397c1a5637ba8e168b7e\ - d3f549a9f39f343e8fe3992706e782a1dde5c5e9e6a950f7d980835c1bc1742d\ - c2840cb2e61086d7 -Test: KeyPairValidAndConsistent -Plaintext: 03C57B87 -Ciphertext: 1440C6776914314A1DA161EAA41D52B283E2C0B487C801CEC33DCDB639F579F69D12FD029C994A311913EB6869C7A5659EE8BD9F5D7225BBB2EB77CF6F3D24A5E9866BD2CC50E593EC5CEBA4A96C59FE8B98B5EE2121E5892F2436F98B5C4E4A12077A1A64F1FCEB783D05453A657BB91909637063813CC00754402DE24F4AD6C0D9D4C15B7F4E485AF3538D391CF5993A59F6D1FE6C76E2A7 -Test: DecryptMatch -Plaintext: C5598C0FE0D90B10E7125079E2EDA32E531C2EBF -Ciphertext: 129FC863B70BB82C1C59EE2DA37FF3909F1DAB4B55D9727EE0CA3311BE5797F93446ACA0409CBFA848A90756D2598B6ECA56F6341C6E9F716A62380CB5D47400CF392A5441DA5AD2C1D066F894942837EA7B6237D7BE2E94FFE0A106148C2B7B9AF624242A945BF3B217D89FDBB070FA5940C1C899AD83AF1F865DEADFF0F4E48A7E00BF7AC5625F6E32F8B01394AE90284AFA061AF6DD61ECA1B8FA77CBC172573A9938332D7AEE41 -Test: DecryptMatch -Plaintext: -Ciphertext: 068117F2BCF29C72CDA3F4560A2165B7DB7C29314EFEC8D110425D5AA02F35C0F9A2304A0554C097944EF3A615BD70F5461E6549C319AC1207B100FEF022410C46284CEA9CA103685A18EC944DEA0BAE8E06D2489A3E2D1D9B255F192677664CA6FF44130C28CDE1FD437E85396503DFF305BA2D64E8BF9C75B00CA1595A1AED2C60865C0DF03F408EF95517E70552B2D5A8C190DC -Test: DecryptMatch -Plaintext: 8DDB5FC737283E5B -Ciphertext: 0B3E0CE51E1D3AE240EB34787DB5D49D6786B3BCC29C37EF8B9155F342C4D226CE1D07F7BAE09DFF7E8CD89915E1312F43540A26F03D918BF56B07E6D07A96870362643092F24FBCC6A2DE62F637B5F5F807E430DAF9B7AFE1890143591BBA035538FB419BE4CBADFCED5EB8BE2471B39CFCFBB2BA854C9E0F52E67524ECB80F9FBB3173D2A18C9F4C43F4E20866428A9256AB8AD199BA0BAD55A18896 -Test: DecryptMatch -Plaintext: -Ciphertext: 197D4DC43B0716191F926DC806A1B707ABD6684735144AFE07E0EAEEDD9BB3C89B9D0076859DACE6FFF9E2685592ECB010909910DCA50D2FB1B15EB9B9CFF4F71250D807EDDC2EFB2033BDFD93FD10E117683E3E4E8A5D3308572D4852954BD51251279A79092E3DCB95F1FCEC8310931933F47998DDB61438478CD80864F08D3370C863BE6E7E1CD22E38BC512D9A160478814057 -Test: DecryptMatch -Plaintext: 53AC983CEE599A17261C53 -Ciphertext: 0E31EAACA9E8A86ACEFD1CB817869F48EAB342EAD0DAFE17B848CA9CB72B92567987B929F655B8D601EB1384BE380C8E4BA8B4E274F724F02FC5C00479C308813A3963E2D8AC88ACE92AEB00AB024A4EC5560857310E03009752B86793B356DA344B4AEF01F3ACCD9CBFBE399D0016260C006FCA5443359EA1E012D43921B8D2B8CFD31B94972ECE9C0031420238C76514635E9B40F17D9AF25A1009DB75E4C0 -Test: DecryptMatch -Comment: 1030-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b02818127b35992d0\ - 8edcc7aaa6ca70365afa8ffacb4a9bef0ea348e27414c2100b81827fbf1abd3f\ - 14150bb5d85ab13b2aca21304365f150511a68c90f4a4eac0bfef0c548e3076b\ - 30a24929c4482f42f2b03ce122b3a251e685a3fe3dbb539932bf8d2b117b1b08\ - dbceb78c84966270657164fe6f20c6d27dca270dd4417f843fdfb23302818113\ - d9acc968476e63d55365381b2d7d47fd65a54df78751a4713a0a610805c0c13f\ - df8d5e9f8a0a85daec2d589d9565109821b2f8a8288d346487a5275605ff7862\ - a47183b598512494e22417a179581e709159d128f342d1ff1edda9cc995fc695\ - 88bd8d846de75bc6424b313832b8b27f379063693ee51386ea20bfc21fefd919\ - 0201030417021513560b35fe90d01a106b1e6ccba4cec953421d48cb -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b02818127b35992d08edcc7\ - aaa6ca70365afa8ffacb4a9bef0ea348e27414c2100b81827fbf1abd3f14150b\ - b5d85ab13b2aca21304365f150511a68c90f4a4eac0bfef0c548e3076b30a249\ - 29c4482f42f2b03ce122b3a251e685a3fe3dbb539932bf8d2b117b1b08dbceb7\ - 8c84966270657164fe6f20c6d27dca270dd4417f843fdfb23302818113d9acc9\ - 68476e63d55365381b2d7d47fd65a54df78751a4713a0a610805c0c13fdf8d5e\ - 9f8a0a85daec2d589d9565109821b2f8a8288d346487a5275605ff7862a47183\ - b598512494e22417a179581e709159d128f342d1ff1edda9cc995fc69588bd8d\ - 846de75bc6424b313832b8b27f379063693ee51386ea20bfc21fefd919020103\ - 0381850002818117f468e3d38f1198556447bc16fb6c6ffe98b31f9042e59602\ - c71286db3e0780601e47372e6eb4a570f2059a7a87ee4471eaf94bcf23e34017\ - 5a377333d39dc64b7eaefcc065bef4a92d0d10acbba71082852c2014d9d3eb2f\ - 8583947c2cbf52865730d2b9511ed8a68367e4d89eca4589b836889cd424485c\ - 9305bc0386b16619 -Test: KeyPairValidAndConsistent -Plaintext: 4424 -Ciphertext: 0C570D0317363DB43DEB295D49A3BC937116F2ECAC9226415952CE634679272B7041A4B806164F12E87A0050AC2D60D393F845965CB3A56FF0CF28D31CFA0285015452C59949E3D96C5C6D1DBE38F6EE98E2C93357E6C036053DF920C7CA5E2EA1617AE44434A347FCE426C55295172ADDE9CAC3AEF2C6D6AB2C8F0FAB1B146FF1A10D5EC2191C99D6418519443EEE2A198BFD159BCC63 -Test: DecryptMatch -Plaintext: 5092C5D9FA398EE31AE27C97 -Ciphertext: 196476CA0E6622569F233780EE0C449C2CAAD3819B348D01B4DE5425EBCDEAEA739C6D9CCACE4DDF06520E83C94D237AFD46A4EFED635112CC78534E2FA6046ED6C06806EA8F4B9F3FC3F87DC55F63B9E14F9ABD82E9CC80A298DB281C9F690391F5B064880CF35C5A0BC7537DE9F65DEB2467FAB5CE8F41529A5B06BFA6B587ED661849BC7388277AE7F7E5EFA3F2526E503ECB106B718275BF32C4F83278CA30 -Test: DecryptMatch -Plaintext: 89BB350DC43CB3 -Ciphertext: 13844D63B45821E8704A9C1F6E9166B5EB7FD98DE5369E5DBB9DECE506EE467294282B5B174EF2F81B6766A3616AC5A974F06D9C47163C69668F4C1C78F8A6716A4EC28A6AE25F615A838B9C747EE857AA2AC92DEDC575AC568A78E8A86EF78D55EDB88707F7B6D558E8A760095BE8BCD066FC57396E67C9D8654245676DAE9FC4BC9D578496CA450B35E179410A5DB443C2026FFF0E5F7E54821E39 -Test: DecryptMatch -Plaintext: -Ciphertext: 040E084ED4A1C135C8867BAFF219A0092855E1E9FC96F38277E16B96986FDEABDC22F3B02CC53B655369DDE3356EA6FE49B77C8EAA49815CD5B1DFDC6E7D0AF6AA985483345BBA8A251F1EC7658DF708C8EED8AB6B953393C03BA2EEDB8B6391D921C9EAD2AA61DBE724B15C9C664EC4EFF83A535E46BF768FD519B043DBF46A36FA03921224281A826F6F43DEA6DF38749D600317 -Test: DecryptMatch -Plaintext: BB296D4FF04AE0171F1F24AE -Ciphertext: 0AA9A85958D9F1BB06E3DB48DACC842534915A7E42715057BD33523EE756F62AD973E37128BB8031358A1DC583F40598B74F079AD667C037D4BE89938233BFE1C167EFE764724F97F2EA42479FB455B1166AAB26A43440867ACE77472CCB13643D5BC9532F68C5368825BF225DF49E2D3BD023447A795AFFE927A796C70E5D6359537A9CE2B4B9323D7FE208540CC32447940ACD91F4718FC7A7CAD45A524B6DA6 -Test: DecryptMatch -Plaintext: 87A2C6B33856C6A096EE -Ciphertext: 12D17080AD0E7FD426E02B6A90736AB4B566F31E937B2D3E642D663D6ABFEB903FC9C4763AE492191E0C15B264CEF321DC8747C590F751A9BA2825D9250F72BA85EEB45B1F1D7B2BA972455DCE7DAE6CBD7B5BFBFB88FCEF52910F9B28D3DCD6BB5D479BBFC73896C3D1C44AB387989DE4D77855F6B8C7A8C12969D51DC6B10BA15C2B19E91A55BD5542853EC6F8F13260E8774C706958B1C9866114FADA1D -Test: DecryptMatch -Comment: 1031-bit DLIES key -PrivateKey: \ - 308201380201003082011806072a8648ce3804013082010b0281814ff13b3664\ - f5c527c36120159d9b9a82054f9ade6866b379e13d03e76cb63b25731132d5f7\ - ec6e95186ed83c793b5d63189dac30c6e6a655605f885fe73d2ae5433c80e660\ - c5d985ad6d12783082861829355c25cd7a7ff84b3033cb7fb530a7baa4000830\ - 2c1eb24b866cf467f570e782bceee66e15585f70b0633965c870530302818127\ - f89d9b327ae293e1b0900acecdcd4102a7cd6f343359bcf09e81f3b65b1d92b9\ - 88996afbf6374a8c376c1e3c9daeb18c4ed6186373532ab02fc42ff39e9572a1\ - 9e40733062ecc2d6b6893c1841430c149aae12e6bd3ffc259819e5bfda9853dd\ - 52000418160f5925c3367a33fab873c15e7773370aac2fb858319cb2e4382981\ - 020103041702150910a291c216ca5f944c5f3eaaa1535c3b8a1f0b15 -PublicKey: \ - 308201a43082011806072a8648ce3804013082010b0281814ff13b3664f5c527\ - c36120159d9b9a82054f9ade6866b379e13d03e76cb63b25731132d5f7ec6e95\ - 186ed83c793b5d63189dac30c6e6a655605f885fe73d2ae5433c80e660c5d985\ - ad6d12783082861829355c25cd7a7ff84b3033cb7fb530a7baa40008302c1eb2\ - 4b866cf467f570e782bceee66e15585f70b0633965c870530302818127f89d9b\ - 327ae293e1b0900acecdcd4102a7cd6f343359bcf09e81f3b65b1d92b988996a\ - fbf6374a8c376c1e3c9daeb18c4ed6186373532ab02fc42ff39e9572a19e4073\ - 3062ecc2d6b6893c1841430c149aae12e6bd3ffc259819e5bfda9853dd520004\ - 18160f5925c3367a33fab873c15e7773370aac2fb858319cb2e4382981020103\ - 038185000281812e9a62ec280cf5ee7d09e5e5675b67a4c325c7565a1129c079\ - 095d0f078e7b8a5b3c947c21c022f01c0b9267a45fdd9f267e63c7f674a02d39\ - 6fc59a960d7991d2e3552d01deb2784f26ec4c9355c0df0497271cb583d157db\ - 90b0634180578ac85005143dda75a33a127df96639e275cee8fe9c02db62d2ed\ - 879f3caae11d6e00 -Test: KeyPairValidAndConsistent -Plaintext: 1FBE21CDBCEBA28625584CB1EA0D9627A919A6CA -Ciphertext: 2CFC251CB2A397880EFD0077D9CEF817A6D69EB6278CD82998C5988DD18D6ED15FC8CAFD1611DE58BB46BA8A87013C7BBD4A8DCFC454F13DB282BBBD4E1594E6AF17AB6219E91D7354EB88515007B58BF0D8FF4BD4C387FF6E02BF81455803E6A936F25245863F1580F00ADFA4BDE052BEC72739B88042CF99480AB6F4489F9C8B9319828A000FDDC4D1A6E49868E3B39DBF7DCDADD9B882B755E330C762FCC023EBBCBD0330D28DB6 -Test: DecryptMatch -Plaintext: DCF33FA5BEDFDD93DA -Ciphertext: 14BA927F10262B134AC43F6787EAEC3546C17EFE3F6D54AD2A245A0EE732B749B7312521372F21716E1DE29AF8FB329C25ADEDE2DADE3A455235DAC6C1F347C2A052893DBA6511C3760384935D68C7808D23CB194E6A19F579782B22C3D8880736BECE89FD75E7E69022E9B2500E5A044105B832C9BFC5F18A807889B401E61A9888276B31FD299D604AEA85091578D41E5B36D66C4510F4B147C5E59615 -Test: DecryptMatch -Plaintext: 217B0E -Ciphertext: 37B50EFF3A3FDA419988CA44CCA3AE95F465A18C89CE2DF025F565DAF0F833E198DAEEB46517FBDE47AA3D5DC5039B873A31D0DEE1EBC63F3E97C0A63CC05A8F877FE70EB7F6198C088FF35C1C369616D3EACB013F295F764146A5AAA2D21CD36B9DA4490CF1B37D379ED7713B955C3B0581650B5C7F4F5B8F45B89B94DC364D3340414B491C29AAF2E197AD6F59B0DD687F2E60F8826169 -Test: DecryptMatch -Plaintext: 36DA002D110CD632A9969DC42409B478A3AD3B -Ciphertext: 37126F749ACDF2B6BF667DE9635CC0BBD61753B30931C847B612936C1AE122D6F0E409B4E9454852540C5FD8DD3DA8BA4026FBE8CC8449CA0071409DB47165907202DC078E5A8F6B0E9C8D3497A2D02F53DC3A47389C1B3778EDDEE980055BC4B7EBAC0B95C0CC4783A4B202CE127FA0D7B65B252492A1847FAA9D1ABE893376917BCD46DB4FFADC06C880AD848683B874F7CDFBF0E4BD87AFC39303C512C44EF58B510702C1129C -Test: DecryptMatch -Plaintext: FAFD -Ciphertext: 0F63F22B7817F2449388E0422C6122200D76BA8D4CEDE63DE950ED26768E6779BA0A238C8C3F2CC5C87C7926F1247A7067E27245423EEEFABCDB606976BA2FD9977320F903733FB57D02620682820B1AEE165604410157C5ECFAB7090EE83638A99E4CA36CA0879D3C14856A3417690A52F14F33CC50FE44503FC47F2D90C096C03F62A85D88891E9568911AF61DF916C3677DCF152FD3 -Test: DecryptMatch -Plaintext: 9E9145E890FEEADC706AE1 -Ciphertext: 0B60A14F132D21E47E2FA20633DE43694EC0394115DB297C1B68D1A7EE7722B6AF5D149A2EF5D0EA05761C0FABCF8C0862AF320E9D273AE743717F78A46F15B640C87F4AD0C25865EA3453B0FB59D997E41A31B6C1669F14639E2F70F7D4324B8729A26C8869D97B432740F7CE28A74EFFC82AD7EF172A02AC678C13235BA2C6EF79143D189838E1F101385BD7098AE3B5B78A80964D5C0A3D7DBA7FD7328BE8 -Test: DecryptMatch -Comment: 1032-bit DLIES key -PrivateKey: \ - 308201390201003082011906072a8648ce3804013082010c02818200b98458f5\ - ada1f23f4ae8a3a519c27fde91efd1f201e386aa6119749aaf6ed389079ae49c\ - c76317f81f14164673e8f0be00edd4db4792d446e7bf84b30200626b442af3f7\ - c9a6ee6fb0f95807e62fa5b2d171a4b326cd60c82b20d63ef00b408ea337f50f\ - a51f07549dc4f9a660842724566b94d6e2a58980d2d20281ce6c327643028181\ - 5cc22c7ad6d0f91fa57451d28ce13fef48f7e8f900f1c355308cba4d57b769c4\ - 83cd724e63b18bfc0f8a0b2339f4785f0076ea6da3c96a2373dfc25981003135\ - a21579fbe4d37737d87cac03f317d2d968b8d2599366b06415906b1f7805a047\ - 519bfa87d28f83aa4ee27cd3304213922b35ca6b7152c4c069690140e736193b\ - 210201030417021534999c0e7b17cc3c110cff71571e8d4708c3122a1a -PublicKey: \ - 308201a53082011906072a8648ce3804013082010c02818200b98458f5ada1f2\ - 3f4ae8a3a519c27fde91efd1f201e386aa6119749aaf6ed389079ae49cc76317\ - f81f14164673e8f0be00edd4db4792d446e7bf84b30200626b442af3f7c9a6ee\ - 6fb0f95807e62fa5b2d171a4b326cd60c82b20d63ef00b408ea337f50fa51f07\ - 549dc4f9a660842724566b94d6e2a58980d2d20281ce6c3276430281815cc22c\ - 7ad6d0f91fa57451d28ce13fef48f7e8f900f1c355308cba4d57b769c483cd72\ - 4e63b18bfc0f8a0b2339f4785f0076ea6da3c96a2373dfc25981003135a21579\ - fbe4d37737d87cac03f317d2d968b8d2599366b06415906b1f7805a047519bfa\ - 87d28f83aa4ee27cd3304213922b35ca6b7152c4c069690140e736193b210201\ - 03038185000281813c42dc88e1e15b9a737bfd64b96a7448983da5242a6cf43e\ - 1cc72e8886db723b681c291f772bfe33de5ba735404581c839341969a691c199\ - 229c2849c1c8c80396837c71d711ce34129d3006aef9d16cac504543c6e570bc\ - 3d730d5cd35d8a375edacf591b2837f9a705d63dd62754365d13c103961161dd\ - 984d89792985ad688f -Test: KeyPairValidAndConsistent -Plaintext: 23 -Ciphertext: 0BE692E3384A784AD01D80A65D22B48449AFC0281B36085B0D8FA03574B4BAD05F754D6FFB8E3F4B4BFE60FC7EA2BC1F11253505C753BEFB1D3BDA0084E6CC1FD82454A601F1C0ADB52B3FFC4895D36542FE0139465B490102C7B6A75C9273B737536DD122CC8C3EA0F32900C82C45B0FEE97D995AC5B4345A8899DD6888D1E814BB5A1141A86E636D31FA05689ABA512DE869D12BB4 -Test: DecryptMatch -Plaintext: 4F571384FD52A9041C8F3094 -Ciphertext: AB7942750662F0FA422F4628B558938545FBF7C749995B4D5B32BBF392292FD1B4EF02E5A2EEF6874BCA9F0D4CBCB92D684CDA821829850BD4CAE110E78E42909CF069B54B4BC7D742E113E57C85BCF54AA5CAE1005516BADA834A857315DD6C3DEF4AEBBBF6CB4AE217107E16E83F884B2933EE618F22C45B78092B2EFF7D5C33DB7D89FED4E134921DFD9DA999FB8AFBFD094D77BD887D2C86AACC401A621905 -Test: DecryptMatch -Plaintext: E421A467654B3B88C93C8E5384FE2B85D4E340 -Ciphertext: 7485B8E5360BC1383FCE1C586E126D5DE89FF1CA7CC8146C37A1E6582A564C4588984915CCE9635EA6ED434C80CAE138FBC1EB15D16B294AC1E59CDE544E4DFBF276D30A7F51461C2B7E7F076222DE6AC534DC47E015BA85062694FD78DC37E9460C10FDAF2C61FC7EE0669E99793A657543B881B50B0D3916E395A959EF55B02DB8E7B4C5B5B653AE2D11CCE639342C8C77C667625116D9E6B6C6AE822CDDF2AA503EC3FAD53D80 -Test: DecryptMatch -Plaintext: 3D6C941B1F03E5C9A4 -Ciphertext: 684AA8D2AD35D2775BC30794A078CFC931096A37D472FE511F72B03B33E87AB1E7B958C3447AF6285AC379379E0D1F1BEC535E4032E186573742A75C1B42BDC52F679DCA13B2B9E67CC73461084DE1777FAAED93C7C1E4A6B19473EDF6A57CD88C076574A356748D501A05AF66A136E908993A0A70538FEB03109C62A41540EB4E166596887B4860E3AB0BF9C1AFD02C67D4BFF28BAECD31D1CEB207A245 -Test: DecryptMatch -Plaintext: -Ciphertext: 111C252A9E64FB777F09AF6AEF9C4210B9644C3A66D5528C631D5348E30B146A6225783DE1FB796DBAB3A901E37818B5AE49BF1F8CC0A6C8909D2DB06D651CB08009A25E13A89653DBBA5959674E37BD72039D4E7BFFB3A2395DF8C36164C3FA71334DBFF2FACA090F1C349BF68443838A0D893B9B498D3B6CC86646F935D5ADED81967A387506688B6478492129534F3A651C9985 -Test: DecryptMatch -Plaintext: DE5F0B92C45A0C1530 -Ciphertext: AE6BAEF52B43EE88AEA7796D667D044887407ED07E7618358243A0108514FE9793EB28EB42B4BA2F28F6687FE7973FB8DBF825541010F1BC1FC7350CBEC0B055C0C71FF2C4D2634582C966C1CFD3449AF8AC956BEC3EE797F7E81E589450EA13C1A8C99116E05E49F4BB87C9B95EFDBEB35B21C36711CEC8A1ECF3E4F194251563F88C056749B835FC19A7CD560FEC785207DD14D43C6104D83BB05F1DA1 -Test: DecryptMatch -Comment: 1536-bit DLIES key -PrivateKey: \ - 308201bb0201003082019706072a8648ce3804013082018a0281c100f9566c8d\ - 687a5ead7c780617d3ed37b4afc46582e9fc0d75ae217fb506f5c2024c2a0e6d\ - 7e042544235b4de63047a33940d772721e895f9d4e92790bef0d3668ec7f6cad\ - e7f9b18049b33efa773c83e97b35ef7ebf18934b48dd4700a48c1f76ffc20684\ - 521bad52834086ccdf1e3d5c9128fef52f6a9444d8e9944d49e5ab411f46b63b\ - 290b7fdc8f48fab24c2059510bb7247e0930d5043802522d67f2b69ac18b82bd\ - 0229e53bf6769fe83c469188d600e6afa6686bd9725afb9ce39bbd9f0281c07c\ - ab3646b43d2f56be3c030be9f69bda57e232c174fe06bad710bfda837ae10126\ - 150736bf0212a211ada6f31823d19ca06bb9390f44afcea7493c85f7869b3476\ - 3fb656f3fcd8c024d99f7d3b9e41f4bd9af7bf5f8c49a5a46ea38052460fbb7f\ - e10342290dd6a941a043666f8f1eae48947f7a97b54a226c74ca26a4f2d5a08f\ - a35b1d9485bfee47a47d5926102ca885db923f04986a821c012916b3f95b4d60\ - c5c15e8114f29dfb3b4ff41e2348c46b007357d33435ecb92d7dce71cddecf02\ - 0102041b02191d78b208d09b23e859be7e79ca76e612d8e5ac75a5ca02c506 -PublicKey: \ - 308202623082019706072a8648ce3804013082018a0281c100f9566c8d687a5e\ - ad7c780617d3ed37b4afc46582e9fc0d75ae217fb506f5c2024c2a0e6d7e0425\ - 44235b4de63047a33940d772721e895f9d4e92790bef0d3668ec7f6cade7f9b1\ - 8049b33efa773c83e97b35ef7ebf18934b48dd4700a48c1f76ffc20684521bad\ - 52834086ccdf1e3d5c9128fef52f6a9444d8e9944d49e5ab411f46b63b290b7f\ - dc8f48fab24c2059510bb7247e0930d5043802522d67f2b69ac18b82bd0229e5\ - 3bf6769fe83c469188d600e6afa6686bd9725afb9ce39bbd9f0281c07cab3646\ - b43d2f56be3c030be9f69bda57e232c174fe06bad710bfda837ae10126150736\ - bf0212a211ada6f31823d19ca06bb9390f44afcea7493c85f7869b34763fb656\ - f3fcd8c024d99f7d3b9e41f4bd9af7bf5f8c49a5a46ea38052460fbb7fe10342\ - 290dd6a941a043666f8f1eae48947f7a97b54a226c74ca26a4f2d5a08fa35b1d\ - 9485bfee47a47d5926102ca885db923f04986a821c012916b3f95b4d60c5c15e\ - 8114f29dfb3b4ff41e2348c46b007357d33435ecb92d7dce71cddecf02010203\ - 81c4000281c07a5b4ddf442b2cd7fd925be84f2ef4c4032d61c5a55c5949b30a\ - 765cd4d5d4566af37ffa7f814f51bdd71c3e5575c6fd0203f14d3ded4e14baa8\ - 2747a6437d35ebc81e2035bfb0e04087fb5fe449163377d47b045b680b394962\ - 20b3138e85f6d24e06f955ec7a1b785ce34c2926cda441bfc86ba2f44a489a41\ - ee1740ab5ec3daf6d2c598e1d143654c05ce61792b47ac92c8d6ba0711419e41\ - 221743b768eeec2601f66d277fba154a62dc996537a0caccfa313cc9fde0194c\ - 05493aab1f07 -Test: KeyPairValidAndConsistent -Plaintext: 9302C420D137C310 -Ciphertext: EEF64A81C754B2EF543A19549AC0FF3F44E4B548284ABAA1E5F1EB704B0D246749D7F1CEF7B20A5226384DBE8FB596101591BE2B53E9909EE3723CB70A385FC2DAF6CE15629EBA21E7F26223B0A2428D8931CBB4F1B281E318A540F38A809C8BAD92D10FDD63305DBBE972E6CB973FC4F2FDF0BB9CC37FC42C7AD76E8DE3FA91E5E79B09796652BFCD62A28A59D9A97759032A0A78E0E1B081DF212A15AA44E35DE9E291EDA499DDB631486C029D56052246C9E37FF24EE9E86465B3B55BC4BAD77B9AC873B6F36EA65892B202E320756540009C81B9C6747BDAF40E -Test: DecryptMatch -Plaintext: 9FD4F26B7317BBD1B235 -Ciphertext: 514DB5C63AD9707197B4F0B2A30CDA18369B963E62F7ABBA1E030E08D3DE4E6C17D4BD7CB8097C2E641FBB0AED6A9FE7FBEAAC1C6B85BB3570D0E86FF6105B9F8C9B562A4EFE4AE3AECA26978C514129006D22C108B1C8A0FA55864EED3D3F81643AAFE36DF1CBC3B4E1B1AD6D5E0612214938A55114589B97286A7EE5B04E39254696DA91453027F07346984423FE2784DEA9375C236E6640504B5BCAC32062836E5BE1695CE73285CD77CE9717FA38E080C28C2959D9E32A589C04ACE5E52970ED49BE34703AD6B9F024DDA176C631EF5EE76833B427E233A5DAEC4328 -Test: DecryptMatch -Plaintext: 337D8BDD32 -Ciphertext: A4EFBF2151DAC683F0C51D60A647151A1EA0C0DAA8CF3497D7116439E6AEEC62A36D06F89AB2F1886FB9F62403E3DA8D6F67F66DA2436EE20FFBADD698DF87EF40470749C0BE0414A7AE4D2755459F8A17F6C7D8920236400313D7846532C391A0A4D99C26C556772E2D3C74E0119C4CEC7EF224488BFEBA017A910E5FD167B4486E436F7481DC5A46F3FF0536193C75A857DC53C5242C11AB911BD21926462C5060BB89F71D99FDEAD3D16B1E21E0D0791B59ED0F49871F744B13F23EF5028C238B895532F90B0ABE9912644EC079604939A0CF519BA9D185 -Test: DecryptMatch -Plaintext: 25549A5AE844ABEAA694E3F6 -Ciphertext: E2B30DD7781DB7EE7B2EE3FEB77F7360A6069396D8BF1DFD85D5429DA5A156677679085D612D0FCCA0979C97E924E77C43D3702940DBB556A5BB6EA33D650E078B1CDF8E5F76DA6591D0AFF4389A3A982A9AC581BFF393B35D36894E407AA56B493C2F7C4CBB75AEC72394AC4F8A99089702F3AEDB2FC7486F5CD01691C3C8F8FF3E951CEC70A4E172B763124BE1D9F96DBBFBA8FA0EBD1A71067A20F68DA6AAAE849880DD7F88901DF051715E240BF0F5B49EEFE35B9B0ED2B69757111080DCE2E2A933CFBE8FB9E6E9A2C2C75E0A4228D06689796AB919EF80405CBF648137 -Test: DecryptMatch -Plaintext: 5E61EB24085019F4A76893517C0A13 -Ciphertext: B13E45F9288FD2C5C0FEE230D1A09DE376ADADB5A4330F33BEC04C6F14C4A1CF3789B976F402F11611AB8345B2EB1069CFEE1E2F482A02A0ED9A3B9D94EB78C7BD7222ECD48A598E34D1F0B6205331CB20E0B2C6C146FB29CC11BAD5CA06BCA3EE39DD536FF330663A817ADECCC284B92F6AE3EB75B00316992BEF8A955EBB4DDE2CEF504E9298AC243C00FDB64B6AE96FD7B2135E6BCEFA7CBFEE135A650AA3D8CD095D1C9156232DCFE1904BC4CCE58B455CEFDDEC1D201B07ED4F999D6281AE21C2008525DB24BEA2D9FDAC1BFEADC3E6E6B1181F1A55A75976C565BC28F177CF02 -Test: DecryptMatch -Plaintext: 87 -Ciphertext: 174E5CFE167D4F6FB9A8FCC0FBEFC12864745900F5A18EA92282C8B6689EF53BBB87B30FC21DB101D93E9FFCED05538EDAB59F9FA07FB176407651DD0C4CD8269B1DBB70F24C8177EC6E16294CF5E87A3070A077B1CE84B612C3E3B1D4FD60D732C4D2CAEF5AC442A358AD0F323E60F58FC8B29894F3EAD3AE0DB8FD08BEBCCD4220CEE6B7C43A5E769D1F890A6B6505EE7FCDC7E399FE5321C2792D7AE094D13EC493CC0911B3EDBA6DAA037E2EA0CD3642784FFF2CB1BE04E5B12AC9D2871F016D8BCCE6DF25C1C04D912CBE707FD4DB0F9E89C4 -Test: DecryptMatch -Comment: 2048-bit DLIES key -PrivateKey: \ - 308202400201003082021906072a8648ce3804013082020c028201010096411b\ - e93e733637e91b1d74f808f4c9c528293e3123ac1d3d2f94c462ff38d0cd2fde\ - c0eb03bc5e54b6df41e9bbe9127a1b3a7f47cfb513340664829ffae26f832b48\ - e2d660d10e4debc1bfb412f331ab7b2f88c0d31fb587ed5c5256e0ebf7da698a\ - fd3cfa0443af91bab8c539376fcbad72bfa6985b6e64250e6b546b07a4575b08\ - 449d383b5650083c637d2452e7d1b9227adfd328ce473bb4374fa31e0ad52e56\ - 7feff6a9c4842d24d069e7babb35313ad63ca5d33d572bb309689a571e9ffe25\ - 38816bd7bde7bb11c10752e6a842751f594f50cf4b8111f387134e30c6c03ba6\ - 40be7cd5b6574c0d0b571a98fcdc292070595dcf6e8d034cc0ef92e8ef028201\ - 004b208df49f399b1bf48d8eba7c047a64e294149f1891d60e9e97ca62317f9c\ - 686697ef607581de2f2a5b6fa0f4ddf4893d0d9d3fa3e7da899a0332414ffd71\ - 37c195a4716b30688726f5e0dfda097998d5bd97c460698fdac3f6ae292b7075\ - fbed34c57e9e7d0221d7c8dd5c629c9bb7e5d6b95fd34c2db732128735aa3583\ - d22bad84224e9c1dab28041e31be922973e8dc913d6fe99467239dda1ba7d18f\ - 056a972b3ff7fb54e24216926834f3dd5d9a989d6b1e52e99eab95d984b44d2b\ - 8f4fff129c40b5ebdef3dd88e083a97354213a8faca7a867a5c088f9c389a718\ - 63601dd3205f3e6adb2ba60685ab8d4c7e6e1490382caee7b74681a66077c974\ - 77020102041e021c614682228a4bea799d01008a4bca099e7cf7711d7914a81c\ - 39d2407f -PublicKey: \ - 308203263082021906072a8648ce3804013082020c028201010096411be93e73\ - 3637e91b1d74f808f4c9c528293e3123ac1d3d2f94c462ff38d0cd2fdec0eb03\ - bc5e54b6df41e9bbe9127a1b3a7f47cfb513340664829ffae26f832b48e2d660\ - d10e4debc1bfb412f331ab7b2f88c0d31fb587ed5c5256e0ebf7da698afd3cfa\ - 0443af91bab8c539376fcbad72bfa6985b6e64250e6b546b07a4575b08449d38\ - 3b5650083c637d2452e7d1b9227adfd328ce473bb4374fa31e0ad52e567feff6\ - a9c4842d24d069e7babb35313ad63ca5d33d572bb309689a571e9ffe2538816b\ - d7bde7bb11c10752e6a842751f594f50cf4b8111f387134e30c6c03ba640be7c\ - d5b6574c0d0b571a98fcdc292070595dcf6e8d034cc0ef92e8ef028201004b20\ - 8df49f399b1bf48d8eba7c047a64e294149f1891d60e9e97ca62317f9c686697\ - ef607581de2f2a5b6fa0f4ddf4893d0d9d3fa3e7da899a0332414ffd7137c195\ - a4716b30688726f5e0dfda097998d5bd97c460698fdac3f6ae292b7075fbed34\ - c57e9e7d0221d7c8dd5c629c9bb7e5d6b95fd34c2db732128735aa3583d22bad\ - 84224e9c1dab28041e31be922973e8dc913d6fe99467239dda1ba7d18f056a97\ - 2b3ff7fb54e24216926834f3dd5d9a989d6b1e52e99eab95d984b44d2b8f4fff\ - 129c40b5ebdef3dd88e083a97354213a8faca7a867a5c088f9c389a71863601d\ - d3205f3e6adb2ba60685ab8d4c7e6e1490382caee7b74681a66077c974770201\ - 020382010500028201001eb30132e415358b7d3f726b93e2eeb083fe7add7abb\ - 6ca352c9e09b365e5768ce032ee52d59f1c65311045c490c42c36ae08cd0264a\ - 26199aeec8c3a8882a363397b4d7e0b6c4abc407f27847be0e8477993069a1a3\ - a3fe68093e09ce55bbedf97c91e741ad2eceb7a0f4be6ff87f68deb03c5280d4\ - 8fdf4900485bf5ca20257b176f58fcee1f0451b3716862488b0642bcd76654ec\ - 4874512538976967a545cdc208a0050f26e541ca70343f653222e6df7aaa07cb\ - cf354a5ab910eb8447382d7f512c440982ab37a402c87d2888eecb35c636ba6c\ - 84a5cce917f234fc7f8d9167167e30f2840407e13751f1944f6aceae3f5a7025\ - 36723c1d88c8c04981e4 -Test: KeyPairValidAndConsistent -Plaintext: 5EE1 -Ciphertext: 73279829369404A1B68D5E86FF334259936133CB04C9186CFF733972054918C3285EE907C2863DEE872252BF03EC9FB088B8DCE6D69D78C6BCD6B3FF87E683C6CF3CA05FA6AF0C068D964BE01030A3AB4E19575811D141A59CFBC9D3558E48CB771D88CB1E0E6C7ABED041077D24005E337AFCFE8531569FE56E2CE97C40693C071409888AE46DAC8BD739AE0E1C392586917FE07A66F7D3AAF0DDC398117B594481D0D5CD19C8708DAED6338EAA552564C31F9548FFC7E5C641FDA95B252EF637C6CF708979948A3E6B4F37A9ADCD60BDD841F3B0945CFF55E2F13468EC71C550CC2AD48E7E1FB444F132AADB1EF2A7C5A22450D0E0CFE9E37D999B4794B5A594A4EB7ED406DB24ED541E575B9F2756545DDD34F6DB -Test: DecryptMatch -Plaintext: 0252EE2E1C603017 -Ciphertext: 0E742D794904D05C0F0B6F60E9655337F8C110F289C6E4A0D6FBA6A2A8EB0FBB566A7F9B9862175C7A00A8205E8C8012366023FD8DDB6EB713DEF86917233DC5D16C2822707230169C183FD3A714806220D7DBA735C4F747A23E4131CE12C5572BD5E659F967A8B7DAD0EB6138D1BB569C6F04EAD79F9A6301609697F73F6FD8CCE934FAC6FC138B4C552E211FB1CC242805C035815F462D0291537DE10632141ED0A7C22439C7270AF0A6244C073CE9E2654FED918C86697988B0B341C5EAD2CD6DE75EAFDB1DFFCC5FE465E8D8C9A34D5B7F0E9DDE62204FD12EE2F99435DD58F3254268F8E6CFFADEA9205DDFCC943004887C405859866A0A40456A6C50B57FCED319AE0EC92B9069F765013436FC9A0253481CBE12B707A2B20D -Test: DecryptMatch -Plaintext: 01AE -Ciphertext: 6AB2E26D99942CEEE4844632355BB3B7713DF000DA11099D4E1BF9EDD1781A9396032E9D96BA0DF21B309A9CABCE9AE3D022C33A931183DEC5A3721EA5CEB39C18935A43E3B0BC153E4469AEB604D031A0084BE5927478AF8EA652D0A4AF455BDC57EDF26E2C6F9A01C91F29984C11D3C60313A53D8AC65D9FA504742868AD3D313506EB4FDD0E9799B111F3041F4C0547BBB06BF7DB20D18B427BCA1BA5099821A5F0997EF08C319B851F0C88B4814CAC7BAA4290B3182738C37B6ABFC2C4770A633F70E6FA4FA53AB286384FFC2AF9B64DECBE12C8EEB97862F76296D13D889E864418056420DCCD0DF9B76FB32FA6BDEE149585F427F133972DB7281D91D6E78B6BC46151901179D186CAAC784D6271023FD6E84B -Test: DecryptMatch -Plaintext: D52A1E0E3253FE281A9471 -Ciphertext: 63F60818E399024073EAF02A7A419229EA4E2FA4126C910AE7D31DE7EB6C9502752F5B7241F2A133E9D71C1A75E23A6F5DBE36C1B661935B0F20123BF434153B1F81BBDE278611C9FAF9F56BE8C78116823AC5B5F355B88A82AD6A73D2B63BECFC7D3B39DB2A6B393E23826235AB76653EDF65DD7A94BD27E221E9D511041340FE83A27F7B26CCF3FA40B2BD786BB9D67D2BCED415F2F76D116E8F3EDC953B8A327D2846F247D91626F643F8DB800F5E1DF0CDAE2369AA8969A938E0BB5A44F0A9C0BBC7D15A34DAF4713531A7B6B59CCCA2282952B16A7E1A1D1CD47D8B2AC6A88BC6A85E692FED89BB3D1F16AC2A922836152059433A29F786F2386A74DD6F555CC8D06C890A4A93E9FE88CEB078333A631E9E3EED0610F0A17F2A4F8DAF -Test: DecryptMatch -Plaintext: 53 -Ciphertext: 7F820C0C9A5709C6026E58446623B5D4B323BACE54724F456684526BD1966A360944227D04824B3C9BAF19A602EBAD25B8047FB6BF9997EBDE6B854140C032481F1479E4B994FC5A2DE8128375099A7A0024AE1CB985D73BB2B806B20E0751EA154BE2A70ECBCA49335BA57694DF1E0EA4566304B8DF4BBFE5AA41D0B767AE1679BDDE70F95E1C0C7E06F4A635F987E2858407BCA2133C3EC5620D58F1AB7FE1426B615959009A4706797FE4060E1C690DA373E48D6BA684F69E981DEE5DB9A58C504DED4D4CA6CD9B776DA03E55DEBA97E541A300465FFC68C5417A10ACED061023ADE00FEED4099180948F26F10D2F9470978469F67AE1092100C16D8FC4104DD1E711CF67D5842DE4102869E96E817F9C9FF520 -Test: DecryptMatch -Plaintext: CEA6026338 -Ciphertext: 13D877F0F00D01125447982639AC82AACF30FA0573001DD809C72D0F811138088C6D6D0569E63AB001CEB0339BFB90F7B71F339CA2F75859920370C622C0C4930B79B99DAC0560C763A1162AB46F58D1409E25301AE6D70DD4FA64984FE894DAD2B6401F8864580132664DDC2A57D1AF8AAE43C2759780C8587475F21275D61765251DA8FE91921703DC8DD279DFF4260D8AFE69257BB43EC609DA30DC33526D66E46365F399AA04F34FA7BA6469CA964AD6F2299233424E7342F1BF493C0BBB31FA1C713543D758219AB0F73B9C24F4699415F96C32E2A700669FCAE7EA6921F96288723ECEDF9677EF35702C8C0B71AC27A57624A7667580A2FBFF72818B2BCBA3589DCB686486FDDB50E29E75EBC8AD3DEDC8B741AF80F7 -Test: DecryptMatch diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa.txt deleted file mode 100644 index 8f31ee98..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa.txt +++ /dev/null @@ -1,337 +0,0 @@ -AlgorithmType: Signature -Name: DSA(1363) -Source: sent by CygnaCom during Crypto++ 5.0 FIPS 140-2 evaluation -KeyFormat: Component -Modulus: 8fbb9edf2fd2834b1a9fe97c25999fbc381ae165d932aa521592c2cdcb4318bfb99a2408f118ea874b73704e2cc557fc89a01ecfb5bc412951e86613b0b2fad2389e81ef42f79705fcdc87a9b9dcb1afb44c37d971aeffc1c859be367457ea19d71f22bcaa29752f15242f59b295125e9e01ab582887fa869e4b0f4a308167a7 -SubgroupOrder: cd6c675f1d22c771e7f59020ca0e94078950df9b -SubgroupGenerator: 7b473ffda9ed6e10f85177ac05f43ec666dc6d42310151053ae83369de9f9b331232cbc83bef31166e19b111e46e57703fc6666ac9a571ff053e18f3c2fbc4c2f32521750a941981a55379a2fe13bc78c6a3787f44dea397af63a7ce432704657feb57295ab9711ac7070ca5b7344bcaaedfd8bbddecd8de9c67e7cffa2fa20d -PublicElement: 64f31bc4d5b42622b41326361fb0d67f9feb364b34be67f6b2e4dc1f928fc70e6fe42cd9cd6ce3dc40113e7b4742d4af6fbe04d962adc5238d4d95b7bb67f0ec6592e966517d0a34137a45dc82ebe282c904750e1aa31b62c919b250d4d8ef922b0b0574cb2ccf1b451d7facd075e77fa532626602b32fee6fb334e1c2911388 -Test: PublicKeyValid -Message: 699c4211bcba049ac8d73c37fc3d02241f70b8ccbd6a1225d813664bcd043660847dfba3dca434cf5600afb60036171ea402bfdc3279ae2f6b7deb5fd0810a96ca7ff7ff1a36021d84a92b6db7d4b03f80b1d5d2306cf3af4be2c448725fedd09399cd5d4fe8853cabc84895fb91e4400c7591e691bafa5cd0398a3c8d18f8c5 -Signature: c0aa11b2571acf6fb78dd85148d97ae04877ea1a05d27ab73783ba4efa3a4b7f110cc44c7ba2c842 -Test: Verify -Message: f5373216e55156d66524e39dd8a345cc519edd8cee2b7cdb755222d42ef8f843000e8b69cffa4b0c154543c3bf871b804a904b5e1ed8a1ad2a29f63bc28b2ce5b5706c5fb2219e40dd682951ad7fed1709397d9ea36fa18894ad0c57391e5af74db54d8f479d4989f6e40de05b63b4a9c7f0ebe535c87485ea36dcbf4b897890 -Signature: 33e28ca5be57567a880c52451ec72f27d25b6e26c38216900ef17f0c307fd7614b399ff5febfd7e6 -Test: Verify -Message: 92fe48a60045104207970b674f800f67cabbba0dbc8d1d120b64a4ddc9b149800003f9efbd6446825ff84fae21d4ed00e61d1f5b4562b872d53b4788ba2247677091889fd75ddd017f52075b3610e275d025ce4c366c608eb2a64a567a5688287ae2cd3066e72db701dc0ce6a7eb46bf210c9f59aa646e5c3ddd86bc210665ba -Signature: 95616a85b6d9ff3c9af7264cbbf8b9cdb71404eec47fa7c91291fb93ddd8b0327df74cfae6698e0d -Test: Verify -Message: 18b8baa09b84cf8ec77a1d34d68b0971fa71016ad5b71838350ce9d114c8aa34d0bf8fd9a747615876845f58b2fb55bba757fb08f176901838b7b7042f87924fcf2a1c50d1c7cce36ab768514b0f277cd86b0a4fa7fe7c653cd729f803751b0d8f8f1cde121d47871caaf0f598deb70c0447e718f0671576ba04f68488ab80c5 -Signature: 23c6fde5fd9a2478d99c3abaa61363d90b2c161e847be181af07276e376ce4f76db56dfc3a1f2425 -Test: Verify -Message: 598660449d62f60b1e0581b0c493803d3ba5cb49a5c5d5917f2a41d6d1b6a8f69a2ea94e7bb8334fa29a0f5ffa32b1f291313fe9491ce32ac3044e8188848db77afd10f17a0ef84b5b56a1b5076d700df021de7ebaeec51827c0eab042ecccfacf6bace5f35add3820b04e6a443e55c632ecbec05032149182d52e1a57e4fef8 -Signature: 2c07790afcaf89768f1d1492345510d937e65bca5621811e1b705651a861be1f88f52090036cc1ce -Test: Verify -Message: e37395964c3c1f7b37c99c2f56070cf9672de2f7cf63bc6778ae6532e81f09baa23cb7e5c2af1c6ad32e7e5bf4aaf7f42cbbf4a20a4bed578182660d02f22799db04b8b2cfa31f41f727ddebd88326ddc6b361d77860e07cedd6e1d87e28c53244a28f14ad6fa099598cb1f73bec114ceded21ad53fa0d6d7482ccaa951a5b1e -Signature: 58697e6dad83ddfe43817e5534535ecd78a985d3928e271212165dec4e76c8025d531ee84ba8caf3 -Test: Verify -Message: 24976d350993351696b33cf2db5440303d5a722cc2d25eeb9ccf1e20f57ec060fa8bf4a22ab9fafbe0bdcb971f5b86fb9ec41e79142e42f4c6b58dd54e71ef4eadd95cce9458b3c5ef2df19ab38896e9e9e35801fb9e079e3fdec0e3c1a7559b5638fdb1dea738edd9bd06f12d144873366f76bc0f5a83621f030d42e857cac0 -Signature: 7488f2ca5fe2bec2c7a83e73407411c9e89bf8cd594d4a03a736423ebd913c2b98a21e445bdf70f6 -Test: NotVerify -Message: 430cde2feba0256295b6366211252174a29c9bd2b8e6db8fe97fb9ce35580a247be8364a37741b077e9f275d3b34b1f2ab3397c2171b1e04d177065972aced3c5201e6a648ef5900a3ab1e4f69f2d59bcf1488a0f84485b8f21e7508ef7ac1eac070269b97ac9726fef3539012f647450557a6c2d4fac685448d3e32235a3e06 -Signature: 7500d2fe4b2943b4da93490d3bac5c344bb18eb550975ead0e461ec33485e11714b4ceab478644b0 -Test: Verify -Message: 81bd412f4f9c8f8b7885d9fec9b013be8246d4284121dc9c2fbfe59a6987af1db141463855cf96ef6031325800b961f2378a6a46c65722bc565ab3c0e993ae15814354790fa8217a9efa9a98c0a6599c39c95638ebf077e0010f5be860bf63df4abc032a559e47e58bd8a9f6e3ee1173e0fb2d378762f4bf87d4764aa483e631 -Signature: 37cb9d9adb92a7e74365f9e4c4857a88a6fabd200d955dc76333b0ea9c1b2f05fee9117c79b10d09 -Test: Verify -Message: 84652beae6fec221ab800bf6303f17a47a84278a1274a2b11f40569bc58ff34ebe28c5a138e4b1c7eed4731989ae1728397db5038f8970c59e84b16353f8a1b411ede5c290de9e50f7de9fab3807f1b6ad238530f09e384900ac0c6591b6a530b30b03e2a8c47ed4fff80744f5219e650cce0eaaed8bf0547b0edf3a39a3f8d9 -Signature: 194a79f399087d977a29a3eab308670b7b133acf4e8b43068639e0e5e37d7ed305e32b85e30a0a22 -Test: Verify -Message: 9cdf6e966c37794c7b3dd6234e76d715099128caff3d03917a4a96a2c703b19386cab41830f5b8ffe9e9fd6b88759450e4714d2f6298e413bca267cc13a5ea6c38ae6fff379b0f8e253b6e562ca95f45d4e6d3b694b6076e99bdeed7d5d9dc7b4bc275c49ae0d5f2c86c015d51cb8eed702790d7ad50c59aa8d203392456dfba -Signature: 7b427233d9e49dbfd8ff2a7814dd99cbd4533d67155696b215d593d5ac3989c8927850601c0d453d -Test: Verify -Message: df577c9f2370b362f86a928e40106d7b0a511d5d8ec619776b82d57e1f195b4bc7f328c619d2490e9fa2b6ed3681ef7cc60fd51343f7cb74e5be0d37a3cb5078f6b89bc0ccd86532ca09f0f7c6bbe5eb85413088b1571e131ef5b6063e5355bfe23d8d6733993f24f036f682ead7871fbd7fe796d0ff4dae90be88c4e8c9a276 -Signature: 39a7efc692685eed0c3cea8838c026b39367c6f446a16258906787af9447329ab99e821eba53cb89 -Test: Verify -Message: 91042eb63d47c10f678bec836f98630e13e707b29c98b28d47b1443cf699e97018d4aecfd500440e7f11134c35c982b1d97b86473500691869fadc89974840f7d2ca319045565573a0fb630bc87576a8bff09460d1027a2500e3ab28b2eeb86d995dd1afe3418c76a4c0f5778094d72c9dc04ab4c8947eede6e3c6cf9d83e80c -Signature: a813d89e3de90f1ce1b77a7d6c629e8f83296aefb8bfe1194f914797d08b53fb59cb9186935dc10e -Test: Verify -Message: e644b9a45009da8248611de174b5613dfb4aafc0a772740c38f1ff480bb23e69ecabb5c2380dbfcf37b1093eb8bf4c3feea04a0d8b270cbd1bfb5a46a2487bd279a62e446649e80afb6b502431f6f97544765f4ad13f24282edb8bdb0ab635bc460d1c421314cdcc4c66eaad16b3e078b6a4e48eb21234e62b688c1d7a56e6be -Signature: 4e4fbbd84fc44f0ecd6c163fa292cd96051ca51764fb5626f8ecbd8470faf6ae5d79c731d9a3497e -Test: NotVerify -Message: d30ac577ac767ce6eee34ccfe09f0278f2faf8d28f657cb424ca7f53712b7f040f7eb63643c784ab02771af64405693a8eca4a21ba22ee1b09c189d96c533a0910583e53283e5693ffc076593d7eaf9e79de5ec9002296e2e4cacc15492cc26beb52b5c4f414ca17fd77b6ee6245ad1ccbec8ec2f89c4c81cc9ca0019deeeda3 -Signature: 4ee3704d4bff39aff0efded0930cf28ff7641f089280f1d0e38a186075e91d73a5b1e7d028340fe5 -Test: Verify -Message: 82bb8073af3e53b8ae158f342c4cae3c039dc830703bf0e893dacf5d280284948596bbd0d3a00cf8915f96464693dc328507df9e27607d43c426095b74102c90c494fc24fbaf5a628ef29146e1ce2c684020182f1e00fb338cc6d4f2fd5ed3b739ce7bc89e05f6cf9fe6b88b769558b72c01ab3accb22291e3d5667a3c8532e3 -Signature: 0b0b366b23090265e75752fdcde1a7d76113653246e0da762e25012cceb13859313e469f4dc31680 -Test: Verify -Message: 12da3a70153655976cba8144f67dc21719410fd136aa69ab4cc11df9eaa955005ba0e5140d3955f643d82a6cfc6e7a222376afc1f8309b4dbe1dbdc4a6bcd2f5fc839f9e9020fec967f12768a3c14130b0c529b3b0d682c129f1fd00eeeceac94b7a0046746269ca30fc1171c2ed30f9182416df371436bde63376e49ab2b635 -Signature: b43f325f82eb07dd2cb3a03a022e8c89216e820da743c216ec6eec5bf445f12b2d326d52e38b90ab -Test: Verify -Message: 45a2799fb193f3adbef66b8035318c5f7eb3610dfc64dbd1a84b87c0f082884ed257db1435c4cce38711b30b9dc8f4e5c7d936a7330ee36984b2e172b37d8ec925c401f80ede802305d93d4ae85e56dbf3e20c7b1c0f4216b17238253465893f773f63e3f4bb07846fa781d6cfcea858382658226e3eeff166e306702e1271c9 -Signature: 238f01011e1b3e7d027af353e06e2138f5a40ffd3d7a78d55c95ea3b94ad82b8ed58c308f7db5ef3 -Test: Verify -Message: 6cff32791fa0d15947fdedf67508fee334d1739512e15ce3ecdb5ac17f56c43e2cf51bbb0bc8b06d34e894164a4dc0ff48f3863a902d3716314916e278667de7bb914ea061279d3c36679b57ee56c6f4f7d84fbe830bcb80d6e71ee2cd15a565b00ca3a13972eebfe4b2da3279d966bad8b7a69a0533701873ed4a36951b94b0 -Signature: c9194d5ca3dbb424faae51f66377836a93bc55ab1d481e5eb9663c7033329d82c13af868f4a24efd -Test: Verify -Message: 37a363f2ebaa01fd1ed7902a4804c8fa46845b63d82b947e59a23073c0e97da2d72db113bbcc8d2095a6336197a744d83a923d5eb610134dc1f80d6f8de1e327fce615de26b88db10dea78599f79615aed9b906fabcaa236e8106a180e94077b1c65462c23863a07003b19e858935ad7d9360d6fae717a8f4480fd443c1a21f7 -Signature: 9ca210249d306006ecffd384f87c4dfcb1d466e005d877c2508475bf0074c4c6fffad6e123bd5dab -Test: Verify -Message: d3b14dfc79ab30cae8e40dcda6bafd6434741e6ab1b9e0d2cd4e8d80f10f176aac3126ef61b662772f31fe4d21bc85b99737e961f5c2c9e28a7d02aac27f7a19901529d8163c687997617e509f576890719ae9aab1c3d3e3524b9434c384036655d56d6ef035db06f7eaa68e78843e22981437fc3eb2950bff2e59d54a154b8a -Signature: 30cffe077d2330f111eaff346634237473feb83cc522a5d20c75db7b4c90c4e21583e1cec8e00f29 -Test: NotVerify -Message: 69d5980a58474652bf27388ea6041f9e0fe688ea95f59fa745682c69bcb1c7ea82e75f19a773eb669cff6e4d549b31219b323c1bb62d16a33c65bfdd344feb77706280b229cc51afdc571dfc6495c35f5953c8e1a83d0b1e73cec7cd2b7bca8beb20f4ec18abf2c437073cb20f4b4def00232255a27ff6b3a17b3b50d88fdcbd -Signature: 18eeda64cc75f18f58d43ce6b95eb3918a521bfb40c1745a38f985d294caf2d86879528678881191 -Test: NotVerify -Message: e0ac66b23eabe745886613c4698c79478f484a43f8dc444e7e7ee215a673c29ba56a56b4b41bcfc1962046ad66132d28a6eaf623858f028c71c3cc4bdd34567d54ddd4f0bf9f97dff31e3def7edd1769b39cdbbaf3f28b283e27a5d7fb548cfc04be365ff66f1717b7164e8148210f83cd1951ffda3db89a0062c5af980a3c8e -Signature: 6db33727b795d286a69ddebadd6e09c527bcb1ee596915b6fc950549beed350fda40a4c1f52c6a34 -Test: Verify -Message: f9cec4d6e1f2c2285dfb17d3ec5d16edec0da9b05ad12d62cbcd8f84ab4ba73eb6cad40ab44ad9a079d7f8221c544d89778a6d50df713f5f25bd1a3acdac1f6a8d0fd92c0a971459ce62fb958dc675bc995dc189a3515088b3e9e33f6b54e59978b60b9359712a2954b55883b54b475c4a9ddeb31c0a19b66f6922ebfcdbb0a1 -Signature: 947428406add226d1dd8db3245d00617b152921404ee5ab8d4e840c87d26073cc4d144a0b51e19a5 -Test: Verify -Message: 966d6fa1ea1ae8d344037a48420d6379278133fbc0c25450974fd9105bf988398f652ad373c511c830d2eb02470dc7c63b3865507d0fc3b0994ce4e4a0dae337d55839d99bd14bbf9eba37be412de0e348653815c77acdee4b5d97d646170062c03e35ec3cb8ac73e8b3f6b40ae5c78aa7014383757a8bc4037c881f2727f772 -Signature: 63137ff0730f28235e87cd5122d22a973035869332ec538d5be6e2c9c0db94f3c012ae4abf3af9fd -Test: Verify -Message: 43a8f0b5992db54d1d65acbf72780493d1af881fe95f9f14f61b834f201ac1df16e5f252eb46b845306efc2b5365655d38b71c63155dbf8193e9a48623f64fd19ecf36a4205fb4ad26594bd2e6a81e3cee19aea80147d4ea2fc700c23395b0e411bf3342f050a09c357f114be21925492e2cb58564f5d666010c0f9e09cedc31 -Signature: 1bf8e80c8183d00907ce80e74989d84815db85dd1654a6d49f74c020a83e8bc931a178ce18056f57 -Test: Verify -Message: c4aaf1632b1438752e9790c89cff4773932d3fab0ef710bcaf41794bcf5c0ccac49e1a3c7143dd2b1484e4e74cf6c4006925fd06f9702a8090276e2ad7e41b74d727a3378835c4ba9533efe5727efac4a14d073f4089b418d7ec8526605a8ed0987c65cc85a3471948dc893b254f41b7d0dd36cefafa057d1cc796b58374bfd7 -Signature: 5fa8964b471c76211e2743c4d993e793dfa7239dc84a19bb3fdad2162a8c98a2434c94213f3a163d -Test: Verify -Message: 739d44364282b7bc61c62188d07e0ef12b907960a740f1764ff8ed7981586c04a47ed0ef2b97fc7dcfa6adc508941762cd79c05f8d2aa15d6e037a06c5f676b7d6d40069cddbe4e0fc81aa18578030ed2d22860929cf0f1389d4d5159d762c2f82378b7a2067a73f62efd159b55a91e8c3248438714773f01704b57fffefc7c3 -Signature: 1b61d79c6b33e3c3394fff6efd641405652033690d7219da8475faaabce3e395bc720d70c60e12f0 -Test: Verify -Message: fc205229f11c877b617739d9ac191773c207ac714c5e2a061a917ad2cde4827ec628b5924eb8e19a06b4357a927d920e8171130580e8dfffc06f2ee5a4449a89af12a87faeed963b2291676cf0d72d984c7997f8e207ba96472924a5a0161f21915542a769b33e978b85e7681f20814bfb964d03ccb25404893674cb1954a87d -Signature: 283d55c038d4270e71ae39db618390f17675478b704764d1fe352550054076f4461eb6da6174dd17 -Test: Verify -Message: c343029ce5d70a70251b50cc5e784126dd65e35080940f450d5cf435d567c9ce8a9dd2cd5d5096c55ba95f2f0952f2b33f6490b642942d24259aef7f62e2ea29b4771bee372ca2d5c30c4428850421c1e0cfb2978323068acb1a3d6b5be34550f9a9d416acc3a637141ef8ce09e845e7787f400d7a99120eb5b4d611f8c051db -Signature: 0cdabb09213e0f09cf01e0329bba5661753950fc92e681173a6eb46c02d00224b50ebca62a248faa -Test: Verify -Message: 5e126ef683f3b61a39065574bece4ad82dbf4d34495f40cb899dd2b163717588ddb683795244ac758252a3adde0a0950126e9984d26a96a7e93b72c780ffbf60ac9d5b553cd8d831c1af2a9edef79426d13cd42942d48e204c45f611cadac252e3804f81d8e612c40dd5423e56cdc3d285e1561b31d400acc875b885d73854d5 -Signature: 01dde9613b9ce3c29b3503c19c13f863f27ab71bc0844476b3860ac891f9ce374aea6c24f517b8ab -Test: Verify -Message: f799a6b5a7bf7c32847fc243cbe0166f5244a377c43682c41b75530e6342174fade751e751885d10692e10858b11926ec626788fdfe925b2cd6d625272a13c899ce41e3c3ccc2f84e533ef6088840d9a6e448bf777e415a291c59ddb7b8d3cdcbca9450bde23ab67f0a6952c3bcf3fc944b6140502bc0a6d60983d00f69dcf1e -Signature: 0fc64023e095044c9d2d003a555e2da7aa5daf413896cd4e7ac774ecbaa0e4ece8e8ccfa053ab62e -Test: Verify -Message: ae0424ff8fb19e8842828a3cd51c93e1123e0c4ce9f9fbbc1b326979295be9ad7c6e6783d62b337ef8924e1b95a3f4aa77546a6af0d409e483ff8b89d422958fcdf0860912c47f45a819b36be047f0538a806ea6580bd83990bf99a6f6c2682cf98316c91df69796a80f50639082a093a5b9b139fb1580739a692b0769b47b3d -Signature: 6fbe751842e02a3fc3726a5d8298d1a7adb799a02d897597f4c459d28e9e25cf447b8cdf50001d21 -Test: Verify -Message: fc5837b228cd6c963b52cabd227cf61b5a1e6ccb4baff71ae4f971da7904bce5d94201efb3fc28912bfc9894b87c307a414f8653784e5fbe76056e3d989f51bf990fca68f0813aa36c00646a0e685fd5278fdce1b2af9a83f41726ed5212d82072180bb396339ce235b5a5dadb187b434335e50fb2aa9f829685108260354721 -Signature: 5bb80b35dad17648220dbe980a660effaddd7c43ad3584318e835c355dd7bf2f5510091389c42914 -Test: Verify -Message: 689eec3b665d72447abe64d4ddd79b7b73cd171bd22fa8689395e0a3d9793997205583d449fe912be240246ababb1859a5fdcdf48ce1d9ebb928ec58615503c073ced04ca0306948abf231ddf33e040b3e0ca7eac8816e218b872fa7d1ad67b9f841ab1c85ab52956d0c61a69f18b78ad5317a739dc6c102a2ea82084038bf7c -Signature: 3cb07367288036891a8861931e5b2104734a6e7e70ffaa32a49032b968805dd0bfc9f1989da22b12 -Test: Verify -Message: bc4828ec0810c7a43cbf028dced7a5890803681f86238a28f296aebeffc7f561a4fa5d6c9a595ab7193ab38eceb39fd220601f6ea5739efddffec8b93b7da7a74ba705014376fde4b375e33a844a57ea3583a43f56a55f9745723c4d287b34e82be7d584fb82e98183094b6be6b4052abd05ae6b92d0034d9d8cc550bdd8d27b -Signature: 67b214ed56ba44ced95d3d9e8c25c99331e3e973a3099e524473ccc8d4256f4ff7de9674a369cb57 -Test: Verify -PublicElement: 19b80e6f0132bd24dc0f26acc6a30445c4deb4fe7394440ce1ea0039d9c8137ec962e54b09d4383989baa288129e551e027477965ba1dbca0b6d586e482325f09a0fb16236d7b4ac3a3bb822a7a329aefeb91936f4b8cae38fd1e369db4f3f97421277533724d27e39248de3618a662c4b757cbbea2e3d805116d3e9d0ab3547 -Test: PublicKeyValid -Message: ceba9387e7ba8d55f8010aa2e8ed7de2c8310df67951e1c49c5fad18baf47dbbb571c2d26f779a79b8a564a07d9184252f097432728b0cda080212effcc3052612c8266e6f2bc88e85e6dafd42cab20679bd1b1d9038a27b6b001e0199237e4cbe37d81441ceaeca363d82728d8f9ebe7dc41d6c2b4f3ee19fcfea07e90c8364 -Signature: 84d8e940de14bfb65b8c0e0999e296a1d3c51f18b8bd79c57d826d9d200a6e38e52490722c6ee201 -Test: Verify -Message: 7b9058ef673b23e5b6a3d97784b898e0d912c990449be876b77b768da6443ba95b5fc1849db70e0482a4a1cf901aaf111b129e8dda38c3e2ccd758204a03c18b6d0500aea30b76a48c11dca21b0a82c9ea54c62bdd5bd71bfb8bacba897c3fbf68590f86b191d55c8ec285095ce2899fffb03983845a9eb9fe6f68749a082ddd -Signature: 7d07f3033c1c841466eeb641ad899ee247757ca067ab38f6f698ad0cce5f26517da7bc51b8e630fa -Test: Verify -Message: 2404a0e4c5ff8fa11c40f9932c8bfd3bac118eee53085c8e658cff857eb56b029ffa907876c65054f258a7fd07e01512bfd850df82a02820a65dbafb3a13d9380f01b9c3093ddd64a49044bcc994cf84d30cf602dd84accc4f2a8fc1a8eb55458ed173bc139c0f494aa028c80ade040a0166da50fdecc00a77aad8d16175b7a2 -Signature: 793e491940787f4e76495575616901c1c77d023342569cb8bc96efcfbc9746b3f51c31e29b221b02 -Test: Verify -Message: 5c311c167d2e3ebc19fbf7ab1c619d8ac1611152527a953d2137eaecc6fdaed79c13f4fa76f224bea7cf162531676a3a4c0a2ab81beba3f9aaa681222b122a8d724a5c77aef60aeb69df73eec3b384eceb157063dee88dce64dd72d4473b4fb2d6ee8de59bd3a61d5843465e48dea37894991aaa130a0b9246f3f659940ed61c -Signature: 7f76e9d084a9afd5c390271261b316cbd1095e710d1b7e4503188c99b8a8d851b130ad240e31f0c3 -Test: NotVerify -Message: 9dc221be2ab612b2ce6c7fc8b739af7fe740e9601f3201d3094a2444a488e076f52c7727ec7665e5949d2f307f0e6ed171e71c7a4cb21f9f3c661494239b5de7470e6d003a5553f80ae385b6aa3fef50a0803ca1f10d64264a93761e6f47a8e2e95e9c82ecc9f5a186361a930e434ab5cc05e10ce5b9e9218bc9e41b6203d81e -Signature: 332a2daa48681410763f13c3b127516c861bf1f187504d8b3bb1bd11ecbf9a9821f18466c10f1859 -Test: Verify -Message: e4354b9c9bd98d62fe629486b6856c96f34d2fa2460200c5c25746f454d32a065f8153049bdbe1b32ff4a8600de6aeeb8f7be7174f1f2f114c06893e3a9997492927596d5bc92a005f96f8417209c36316af59d9f41450e4eff0445b8a8e52ba7d7ed56e927b6060c59ffcc09bc5a313c33ffc80ecba5957e56deee2fc895471 -Signature: 65c2fd8a2635d6942b4b833682b29637eff64d80ac5ba18491bdc26d1c34d70a2c4b680900347d1d -Test: Verify -Message: a090ca3eecf8677a7699f42b16428445a3cbe74981efd6436d66620185469e959b9c8c0dbb464672fa136dff821ed7a2db6874b97bb5810691a9f1f30f22180df6d89abae633943ee56c08ee6fe88eb3bfd139c25df7c899e8e60e3d2647a3b3497cccbd8477a9d7cfdb9d71f657036ee83f0fdc3e6b01f60a559157e36e9781 -Signature: 19b4876e4043fe5f5a58e70b1560b0942ff4fdba842266a6653a6aa1550b91f4ba85a3b676a3659b -Test: Verify -Message: 8e2ecbfb35ae99dd004f2305cb2fe98c81edcccc13372e86b98f4e526d5dde4da43ae6fd4f7cdd8812fd0516c43107832767cf49e95faaaddb0e9f2a70ad0b1b790880ac1f05df022172b3a94f14d13f47ee2e5f70cf01d0341f19ef82ea805a832e51de9b61d7a3a346e89665f280175919a0e59f9e69463d5b757a9a2d7662 -Signature: 6d67367aa1caef2722c125a30e9e08ef7dad05a015893ec3c395c35d81944fe2db2a660e4e60913e -Test: Verify -Message: 6d3ba912c4bc10feb611e15965fe814bb2d5e5de67705a1ca46e8e6a8cb2e3243018f57abb7a698bdfe3f9c08012bd6aa033bc9f8bd9b351433f24b12ec0a3c3fe945c42e1cce9b6eb9153d4c099661686ea3a9b0ad3ff4131280800a2bd1b8ab125f7218fac27b8b092064d7d8a13863c73788a3c56d52344a051113ea1e3b1 -Signature: c56d1aa9f30790bec01fc07e5816fc6f44ab659898a959ecb061b4347e7f2be6f2df97ba33043a00 -Test: Verify -Message: cf2010dec81c60bbe408df2bf20f465d259a5a8d2f7920ce9c566318705c69950423f1281edf713f50ca8eda93cedbdc2378d6929d192081573efd7500520cc6799247edf3323e4849cd902aa013aa273daec49ea6741887fcd4657e987aa511e5450a467e6c3f7088ebdc3451342ad729141aca81e3807843f0944e712bab0c -Signature: a6640671721cb21d86265e30cabbc09ba20cf6081b4a5c7928ab3a53d4e291bf6049e8bf8418f6d6 -Test: Verify -Message: 4b00e4324ff7fbeb0fc48a6c83de82d52da1bcd1eb6669cffbe2bd824fc1d7971383f4b67d96d5bcd4b56e36c480d021e05d58e0788e197f9e93882773c267e1b725f38f919451289b143633316ed687fb131041b930d7064e0de47a10ac9a014f9e39b5232847a87b973c5b63e16d7f957d3aea43847cdd24092975bdb5496f -Signature: ab2f5b0d5237ec1b7e6297700a7c06647a526cb069c8162c513100008fe0dc37d4a8c9639ac94cb0 -Test: Verify -Message: 20f18b1eb4ccf98fa68c10d680f1536bd5c7c3307cb13ede0e3717afa213f74dc8b8f4fbc324ef020ce7335e03744baaf8a824495a9964d63ea00ace13a9467ca4ba9b264fc2337684a4822b81841f004c51dfdcf193333cfd77c4de3a184db0ad10b8f8ce3f7cc407da369470b88647c8d92d43b73864e942d37f388ff7c3c0 -Signature: ae23d943a56fc60ef381a2a5c056d24e472e9e906e4af1bcc91a27800b99b7cbbae8d4fc303ada82 -Test: Verify -Message: c9db3284c5b9a283f38da98655485939d5662045b325ccae3207df72838a1660f22634364f8814fe9f0eeeaa0483e9efea1ce25f74b37bca264268d6d3a3f6dcc986dc063cb347a7f08220db2b97a060dae317b302d8f86e6aec29e287518af0a8f2c32d62b153363ee0d650a2fe9744fdb3567a370e5a5458fdbbce770de953 -Signature: 06bd46f7ec091697c86e82497dc184139a988e3b9adee67ce3d87d739871fb1cdcef9dc6de421615 -Test: Verify -Message: e2e5fc81619b215141e12ea9544184e5ebabcb3834e96dbad2464fb5be7bd22c5dda0aade2be3d59e732a03147e04da33f3c8854c4f23330278e8fb0e76b356bd7de54e071a22c827987cb05d65708e8ac09bd43be2948d304874443881f84bd874852b1c421e6e52f3929bdb77eabcd6c68e29dda66a4bba189e807596fb93b -Signature: c86708f91828158b1c129e48ccc6adfdccf4997e8eb2214c24fd4bf4edd8ac1f3411d77ec65321c2 -Test: Verify -Message: b9a5127b9995a063f3422d3069a4b22ff9b7816e01ceeb3f933733f1fc11b3ca8f694d49b79c159a3ce93c59d555408befc452dabd54071181fd43d8196863b1cc0caa32568fee84335c841c298068b919cbb19e06233412662b7815a916da6408c501af8f2885196ed3dbf17cdf84af0c047632f5f4ca39dcfaa81fc5d370db -Signature: 0461b5dfdcfa1f9be6e7528478e2785903f0b8990f2354209554aeedd246d231567b06c5f81e0842 -Test: Verify -Message: 38da1e2a517a87304f85291a67e7a7ea0e637e797fa1a122707b58ac10845b7d44da2afe232eaf49b011171ad781edf4aab47992dc2358927eda5d5df9ffa75a4da2035389c484278aaa60b1f7630ef97d979e9a48935873c2929892904ee95dc9c7610279533c2256e7bcb9c1a4405100a5a367ba08d81db43bc322cb885adf -Signature: 3e7f697603dd770218ff55f027a8fc980763b6b9bbe84a766e0e55fc7c23e4f734d28f67fd73e14c -Test: Verify -Message: e431f4fc91ec6111098c5de4532c76bdd3ab9a42e92c6c10e7ccc69539a38f31cffdbe8dcedaaf3b78a3a68f592fa1bcb4f663332d94bd38b8811fc7c10f60a69da5cacb303a6af0e0159675bac3bf76e459782d43ebc7896c4dac0fd009f0f224a0306e0f06296a1858454ecee06722394bf4e88129223adda68528bf87d74c -Signature: 2b2111694dd96095c76bd18fbce8f720ddcffe6c8d9c194e880b0abfa44bcaee6b97addc84c519de -Test: NotVerify -Message: 2f3e3407e1c3e585d3f87ecdf8ee45321c8d46ed84410565c7e282c1ece573acc5c2bd688ba53416bb5894433070bfb782b7397b9edae229a653f2780b993a07e887996aa20bbd73be101bc203ad318fd18efbb7c0a3b4057c08cfc3e03535825167c0255d4ef73495f80c60a8fd1352c1ec85b822f6f59201da10baa310dbb2 -Signature: 88ed45212439c0cb86f513026b72002cdae6317544b95fcf4dd1eeaf460edb6f5891080272a3b31c -Test: Verify -Message: b3b7c629f3f5e85b35f7b95d9757a8dd980a2acc68fd9f1b74ee82af328cd5a62ad2ccce45a1b8625a9c3706f6499a066c6597cb1e88309f0afae3a298d4130ca25bb6a5c5994181e73dd00109b59a074e8a95794cfb65f993dd8be27cb2cb863409dea709155933f391dd4466d38058562f7ccd8c8f17a02850d267775fd58c -Signature: b2101fe80d5d71592eae972be0cb7f67e0fc2950bf60fb12b91a1a63d9f4747c1d92d2712cc33300 -Test: Verify -Message: cbf84e9aefa950d9c997dcb571a50e25c09c7ba40e730a1c28e112109621b4090b057b442c3e339a86ea07afc95fde5f4a37f765b99cc34e1fd5039d1b1122405d74d5336360f17273058c25da2b5807633f3c181a9d3483421d6ad294e09550bb5c93bf0ca6423b8affa46e1aa232f603cd8113a90e13958ad080057925c612 -Signature: bb80dfc840147d79654ed993f5266da74985e2225e7f5d61266fb1caa2deb06fa3bebd930122cfe4 -Test: Verify -Message: 3f1ba8edcc9ff1dfe2c25c860202f927af2188fe5bde071b8fef797c5f42f96c0d75001bfc94f37ed912f06a040adaec45b6a3ebac30d901c96974960d67de3f80c34456a5621cdaab73f788d5a9893b2bbaf68162185f7f09efad07f6609df7f0fb0cd59e8284a8b0dd08194c591dcbbb2519f7540fb04ca97bbc06f1a44d4d -Signature: 06c8b4f82b1e5429a07857ad5a1753f1d7cb43b345bd935a1f203ca2e69fcbd2321b295b1ed3c2a2 -Test: Verify -Message: d0b56cf1a2bf4845544090bc5440efaf864b8ba6205a03e5cbffac3af8d50d067f28988a7fe0ab7472b3c7aa8f8b0f5664350432b44c80168f65f0bfb07cd6e11b9f7e70f7d9ff2ca961766b33047f2bcbd0f458bf02e95a8932e8e22ebd69f6dc73953bc3823d8333a21597f8833546f374d1aefa5438c9f1be0b3c2970c05d -Signature: 035b9d105cbcce5d24fc186ff52ca07663ca774e057e6de4f5cba8df8b24cbd361df4878c6ebd3c8 -Test: Verify -Message: 82f8b357919acf5ac548e01bbe97782acc131a157d1b616364ff6dd32c5993d1dea9453a6f343e518e1ef301abc636554b632d368cdc7363f3ec8cb67e768e95e6260eb7354a491989ef9440274005b0c31b63ac0ef54c3081efa52d6939470433a8e745fa9346a94ff39b4e47ba3d31cb7495f11c1c44c2a54190b0055a1416 -Signature: a4e3cd2cbd2151d2033d0a56fa7d388af1e050efbc23bdd5fd17061234244d0a9511b84525e719bc -Test: Verify -Message: 5e5dc7a9fad7608fa377eee0d126a5377bfc0b9c11cd19b3b7f88f25c36c984f78fb9f2a05e3707bb99a933b88dae649c4ed794e143aaff1b911923d02b3764f0da5d244bf375b61064f62854e7b6fcc42371f85c57b3b562f891aaeccf5396c93f518cd23ea579b032f12941b2279186e71b4181aa7f63b91f7df51194718fd -Signature: a96a7dffb16216ec93857df38b10fc73c4792e61055a3d5c2aea3e5193113b7d0bfd81f6c3b0d01c -Test: NotVerify -Message: 9f8215298027d29e4128e75b86e6343bdebfd7f0f60bf417ff57c49a5ce1e14b9154d0be68c5cf6765ede1f56ca818eeb1af228be19217d68ef98202e01cad0b7a7f328eabf3bfebd6ca2999245ab4c968b4a13e52a6f96cd8ef99d0e1c17f8f347d5352a1aa39616e36d6fe04f1a104db476cc0a33e3210b4b022bab7c9ed0f -Signature: 7956b42cf6762bfa1d84425dbde83554a598caeb6e3298db6c225befa59a9840faab00f16b662ca5 -Test: Verify -Message: c196e14d01a2abd6dc046801d766e076cae2539afa2ab5597af92c35c4bbcd8f9378923503069f2dec6fb6c17ba1f7cc1355dd4363417607c881e2e9e5430ffe80b2b326a0258ad7e589d22f270c043a530cd480823f6bd35a23e357aaa804d2411c3d360f58e66c7f29b56314017e5942df2f698f7c0b56eab727964b4222a2 -Signature: caee28fd1cc548ceeb7141e3255c6043751425f2c344e1ddfe08ee2d42ae77391ed03f9baa195aef -Test: Verify -Message: 7d8df5288388272a7473d757c078a6de15994fe827c215d0bf2f6aa50701e1e2141c566cb5445bcd7b78e6b0098d399c9d0f12f5df541530eae276569803ebbc13a7d101997a9d488f4686b7c98b7130185c1c4f157c8fa42ebac032ee8a852891e5c0dec862c513c9950f659aa824129f39c5ee63735ba4a36f9e31a1cd889d -Signature: 75bb8dd4118b861c56c6a56bf00f194b9296bb677ea7ca4f5cda2855253f880473d5aaa8196c39b3 -Test: Verify -Message: fca73579a6d91eabb3401ed9b9145c2bc94a7066a85eba514a62046a95485bca536c2a5678659828970d253c9fce805fda30ab5527a0514a7783677b867b0325dbf979ae0303bc120947f3913a615a9717695ceb9ac1ef1cae1d2f29e9d33e6f8c655bd8bd4c41420307c22e0365a4aa790fbc80795849a0e84993cb36e8c482 -Signature: bb488822df803c1b8b424169ebc82e4638af6d567a7d2adfeaff0861631adc4c602a95a7ea8a0c00 -Test: Verify -Message: 2e5dd807911f65df6c7b71c9727137156df8fe02af3c1e19bb1d51cb35e43d4e07483eb5d5a1784ea46b1d41c6fefc66088c4b661f5bb5165044a710606dd893bb43179de8ba59472cc902617d20744eab2cd621ca4e26f8e2578299da47b24ca247faf8a0e41f815e8eb8617150b785acd1376a868c8878c94c799e7debe530 -Signature: 02bd342623b4f7cadbd88af72c8ccfb29f85042d4d2d6853d6a7769f2ed879fbed85cc6c7440fcd3 -Test: Verify -Message: fd149580b4d7b1e3799006d6c37974de79658e074d2d1cf4585ed124f7204986e569464099642cbde21cbaf5c16d0a01872dccde2f96bf81fef7711c599b37b0e6fa6fd3e71ff5c4d359e4ac36258e37cb5bbe53d7992d48c8ed42f90fc60e793a1d88d156e00510849ffb94da79f7987d49dcfffc0e5d60ef98bd52d07ac6f9 -Signature: 52c97e4fd456b9a2141afde95fc0ebf4ee2a509f274e31f5a6ee2730194eb09532d7c12583b2413f -Test: Verify -Message: d1197e08ba9f4654452e42783e664e3c7ad5cd9de2565149c0aa8d5a49547d576cb9d369da79a5da560856d33e91c2565b0cae7ae59e6ee7da31d891815469b93954b621879c168e5f4a8e84b313fd3d3a5989eb828b493039bc33dab88749e3d12200a9dac0f16afa2dc303b3a557e9b0f53668d1d5381b748477ad07a573ce -Signature: 41b31f1faac06a781ce424ab9ec6cff44f1e015bc7237a3019af5d73774a0b60345b6ed2293b7fa3 -Test: Verify -Message: 78cb9e8764eae88cc7bcfecb525617286955348da2e9c0958124677a7285334108c0ee2475d0b3404940d6806fb5f7c965c06166bbe3a9b7cfe18316c74be80acf4766af95a4c765011ce6b839e8cd90d58a139a60d675f60f42b421c570ae2647fac001bb7d5b5367e8e44da806d2d6324a03ff87db5ea9b9e0af75630dbfed -Signature: 62a367ef341b27a22c1ecb52dcfc34180902479129796872ce1b0cdbb678fcb0df10b1f37da5ac9f -Test: Verify -Message: f0e673b363e13da716f3288bf4b4993d6ff109e72a28529ce9453a2eb69b3d5256249ff7ebfdb3e3ea1d659040550e46c08d7979d03d3165552a0ee8db63ffa0097b19454508e148a35cd6ad14834226cc7d4371f3bc14f391e1a196b3b44be0e361f854c7fa5f0d18299399c635cd1469387e86eb9f947e74e20dee9785ba4a -Signature: bd8054b1502e66908555110fc569ac6ddccdea0285a04c81b9ed46ff160a26eedfeb4a8255147239 -Test: NotVerify -Message: dcbaca556bcbfcc70d2164b348b037467071dc423c11a549aad8d06716ddbee49668724899a84daebf96084efb29f246e7bb6ca967bba2ca82948bca7dde246039c4e8e8cfb593af694f197d6488e164a41f46c8364250b02d81af4cb6f2f9c67da6254d454c4860c3248e58bb277c395d7564bae2fe299263753405f972b7af -Signature: cc52d6498a412d0b801d243e37a0291644135294bb91fd182f3458c59e60725b21436a401d534497 -Test: Verify -Message: 901bc4215934ede2f6835d615c38953a95cd48bc09a249a30edcb412b37f5cd4c9ca75d433d383da706382886614579471a97647acaed5377f511241697fe0c90f42b735865abca8dd1beefcef86930267abe2fd143ef25c6f79e2b86a314a0e7b3ce23ee90271c35661f9b58ec721fc8f8ae2d6d88b768cf70c7e704dce721b -Signature: 69fe1c37cddc2db194719f80d9db24c60618f5e99cda4d645d1be7c3c4ba192c5d8606dc9c2cdc61 -Test: Verify -Message: e524024ea5f5ef7baaf30efbfadbffd9ca00ccd03d91c23a612e8d3c67ab933023239253c4417cb0d5cb934c7370c193d0d23a03e8d75417832da6766c1c605df090eb4a9966c1ea2cf68e45e0e28828e11f0bd305417ae4ce0b5283a0378fcf438243899cfb75ffa88e383cbacc0c6ef5fd7a970c68ea7839e1c8bb7c94d760 -Signature: 41bfc6a00915f9a7e24e0d4a7a1220aa0c0f3127b0286f8333c9b002a4acba9673717ffb09368caa -Test: Verify -PublicElement: 1dd203bc368c505fafbc02d560b4b9f003d93be0f78a11fe60e94c406890ce920be3fab9d9ffe84b80f3fdb9071dc602d7c8165fb62e346847b3918d450b3dcccb4bcff0ab98e3052ae36d1a65caa37c7187bb620c5147870ef676091f5199be871dce4fcda065da9f3568fa70edd637450acaa7e42f128b6a3a0519d86784d4 -Test: PublicKeyValid -Message: 691699d5c945a8508a41c3c83f768406a904e3bcad75c75e76becc40e67857f0435fd8d61f0b5f0b88ee6276718fcd2d60064b0b5ab7d48d0c5377f23b0c69936d174f80d968c95c8ca93f7bde7cef3914f2379e574c202fd5f12c1735af62774136970acfd2fefdf068f20e5cb403e31dc140ad7caac5fd298f84e6aeda5855 -Signature: 9c2687d271c475a3ca252997642f12c2494e6e1612ca7c28dcebefb178a72071de741a27699cbb58 -Test: Verify -Message: ad15c247a6d92417670bb015e2c56b2170d449feaea127d898600517e37d88639f43b0f80ecfd52cbf34e83deff0e860208fa308fb9eaf7463d2a87cdb79ab9c1a221341ed8973544dc5d405c0b530d9f5a72ff69a4b20af81d83b4bf47c151b560a65bbfbdff6a74915ec020fec3ba325746462458072a12ac8351de75dbef7 -Signature: 3edf3214d7492ead518c21641cdeeaf11955cf2c9fd41dd6990a3d93b5b996dc65b4480102910be6 -Test: Verify -Message: fe8aa91c3ff17c55cfeb6ca7d7934f00e1ea15bb63b4fb9d8a94f410486b559ea1eebfb131865289026c0f7e8d058e780e7be2ac0d9dca9929f91942283868ad3cbafa9c9872ef8a3303ade9dc1c8b9b7f11c0afb6ba8b5d9391a444ac07e4e2682730548a6eab50fbe91c60dc909d61cce2853b76c398e25f926e8def8f2136 -Signature: 454f59ad954b584350b19484ee93f3fac35e5a21025acec86b4d2cedb998a838f9c3d801acf7ff52 -Test: Verify -Message: 53bd313ad31f55de5bf21a35c1a6291bca8e6e0b206736489726884da107c1770fd273f10a707fe051af70d0b5521b5fd25d75280f9fb5f2d880aa1a1b0c5e3e0140ec2bee959f09bccb4cc633f7f2c0ccd08fb6a73645f0ca04aeae9c177ccea19f55c277a5eeb212dd66ed34aee5963080758bdf452099e34a4bdf1b405280 -Signature: 7408d817a92cce7b17409ca4a522ee8d2a05bc6ab21cfaa6c48819dde84f86090139f18c389ec906 -Test: Verify -Message: 8d67b965319d7ea31ecc8f7538b0042c8175e4de45b0eb7d869b9e3aaa918d1964cae8d5e05846f63261b131009ef5006f152a824c137f957c6c4a31a6f64d081e444b5c159fcc20004b2c5245f8ea982d862f1906fd9d9f98cd5beaca425e57954bf9b22a6ca8585f00199160b47c2c93410c5ccb69ded3b135ea1d706d573e -Signature: 3c2251163492bf6e777793020a5010959d84a258b28ebc211aeffb54f4f99500f88cf0b2eee180ca -Test: NotVerify -Message: 8fa0b50bd675f973a529cb90f5a7be4302794ed969f31dda80a16e0ef6efe2d1ac177399d350aec5463535a82a7374d6c4b7a3ae9ad7fd28cd3f3fe0b69e6363c0d29eba861297352d5bea7a031cddcd582561a29dcd4c60bc63d678b7d751a683a92d8727132c5c1172e11db8fb6fc2789b80cdaa2e841b03e52ced2ff12632 -Signature: 4d6e667824358fe066bf44377146bf2f5f2d92d2adc0aa673fc3912c3ae67bf8d0c529fb1c25776d -Test: Verify -Message: 17aeab19d1ee54e4aaaa66144a82f1a348dc53f8f1fa9d1b575c44389e580c5883f8315b2d14d83838b1b679009800f12b3a92c179c4638ad07e28f4836a475fe21900e908d0d6a0e0dc44097a339ed18d4c45d24c400f496e22f556789bffb54dca6dbbf95b2794bae667bb508aa4bb86cac22401a779d049ff035715250ad1 -Signature: 570867e6fd129769612e82d31a833ddfbb9a07833815df754b1db1c729e7a85fa4bee867dbcd42ce -Test: Verify -Message: cbdcecd18c9984a189ddd576261b6aebaf3030639731cd79ef7a3faa2af4b9420fa6bb84ff7f701d69624ccb8b73e6496ba1137f157444e81618224339ab687d81c300de67436173556028bd62eff59850f1896dc3611d9cc43c052476d28695174df4383a7f107c43f0a0a4232750af5539c98719900f6ef0fe20a65802cb60 -Signature: bed7f5866b9ec24dc7f0ec818262aa7a2197926c314a353cfdb5d11c7e57685ddc0c1863b7915521 -Test: Verify -Message: e8cac9ce0ef12933d72bb5ec654590ae24739b0b378f75d32293d3acb85902ef4791b9c603032484b0072f45944210c79ca21787cd9dba1feea5dcdf74ef5dabae66e81531eaf9bb86ce2de21390ce5347da9f760abae4ad641eb5f46c9385b6733feef2721cbf8eb27748fbbaa8e40b7d13c80fc55f0c35daf6f82078bd90c9 -Signature: 35dc7ce798a62cf86653c31306ee9dc5a8ffef2a8c086ebe25b001f990e5f511f780ad9d7eeed027 -Test: Verify -Message: 95f01262b79dfb8fc98a0217a661456a8b97042d6dd524499daae53a9a70e096377c44dcee8a528083671634dce0677820eb21640f14a2b4a22b8316e32c98b10f6f2af6e91073aa61a15b34660f722408d22e05d359666567b50e225c8434f655203c46620958279c914bb1fbc65e897ba4a2a96f7c697325a0fff6bb50ae7f -Signature: 9e75e572e76eca4859c954248a01d31921da32e371ecee37eb40aa9c13ca2e65961359e4466e9e72 -Test: Verify -Message: 64414cf10d118df7436add5cbd54ba23e8af55f7f79d44a22b1369ce64ba21fce90cb1c274acee4981062d07d9276ab859debca30814f90b5969a5f3bd1120176ced102775ed0d4604a58cc3f42e0e179540891fbf8d179a1760dde6a1763ef7861d4298288b41e66481d30a2620fd36330b94e333bff649fe2fea1e28a3d493 -Signature: 212c24985e37ee89e71cbe6d6012b89fa181db569227db91fc0b6f557f377e380cc56c271f7cb77f -Test: Verify -Message: 8dcf3f1d21a4d1e15238b6db0e89798e66cc62b60e7d0eee15a550a2e56b47387ddec07aee02cd471418a77a9733c21b22f82ec5e1b4365741a533dfe382b1c3e24cc6314659aecac89eab8ac93c1cfb8d4edc9abcf2de891b95067786844acd32b0091b21c2abc2e65f7be29bbdc1862066230e954c3edd1a0e8044c68a49af -Signature: 7add75db81ef8d210f6dad09da3d11381324430bc473f003495c0288a42fd93957dfa5321bdc3d82 -Test: Verify -Message: 0ee654428677f6fd59e6cdcd1406dae8f753dcbca966a88e1db8ab5abf9bbde6e47528287040f8dac93f865cfd023fca2f9dba5d4725fa07da6b004a57fc955a73595573d773007c096afddd9987309e8c78fdc10dca9de053aca00bcde3c3dc9508f5dc1409a41bf1e04c0a408d429ce85abe9d554f285260f3a4527b46e0a4 -Signature: ccfd740744131a05fbfebb26edf96572d3475d6441c042287c109e0aaa4e9db694d074889cb55dfc -Test: Verify -Message: 1a21fb1ded7d167c9a590c8bfc4abc10ab1aab159476b834d9d91e24ebb8aa84e5ee3ee72c6b87214519fbd2f70f1630a2fad519dec7735857966237e8db8d46f6d6cd6b0f36aa2bc4095337c4e7e03a3a60c6e268a29b2d846f0cf6d33e1cbf04b09fc1cf37f631ce010cd59b2b91c82b2376896b5ea94b193c1278e438ce87 -Signature: a07b8566ada6bbd54b5fc36b4a3b698cbf60c1ee912a5197ba6e98bd4777a884d6bc66022020de8f -Test: Verify -Message: ffc7c4abcca3dae4c21b311e6fb51da2262e53dd491ed515d6cd216d34549a1c40f836ea93c36aec17645380c949258bd0fbd9f2bfb9135727585115615a5a7e9a4ee6541f678a86eb60e72c6e8f14c4a04848af4675cce784732002a42f6c6c25812be108c8132956c74718f6c0c0c5adcff80a7689d93c05d5e62c960aa95e -Signature: 60b09ca0f393d3398635c5075d114429b6cdc8bcc7e66888f49148be9a9f96edc5014b106de6afe6 -Test: Verify -Message: 88fb1d5c4fe552db3d7213c906f74702fc102d41cfe636138ac123fbcbce5fe743319fd36e4eb8bc9355c0c7fe0c69b27de19a7c182f4e5016d0b2b82de57aff08e284e7ffdcb18c1217009826cbeba9843706ff8fe9d66ac64bf073fa7253cad02307f07927f625b1d10994f6cd87bd0b2aac23acab8638934a1485ab0ea11e -Signature: a4e8a3e21168f000ced52e3a35573fb6ba82eaa164813969ad388163d2cb861f472e7cbee985e0e1 -Test: Verify -Message: 4593c65d5e569a3d1369a916c8e6d4f541080dc192e7e51447745056d5b7bc1c404852c00e0d8b406d32f75ca06e4aecaf74a87f4fb7323a0f63d1efc598427c38e963670f15bcb7fa0451151f05a724c747141d49954caf37562916c8c4ba7a866c908a38e7445912d74d781b240055e078e8d457f9492b1646ef03b5b43ccd -Signature: 8c8e17b621fc67bbf36704f2356e7755d960fce3a52357c84b778376dcca9f92c91b9be575daf7b0 -Test: Verify -Message: 6180fb71de61a23cbe0d4383386e0170da515bbd67512b41ef03e0bc2d63fbdf257fc89ffe625fbb1d43da8c84efd80d6974322a1a0ffd4d1158c02753acf7bc0edbc8b2721304dacf0d6100f176f6efb9a0f8c8fd69b385a16cccc9f667b5ea52ed7141f14c8ab10cc1507638db532f012d232fc6384700d7977b39ce6c2f82 -Signature: 4156c005b5e099e4cae1d24a4ef35ae0749e4cdeade8929a74ef00f4f57e18c864ae6a376d8bdb55 -Test: Verify -Message: e52be63c5733b8e9860af61ee50f73e7f679522cd72f31af10ec93469c938e5b35d0b7a1e4f14b18c9039f442831caa9b659908b22ef92e4e617b4a54ffecf32ca7a981872e2d011d72fae3a11538a9306d9cbb7f8bf12de5291a710b3c625ab3b5f621816bea1ca48c4fb78b82f0b9b7e32d92a71560994ec9145ffe1a4e7c0 -Signature: b07e9d17a45cc2ceeb1fde1299ba0d6b3bcbe7dcc50e823d12ae5d86972fc6e21d499d38120d7638 -Test: Verify -Message: 1b223eeb3cebfc1575b37c5eba339ca55ab86c9300a64fcfe94d4f6467f1c06f9714190d5f060f84abb0f3b0e89d4db0c04abad218af03bd480d7fdd9afaab1405ab079e2a82334590d84ac71c0c7f85d4ccf76dd5a3e62992c4ec894f15b22edd7fc0789775a2b29dc33c7d5099697a0ed7db3b2f9b2f6c40084f3e7e590d15 -Signature: 199d5f32d2645a1d46ef1cb3ecb15a34eab59b9a8c3cbf5810966097bb9c280e812c22ac298e156a -Test: Verify -Message: 7296f7fd229c0893a84a5b7ee87a034416e5ae1edf1e7416d6c9df5f20213cf564aa2175ed32403f220e6aca2893e747d5d3f579d8999ed427a7bfd5aa2f55a1258f0be16b5102dcc163e0d790931baa504e87a3b1991ea00b501067089f0b498fbeccf8f4f1e7a55fbfd35d7a7239a55fcf7d55c0178eb2583eebcf936af626 -Signature: 5e2044f956599ab077c91e0f9f9408dfd3c458c61fe6edfab105b1f711919c0b43bbb7557252b193 -Test: Verify -Message: 7279097dcfe09b8615d3275b713dced645da08ef435fe783c5e888676fa3daad07bb933594886f78b6f4ab914530c28d2e9967f48ae5c398ff92f09d5c90b6c9702d850d2b42b355f89cf68d5aad25f4c5742ba5bfaa4c62372e9ca425b3bce164a8d81dcc67deb494a20066e60b6da3c4434b191a06f87c249482950362658e -Signature: c2b345d1c28a149215db60952dac2854103f0260bd4994a0b35394474ab82958d7ceb406f6285f4c -Test: Verify -Message: 7c9b50842db0de693441a2c13323de1369e251c07cd49c41877ff69b672d142642ce53805a0e28cd11b7ca313c491e8facd7e382fa241e9d93ffc8df05dcb67a89b4cac6d01e587f12aedb47558ed958fb5b14898f43f284d15c2f46ff47c1d866050b4c2a1947fa52df2dfc172ce9e86d273ccdd368f070584f82c8eea60bb7 -Signature: 363c61fe40b4c0a4f06908df5c46d8a9c98dee71cd1c56f8d7a16c081712cb1b8c92cfd00464a3e7 -Test: Verify -Message: 0bf43670b5fe01cb48e75a19b519f324451ccbb3d85d8ef15c41311b906aca6efb48ad5027e4cdbd23e951f538f47564ea1da4d133c6d4cbfba32151db0aadc1137db703c975faf58471481ae93f677fb48a2ceffaa5d6579d97ad7c1067dbdb4da98ae01349404c659777e04093804f9b7b9a63a5934e6e3a340df4a7180d96 -Signature: bbefc869907609019f4a85294aa854961e51c4884c235f4cdf85c4c3e0ff34069183ebf0ef50bb9f -Test: Verify -Message: 419ff761987d7257a0bc8817abb4077986972726e6ac93f311cab67ac91747fa7d021871b37f1bf8b082b55e6bbf4709b1a0fa099986cc7d2b44d82b4cd9ea5bec6e43f47490a9da6aafb38767d753e83bada47a5eacf6a59aa11758f665e4e6e7db1121b22a35b5253b19c7767542ce7bb7bcb10c972922b6da0b3aa1334e56 -Signature: 29becc5afb5ea31a71b4169b91f9594d0819de2d409e4c0c3bfe8e2ea53e98dc1ad4a72f3e3081b9 -Test: NotVerify -Message: 31c4c31942471dd6583810807472b62ce7cbbddbac7de47f08d7bb4b6024973f5adcd3f4380a4ea571fd227f9133a22a53829698fc88ba0dfa55746fbe58d6d0d687d43a4fd3c7ba4acb21afdd8f72542df89c8cc90553ee4989d8112713f619dd1e3d82407a7d2c1cfa87a8115f20c1ad84454ecbcca6382bc95dc6532eef31 -Signature: 3c999e56f7ba49e48cb72c76bb7848d4562aa96dbb8c5a3adc19533b00cb2a421fa107b0b956452d -Test: Verify -Message: 64a5d78514c2e26b011e7bca8ae480a2770cb50b03bb6fac29db817c30fb6bb87a68c225898ddb885288bb62c70e43f19f8198646850d15dd08ee5ad30d6d34b595e1395a4593dcb3493f8c98e4825055d454dc87f4249b1537e3067469c869e9cbda24d7cdf602d3f760876fa497fd5498facb15f492d9f4be23c238d05dbaa -Signature: c3a0e8c6df40bb4d672d2438f4f770c141054f1e0b6cd25a0f9d0de138d6c8eb028ae0b23dbd2720 -Test: Verify -Message: c4d9d647a62a699ce00ac9c55b2197a796fd1e8e2120f2d75a50cadf671a9c2c74a8f7db2ec5a549802e81058d1c95f6ee0e78c92ddce79e82f9a3f3cc088ad0d3a2f934bd6661c0ce4327a26402c2c432171036bca8f8da13df464ed36dc31f5a5f942b4a25d55741e07673d8ec556adaae9caec69f5ee387996dca72617e71 -Signature: 1145693d535af4e7b13ed5801c2539db279007dca94800d15c4f2d184c71cf793feab7e46c52121b -Test: Verify -Message: 9981198067ce9d394f53f1233ee06b86075ed7d61142c04f3e54fdcf1ea280f454bf5b76494113c6107a2ae89a76e78e1b356876bc2aeb0582f459257e5b145b368e022d539bdab38d2fae7cd490baa4c1d86b333c74b3b86edd8c25e995cbee1664275ddfd489399eea969746277b00d0c0f8c5e919b09eda88af89b7473ce2 -Signature: 57f2c2fd72f077ef67ceaf46d99753bf796a4712a018b08a786d4c40136256ac0a8618db7dd1eb28 -Test: Verify -Message: bfcbe3e18f4423b9f21b33fadb4763c2e4221126f11b6c79099e6bd9714008000a2fc249edda520144dcacf16c2e3929488e540ee82a03a65c92f723d2dcc6aff61967778bf8eefa46b98a94eb55bc45aaecd9c7bc6fc3d13a8ee4a53de46be03c61cb82a2f8703cae8bc4fa901362b1c2149a6aa440258f5b6a2a76ebae712c -Signature: 5c141ab2f4ee5a513c4ee7e9a5e770f294859b1f6551d44ed78029dbbebe181a73e2726f1b553022 -Test: Verify -Message: 839331e55e6928503c36c0530394dea50f46f78d7bd8fea1ae7894c02a136b4e91b3fbaff91869067196b42fd32e22fbcdf0eaab2b9023af6747ec9f73eddd7bc555ae1fa4e8260ab2844750ba97b8ddbc7773ec3705afc6b68310c09eb20d6f362fa22ef71038d316bad1ae500678c2f594e847386e7c60b6e157194499d4a4 -Signature: 0ad3d7f5ea209ad35ba4a0a17e16483c50f5e4953a692ea71730d7c5c4c13feed38ed90759aa2e86 -Test: Verify -Message: d4fdc830db8cef7540b6b3ab242cfe3bb59004a3f3c61b60a37cda1890fc7108093249ae98f9dcb7ffaad62b79e76dd72fa4fdfbf878e8355523aeadac5f4882c5ecc97583d638d5e309a8aa3a189925ab4a9348e7e601d129c14b6d7005381bff4383dd13bcbba6e4ec6081df583bfe229afee237aa1d0e156eecb05485f9a9 -Signature: 189c08e378bc9feb81891706f80a9fcd1f10725564e3814342937391e39f8830eaed6702b8579e3d -Test: NotVerify -Message: 3fb043ac04c26a1d06fa3f3638e0ab0a218b5a74c36243f4ce1278c606d02b44f1d1027ec6069c17931c6463adb495be5de08e2fc8de583e1f187513085bebd04d579130c4589a607e445f1e33d57110ee17df67f524c4b4fb1f150a896fa955aa3d8afbd6307bb12168c99fa4b957b72c29e45222aca00dba1eefe460827d8c -Signature: 65ab093718776e0b945e5fa24014468ee40422b3688c00beb21593dd4785c90b350e9471a5dff538 -Test: Verify -Message: 155f0682c1d481571fd2d93a6bd70e5e2a6fee3702270f03d7b40d9c2c65057eb8c6521448968747d5ebac49e5a4be9f270f616d49dce8061d4287b4ed6fd7c41c368bd6fef47163f9c3ac8fdce330317f657e209c19a2c1eeba6ace8858e86877072a609cc638c2c3b24fa3086c5d2d6cc7bde8b3b6344b80762c83b4f73082 -Signature: 90e0b86567a2b176a74a817d52009c2bb553eb9ac3694f997c5f70ca3936b6d57f1908868ffc7518 -Test: Verify -Message: 4b03e4a77dd910d51e6c170faa228f3d5c258c96bc44cc986a0d244629292ca62ff8277aab6d353e982bbc62c1e113c815e371812d0916c41ccdb83076a03043a38c651b6511796ba83933c18afdadf6abdc3ef6b6baaab230f6896280d0f50040f97801c37c3456e7cd54a31c2eb3bfb54bcc6c6e0de2583fc270536071d3d3 -Signature: 999adeab789df72dab3c86e115140d0dbb4905adbebe59a1995fbc73fc678a8ca89d7b6cb644569f -Test: Verify -Message: a59d6636f5dc1fbe82ec2df71a90657f5ccbbcf1af6e69157de03b45b42e3c227f53877942c96770d450b1f500fd64683e877e87aece219a56ace7e19d01823b07f9981733a1dea012aa7324697c7fc68a7e0c654fa524cb573b2c1a84f18074b52850eac17cbba7b4932a5e4d24eef1b84b1d62880ba9fff824c2ca63186f26 -Signature: 30f81281e18c995d53f02e6d04eb988bb0b8bd3f1af1a7c8447c704f06d7379dae2ccf95ec13edd9 -Test: NotVerify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa_1363.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa_1363.txt deleted file mode 100644 index 712e5ea6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/dsa_1363.txt +++ /dev/null @@ -1,553 +0,0 @@ -AlgorithmType: Signature -Name: DSA-1363/EMSA1(SHA-1) -Source: generated by Wei Dai using Crypto++ 5.0 -KeyFormat: DER -Comment: 1024-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f02818100bd670f79\ - b0cde98a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f6564e43a\ - 559a0c9f8bad36cc25330548b347ac158a345631fa90f7b873c36effae2f7823\ - 227a3f580b5dd18304d5932751e743e922eebfbb4289c389d9019c36f96c6b81\ - fffbf20be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b021509b2\ - 940496d6d9a43bb7ec642c57b302e59b3a515502818100a1c379ba91fe1f9d52\ - 83807b809c698bce4aee6f405f4de8c46becf33c08a63bc5f8088f75b5b6bcfb\ - 0847ccbdee700e4e698652317bbd7a3056404c541136d7332c2b835ef0d1508e\ - f57b437de60675f20f75df0483f242ddeb57efacd180418790f4dec0a8250593\ - ba36f17316580d50db1383ea93a21247650a2e04af904d041702150355dc8843\ - 45c08fb399b23b161831e94dbe61571e -PublicKey: \ - 308201b73082012c06072a8648ce3804013082011f02818100bd670f79b0cde9\ - 8a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f6564e43a559a0c\ - 9f8bad36cc25330548b347ac158a345631fa90f7b873c36effae2f7823227a3f\ - 580b5dd18304d5932751e743e922eebfbb4289c389d9019c36f96c6b81fffbf2\ - 0be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b021509b2940496\ - d6d9a43bb7ec642c57b302e59b3a515502818100a1c379ba91fe1f9d5283807b\ - 809c698bce4aee6f405f4de8c46becf33c08a63bc5f8088f75b5b6bcfb0847cc\ - bdee700e4e698652317bbd7a3056404c541136d7332c2b835ef0d1508ef57b43\ - 7de60675f20f75df0483f242ddeb57efacd180418790f4dec0a8250593ba36f1\ - 7316580d50db1383ea93a21247650a2e04af904d03818400028180255cf6b0a3\ - 3f80cab614eafd5f7b2a6d83b3eafe27cd97b77ae70c7b966707d823f0e6aaaa\ - 41dc005aaefd3a0c269e60a665d2642f5d631ff1a3b8701bc06be9c44ab7367f\ - 77fefeec4c5959cd07e50d74a05af60b059ad3fc75249ecf44774b88b46860d9\ - c3fa35d033bcfc7b0b2d48dc180d192d4918cddff4f7ebcdaaa198 -Test: KeyPairValidAndConsistent -Message: 66B92E1E2C44B80F7BFA -Signature: 06418D4F24A8059553951CA062BBD6E0833ED1745608E1158CA4B8F8FE1CD2AF087B5EEE08FCA0D7A63C -Test: Verify -Message: 973266BB0A492248082A -Signature: 02BA236FE800EECABB85698A76B5485865454B3016010755F0E1BF7CE26FB62BE4FD01141F5CA4144811 -Test: Verify -Message: 9A6D079ED0CA9D8B40E8 -Signature: 045BA3DB16E6B910DC89A2D26096625F757D62077D049886B85EBC7500884B4DDD1898BC52746C54F68D -Test: Verify -Message: AA34DCE67BCDAC927DA6 -Signature: 0835C94121313842ABF04D4960E711D1F0904612BC09840989EEAFF2071522B75957DEAC801574BD22EB -Test: Verify -Message: 4EDAC08816AFDBF284DA -Signature: 08E1574E5299C910694D17075136F41EBD558D1B1805CAA3B6E98DCCC3702F286E76BBD29435CA2CEA5C -Test: Verify -Message: D82F2E903230962B8174 -Signature: 0366F1AE94FD2CDEBA4EE879BB8923F0E49CFB921008E6A5C7457E88811D46DC7F297D6A96E909268244 -Test: Verify -Comment: 1025-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f028181017310bf02\ - d70ef2cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd553bc9368d\ - db154a55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4a9c56c2863\ - 05aa21ec4e35de7390747477b3bd574e7b87cbebde2f665703137a1172350ad2\ - f48a0884d076ada9db82f104e6b0ad86693cd4adbd0067639102fcf102150b39\ - 49dadf3196f08bca0606f06443afce2fb1d02f028181015f0f6d1729ef2af723\ - c00e36450a04c7e7681d65b74a6417a53b3eb6036989eff8e0ab11a7ec3ce234\ - 0b7c7a92e1a977aee52555c06c12c4cc28496ddc2598feeb7539ce90d3888e21\ - f61d7f14746cf67d9fed373afd97e2483700e300ed9da25e7200b363a4727ad2\ - 01194b36ea5f816cf83488c3e527d3a5515870d2da63d6041702150696b0f255\ - 468b7ac18e11632f208ca86383a46724 -PublicKey: \ - 308201b73082012c06072a8648ce3804013082011f028181017310bf02d70ef2\ - cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd553bc9368ddb154a\ - 55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4a9c56c286305aa21\ - ec4e35de7390747477b3bd574e7b87cbebde2f665703137a1172350ad2f48a08\ - 84d076ada9db82f104e6b0ad86693cd4adbd0067639102fcf102150b3949dadf\ - 3196f08bca0606f06443afce2fb1d02f028181015f0f6d1729ef2af723c00e36\ - 450a04c7e7681d65b74a6417a53b3eb6036989eff8e0ab11a7ec3ce2340b7c7a\ - 92e1a977aee52555c06c12c4cc28496ddc2598feeb7539ce90d3888e21f61d7f\ - 14746cf67d9fed373afd97e2483700e300ed9da25e7200b363a4727ad201194b\ - 36ea5f816cf83488c3e527d3a5515870d2da63d60381840002818045bf83e62f\ - 50190374b23de5e4a1d0278e9e8e6c8335577d62e80662a380c206e326819c50\ - 82d321dfda1f905fa5a3ead9a2dc769885a27b1fd6a133185dc5a7876a76ab0a\ - 09fe02b7071a924169e4d2d2a67e67ed3628800134183b962c0b313463aa154e\ - 6437d644e025ab234e63d19c129842a61c5e5ea5a06466c858c81c -Test: KeyPairValidAndConsistent -Message: 2F585D0CE4FA1CD93880 -Signature: 0643ABF8D3C2F4BAB02CF79D698948A1A416BEC05D00F33CC3D41CA9117E6CD99E5DCBBD4425DA12E98E -Test: Verify -Message: 4F09A1F217B8393199EE -Signature: 052DE620B5628EECCF7C56410CAC2B72A5AD1B5A67072ABF369453BC28A386ACD5939C9985C09338FD03 -Test: Verify -Message: 03D7110A753B008A76A0 -Signature: 01D44D16B5FDFB8C39AACEA72391A889EECBFFB5E701EB8F46E4FAB96326F73E0CC698E1F66C32FE5C2E -Test: Verify -Message: 129F4781D417671F886D -Signature: 00CE142CE967BA951B9DE26DEFB5B341CB49247C1308515315449B5533ED469B6470C4E3A3751E35E7BB -Test: Verify -Message: 3E1594F559D1248D1112 -Signature: 07B192657E256B60567BF6EB399D8A2DE8FFF7AE8A031A655BEC911A82049155CDB4F2A76A8004AE646D -Test: Verify -Message: D6F0354F1B6B253B6997 -Signature: 07FE18E0C00F6AC3CBCB95874AB66A98E34DF74F37059178C920C5D13CE173B8D2832310B9587940F6D9 -Test: Verify -Comment: 1026-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f0281810250988282\ - 17d00108030801e5f135fc6fd3010be39e49060a96addc8a081198803402c4b4\ - 6e4ce0750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791d02d8143e2\ - 74b1325f2213e17f9384c805f479e52a3117cf84869d395f1bc025c918484478\ - d2da1880d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc17021536bb\ - 68cd95dab195f14c4534283e7ea50b00cc31a302818100e2782ad6992f4b7e88\ - 787b4d616744b60e095575a177569c4a069e311e38b7240c43343367e23574c3\ - 0e4d9f05afe1fbe61423bab715915c4ccf28aa0ed2f52b092b86c8ec1f9d4795\ - d6e91c88ba41297625c11a9e1f4f182da13cf51e541038a1266bf32b2dd81ecd\ - 84bb80be8fdf97689942e944b7fbb6981e00cd680ee25f041702152db270c284\ - 328353f979cad99f4133c53acaa6ee71 -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f028181025098828217d001\ - 08030801e5f135fc6fd3010be39e49060a96addc8a081198803402c4b46e4ce0\ - 750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791d02d8143e274b132\ - 5f2213e17f9384c805f479e52a3117cf84869d395f1bc025c918484478d2da18\ - 80d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc17021536bb68cd95\ - dab195f14c4534283e7ea50b00cc31a302818100e2782ad6992f4b7e88787b4d\ - 616744b60e095575a177569c4a069e311e38b7240c43343367e23574c30e4d9f\ - 05afe1fbe61423bab715915c4ccf28aa0ed2f52b092b86c8ec1f9d4795d6e91c\ - 88ba41297625c11a9e1f4f182da13cf51e541038a1266bf32b2dd81ecd84bb80\ - be8fdf97689942e944b7fbb6981e00cd680ee25f038185000281810179b283f6\ - 7868aeded3a0c5633d0e6c18fad77174e2c89c03452593d05e77a9fb029c0ccb\ - 2b6f2328e79c286ee392713f12d9d45578348383b81d11b0e0f7e89965a7785d\ - 5ab64ea25bb73e8acaa8e84cb9897985015757a48c0b1dac3a6a606fe671ea07\ - 3ec434a46f227b8d4b02a46fbba2f6c6216736d669f55778d81004d8 -Test: KeyPairValidAndConsistent -Message: 7E4F2ED4E79062778A2D -Signature: 03DF91D560884BAA90258F0F78A7AB61F9A4A5CF3D363E8DE2EAAB389B9492C2B80C44509BF2372BDEE0 -Test: Verify -Message: A0E35846B5CF1B5BF560 -Signature: 21DF9C60877B6D7F531AAF1C39122779436029685109B2D736A45F51A80099041AA5F118D7D6025AD30E -Test: Verify -Message: 3B138785EFC6F520EAE0 -Signature: 10A38520BAC07202DD1CB5A9C88B15B9579B9A1344025E4C4B9D1BC3AAA8C97AA90121D52E42E59A0A99 -Test: Verify -Message: 0F6BE2AA764B485145D4 -Signature: 0233267173F284737B68D15A500D23F3C86988E3DB28DD55AE3DFEAAA7251D354CB44315D6024CBE3E36 -Test: Verify -Message: 6CD9FBD23EA58826FB04 -Signature: 15A1B0DDA6BDB62D96AC557E3F1F24DCAD0C51EF3523B01EA2A8FD93761D0E4D070BA6352A81F31B776A -Test: Verify -Message: 473A82649565109E9E89 -Signature: 1FE31C3A3EF6F57DE2586A5F2EBD48A5C707092D230E1D217EE0A752EFD9ACA8BF0B9EE9424184B8F8F2 -Test: Verify -Comment: 1027-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f028181055402a8ab\ - e9cda3072ca8601d68032651feb0335856e57f8f8d4ec949098a6459151cefee\ - f91b7aa733668c8cf0e9b96c93c61f3528d4036daa6565646f65d74c4552817d\ - f7e5fb1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e23fb5572a75\ - f8f29b58bd5f7db435e8a92a923f15d50f34213d29816921bf195b2d0215291d\ - 0ba731a4303070504d8b9615640a5e1345e00f028181051c9d0270b69ceef82a\ - f5aed5f91dc88d585096609d835d03d39cf3ce74f5a3402d4e8e192455493da6\ - 1cc58ee6f54dd941172be3d7642169cbc52273f4b725f1d6c820c3333336c64d\ - 32fb6238121b3ccb7c71b847764946bb0887a44ca9de802cda62efa9dda57375\ - 1084225353f11ed837f3dc25de8374b6fdbfb6e313e46d0417021513b27094d9\ - a5a3a9704cebdbe890da325fa26ad555 -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f028181055402a8abe9cda3\ - 072ca8601d68032651feb0335856e57f8f8d4ec949098a6459151cefeef91b7a\ - a733668c8cf0e9b96c93c61f3528d4036daa6565646f65d74c4552817df7e5fb\ - 1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e23fb5572a75f8f29b\ - 58bd5f7db435e8a92a923f15d50f34213d29816921bf195b2d0215291d0ba731\ - a4303070504d8b9615640a5e1345e00f028181051c9d0270b69ceef82af5aed5\ - f91dc88d585096609d835d03d39cf3ce74f5a3402d4e8e192455493da61cc58e\ - e6f54dd941172be3d7642169cbc52273f4b725f1d6c820c3333336c64d32fb62\ - 38121b3ccb7c71b847764946bb0887a44ca9de802cda62efa9dda57375108422\ - 5353f11ed837f3dc25de8374b6fdbfb6e313e46d0381850002818103b06b9909\ - 7cd7145c7d7782b02e247a4741f3c7f39233627f17e13ebff89a18cad6a454c3\ - f32f7ef2910384030da71ae47e1c3fa79c2141dad107f8e715e47fb0bb626baa\ - fc35db769852ebbec2d339c3c3d5f2287cfdd20b3b78ea4607086c42558ae463\ - 7eddd6a74bc1072d0f34d9c0130cbc9e84f537e7ce50df502d17b5c3 -Test: KeyPairValidAndConsistent -Message: AE6DCD9535AEEE3ECC89 -Signature: 1BB090DC4573AA79F34181020C4D5B582BBA67062C23E5DD6913CE91482A05716784BA680F7F4AC1684B -Test: Verify -Message: C83A14EAC016D659F9FE -Signature: 182AC27BC4B77B145BF90E73A2CEEC5325941507F925279DF5B6280664CE82248348C3EDC59DCD428B64 -Test: Verify -Message: 745E02041EB487D16CE6 -Signature: 13C4F9AC03EA094CF7F60B96CAAA29053706E93DEC1024EAA1606E13B2C3062F2D6082846D29E6E60829 -Test: Verify -Message: 62F019655A83501FC4E7 -Signature: 077E19089B0BB32A7B21B0D27218C6E1F14AD432181BB76FF5E7EC35EC01CA47595F4C7ABB8ABD6064A9 -Test: Verify -Message: 351D37A4B5046E885EAA -Signature: 21962B09FF030A41251AD592F8D2AF24144B3AC713245AF18BE28F192FD29326D91F12A76A01477C8788 -Test: Verify -Message: 4073D33915F595F4FF9D -Signature: 1F4CF158E806AFE59139E2A9840BCEF79237800C521E49B7DBDF9830C86E7653FC716B43224EA00C883F -Test: Verify -Comment: 1028-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f0281810abdeff64b\ - 6f28256e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467c271bbb1e1\ - fbb6af058517fdacdf26b5919674c625eced6317d8631c063f43b3ade2cd633d\ - 554913339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253f0f988c354\ - 725289f2897df0a15985c92b2d4da8d087870c251c72d979b8304d5102152368\ - e2b864b250ad45406391e7eeaa3d27cd053c2b02818107c325695dfe315a77ad\ - 7b42f0d18f9d4821b5c153fee7385877602fa54477bb8c0639d2438f34352b97\ - c22d02a7295d2b53d5286a01caa919d6283614690624240af922675ccd4a0534\ - ec336cb79cde31b02b5988cc5a53ca17790d67d803a27bb927b9c59bdc6ac794\ - 175e285cafdece6778ab19a0b444747fee20d5bf929e70041702150771305163\ - 506b2b83bd5279935df1b5fcf180b004 -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f0281810abdeff64b6f2825\ - 6e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467c271bbb1e1fbb6af\ - 058517fdacdf26b5919674c625eced6317d8631c063f43b3ade2cd633d554913\ - 339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253f0f988c354725289\ - f2897df0a15985c92b2d4da8d087870c251c72d979b8304d5102152368e2b864\ - b250ad45406391e7eeaa3d27cd053c2b02818107c325695dfe315a77ad7b42f0\ - d18f9d4821b5c153fee7385877602fa54477bb8c0639d2438f34352b97c22d02\ - a7295d2b53d5286a01caa919d6283614690624240af922675ccd4a0534ec336c\ - b79cde31b02b5988cc5a53ca17790d67d803a27bb927b9c59bdc6ac794175e28\ - 5cafdece6778ab19a0b444747fee20d5bf929e7003818500028181043e4ae624\ - 4408879264fe6b859b578218705b9a45af22efded27141b7f090cbcbe42dcf48\ - 1df3e41b13920ae02b694eaa6bfd62f2d3c5d677b8c4ce783cbe2789e088b044\ - 89ef535ad4a517351c8835cf128f7ec677a1b1dbe3ae9cc4198ddb6e1cef8e97\ - 8c0725f5063797bc43eb9ae496286cccbad5d4e026e9edb997d2f918 -Test: KeyPairValidAndConsistent -Message: 4867852C83F181CDD010 -Signature: 1D0F4F49AFA0448163604847C9308A824ECE928E05066D47892256DB725FCB31F93F38B9E02C71E100EE -Test: Verify -Message: DA6493C86D6B62C5961C -Signature: 1BB4A8A1B8D81EEE9AB291C49F688F27D2191EA51B15A5DA66A6367D931DAB338E595C80E70CEE4BB644 -Test: Verify -Message: AE2C1136BFE966794A6C -Signature: 02AFAB91234D08FCEC22E57AB5718FBF41A86D2469012F8476BFCF4EA4E03D9F7A6E467ABDD0B5626784 -Test: Verify -Message: B20160E0442E726BE749 -Signature: 140A45F4933F05807A533628962E42A8BEFAF5977917F2A8D8706B8BE83EE6B6CEBCC951553B4E3203B5 -Test: Verify -Message: 3638935C4492F5CA42F2 -Signature: 234F78EF68343E77710E17285E47994AB599F3646315C37B8CC01CF6BE9C803D6B81B232DE9171DA7967 -Test: Verify -Message: DFB674CA6E0FDC0CBE99 -Signature: 1DF9B1B9F78F5FCCCCC5F698EDDBC8EB28C0F4D10002A052284AA4FBA601D3047E3AA97F8CF73731A44B -Test: Verify -Comment: 1029-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f0281811d0f176b67\ - 99b36724c92954c38d0288fa95400c2b14e064f76a6338fccaebca8d978b93bb\ - 76507bc150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86185a72f04f\ - f80538d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc344db7e562\ - 1c949a9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38dd702153357\ - 536531dec150be0ef8747f69ea30d987ff7df1028181067dd80dbc6b41f58d08\ - f077a9a3dcbfe12a62065fe6b4691c457f506b56dcab0433b3aad6ef96250163\ - 3d0f3947b491a1317e7e6b632f062c53104d609c9222b056f08a0c83662a7074\ - 4331fd09b2b42fb0768e52da27e92732106fbd41ec737373fd080b56b543d808\ - d49eeb6e1bb0a8619b1edee8fb8295dc042423f684af8a041702152dcdc00a86\ - ecc2a60ebfa6660a83af1d7c3e570b85 -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f0281811d0f176b6799b367\ - 24c92954c38d0288fa95400c2b14e064f76a6338fccaebca8d978b93bb76507b\ - c150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86185a72f04ff80538\ - d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc344db7e5621c949a\ - 9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38dd702153357536531\ - dec150be0ef8747f69ea30d987ff7df1028181067dd80dbc6b41f58d08f077a9\ - a3dcbfe12a62065fe6b4691c457f506b56dcab0433b3aad6ef962501633d0f39\ - 47b491a1317e7e6b632f062c53104d609c9222b056f08a0c83662a70744331fd\ - 09b2b42fb0768e52da27e92732106fbd41ec737373fd080b56b543d808d49eeb\ - 6e1bb0a8619b1edee8fb8295dc042423f684af8a0381850002818113834f0fa1\ - f42abf7dbd264cb7d2eb5798da8972df67f517c62d7ae5070fd588d61db62e49\ - 2f9654833e876ed5737df35069f5ee01a45de881d8f5e68ec52ad9ef32780e8c\ - 453a5f1e38cc17bc5cd061a3c122080f6e1b82d31877e8b08f634f497bd90b06\ - 824eaa0416c64104ce5622c272673d0dedb836ac7d47e0cea0673902 -Test: KeyPairValidAndConsistent -Message: 1E34034C47FE533F8FF5 -Signature: 04E171B845E602A871CD5DACA5738BC4585A452A86108D03D70C3D2D605FAE90DB8D339AADB692EB1ABE -Test: Verify -Message: 53D2CA23AF7DF95634F0 -Signature: 1327D4C32DFB874EA2104A9B30EAF288C7016146D1217C237E0201482E483EBC7F0A713748547F9B6B21 -Test: Verify -Message: 0F056E08AE77B3B30F33 -Signature: 1B4A688745F3D86B0D8A5D97FFA0E31C322EFAAD0A0FCD907B2D49EB8150539E81FF29341EC34440425C -Test: Verify -Message: F08C80E8FD38A3867B76 -Signature: 0972705B5E84A8BA57226C770CCB0ECDEBC816EA162FCB3BA5B3C235105EA75F379EE84187E27A86D21D -Test: Verify -Message: 6D392690B92B3E75020F -Signature: 185968475C67C936CB152F76E80EE22FB82A27ED120C5C0ADB2D750D2C38F0A9671EBFEC2815F675C24C -Test: Verify -Message: 10AE0E091A267641FACF -Signature: 1AC3C2010BFB10CA6889120A23F984FE0D4CF79D1B07578217E5A3C68EDF05006C1F3F1BFB3848E4ECE5 -Test: Verify -Comment: 1030-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f0281812a32d68d31\ - 248024053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c2661d9165f0a\ - b85491d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8ed3ee64b73\ - aa43ea9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515007ed1b1a5\ - 708b5e8d81304fa651edc715918e2299cfe9016dfec5f454d907f59f021527c7\ - 996c1d3729c4cf1de06529e5619771e27ad9eb0281810d87a4b01385da7f43b6\ - 277933c5f0dc8072dcacd5252e1b29f588114a7ac56e377050aa8174b5dda400\ - f043234e4a746442792734dc80274a00a3676101be94759fc2630b9a85896648\ - 8b12611d03d0b31e7243e124497a754544cee1db10bb0a81cf0b2a68045b76fe\ - 935f641c666fdc788a2b968c6668c669115756b961d9fe04170215091155581e\ - cb7a0a792ba95c772d9382298bfdfa6f -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f0281812a32d68d31248024\ - 053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c2661d9165f0ab85491\ - d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8ed3ee64b73aa43ea\ - 9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515007ed1b1a5708b5e\ - 8d81304fa651edc715918e2299cfe9016dfec5f454d907f59f021527c7996c1d\ - 3729c4cf1de06529e5619771e27ad9eb0281810d87a4b01385da7f43b6277933\ - c5f0dc8072dcacd5252e1b29f588114a7ac56e377050aa8174b5dda400f04323\ - 4e4a746442792734dc80274a00a3676101be94759fc2630b9a858966488b1261\ - 1d03d0b31e7243e124497a754544cee1db10bb0a81cf0b2a68045b76fe935f64\ - 1c666fdc788a2b968c6668c669115756b961d9fe038185000281810d7d22c931\ - 422fc46505887559a51490c2e367cdb40242cdbaeb23024693fd5c68f6a3307c\ - a34b224457d5aa610b90eca3b39905481daaba7151318f09f974ad664546d14c\ - 87f797e38139ee1e07adba9c775e07b7f7b3edba87d886920d6b2cef5f084359\ - 566b0a3b8b940a65b9ad93fd7ccd1354cdcee3c43c6bd315180498ad -Test: KeyPairValidAndConsistent -Message: 23EEE1D0EA8950B8F322 -Signature: 1800356929B316D1E4FA886CAE0CAD56E32506522D0B8440BB7695D522F31CD87079BEA4CA9F18ED4288 -Test: Verify -Message: 13FA6F2816FB83190A21 -Signature: 207830C2DE87296BC39CD21630F26228F00CF60BC3150CBC82CFA9006534A6C5E354AA281C434A8C2077 -Test: Verify -Message: D071CCC0C6E4CAE82E5A -Signature: 054C9C0C30C6B73AAB9E54C11D4EFC82BD6E8680932501D78A58EE305930E72ACD3BB2565023455DEAEA -Test: Verify -Message: 22CE83F4803BF3EA2C48 -Signature: 07065A6F5C9A086CB83F2F113895730C1B2FE0DCD90FD6AA887B066D685D3DD6C3C0D95CB8C8A48FBFF1 -Test: Verify -Message: 7A927EC7BB9CA16C1B0A -Signature: 24BF344DC7B25F831428078AC0D929A72A29160B6205A1BD4B1B2C5BD8BEFCB650DE23652701DDD4F4EF -Test: Verify -Message: 9591B069993E10BC0B84 -Signature: 0E6E6BF91BBC9FB91FCD3CE32907F5B6AB5E88928C1E3BC92649EDFDFE672AFB654C765F2758DE4BD78F -Test: Verify -Comment: 1031-bit DSA key -PrivateKey: \ - 3082014c0201003082012c06072a8648ce3804013082011f0281814d58515f7b\ - 41c4fc87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c59217422001a272ef\ - 91dbd09e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d52781140bba40600c\ - bd4752d2c32b43253efee57af6964c339570edb24195502e6d424b84bed65ac9\ - 8c6fc52ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb93021526f8\ - 6a81a6bb530c2f9b63e3690e95a0894575f4450281811e24828adb4ebf2becdb\ - dcadf6706631293ad6566803d12479f04a7bb20b6086fe81df164f8bd02c5f41\ - 8c1140d143f11a71170b42d0753c952bfff951b9ca4204868375efaa4afad50b\ - 75787e41c5ab9ce8adcbccecd3716f350bb8aaeca9b6098bd0002d789e1f7db9\ - c19d9045499877b93ecb4e7c64808b742063bbecf60e29041702150e61a054ee\ - 6510734a80f67a54d8c4151c957ef16f -PublicKey: \ - 308201b83082012c06072a8648ce3804013082011f0281814d58515f7b41c4fc\ - 87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c59217422001a272ef91dbd0\ - 9e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d52781140bba40600cbd4752\ - d2c32b43253efee57af6964c339570edb24195502e6d424b84bed65ac98c6fc5\ - 2ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb93021526f86a81a6\ - bb530c2f9b63e3690e95a0894575f4450281811e24828adb4ebf2becdbdcadf6\ - 706631293ad6566803d12479f04a7bb20b6086fe81df164f8bd02c5f418c1140\ - d143f11a71170b42d0753c952bfff951b9ca4204868375efaa4afad50b75787e\ - 41c5ab9ce8adcbccecd3716f350bb8aaeca9b6098bd0002d789e1f7db9c19d90\ - 45499877b93ecb4e7c64808b742063bbecf60e290381850002818119b50f1eea\ - 45bfaa22352a38f3c3b86d6f670747ac2fd94359608e25f2bb9f602506bc3572\ - 45deeb4c3c702d435c557da4f4a9fd37330a75547c91681fdbb51f286adb498d\ - 1e489e89b2e6a4eb9ff30222c51fefbeac7435f629f536ac2d6b87664d80e5c9\ - 7398cf489a1d1ca217f7f21ea8e409f938378875cf5f528162e3bc07 -Test: KeyPairValidAndConsistent -Message: B4B3C8FBE82013228A21 -Signature: 0E08FE696A4C70B16A127CAE8C61E5B38B7A1F34402584D1F21F71016054E820E3B1BB866309D93A7DA5 -Test: Verify -Message: 17D2D18302173E2CE992 -Signature: 0203C3869E15F8847B58BD158CB746433AA05F201317C0541908ACD5EA78A02D1FAB79380619199CC5B8 -Test: Verify -Message: 8032AE177D6DF38C7E27 -Signature: 1F436F5BC73A3402221B539F1D7CCBD4C3AE948418216122809E062ACF5D6086546FCBB293B4C7510CBD -Test: Verify -Message: 768640A60A3C62E02428 -Signature: 0A5D52C534A9BF1175247538638077489537025975254955F8A96B0CA2E7985D5D6E3DD54EE298C90100 -Test: Verify -Message: B0999CA45B77ED63639D -Signature: 144DDD0C1BE6D96FC3AFFA240FCD6D2AD0748C848F0C8A25AE8AC2E55A38DE9DBBAFF90CF464547365E2 -Test: Verify -Message: 587EDB968FA82C12C930 -Signature: 01FC4F6F98898F3639E8D93E7C2E6F3945120AD19D15EA13EDC96BED7E73A7D5D161217F1C67F3048BE3 -Test: Verify -Comment: 1032-bit DSA key -PrivateKey: \ - 3082014e0201003082012e06072a8648ce3804013082012102818200d551680a\ - 62ebf98f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833f4c19ac8\ - 83ead22efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e514d4628b\ - 197721bdaec780e126ac80ac83f24fef5c154f7690ceba903748be5212e3180e\ - a718ca7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f0902152e\ - 802b5369c3f1ddfa789bf8f2ad2e048ced3bf35502818200a9aebee7d29f90b0\ - 81afc4d496a6a78210e918bb57a8a21c5995586c0bf20f7a56bb10a97e05a3a7\ - 23e7db64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076aeded938775ae222\ - 3900adaf52a93f52d62173c82d4b67388c85d4c1127e1edf4643cf09f5375b60\ - c19316c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b4a041702150f66e0\ - 4c5a75d3eac03d744e5432f23e3aea066a63 -PublicKey: \ - 308201ba3082012e06072a8648ce3804013082012102818200d551680a62ebf9\ - 8f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833f4c19ac883ead2\ - 2efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e514d4628b197721\ - bdaec780e126ac80ac83f24fef5c154f7690ceba903748be5212e3180ea718ca\ - 7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f0902152e802b53\ - 69c3f1ddfa789bf8f2ad2e048ced3bf35502818200a9aebee7d29f90b081afc4\ - d496a6a78210e918bb57a8a21c5995586c0bf20f7a56bb10a97e05a3a723e7db\ - 64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076aeded938775ae2223900ad\ - af52a93f52d62173c82d4b67388c85d4c1127e1edf4643cf09f5375b60c19316\ - c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b4a038185000281812640c1\ - 88055329f0b44aaf80f82f7fc7f0e421031834dfbd1fb6d6af6ab3e1c173c901\ - 370a4ce2793c1b88d12f764c58ff064905da9c5001f679c7508972f237bccca5\ - 6524787466a7c9c2d6bb6392963008ed1a3e4cf3b13e66086bce3a4ca04d8cab\ - cf0cadb4c403c7d02a858460d04350e730289cb5adf200b5fdf1198168b5 -Test: KeyPairValidAndConsistent -Message: 909068BEFFA43331FDC7 -Signature: 2CCCFF8A67073E5DF643B61A5AE7A5BC216FE267E713B9005F69797B44ECD33BA5DD87461B5C72C50390 -Test: Verify -Message: AC8AFC7A1D9105539E10 -Signature: 0A2BEB58D806EECDDCBD590EBE4AE5AE7BDA326EA0072ADB9FA6A6FEBF40488C80690A2B1DF141BACF91 -Test: Verify -Message: 310E40311BB3F77F9483 -Signature: 28726153B52FE75F1FAA4C97124EE042065D2C90B50B43F885FC45C42C3ED9BDC4EC2D36A2799A041C67 -Test: Verify -Message: 35455ABD53E6FB11ED9B -Signature: 15B3D6ACA9EAD5AA1501ED201335AF9B46657A4CBF00D19328018D82624D4BD9B22D645429B385DADBCA -Test: Verify -Message: 95FFA73B52F0D06A0C1E -Signature: 2904FA8F78B6DF0D15A08714C8F86B97532A9D13B617EC03F329DA20E42816CCF45DBACB432B1F5011C8 -Test: Verify -Message: 1E9934125DA6E9B4E975 -Signature: 1666A3B9DBE26F2AE3F9BF7CBF47989D87AF82F580147BEC8350E21D4DB0691074F63B85A3A7D8E82A8D -Test: Verify -Comment: 1536-bit DSA key -PrivateKey: \ - 308201d4020100308201b006072a8648ce380401308201a30281c100fada6e4b\ - ecef964a85caf9e129639a5616ac000dbac59bd50b84bc8d464114079c34c5b5\ - 8d7d40027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b65c2ebac\ - 05da09e40cdc417024cccba267a98f4eb69701a276b4f117662b566605c36054\ - e7f015d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029ef5c25c5\ - 5ae998f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024188627cf\ - 5ce68674e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b0219232c\ - f9bee9d56c8bd8252d1edb59d99c40cf32d07d9e5a48930281c100f028143e3f\ - 9d1317aafb814215ffda9c584da8943e96212c90a082c3d2f335e8a6b64d1c89\ - 0aa2224ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b801218ac27\ - 0acdd45579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f054d95150a\ - f96f9a7488010787a799c544883ff76a4e3092f2ca9aa9000cecb88dda343c97\ - 2c8192a83820727b1945c1a270cf913ab932457e8e6e207d06cd0efdf265b762\ - b9fa15c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be43041b02191d\ - 4cedc87d55eea31bd702139b90be08d58692a1f97628a01b -PublicKey: \ - 3082027c308201b006072a8648ce380401308201a30281c100fada6e4becef96\ - 4a85caf9e129639a5616ac000dbac59bd50b84bc8d464114079c34c5b58d7d40\ - 027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b65c2ebac05da09\ - e40cdc417024cccba267a98f4eb69701a276b4f117662b566605c36054e7f015\ - d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029ef5c25c55ae998\ - f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024188627cf5ce686\ - 74e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b0219232cf9bee9\ - d56c8bd8252d1edb59d99c40cf32d07d9e5a48930281c100f028143e3f9d1317\ - aafb814215ffda9c584da8943e96212c90a082c3d2f335e8a6b64d1c890aa222\ - 4ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b801218ac270acdd4\ - 5579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f054d95150af96f9a\ - 7488010787a799c544883ff76a4e3092f2ca9aa9000cecb88dda343c972c8192\ - a83820727b1945c1a270cf913ab932457e8e6e207d06cd0efdf265b762b9fa15\ - c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be430381c5000281c100\ - 819c8cedb9c014aa577e9046b90795accbebe81bef68b1b5c37c68cb357e1a5f\ - f92761bc26cb0953956b6c0aec05acfc9d1a27c50789793b13d9eaf2361760c9\ - 7a7d86e7d922f4809a5d2d01448e938190bbc24c150e03ef8305365ddbf5ca19\ - 6857314e3b3023f8ddc9d209bd7dad1ee763e7003fd1b0c53057d2e9acadd23a\ - a18f83d20143bc41a2dfa4a164c82621fc0f800052ec01bec7c99c66fe20ec57\ - 67e6fbbe8810cd5aa75eff3d8a4cb53e1259ebcfebcc2fcf21ba7f3589cd525a -Test: KeyPairValidAndConsistent -Message: 9F6DC301DF53FE22CAC0 -Signature: 15B22111FEFA4AC1E53F2FEC346559E3613BB94F7BB3E2B7551D8B982FA10C38E7F182834DFC7391155FFA42AB945A29E118 -Test: Verify -Message: 2D7B5B9A27EAB468331E -Signature: 029EEA97097FE926DD09821284BCA3F45750B1F8102380D20100596D914DBF6BEFBE1B7A938E3AA5D656B6FD99E8EEE7C606 -Test: Verify -Message: F552FCBBA04FFCCC5CB6 -Signature: 115DE3CC1553CD5E4D40CCED80146DB1D76C10D992AACBCBCB05375C5FDA9F65B9A19DF7E51E6A36A3F2830AEA433AFD4F8B -Test: Verify -Message: 0D52B894153A4BB74068 -Signature: 0F6B8CC28D82E22B9B87D62CFF5C7B2289BB2F8008C42F105B2322CF95BC6D443A9D89A292F482490D94693A44DDF7AC4BD3 -Test: Verify -Message: 294442E103CC0CBA32A6 -Signature: 0FBD8768A18C2B28CE95775AD734157C34C1C3961C1DBBAFDD0A3E92A312A7925AFC9F7F4760FB0C56B42A2042C6B8B37C0E -Test: Verify -Message: E993D8FE1E6F6C3914ED -Signature: 0559D66BAC906C607BBA769AAFEB93E9AEC55FDD4597E432870CDC8A3DF9778301A0B218C886F6B08A414C51BD2F8214201A -Test: Verify -Comment: 2048-bit DSA key -PrivateKey: \ - 3082025d0201003082023506072a8648ce3804013082022802820101009a0886\ - 5d2bc9e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a8f012f\ - 00e52f7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035eda72e1f\ - 31f82c8d64c86e686899d53c0200282f407ceb1507db480f1db223606a57466c\ - f60fe9fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5ebf65e\ - 4dfc2837e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26a64e9b\ - fcaa82334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68f6678f\ - accdb7f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f7345a37d\ - dc1ccdea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f021d03\ - f35f80fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab541702820100\ - 75c5d8c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1\ - 6757684d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9\ - b6e962594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4\ - 0131081f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b59\ - 4b1774d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2\ - 092aa583c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b\ - 8ad4d89f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc707\ - 4ee3a0b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a\ - 041f021d0212c34d3d17b96a899548ebf43bb886676acebd2f040f5b33a4e88d\ - 2d -PublicKey: \ - 308203423082023506072a8648ce3804013082022802820101009a08865d2bc9\ - e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a8f012f00e52f\ - 7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035eda72e1f31f82c\ - 8d64c86e686899d53c0200282f407ceb1507db480f1db223606a57466cf60fe9\ - fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5ebf65e4dfc28\ - 37e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26a64e9bfcaa82\ - 334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68f6678faccdb7\ - f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f7345a37ddc1ccd\ - ea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f021d03f35f80\ - fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab54170282010075c5d8\ - c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1675768\ - 4d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9b6e962\ - 594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4013108\ - 1f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b594b1774\ - d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2092aa5\ - 83c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b8ad4d8\ - 9f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc7074ee3a0\ - b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a038201\ - 050002820100267f9c3ff3ee3cbc0f9e94dc7e6837e1ff65175e967987b90b9a\ - ea7eef1de6e4c342bebb5dbd0c4e2f6514f2d487857a146dda6cfdbc8b56ed25\ - 4cd65754d84dd21a271cd15fc656274725643728b41ce3f0e6872b6dfb4c289e\ - 03f9b903880ce3d7d745dfbb641c8c42ec0bfb6951ca2611fd877c32248c9725\ - 2bdb42d7bd65ebc50653dff389526c546d1e6ebaf6bd8b3298c01935901b7efb\ - 288b78730d89fba7f46f2a642aee0dbc93aa29c190b201acf89d4f8ba28f3e3f\ - 54a1c5a48294dda908f904afb7db398682c809ce13abd49279221d5b40ad7621\ - 6bad7ca256d718d3552344c481b20da5aac3e637fb7edeaf7960b532ef761376\ - 489f02fa8c10 -Test: KeyPairValidAndConsistent -Message: 5F3914F7AE0F6C76D152 -Signature: 03D30B7EAADDCB384CECDBB7541DFE57187242C836A6C72AF6C2525E1A01DB97DF3F41156089162FAFC87361F2F28E55616A50633637FB13EFE3 -Test: Verify -Message: 769583D4E7EAD14C137A -Signature: 01DC2815FD4918B8D314526066A03AD6593C8CED9E1ED04252B1BBA59D019F1C965028DA88BF4DB35AEDBA2C3C963B7933E5C07C590EF78BDFA1 -Test: Verify -Message: 6441D5239F50C71DE0F5 -Signature: 013F6D395DE56832F72F17F7F7572BB6DD1C48BADCBDEA91F0A634486E034B617DA8F5AB5E6F78C691313F822C599B6400A0A119A5DA330C6830 -Test: Verify -Message: F1C2D4F7C3ECDF2C17B7 -Signature: 006441A8B3517613F950BC1C84504082C0C3EA10CC08DCC1DA22E05480036D78345B17244F0DE41DA8342AF3441489CF9880BAA01BF2745CAB3A -Test: Verify -Message: 752A1F2B8D9A717A882F -Signature: 0127027984402F5B8C7DB1B7666FFA787548E4200D26B9D3B20EA9B4370298A9BDC901F324844613E8B5F34F2BFE40D9E6513D0E207B5105A9B1 -Test: Verify -Message: 666DC6B1E871026EDE56 -Signature: 03E87B55A7E81318B6B7057C901F8E3DC564053C1EA08B1F1FD965453803F21C20CE7FCCF606FB1328EC987666E87AF16ABE6B42DB854BFAA019 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/eax.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/eax.txt deleted file mode 100644 index 8b77f82f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/eax.txt +++ /dev/null @@ -1,75 +0,0 @@ -AlgorithmType: AuthenticatedSymmetricCipher -Name: AES/EAX -Source: http://www.cs.ucdavis.edu/~rogaway/papers/eax.pdf -Plaintext: -Key: 233952DEE4D5ED5F9B9C6D6FF80FF478 -IV: 62EC67F9C3A4A407FCB2A8C49031A8B3 -Header: 6BFB914FD07EAE6B -Ciphertext: E037830E8389F27B025A2D6527E79D01 -Test: Encrypt -Plaintext: F7FB -Key: 91945D3F4DCBEE0BF45EF52255F095A4 -IV: BECAF043B0A23D843194BA972C66DEBD -Header: FA3BFD4806EB53FA -Ciphertext: 19DD5C4C9331049D0BDAB0277408F67967E5 -Test: Encrypt -Plaintext: 1A47CB4933 -Key: 01F74AD64077F2E704C0F60ADA3DD523 -IV: 70C3DB4F0D26368400A10ED05D2BFF5E -Header: 234A3463C1264AC6 -Ciphertext: D851D5BAE03A59F238A23E39199DC9266626C40F80 -Test: Encrypt -Plaintext: 481C9E39B1 -Key: D07CF6CBB7F313BDDE66B727AFD3C5E8 -IV: 8408DFFF3C1A2B1292DC199E46B7D617 -Header: 33CCE2EABFF5A79D -Ciphertext: 632A9D131AD4C168A4225D8E1FF755939974A7BEDE -Test: Encrypt -Plaintext: 40D0C07DA5E4 -Key: 35B6D0580005BBC12B0587124557D2C2 -IV: FDB6B06676EEDC5C61D74276E1F8E816 -Header: AEB96EAEBE2970E9 -Ciphertext: 071DFE16C675CB0677E536F73AFE6A14B74EE49844DD -Test: Encrypt -Plaintext: 4DE3B35C3FC039245BD1FB7D -Key: BD8E6E11475E60B268784C38C62FEB22 -IV: 6EAC5C93072D8E8513F750935E46DA1B -Header: D4482D1CA78DCE0F -Ciphertext: 835BB4F15D743E350E728414ABB8644FD6CCB86947C5E10590210A4F -Test: Encrypt -Plaintext: 8B0A79306C9CE7ED99DAE4F87F8DD61636 -Key: 7C77D6E813BED5AC98BAA417477A2E7D -IV: 1A8C98DCD73D38393B2BF1569DEEFC19 -Header: 65D2017990D62528 -Ciphertext: 02083E3979DA014812F59F11D52630DA30137327D10649B0AA6E1C181DB617D7F2 -Test: Encrypt -Plaintext: 1BDA122BCE8A8DBAF1877D962B8592DD2D56 -Key: 5FFF20CAFAB119CA2FC73549E20F5B0D -IV: DDE59B97D722156D4D9AFF2BC7559826 -Header: 54B9F04E6A09189A -Ciphertext: 2EC47B2C4954A489AFC7BA4897EDCDAE8CC33B60450599BD02C96382902AEF7F832A -Test: Encrypt -Plaintext: 6CF36720872B8513F6EAB1A8A44438D5EF11 -Key: A4A4782BCFFD3EC5E7EF6D8C34A56123 -IV: B781FCF2F75FA5A8DE97A9CA48E522EC -Header: 899A175897561D7E -Ciphertext: 0DE18FD0FDD91E7AF19F1D8EE8733938B1E8E7F6D2231618102FDB7FE55FF1991700 -Test: Encrypt -Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7 -Key: 8395FCF1E95BEBD697BD010BC766AAC3 -IV: 22E7ADD93CFC6393C57EC0B3C17D6B44 -Header: 126735FCC320D25A -Ciphertext: CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E -Test: Encrypt -Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7 -Key: 8395FCF1E95BEBD697BD010BC766AAC3 -IV: 22E7ADD93CFC6393C57EC0B3C17D6B44 -Header: 126735FCC320D25A -Ciphertext: CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E -Test: Encrypt -Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7 -Key: 8395FCF1E95BEBD697BD010BC766AAC3 -IV: 22E7ADD93CFC6393C57EC0B3C17D6B44 -Header: 126735FCC320D25A -Ciphertext: 0B8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E -Test: NotVerify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/esign.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/esign.txt deleted file mode 100644 index 63706717..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/esign.txt +++ /dev/null @@ -1,93 +0,0 @@ -AlgorithmType: Signature -Name: ESIGN/EMSA5-MGF1(SHA-1) -Source: Crypto++ 5.0 test vectors, generated by Wei Dai -Comment: 1536-bit key -KeyFormat: DER -PrivateKey: \ - 3082014D0281C100E2A6788AB3CC986AEC06C51690143D3677141645D0628165EE924B9AFB7E6EDD\ - 52D90145B2F6031522C7A6CEC05E358F42B7837DACEA589F868F8DCA1C0F5FD8E5EDB8BBBAFCFF6D\ - 64CFCFBE68F46FBA6EFF45BC9D0CBB4F7F6075F5FFC2049C2F304B51C417764E18D182926E02D411\ - 6CE5C5C010E3D0AA6872A49B0D1FF4B37D54689C31F5821D04E9D4DB34D7536EE7F88B8C481B0EC1\ - F93193A0B70567E6FD76E9FAC4F67BB47DACD356D0C8015261E068DDF8C34C0CAFCF3FA775577FEB\ - 020120024100FAF0F292EE96D4F449024F86C0A104E0633C722586EC00AD33E0234629825D2081BA\ - 337597889CAC55DC6BEBDD8F13FE3AA2133D6371601A37D195DA7BC45EF3024100EBE16F88887A42\ - 5AA08E271467CC2220DC44012AB24ED4FF3512A96E8CB600C8BBCB771459FF0EE63D4B6786952A83\ - A7143A775073F0A1D69B6D0B5817755673 -PublicKey: \ - 3081C70281C100E2A6788AB3CC986AEC06C51690143D3677141645D0628165EE924B9AFB7E6EDD52\ - D90145B2F6031522C7A6CEC05E358F42B7837DACEA589F868F8DCA1C0F5FD8E5EDB8BBBAFCFF6D64\ - CFCFBE68F46FBA6EFF45BC9D0CBB4F7F6075F5FFC2049C2F304B51C417764E18D182926E02D4116C\ - E5C5C010E3D0AA6872A49B0D1FF4B37D54689C31F5821D04E9D4DB34D7536EE7F88B8C481B0EC1F9\ - 3193A0B70567E6FD76E9FAC4F67BB47DACD356D0C8015261E068DDF8C34C0CAFCF3FA775577FEB02\ - 0120 -Test: KeyPairValidAndConsistent -Message: "test" -Signature: \ - A3E32065DEDAE7EC05C1BFCD25797D99CDD5739D9DF3A4AA9AA45AC8233D0D37FEBC763FF184F659\ - 14914F0C341BAE9A5C2E2E38087877CBDC3C7EA034445B0F67D9352A79471A523771DB1267C1B6C6\ - 6673B3402ED6F21A840AB67B0FEB8B88AB33DDE4832190632D512AB16FABA75CFD7799F2E1EF671A\ - 7402370EED0A06ADF41565B8E1D145AE3919B4FF5DF1457BE0FE72ED11928F61414F0200F2766F7C\ - 79A2E552205D975EFE39AE2110FB35F480814113DDE85FCA1E4FF89BB268FB28 -Test: Verify -Message: "test1" -Test: NotVerify - -AlgorithmType: Signature -Name: ESIGN/EMSA5-MGF1(SHA-1) -Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \ - ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.1-3 ( 1152 bits ) -KeyFormat: Component -Prime1: ec8b4bdc9a56ae7b60619814ec45d617246063b5aac39c286f7c82ec2824c245001b678217a7cf178979c7270eb510db -Prime2: e7b1c3ae3494d0ac7b6868a53a5fe3ba19471437c54b25699e8c348a003e5e1d4c6d244d4f6a78f260c98fc54795a6a3 -Modulus: c5d0b8fac0cc6acc9d52c61200b541f7b4f8ff9f1bda97e0ebf78a3df768ba70ade59306d6ae65655bff7c6a94518c91e43dc0003b6f8730acc244799bdacb1e5070c6ea3089ea83bd5ef0a533adf3d9d63c0e88ce74545cfb21213fc33813fd913c6a6cf84b5adabc7d74751e9945521ac76a790bba95ad48d9d3fb2fbc4b0ed2ddee7d5ea6aa61633eccdac6381fab -PublicExponent: 0400 -Test: KeyPairValidAndConsistent -Message: 86f28c1cb5e640548309b85dc6e64c1a -Signature: 348dc9a0943b1e2ba7ef501cbe970a023b37ca4019b9a5cb35ffc3bcdb28dcbd4193d7817d418bbaf291d97a1eeb918a03ee65caa7ad26c24f9ef807c8798ade5b70d7328cd36ac0844bf63f511bb63067e8236d084cf8af68e88155ea94b978aab6bd0339c55d976434423fc779d549779e81f528d028c7343e060544410e528814fb0874417d1eedf38d6db4b97dd6 -Test: Verify -Message: 2fd87bfa6c8a965c9e1aaa8e3574202b -Signature: 561ad8bd11270c71f00af0e0cf256d858c757e8b55b9c4d6fb6bf71598ab59352992656348c1ff1ccda14fb7c5c3b53be49727c07422b78ffc380eeb03be7bdf07b279337af8a1eb7c5bdb725b33a82926b6afb7a1fff0750cc2532c6f96e28d7f1e621cf222b42bb850312f1a5fb7d99acd1c6f6d2347a121dd478374d6a40a7b0cd42e430f01b926135fc8d850366a -Test: Verify -Message: 888330ef1dc1588d578badde35c98d1e -Signature: 915d64d7b9b811fe8b58eaff4c2bf9ce2ad886eef95b28093f8c21f4ca950fdb2f6e77f97d0f2f8158445347f5b3ce33e082f3b5204522e15614d1891078d9557796726b5555cbd8d5489638ecf4738257dea70175fe27de54b1f45c0a96c229bd59260bebfb241e8eacb8a1a23b9a9a79b6d1f52cfed8cca2f1968e37d76c435ad1acd44131ef2c5f5e4ea8a33aee4e -Test: Verify - -AlgorithmType: Signature -Name: ESIGN/EMSA5-MGF1(SHA-1) -Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \ - ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.4-6 ( 1152 bits ) -KeyFormat: Component -Prime1: d64dac2fb3506111bbac11a04e138d2d6f32df119f2f259065cf5785a46aaf404ad887f0a310b36be4a3a1a33c8a054f -Prime2: d1158628ed1e0695c02a821ab8590f59fc1a3fb1e19ee192ab789e9d963766d78f55cfef9bf58c0c774a32d8a8943955 -Modulus: 92855120174c4a115bf525fa1f2ebf68d8328162149a5a6751b2512584eab7e5582d38d0e5029e01ece85a484030bb884a29121d8924f0195b22842b16436cd36c33bbe843e1cf7a585e89894b14595641d081a3077d667096df251bd93c86ebd94e0d555601794fa66fa2bcea920287c19922bed486a4f631390d1e36cc3635b509cb14c44d50313919a6cbb75eff35 -PublicExponent: 0400 -Test: KeyPairValidAndConsistent -Message: 16a3632339c463e243a4909f8a3810a8 -Signature: 7d8790ee852a4f3ba8bb3fa0f6fc30c29b6bc2bc538195826544138dcb92500122148ac2cf0dc77dd37182c2267a73317ce5b2ae26db79204abe0e10c7212ba8de99fdc5cf498f7ee689588541fb78291afb9b65242f725a4aa32b119957b4314a58b4239a0235b9b1a8a6efbaa3601961d4b0730a6d9e5659f20105931d473daf3d378b39b7f3f01516d72ade9ef68a -Test: Verify -Message: ef8bcad6c164a86b0e0a3c011d556744 -Signature: 6ce6024f64a7f04a0fe29b65cf2ec2ac49d9f90078a77db8bc260d3cfef233165a90b29d5787218b4d05a0e9321f2e802a8ed6d1a4201feb982a5d06bef051d60436d8c61a249432e662e625806526075f02b60d198142b96b67a4ac31d0071a1f971dae5a6a1b6db177591edfe80f7e51c7335441490f05f214b5a1aec94de572e3ec11ef4bebeb42f27037d38a186f -Test: Verify -Message: 29023889c79230c1c479820c5ff2e006 -Signature: 85f0b648ee0f6d30a18666e2da8bcda319ede91ca18e018548e2a1c21b0e0049b91528eba4da3be4551b26c4e59e6aba25312874f2320eaf7c94c541e17fb16fb0d9d9928ea526b0fc0c0fb2d12e425a5917e4039a5366585327bc3456107ff31c889c5e04259457dfe65952dc43cd35f4ca689272769096b9583bbffad4a057673f938fa7192bbca44598cf5600e3eb -Test: Verify - -AlgorithmType: Signature -Name: ESIGN/EMSA5-MGF1(SHA-1) -Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \ - ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.7-9 ( 1152 bits ) -KeyFormat: Component -Prime1: fd5708b30e8ee342bacaeb01c0d3baa91a833dacff2878c7df62e04a65afe770acdcefeaf8a72a5809387e5ed97756ef -Prime2: fa335563d5da151e3ab025f3b77d3f1eaf4a0d431012e79b12ca8ec433d347bd9a2b5179f2ed332a19ea2cad694c97dd -Modulus: f5072ba25e7df2c0e0a0abde031dda9534a493396ab895e6132abc90f993535ce55d6395e1fd548371228decc1cfefa9737344243ddb1eccbbc22d68571617afb23638c3f0222a84b0a8c9889ab934aa84cc92e14d972670db6d2105bbd0212c1843ff0ccbae19535ac01cf02ad98aa941fce32fac874cea7f1f83969fbaf025fb562a087efb4652210d45279312da7d -PublicExponent: 0400 -Test: KeyPairValidAndConsistent -Message: abbf5c71245af5d272e627ec845e9ed4 -Signature: b75e2869c052df20d6c008dd911a5bd752d5a23ee42ae47def37f76f6b2d5f04eb8d9b0783c502e0abd30bc567a6672292c3a6736fe8d4034fad857456cd599259d09f42f1d4c64d244fd149f6316f0b763be0de4f9da7f9649a76b984fe2ae99293d406904a9df59d28cc8a58b7ad0029657a47ac0e28d6353287df1ea8feef2fbb65d86425e80487420c1c9c1bda7e -Test: Verify -Message: cf2c943bc4c23175b43ba128c75339d1 -Signature: 64616eb627bf49c2a5a183479a66b7dae12cd1a0982baa0cc12329f594196b9de47909e6b5cf4653bfccdeeb5478fd88c31c197c9adc335a84ec58664ce5fc55c7b2f17b0f32ffac4ff3f3b4ddb3ce125ab7e43efc0be6ae8357895ab5f118a4ec71b57cc1b252373fecd4a1f404ed295f2d97868e3737fdd6fdf124bc2f1e083b57d5c237db775d429d08d5b5ced857 -Test: Verify -Message: 4d011f09f665d5f4a12595900e3827ec -Signature: 1911d3df18bdd9907b69ce6b655086c952c92d826bbef199fb1e0dcb7209a1b28d0a03beabc9e7d8df052febe26f691ff808caaac697c3005d524f3da8c700bf620aa37fd0793b3f22c6a488d733336d040642e0767755391951a754a1111345b912b4c0228ab154eb4baac0383a54023bd7c7ea2ed4bb894444b80d7e5f18407f51c3af858b9fa9198190b4b540fce8 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/gcm.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/gcm.txt deleted file mode 100644 index b32240e3..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/gcm.txt +++ /dev/null @@ -1,168 +0,0 @@ -AlgorithmType: AuthenticatedSymmetricCipher -Name: AES/GCM -Source: aes-modes-src-07-10-08/Testvals/gcm.1, Basic Tests for GCM (compiled by B. R. Gladman) -Key: 00000000000000000000000000000000 -IV: 000000000000000000000000 -MAC: 00000000000000000000000000000000 -Test: NotVerify -Key: 00000000000000000000000000000000 -IV: 000000000000000000000000 -MAC: 58e2fccefa7e3061367f1d57a4e7455a -Test: Encrypt -Key: 00000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 0388dace60b6a392f328c2b971b2fe78 -MAC: ab6e47d42cec13bdf53a67b21257bddf -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbaddecaf888 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 -Ciphertext: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e 21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985 -MAC: 4d5c2af327cd64a62cf35abd2ba6fab4 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbaddecaf888 -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e 21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091 -MAC: 5bc94fbc3221a5db94fae95ae7121a47 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbad -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c7423 73806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598 -MAC: 3612d2e79e3b0785561be14aaca2fccb -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308 -IV: 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca7 01e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5 -MAC: 619cc5aefffe0bfa462af43c1699d050 -Test: Encrypt -Header: -Plaintext: -Ciphertext: -Key: 000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -MAC: cd33b28ac773f74ba00ed1f312572435 -Test: Encrypt -Key: 000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 98e7247c07f0fe411c267e4384b0f600 -MAC: 2ff58d80033927ab8ef4d4587514f0fb -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c -IV: cafebabefacedbaddecaf888 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 -Ciphertext: 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c 7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256 -MAC: 9924a7c8587336bfb118024db8674a14 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c -IV: cafebabefacedbaddecaf888 -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c 7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710 -MAC: 2519498e80f1478f37ba55bd6d27618c -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c -IV: cafebabefacedbad -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057 fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7 -MAC: 65dcc57fcf623a24094fcca40d3533f8 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c -IV: 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e45 81e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b -MAC: dcf566ff291c25bbb8568fc3d376a6d9 -Test: Encrypt -Header: -Plaintext: -Ciphertext: -Key: 0000000000000000000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -MAC: 530f8afbc74536b9a963b4f1c4cb738b -Test: Encrypt -Key: 0000000000000000000000000000000000000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: cea7403d4d606b6e074ec5d3baf39d18 -MAC: d0d1c8a799996bf0265b98b5d48ab919 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbaddecaf888 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 -Ciphertext: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa 8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad -MAC: b094dac5d93471bdec1a502270e3cc6c -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbaddecaf888 -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa 8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662 -MAC: 76fc6ece0f4e1768cddf8853bb2d551b -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 -IV: cafebabefacedbad -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0 feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f -MAC: 3a337dbf46a792c45e454913fe2ea8f2 -Test: Encrypt -Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 -IV: 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b -Header: feedfacedeadbeeffeedfacedeadbeefabaddad2 -Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 -Ciphertext: 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf4 0fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f -MAC: a44a8266ee1c8eb0c8b5d4cf5ae9f19a -Test: Encrypt -Header: -Plaintext: -Ciphertext: -Key: 00000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f 303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f 505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f 707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f 909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeaf b0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf -Ciphertext: 0389d8cd64b3a595fb21c8b27dbff077 e784b8b85d5e4f34efe493e48896dfff 002333026a56b2fd08a09c87fcbe85cf f97c902a25bb1f4a43478687f5feb6cd ca9f3fc6ecab732627386ee2996a4cde c5e91f48c293c6a87774b950aeb1d7bf 62321a0d76006297b2d06623cf6e4fb1 433494c3326b0ae914120085a195413f 5e3278e4107d7b08dd2107405610e67d 83ed5b5ba0b591e9e46b1029f5f6936f fdb0e788fc09f60d861a0b3e1ab6294a 76ebdf6663421ef7dd6c1bc448dfcdb7 a0c38bae72fa627ed327f2b46fcec25a 77ee5fd7e3354788643c0d7df15075d5 -MAC: 6b385f3012eafda4189da7ad3b6eafbf -Test: Encrypt -Key: 00000000000000000000000000000000 -IV: 000000000000000000000000 -Plaintext: 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f 303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f 505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f 707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f 909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeaf b0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf -Ciphertext: 0389d8cd64b3a595fb21c8b27dbff077 e784b8b85d5e4f34efe493e48896dfff 002333026a56b2fd08a09c87fcbe85cf f97c902a25bb1f4a43478687f5feb6cd ca9f3fc6ecab732627386ee2996a4cde c5e91f48c293c6a87774b950aeb1d7bf 62321a0d76006297b2d06623cf6e4fb1 433494c3326b0ae914120085a195413f 5e3278e4107d7b08dd2107405610e67d 83ed5b5ba0b591e9e46b1029f5f6936f fdb0e788fc09f60d861a0b3e1ab6294a 76ebdf6663421ef7dd6c1bc448dfcdb7 a0c38bae72fa627ed327f2b46fcec25a 77ee5fd7e3354788643c0d7df15075d5 -MAC: 6b385f3012eafda4189da7ad3b6eafbf -Test: Encrypt - -AlgorithmType: AuthenticatedSymmetricCipher -Name: AES/GCM -Source: Generated by Crypto++ 5.6.1 -Comment: long test vector with odd length -IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 -Key: 2b7e151628aed2a6abf7158809cf4f3c -Ciphertext: BD70C168B0D4371B0A85B4B5D65D92569B17 \ -F9A3D0A25B9F608E2C34621CF4D37357845431E04E585CDAAD7527BF8A2426DEEF451320C78D5EF0 \ -9F5B11A8B8C700CD329A3D4CDED92C20F6BF28CB3627681C5B0AF2B5692CC7EC9049008ACBBD127A \ -9CD8DEF00425697E0BCF67E05AEE70EA1A5D7EE95E3B88FBAF3C196AAAECB73E09BDF057AF701A02 \ -42394BCC104FF4F75F15D287325FCFFDB7E7FF3A939A80A6A3A9D7570E6EF6AD0BBE6E291338938D \ -2FEBBC7D5EE95CD73E752ACD48915DCAE0A0807E6F4B2ADADBD945667318264EF7D8C2ECC0B8FB67 \ -A43614C5F5EA51CADD4AEE91DC371A7FC5A3B4581D1D9DD99608CD2BB0338F82933C19F5B8EBAD6B \ -BA583835FBD29136302BAC163F86CA9E3E6F3B5BFDEFAB3E4B019190AE2EBC0B71034EA9BF882879 \ -139FFE76DD997F6729425F3D5C5392762C245769D18CC963C92211B71F564203AFBF68626C083303 \ -1D449B02DFA5C0F09FAFCE951FE35F4AD8122AB682A4AF28931113F75615E12DB05DD9247973F1C6 \ -057666848C13EDE41192F38948366D468D84CAF896EFF724082D2BAB2376E2813B41A014999B0EE7 \ -377758715D9554926AB3514EEB96A0ABD501D94A05692D858190D5AD307CEB6E6C8A63841A8257BE \ -C2527C4B937840AA51292E15834AB801F0275A6A4B1B6E969B7A7FCE217D6F823CDE1760F847E8F4 \ -6CBDE152A24F2319EC2A7089D2954259D30332089FF928034391D1B0B8AFD7C8A5D4F8E0DAB5883C \ -A7D581F78E4848DC3B01E5F2A5C01BA8910D0F144BC494E29450271174B866868EE8DC6B0DD396ED \ -9D72F83DE3BB6DE6FEBC64178961E011D0D746C2CE3A0FBD05CDF8FA79AC03E94C88368BD903E142 \ -7FCFC30C9D100E220B4CB9B7BA242DA49D334E930B6C4EB877D1DF2C0F8CF4AF7813E2F295929707 \ -19846FC52A47FCE6E71DC5E58FC5F49C91BDE56B7A2A68CFA994D6BFA5357A8403A2B37C69A6A0A4 \ -35E4AB4C9E450473AF0CDFDBCC238A2DD7 -MAC: 4FEA89D75727E82B3A9F9EEB5E217A3E -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/hmac.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/hmac.txt deleted file mode 100644 index 2a604bba..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/hmac.txt +++ /dev/null @@ -1,281 +0,0 @@ -AlgorithmType: MAC -Name: HMAC(MD5) -Source: RFC 2202 -Comment: Test Case 1 -Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: 0x9294727a3638bb1c13f48ef8158bfc9d -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 0x750c783e6ab0b503eaa86e310a5db738 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 0x56be34521d144c88dbb8c733f0e8b3f6 -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 0x697eaf0aca3a3aea3a75164746ffaa79 -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 0x56461ef2342edc00f9bab995690efd4c -Test: Verify -MAC: 0x56461ef2342edc00f9bab995 -#TruncatedSize: 12 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 0x6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd -Test: Verify -Comment: Test Case 7 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data" -MAC: 0x6f630fad67cda0ee1fb1f562db3aa53e -Test: Verify - -AlgorithmType: MAC -Name: HMAC(SHA-1) -Source: RFC 2202 -Comment: Test Case 1 -Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: 0xb617318655057264e28bc0b6fb378c8ef146be00 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 0xeffcdf6ae5eb2fa2d27416d5f184df9c259a7c79 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 0x125d7342b9ac11cd91a39af48aa17b4f63f175d3 -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 0x4c9007f4026250c6bc8414f9bf50c86c2d7235da -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 0x4c1a03424b55e07fe7f27be1d58bb9324a9a5a04 -Test: Verify -MAC: 0x4c1a03424b55e07fe7f27be1 -#TruncatedSize: 12 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 0xaa4ae5e15272d00e95705637ce8a3b55ed402112 -Test: Verify -Comment: Test Case 7 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data" -MAC: 0xe8e99d0f45237d786d6bbaa7965c7808bbff1a91 -Test: Verify - -AlgorithmType: MAC -Name: HMAC(RIPEMD-160) -Source: RFC 2286 -Comment: Test Case 1 -Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: 0x24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 0xdda6c0213a485a9e24f4742064a7f033b43c4069 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 0xb0b105360de759960ab4f35298e116e295d8e7c1 -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 0xd5ca862f4d21d5e610e18b4cf1beb97a4365ecf4 -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 0x7619693978f91d90539ae786500ff3d8e0518e39 -Test: Verify -MAC: 0x7619693978f91d90539ae786 -#TruncatedSize: 12 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 0x6466ca07ac5eac29e1bd523e5ada7605b791fd8b -Test: Verify -Comment: Test Case 7 -Key: r80 0xaa -Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data" -MAC: 0x69ea60798d71616cce5fd0871e23754cd75d5a0a -Test: Verify - -AlgorithmType: MAC -Name: HMAC(SHA-224) -Source: RFC 4231 -Comment: Test Case 1 -Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: 0x896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 0xa30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 0x7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 0x6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 0x0e2aea68a90c8d37c988bcdb9fca6fa8 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r131 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 0x95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e -Test: Verify -Comment: Test Case 7 -Key: r131 0xaa -Message: "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.") -MAC: 0x3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1 -Test: Verify - -AlgorithmType: MAC -Name: HMAC(SHA-256) -Source: RFC 4231 -Comment: Test Case 1 -Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: a3b6167473100ee06e0c796c2955552b -Test: VerifyTruncated -Comment: Test Case 6 -Key: r131 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54 -Test: Verify -Comment: Test Case 7 -Key: r131 0xaa -Message: "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.") -MAC: 9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2 -Test: Verify - -AlgorithmType: MAC -Name: HMAC(SHA-384) -Source: RFC 4231 -Comment: Test Case 1 -Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: 88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27 -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: 3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 3abf34c3503b2a23a46efc619baef897 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r131 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952 -Test: Verify -Comment: Test Case 7 -Key: r131 0xaa -Message: "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.") -MAC: 6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e -Test: Verify - -AlgorithmType: MAC -Name: HMAC(SHA-512) -Source: RFC 4231 -Comment: Test Case 1 -Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b -Message: "Hi There" -MAC: 87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854 -Test: Verify -Comment: Test Case 2 -Key: "Jefe" -Message: "what do ya want for nothing?" -MAC: 164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737 -Test: Verify -Comment: Test Case 3 -Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -Message: r50 0xdd -MAC: fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb -Test: Verify -Comment: Test Case 4 -Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819 -Message: r50 0xcd -MAC: b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd -Test: Verify -Comment: Test Case 5 -Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c -Message: "Test With Truncation" -MAC: 415fad6271580a531d4179bc891d87a6 -Test: VerifyTruncated -Comment: Test Case 6 -Key: r131 0xaa -Message: "Test Using Larger Than Block-Size Key - Hash Key First" -MAC: 80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598 -Test: Verify -Comment: Test Case 7 -Key: r131 0xaa -Message: "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.") -MAC: e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/mars.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/mars.txt deleted file mode 100644 index 3ed5a107..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/mars.txt +++ /dev/null @@ -1,66 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: MARS/ECB -Key: 80000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: B3E2AD5608AC1B6733A7CB4FDF8F9952 -Test: Encrypt -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: DCC07B8DFB0738D6E30A22DFCF27E886 -Test: Encrypt -Key: 00000000000000000000000000000000 -Plaintext: DCC07B8DFB0738D6E30A22DFCF27E886 -Ciphertext: 33CAFFBDDC7F1DDA0F9C15FA2F30E2FF -Test: Encrypt -Key: CB14A1776ABBC1CDAFE7243DEF2CEA02 -Plaintext: F94512A9B42D034EC4792204D708A69B -Ciphertext: 225DA2CB64B73F79069F21A5E3CB8522 -Test: Encrypt -Key: 86EDF4DA31824CABEF6A4637C40B0BAB -Plaintext: 4DF955AD5B398D66408D620A2B27E1A9 -Ciphertext: A4B737340AE6D2CAFD930BA97D86129F -Test: Encrypt -Key: 000000000000000000000000000000000000000000000000 -Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Ciphertext: 97778747D60E425C2B4202599DB856FB -Test: Encrypt -Key: D158860838874D9500000000000000000000000000000000 -Plaintext: 93A953A82C10411DD158860838874D95 -Ciphertext: 4FA0E5F64893131712F01408D233E9F7 -Test: Encrypt -Key: 791739A58B04581A93A953A82C10411DD158860838874D95 -Plaintext: 6761C42D3E6142D2A84FBFADB383158F -Ciphertext: F706BC0FD97E28B6F1AF4E17D8755FFF -Test: Encrypt -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 62E45B4CF3477F1DD65063729D9ABA8F -Ciphertext: 0F4B897EA014D21FBC20F1054A42F719 -Test: Encrypt -Key: FBA167983E7AEF22317CE28C02AAE1A3E8E5CC3CEDBEA82A99DBC39AD65E7227 -Plaintext: 1344ABA4D3C44708A8A72116D4F49384 -Ciphertext: 458335D95EA42A9F4DCCD41AECC2390D -Test: Encrypt -Key: 00000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 3FE24DC09173D15F4616A849D396F7E3 -Test: EncryptionMCT -Key: 00000000000000000000000000000000 -Plaintext: 24BD3D2FC6FEE152D1D64545E2230584 -Ciphertext: 00000000000000000000000000000000 -Test: DecryptionMCT -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: 34EC834E2F30741ECB476DA7E9662BBD -Test: EncryptionMCT -Key: 000000000000000000000000000000000000000000000000 -Plaintext: 7F27C3397A8CEEF1BDF859459690FEA8 -Ciphertext: 00000000000000000000000000000000 -Test: DecryptionMCT -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 00000000000000000000000000000000 -Ciphertext: EDE145C10E279501D921C5E3B04420A6 -Test: EncryptionMCT -Key: 0000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 95615ADB0DDF6613A5E84F849AC8C00D -Ciphertext: 00000000000000000000000000000000 -Test: DecryptionMCT diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/nr.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/nr.txt deleted file mode 100644 index f08bb6ac..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/nr.txt +++ /dev/null @@ -1,615 +0,0 @@ -AlgorithmType: Signature -Name: NR(1363)/EMSA1(SHA-1) -Source: generated by Wei Dai using Crypto++ 5.0 -Comment: 1024-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 09b2940496d6d9a43bb7ec642c57b302e59b3a5155 -SubgroupGenerator: \ - a1c379ba91fe1f9d5283807b809c698bce4aee6f405f4de8c46becf33c08a63b\ - c5f8088f75b5b6bcfb0847ccbdee700e4e698652317bbd7a3056404c541136d7\ - 332c2b835ef0d1508ef57b437de60675f20f75df0483f242ddeb57efacd18041\ - 8790f4dec0a8250593ba36f17316580d50db1383ea93a21247650a2e04af904d -Modulus: \ - bd670f79b0cde98a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f\ - 6564e43a559a0c9f8bad36cc25330548b347ac158a345631fa90f7b873c36eff\ - ae2f7823227a3f580b5dd18304d5932751e743e922eebfbb4289c389d9019c36\ - f96c6b81fffbf20be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b -PrivateExponent: \ - 0355dc884345c08fb399b23b161831e94dbe61571e -PublicElement: \ - 255cf6b0a33f80cab614eafd5f7b2a6d83b3eafe27cd97b77ae70c7b966707d8\ - 23f0e6aaaa41dc005aaefd3a0c269e60a665d2642f5d631ff1a3b8701bc06be9\ - c44ab7367f77fefeec4c5959cd07e50d74a05af60b059ad3fc75249ecf44774b\ - 88b46860d9c3fa35d033bcfc7b0b2d48dc180d192d4918cddff4f7ebcdaaa198 -Test: KeyPairValidAndConsistent -Message: 66B92E1E2C44B80F7BFA -Signature: \ - 06e7586b76d5a8270155cce2d3ff4495237eed29a101eb1341fce0b43d95397b\ - 053d93772b0a9cf3117b -Test: Verify -Message: 973266BB0A492248082A -Signature: \ - 02de44ed2233f0f11dcf567217d2089ec039a211bf000d42e04900a66ce45c58\ - 526a97d7f4cfba29e43d -Test: Verify -Message: 9A6D079ED0CA9D8B40E8 -Signature: \ - 04f59dbb2712926b3bc1d3c428f16203f3443f88db0669adda94dcb54e1fff71\ - fb51bb603e7adff13f84 -Test: Verify -Message: AA34DCE67BCDAC927DA6 -Signature: \ - 08ad21bf9d0cc598a214329d3544685d39487988bb01aced68ad0a4831affbff\ - 3b14df6c0f4ac4d2e967 -Test: Verify -Message: 4EDAC08816AFDBF284DA -Signature: \ - 09a9d5aa9bd1b6b61fe8825128c8e52a6213692b2504c8c6951299b5ca51b03d\ - ea0a5e56f9a7c4cd44f7 -Test: Verify -Message: D82F2E903230962B8174 -Signature: \ - 0441c8d089e690a7fab391de07073326d443a0d9d806a3997ac1641175310890\ - 1e55582a582541330539 -Test: Verify -Comment: 1025-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 0b3949dadf3196f08bca0606f06443afce2fb1d02f -SubgroupGenerator: \ - 015f0f6d1729ef2af723c00e36450a04c7e7681d65b74a6417a53b3eb6036989\ - eff8e0ab11a7ec3ce2340b7c7a92e1a977aee52555c06c12c4cc28496ddc2598\ - feeb7539ce90d3888e21f61d7f14746cf67d9fed373afd97e2483700e300ed9d\ - a25e7200b363a4727ad201194b36ea5f816cf83488c3e527d3a5515870d2da63\ - d6 -Modulus: \ - 017310bf02d70ef2cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd\ - 553bc9368ddb154a55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4\ - a9c56c286305aa21ec4e35de7390747477b3bd574e7b87cbebde2f665703137a\ - 1172350ad2f48a0884d076ada9db82f104e6b0ad86693cd4adbd0067639102fc\ - f1 -PrivateExponent: \ - 0696b0f255468b7ac18e11632f208ca86383a46724 -PublicElement: \ - 45bf83e62f50190374b23de5e4a1d0278e9e8e6c8335577d62e80662a380c206\ - e326819c5082d321dfda1f905fa5a3ead9a2dc769885a27b1fd6a133185dc5a7\ - 876a76ab0a09fe02b7071a924169e4d2d2a67e67ed3628800134183b962c0b31\ - 3463aa154e6437d644e025ab234e63d19c129842a61c5e5ea5a06466c858c81c -Test: KeyPairValidAndConsistent -Message: 2F585D0CE4FA1CD93880 -Signature: \ - 06586d8a703cdc27200d5261853f50effa8ebbdfc905f5becb68b81eca506992\ - 50fb54e46d557c6095dd -Test: Verify -Message: 4F09A1F217B8393199EE -Signature: \ - 0622cd33b1d715829d8fae104759ed449f95becb5e03d36f5578fd6a2951d2e6\ - 26cfce85ba6563990d64 -Test: Verify -Message: 03D7110A753B008A76A0 -Signature: \ - 02925630b4c80e604fc1d8680bfd0e3d878e22b3a30ab8b10da7fc38816a8c5f\ - 1e06927c68f9d3db60d9 -Test: Verify -Message: 129F4781D417671F886D -Signature: \ - 016c2c4ce845b4d412828cbb8a396d080c7eb93bcb01f7010410198c8bac96df\ - 8ab8761cebdb7d87f3a2 -Test: Verify -Message: 3E1594F559D1248D1112 -Signature: \ - 080bab68c62be86ab2c1bfd0edf10387a7cd66b69f054e254218e01f650e4e8c\ - 6bfa10054e367893e59e -Test: Verify -Message: D6F0354F1B6B253B6997 -Signature: \ - 08755c7e8012e8160db75c6160686351e5c577207f01602b4dda2fa56b864374\ - 703c83bb323c7bb34f5f -Test: Verify -Comment: 1026-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 36bb68cd95dab195f14c4534283e7ea50b00cc31a3 -SubgroupGenerator: \ - e2782ad6992f4b7e88787b4d616744b60e095575a177569c4a069e311e38b724\ - 0c43343367e23574c30e4d9f05afe1fbe61423bab715915c4ccf28aa0ed2f52b\ - 092b86c8ec1f9d4795d6e91c88ba41297625c11a9e1f4f182da13cf51e541038\ - a1266bf32b2dd81ecd84bb80be8fdf97689942e944b7fbb6981e00cd680ee25f -Modulus: \ - 025098828217d00108030801e5f135fc6fd3010be39e49060a96addc8a081198\ - 803402c4b46e4ce0750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791\ - d02d8143e274b1325f2213e17f9384c805f479e52a3117cf84869d395f1bc025\ - c918484478d2da1880d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc\ - 17 -PrivateExponent: \ - 2db270c284328353f979cad99f4133c53acaa6ee71 -PublicElement: \ - 0179b283f67868aeded3a0c5633d0e6c18fad77174e2c89c03452593d05e77a9\ - fb029c0ccb2b6f2328e79c286ee392713f12d9d45578348383b81d11b0e0f7e8\ - 9965a7785d5ab64ea25bb73e8acaa8e84cb9897985015757a48c0b1dac3a6a60\ - 6fe671ea073ec434a46f227b8d4b02a46fbba2f6c6216736d669f55778d81004\ - d8 -Test: KeyPairValidAndConsistent -Message: 7E4F2ED4E79062778A2D -Signature: \ - 03f523873462ee1513833e2853c3b62e30c5c1cc3224f1a42dc154fa84ecce04\ - 487069530d76e0574a38 -Test: Verify -Message: A0E35846B5CF1B5BF560 -Signature: \ - 2264285d75a55c431a7adb9347bc07d58efbeb1dd9354d01b0b86f2875f8dec0\ - 294d20289d39369c5afa -Test: Verify -Message: 3B138785EFC6F520EAE0 -Signature: \ - 116e45961ca73f3ccf08b35f94877fef88772cf0fa2ab196c85a91104d8fbde6\ - 65b7032b2fb4011a88cc -Test: Verify -Message: 0F6BE2AA764B485145D4 -Signature: \ - 027ad753bde13c7f2fcd7571e5558f8af756cdb9463237fb0e285cb633cc86be\ - 1b410188d701f6ca83c6 -Test: Verify -Message: 6CD9FBD23EA58826FB04 -Signature: \ - 1651decd376899104e3fdbe40ab2d9bfd3c8577f3b092b66e3760678ecb3fc35\ - 23a59107e0bdccb76a73 -Test: Verify -Message: 473A82649565109E9E89 -Signature: \ - 2045ef56d92f89a214d76cca6b591068ac5f0d008c121ec4e5c4c1e8ca9b67cd\ - bb5ecc776a23b6d54ba5 -Test: Verify -Comment: 1027-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 291d0ba731a4303070504d8b9615640a5e1345e00f -SubgroupGenerator: \ - 051c9d0270b69ceef82af5aed5f91dc88d585096609d835d03d39cf3ce74f5a3\ - 402d4e8e192455493da61cc58ee6f54dd941172be3d7642169cbc52273f4b725\ - f1d6c820c3333336c64d32fb6238121b3ccb7c71b847764946bb0887a44ca9de\ - 802cda62efa9dda573751084225353f11ed837f3dc25de8374b6fdbfb6e313e4\ - 6d -Modulus: \ - 055402a8abe9cda3072ca8601d68032651feb0335856e57f8f8d4ec949098a64\ - 59151cefeef91b7aa733668c8cf0e9b96c93c61f3528d4036daa6565646f65d7\ - 4c4552817df7e5fb1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e2\ - 3fb5572a75f8f29b58bd5f7db435e8a92a923f15d50f34213d29816921bf195b\ - 2d -PrivateExponent: \ - 13b27094d9a5a3a9704cebdbe890da325fa26ad555 -PublicElement: \ - 03b06b99097cd7145c7d7782b02e247a4741f3c7f39233627f17e13ebff89a18\ - cad6a454c3f32f7ef2910384030da71ae47e1c3fa79c2141dad107f8e715e47f\ - b0bb626baafc35db769852ebbec2d339c3c3d5f2287cfdd20b3b78ea4607086c\ - 42558ae4637eddd6a74bc1072d0f34d9c0130cbc9e84f537e7ce50df502d17b5\ - c3 -Test: KeyPairValidAndConsistent -Message: AE6DCD9535AEEE3ECC89 -Signature: \ - 1c6794878aabf07cf9f59b685d4a3a6e51c9135dc101a4a6a62c95a20902e2fa\ - 23db7d15293f595f86ab -Test: Verify -Message: C83A14EAC016D659F9FE -Signature: \ - 18ed4812925dca6a9c30e2e3566433e202be2d305414e1e6583905ad845cbc63\ - 2049804932aac79b858c -Test: Verify -Message: 745E02041EB487D16CE6 -Signature: \ - 13d4ef1de59ef0fe9bc4ecc6d382908642f6f5793e255b819e25ed124f7fa574\ - d91fc2e9b258f0514b15 -Test: Verify -Message: 62F019655A83501FC4E7 -Signature: \ - 07f797768984ecc792f366ece16f5102aec2aac6d31fdaf3972839cac2c99a2b\ - f5b347c887d37943383c -Test: Verify -Message: 351D37A4B5046E885EAA -Signature: \ - 22064cd5179ff1551dbf73c5220e17a9dfa1aa8f7f22f44a6c70f13c6d0a21f8\ - 7e53278251037a6cdc5e -Test: Verify -Message: 4073D33915F595F4FF9D -Signature: \ - 1f902ea2c9521b8c7f11619d35dd22a4667e2eb89a017194bb68ec0a9df762c9\ - 377c1c075b5f09566048 -Test: Verify -Comment: 1028-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 2368e2b864b250ad45406391e7eeaa3d27cd053c2b -SubgroupGenerator: \ - 07c325695dfe315a77ad7b42f0d18f9d4821b5c153fee7385877602fa54477bb\ - 8c0639d2438f34352b97c22d02a7295d2b53d5286a01caa919d6283614690624\ - 240af922675ccd4a0534ec336cb79cde31b02b5988cc5a53ca17790d67d803a2\ - 7bb927b9c59bdc6ac794175e285cafdece6778ab19a0b444747fee20d5bf929e\ - 70 -Modulus: \ - 0abdeff64b6f28256e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467\ - c271bbb1e1fbb6af058517fdacdf26b5919674c625eced6317d8631c063f43b3\ - ade2cd633d554913339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253\ - f0f988c354725289f2897df0a15985c92b2d4da8d087870c251c72d979b8304d\ - 51 -PrivateExponent: \ - 0771305163506b2b83bd5279935df1b5fcf180b004 -PublicElement: \ - 043e4ae6244408879264fe6b859b578218705b9a45af22efded27141b7f090cb\ - cbe42dcf481df3e41b13920ae02b694eaa6bfd62f2d3c5d677b8c4ce783cbe27\ - 89e088b04489ef535ad4a517351c8835cf128f7ec677a1b1dbe3ae9cc4198ddb\ - 6e1cef8e978c0725f5063797bc43eb9ae496286cccbad5d4e026e9edb997d2f9\ - 18 -Test: KeyPairValidAndConsistent -Message: 4867852C83F181CDD010 -Signature: \ - 1db6a5661b20c9289428c3b9ebf65d5a8f757f3a3b1eb15dfaf0c8cefc891954\ - b48279eb45910a141ec3 -Test: Verify -Message: DA6493C86D6B62C5961C -Signature: \ - 1c05300a56319ba4a8ace1206f5f37b5bbefc9d80a171a57b6da3c02aa1f3079\ - 70583c008f073996d932 -Test: Verify -Message: AE2C1136BFE966794A6C -Signature: \ - 02dfd79eb18f3a862b11a5d199a7db1dc53580ade90517a7739cbd8ab1849c44\ - 54ba17a69b8d03ecc4f9 -Test: Verify -Message: B20160E0442E726BE749 -Signature: \ - 14c0cf809174d39f1324b7dd0d6d1fb3be5b5577c10048b12def39772fa60cd5\ - a9d2cca9075f12e5a3c1 -Test: Verify -Message: 3638935C4492F5CA42F2 -Signature: \ - 0081d7216636bc6fb9bc7a637a377ebf4f9048826e0360c8faf03dd28c4ee4a4\ - da82689259f140b3d918 -Test: Verify -Message: DFB674CA6E0FDC0CBE99 -Signature: \ - 1e3e21aa3dcccddb8cf3e360631fc36956263951ff18fec553531252b4dbe753\ - 6ed5fc62897d51500c38 -Test: Verify -Comment: 1029-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 3357536531dec150be0ef8747f69ea30d987ff7df1 -SubgroupGenerator: \ - 067dd80dbc6b41f58d08f077a9a3dcbfe12a62065fe6b4691c457f506b56dcab\ - 0433b3aad6ef962501633d0f3947b491a1317e7e6b632f062c53104d609c9222\ - b056f08a0c83662a70744331fd09b2b42fb0768e52da27e92732106fbd41ec73\ - 7373fd080b56b543d808d49eeb6e1bb0a8619b1edee8fb8295dc042423f684af\ - 8a -Modulus: \ - 1d0f176b6799b36724c92954c38d0288fa95400c2b14e064f76a6338fccaebca\ - 8d978b93bb76507bc150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86\ - 185a72f04ff80538d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc\ - 344db7e5621c949a9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38d\ - d7 -PrivateExponent: \ - 2dcdc00a86ecc2a60ebfa6660a83af1d7c3e570b85 -PublicElement: \ - 13834f0fa1f42abf7dbd264cb7d2eb5798da8972df67f517c62d7ae5070fd588\ - d61db62e492f9654833e876ed5737df35069f5ee01a45de881d8f5e68ec52ad9\ - ef32780e8c453a5f1e38cc17bc5cd061a3c122080f6e1b82d31877e8b08f634f\ - 497bd90b06824eaa0416c64104ce5622c272673d0dedb836ac7d47e0cea06739\ - 02 -Test: KeyPairValidAndConsistent -Message: 1E34034C47FE533F8FF5 -Signature: \ - 05c110848feacc9ac762ffa14943f9ce9a111777de0502d9f364ad9b2df4e1a8\ - 17bc15a602579b3a6a25 -Test: Verify -Message: 53D2CA23AF7DF95634F0 -Signature: \ - 14009997efeb3fd246956e44b5b0e48581ac5f414613b41fe5842c85b031ab8a\ - e68f66f8e1f1f9fc1d74 -Test: Verify -Message: 0F056E08AE77B3B30F33 -Signature: \ - 1beedf85b426d36a657f422ab9a9132986eaf415332816d33d70c726c3066158\ - c6481fd00503ffb65518 -Test: Verify -Message: F08C80E8FD38A3867B76 -Signature: \ - 0a23b8d8f920cfb0dec93725e4972080445647c54227fb987dd9f80fab446c75\ - 1c2594276168aa68f318 -Test: Verify -Message: 6D392690B92B3E75020F -Signature: \ - 18668f59c6974dad551a89bec5cacf0bf8617e8f43052eb97d7a1b12411b27b7\ - 4248b3d1f5070823e951 -Test: Verify -Message: 10AE0E091A267641FACF -Signature: \ - 1b3d10f74fdaed3d4d61fedfa3f6ad3a37c0cf6687166a312d5b280724c3545d\ - 225e1fe0639cfb1113d6 -Test: Verify -Comment: 1030-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 27c7996c1d3729c4cf1de06529e5619771e27ad9eb -SubgroupGenerator: \ - 0d87a4b01385da7f43b6277933c5f0dc8072dcacd5252e1b29f588114a7ac56e\ - 377050aa8174b5dda400f043234e4a746442792734dc80274a00a3676101be94\ - 759fc2630b9a858966488b12611d03d0b31e7243e124497a754544cee1db10bb\ - 0a81cf0b2a68045b76fe935f641c666fdc788a2b968c6668c669115756b961d9\ - fe -Modulus: \ - 2a32d68d31248024053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c26\ - 61d9165f0ab85491d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8\ - ed3ee64b73aa43ea9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515\ - 007ed1b1a5708b5e8d81304fa651edc715918e2299cfe9016dfec5f454d907f5\ - 9f -PrivateExponent: \ - 091155581ecb7a0a792ba95c772d9382298bfdfa6f -PublicElement: \ - 0d7d22c931422fc46505887559a51490c2e367cdb40242cdbaeb23024693fd5c\ - 68f6a3307ca34b224457d5aa610b90eca3b39905481daaba7151318f09f974ad\ - 664546d14c87f797e38139ee1e07adba9c775e07b7f7b3edba87d886920d6b2c\ - ef5f084359566b0a3b8b940a65b9ad93fd7ccd1354cdcee3c43c6bd315180498\ - ad -Test: KeyPairValidAndConsistent -Message: 23EEE1D0EA8950B8F322 -Signature: \ - 18fe1a5f61c4946810e82a1e30fb6c87ce4ad9cebb1ae27eebfa8779fe292b2a\ - 451be3506bb65519dfd0 -Test: Verify -Message: 13FA6F2816FB83190A21 -Signature: \ - 2161a5be85f7ffe806df00f4bd50915e4b0674e7591f1c0902153823f881bc7b\ - 3f093d92bf86b74b5b3e -Test: Verify -Message: D071CCC0C6E4CAE82E5A -Signature: \ - 059158b2cf143f38eb8c51088dd79bf45990e596c8026fa3de5e668368b9d8d7\ - fe9ffdbdecf66aaf02bb -Test: Verify -Message: 22CE83F4803BF3EA2C48 -Signature: \ - 073b56d72a5b706455cfdcbf85b75ee45c40e96dd21a5460542ade665e51a85c\ - 510315a50307c2bbdb2d -Test: Verify -Message: 7A927EC7BB9CA16C1B0A -Signature: \ - 254c7525aad9b4b3807b3900a963fbf42f9ff2144820ea69abe5ba2c80613510\ - e1429ebc726fd0a87a4c -Test: Verify -Message: 9591B069993E10BC0B84 -Signature: \ - 0ed4210e5e4f2f9546ea181c4a61d062a1158810071905b180dbf070b480f436\ - 0b1f66065ecf111741cf -Test: Verify -Comment: 1031-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 26f86a81a6bb530c2f9b63e3690e95a0894575f445 -SubgroupGenerator: \ - 1e24828adb4ebf2becdbdcadf6706631293ad6566803d12479f04a7bb20b6086\ - fe81df164f8bd02c5f418c1140d143f11a71170b42d0753c952bfff951b9ca42\ - 04868375efaa4afad50b75787e41c5ab9ce8adcbccecd3716f350bb8aaeca9b6\ - 098bd0002d789e1f7db9c19d9045499877b93ecb4e7c64808b742063bbecf60e\ - 29 -Modulus: \ - 4d58515f7b41c4fc87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c5921742\ - 2001a272ef91dbd09e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d5278114\ - 0bba40600cbd4752d2c32b43253efee57af6964c339570edb24195502e6d424b\ - 84bed65ac98c6fc52ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb\ - 93 -PrivateExponent: \ - 0e61a054ee6510734a80f67a54d8c4151c957ef16f -PublicElement: \ - 19b50f1eea45bfaa22352a38f3c3b86d6f670747ac2fd94359608e25f2bb9f60\ - 2506bc357245deeb4c3c702d435c557da4f4a9fd37330a75547c91681fdbb51f\ - 286adb498d1e489e89b2e6a4eb9ff30222c51fefbeac7435f629f536ac2d6b87\ - 664d80e5c97398cf489a1d1ca217f7f21ea8e409f938378875cf5f528162e3bc\ - 07 -Test: KeyPairValidAndConsistent -Message: B4B3C8FBE82013228A21 -Signature: \ - 0e1003dd216194ded89f7d10b35a266ca7587d8cfb06a1fe3dd43f07dea4a6d6\ - acaa1477f2552c9b3114 -Test: Verify -Message: 17D2D18302173E2CE992 -Signature: \ - 027b40cd9a159257a57efae3a657399a3b6d8b06f707ba3a323abc383a93f919\ - 1246c38c03b028be05df -Test: Verify -Message: 8032AE177D6DF38C7E27 -Signature: \ - 1f5e3d759e3b832f5a6c57b055764ff5b8ad942dd819610ef94cfec296cd1b56\ - 4fd0b18bfa08c3645db3 -Test: Verify -Message: 768640A60A3C62E02428 -Signature: \ - 0abe2dfabc81ab677d2cbd781ef9768325a5d6d15a22f41b32972bd67058e617\ - e28c7e0dfbaae535d655 -Test: Verify -Message: B0999CA45B77ED63639D -Signature: \ - 1525539cd207d5f6f915eb2731b6451e38e11e0a031d7e420e0bb95d6616d8ef\ - 35d20eb43c111f8f9ca1 -Test: Verify -Message: 587EDB968FA82C12C930 -Signature: \ - 024ed20dc19a07e00158aa2fe9cb6353f0112b8fab0e6775667115e1c92e5eb4\ - 29876c12ed48e996f4f7 -Test: Verify -Comment: 1032-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 2e802b5369c3f1ddfa789bf8f2ad2e048ced3bf355 -SubgroupGenerator: \ - a9aebee7d29f90b081afc4d496a6a78210e918bb57a8a21c5995586c0bf20f7a\ - 56bb10a97e05a3a723e7db64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076\ - aeded938775ae2223900adaf52a93f52d62173c82d4b67388c85d4c1127e1edf\ - 4643cf09f5375b60c19316c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b\ - 4a -Modulus: \ - d551680a62ebf98f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833\ - f4c19ac883ead22efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e5\ - 14d4628b197721bdaec780e126ac80ac83f24fef5c154f7690ceba903748be52\ - 12e3180ea718ca7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f\ - 09 -PrivateExponent: \ - 0f66e04c5a75d3eac03d744e5432f23e3aea066a63 -PublicElement: \ - 2640c188055329f0b44aaf80f82f7fc7f0e421031834dfbd1fb6d6af6ab3e1c1\ - 73c901370a4ce2793c1b88d12f764c58ff064905da9c5001f679c7508972f237\ - bccca56524787466a7c9c2d6bb6392963008ed1a3e4cf3b13e66086bce3a4ca0\ - 4d8cabcf0cadb4c403c7d02a858460d04350e730289cb5adf200b5fdf1198168\ - b5 -Test: KeyPairValidAndConsistent -Message: 909068BEFFA43331FDC7 -Signature: \ - 2d557d8fae420880640dd9f60a524db48980c80d8b0179dd3c1892f02e87c9f6\ - a04a8aa731be05aaffef -Test: Verify -Message: AC8AFC7A1D9105539E10 -Signature: \ - 0ae7f23328453fdb03c090c09ee69d787ee7dfaccd047445b1026a9a7cacdd1f\ - 91455db7299538817894 -Test: Verify -Message: 310E40311BB3F77F9483 -Signature: \ - 28a8d8de06dc0011b044d19a163d350535d6ca91a023c9687557690ddf102d8c\ - 7558246ced311f2fc444 -Test: Verify -Message: 35455ABD53E6FB11ED9B -Signature: \ - 162156e476cba65e767b4db942bb35cdc6293cf4360f1801a215bb2c726c22af\ - f3a711d3c6473f1eb985 -Test: Verify -Message: 95FFA73B52F0D06A0C1E -Signature: \ - 29bf4f13e6aff528aa1b060c2baed865c442e0472422b4bd485aa5ba2a09ad0d\ - 732637bb3ee520f6bc0b -Test: Verify -Message: 1E9934125DA6E9B4E975 -Signature: \ - 1674975d0a97e799d113ff9cad06b7f70a33f5ca5f1916cee07b525270284fbb\ - 1c0428666987ad7e2116 -Test: Verify -Comment: 1536-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 232cf9bee9d56c8bd8252d1edb59d99c40cf32d07d9e5a4893 -SubgroupGenerator: \ - f028143e3f9d1317aafb814215ffda9c584da8943e96212c90a082c3d2f335e8\ - a6b64d1c890aa2224ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b\ - 801218ac270acdd45579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f\ - 054d95150af96f9a7488010787a799c544883ff76a4e3092f2ca9aa9000cecb8\ - 8dda343c972c8192a83820727b1945c1a270cf913ab932457e8e6e207d06cd0e\ - fdf265b762b9fa15c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be43 -Modulus: \ - fada6e4becef964a85caf9e129639a5616ac000dbac59bd50b84bc8d46411407\ - 9c34c5b58d7d40027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b\ - 65c2ebac05da09e40cdc417024cccba267a98f4eb69701a276b4f117662b5666\ - 05c36054e7f015d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029\ - ef5c25c55ae998f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024\ - 188627cf5ce68674e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b -PrivateExponent: \ - 1d4cedc87d55eea31bd702139b90be08d58692a1f97628a01b -PublicElement: \ - 819c8cedb9c014aa577e9046b90795accbebe81bef68b1b5c37c68cb357e1a5f\ - f92761bc26cb0953956b6c0aec05acfc9d1a27c50789793b13d9eaf2361760c9\ - 7a7d86e7d922f4809a5d2d01448e938190bbc24c150e03ef8305365ddbf5ca19\ - 6857314e3b3023f8ddc9d209bd7dad1ee763e7003fd1b0c53057d2e9acadd23a\ - a18f83d20143bc41a2dfa4a164c82621fc0f800052ec01bec7c99c66fe20ec57\ - 67e6fbbe8810cd5aa75eff3d8a4cb53e1259ebcfebcc2fcf21ba7f3589cd525a -Test: KeyPairValidAndConsistent -Message: 9F6DC301DF53FE22CAC0 -Signature: \ - 15b22111ffa1b733979cd9d8944b1291ce09468ccbd05040de0f83023c8fe083\ - 734ec39a542011643e448b01429c4bae06d1 -Test: Verify -Message: 2D7B5B9A27EAB468331E -Signature: \ - 029eea970a049ffcb4c6117c97d181bec7a27557ceb88d422b2212ca36238380\ - 87cd52d2445f539c9c03705ba4b485f56e19 -Test: Verify -Message: F552FCBBA04FFCCC5CB6 -Signature: \ - 115de3cc15d9a066c00fed43f583f6a9c984d4b8f4c93c3d72094a4b04dda506\ - 7d460c3d1ae33ba66ceaac676256c1e73001 -Test: Verify -Message: 0D52B894153A4BB74068 -Signature: \ - 0f6b8cc28e2068a3fe14d220177793daf3512ba6942e9d16ef1571fa34926c27\ - edd1bfa94723a663425f5c2d01eaddaa972e -Test: Verify -Message: 294442E103CC0CBA32A6 -Signature: \ - 0fbd8768a1b3025c0d0d309cc448320e086318772bb9485a5a0a2afa1eb2afb2\ - d1818aa7b1c55b9dc424e654524278f0ddbc -Test: Verify -Message: E993D8FE1E6F6C3914ED -Signature: \ - 0559d66bad3a51520bbb85827a257ab09dfa33938127c69bf40f08339b2f2251\ - c0e50b63d2a4d05225dea7f58f67de3071e9 -Test: Verify -Comment: 2048-bit NR key -KeyFormat: Component -SubgroupOrder: \ - 03f35f80fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab5417 -SubgroupGenerator: \ - 75c5d8c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1\ - 6757684d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9\ - b6e962594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4\ - 0131081f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b59\ - 4b1774d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2\ - 092aa583c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b\ - 8ad4d89f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc707\ - 4ee3a0b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a -Modulus: \ - 9a08865d2bc9e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a\ - 8f012f00e52f7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035ed\ - a72e1f31f82c8d64c86e686899d53c0200282f407ceb1507db480f1db223606a\ - 57466cf60fe9fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5\ - ebf65e4dfc2837e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26\ - a64e9bfcaa82334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68\ - f6678faccdb7f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f73\ - 45a37ddc1ccdea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f -PrivateExponent: \ - 0212c34d3d17b96a899548ebf43bb886676acebd2f040f5b33a4e88d2d -PublicElement: \ - 267f9c3ff3ee3cbc0f9e94dc7e6837e1ff65175e967987b90b9aea7eef1de6e4\ - c342bebb5dbd0c4e2f6514f2d487857a146dda6cfdbc8b56ed254cd65754d84d\ - d21a271cd15fc656274725643728b41ce3f0e6872b6dfb4c289e03f9b903880c\ - e3d7d745dfbb641c8c42ec0bfb6951ca2611fd877c32248c97252bdb42d7bd65\ - ebc50653dff389526c546d1e6ebaf6bd8b3298c01935901b7efb288b78730d89\ - fba7f46f2a642aee0dbc93aa29c190b201acf89d4f8ba28f3e3f54a1c5a48294\ - dda908f904afb7db398682c809ce13abd49279221d5b40ad76216bad7ca256d7\ - 18d3552344c481b20da5aac3e637fb7edeaf7960b532ef761376489f02fa8c10 -Test: KeyPairValidAndConsistent -Message: 5F3914F7AE0F6C76D152 -Signature: \ - 03d30b7eaaddcb384dce378f806e88d646419bbedbc2c0c5cae32f3c3b02e0e1\ - a3c3ab04b31e2c25db713db539a65c9419a846aea88aaa707cb4 -Test: Verify -Message: 769583D4E7EAD14C137A -Signature: \ - 01dc2815fd4918b8d3bd1743f5ab4546313b1fa8044b4737b2c485eeb0016bcc\ - cc084be064b6a8934a28011167eebbc33513ce609aa206810aa1 -Test: Verify -Message: 6441D5239F50C71DE0F5 -Signature: \ - 013f6d395de56832f82ee813b574002c36e551aaeffbb28ddebb84da7f01ff6f\ - 4c3d0f3519d548e2ec1a0b36f12ac1e4fedc83071bbbbce024a6 -Test: Verify -Message: F1C2D4F7C3ECDF2C17B7 -Signature: \ - 006441a8b3517613f9a8c2e7a89c492e7f49300d901ad01b92167c1fce02453d\ - 52b69dc1fc6532e792ad6366eae7fb14de3ad3f6f3132b0519fc -Test: Verify -Message: 752A1F2B8D9A717A882F -Signature: \ - 0127027984402f5b8cc069decc1bd611f0bb59c6eee86da7d334e3f8b903c5f3\ - 02c65aaf16a837963bf772931235f81e963e4d692699dfd4f7e1 -Test: Verify -Message: 666DC6B1E871026EDE56 -Signature: \ - 03e87b55a7e81318b7599da3fa8f18d46253b6546814fd1ae19318820100c297\ - 4de2624da0d54ca27e7fe3477913a6df35bf925de3f3d9a06849 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/panama.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/panama.txt deleted file mode 100644 index bd4d4ee3..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/panama.txt +++ /dev/null @@ -1,76 +0,0 @@ -AlgorithmType: MessageDigest -Name: Panama-LE -Source: Panama reference implementation -Message: "" -Digest: aa0cc954d757d7ac7779ca3342334ca471abd47d5952ac91ed837ecd5b16922b -Test: Verify -Message: "The quick brown fox jumps over the lazy dog" -Digest: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1 -Test: Verify -Source: generated by Crypto++ 5.2.1 -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: af9c66fb6058e2232a5dfba063ee14b0f86f0e334e165812559435464dd9bb60 -Test: Verify - -AlgorithmType: MessageDigest -Name: Panama-BE -Source: Panama reference implementation -Message: "" -Digest: e81aa04523532dd7267e5c5bc3ba0e289837a62ba032350351980e960a84b0af -Test: Verify -Message: "The quick brown fox jumps over the lazy dog" -Digest: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc -Test: Verify -Source: generated by Crypto++ 5.2.1 -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: cb34f0937e8d870d3bd7ff6311765f2c229a6c2154e4db119538db5159437cab -Test: Verify - -AlgorithmType: MAC -Name: Panama-LE -Source: modified from Panama hash test vectors -Key: "" -Message: "" -MAC: aa0cc954d757d7ac7779ca3342334ca471abd47d5952ac91ed837ecd5b16922b -Test: Verify -Message: "The quick brown fox jumps over the lazy dog" -MAC: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -MAC: af9c66fb6058e2232a5dfba063ee14b0f86f0e334e165812559435464dd9bb60 -Test: Verify -Key: "The " -Message: "quick brown fox jumps over the lazy dog" -MAC: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1 -Test: Verify - -AlgorithmType: MAC -Name: Panama-BE -Source: modified from Panama hash test vectors -Key: "" -Message: "" -MAC: e81aa04523532dd7267e5c5bc3ba0e289837a62ba032350351980e960a84b0af -Test: Verify -Message: "The quick brown fox jumps over the lazy dog" -MAC: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -MAC: cb34f0937e8d870d3bd7ff6311765f2c229a6c2154e4db119538db5159437cab -Test: Verify -Key: "The " -Message: "quick brown fox jumps over the lazy dog" -MAC: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc -Test: Verify - -AlgorithmType: SymmetricCipher -Source: generated by Crypto++ 5.2.1 -Key: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -IV: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -Name: Panama-LE -Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -Ciphertext: F07F5FF2CCD01A0A7D44ACD6D239C2AF0DA1FF35275BAF5DFA6E09411B79D8B9 -Test: Encrypt -Name: Panama-BE -Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -Ciphertext: E12E2F6BA41AE832D888DA9FA6863BC37C0E996F190A1711330322D37BD98CA4 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_oaep.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_oaep.txt deleted file mode 100644 index 4e4cdd39..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_oaep.txt +++ /dev/null @@ -1,1765 +0,0 @@ -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 1: A 1024-bit RSA Key Pair -Modulus: \ -a8 b3 b2 84 af 8e b5 0b 38 70 34 a8 60 f1 46 c4 \ -91 9f 31 87 63 cd 6c 55 98 c8 ae 48 11 a1 e0 ab \ -c4 c7 e0 b0 82 d6 93 a5 e7 fc ed 67 5c f4 66 85 \ -12 77 2c 0c bc 64 a7 42 c6 c6 30 f5 33 c8 cc 72 \ -f6 2a e8 33 c4 0b f2 58 42 e9 84 bb 78 bd bf 97 \ -c0 10 7d 55 bd b6 62 f5 c4 e0 fa b9 84 5c b5 14 \ -8e f7 39 2d d3 aa ff 93 ae 1e 6b 66 7b b3 d4 24 \ -76 16 d4 f5 ba 10 d4 cf d2 26 de 88 d3 9f 16 fb -PublicExponent: 01 00 01 -PrivateExponent: \ -53 33 9c fd b7 9f c8 46 6a 65 5c 73 16 ac a8 5c \ -55 fd 8f 6d d8 98 fd af 11 95 17 ef 4f 52 e8 fd \ -8e 25 8d f9 3f ee 18 0f a0 e4 ab 29 69 3c d8 3b \ -15 2a 55 3d 4a c4 d1 81 2b 8b 9f a5 af 0e 7f 55 \ -fe 73 04 df 41 57 09 26 f3 31 1f 15 c4 d6 5a 73 \ -2c 48 31 16 ee 3d 3d 2d 0a f3 54 9a d9 bf 7c bf \ -b7 8a d8 84 f8 4d 5b eb 04 72 4d c7 36 9b 31 de \ -f3 7d 0c f5 39 e9 cf cd d3 de 65 37 29 ea d5 d1 -Prime1: \ -d3 27 37 e7 26 7f fe 13 41 b2 d5 c0 d1 50 a8 1b \ -58 6f b3 13 2b ed 2f 8d 52 62 86 4a 9c b9 f3 0a \ -f3 8b e4 48 59 8d 41 3a 17 2e fb 80 2c 21 ac f1 \ -c1 1c 52 0c 2f 26 a4 71 dc ad 21 2e ac 7c a3 9d -Prime2: \ -cc 88 53 d1 d5 4d a6 30 fa c0 04 f4 71 f2 81 c7 \ -b8 98 2d 82 24 a4 90 ed be b3 3d 3e 3d 5c c9 3c \ -47 65 70 3d 1d d7 91 64 2f 1f 11 6a 0d d8 52 be \ -24 19 b2 af 72 bf e9 a0 30 e8 60 b0 28 8b 5d 77 -ModPrime1PrivateExponent: \ -0e 12 bf 17 18 e9 ce f5 59 9b a1 c3 88 2f e8 04 \ -6a 90 87 4e ef ce 8f 2c cc 20 e4 f2 74 1f b0 a3 \ -3a 38 48 ae c9 c9 30 5f be cb d2 d7 68 19 96 7d \ -46 71 ac c6 43 1e 40 37 96 8d b3 78 78 e6 95 c1 -ModPrime2PrivateExponent: \ -95 29 7b 0f 95 a2 fa 67 d0 07 07 d6 09 df d4 fc \ -05 c8 9d af c2 ef 6d 6e a5 5b ec 77 1e a3 33 73 \ -4d 92 51 e7 90 82 ec da 86 6e fe f1 3c 45 9e 1a \ -63 13 86 b7 e3 54 c8 99 f5 f1 12 ca 85 d7 15 83 -MultiplicativeInverseOfPrime2ModPrime1: \ -4f 45 6c 50 24 93 bd c0 ed 2a b7 56 a3 a6 ed 4d \ -67 35 2a 69 7d 42 16 e9 32 12 b1 27 a6 3d 54 11 \ -ce 6f a9 8d 5d be fd 73 26 3e 37 28 14 27 43 81 \ -81 66 ed 7d d6 36 87 dd 2a 8c a1 d2 f4 fb d8 e1 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 1.1 -Plaintext: \ -66 28 19 4e 12 07 3d b0 3b a9 4c da 9e f9 53 23 \ -97 d5 0d ba 79 b9 87 00 4a fe fe 34 -Seed: # not used yet\ -18 b7 76 ea 21 06 9d 69 77 6a 33 e9 6b ad 48 e1 \ -dd a0 a5 ef -Ciphertext: \ -35 4f e6 7b 4a 12 6d 5d 35 fe 36 c7 77 79 1a 3f \ -7b a1 3d ef 48 4e 2d 39 08 af f7 22 fa d4 68 fb \ -21 69 6d e9 5d 0b e9 11 c2 d3 17 4f 8a fc c2 01 \ -03 5f 7b 6d 8e 69 40 2d e5 45 16 18 c2 1a 53 5f \ -a9 d7 bf c5 b8 dd 9f c2 43 f8 cf 92 7d b3 13 22 \ -d6 e8 81 ea a9 1a 99 61 70 e6 57 a0 5a 26 64 26 \ -d9 8c 88 00 3f 84 77 c1 22 70 94 a0 d9 fa 1e 8c \ -40 24 30 9c e1 ec cc b5 21 00 35 d4 7a c7 2e 8a -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 1.2 -Plaintext: \ -75 0c 40 47 f5 47 e8 e4 14 11 85 65 23 29 8a c9\ -ba e2 45 ef af 13 97 fb e5 6f 9d d5 -Seed: # not used yet\ -0c c7 42 ce 4a 9b 7f 32 f9 51 bc b2 51 ef d9 25\ -fe 4f e3 5f -Ciphertext: \ -64 0d b1 ac c5 8e 05 68 fe 54 07 e5 f9 b7 01 df\ -f8 c3 c9 1e 71 6c 53 6f c7 fc ec 6c b5 b7 1c 11\ -65 98 8d 4a 27 9e 15 77 d7 30 fc 7a 29 93 2e 3f\ -00 c8 15 15 23 6d 8d 8e 31 01 7a 7a 09 df 43 52\ -d9 04 cd eb 79 aa 58 3a dc c3 1e a6 98 a4 c0 52\ -83 da ba 90 89 be 54 91 f6 7c 1a 4e e4 8d c7 4b\ -bb e6 64 3a ef 84 66 79 b4 cb 39 5a 35 2d 5e d1\ -15 91 2d f6 96 ff e0 70 29 32 94 6d 71 49 2b 44 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 1.3 -Plaintext: \ -d9 4a e0 83 2e 64 45 ce 42 33 1c b0 6d 53 1a 82\ -b1 db 4b aa d3 0f 74 6d c9 16 df 24 d4 e3 c2 45\ -1f ff 59 a6 42 3e b0 e1 d0 2d 4f e6 46 cf 69 9d\ -fd 81 8c 6e 97 b0 51 -Seed: # not used yet\ -25 14 df 46 95 75 5a 67 b2 88 ea f4 90 5c 36 ee\ -c6 6f d2 fd -Ciphertext: \ -42 37 36 ed 03 5f 60 26 af 27 6c 35 c0 b3 74 1b\ -36 5e 5f 76 ca 09 1b 4e 8c 29 e2 f0 be fe e6 03\ -59 5a a8 32 2d 60 2d 2e 62 5e 95 eb 81 b2 f1 c9\ -72 4e 82 2e ca 76 db 86 18 cf 09 c5 34 35 03 a4\ -36 08 35 b5 90 3b c6 37 e3 87 9f b0 5e 0e f3 26\ -85 d5 ae c5 06 7c d7 cc 96 fe 4b 26 70 b6 ea c3\ -06 6b 1f cf 56 86 b6 85 89 aa fb 7d 62 9b 02 d8\ -f8 62 5c a3 83 36 24 d4 80 0f b0 81 b1 cf 94 eb -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 1.4 -Plaintext: \ -52 e6 50 d9 8e 7f 2a 04 8b 4f 86 85 21 53 b9 7e\ -01 dd 31 6f 34 6a 19 f6 7a 85 -Seed: # not used yet\ -c4 43 5a 3e 1a 18 a6 8b 68 20 43 62 90 a3 7c ef\ -b8 5d b3 fb -Ciphertext: \ -45 ea d4 ca 55 1e 66 2c 98 00 f1 ac a8 28 3b 05\ -25 e6 ab ae 30 be 4b 4a ba 76 2f a4 0f d3 d3 8e\ -22 ab ef c6 97 94 f6 eb bb c0 5d db b1 12 16 24\ -7d 2f 41 2f d0 fb a8 7c 6e 3a cd 88 88 13 64 6f\ -d0 e4 8e 78 52 04 f9 c3 f7 3d 6d 82 39 56 27 22\ -dd dd 87 71 fe c4 8b 83 a3 1e e6 f5 92 c4 cf d4\ -bc 88 17 4f 3b 13 a1 12 aa e3 b9 f7 b8 0e 0f c6\ -f7 25 5b a8 80 dc 7d 80 21 e2 2a d6 a8 5f 07 55 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 1.5 -Plaintext: \ -8d a8 9f d9 e5 f9 74 a2 9f ef fb 46 2b 49 18 0f\ -6c f9 e8 02 -Seed: # not used yet\ -b3 18 c4 2d f3 be 0f 83 fe a8 23 f5 a7 b4 7e d5\ -e4 25 a3 b5 -Ciphertext: \ -36 f6 e3 4d 94 a8 d3 4d aa cb a3 3a 21 39 d0 0a\ -d8 5a 93 45 a8 60 51 e7 30 71 62 00 56 b9 20 e2\ -19 00 58 55 a2 13 a0 f2 38 97 cd cd 73 1b 45 25\ -7c 77 7f e9 08 20 2b ef dd 0b 58 38 6b 12 44 ea\ -0c f5 39 a0 5d 5d 10 32 9d a4 4e 13 03 0f d7 60\ -dc d6 44 cf ef 20 94 d1 91 0d 3f 43 3e 1c 7c 6d\ -d1 8b c1 f2 df 7f 64 3d 66 2f b9 dd 37 ea d9 05\ -91 90 f4 fa 66 ca 39 e8 69 c4 eb 44 9c bd c4 39 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 1.6 -Plaintext: \ -26 52 10 50 84 42 71 -Seed: # not used yet\ -e4 ec 09 82 c2 33 6f 3a 67 7f 6a 35 61 74 eb 0c\ -e8 87 ab c2 -Ciphertext: \ -42 ce e2 61 7b 1e ce a4 db 3f 48 29 38 6f bd 61\ -da fb f0 38 e1 80 d8 37 c9 63 66 df 24 c0 97 b4\ -ab 0f ac 6b df 59 0d 82 1c 9f 10 64 2e 68 1a d0\ -5b 8d 78 b3 78 c0 f4 6c e2 fa d6 3f 74 e0 ad 3d\ -f0 6b 07 5d 7e b5 f5 63 6f 8d 40 3b 90 59 ca 76\ -1b 5c 62 bb 52 aa 45 00 2e a7 0b aa ce 08 de d2\ -43 b9 d8 cb d6 2a 68 ad e2 65 83 2b 56 56 4e 43\ -a6 fa 42 ed 19 9a 09 97 69 74 2d f1 53 9e 82 55 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 2: A 1025-bit RSA Key Pair -Modulus: \ -01 94 7c 7f ce 90 42 5f 47 27 9e 70 85 1f 25 d5\ -e6 23 16 fe 8a 1d f1 93 71 e3 e6 28 e2 60 54 3e\ -49 01 ef 60 81 f6 8c 0b 81 41 19 0d 2a e8 da ba\ -7d 12 50 ec 6d b6 36 e9 44 ec 37 22 87 7c 7c 1d\ -0a 67 f1 4b 16 94 c5 f0 37 94 51 a4 3e 49 a3 2d\ -de 83 67 0b 73 da 91 a1 c9 9b c2 3b 43 6a 60 05\ -5c 61 0f 0b af 99 c1 a0 79 56 5b 95 a3 f1 52 66\ -32 d1 d4 da 60 f2 0e da 25 e6 53 c4 f0 02 76 6f\ -45 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -08 23 f2 0f ad b5 da 89 08 8a 9d 00 89 3e 21 fa\ -4a 1b 11 fb c9 3c 64 a3 be 0b aa ea 97 fb 3b 93\ -c3 ff 71 37 04 c1 9c 96 3c 1d 10 7a ae 99 05 47\ -39 f7 9e 02 e1 86 de 86 f8 7a 6d de fe a6 d8 cc\ -d1 d3 c8 1a 47 bf a7 25 5b e2 06 01 a4 a4 b2 f0\ -8a 16 7b 5e 27 9d 71 5b 1b 45 5b dd 7e ab 24 59\ -41 d9 76 8b 9a ce fb 3c cd a5 95 2d a3 ce e7 25\ -25 b4 50 16 63 a8 ee 15 c9 e9 92 d9 24 62 fe 39 -Prime1: \ -01 59 db de 04 a3 3e f0 6f b6 08 b8 0b 19 0f 4d\ -3e 22 bc c1 3a c8 e4 a0 81 03 3a bf a4 16 ed b0\ -b3 38 aa 08 b5 73 09 ea 5a 52 40 e7 dc 6e 54 37\ -8c 69 41 4c 31 d9 7d db 1f 40 6d b3 76 9c c4 1a\ -43 -Prime2: \ -01 2b 65 2f 30 40 3b 38 b4 09 95 fd 6f f4 1a 1a\ -cc 8a da 70 37 32 36 b7 20 2d 39 b2 ee 30 cf b4\ -6d b0 95 11 f6 f3 07 cc 61 cc 21 60 6c 18 a7 5b\ -8a 62 f8 22 df 03 1b a0 df 0d af d5 50 6f 56 8b\ -d7 -ModPrime1PrivateExponent: \ -43 6e f5 08 de 73 65 19 c2 da 4c 58 0d 98 c8 2c\ -b7 45 2a 3f b5 ef ad c3 b9 c7 78 9a 1b c6 58 4f\ -79 5a dd bb d3 24 39 c7 46 86 55 2e cb 6c 2c 30\ -7a 4d 3a f7 f5 39 ee c1 57 24 8c 7b 31 f1 a2 55 -ModPrime2PrivateExponent: \ -01 2b 15 a8 9f 3d fb 2b 39 07 3e 73 f0 2b dd 0c\ -1a 7b 37 9d d4 35 f0 5c dd e2 ef f9 e4 62 94 8b\ -7c ec 62 ee 90 50 d5 e0 81 6e 07 85 a8 56 b4 91\ -08 dc b7 5f 36 83 87 4d 1c a6 32 9a 19 01 30 66\ -ff -MultiplicativeInverseOfPrime2ModPrime1: \ -02 70 db 17 d5 91 4b 01 8d 76 11 8b 24 38 9a 73\ -50 ec 83 6b 00 63 a2 17 21 23 6f d8 ed b6 d8 9b\ -51 e7 ee b8 7b 61 1b 71 32 cb 7e a7 35 6c 23 15\ -1c 1e 77 51 50 7c 78 6d 9e e1 79 41 70 a8 c8 e8 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 2.1 -Plaintext: \ -8f f0 0c aa 60 5c 70 28 30 63 4d 9a 6c 3d 42 c6\ -52 b5 8c f1 d9 2f ec 57 0b ee e7 -Seed: # not used yet\ -8c 40 7b 5e c2 89 9e 50 99 c5 3e 8c e7 93 bf 94\ -e7 1b 17 82 -Ciphertext: \ -01 81 af 89 22 b9 fc b4 d7 9d 92 eb e1 98 15 99\ -2f c0 c1 43 9d 8b cd 49 13 98 a0 f4 ad 3a 32 9a\ -5b d9 38 55 60 db 53 26 83 c8 b7 da 04 e4 b1 2a\ -ed 6a ac df 47 1c 34 c9 cd a8 91 ad dc c2 df 34\ -56 65 3a a6 38 2e 9a e5 9b 54 45 52 57 eb 09 9d\ -56 2b be 10 45 3f 2b 6d 13 c5 9c 02 e1 0f 1f 8a\ -bb 5d a0 d0 57 09 32 da cf 2d 09 01 db 72 9d 0f\ -ef cc 05 4e 70 96 8e a5 40 c8 1b 04 bc ae fe 72\ -0e -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 2.2 -Plaintext: \ -2d -Seed: # not used yet\ -b6 00 cf 3c 2e 50 6d 7f 16 77 8c 91 0d 3a 8b 00\ -3e ee 61 d5 -Ciphertext: \ -01 87 59 ff 1d f6 3b 27 92 41 05 62 31 44 16 a8\ -ae af 2a c6 34 b4 6f 94 0a b8 2d 64 db f1 65 ee\ -e3 30 11 da 74 9d 4b ab 6e 2f cd 18 12 9c 9e 49\ -27 7d 84 53 11 2b 42 9a 22 2a 84 71 b0 70 99 39\ -98 e7 58 86 1c 4d 3f 6d 74 9d 91 c4 29 0d 33 2c\ -7a 4a b3 f7 ea 35 ff 3a 07 d4 97 c9 55 ff 0f fc\ -95 00 6b 62 c6 d2 96 81 0d 9b fa b0 24 19 6c 79\ -34 01 2c 2d f9 78 ef 29 9a ba 23 99 40 cb a1 02\ -45 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 2.3 -Plaintext: \ -74 fc 88 c5 1b c9 0f 77 af 9d 5e 9a 4a 70 13 3d\ -4b 4e 0b 34 da 3c 37 c7 ef 8e -Seed: # not used yet\ -a7 37 68 ae ea a9 1f 9d 8c 1e d6 f9 d2 b6 34 67\ -f0 7c ca e3 -Ciphertext: \ -01 88 02 ba b0 4c 60 32 5e 81 c4 96 23 11 f2 be\ -7c 2a dc e9 30 41 a0 07 19 c8 8f 95 75 75 f2 c7\ -9f 1b 7b c8 ce d1 15 c7 06 b3 11 c0 8a 2d 98 6c\ -a3 b6 a9 33 6b 14 7c 29 c6 f2 29 40 9d de c6 51\ -bd 1f dd 5a 0b 7f 61 0c 99 37 fd b4 a3 a7 62 36\ -4b 8b 32 06 b4 ea 48 5f d0 98 d0 8f 63 d4 aa 8b\ -b2 69 7d 02 7b 75 0c 32 d7 f7 4e af 51 80 d2 e9\ -b6 6b 17 cb 2f a5 55 23 bc 28 0d a1 0d 14 be 20\ -53 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 2.4 -Plaintext: \ -a7 eb 2a 50 36 93 1d 27 d4 e8 91 32 6d 99 69 2f\ -fa dd a9 bf 7e fd 3e 34 e6 22 c4 ad c0 85 f7 21\ -df e8 85 07 2c 78 a2 03 b1 51 73 9b e5 40 fa 8c\ -15 3a 10 f0 0a -Seed: # not used yet\ -9a 7b 3b 0e 70 8b d9 6f 81 90 ec ab 4f b9 b2 b3\ -80 5a 81 56 -Ciphertext: \ -00 a4 57 8c bc 17 63 18 a6 38 fb a7 d0 1d f1 57\ -46 af 44 d4 f6 cd 96 d7 e7 c4 95 cb f4 25 b0 9c\ -64 9d 32 bf 88 6d a4 8f ba f9 89 a2 11 71 87 ca\ -fb 1f b5 80 31 76 90 e3 cc d4 46 92 0b 7a f8 2b\ -31 db 58 04 d8 7d 01 51 4a cb fa 91 56 e7 82 f8\ -67 f6 be d9 44 9e 0e 9a 2c 09 bc ec c6 aa 08 76\ -36 96 5e 34 b3 ec 76 6f 2f e2 e4 30 18 a2 fd de\ -b1 40 61 6a 0e 9d 82 e5 33 10 24 ee 06 52 fc 76\ -41 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 2.5 -Plaintext: \ -2e f2 b0 66 f8 54 c3 3f 3b dc bb 59 94 a4 35 e7\ -3d 6c 6c -Seed: # not used yet\ -eb 3c eb bc 4a dc 16 bb 48 e8 8c 8a ec 0e 34 af\ -7f 42 7f d3 -Ciphertext: \ -00 eb c5 f5 fd a7 7c fd ad 3c 83 64 1a 90 25 e7\ -7d 72 d8 a6 fb 33 a8 10 f5 95 0f 8d 74 c7 3e 8d\ -93 1e 86 34 d8 6a b1 24 62 56 ae 07 b6 00 5b 71\ -b7 f2 fb 98 35 12 18 33 1c e6 9b 8f fb dc 9d a0\ -8b bc 9c 70 4f 87 6d eb 9d f9 fc 2e c0 65 ca d8\ -7f 90 90 b0 7a cc 17 aa 7f 99 7b 27 ac a4 88 06\ -e8 97 f7 71 d9 51 41 fe 45 26 d8 a5 30 1b 67 86\ -27 ef ab 70 7f d4 0f be bd 6e 79 2a 25 61 3e 7a\ -ec -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 2.6 -Plaintext: \ -8a 7f b3 44 c8 b6 cb 2c f2 ef 1f 64 3f 9a 32 18\ -f6 e1 9b ba 89 c0 -Seed: # not used yet\ -4c 45 cf 4d 57 c9 8e 3d 6d 20 95 ad c5 1c 48 9e\ -b5 0d ff 84 -Ciphertext: \ -01 08 39 ec 20 c2 7b 90 52 e5 5b ef b9 b7 7e 6f\ -c2 6e 90 75 d7 a5 43 78 c6 46 ab df 51 e4 45 bd\ -57 15 de 81 78 9f 56 f1 80 3d 91 70 76 4a 9e 93\ -cb 78 79 86 94 02 3e e7 39 3c e0 4b c5 d8 f8 c5\ -a5 2c 17 1d 43 83 7e 3a ca 62 f6 09 eb 0a a5 ff\ -b0 96 0e f0 41 98 dd 75 4f 57 f7 fb e6 ab f7 65\ -cf 11 8b 4c a4 43 b2 3b 5a ab 26 6f 95 23 26 ac\ -45 81 10 06 44 32 5f 8b 72 1a cd 5d 04 ff 14 ef\ -3a -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 3: A 1026-bit RSA Key Pair -Modulus: \ -02 b5 8f ec 03 9a 86 07 00 a4 d7 b6 46 2f 93 e6\ -cd d4 91 16 1d dd 74 f4 e8 10 b4 0e 3c 16 52 00\ -6a 5c 27 7b 27 74 c1 13 05 a4 cb ab 5a 78 ef a5\ -7e 17 a8 6d f7 a3 fa 36 fc 4b 1d 22 49 f2 2e c7\ -c2 dd 6a 46 32 32 ac ce a9 06 d6 6e be 80 b5 70\ -4b 10 72 9d a6 f8 33 23 4a bb 5e fd d4 a2 92 cb\ -fa d3 3b 4d 33 fa 7a 14 b8 c3 97 b5 6e 3a cd 21\ -20 34 28 b7 7c df a3 3a 6d a7 06 b3 d8 b0 fc 43\ -e9 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -15 b4 8a 5b 56 83 a9 46 70 e2 3b 57 18 f8 14 fa\ -0e 13 f8 50 38 f5 07 11 18 2c ba 61 51 05 81 f3\ -d2 2c 7e 23 2e f9 37 e2 2e 55 1d 68 b8 6e 2f 8c\ -b1 aa d8 be 2e 48 8f 5d f7 ef d2 79 e3 f5 68 d4\ -ea f3 6f 80 cf 71 41 ac e6 0f cc 91 13 fb 6c 4a\ -84 1f d5 0b bc 7c 51 2f fc be ff 21 48 7a a8 11\ -eb 3c a8 c6 20 05 34 6a 86 de 86 bf a1 d8 a9 48\ -fd 3f 34 8c 22 ea ad f3 33 c3 ce 6c e1 32 08 fd -Prime1: \ -01 bf 01 d2 16 d7 35 95 cf 02 70 c2 be b7 8d 40\ -a0 d8 44 7d 31 da 91 9a 98 3f 7e ea 78 1b 77 d8\ -5f e3 71 b3 e9 37 3e 7b 69 21 7d 31 50 a0 2d 89\ -58 de 7f ad 9d 55 51 60 95 8b 44 54 12 7e 0e 7e\ -af -Prime2: \ -01 8d 33 99 65 81 66 db 38 29 81 6d 7b 29 54 16\ -75 9e 9c 91 98 7f 5b 2d 8a ec d6 3b 04 b4 8b d7\ -b2 fc f2 29 bb 7f 8a 6d c8 8b a1 3d d2 e3 9a d5\ -5b 6d 1a 06 16 07 08 f9 70 0b e8 0b 8f d3 74 4c\ -e7 -ModPrime1PrivateExponent: \ -06 c0 a2 49 d2 0a 6f 2e e7 5c 88 b4 94 d5 3f 6a\ -ae 99 aa 42 7c 88 c2 8b 16 3a 76 94 45 e5 f3 90\ -cf 40 c2 74 fd 6e a6 32 9a 5c e7 c7 ce 03 a2 15\ -83 96 ee 2a 78 45 78 6e 09 e2 88 5a 97 28 e4 e5 -ModPrime2PrivateExponent: \ -d1 d2 7c 29 fe dd 92 d8 6c 34 8e dd 0c cb fa c1\ -4f 74 6e 05 1c e1 d1 81 1d f3 5d 61 f2 ee 1c 97\ -d4 bf 28 04 80 2f 64 27 18 7b a8 e9 0a 8a f4 42\ -43 b4 07 9b 03 44 5e 60 2e 29 fa 51 93 e6 4f e9 -MultiplicativeInverseOfPrime2ModPrime1: \ -8c b2 f7 56 bd 89 41 b1 d3 b7 70 e5 ad 31 ee 37\ -3b 28 ac da 69 ff 9b 6f 40 fe 57 8b 9f 1a fb 85\ -83 6f 96 27 d3 7a cf f7 3c 27 79 e6 34 bb 26 01\ -1c 2c 8f 7f 33 61 ae 2a 9e a6 5e d6 89 e3 63 9a -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 3.1 -Plaintext: \ -08 78 20 b5 69 e8 fa 8d -Seed: # not used yet\ -8c ed 6b 19 62 90 80 57 90 e9 09 07 40 15 e6 a2\ -0b 0c 48 94 -Ciphertext: \ -02 6a 04 85 d9 6a eb d9 6b 43 82 08 50 99 b9 62\ -e6 a2 bd ec 3d 90 c8 db 62 5e 14 37 2d e8 5e 2d\ -5b 7b aa b6 5c 8f af 91 bb 55 04 fb 49 5a fc e5\ -c9 88 b3 f6 a5 2e 20 e1 d6 cb d3 56 6c 5c d1 f2\ -b8 31 8b b5 42 cc 0e a2 5c 4a ab 99 32 af a2 07\ -60 ea dd ec 78 43 96 a0 7e a0 ef 24 d4 e6 f4 d3\ -7e 50 52 a7 a3 1e 14 6a a4 80 a1 11 bb e9 26 40\ -13 07 e0 0f 41 00 33 84 2b 6d 82 fe 5c e4 df ae\ -80 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 3.2 -Plaintext: \ -46 53 ac af 17 19 60 b0 1f 52 a7 be 63 a3 ab 21\ -dc 36 8e c4 3b 50 d8 2e c3 78 1e 04 -Seed: # not used yet\ -b4 29 1d 65 67 55 08 48 cc 15 69 67 c8 09 ba ab\ -6c a5 07 f0 -Ciphertext: \ -02 4d b8 9c 78 02 98 9b e0 78 38 47 86 30 84 94\ -1b f2 09 d7 61 98 7e 38 f9 7c b5 f6 f1 bc 88 da\ -72 a5 0b 73 eb af 11 c8 79 c4 f9 5d f3 7b 85 0b\ -8f 65 d7 62 2e 25 b1 b8 89 e8 0f e8 0b ac a2 06\ -9d 6e 0e 1d 82 99 53 fc 45 90 69 de 98 ea 97 98\ -b4 51 e5 57 e9 9a bf 8f e3 d9 cc f9 09 6e bb f3\ -e5 25 5d 3b 4e 1c 6d 2e ca df 06 7a 35 9e ea 86\ -40 5a cd 47 d5 e1 65 51 7c ca fd 47 d6 db ee 4b\ -f5 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 3.3 -Plaintext: \ -d9 4c d0 e0 8f a4 04 ed 89 -Seed: # not used yet\ -ce 89 28 f6 05 95 58 25 40 08 ba dd 97 94 fa dc\ -d2 fd 1f 65 -Ciphertext: \ -02 39 bc e6 81 03 24 41 52 88 77 d6 d1 c8 bb 28\ -aa 3b c9 7f 1d f5 84 56 36 18 99 57 97 68 38 44\ -ca 86 66 47 32 f4 be d7 a0 aa b0 83 aa ab fb 72\ -38 f5 82 e3 09 58 c2 02 4e 44 e5 70 43 b9 79 50\ -fd 54 3d a9 77 c9 0c dd e5 33 7d 61 84 42 f9 9e\ -60 d7 78 3a b5 9c e6 dd 9d 69 c4 7a d1 e9 62 be\ -c2 2d 05 89 5c ff 8d 3f 64 ed 52 61 d9 2b 26 78\ -51 03 93 48 49 90 ba 3f 7f 06 81 8a e6 ff ce 8a\ -3a -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 3.4 -Plaintext: \ -6c c6 41 b6 b6 1e 6f 96 39 74 da d2 3a 90 13 28\ -4e f1 -Seed: # not used yet\ -6e 29 79 f5 2d 68 14 a5 7d 83 b0 90 05 48 88 f1\ -19 a5 b9 a3 -Ciphertext: \ -02 99 4c 62 af d7 6f 49 8b a1 fd 2c f6 42 85 7f\ -ca 81 f4 37 3c b0 8f 1c ba ee 6f 02 5c 3b 51 2b\ -42 c3 e8 77 91 13 47 66 48 03 9d be 04 93 f9 24\ -62 92 fa c2 89 50 60 0e 7c 0f 32 ed f9 c8 1b 9d\ -ec 45 c3 bd e0 cc 8d 88 47 59 01 69 90 7b 7d c5\ -99 1c eb 29 bb 07 14 d6 13 d9 6d f0 f1 2e c5 d8\ -d3 50 7c 8e e7 ae 78 dd 83 f2 16 fa 61 de 10 03\ -63 ac a4 8a 7e 91 4a e9 f4 2d df be 94 3b 09 d9\ -a0 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 3.5 -Plaintext: \ -df 51 51 83 2b 61 f4 f2 58 91 fb 41 72 f3 28 d2\ -ed df 83 71 ff cf db e9 97 93 92 95 f3 0e ca 69\ -18 01 7c fd a1 15 3b f7 a6 af 87 59 32 23 -Seed: # not used yet\ -2d 76 0b fe 38 c5 9d e3 4c dc 8b 8c 78 a3 8e 66\ -28 4a 2d 27 -Ciphertext: \ -01 62 04 2f f6 96 95 92 a6 16 70 31 81 1a 23 98\ -34 ce 63 8a bf 54 fe c8 b9 94 78 12 2a fe 2e e6\ -7f 8c 5b 18 b0 33 98 05 bf db c5 a4 e6 72 0b 37\ -c5 9c fb a9 42 46 4c 59 7f f5 32 a1 19 82 15 45\ -fd 2e 59 b1 14 e6 1d af 71 82 05 29 f5 02 9c f5\ -24 95 43 27 c3 4e c5 e6 f5 ba 7e fc c4 de 94 3a\ -b8 ad 4e d7 87 b1 45 43 29 f7 0d b7 98 a3 a8 f4\ -d9 2f 82 74 e2 b2 94 8a de 62 7c e8 ee 33 e4 3c\ -60 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 3.6 -Plaintext: \ -3c 3b ad 89 3c 54 4a 6d 52 0a b0 22 31 91 88 c8\ -d5 04 b7 a7 88 b8 50 90 3b 85 97 2e aa 18 55 2e\ -11 34 a7 ad 60 98 82 62 54 ff 7a b6 72 b3 d8 eb\ -31 58 fa c6 d4 cb ae f1 -Seed: # not used yet\ -f1 74 77 9c 5f d3 cf e0 07 ba dc b7 a3 6c 9b 55\ -bf cf bf 0e -Ciphertext: \ -00 11 20 51 e7 5d 06 49 43 bc 44 78 07 5e 43 48\ -2f d5 9c ee 06 79 de 68 93 ee c3 a9 43 da a4 90\ -b9 69 1c 93 df c0 46 4b 66 23 b9 f3 db d3 e7 00\ -83 26 4f 03 4b 37 4f 74 16 4e 1a 00 76 37 25 e5\ -74 74 4b a0 b9 db 83 43 4f 31 df 96 f6 e2 a2 6f\ -6d 8e ba 34 8b d4 68 6c 22 38 ac 07 c3 7a ac 37\ -85 d1 c7 ee a2 f8 19 fd 91 49 17 98 ed 8e 9c ef\ -5e 43 b7 81 b0 e0 27 6e 37 c4 3f f9 49 2d 00 57\ -30 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 4: A 1027-bit RSA Key Pair -Modulus: \ -05 12 40 b6 cc 00 04 fa 48 d0 13 46 71 c0 78 c7\ -c8 de c3 b3 e2 f2 5b c2 56 44 67 33 9d b3 88 53\ -d0 6b 85 ee a5 b2 de 35 3b ff 42 ac 2e 46 bc 97\ -fa e6 ac 96 18 da 95 37 a5 c8 f5 53 c1 e3 57 62\ -59 91 d6 10 8d cd 78 85 fb 3a 25 41 3f 53 ef ca\ -d9 48 cb 35 cd 9b 9a e9 c1 c6 76 26 d1 13 d5 7d\ -de 4c 5b ea 76 bb 5b b7 de 96 c0 0d 07 37 2e 96\ -85 a6 d7 5c f9 d2 39 fa 14 8d 70 93 1b 5f 3f b0\ -39 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -04 11 ff ca 3b 7c a5 e9 e9 be 7f e3 8a 85 10 5e\ -35 38 96 db 05 c5 79 6a ec d2 a7 25 16 1e b3 65\ -1c 86 29 a9 b8 62 b9 04 d7 b0 c7 b3 7f 8c b5 a1\ -c2 b5 40 01 01 8a 00 a1 eb 2c af e4 ee 4e 94 92\ -c3 48 bc 2b ed ab 4b 9e bb f0 64 e8 ef f3 22 b9\ -00 9f 8e ec 65 39 05 f4 0d f8 8a 3c dc 49 d4 56\ -7f 75 62 7d 41 ac a6 24 12 9b 46 a0 b7 c6 98 e5\ -e6 5f 2b 7b a1 02 c7 49 a1 01 35 b6 54 0d 04 01 -Prime1: \ -02 74 58 c1 9e c1 63 69 19 e7 36 c9 af 25 d6 09\ -a5 1b 8f 56 1d 19 c6 bf 69 43 dd 1e e1 ab 8a 4a\ -3f 23 21 00 bd 40 b8 8d ec c6 ba 23 55 48 b6 ef\ -79 2a 11 c9 de 82 3d 0a 79 22 c7 09 5b 6e ba 57\ -01 -Prime2: \ -02 10 ee 9b 33 ab 61 71 6e 27 d2 51 bd 46 5f 4b\ -35 a1 a2 32 e2 da 00 90 1c 29 4b f2 23 50 ce 49\ -0d 09 9f 64 2b 53 75 61 2d b6 3b a1 f2 03 86 49\ -2b f0 4d 34 b3 c2 2b ce b9 09 d1 34 41 b5 3b 51\ -39 -ModPrime1PrivateExponent: \ -39 fa 02 8b 82 6e 88 c1 12 1b 75 0a 8b 24 2f a9\ -a3 5c 5b 66 bd fd 1f a6 37 d3 cc 48 a8 4a 4f 45\ -7a 19 4e 77 27 e4 9f 7b cc 6e 5a 5a 41 26 57 fc\ -47 0c 73 22 eb c3 74 16 ef 45 8c 30 7a 8c 09 01 -ModPrime2PrivateExponent: \ -01 5d 99 a8 41 95 94 39 79 fa 9e 1b e2 c3 c1 b6\ -9f 43 2f 46 fd 03 e4 7d 5b ef bb bf d6 b1 d1 37\ -1d 83 ef b3 30 a3 e0 20 94 2b 2f ed 11 5e 5d 02\ -be 24 fd 92 c9 01 9d 1c ec d6 dd 4c f1 e5 4c c8\ -99 -MultiplicativeInverseOfPrime2ModPrime1: \ -01 f0 b7 01 51 70 b3 f5 e4 22 23 ba 30 30 1c 41\ -a6 d8 7c bb 70 e3 0c b7 d3 c6 7d 25 47 3d b1 f6\ -cb f0 3e 3f 91 26 e3 e9 79 68 27 9a 86 5b 2c 2b\ -42 65 24 cf c5 2a 68 3d 31 ed 30 eb 98 4b e4 12\ -ba -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 4.1 -Plaintext: \ -4a 86 60 95 34 ee 43 4a 6c bc a3 f7 e9 62 e7 6d\ -45 5e 32 64 c1 9f 60 5f 6e 5f f6 13 7c 65 c5 6d\ -7f b3 44 cd 52 bc 93 37 4f 3d 16 6c 9f 0c 6f 9c\ -50 6b ad 19 33 09 72 d2 -Seed: # not used yet\ -1c ac 19 ce 99 3d ef 55 f9 82 03 f6 85 28 96 c9\ -5c cc a1 f3 -Ciphertext: \ -04 cc e1 96 14 84 5e 09 41 52 a3 fe 18 e5 4e 33\ -30 c4 4e 5e fb c6 4a e1 68 86 cb 18 69 01 4c c5\ -78 1b 1f 8f 9e 04 53 84 d0 11 2a 13 5c a0 d1 2e\ -9c 88 a8 e4 06 34 16 de aa e3 84 4f 60 d6 e9 6f\ -e1 55 14 5f 45 25 b9 a3 44 31 ca 37 66 18 0f 70\ -e1 5a 5e 5d 8e 8b 1a 51 6f f8 70 60 9f 13 f8 96\ -93 5c ed 18 82 79 a5 8e d1 3d 07 11 42 77 d7 5c\ -65 68 60 7e 0a b0 92 fd 80 3a 22 3e 4a 8e e0 b1\ -a8 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 4.2 -Plaintext: \ -b0 ad c4 f3 fe 11 da 59 ce 99 27 73 d9 05 99 43\ -c0 30 46 49 7e e9 d9 f9 a0 6d f1 16 6d b4 6d 98\ -f5 8d 27 ec 07 4c 02 ee e6 cb e2 44 9c 8b 9f c5\ -08 0c 5c 3f 44 33 09 25 12 ec 46 aa 79 37 43 c8 -Seed: # not used yet\ -f5 45 d5 89 75 85 e3 db 71 aa 0c b8 da 76 c5 1d\ -03 2a e9 63 -Ciphertext: \ -00 97 b6 98 c6 16 56 45 b3 03 48 6f bf 5a 2a 44\ -79 c0 ee 85 88 9b 54 1a 6f 0b 85 8d 6b 65 97 b1\ -3b 85 4e b4 f8 39 af 03 39 9a 80 d7 9b da 65 78\ -c8 41 f9 0d 64 57 15 b2 80 d3 71 43 99 2d d1 86\ -c8 0b 94 9b 77 5c ae 97 37 0e 4e c9 74 43 13 6c\ -6d a4 84 e9 70 ff db 13 23 a2 08 47 82 1d 3b 18\ -38 1d e1 3b b4 9a ae a6 65 30 c4 a4 b8 27 1f 3e\ -ae 17 2c d3 66 e0 7e 66 36 f1 01 9d 2a 28 ae d1\ -5e -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 4.3 -Plaintext: \ -bf 6d 42 e7 01 70 7b 1d 02 06 b0 c8 b4 5a 1c 72\ -64 1f f1 28 89 21 9a 82 bd ea 96 5b 5e 79 a9 6b\ -0d 01 63 ed 9d 57 8e c9 ad a2 0f 2f bc f1 ea 3c\ -40 89 d8 34 19 ba 81 b0 c6 0f 36 06 da 99 -Seed: # not used yet\ -ad 99 7f ee f7 30 d6 ea 7b e6 0d 0d c5 2e 72 ea\ -cb fd d2 75 -Ciphertext: \ -03 01 f9 35 e9 c4 7a bc b4 8a cb be 09 89 5d 9f\ -59 71 af 14 83 9d a4 ff 95 41 7e e4 53 d1 fd 77\ -31 90 72 bb 72 97 e1 b5 5d 75 61 cd 9d 1b b2 4c\ -1a 9a 37 c6 19 86 43 08 24 28 04 87 9d 86 eb d0\ -01 dc e5 18 39 75 e1 50 69 89 b7 0e 5a 83 43 41\ -54 d5 cb fd 6a 24 78 7e 60 eb 0c 65 8d 2a c1 93\ -30 2d 11 92 c6 e6 22 d4 a1 2a d4 b5 39 23 bc a2\ -46 df 31 c6 39 5e 37 70 2c 6a 78 ae 08 1f b9 d0\ -65 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 4.4 -Plaintext: \ -fb 2e f1 12 f5 e7 66 eb 94 01 92 97 93 47 94 f7\ -be 2f 6f c1 c5 8e -Seed: # not used yet\ -13 64 54 df 57 30 f7 3c 80 7a 7e 40 d8 c1 a3 12\ -ac 5b 9d d3 -Ciphertext: \ -02 d1 10 ad 30 af b7 27 be b6 91 dd 0c f1 7d 0a\ -f1 a1 e7 fa 0c c0 40 ec 1a 4b a2 6a 42 c5 9d 0a\ -79 6a 2e 22 c8 f3 57 cc c9 8b 65 19 ac eb 68 2e\ -94 5e 62 cb 73 46 14 a5 29 40 7c d4 52 be e3 e4\ -4f ec e8 42 3c c1 9e 55 54 8b 8b 99 4b 84 9c 7e\ -cd e4 93 3e 76 03 7e 1d 0c e4 42 75 b0 87 10 c6\ -8e 43 01 30 b9 29 73 0e d7 7e 09 b0 15 64 2c 55\ -93 f0 4e 4f fb 94 10 79 81 02 a8 e9 6f fd fe 11\ -e4 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 4.5 -Plaintext: \ -28 cc d4 47 bb 9e 85 16 6d ab b9 e5 b7 d1 ad ad\ -c4 b9 d3 9f 20 4e 96 d5 e4 40 ce 9a d9 28 bc 1c\ -22 84 -Seed: # not used yet\ -bc a8 05 7f 82 4b 2e a2 57 f2 86 14 07 ee f6 3d\ -33 20 86 81 -Ciphertext: \ -00 db b8 a7 43 9d 90 ef d9 19 a3 77 c5 4f ae 8f\ -e1 1e c5 8c 3b 85 83 62 e2 3a d1 b8 a4 43 10 79\ -90 66 b9 93 47 aa 52 56 91 d2 ad c5 8d 9b 06 e3\ -4f 28 8c 17 03 90 c5 f0 e1 1c 0a a3 64 59 59 f1\ -8e e7 9e 8f 2b e8 d7 ac 5c 23 d0 61 f1 8d d7 4b\ -8c 5f 2a 58 fc b5 eb 0c 54 f9 9f 01 a8 32 47 56\ -82 92 53 65 83 34 09 48 d7 a8 c9 7c 4a cd 1e 98\ -d1 e2 9d c3 20 e9 7a 26 05 32 a8 aa 7a 75 8a 1e\ -c2 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 4.6 -Plaintext: \ -f2 22 42 75 1e c6 b1 -Seed: # not used yet\ -2e 7e 1e 17 f6 47 b5 dd d0 33 e1 54 72 f9 0f 68\ -12 f3 ac 4e -Ciphertext: \ -00 a5 ff a4 76 8c 8b be ca ee 2d b7 7e 8f 2e ec\ -99 59 59 33 54 55 20 83 5e 5b a7 db 94 93 d3 e1\ -7c dd ef e6 a5 f5 67 62 44 71 90 8d b4 e2 d8 3a\ -0f be e6 06 08 fc 84 04 95 03 b2 23 4a 07 dc 83\ -b2 7b 22 84 7a d8 92 0f f4 2f 67 4e f7 9b 76 28\ -0b 00 23 3d 2b 51 b8 cb 27 03 a9 d4 2b fb c8 25\ -0c 96 ec 32 c0 51 e5 7f 1b 4b a5 28 db 89 c3 7e\ -4c 54 e2 7e 6e 64 ac 69 63 5a e8 87 d9 54 16 19\ -a9 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 5: A 1028-bit RSA Key Pair -Modulus: \ -0a ad f3 f9 c1 25 e5 d8 91 f3 1a c4 48 e9 93 de\ -fe 58 0f 80 2b 45 f9 d7 f2 2b a5 02 1e 9c 47 57\ -6b 5a 1e 68 03 1b a9 db 4e 6d ab e4 d9 6a 1d 6f\ -3d 26 72 68 cf f4 08 00 5f 11 8e fc ad b9 98 88\ -d1 c2 34 46 71 66 b2 a2 b8 49 a0 5a 88 9c 06 0a\ -c0 da 0c 5f ae 8b 55 f3 09 ba 62 e7 03 74 2f a0\ -32 6f 2d 10 b0 11 02 14 89 ff 49 77 70 19 0d 89\ -5f d3 9f 52 29 3c 39 ef d7 3a 69 8b da b9 f1 0e\ -d9 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -02 56 eb 4c ba 70 67 f2 d2 be 54 0d cd ff 45 82\ -a3 6b 7d 31 d1 c9 09 9b b2 14 b7 98 48 46 6a 26\ -8f 80 f5 8a 49 ac 04 c0 e3 64 89 34 a0 20 6c 04\ -53 7c 19 b2 36 64 3a 60 82 73 21 44 df 75 fa 21\ -75 88 f7 94 68 2b e8 91 68 27 6d c7 26 c5 c0 cb\ -db 84 d3 1b bf 26 d0 a4 3a f4 95 71 7f 7d 52 8a\ -cf ee 34 15 61 f6 ff 3c ae 05 c5 78 f8 47 0d 96\ -82 f9 c0 d0 72 f9 f6 06 8b 56 d5 88 0f 68 2b e2\ -c5 -Prime1: \ -03 b0 d3 96 2f 6d 17 54 9c bf ca 11 29 43 48 dc\ -f0 e7 e3 9f 8c 2b c6 82 4f 21 64 b6 06 d6 87 86\ -0d ae 1e 63 23 93 cf ed f5 13 22 82 29 06 9e 2f\ -60 e4 ac d7 e6 33 a4 36 06 3f 82 38 5f 48 99 37\ -07 -Prime2: \ -02 e4 c3 2e 2f 51 72 69 b7 07 23 09 f0 0c 0e 31\ -36 5f 7c e2 8b 23 6b 82 91 2d f2 39 ab f3 95 72\ -cf 0e d6 04 b0 29 82 e5 35 64 c5 2d 6a 05 39 7d\ -e5 c0 52 a2 fd dc 14 1e f7 18 98 36 34 6a eb 33\ -1f -ModPrime1PrivateExponent: \ -01 e8 4b 11 9d 25 16 1f a6 7b 00 25 6a 5b d9 b6\ -45 d2 b2 32 ec b0 5b 01 51 80 02 9a 88 62 2a dc\ -3f 09 b3 ae ac de 61 61 ab 7c de 22 c2 ad 26 e7\ -79 7d f5 4e 07 2c bd 3b 26 73 80 0b 3e 43 38 db\ -d5 -ModPrime2PrivateExponent: \ -eb 90 aa 1a 40 13 5b 4c ea 07 19 7c ed c8 81 9b\ -e1 e7 cb ff 25 47 66 21 16 f4 65 a4 a9 f4 87 ab\ -12 f3 ba 4f ef 13 82 22 65 a6 52 97 d9 8b 7b de\ -d9 37 2e 3f fe 81 a3 8b 3e 96 00 fe d0 55 75 4f -MultiplicativeInverseOfPrime2ModPrime1: \ -01 2f 7f 81 38 f9 40 40 62 eb 85 a4 29 24 52 0b\ -38 f5 bb 88 6a 01 96 f4 8b b8 dc ea 60 fd 92 cc\ -02 7f 18 e7 81 58 a3 4a 5c 5d 5f 86 0a 0f 6c 04\ -07 1a 7d 01 31 2c 06 50 62 f1 eb 48 b7 9d 1c 83\ -cb -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 5.1 -Plaintext: \ -af 71 a9 01 e3 a6 1d 31 32 f0 fc 1f db 47 4f 9e\ -a6 57 92 57 ff c2 4d 16 41 70 14 5b 3d bd e8 -Seed: # not used yet\ -44 c9 2e 28 3f 77 b9 49 9c 60 3d 96 36 60 c8 7d\ -2f 93 94 61 -Ciphertext: \ -03 60 46 a4 a4 7d 9e d3 ba 9a 89 13 9c 10 50 38\ -eb 74 92 b0 5a 5d 68 bf d5 3a cc ff 45 97 f7 a6\ -86 51 b4 7b 4a 46 27 d9 27 e4 85 ee d7 b4 56 64\ -20 e8 b4 09 87 9e 5d 60 6e ae 25 1d 22 a5 df 79\ -9f 79 20 bf c1 17 b9 92 57 2a 53 b1 26 31 46 bc\ -ea 03 38 5c c5 e8 53 c9 a1 01 c8 c3 e1 bd a3 1a\ -51 98 07 49 6c 6c b5 e5 ef b4 08 82 3a 35 2b 8f\ -a0 66 1f b6 64 ef ad d5 93 de b9 9f ff 5e d0 00\ -e5 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 5.2 -Plaintext: \ -a3 b8 44 a0 82 39 a8 ac 41 60 5a f1 7a 6c fd a4\ -d3 50 13 65 85 90 3a 41 7a 79 26 87 60 51 9a 4b\ -4a c3 30 3e c7 3f 0f 87 cf b3 23 99 -Seed: # not used yet\ -cb 28 f5 86 06 59 fc ee e4 9c 3e ea fc e6 25 a7\ -08 03 bd 32 -Ciphertext: \ -03 d6 eb 65 4e dc e6 15 bc 59 f4 55 26 5e d4 e5\ -a1 82 23 cb b9 be 4e 40 69 b4 73 80 4d 5d e9 6f\ -54 dc aa a6 03 d0 49 c5 d9 4a a1 47 0d fc d2 25\ -40 66 b7 c7 b6 1f f1 f6 f6 77 0e 32 15 c5 13 99\ -fd 4e 34 ec 50 82 bc 48 f0 89 84 0a d0 43 54 ae\ -66 dc 0f 1b d1 8e 46 1a 33 cc 12 58 b4 43 a2 83\ -7a 6d f2 67 59 aa 23 02 33 49 86 f8 73 80 c9 cc\ -9d 53 be 9f 99 60 5d 2c 9a 97 da 7b 09 15 a4 a7\ -ad -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 5.3 -Plaintext: \ -30 8b 0e cb d2 c7 6c b7 7f c6 f7 0c 5e dd 23 3f\ -d2 f2 09 29 d6 29 f0 26 95 3b b6 2a 8f 4a 3a 31\ -4b de 19 5d e8 5b 5f 81 6d a2 aa b0 74 d2 6c b6\ -ac dd f3 23 ae 3b 9c 67 8a c3 cf 12 fb dd e7 -Seed: # not used yet\ -22 85 f4 0d 77 04 82 f9 a9 ef a2 c7 2c b3 ac 55\ -71 6d c0 ca -Ciphertext: \ -07 70 95 21 81 64 9f 9f 9f 07 ff 62 6f f3 a2 2c\ -35 c4 62 44 3d 90 5d 45 6a 9f d0 bf f4 3c ac 2c\ -a7 a9 f5 54 e9 47 8b 9a cc 3a c8 38 b0 20 40 ff\ -d3 e1 84 7d e2 e4 25 39 29 f9 dd 9e e4 04 43 25\ -a9 b0 5c ab b8 08 b2 ee 84 0d 34 e1 5d 10 5a 3f\ -1f 7b 27 69 5a 1a 07 a2 d7 3f e0 8e ca aa 3c 9c\ -9d 4d 5a 89 ff 89 0d 54 72 7d 7a e4 0c 0e c1 a8\ -dd 86 16 5d 8e e2 c6 36 81 41 01 6a 48 b5 5b 69\ -67 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 5.4 -Plaintext: \ -15 c5 b9 ee 11 85 -Seed: # not used yet\ -49 fa 45 d3 a7 8d d1 0d fd 57 73 99 d1 eb 00 af\ -7e ed 55 13 -Ciphertext: \ -08 12 b7 67 68 eb cb 64 2d 04 02 58 e5 f4 44 1a\ -01 85 21 bd 96 68 7e 6c 5e 89 9f cd 6c 17 58 8f\ -f5 9a 82 cc 8a e0 3a 4b 45 b3 12 99 af 17 88 c3\ -29 f7 dc d2 85 f8 cf 4c ed 82 60 6b 97 61 26 71\ -a4 5b ed ca 13 34 42 14 4d 16 17 d1 14 f8 02 85\ -7f 0f 9d 73 97 51 c5 7a 3f 9e e4 00 91 2c 61 e2\ -e6 99 2b e0 31 a4 3d d4 8f a6 ba 14 ee f7 c4 22\ -b5 ed c4 e7 af a0 4f dd 38 f4 02 d1 c8 bb 71 9a\ -bf -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 5.5 -Plaintext: \ -21 02 6e 68 00 c7 fa 72 8f ca ab a0 d1 96 ae 28\ -d7 a2 ac 4f fd 8a bc e7 94 f0 98 5f 60 c8 a6 73\ -72 77 36 5d 3f ea 11 db 89 23 a2 02 9a -Seed: # not used yet\ -f0 28 74 13 23 4c c5 03 47 24 a0 94 c4 58 6b 87\ -af f1 33 fc -Ciphertext: \ -07 b6 0e 14 ec 95 4b fd 29 e6 0d 00 47 e7 89 f5\ -1d 57 18 6c 63 58 99 03 30 67 93 ce d3 f6 82 41\ -c7 43 52 9a ba 6a 63 74 f9 2e 19 e0 16 3e fa 33\ -69 7e 19 6f 76 61 df aa a4 7a ac 6b de 5e 51 de\ -b5 07 c7 2c 58 9a 2c a1 69 3d 96 b1 46 03 81 24\ -9b 2c db 9e ac 44 76 9f 24 89 c5 d3 d2 f9 9f 0e\ -e3 c7 ee 5b f6 4a 5a c7 9c 42 bd 43 3f 14 9b e8\ -cb 59 54 83 61 64 05 95 51 3c 97 af 7b c2 50 97\ -23 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 5.6 -Plaintext: \ -54 1e 37 b6 8b 6c 88 72 b8 4c 02 -Seed: # not used yet\ -d9 fb a4 5c 96 f2 1e 6e 26 d2 9e b2 cd cb 65 85\ -be 9c b3 41 -Ciphertext: \ -08 c3 6d 4d da 33 42 3b 2e d6 83 0d 85 f6 41 1b\ -a1 dc f4 70 a1 fa e0 eb ef ee 7c 08 9f 25 6c ef\ -74 cb 96 ea 69 c3 8f 60 f3 9a be e4 41 29 bc b4\ -c9 2d e7 f7 97 62 3b 20 07 4e 3d 9c 28 99 70 1e\ -d9 07 1e 1e fa 0b dd 84 d4 c3 e5 13 03 02 d8 f0\ -24 0b ab a4 b8 4a 71 cc 03 2f 22 35 a5 ff 0f ae\ -27 7c 3e 8f 91 12 be f4 4c 9a e2 0d 17 5f c9 a4\ -05 8b fc 93 0b a3 1b 02 e2 e4 f4 44 48 37 10 f2\ -4a -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 6: A 1029-bit RSA Key Pair -Modulus: \ -12 b1 7f 6d ad 2e cd 19 ff 46 dc 13 f7 86 0f 09\ -e0 e0 cf b6 77 b3 8a 52 59 23 05 ce af 02 2c 16\ -6d b9 0d 04 ac 29 e3 3f 7d d1 2d 9f af 66 e0 81\ -6b b6 3e ad 26 7c c7 d4 6c 17 c3 7b e2 14 bc a2\ -a2 2d 72 3a 64 e4 44 07 43 6b 6f c9 65 72 9a ef\ -c2 55 4f 37 6c d5 dc ea 68 29 37 80 a6 2b f3 9d\ -00 29 48 5a 16 0b bb 9e 5d c0 97 2d 21 a5 04 f5\ -2e 5e e0 28 aa 41 63 32 f5 10 b2 e9 cf f5 f7 22\ -af -PublicExponent: \ -01 00 01 -PrivateExponent: \ -02 95 ec a3 56 06 18 36 95 59 ce cd 30 3a a9 cf\ -da fc 1d 9f 06 95 9d f7 5f fe f9 29 aa 89 69 61\ -bc d1 90 dc 69 97 ed a7 f5 96 3e 72 4d 07 b4 dc\ -11 f3 06 5e 5a e9 7d 96 83 51 12 28 0b 90 84 bb\ -14 f2 a2 1e bd 4e 88 9d 41 b9 c4 13 2e c1 95 6f\ -ca b8 bb 2f ed 05 75 88 49 36 52 2c 5f f7 d3 32\ -61 90 48 24 e7 ca de e4 e0 bb 37 2d 24 57 cf 78\ -e2 bd 12 86 22 8f f8 3f 10 73 1c e6 3c 90 cf f3\ -f9 -Prime1: \ -04 a6 ce 8b 73 58 df a6 9b dc f7 42 61 70 05 af\ -b5 38 5f 5f 3a 58 a2 4e f7 4a 22 a8 c0 5c b7 cc\ -38 eb d4 cc 9d 9a 9d 78 9a 62 cd 0f 60 f0 cb 94\ -1d 34 23 c9 69 2e fa 4f e3 ad ff 29 0c 47 49 a3\ -8b -Prime2: \ -04 04 c9 a8 03 37 1f ed b4 c5 be 39 f3 c0 0b 00\ -9e 5e 08 a6 3b e1 e4 00 35 cd ac a5 01 1c c7 01\ -cf 7e eb cb 99 f0 ff e1 7c fd 0a 4b f7 be fd 2d\ -d5 36 ac 94 6d b7 97 fd bc 4a be 8f 29 34 9b 91\ -ed -ModPrime1PrivateExponent: \ -03 96 1c 8f 76 0a a2 bd 51 54 c7 aa fd 77 22 5b\ -3b ac d0 13 9a e7 b5 94 8e a3 31 1f cc d8 6f b9\ -5c 75 af a7 67 28 4b 9b 2d e5 59 57 2f 15 d8 d0\ -44 c7 eb 83 a1 be 5f ad f2 cc 37 7c 0d 84 75 29\ -4b -ModPrime2PrivateExponent: \ -02 21 97 e0 66 74 21 96 aa bc 03 fa 2f ee b4 e7\ -0b 15 cb 78 7d 61 7a cd 31 bb 75 c7 bc 23 4a d7\ -06 f7 c4 8d 21 82 d1 f0 ff 9c 22 8d cf 41 96 7b\ -6c 0b a6 d2 c0 ad 11 0a 1b 85 78 31 ec 24 5e 2c\ -b1 -MultiplicativeInverseOfPrime2ModPrime1: \ -04 01 c4 c0 c5 3d 45 db db 5e 9d 96 d0 fe cf 42\ -75 df 09 74 bc 4a 07 36 b4 a7 4c 32 69 05 3e fb\ -68 6a ce 24 06 e2 2c 9e 05 8d db 4a e5 40 62 7a\ -e2 fd b0 82 61 e8 e7 e4 bc bc 99 4d aa fa 30 5c\ -45 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 6.1 -Plaintext: \ -40 46 ca 8b aa 33 47 ca 27 f4 9e 0d 81 f9 cc 1d\ -71 be 9b a5 17 d4 -Seed: # not used yet\ -dd 0f 6c fe 41 5e 88 e5 a4 69 a5 1f bb a6 df d4\ -0a db 43 84 -Ciphertext: \ -06 30 ee bc d2 85 6c 24 f7 98 80 6e 41 f9 e6 73\ -45 ed a9 ce da 38 6a cc 9f ac ae a1 ee ed 06 ac\ -e5 83 70 97 18 d9 d1 69 fa df 41 4d 5c 76 f9 29\ -96 83 3e f3 05 b7 5b 1e 4b 95 f6 62 a2 0f ae dc\ -3b ae 0c 48 27 a8 bf 8a 88 ed bd 57 ec 20 3a 27\ -a8 41 f0 2e 43 a6 15 ba b1 a8 ca c0 70 1d e3 4d\ -eb de f6 2a 08 80 89 b5 5e c3 6e a7 52 2f d3 ec\ -8d 06 b6 a0 73 e6 df 83 31 53 bc 0a ef d9 3b d1\ -a3 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 6.2 -Plaintext: \ -5c c7 2c 60 23 1d f0 3b 3d 40 f9 b5 79 31 bc 31\ -10 9f 97 25 27 f2 8b 19 e7 48 0c 72 88 cb 3c 92\ -b2 25 12 21 4e 4b e6 c9 14 79 2d da bd f5 7f aa\ -8a a7 -Seed: # not used yet\ -8d 14 bd 94 6a 13 51 14 8f 5c ae 2e d9 a0 c6 53\ -e8 5e bd 85 -Ciphertext: \ -0e bc 37 37 61 73 a4 fd 2f 89 cc 55 c2 ca 62 b2\ -6b 11 d5 1c 3c 7c e4 9e 88 45 f7 4e 76 07 31 7c\ -43 6b c8 d2 3b 96 67 df eb 9d 08 72 34 b4 7b c6\ -83 71 75 ae 5c 05 59 f6 b8 1d 7d 22 41 6d 3e 50\ -f4 ac 53 3d 8f 08 12 f2 db 9e 79 1f e9 c7 75 ac\ -8b 6a d0 f5 35 ad 9c eb 23 a4 a0 20 14 c5 8a b3\ -f8 d3 16 14 99 a2 60 f3 93 48 e7 14 ae 2a 1d 34\ -43 20 8f d8 b7 22 cc fd fb 39 3e 98 01 1f 99 e6\ -3f -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 6.3 -Plaintext: \ -b2 0e 65 13 03 09 2f 4b cc b4 30 70 c0 f8 6d 23\ -04 93 62 ed 96 64 2f c5 63 2c 27 db 4a 52 e3 d8\ -31 f2 ab 06 8b 23 b1 49 87 9c 00 2f 6b f3 fe ee\ -97 59 11 12 56 2c -Seed: # not used yet\ -6c 07 5b c4 55 20 f1 65 c0 bf 5e a4 c5 df 19 1b\ -c9 ef 0e 44 -Ciphertext: \ -0a 98 bf 10 93 61 93 94 43 6c f6 8d 8f 38 e2 f1\ -58 fd e8 ea 54 f3 43 5f 23 9b 8d 06 b8 32 18 44\ -20 24 76 ae ed 96 00 94 92 48 0c e3 a8 d7 05 49\ -8c 4c 8c 68 f0 15 01 dc 81 db 60 8f 60 08 73 50\ -c8 c3 b0 bd 2e 9e f6 a8 14 58 b7 c8 01 b8 9f 2e\ -4f e9 9d 49 00 ba 6a 4b 5e 5a 96 d8 65 dc 67 6c\ -77 55 92 87 94 13 0d 62 80 a8 16 0a 19 0f 2d f3\ -ea 7c f9 aa 02 71 d8 8e 9e 69 05 ec f1 c5 15 2d\ -65 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 6.4 -Plaintext: \ -68 4e 30 38 c5 c0 41 f7 -Seed: # not used yet\ -3b bc 3b d6 63 7d fe 12 84 69 01 02 9b f5 b0 c0\ -71 03 43 9c -Ciphertext: \ -00 8e 7a 67 ca cf b5 c4 e2 4b ec 7d ee 14 91 17\ -f1 95 98 ce 8c 45 80 8f ef 88 c6 08 ff 9c d6 e6\ -95 26 3b 9a 3c 0a d4 b8 ba 4c 95 23 8e 96 a8 42\ -2b 85 35 62 9c 8d 53 82 37 44 79 ad 13 fa 39 97\ -4b 24 2f 9a 75 9e ea f9 c8 3a d5 a8 ca 18 94 0a\ -01 62 ba 75 58 76 df 26 3f 4b d5 0c 65 25 c5 60\ -90 26 7c 1f 0e 09 ce 08 99 a0 cf 35 9e 88 12 0a\ -bd 9b f8 93 44 5b 3c ae 77 d3 60 73 59 ae 9a 52\ -f8 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 6.5 -Plaintext: \ -32 48 8c b2 62 d0 41 d6 e4 dd 35 f9 87 bf 3c a6\ -96 db 1f 06 ac 29 a4 46 93 -Seed: # not used yet\ -b4 6b 41 89 3e 8b ef 32 6f 67 59 38 3a 83 07 1d\ -ae 7f ca bc -Ciphertext: \ -00 00 34 74 41 6c 7b 68 bd f9 61 c3 85 73 79 44\ -d7 f1 f4 0c b3 95 34 3c 69 3c c0 b4 fe 63 b3 1f\ -ed f1 ea ee ac 9c cc 06 78 b3 1d c3 2e 09 77 48\ -95 14 c4 f0 90 85 f6 29 8a 96 53 f0 1a ea 40 45\ -ff 58 2e e8 87 be 26 ae 57 5b 73 ee f7 f3 77 49\ -21 e3 75 a3 d1 9a dd a0 ca 31 aa 18 49 88 7c 1f\ -42 ca c9 67 7f 7a 2f 4e 92 3f 6e 5a 86 8b 38 c0\ -84 ef 18 75 94 dc 9f 7f 04 8f ea 2e 02 95 53 84\ -ab -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 6.6 -Plaintext: \ -50 ba 14 be 84 62 72 02 79 c3 06 ba -Seed: # not used yet\ -0a 24 03 31 2a 41 e3 d5 2f 06 0f bc 13 a6 7d e5\ -cf 76 09 a7 -Ciphertext: \ -0a 02 6d da 5f c8 78 5f 7b d9 bf 75 32 7b 63 e8\ -5e 2c 0f de e5 da db 65 eb dc ac 9a e1 de 95 c9\ -2c 67 2a b4 33 aa 7a 8e 69 ce 6a 6d 88 97 fa c4\ -ac 4a 54 de 84 1a e5 e5 bb ce 76 87 87 9d 79 63\ -4c ea 7a 30 68 40 65 c7 14 d5 24 09 b9 28 25 6b\ -bf 53 ea bc d5 23 1e b7 25 95 04 53 73 99 bd 29\ -16 4b 72 6d 33 a4 6d a7 01 36 0a 41 68 a0 91 cc\ -ab 72 d4 4a 62 fe d2 46 c0 ff ea 5b 13 48 ab 54\ -70 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 7: A 1030-bit RSA Key Pair -Modulus: \ -31 11 79 f0 bc fc 9b 9d 3c a3 15 d0 0e f3 0d 7b\ -dd 3a 2c fa e9 91 1b fe dc b9 48 b3 a4 78 2d 07\ -32 b6 ab 44 aa 4b f0 37 41 a6 44 dc 01 be c3 e6\ -9b 01 a0 33 e6 75 d8 ac d7 c4 92 5c 6b 1a ec 31\ -19 05 1d fd 89 76 2d 21 5d 45 47 5f fc b5 9f 90\ -81 48 62 3f 37 17 71 56 f6 ae 86 dd 7a 7c 5f 43\ -dc 1e 1f 90 82 54 05 8a 28 4a 5f 06 c0 02 17 93\ -a8 7f 1a c5 fe ff 7d ca ee 69 c5 e5 1a 37 89 e3\ -73 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -07 0c fc ff 2f eb 82 76 e2 74 32 c4 5d fe e4 8f\ -49 b7 91 7d 65 30 e1 f0 ca 34 60 f3 2e 02 76 17\ -44 87 c5 6e 22 a4 5d 25 00 d7 77 54 95 21 9d 7d\ -16 5a 9c f3 bd 92 c3 2a f9 a9 8d 8d c9 cc 29 68\ -00 ad c9 4a 0a 54 fb 40 f3 42 91 bf 84 ee 8e a1\ -2b 6f 10 93 59 c6 d3 54 2a 50 f9 c7 67 f5 cf ff\ -05 a6 81 c2 e6 56 fb 77 ca aa db 4b e9 46 8d 8a\ -bc d4 df 98 f5 8e 86 d2 05 3f a1 34 9f 74 8e 21\ -b1 -Prime1: \ -07 49 26 2c 11 1c d4 70 ec 25 66 e6 b3 73 2f c0\ -93 29 46 9a a1 90 71 d3 b9 c0 19 06 51 4c 6f 1d\ -26 ba a1 4b ea b0 97 1c 8b 7e 61 1a 4f 79 00 9d\ -6f ea 77 69 28 ca 25 28 5b 0d e3 64 3d 1a 3f 8c\ -71 -Prime2: \ -06 bc 1e 50 e9 6c 02 bf 63 6e 9e ea 8b 89 9b be\ -bf 76 51 de 77 dd 47 4c 3e 9b c2 3b ad 81 82 b6\ -19 04 c7 d9 7d fb eb fb 1e 00 10 88 78 b6 e6 7e\ -41 53 91 d6 79 42 c2 b2 bf 9b 44 35 f8 8b 0c b0\ -23 -ModPrime1PrivateExponent: \ -03 bc 7e a7 f0 aa b1 43 ab c6 ce 8b 97 11 86 36\ -a3 01 72 e4 cf e0 2c 8f a0 dd a3 b7 ba af 90 f8\ -09 29 82 98 55 25 f4 88 bd fc b4 bd 72 6e 22 63\ -9a c6 4a 30 92 ab 7f fc bf 1d 53 34 cf a5 0b 5b\ -f1 -ModPrime2PrivateExponent: \ -02 62 a6 aa 29 c2 a3 c6 7d c5 34 6c 06 38 1a fd\ -98 7a a3 cc 93 cf bf ec f5 4f dd 9f 9d 78 7d 7f\ -59 a5 23 d3 98 97 9d a1 37 a2 f6 38 1f e9 48 01\ -f7 c9 4d a2 15 18 dc 34 cb 40 87 0c 46 97 99 4a\ -d9 -MultiplicativeInverseOfPrime2ModPrime1: \ -64 9d 4c 17 b6 ee 17 21 e7 72 d0 38 9a 55 9c 3d\ -3c df 95 50 d4 57 c4 6b 03 7b 74 64 1b 1d 52 16\ -6a f8 a2 13 c8 39 62 06 cd fb a4 42 2f 18 d6 f6\ -1d bc b5 d2 14 c9 71 bf 48 2a eb 97 6a 73 70 c2 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 7.1 -Plaintext: \ -47 aa e9 09 -Seed: # not used yet\ -43 dd 09 a0 7f f4 ca c7 1c aa 46 32 ee 5e 1c 1d\ -ae e4 cd 8f -Ciphertext: \ -16 88 e4 ce 77 94 bb a6 cb 70 14 16 9e cd 55 9c\ -ed e2 a3 0b 56 a5 2b 68 d9 fe 18 cf 19 73 ef 97\ -b2 a0 31 53 95 1c 75 5f 62 94 aa 49 ad bd b5 58\ -45 ab 68 75 fb 39 86 c9 3e cf 92 79 62 84 0d 28\ -2f 9e 54 ce 8b 69 0f 7c 0c b8 bb d7 34 40 d9 57\ -1d 1b 16 cd 92 60 f9 ea b4 78 3c c4 82 e5 22 3d\ -c6 09 73 87 17 83 ec 27 b0 ae 0f d4 77 32 cb c2\ -86 a1 73 fc 92 b0 0f b4 ba 68 24 64 7c d9 3c 85\ -c1 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 7.2 -Plaintext: \ -1d 9b 2e 22 23 d9 bc 13 bf b9 f1 62 ce 73 5d b4\ -8b a7 c6 8f 68 22 a0 a1 a7 b6 ae 16 58 34 e7 -Seed: # not used yet\ -3a 9c 3c ec 7b 84 f9 bd 3a de cb c6 73 ec 99 d5\ -4b 22 bc 9b -Ciphertext: \ -10 52 ed 39 7b 2e 01 e1 d0 ee 1c 50 bf 24 36 3f\ -95 e5 04 f4 a0 34 34 a0 8f d8 22 57 4e d6 b9 73\ -6e db b5 f3 90 db 10 32 14 79 a8 a1 39 35 0e 2b\ -d4 97 7c 37 78 ef 33 1f 3e 78 ae 11 8b 26 84 51\ -f2 0a 2f 01 d4 71 f5 d5 3c 56 69 37 17 1b 2d bc\ -2d 4b de 45 9a 57 99 f0 37 2d 65 74 23 9b 23 23\ -d2 45 d0 bb 81 c2 86 b6 3c 89 a3 61 01 73 37 e4\ -90 2f 88 a4 67 f4 c7 f2 44 bf d5 ab 46 43 7f f3\ -b6 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 7.3 -Plaintext: \ -d9 76 fc -Seed: # not used yet\ -76 a7 5e 5b 61 57 a5 56 cf 88 84 bb 2e 45 c2 93\ -dd 54 5c f5 -Ciphertext: \ -21 55 cd 84 3f f2 4a 4e e8 ba db 76 94 26 00 28\ -a4 90 81 3b a8 b3 69 a4 cb f1 06 ec 14 8e 52 98\ -70 7f 59 65 be 7d 10 1c 10 49 ea 85 84 c2 4c d6\ -34 55 ad 9c 10 4d 68 62 82 d3 fb 80 3a 4c 11 c1\ -c2 e9 b9 1c 71 78 80 1d 1b 66 40 f0 03 f5 72 8d\ -f0 07 b8 a4 cc c9 2b ce 05 e4 1a 27 27 8d 7c 85\ -01 8c 52 41 43 13 a5 07 77 89 00 1d 4f 01 91 0b\ -72 aa d0 5d 22 0a a1 4a 58 73 3a 74 89 bc 54 55\ -6b -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 7.4 -Plaintext: \ -d4 73 86 23 df 22 3a a4 38 43 df 84 67 53 4c 41\ -d0 13 e0 c8 03 c6 24 e2 63 66 6b 23 9b de 40 a5\ -f2 9a eb 8d e7 9e 3d aa 61 dd 03 70 f4 9b d4 b0\ -13 83 4b 98 21 2a ef 6b 1c 5e e3 73 b3 cb -Seed: # not used yet\ -78 66 31 4a 6a d6 f2 b2 50 a3 59 41 db 28 f5 86\ -4b 58 58 59 -Ciphertext: \ -0a b1 4c 37 3a eb 7d 43 28 d0 aa ad 8c 09 4d 88\ -b9 eb 09 8b 95 f2 10 54 a2 90 82 52 2b e7 c2 7a\ -31 28 78 b6 37 91 7e 3d 81 9e 6c 3c 56 8d b5 d8\ -43 80 2b 06 d5 1d 9e 98 a2 be 0b f4 0c 03 14 23\ -b0 0e df bf f8 32 0e fb 91 71 bd 20 44 65 3a 4c\ -b9 c5 12 2f 6c 65 e8 3c da 2e c3 c1 26 02 7a 9c\ -1a 56 ba 87 4d 0f ea 23 f3 80 b8 2c f2 40 b8 cf\ -54 00 04 75 8c 4c 77 d9 34 15 7a 74 f3 fc 12 bf\ -ac -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 7.5 -Plaintext: \ -bb 47 23 1c a5 ea 1d 3a d4 6c 99 34 5d 9a 8a 61 -Seed: # not used yet\ -b2 16 6e d4 72 d5 8d b1 0c ab 2c 6b 00 0c cc f1\ -0a 7d c5 09 -Ciphertext: \ -02 83 87 a3 18 27 74 34 79 8b 4d 97 f4 60 06 8d\ -f5 29 8f ab a5 04 1b a1 17 61 a1 cb 73 16 b2 41\ -84 11 4e c5 00 25 7e 25 89 ed 3b 60 7a 1e bb e9\ -7a 6c c2 e0 2b f1 b6 81 f4 23 12 a3 3b 7a 77 d8\ -e7 85 5c 4a 6d e0 3e 3c 04 64 3f 78 6b 91 a2 64\ -a0 d6 80 5e 2c ea 91 e6 81 77 eb 7a 64 d9 25 5e\ -4f 27 e7 13 b7 cc ec 00 dc 20 0e bd 21 c2 ea 2b\ -b8 90 fe ae 49 42 df 94 1d c3 f9 78 90 ed 34 74\ -78 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 7.6 -Plaintext: \ -21 84 82 70 95 d3 5c 3f 86 f6 00 e8 e5 97 54 01\ -32 96 -Seed: # not used yet\ -52 67 3b de 2c a1 66 c2 aa 46 13 1a c1 dc 80 8d\ -67 d7 d3 b1 -Ciphertext: \ -14 c6 78 a9 4a d6 05 25 ef 39 e9 59 b2 f3 ba 5c\ -09 7a 94 ff 91 2b 67 db ac e8 05 35 c1 87 ab d4\ -7d 07 54 20 b1 87 21 52 bb a0 8f 7f c3 1f 31 3b\ -bf 92 73 c9 12 fc 4c 01 49 a9 b0 cf b7 98 07 e3\ -46 eb 33 20 69 61 1b ec 0f f9 bc d1 68 f1 f7 c3\ -3e 77 31 3c ea 45 4b 94 e2 54 9e ec f0 02 e2 ac\ -f7 f6 f2 d2 84 5d 4f e0 aa b2 e5 a9 2d df 68 c4\ -80 ae 11 24 79 35 d1 f6 25 74 84 22 16 ae 67 41\ -15 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 8: A 1031-bit RSA Key Pair -Modulus: \ -5b df 0e 30 d3 21 dd a5 14 7f 88 24 08 fa 69 19\ -54 80 df 8f 80 d3 f6 e8 bf 58 18 50 4f 36 42 7c\ -a9 b1 f5 54 0b 9c 65 a8 f6 97 4c f8 44 7a 24 4d\ -92 80 20 1b b4 9f cb be 63 78 d1 94 4c d2 27 e2\ -30 f9 6e 3d 10 f8 19 dc ef 27 6c 64 a0 0b 2a 4b\ -67 01 e7 d0 1d e5 fa bd e3 b1 e9 a0 df 82 f4 63\ -13 59 cd 22 66 96 47 fb b1 71 72 46 13 4e d7 b4\ -97 cf ff bd c4 2b 59 c7 3a 96 ed 90 16 62 12 df\ -f7 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -0f 7d 1e 9e 5a aa 25 fd 13 e4 a0 66 3a e1 44 e0\ -d1 5f 5c d1 8b cd b0 9d f2 cc 7e 64 e3 c5 e9 15\ -ad 62 64 53 04 16 1d 09 8c 71 5b b7 ab 8b d0 1d\ -07 ea f3 fe d7 c7 ed 08 af 2a 8a 62 ef 44 ab 16\ -b3 20 e1 4a f7 2a 48 f9 6a fe 26 2a 0a e4 cf 65\ -e6 35 e9 10 79 0c d4 ee 5c ea 76 8a 4b 26 39 f7\ -e6 f6 77 b3 f0 bb 6b e3 2b 75 74 7d 89 09 03 6f\ -02 64 f5 8d 40 1c db a1 31 71 61 57 a7 5e cf 63\ -31 -Prime1: \ -0a 02 ef 84 48 d9 fa d8 bb d0 d0 04 c8 c2 aa 97\ -51 ef 97 21 c1 b0 d0 32 36 a5 4b 0d f9 47 cb ae\ -d5 a2 55 ee 9e 8e 20 d4 91 ea 17 23 fe 09 47 04\ -a9 76 2e 88 af d1 6e bb 59 94 41 2c a9 66 dc 4f\ -9f -Prime2: \ -09 2d 36 2e 7e d3 a0 bf d9 e9 fd 0e 6c 03 01 b6\ -df 29 15 9c f5 0c c8 3b 9b 0c f4 d6 ee a7 1a 61\ -e0 02 b4 6e 0a e9 f2 de 62 d2 5b 5d 74 52 d4 98\ -b8 1c 9a c6 fc 58 59 3d 4c 3f b4 f5 d7 2d fb b0\ -a9 -ModPrime1PrivateExponent: \ -07 c7 14 10 af 10 39 62 db 36 74 04 e3 7a e8 50\ -ba a4 e9 c2 9d d9 21 45 81 52 94 a6 7c 7d 1c 6d\ -ed 26 3a a0 30 a9 b6 33 ae 50 30 3e 14 03 5d 1a\ -f0 14 12 3e ba 68 78 20 30 8d 8e bc 85 b6 95 7d\ -7d -ModPrime2PrivateExponent: \ -ae 2c 75 38 0c 02 c0 16 ad 05 89 1b 33 01 de 88\ -1f 28 ae 11 71 18 2b 6b 2c 83 be a7 c5 15 ec a9\ -ca 29 8c 7b 1c ab 58 17 a5 97 06 8f c8 50 60 de\ -4d a8 a0 16 37 8a ae 43 c7 f9 67 bc c3 79 04 b9 -MultiplicativeInverseOfPrime2ModPrime1: \ -05 98 d1 05 9e 3a da 4f 63 20 75 2c 09 d8 05 ff\ -7d 1f 1a e0 d0 17 ae ee e9 ce fa 0d 7d d7 ff 77\ -5e 44 b5 78 32 2f 64 05 d6 21 1d a1 95 19 66 6a\ -a8 7f dc 4c d8 c8 8f 6b 6e 3d 67 e9 61 dc bb a3\ -d0 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 8.1 -Plaintext: \ -05 0b 75 5e 5e 68 80 f7 b9 e9 d6 92 a7 4c 37 aa\ -e4 49 b3 1b fe a6 de ff 83 74 7a 89 7f 6c 2c 82\ -5b b1 ad bf 85 0a 3c 96 99 4b 5d e5 b3 3c bc 7d\ -4a 17 91 3a 79 67 -Seed: # not used yet\ -77 06 ff ca 1e cf b1 eb ee 2a 55 e5 c6 e2 4c d2\ -79 7a 41 25 -Ciphertext: \ -09 b3 68 3d 8a 2e b0 fb 29 5b 62 ed 1f b9 29 0b\ -71 44 57 b7 82 53 19 f4 64 78 72 af 88 9b 30 40\ -94 72 02 0a d1 29 12 bf 19 b1 1d 48 19 f4 96 14\ -82 4f fd 84 d0 9c 0a 17 e7 d1 73 09 d1 29 19 79\ -04 10 aa 29 95 69 9f 6a 86 db e3 24 2b 5a cc 23\ -af 45 69 10 80 d6 b1 ae 81 0f b3 e3 05 70 87 f0\ -97 00 92 ce 00 be 95 62 ff 40 53 b6 26 2c e0 ca\ -a9 3e 13 72 3d 2e 3a 5b a0 75 d4 5f 0d 61 b5 4b\ -61 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 8.2 -Plaintext: \ -4e b6 8d cd 93 ca 9b 19 df 11 1b d4 36 08 f5 57\ -02 6f e4 aa 1d 5c fa c2 27 a3 eb 5a b9 54 8c 18\ -a0 6d de d2 3f 81 82 59 86 b2 fc d7 11 09 ec ef\ -7e ff 88 87 3f 07 5c 2a a0 c4 69 f6 9c 92 bc -Seed: # not used yet\ -a3 71 7d a1 43 b4 dc ff bc 74 26 65 a8 fa 95 05\ -85 54 83 43 -Ciphertext: \ -2e cf 15 c9 7c 5a 15 b1 47 6a e9 86 b3 71 b5 7a\ -24 28 4f 4a 16 2a 8d 0c 81 82 e7 90 5e 79 22 56\ -f1 81 2b a5 f8 3f 1f 7a 13 0e 42 dc c0 22 32 84\ -4e dc 14 a3 1a 68 ee 97 ae 56 4a 38 3a 34 11 65\ -64 24 c5 f6 2d db 64 60 93 c3 67 be 1f cd a4 26\ -cf 00 a0 6d 8a cb 7e 57 77 6f bb d8 55 ac 3d f5\ -06 fc 16 b1 d7 c3 f2 11 0f 3d 80 68 e9 1e 18 63\ -63 83 1c 84 09 68 0d 8d a9 ec d8 cf 1f a2 0e e3\ -9d -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 8.3 -Plaintext: \ -86 04 ac 56 32 8c 1a b5 ad 91 78 61 -Seed: # not used yet\ -ee 06 20 90 73 cc a0 26 bb 26 4e 51 85 bf 8c 68\ -b7 73 9f 86 -Ciphertext: \ -4b c8 91 30 a5 b2 da bb 7c 2f cf 90 eb 5d 0e af\ -9e 68 1b 71 46 a3 8f 31 73 a3 d9 cf ec 52 ea 9e\ -0a 41 93 2e 64 8a 9d 69 34 4c 50 da 76 3f 51 a0\ -3c 95 76 21 31 e8 05 22 54 dc d2 24 8c ba 40 fd\ -31 66 77 86 ce 05 a2 b7 b5 31 ac 9d ac 9e d5 84\ -a5 9b 67 7c 1a 8a ed 8c 5d 15 d6 8c 05 56 9e 2b\ -e7 80 bf 7d b6 38 fd 2b fd 2a 85 ab 27 68 60 f3\ -77 73 38 fc a9 89 ff d7 43 d1 3e e0 8e 0c a9 89\ -3f -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 8.4 -Plaintext: \ -fd da 5f bf 6e c3 61 a9 d9 a4 ac 68 af 21 6a 06\ -86 f4 38 b1 e0 e5 c3 6b 95 5f 74 e1 07 f3 9c 0d\ -dd cc -Seed: # not used yet\ -99 0a d5 73 dc 48 a9 73 23 5b 6d 82 54 36 18 f2\ -e9 55 10 5d -Ciphertext: \ -2e 45 68 47 d8 fc 36 ff 01 47 d6 99 35 94 b9 39\ -72 27 d5 77 75 2c 79 d0 f9 04 fc b0 39 d4 d8 12\ -fe a6 05 a7 b5 74 dd 82 ca 78 6f 93 75 23 48 43\ -8e e9 f5 b5 45 49 85 d5 f0 e1 69 9e 3e 7a d1 75\ -a3 2e 15 f0 3d eb 04 2a b9 fe 1d d9 db 1b b8 6f\ -8c 08 9c cb 45 e7 ef 0c 5e e7 ca 9b 72 90 ca 6b\ -15 be d4 70 39 78 8a 8a 93 ff 83 e0 e8 d6 24 4c\ -71 00 63 62 de ef 69 b6 f4 16 fb 3c 68 43 83 fb\ -d0 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 8.5 -Plaintext: \ -4a 5f 49 14 be e2 5d e3 c6 93 41 de 07 -Seed: # not used yet\ -ec c6 3b 28 f0 75 6f 22 f5 2a c8 e6 ec 12 51 a6\ -ec 30 47 18 -Ciphertext: \ -1f b9 35 6f d5 c4 b1 79 6d b2 eb f7 d0 d3 93 cc\ -81 0a df 61 45 de fc 2f ce 71 4f 79 d9 38 00 d5\ -e2 ac 21 1e a8 bb ec ca 4b 65 4b 94 c3 b1 8b 30\ -dd 57 6c e3 4d c9 54 36 ef 57 a0 94 15 64 59 23\ -35 9a 5d 7b 41 71 ef 22 c2 46 70 f1 b2 29 d3 60\ -3e 91 f7 66 71 b7 df 97 e7 31 7c 97 73 44 76 d5\ -f3 d1 7d 21 cf 82 b5 ba 9f 83 df 2e 58 8d 36 98\ -4f d1 b5 84 46 8b d2 3b 2e 87 5f 32 f6 89 53 f7\ -b2 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 8.6 -Plaintext: \ -8e 07 d6 6f 7b 88 0a 72 56 3a bc d3 f3 50 92 bc\ -33 40 9f b7 f8 8f 24 72 be -Seed: # not used yet\ -39 25 c7 1b 36 2d 40 a0 a6 de 42 14 55 79 ba 1e\ -7d d4 59 fc -Ciphertext: \ -3a fd 9c 66 00 14 7b 21 79 8d 81 8c 65 5a 0f 4c\ -92 12 db 26 d0 b0 df dc 2a 75 94 cc b3 d2 2f 5b\ -f1 d7 c3 e1 12 cd 73 fc 7d 50 9c 7a 8b af dd 3c\ -27 4d 13 99 00 9f 96 09 ec 4b e6 47 7e 45 3f 07\ -5a a3 3d b3 82 87 0c 1c 34 09 ae f3 92 d7 38 6a\ -e3 a6 96 b9 9a 94 b4 da 05 89 44 7e 95 5d 16 c9\ -8b 17 60 2a 59 bd 73 62 79 fc d8 fb 28 0c 44 62\ -d5 90 bf a9 bf 13 fe d5 70 ea fd e9 73 30 a2 c2\ -10 -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 9: A 1536-bit RSA Key Pair -Modulus: \ -cf 2c d4 1e 34 ca 3a 72 8e a5 cb 8a ff 64 c3 6d\ -27 bd ef 53 64 e3 36 fd 68 d3 12 3c 5a 19 6a 8c\ -28 70 13 e8 53 d5 15 6d 58 d1 51 95 45 20 fb 4f\ -6d 7b 17 ab b6 81 77 65 90 9c 57 61 19 65 9d 90\ -2b 19 06 ed 8a 2b 10 c1 55 c2 4d 12 45 28 da b9\ -ee ae 37 9b ea c6 6e 4a 41 17 86 dc b8 fd 00 62\ -eb c0 30 de 12 19 a0 4c 2a 8c 1b 7d d3 13 1e 4d\ -6b 6c ae e2 e3 1a 5e d4 1a c1 50 9b 2e f1 ee 2a\ -b1 83 64 be 56 8c a9 41 c2 5e cc 84 ff 9d 64 3b\ -5e c1 aa ae 10 2a 20 d7 3f 47 9b 78 0f d6 da 91\ -07 52 12 d9 ea c0 3a 06 74 d8 99 eb a2 e4 31 f4\ -c4 4b 61 5b 6b a2 23 2b d4 b3 3b ae d7 3d 62 5d -PublicExponent: \ -01 00 01 -PrivateExponent: \ -19 8c 14 1e 23 71 5a 92 bc cf 6a 11 9a 5b c1 13\ -89 46 8d 28 11 f5 48 d7 27 e1 7b 4a b0 eb 98 6d\ -6f 21 1e fb 53 b7 1f 7c cb ea 87 ee 69 c7 5e e6\ -15 00 8c 53 32 de b5 2b f3 90 ab df bf e3 7d 72\ -05 36 81 59 b2 63 8c 1d e3 26 e2 1d 22 25 1f 0f\ -b5 84 8b 3b f1 50 05 d2 a7 43 30 f0 af e9 16 ee\ -62 cc c1 34 4d 1d 83 a7 09 e6 06 76 27 38 40 f7\ -f3 77 42 4a 5e 0a 4d a7 5f 01 b3 1f f7 68 19 cf\ -9c bf dd 21 52 43 c3 91 7c 03 ef 38 19 93 12 e5\ -67 b3 bf 7a ed 3a b4 57 f3 71 ef 8a 14 23 f4 5b\ -68 c6 e2 82 ec 11 1b ba 28 33 b9 87 fd 69 fa d8\ -3b c1 b8 c6 13 c5 e1 ea 16 c1 1e d1 25 ea 7e c1 -Prime1: \ -fc 8d 6c 04 be c4 eb 9a 81 92 ca 79 00 cb e5 36\ -e2 e8 b5 19 de cf 33 b2 45 97 98 c6 90 9d f4 f1\ -76 db 7d 23 19 0f c7 2b 88 65 a7 18 af 89 5f 1b\ -cd 91 45 29 80 27 42 3b 60 5e 70 a4 7c f5 83 90\ -a8 c3 e8 8f c8 c4 8e 8b 32 e3 da 21 0d fb e3 e8\ -81 ea 56 74 b6 a3 48 c2 1e 93 f9 e5 5e a6 5e fd -Prime2: \ -d2 00 d4 5e 78 8a ac ea 60 6a 40 1d 04 60 f8 7d\ -d5 c1 02 7e 12 dc 1a 0d 75 86 e8 93 9d 9c f7 89\ -b4 0f 51 ac 04 42 96 1d e7 d2 1c c2 1e 05 c8 31\ -55 c1 f2 aa 91 93 38 7c fd f9 56 cb 48 d1 53 ba\ -27 04 06 f9 bb ba 53 7d 49 87 d9 e2 f9 94 2d 7a\ -14 cb ff fe a7 4f ec dd a9 28 d2 3e 25 9f 5e e1 -ModPrime1PrivateExponent: \ -db 16 80 2f 79 a2 f0 d4 5f 35 8d 69 fd 33 e4 4b\ -81 fa e8 28 62 2e 93 a5 42 53 e9 97 d0 1b 07 43\ -75 9d a0 e8 12 b4 aa 4e 6c 8b ea b2 32 8d 54 31\ -95 5a 41 8a 67 ff 26 a8 c5 c8 07 a5 da 35 4e 05\ -ef 31 cc 8c f7 58 f4 63 73 29 50 b0 3e 26 57 26\ -fb 94 e3 9d 6a 57 2a 26 24 4a b0 8d b7 57 52 ad -ModPrime2PrivateExponent: \ -a0 a3 17 cf e7 df 14 23 f8 7a 6d ee 84 51 f4 e2\ -b4 a6 7e 54 97 f2 9b 4f 1e 4e 83 0b 9f ad d9 40\ -11 67 02 6f 55 96 e5 a3 9c 97 81 7e 0f 5f 16 e2\ -7e 19 ec 99 02 e0 1d 7e a6 fb 9a a3 c7 60 af ee\ -1e 38 1b 69 de 6a c9 c0 75 85 a0 6a d9 c4 ba 00\ -bf 75 c8 ad 2f a8 98 a4 79 e8 0a e2 94 fe d2 a1 -MultiplicativeInverseOfPrime2ModPrime1: \ -0b 21 f3 35 c3 53 34 2e b4 4c 3a a2 44 45 78 0c\ -2d 65 5b 94 01 74 ca e3 8c 7c 8a 4e 64 93 c0 ba\ -9f d3 03 74 82 67 b0 83 b9 a7 a6 cb 61 e4 2d b3\ -62 b8 c9 89 6d b7 06 4e 02 ad 5a e6 15 87 da 15\ -b4 64 9c 90 59 49 09 fe b3 7d bc b6 54 be b7 26\ -8e c8 01 e5 a8 b4 aa 39 11 be bd 88 54 2f 05 be -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 9.1 -Plaintext: \ -f7 35 fd 55 ba 92 59 2c 3b 52 b8 f9 c4 f6 9a aa\ -1c be f8 fe 88 ad d0 95 59 54 12 46 7f 9c f4 ec\ -0b 89 6c 59 ed a1 62 10 e7 54 9c 8a bb 10 cd bc\ -21 a1 2e c9 b6 b5 b8 fd 2f 10 39 9e b6 -Seed: # not used yet\ -8e c9 65 f1 34 a3 ec 99 31 e9 2a 1c a0 dc 81 69\ -d5 ea 70 5c -Ciphertext: \ -26 7b cd 11 8a ca b1 fc 8b a8 1c 85 d7 30 03 cb\ -86 10 fa 55 c1 d9 7d a8 d4 8a 7c 7f 06 89 6a 4d\ -b7 51 aa 28 42 55 b9 d3 6a d6 5f 37 65 3d 82 9f\ -1b 37 f9 7b 80 01 94 25 45 b2 fc 2c 55 a7 37 6c\ -a7 a1 be 4b 17 60 c8 e0 5a 33 e5 aa 25 26 b8 d9\ -8e 31 70 88 e7 83 4c 75 5b 2a 59 b1 26 31 a1 82\ -c0 5d 5d 43 ab 17 79 26 4f 84 56 f5 15 ce 57 df\ -df 51 2d 54 93 da b7 b7 33 8d c4 b7 d7 8d b9 c0\ -91 ac 3b af 53 7a 69 fc 7f 54 9d 97 9f 0e ff 9a\ -94 fd a4 16 9b d4 d1 d1 9a 69 c9 9e 33 c3 b5 54\ -90 d5 01 b3 9b 1e da e1 18 ff 67 93 a1 53 26 15\ -84 d3 a5 f3 9f 6e 68 2e 3d 17 c8 cd 12 61 fa 72 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 9.2 -Plaintext: \ -81 b9 06 60 50 15 a6 3a ab e4 2d df 11 e1 97 89\ -12 f5 40 4c 74 74 b2 6d ce 3e d4 82 bf 96 1e cc\ -81 8b f4 20 c5 46 59 -Seed: # not used yet\ -ec b1 b8 b2 5f a5 0c da b0 8e 56 04 28 67 f4 af\ -58 26 d1 6c -Ciphertext: \ -93 ac 9f 06 71 ec 29 ac bb 44 4e ff c1 a5 74 13\ -51 d6 0f db 0e 39 3f bf 75 4a cf 0d e4 97 61 a1\ -48 41 df 77 72 e9 bc 82 77 39 66 a1 58 4c 4d 72\ -ba ea 00 11 8f 83 f3 5c ca 6e 53 7c bd 4d 81 1f\ -55 83 b2 97 83 d8 a6 d9 4c d3 1b e7 0d 6f 52 6c\ -10 ff 09 c6 fa 7c e0 69 79 5a 3f cd 05 11 fd 5f\ -cb 56 4b cc 80 ea 9c 78 f3 8b 80 01 25 39 d8 a4\ -dd f6 fe 81 e9 cd db 7f 50 db bb bc c7 e5 d8 60\ -97 cc f4 ec 49 18 9f b8 bf 31 8b e6 d5 a0 71 5d\ -51 6b 49 af 19 12 58 cd 32 dc 83 3c e6 eb 46 73\ -c0 3a 19 bb ac e8 8c c5 48 95 f6 36 cc 0c 1e c8\ -90 96 d1 1c e2 35 a2 65 ca 17 64 23 2a 68 9a e8 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 9.3 -Plaintext: \ -fd 32 64 29 df 9b 89 0e 09 b5 4b 18 b8 f3 4f 1e\ -24 -Seed: # not used yet\ -e8 9b b0 32 c6 ce 62 2c bd b5 3b c9 46 60 14 ea\ -77 f7 77 c0 -Ciphertext: \ -81 eb dd 95 05 4b 0c 82 2e f9 ad 76 93 f5 a8 7a\ -df b4 b4 c4 ce 70 df 2d f8 4e d4 9c 04 da 58 ba\ -5f c2 0a 19 e1 a6 e8 b7 a3 90 0b 22 79 6d c4 e8\ -69 ee 6b 42 79 2d 15 a8 ec eb 56 c0 9c 69 91 4e\ -81 3c ea 8f 69 31 e4 b8 ed 6f 42 1a f2 98 d5 95\ -c9 7f 47 89 c7 ca a6 12 c7 ef 36 09 84 c2 1b 93\ -ed c5 40 10 68 b5 af 4c 78 a8 77 1b 98 4d 53 b8\ -ea 8a df 2f 6a 7d 4a 0b a7 6c 75 e1 dd 9f 65 8f\ -20 de d4 a4 60 71 d4 6d 77 91 b5 68 03 d8 fe a7\ -f0 b0 f8 e4 1a e3 f0 93 83 a6 f9 58 5f e7 75 3e\ -aa ff d2 bf 94 56 31 08 be ec c2 07 bb b5 35 f5\ -fc c7 05 f0 dd e9 f7 08 c6 2f 49 a9 c9 03 71 d3 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 9.4 -Plaintext: \ -f1 45 9b 5f 0c 92 f0 1a 0f 72 3a 2e 56 62 48 4d\ -8f 8c 0a 20 fc 29 da d6 ac d4 3b b5 f3 ef fd f4\ -e1 b6 3e 07 fd fe 66 28 d0 d7 4c a1 9b f2 d6 9e\ -4a 0a bf 86 d2 93 92 5a 79 67 72 f8 08 8e -Seed: # not used yet\ -60 6f 3b 99 c0 b9 cc d7 71 ea a2 9e a0 e4 c8 84\ -f3 18 9c cc -Ciphertext: \ -bc c3 5f 94 cd e6 6c b1 13 66 25 d6 25 b9 44 32\ -a3 5b 22 f3 d2 fa 11 a6 13 ff 0f ca 5b d5 7f 87\ -b9 02 cc dc 1c d0 ae bc b0 71 5e e8 69 d1 d1 fe\ -39 5f 67 93 00 3f 5e ca 46 50 59 c8 86 60 d4 46\ -ff 5f 08 18 55 20 22 55 7e 38 c0 8a 67 ea d9 91\ -26 22 54 f1 06 82 97 5e c5 63 97 76 85 37 f4 97\ -7a f6 d5 f6 aa ce b7 fb 25 de c5 93 72 30 23 1f\ -d8 97 8a f4 91 19 a2 9f 29 e4 24 ab 82 72 b4 75\ -62 79 2d 5c 94 f7 74 b8 82 9d 0b 0d 9f 1a 8c 9e\ -dd f3 75 74 d5 fa 24 8e ef a9 c5 27 1f c5 ec 25\ -79 c8 1b dd 61 b4 10 fa 61 fe 36 e4 24 22 1c 11\ -3a dd b2 75 66 4c 80 1d 34 ca 8c 63 51 e4 a8 58 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 9.5 -Plaintext: \ -53 e6 e8 c7 29 d6 f9 c3 19 dd 31 7e 74 b0 db 8e\ -4c cc a2 5f 3c 83 05 74 6e 13 7a c6 3a 63 ef 37\ -39 e7 b5 95 ab b9 6e 8d 55 e5 4f 7b d4 1a b4 33\ -37 8f fb 91 1d -Seed: # not used yet\ -fc bc 42 14 02 e9 ec ab c6 08 2a fa 40 ba 5f 26\ -52 2c 84 0e -Ciphertext: \ -23 2a fb c9 27 fa 08 c2 f6 a2 7b 87 d4 a5 cb 09\ -c0 7d c2 6f ae 73 d7 3a 90 55 88 39 f4 fd 66 d2\ -81 b8 7e c7 34 bc e2 37 ba 16 66 98 ed 82 91 06\ -a7 de 69 42 cd 6c dc e7 8f ed 8d 2e 4d 81 42 8e\ -66 49 0d 03 62 64 ce f9 2a f9 41 d3 e3 50 55 fe\ -39 81 e1 4d 29 cb b9 a4 f6 74 73 06 3b ae c7 9a\ -11 79 f5 a1 7c 9c 18 32 f2 83 8f d7 d5 e5 9b b9\ -65 9d 56 dc e8 a0 19 ed ef 1b b3 ac cc 69 7c c6\ -cc 7a 77 8f 60 a0 64 c7 f6 f5 d5 29 c6 21 02 62\ -e0 03 de 58 3e 81 e3 16 7b 89 97 1f b8 c0 e1 5d\ -44 ff fe f8 9b 53 d8 d6 4d d7 97 d1 59 b5 6d 2b\ -08 ea 53 07 ea 12 c2 41 bd 58 d4 ee 27 8a 1f 2e -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 9.6 -Plaintext: \ -b6 b2 8e a2 19 8d 0c 10 08 bc 64 -Seed: # not used yet\ -23 aa de 0e 1e 08 bb 9b 9a 78 d2 30 2a 52 f9 c2\ -1b 2e 1b a2 -Ciphertext: \ -43 8c c7 dc 08 a6 8d a2 49 e4 25 05 f8 57 3b a6\ -0e 2c 27 73 d5 b2 90 f4 cf 9d ff 71 8e 84 20 81\ -c3 83 e6 70 24 a0 f2 95 94 ea 98 7b 9d 25 e4 b7\ -38 f2 85 97 0d 19 5a bb 3a 8c 80 54 e3 d7 9d 6b\ -9c 9a 83 27 ba 59 6f 12 59 e2 71 26 67 47 66 90\ -7d 8d 58 2f f3 a8 47 61 54 92 9a db 1e 6d 12 35\ -b2 cc b4 ec 8f 66 3b a9 cc 67 0a 92 be bd 85 3c\ -8d bf 69 c6 43 6d 01 6f 61 ad d8 36 e9 47 32 45\ -04 34 20 7f 9f d4 c4 3d ec 2a 12 a9 58 ef a0 1e\ -fe 26 69 89 9b 5e 60 4c 25 5c 55 fb 71 66 de 55\ -89 e3 69 59 7b b0 91 68 c0 6d d5 db 17 7e 06 a1\ -74 0e b2 d5 c8 2f ae ca 6d 92 fc ee 99 31 ba 9f -Test: DecryptMatch - -AlgorithmType: AsymmetricCipher -Name: RSA/OAEP-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 10: A 2048-bit RSA Key Pair -Modulus: \ -ae 45 ed 56 01 ce c6 b8 cc 05 f8 03 93 5c 67 4d\ -db e0 d7 5c 4c 09 fd 79 51 fc 6b 0c ae c3 13 a8\ -df 39 97 0c 51 8b ff ba 5e d6 8f 3f 0d 7f 22 a4\ -02 9d 41 3f 1a e0 7e 4e be 9e 41 77 ce 23 e7 f5\ -40 4b 56 9e 4e e1 bd cf 3c 1f b0 3e f1 13 80 2d\ -4f 85 5e b9 b5 13 4b 5a 7c 80 85 ad ca e6 fa 2f\ -a1 41 7e c3 76 3b e1 71 b0 c6 2b 76 0e de 23 c1\ -2a d9 2b 98 08 84 c6 41 f5 a8 fa c2 6b da d4 a0\ -33 81 a2 2f e1 b7 54 88 50 94 c8 25 06 d4 01 9a\ -53 5a 28 6a fe b2 71 bb 9b a5 92 de 18 dc f6 00\ -c2 ae ea e5 6e 02 f7 cf 79 fc 14 cf 3b dc 7c d8\ -4f eb bb f9 50 ca 90 30 4b 22 19 a7 aa 06 3a ef\ -a2 c3 c1 98 0e 56 0c d6 4a fe 77 95 85 b6 10 76\ -57 b9 57 85 7e fd e6 01 09 88 ab 7d e4 17 fc 88\ -d8 f3 84 c4 e6 e7 2c 3f 94 3e 0c 31 c0 c4 a5 cc\ -36 f8 79 d8 a3 ac 9d 7d 59 86 0e aa da 6b 83 bb -PublicExponent: \ -01 00 01 -PrivateExponent: \ -05 6b 04 21 6f e5 f3 54 ac 77 25 0a 4b 6b 0c 85\ -25 a8 5c 59 b0 bd 80 c5 64 50 a2 2d 5f 43 8e 59\ -6a 33 3a a8 75 e2 91 dd 43 f4 8c b8 8b 9d 5f c0\ -d4 99 f9 fc d1 c3 97 f9 af c0 70 cd 9e 39 8c 8d\ -19 e6 1d b7 c7 41 0a 6b 26 75 df bf 5d 34 5b 80\ -4d 20 1a dd 50 2d 5c e2 df cb 09 1c e9 99 7b be\ -be 57 30 6f 38 3e 4d 58 81 03 f0 36 f7 e8 5d 19\ -34 d1 52 a3 23 e4 a8 db 45 1d 6f 4a 5b 1b 0f 10\ -2c c1 50 e0 2f ee e2 b8 8d ea 4a d4 c1 ba cc b2\ -4d 84 07 2d 14 e1 d2 4a 67 71 f7 40 8e e3 05 64\ -fb 86 d4 39 3a 34 bc f0 b7 88 50 1d 19 33 03 f1\ -3a 22 84 b0 01 f0 f6 49 ea f7 93 28 d4 ac 5c 43\ -0a b4 41 49 20 a9 46 0e d1 b7 bc 40 ec 65 3e 87\ -6d 09 ab c5 09 ae 45 b5 25 19 01 16 a0 c2 61 01\ -84 82 98 50 9c 1c 3b f3 a4 83 e7 27 40 54 e1 5e\ -97 07 50 36 e9 89 f6 09 32 80 7b 52 57 75 1e 79 -Prime1: \ -ec f5 ae cd 1e 55 15 ff fa cb d7 5a 28 16 c6 eb\ -f4 90 18 cd fb 46 38 e1 85 d6 6a 73 96 b6 f8 09\ -0f 80 18 c7 fd 95 cc 34 b8 57 dc 17 f0 cc 65 16\ -bb 13 46 ab 4d 58 2c ad ad 7b 41 03 35 23 87 b7\ -03 38 d0 84 04 7c 9d 95 39 b6 49 62 04 b3 dd 6e\ -a4 42 49 92 07 be c0 1f 96 42 87 ff 63 36 c3 98\ -46 58 33 68 46 f5 6e 46 86 18 81 c1 02 33 d2 17\ -6b f1 5a 5e 96 dd c7 80 bc 86 8a a7 7d 3c e7 69 -Prime2: \ -bc 46 c4 64 fc 6a c4 ca 78 3b 0e b0 8a 3c 84 1b\ -77 2f 7e 9b 2f 28 ba bd 58 8a e8 85 e1 a0 c6 1e\ -48 58 a0 fb 25 ac 29 99 90 f3 5b e8 51 64 c2 59\ -ba 11 75 cd d7 19 27 07 13 51 84 99 2b 6c 29 b7\ -46 dd 0d 2c ab e1 42 83 5f 7d 14 8c c1 61 52 4b\ -4a 09 94 6d 48 b8 28 47 3f 1c e7 6b 6c b6 88 6c\ -34 5c 03 e0 5f 41 d5 1b 5c 3a 90 a3 f2 40 73 c7\ -d7 4a 4f e2 5d 9c f2 1c 75 96 0f 3f c3 86 31 83 -ModPrime1PrivateExponent: \ -c7 35 64 57 1d 00 fb 15 d0 8a 3d e9 95 7a 50 91\ -5d 71 26 e9 44 2d ac f4 2b c8 2e 86 2e 56 73 ff\ -6a 00 8e d4 d2 e3 74 61 7d f8 9f 17 a1 60 b4 3b\ -7f da 9c b6 b6 b7 42 18 60 98 15 f7 d4 5c a2 63\ -c1 59 aa 32 d2 72 d1 27 fa f4 bc 8c a2 d7 73 78\ -e8 ae b1 9b 0a d7 da 3c b3 de 0a e7 31 49 80 f6\ -2b 6d 4b 0a 87 5d 1d f0 3c 1b ae 39 cc d8 33 ef\ -6c d7 e2 d9 52 8b f0 84 d1 f9 69 e7 94 e9 f6 c1 -ModPrime2PrivateExponent: \ -26 58 b3 7f 6d f9 c1 03 0b e1 db 68 11 7f a9 d8\ -7e 39 ea 2b 69 3b 7e 6d 3a 2f 70 94 74 13 ee c6\ -14 2e 18 fb 8d fc b6 ac 54 5d 7c 86 a0 ad 48 f8\ -45 71 70 f0 ef b2 6b c4 81 26 c5 3e fd 1d 16 92\ -01 98 dc 2a 11 07 dc 28 2d b6 a8 0c d3 06 23 60\ -ba 3f a1 3f 70 e4 31 2f f1 a6 cd 6b 8f c4 cd 9c\ -5c 3d b1 7c 6d 6a 57 21 2f 73 ae 29 f6 19 32 7b\ -ad 59 b1 53 85 85 85 ba 4e 28 b6 0a 62 a4 5e 49 -MultiplicativeInverseOfPrime2ModPrime1: \ -6f 38 52 6b 39 25 08 55 34 ef 3e 41 5a 83 6e de\ -8b 86 15 8a 2c 7c bf ec cb 0b d8 34 30 4f ec 68\ -3b a8 d4 f4 79 c4 33 d4 34 16 e6 32 69 62 3c ea\ -10 07 76 d8 5a ff 40 1d 3f ff 61 0e e6 54 11 ce\ -3b 13 63 d6 3a 97 09 ee de 42 64 7c ea 56 14 93\ -d5 45 70 a8 79 c1 86 82 cd 97 71 0b 96 20 5e c3\ -11 17 d7 3b 5f 36 22 3f ad d6 e8 ba 90 dd 7c 0e\ -e6 1d 44 e1 63 25 1e 20 c7 f6 6e b3 05 11 7c b8 -Test: KeyPairValidAndConsistent -Comment: RSAES-OAEP Encryption Example 10.1 -Plaintext: \ -8b ba 6b f8 2a 6c 0f 86 d5 f1 75 6e 97 95 68 70\ -b0 89 53 b0 6b 4e b2 05 bc 16 94 ee -Seed: # not used yet\ -47 e1 ab 71 19 fe e5 6c 95 ee 5e aa d8 6f 40 d0\ -aa 63 bd 33 -Ciphertext: \ -53 ea 5d c0 8c d2 60 fb 3b 85 85 67 28 7f a9 15\ -52 c3 0b 2f eb fb a2 13 f0 ae 87 70 2d 06 8d 19\ -ba b0 7f e5 74 52 3d fb 42 13 9d 68 c3 c5 af ee\ -e0 bf e4 cb 79 69 cb f3 82 b8 04 d6 e6 13 96 14\ -4e 2d 0e 60 74 1f 89 93 c3 01 4b 58 b9 b1 95 7a\ -8b ab cd 23 af 85 4f 4c 35 6f b1 66 2a a7 2b fc\ -c7 e5 86 55 9d c4 28 0d 16 0c 12 67 85 a7 23 eb\ -ee be ff 71 f1 15 94 44 0a ae f8 7d 10 79 3a 87\ -74 a2 39 d4 a0 4c 87 fe 14 67 b9 da f8 52 08 ec\ -6c 72 55 79 4a 96 cc 29 14 2f 9a 8b d4 18 e3 c1\ -fd 67 34 4b 0c d0 82 9d f3 b2 be c6 02 53 19 62\ -93 c6 b3 4d 3f 75 d3 2f 21 3d d4 5c 62 73 d5 05\ -ad f4 cc ed 10 57 cb 75 8f c2 6a ee fa 44 12 55\ -ed 4e 64 c1 99 ee 07 5e 7f 16 64 61 82 fd b4 64\ -73 9b 68 ab 5d af f0 e6 3e 95 52 01 68 24 f0 54\ -bf 4d 3c 8c 90 a9 7b b6 b6 55 32 84 eb 42 9f cc -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 10.2 -Plaintext: \ -e6 ad 18 1f 05 3b 58 a9 04 f2 45 75 10 37 3e 57 -Seed: # not used yet\ -6d 17 f5 b4 c1 ff ac 35 1d 19 5b f7 b0 9d 09 f0\ -9a 40 79 cf -Ciphertext: \ -a2 b1 a4 30 a9 d6 57 e2 fa 1c 2b b5 ed 43 ff b2\ -5c 05 a3 08 fe 90 93 c0 10 31 79 5f 58 74 40 01\ -10 82 8a e5 8f b9 b5 81 ce 9d dd d3 e5 49 ae 04\ -a0 98 54 59 bd e6 c6 26 59 4e 7b 05 dc 42 78 b2\ -a1 46 5c 13 68 40 88 23 c8 5e 96 dc 66 c3 a3 09\ -83 c6 39 66 4f c4 56 9a 37 fe 21 e5 a1 95 b5 77\ -6e ed 2d f8 d8 d3 61 af 68 6e 75 02 29 bb d6 63\ -f1 61 86 8a 50 61 5e 0c 33 7b ec 0c a3 5f ec 0b\ -b1 9c 36 eb 2e 0b bc c0 58 2f a1 d9 3a ac db 06\ -10 63 f5 9f 2c e1 ee 43 60 5e 5d 89 ec a1 83 d2\ -ac df e9 f8 10 11 02 2a d3 b4 3a 3d d4 17 da c9\ -4b 4e 11 ea 81 b1 92 96 6e 96 6b 18 20 82 e7 19\ -64 60 7b 4f 80 02 f3 62 99 84 4a 11 f2 ae 0f ae\ -ac 2e ae 70 f8 f4 f9 80 88 ac dc d0 ac 55 6e 9f\ -cc c5 11 52 19 08 fa d2 6f 04 c6 42 01 45 03 05\ -77 87 58 b0 53 8b f8 b5 bb 14 4a 82 8e 62 97 95 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 10.3 -Plaintext: \ -51 0a 2c f6 0e 86 6f a2 34 05 53 c9 4e a3 9f bc\ -25 63 11 e8 3e 94 45 4b 41 24 -Seed: # not used yet\ -38 53 87 51 4d ec cc 7c 74 0d d8 cd f9 da ee 49\ -a1 cb fd 54 -Ciphertext: \ -98 86 c3 e6 76 4a 8b 9a 84 e8 41 48 eb d8 c3 b1\ -aa 80 50 38 1a 78 f6 68 71 4c 16 d9 cf d2 a6 ed\ -c5 69 79 c5 35 d9 de e3 b4 4b 85 c1 8b e8 92 89\ -92 37 17 11 47 22 16 d9 5d da 98 d2 ee 83 47 c9\ -b1 4d ff df f8 4a a4 8d 25 ac 06 f7 d7 e6 53 98\ -ac 96 7b 1c e9 09 25 f6 7d ce 04 9b 7f 81 2d b0\ -74 29 97 a7 4d 44 fe 81 db e0 e7 a3 fe af 2e 5c\ -40 af 88 8d 55 0d db be 3b c2 06 57 a2 95 43 f8\ -fc 29 13 b9 bd 1a 61 b2 ab 22 56 ec 40 9b bd 7d\ -c0 d1 77 17 ea 25 c4 3f 42 ed 27 df 87 38 bf 4a\ -fc 67 66 ff 7a ff 08 59 55 5e e2 83 92 0f 4c 8a\ -63 c4 a7 34 0c ba fd dc 33 9e cd b4 b0 51 50 02\ -f9 6c 93 2b 5b 79 16 7a f6 99 c0 ad 3f cc fd f0\ -f4 4e 85 a7 02 62 bf 2e 18 fe 34 b8 50 58 99 75\ -e8 67 ff 96 9d 48 ea bf 21 22 71 54 6c dc 05 a6\ -9e cb 52 6e 52 87 0c 83 6f 30 7b d7 98 78 0e de -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 10.4 -Plaintext: \ -bc dd 19 0d a3 b7 d3 00 df 9a 06 e2 2c aa e2 a7\ -5f 10 c9 1f f6 67 b7 c1 6b de 8b 53 06 4a 26 49\ -a9 40 45 c9 -Seed: # not used yet\ -5c ac a6 a0 f7 64 16 1a 96 84 f8 5d 92 b6 e0 ef\ -37 ca 8b 65 -Ciphertext: \ -63 18 e9 fb 5c 0d 05 e5 30 7e 16 83 43 6e 90 32\ -93 ac 46 42 35 8a aa 22 3d 71 63 01 3a ba 87 e2\ -df da 8e 60 c6 86 0e 29 a1 e9 26 86 16 3e a0 b9\ -17 5f 32 9c a3 b1 31 a1 ed d3 a7 77 59 a8 b9 7b\ -ad 6a 4f 8f 43 96 f2 8c f6 f3 9c a5 81 12 e4 81\ -60 d6 e2 03 da a5 85 6f 3a ca 5f fe d5 77 af 49\ -94 08 e3 df d2 33 e3 e6 04 db e3 4a 9c 4c 90 82\ -de 65 52 7c ac 63 31 d2 9d c8 0e 05 08 a0 fa 71\ -22 e7 f3 29 f6 cc a5 cf a3 4d 4d 1d a4 17 80 54\ -57 e0 08 be c5 49 e4 78 ff 9e 12 a7 63 c4 77 d1\ -5b bb 78 f5 b6 9b d5 78 30 fc 2c 4e d6 86 d7 9b\ -c7 2a 95 d8 5f 88 13 4c 6b 0a fe 56 a8 cc fb c8\ -55 82 8b b3 39 bd 17 90 9c f1 d7 0d e3 33 5a e0\ -70 39 09 3e 60 6d 65 53 65 de 65 50 b8 72 cd 6d\ -e1 d4 40 ee 03 1b 61 94 5f 62 9a d8 a3 53 b0 d4\ -09 39 e9 6a 3c 45 0d 2a 8d 5e ee 9f 67 80 93 c8 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 10.5 -Plaintext: \ -a7 dd 6c 7d c2 4b 46 f9 dd 5f 1e 91 ad a4 c3 b3\ -df 94 7e 87 72 32 a9 -Seed: # not used yet\ -95 bc a9 e3 85 98 94 b3 dd 86 9f a7 ec d5 bb c6\ -40 1b f3 e4 -Ciphertext: \ -75 29 08 72 cc fd 4a 45 05 66 0d 65 1f 56 da 6d\ -aa 09 ca 13 01 d8 90 63 2f 6a 99 2f 3d 56 5c ee\ -46 4a fd ed 40 ed 3b 5b e9 35 67 14 ea 5a a7 65\ -5f 4a 13 66 c2 f1 7c 72 8f 6f 2c 5a 5d 1f 8e 28\ -42 9b c4 e6 f8 f2 cf f8 da 8d c0 e0 a9 80 8e 45\ -fd 09 ea 2f a4 0c b2 b6 ce 6f ff f5 c0 e1 59 d1\ -1b 68 d9 0a 85 f7 b8 4e 10 3b 09 e6 82 66 64 80\ -c6 57 50 5c 09 29 25 94 68 a3 14 78 6d 74 ea b1\ -31 57 3c f2 34 bf 57 db 7d 9e 66 cc 67 48 19 2e\ -00 2d c0 de ea 93 05 85 f0 83 1f dc d9 bc 33 d5\ -1f 79 ed 2f fc 16 bc f4 d5 98 12 fc eb ca a3 f9\ -06 9b 0e 44 56 86 d6 44 c2 5c cf 63 b4 56 ee 5f\ -a6 ff e9 6f 19 cd f7 51 fe d9 ea f3 59 57 75 4d\ -bf 4b fe a5 21 6a a1 84 4d c5 07 cb 2d 08 0e 72\ -2e ba 15 03 08 c2 b5 ff 11 93 62 0f 17 66 ec f4\ -48 1b af b9 43 bd 29 28 77 f2 13 6c a4 94 ab a0 -Test: DecryptMatch -Comment: RSAES-OAEP Encryption Example 10.6 -Plaintext: \ -ea f1 a7 3a 1b 0c 46 09 53 7d e6 9c d9 22 8b bc\ -fb 9a 8c a8 c6 c3 ef af 05 6f e4 a7 f4 63 4e d0\ -0b 7c 39 ec 69 22 d7 b8 ea 2c 04 eb ac -Seed: # not used yet\ -9f 47 dd f4 2e 97 ee a8 56 a9 bd bc 71 4e b3 ac\ -22 f6 eb 32 -Ciphertext: \ -2d 20 7a 73 43 2a 8f b4 c0 30 51 b3 f7 3b 28 a6\ -17 64 09 8d fa 34 c4 7a 20 99 5f 81 15 aa 68 16\ -67 9b 55 7e 82 db ee 58 49 08 c6 e6 97 82 d7 de\ -b3 4d bd 65 af 06 3d 57 fc a7 6a 5f d0 69 49 2f\ -d6 06 8d 99 84 d2 09 35 05 65 a6 2e 5c 77 f2 30\ -38 c1 2c b1 0c 66 34 70 9b 54 7c 46 f6 b4 a7 09\ -bd 85 ca 12 2d 74 46 5e f9 77 62 c2 97 63 e0 6d\ -bc 7a 9e 73 8c 78 bf ca 01 02 dc 5e 79 d6 5b 97\ -3f 28 24 0c aa b2 e1 61 a7 8b 57 d2 62 45 7e d8\ -19 5d 53 e3 c7 ae 9d a0 21 88 3c 6d b7 c2 4a fd\ -d2 32 2e ac 97 2a d3 c3 54 c5 fc ef 1e 14 6c 3a\ -02 90 fb 67 ad f0 07 06 6e 00 42 8d 2c ec 18 ce\ -58 f9 32 86 98 de fe f4 b2 eb 5e c7 69 18 fd e1\ -c1 98 cb b3 8b 7a fc 67 62 6a 9a ef ec 43 22 bf\ -d9 0d 25 63 48 1c 9a 22 1f 78 c8 27 2c 82 d1 b6\ -2a b9 14 e1 c6 9f 6a f6 ef 30 ca 52 60 db 4a 46 -Test: DecryptMatch diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pkcs1_1_5.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pkcs1_1_5.txt deleted file mode 100644 index 2272b7c4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pkcs1_1_5.txt +++ /dev/null @@ -1,89 +0,0 @@ -AlgorithmType: Signature -Name: RSA/PKCS1-1.5(MD2) -KeyFormat: DER -Source: http://www.rsasecurity.com/rsalabs/pkcs/index.html, \ - Some Examples of the PKCS Standards -PrivateKey: \ - 30 82 01 50\ - 02 01 00 #version = 0\ - 30 0d #privateKeyAlgorithmIdentifier\ - 06 09 #algorithm = rsaEncryption\ - 2a 86 48 86 f7 0d 01 01 01\ - 05 00 #parameters = NULL\ - 04 82 01 3a #privateKey = RSAPrivateKey encoding\ - 30 82 01 36\ - 02 01 00 #version = 0\ - 02 40 #modulus = n\ - 0a 66 79 1d c6 98 81 68 de 7a b7 74 19 bb 7f b0\ - c0 01 c6 27 10 27 00 75 14 29 42 e1 9a 8d 8c 51\ - d0 53 b3 e3 78 2a 1d e5 dc 5a f4 eb e9 94 68 17\ - 01 14 a1 df e6 7c dc 9a 9a f5 5d 65 56 20 bb ab\ - 02 03 01 00 01 #publicExponent = e\ - 02 40 #privateExponent = d\ - 01 23 c5 b6 1b a3 6e db 1d 36 79 90 41 99 a8 9e\ - a8 0c 09 b9 12 2e 14 00 c0 9a dc f7 78 46 76 d0\ - 1d 23 35 6a 7d 44 d6 bd 8b d5 0e 94 bf c7 23 fa\ - 87 d8 86 2b 75 17 76 91 c1 1d 75 76 92 df 88 81\ - 02 20 #prime1 = p\ - 33 d4 84 45 c8 59 e5 23 40 de 70 4b cd da 06 5f\ - bb 40 58 d7 40 bd 1d 67 d2 9e 9c 14 6c 11 cf 61\ - 02 20 #prime2 = q\ - 33 5e 84 08 86 6b 0f d3 8d c7 00 2d 3f 97 2c 67\ - 38 9a 65 d5 d8 30 65 66 d5 c4 f2 a5 aa 52 62 8b\ - 02 20 #exponent1 = d mod p-1\ - 04 5e c9 00 71 52 53 25 d3 d4 6d b7 96 95 e9 af\ - ac c4 52 39 64 36 0e 02 b1 19 ba a3 66 31 62 41\ - 02 20 #exponent2 = d mod q-1\ - 15 eb 32 73 60 c7 b6 0d 12 e5 e2 d1 6b dc d9 79\ - 81 d1 7f ba 6b 70 db 13 b2 0b 43 6e 24 ea da 59\ - 02 20 #coefficient = q-1 mod p\ - 2c a6 36 6d 72 78 1d fa 24 d3 4a 9a 24 cb c2 ae\ - 92 7a 99 58 af 42 65 63 ff 63 fb 11 65 8a 46 1d -PublicKey: \ - 30 5b #subjectPublicKeyInfo\ - 30 0d #algorithm\ - 06 09 #algorithm = rsaEncryption\ - 2a 86 48 86 f7 0d 01 01 01\ - 05 00 #parameters = NULL\ - 03 4a #subjectPublicKey = RSAPublicKey encoding\ - 00\ - 30 47\ - 02 40 #modulus = n\ - 0a 66 79 1d c6 98 81 68 de 7a b7 74 19 bb 7f b0\ - c0 01 c6 27 10 27 00 75 14 29 42 e1 9a 8d 8c 51\ - d0 53 b3 e3 78 2a 1d e5 dc 5a f4 eb e9 94 68 17\ - 01 14 a1 df e6 7c dc 9a 9a f5 5d 65 56 20 bb ab\ - 02 03 01 00 01 #publicExponent = e -Test: KeyPairValidAndConsistent -Message: # "Everyone gets Friday off."\ - 45 76 65 72 79 6f 6e 65 20 67 65 74 73 20 46 72 69 64 61 79 20 6f 66 66 2e -Signature: \ - 05fa6a812fc7df8bf4f2542509e03e84\ - 6e11b9c620be2009efb440efbcc66921\ - 6994ac04f341b57d05202d428fb2a27b\ - 5c77dfd9b15bfc3d559353503410c1e1 -Test: Verify -Name: RSA/PKCS1-1.5(SHA-1) -Source: generated by Wei Dai using Crypto++ 5.0 -Signature: 0610761F95FFD1B8F29DA34212947EC2AA0E358866A722F03CC3C41487ADC604A48FF54F5C6BEDB9FB7BD59F82D6E55D8F3174BA361B2214B2D74E8825E04E81 -Test: Verify -Message: 00 -Test: NotVerify - -AlgorithmType: Signature -Name: RSA/PKCS1-1.5(SHA-1) -Source: http://islab.oregonstate.edu/emails/pkcs-tng-02/0152 -KeyFormat: Component -Modulus: A885B6F851A8079AB8A281DB0297148511EE0D8C07C0D4AE6D6FED461488E0D41E3FF8F281B06A3240B5007A5C2AB4FB6BE8AF88F119DB998368DDDC9710ABED -PublicExponent: 010001 -PrivateExponent: 2B259D2CA3DF851EE891F6F4678BDDFD9A131C95D3305C63D2723B4A5B9C960F5EC8BB7DCDDBEBD8B6A38767D64AD451E9383E0891E4EE7506100481F2B49323 -Prime1: D7103CD676E39824E2BE50B8E6533FE7CB7484348E283802AD2B8D00C80D19DF -Prime2: C89996DC169CEB3F227958275968804D4BE9FC4012C3219662F1A438C9950BB3 -ModPrime1PrivateExponent: 5D8EA4C8AF83A70634D5920C3DB66D908AC3AF57A597FD75BC9BBB856181C185 -ModPrime2PrivateExponent: C598E54DAEC8ABC1E907769A6C2BD01653ED0C9960E1EDB7E186FDA922883A99 -MultiplicativeInverseOfPrime2ModPrime1: 7C6F27B5B51B78AD80FB36E700990CF307866F2943124CBD93D97C137794C104 -Test: KeyPairValidAndConsistent -Source: generated by Wei Dai using Crypto++ 5.0 -Message: 74657374 # "test" -Signature: A7E00CE4391F914D82158D9B732759808E25A1C6383FE87A5199157650D4296CF612E9FF809E686A0AF328238306E79965F6D0138138829D9A1A22764306F6CE -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pss.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pss.txt deleted file mode 100644 index 1b5fc9c8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rsa_pss.txt +++ /dev/null @@ -1,2083 +0,0 @@ -AlgorithmType: Signature -Name: RSA/PSS-MGF1(SHA-1) -Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors -KeyFormat: Component -Comment: Example 1: A 1024-bit RSA Key Pair -Modulus: \ -a5 6e 4a 0e 70 10 17 58 9a 51 87 dc 7e a8 41 d1\ -56 f2 ec 0e 36 ad 52 a4 4d fe b1 e6 1f 7a d9 91\ -d8 c5 10 56 ff ed b1 62 b4 c0 f2 83 a1 2a 88 a3\ -94 df f5 26 ab 72 91 cb b3 07 ce ab fc e0 b1 df\ -d5 cd 95 08 09 6d 5b 2b 8b 6d f5 d6 71 ef 63 77\ -c0 92 1c b2 3c 27 0a 70 e2 59 8e 6f f8 9d 19 f1\ -05 ac c2 d3 f0 cb 35 f2 92 80 e1 38 6b 6f 64 c4\ -ef 22 e1 e1 f2 0d 0c e8 cf fb 22 49 bd 9a 21 37 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -33 a5 04 2a 90 b2 7d 4f 54 51 ca 9b bb d0 b4 47\ -71 a1 01 af 88 43 40 ae f9 88 5f 2a 4b be 92 e8\ -94 a7 24 ac 3c 56 8c 8f 97 85 3a d0 7c 02 66 c8\ -c6 a3 ca 09 29 f1 e8 f1 12 31 88 44 29 fc 4d 9a\ -e5 5f ee 89 6a 10 ce 70 7c 3e d7 e7 34 e4 47 27\ -a3 95 74 50 1a 53 26 83 10 9c 2a ba ca ba 28 3c\ -31 b4 bd 2f 53 c3 ee 37 e3 52 ce e3 4f 9e 50 3b\ -d8 0c 06 22 ad 79 c6 dc ee 88 35 47 c6 a3 b3 25 -Prime1: \ -e7 e8 94 27 20 a8 77 51 72 73 a3 56 05 3e a2 a1\ -bc 0c 94 aa 72 d5 5c 6e 86 29 6b 2d fc 96 79 48\ -c0 a7 2c bc cc a7 ea cb 35 70 6e 09 a1 df 55 a1\ -53 5b d9 b3 cc 34 16 0b 3b 6d cd 3e da 8e 64 43 -Prime2: \ -b6 9d ca 1c f7 d4 d7 ec 81 e7 5b 90 fc ca 87 4a\ -bc de 12 3f d2 70 01 80 aa 90 47 9b 6e 48 de 8d\ -67 ed 24 f9 f1 9d 85 ba 27 58 74 f5 42 cd 20 dc\ -72 3e 69 63 36 4a 1f 94 25 45 2b 26 9a 67 99 fd -ModPrime1PrivateExponent: \ -28 fa 13 93 86 55 be 1f 8a 15 9c ba ca 5a 72 ea\ -19 0c 30 08 9e 19 cd 27 4a 55 6f 36 c4 f6 e1 9f\ -55 4b 34 c0 77 79 04 27 bb dd 8d d3 ed e2 44 83\ -28 f3 85 d8 1b 30 e8 e4 3b 2f ff a0 27 86 19 79 -ModPrime2PrivateExponent: \ -1a 8b 38 f3 98 fa 71 20 49 89 8d 7f b7 9e e0 a7\ -76 68 79 12 99 cd fa 09 ef c0 e5 07 ac b2 1e d7\ -43 01 ef 5b fd 48 be 45 5e ae b6 e1 67 82 55 82\ -75 80 a8 e4 e8 e1 41 51 d1 51 0a 82 a3 f2 e7 29 -MultiplicativeInverseOfPrime2ModPrime1: \ -27 15 6a ba 41 26 d2 4a 81 f3 a5 28 cb fb 27 f5\ -68 86 f8 40 a9 f6 e8 6e 17 a4 4b 94 fe 93 19 58\ -4b 8e 22 fd de 1e 5a 2e 3b d8 aa 5b a8 d8 58 41\ -94 eb 21 90 ac f8 32 b8 47 f1 3a 3d 24 a7 9f 4d -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 1.1 -Message: \ -cd c8 7d a2 23 d7 86 df 3b 45 e0 bb bc 72 13 26\ -d1 ee 2a f8 06 cc 31 54 75 cc 6f 0d 9c 66 e1 b6\ -23 71 d4 5c e2 39 2e 1a c9 28 44 c3 10 10 2f 15\ -6a 0d 8d 52 c1 f4 c4 0b a3 aa 65 09 57 86 cb 76\ -97 57 a6 56 3b a9 58 fe d0 bc c9 84 e8 b5 17 a3\ -d5 f5 15 b2 3b 8a 41 e7 4a a8 67 69 3f 90 df b0\ -61 a6 e8 6d fa ae e6 44 72 c0 0e 5f 20 94 57 29\ -cb eb e7 7f 06 ce 78 e0 8f 40 98 fb a4 1f 9d 61\ -93 c0 31 7e 8b 60 d4 b6 08 4a cb 42 d2 9e 38 08\ -a3 bc 37 2d 85 e3 31 17 0f cb f7 cc 72 d0 b7 1c\ -29 66 48 b3 a4 d1 0f 41 62 95 d0 80 7a a6 25 ca\ -b2 74 4f d9 ea 8f d2 23 c4 25 37 02 98 28 bd 16\ -be 02 54 6f 13 0f d2 e3 3b 93 6d 26 76 e0 8a ed\ -1b 73 31 8b 75 0a 01 67 d0 -Salt: \ -de e9 59 c7 e0 64 11 36 14 20 ff 80 18 5e d5 7f\ -3e 67 76 af -Signature: \ -90 74 30 8f b5 98 e9 70 1b 22 94 38 8e 52 f9 71\ -fa ac 2b 60 a5 14 5a f1 85 df 52 87 b5 ed 28 87\ -e5 7c e7 fd 44 dc 86 34 e4 07 c8 e0 e4 36 0b c2\ -26 f3 ec 22 7f 9d 9e 54 63 8e 8d 31 f5 05 12 15\ -df 6e bb 9c 2f 95 79 aa 77 59 8a 38 f9 14 b5 b9\ -c1 bd 83 c4 e2 f9 f3 82 a0 d0 aa 35 42 ff ee 65\ -98 4a 60 1b c6 9e b2 8d eb 27 dc a1 2c 82 c2 d4\ -c3 f6 6c d5 00 f1 ff 2b 99 4d 8a 4e 30 cb b3 3c -Test: Verify -Comment: RSASSA-PSS Signature Example 1.2 -Message: \ -85 13 84 cd fe 81 9c 22 ed 6c 4c cb 30 da eb 5c\ -f0 59 bc 8e 11 66 b7 e3 53 0c 4c 23 3e 2b 5f 8f\ -71 a1 cc a5 82 d4 3e cc 72 b1 bc a1 6d fc 70 13\ -22 6b 9e -Salt: \ -ef 28 69 fa 40 c3 46 cb 18 3d ab 3d 7b ff c9 8f\ -d5 6d f4 2d -Signature: \ -3e f7 f4 6e 83 1b f9 2b 32 27 41 42 a5 85 ff ce\ -fb dc a7 b3 2a e9 0d 10 fb 0f 0c 72 99 84 f0 4e\ -f2 9a 9d f0 78 07 75 ce 43 73 9b 97 83 83 90 db\ -0a 55 05 e6 3d e9 27 02 8d 9d 29 b2 19 ca 2c 45\ -17 83 25 58 a5 5d 69 4a 6d 25 b9 da b6 60 03 c4\ -cc cd 90 78 02 19 3b e5 17 0d 26 14 7d 37 b9 35\ -90 24 1b e5 1c 25 05 5f 47 ef 62 75 2c fb e2 14\ -18 fa fe 98 c2 2c 4d 4d 47 72 4f db 56 69 e8 43 -Test: Verify -Comment: RSASSA-PSS Signature Example 1.3 -Message: \ -a4 b1 59 94 17 61 c4 0c 6a 82 f2 b8 0d 1b 94 f5\ -aa 26 54 fd 17 e1 2d 58 88 64 67 9b 54 cd 04 ef\ -8b d0 30 12 be 8d c3 7f 4b 83 af 79 63 fa ff 0d\ -fa 22 54 77 43 7c 48 01 7f f2 be 81 91 cf 39 55\ -fc 07 35 6e ab 3f 32 2f 7f 62 0e 21 d2 54 e5 db\ -43 24 27 9f e0 67 e0 91 0e 2e 81 ca 2c ab 31 c7\ -45 e6 7a 54 05 8e b5 0d 99 3c db 9e d0 b4 d0 29\ -c0 6d 21 a9 4c a6 61 c3 ce 27 fa e1 d6 cb 20 f4\ -56 4d 66 ce 47 67 58 3d 0e 5f 06 02 15 b5 90 17\ -be 85 ea 84 89 39 12 7b d8 c9 c4 d4 7b 51 05 6c\ -03 1c f3 36 f1 7c 99 80 f3 b8 f5 b9 b6 87 8e 8b\ -79 7a a4 3b 88 26 84 33 3e 17 89 3f e9 ca a6 aa\ -29 9f 7e d1 a1 8e e2 c5 48 64 b7 b2 b9 9b 72 61\ -8f b0 25 74 d1 39 ef 50 f0 19 c9 ee f4 16 97 13\ -38 e7 d4 70 -Salt: \ -71 0b 9c 47 47 d8 00 d4 de 87 f1 2a fd ce 6d f1\ -81 07 cc 77 -Signature: \ -66 60 26 fb a7 1b d3 e7 cf 13 15 7c c2 c5 1a 8e\ -4a a6 84 af 97 78 f9 18 49 f3 43 35 d1 41 c0 01\ -54 c4 19 76 21 f9 62 4a 67 5b 5a bc 22 ee 7d 5b\ -aa ff aa e1 c9 ba ca 2c c3 73 b3 f3 3e 78 e6 14\ -3c 39 5a 91 aa 7f ac a6 64 eb 73 3a fd 14 d8 82\ -72 59 d9 9a 75 50 fa ca 50 1e f2 b0 4e 33 c2 3a\ -a5 1f 4b 9e 82 82 ef db 72 8c c0 ab 09 40 5a 91\ -60 7c 63 69 96 1b c8 27 0d 2d 4f 39 fc e6 12 b1 -Test: Verify -Comment: RSASSA-PSS Signature Example 1.4 -Message: \ -bc 65 67 47 fa 9e af b3 f0 -Salt: \ -05 6f 00 98 5d e1 4d 8e f5 ce a9 e8 2f 8c 27 be\ -f7 20 33 5e -Signature: \ -46 09 79 3b 23 e9 d0 93 62 dc 21 bb 47 da 0b 4f\ -3a 76 22 64 9a 47 d4 64 01 9b 9a ea fe 53 35 9c\ -17 8c 91 cd 58 ba 6b cb 78 be 03 46 a7 bc 63 7f\ -4b 87 3d 4b ab 38 ee 66 1f 19 96 34 c5 47 a1 ad\ -84 42 e0 3d a0 15 b1 36 e5 43 f7 ab 07 c0 c1 3e\ -42 25 b8 de 8c ce 25 d4 f6 eb 84 00 f8 1f 7e 18\ -33 b7 ee 6e 33 4d 37 09 64 ca 79 fd b8 72 b4 d7\ -52 23 b5 ee b0 81 01 59 1f b5 32 d1 55 a6 de 87 -Test: Verify -Comment: RSASSA-PSS Signature Example 1.5 -Message: \ -b4 55 81 54 7e 54 27 77 0c 76 8e 8b 82 b7 55 64\ -e0 ea 4e 9c 32 59 4d 6b ff 70 65 44 de 0a 87 76\ -c7 a8 0b 45 76 55 0e ee 1b 2a ca bc 7e 8b 7d 3e\ -f7 bb 5b 03 e4 62 c1 10 47 ea dd 00 62 9a e5 75\ -48 0a c1 47 0f e0 46 f1 3a 2b f5 af 17 92 1d c4\ -b0 aa 8b 02 be e6 33 49 11 65 1d 7f 85 25 d1 0f\ -32 b5 1d 33 be 52 0d 3d df 5a 70 99 55 a3 df e7\ -82 83 b9 e0 ab 54 04 6d 15 0c 17 7f 03 7f dc cc\ -5b e4 ea 5f 68 b5 e5 a3 8c 9d 7e dc cc c4 97 5f\ -45 5a 69 09 b4 -Salt: \ -80 e7 0f f8 6a 08 de 3e c6 09 72 b3 9b 4f bf dc\ -ea 67 ae 8e -Signature: \ -1d 2a ad 22 1c a4 d3 1d df 13 50 92 39 01 93 98\ -e3 d1 4b 32 dc 34 dc 5a f4 ae ae a3 c0 95 af 73\ -47 9c f0 a4 5e 56 29 63 5a 53 a0 18 37 76 15 b1\ -6c b9 b1 3b 3e 09 d6 71 eb 71 e3 87 b8 54 5c 59\ -60 da 5a 64 77 6e 76 8e 82 b2 c9 35 83 bf 10 4c\ -3f db 23 51 2b 7b 4e 89 f6 33 dd 00 63 a5 30 db\ -45 24 b0 1c 3f 38 4c 09 31 0e 31 5a 79 dc d3 d6\ -84 02 2a 7f 31 c8 65 a6 64 e3 16 97 8b 75 9f ad -Test: Verify -Comment: RSASSA-PSS Signature Example 1.6 -Message: \ -10 aa e9 a0 ab 0b 59 5d 08 41 20 7b 70 0d 48 d7\ -5f ae dd e3 b7 75 cd 6b 4c c8 8a e0 6e 46 94 ec\ -74 ba 18 f8 52 0d 4f 5e a6 9c bb e7 cc 2b eb a4\ -3e fd c1 02 15 ac 4e b3 2d c3 02 a1 f5 3d c6 c4\ -35 22 67 e7 93 6c fe bf 7c 8d 67 03 57 84 a3 90\ -9f a8 59 c7 b7 b5 9b 8e 39 c5 c2 34 9f 18 86 b7\ -05 a3 02 67 d4 02 f7 48 6a b4 f5 8c ad 5d 69 ad\ -b1 7a b8 cd 0c e1 ca f5 02 5a f4 ae 24 b1 fb 87\ -94 c6 07 0c c0 9a 51 e2 f9 91 13 11 e3 87 7d 00\ -44 c7 1c 57 a9 93 39 50 08 80 6b 72 3a c3 83 73\ -d3 95 48 18 18 52 8c 1e 70 53 73 92 82 05 35 29\ -51 0e 93 5c d0 fa 77 b8 fa 53 cc 2d 47 4b d4 fb\ -3c c5 c6 72 d6 ff dc 90 a0 0f 98 48 71 2c 4b cf\ -e4 6c 60 57 36 59 b1 1e 64 57 e8 61 f0 f6 04 b6\ -13 8d 14 4f 8c e4 e2 da 73 -Salt: \ -a8 ab 69 dd 80 1f 00 74 c2 a1 fc 60 64 98 36 c6\ -16 d9 96 81 -Signature: \ -2a 34 f6 12 5e 1f 6b 0b f9 71 e8 4f bd 41 c6 32\ -be 8f 2c 2a ce 7d e8 b6 92 6e 31 ff 93 e9 af 98\ -7f bc 06 e5 1e 9b e1 4f 51 98 f9 1f 3f 95 3b d6\ -7d a6 0a 9d f5 97 64 c3 dc 0f e0 8e 1c be f0 b7\ -5f 86 8d 10 ad 3f ba 74 9f ef 59 fb 6d ac 46 a0\ -d6 e5 04 36 93 31 58 6f 58 e4 62 8f 39 aa 27 89\ -82 54 3b c0 ee b5 37 dc 61 95 80 19 b3 94 fb 27\ -3f 21 58 58 a0 a0 1a c4 d6 50 b9 55 c6 7f 4c 58 -Test: Verify -Comment: Example 2: A 1025-bit RSA Key Pair -Modulus: \ -01 d4 0c 1b cf 97 a6 8a e7 cd bd 8a 7b f3 e3 4f\ -a1 9d cc a4 ef 75 a4 74 54 37 5f 94 51 4d 88 fe\ -d0 06 fb 82 9f 84 19 ff 87 d6 31 5d a6 8a 1f f3\ -a0 93 8e 9a bb 34 64 01 1c 30 3a d9 91 99 cf 0c\ -7c 7a 8b 47 7d ce 82 9e 88 44 f6 25 b1 15 e5 e9\ -c4 a5 9c f8 f8 11 3b 68 34 33 6a 2f d2 68 9b 47\ -2c bb 5e 5c ab e6 74 35 0c 59 b6 c1 7e 17 68 74\ -fb 42 f8 fc 3d 17 6a 01 7e dc 61 fd 32 6c 4b 33\ -c9 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -02 7d 14 7e 46 73 05 73 77 fd 1e a2 01 56 57 72\ -17 6a 7d c3 83 58 d3 76 04 56 85 a2 e7 87 c2 3c\ -15 57 6b c1 6b 9f 44 44 02 d6 bf c5 d9 8a 3e 88\ -ea 13 ef 67 c3 53 ec a0 c0 dd ba 92 55 bd 7b 8b\ -b5 0a 64 4a fd fd 1d d5 16 95 b2 52 d2 2e 73 18\ -d1 b6 68 7a 1c 10 ff 75 54 5f 3d b0 fe 60 2d 5f\ -2b 7f 29 4e 36 01 ea b7 b9 d1 ce cd 76 7f 64 69\ -2e 3e 53 6c a2 84 6c b0 c2 dd 48 6a 39 fa 75 b1 -Prime1: \ -01 66 01 e9 26 a0 f8 c9 e2 6e ca b7 69 ea 65 a5\ -e7 c5 2c c9 e0 80 ef 51 94 57 c6 44 da 68 91 c5\ -a1 04 d3 ea 79 55 92 9a 22 e7 c6 8a 7a f9 fc ad\ -77 7c 3c cc 2b 9e 3d 36 50 bc e4 04 39 9b 7e 59\ -d1 -Prime2: \ -01 4e af a1 d4 d0 18 4d a7 e3 1f 87 7d 12 81 dd\ -da 62 56 64 86 9e 83 79 e6 7a d3 b7 5e ae 74 a5\ -80 e9 82 7a bd 6e b7 a0 02 cb 54 11 f5 26 67 97\ -76 8f b8 e9 5a e4 0e 3e 8a 01 f3 5f f8 9e 56 c0\ -79 -ModPrime1PrivateExponent: \ -e2 47 cc e5 04 93 9b 8f 0a 36 09 0d e2 00 93 87\ -55 e2 44 4b 29 53 9a 7d a7 a9 02 f6 05 68 35 c0\ -db 7b 52 55 94 97 cf e2 c6 1a 80 86 d0 21 3c 47\ -2c 78 85 18 00 b1 71 f6 40 1d e2 e9 c2 75 6f 31 -ModPrime2PrivateExponent: \ -b1 2f ba 75 78 55 e5 86 e4 6f 64 c3 8a 70 c6 8b\ -3f 54 8d 93 d7 87 b3 99 99 9d 4c 8f 0b bd 25 81\ -c2 1e 19 ed 00 18 a6 d5 d3 df 86 42 4b 3a bc ad\ -40 19 9d 31 49 5b 61 30 9f 27 c1 bf 55 d4 87 c1 -MultiplicativeInverseOfPrime2ModPrime1: \ -56 4b 1e 1f a0 03 bd a9 1e 89 09 04 25 aa c0 5b\ -91 da 9e e2 50 61 e7 62 8d 5f 51 30 4a 84 99 2f\ -dc 33 76 2b d3 78 a5 9f 03 0a 33 4d 53 2b d0 da\ -e8 f2 98 ea 9e d8 44 63 6a d5 fb 8c bd c0 3c ad -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 2.1 -Message: \ -da ba 03 20 66 26 3f ae db 65 98 48 11 52 78 a5\ -2c 44 fa a3 a7 6f 37 51 5e d3 36 32 10 72 c4 0a\ -9d 9b 53 bc 05 01 40 78 ad f5 20 87 51 46 aa e7\ -0f f0 60 22 6d cb 7b 1f 1f c2 7e 93 60 -Salt: \ -57 bf 16 0b cb 02 bb 1d c7 28 0c f0 45 85 30 b7\ -d2 83 2f f7 -Signature: \ -01 4c 5b a5 33 83 28 cc c6 e7 a9 0b f1 c0 ab 3f\ -d6 06 ff 47 96 d3 c1 2e 4b 63 9e d9 13 6a 5f ec\ -6c 16 d8 88 4b dd 99 cf dc 52 14 56 b0 74 2b 73\ -68 68 cf 90 de 09 9a db 8d 5f fd 1d ef f3 9b a4\ -00 7a b7 46 ce fd b2 2d 7d f0 e2 25 f5 46 27 dc\ -65 46 61 31 72 1b 90 af 44 53 63 a8 35 8b 9f 60\ -76 42 f7 8f ab 0a b0 f4 3b 71 68 d6 4b ae 70 d8\ -82 78 48 d8 ef 1e 42 1c 57 54 dd f4 2c 25 89 b5\ -b3 -Test: Verify -Comment: RSASSA-PSS Signature Example 2.2 -Message: \ -e4 f8 60 1a 8a 6d a1 be 34 44 7c 09 59 c0 58 57\ -0c 36 68 cf d5 1d d5 f9 cc d6 ad 44 11 fe 82 13\ -48 6d 78 a6 c4 9f 93 ef c2 ca 22 88 ce bc 2b 9b\ -60 bd 04 b1 e2 20 d8 6e 3d 48 48 d7 09 d0 32 d1\ -e8 c6 a0 70 c6 af 9a 49 9f cf 95 35 4b 14 ba 61\ -27 c7 39 de 1b b0 fd 16 43 1e 46 93 8a ec 0c f8\ -ad 9e b7 2e 83 2a 70 35 de 9b 78 07 bd c0 ed 8b\ -68 eb 0f 5a c2 21 6b e4 0c e9 20 c0 db 0e dd d3\ -86 0e d7 88 ef ac ca ca 50 2d 8f 2b d6 d1 a7 c1\ -f4 1f f4 6f 16 81 c8 f1 f8 18 e9 c4 f6 d9 1a 0c\ -78 03 cc c6 3d 76 a6 54 4d 84 3e 08 4e 36 3b 8a\ -cc 55 aa 53 17 33 ed b5 de e5 b5 19 6e 9f 03 e8\ -b7 31 b3 77 64 28 d9 e4 57 fe 3f bc b3 db 72 74\ -44 2d 78 58 90 e9 cb 08 54 b6 44 4d ac e7 91 d7\ -27 3d e1 88 97 19 33 8a 77 fe -Salt: \ -7f 6d d3 59 e6 04 e6 08 70 e8 98 e4 7b 19 bf 2e\ -5a 7b 2a 90 -Signature: \ -01 09 91 65 6c ca 18 2b 7f 29 d2 db c0 07 e7 ae\ -0f ec 15 8e b6 75 9c b9 c4 5c 5f f8 7c 76 35 dd\ -46 d1 50 88 2f 4d e1 e9 ae 65 e7 f7 d9 01 8f 68\ -36 95 4a 47 c0 a8 1a 8a 6b 6f 83 f2 94 4d 60 81\ -b1 aa 7c 75 9b 25 4b 2c 34 b6 91 da 67 cc 02 26\ -e2 0b 2f 18 b4 22 12 76 1d cd 4b 90 8a 62 b3 71\ -b5 91 8c 57 42 af 4b 53 7e 29 69 17 67 4f b9 14\ -19 47 61 62 1c c1 9a 41 f6 fb 95 3f bc bb 64 9d\ -ea -Test: Verify -Comment: RSASSA-PSS Signature Example 2.3 -Message: \ -52 a1 d9 6c 8a c3 9e 41 e4 55 80 98 01 b9 27 a5\ -b4 45 c1 0d 90 2a 0d cd 38 50 d2 2a 66 d2 bb 07\ -03 e6 7d 58 67 11 45 95 aa bf 5a 7a eb 5a 8f 87\ -03 4b bb 30 e1 3c fd 48 17 a9 be 76 23 00 23 60\ -6d 02 86 a3 fa f8 a4 d2 2b 72 8e c5 18 07 9f 9e\ -64 52 6e 3a 0c c7 94 1a a3 38 c4 37 99 7c 68 0c\ -ca c6 7c 66 bf a1 -Salt: \ -fc a8 62 06 8b ce 22 46 72 4b 70 8a 05 19 da 17\ -e6 48 68 8c -Signature: \ -00 7f 00 30 01 8f 53 cd c7 1f 23 d0 36 59 fd e5\ -4d 42 41 f7 58 a7 50 b4 2f 18 5f 87 57 85 20 c3\ -07 42 af d8 43 59 b6 e6 e8 d3 ed 95 9d c6 fe 48\ -6b ed c8 e2 cf 00 1f 63 a7 ab e1 62 56 a1 b8 4d\ -f0 d2 49 fc 05 d3 19 4c e5 f0 91 27 42 db bf 80\ -dd 17 4f 6c 51 f6 ba d7 f1 6c f3 36 4e ba 09 5a\ -06 26 7d c3 79 38 03 ac 75 26 ae be 0a 47 5d 38\ -b8 c2 24 7a b5 1c 48 98 df 70 47 dc 6a df 52 c6\ -c4 -Test: Verify -Comment: RSASSA-PSS Signature Example 2.4 -Message: \ -a7 18 2c 83 ac 18 be 65 70 a1 06 aa 9d 5c 4e 3d\ -bb d4 af ae b0 c6 0c 4a 23 e1 96 9d 79 ff -Salt: \ -80 70 ef 2d e9 45 c0 23 87 68 4b a0 d3 30 96 73\ -22 35 d4 40 -Signature: \ -00 9c d2 f4 ed be 23 e1 23 46 ae 8c 76 dd 9a d3\ -23 0a 62 07 61 41 f1 6c 15 2b a1 85 13 a4 8e f6\ -f0 10 e0 e3 7f d3 df 10 a1 ec 62 9a 0c b5 a3 b5\ -d2 89 30 07 29 8c 30 93 6a 95 90 3b 6b a8 55 55\ -d9 ec 36 73 a0 61 08 fd 62 a2 fd a5 6d 1c e2 e8\ -5c 4d b6 b2 4a 81 ca 3b 49 6c 36 d4 fd 06 eb 7c\ -91 66 d8 e9 48 77 c4 2b ea 62 2b 3b fe 92 51 fd\ -c2 1d 8d 53 71 ba da d7 8a 48 82 14 79 63 35 b4\ -0b -Test: Verify -Comment: RSASSA-PSS Signature Example 2.5 -Message: \ -86 a8 3d 4a 72 ee 93 2a 4f 56 30 af 65 79 a3 86\ -b7 8f e8 89 99 e0 ab d2 d4 90 34 a4 bf c8 54 dd\ -94 f1 09 4e 2e 8c d7 a1 79 d1 95 88 e4 ae fc 1b\ -1b d2 5e 95 e3 dd 46 1f -Salt: \ -17 63 9a 4e 88 d7 22 c4 fc a2 4d 07 9a 8b 29 c3\ -24 33 b0 c9 -Signature: \ -00 ec 43 08 24 93 1e bd 3b aa 43 03 4d ae 98 ba\ -64 6b 8c 36 01 3d 16 71 c3 cf 1c f8 26 0c 37 4b\ -19 f8 e1 cc 8d 96 50 12 40 5e 7e 9b f7 37 86 12\ -df cc 85 fc e1 2c da 11 f9 50 bd 0b a8 87 67 40\ -43 6c 1d 25 95 a6 4a 1b 32 ef cf b7 4a 21 c8 73\ -b3 cc 33 aa f4 e3 dc 39 53 de 67 f0 67 4c 04 53\ -b4 fd 9f 60 44 06 d4 41 b8 16 09 8c b1 06 fe 34\ -72 bc 25 1f 81 5f 59 db 2e 43 78 a3 ad dc 18 1e\ -cf -Test: Verify -Comment: RSASSA-PSS Signature Example 2.6 -Message: \ -04 9f 91 54 d8 71 ac 4a 7c 7a b4 53 25 ba 75 45\ -a1 ed 08 f7 05 25 b2 66 7c f1 -Salt: \ -37 81 0d ef 10 55 ed 92 2b 06 3d f7 98 de 5d 0a\ -ab f8 86 ee -Signature: \ -00 47 5b 16 48 f8 14 a8 dc 0a bd c3 7b 55 27 f5\ -43 b6 66 bb 6e 39 d3 0e 5b 49 d3 b8 76 dc cc 58\ -ea c1 4e 32 a2 d5 5c 26 16 01 44 56 ad 2f 24 6f\ -c8 e3 d5 60 da 3d df 37 9a 1c 0b d2 00 f1 02 21\ -df 07 8c 21 9a 15 1b c8 d4 ec 9d 2f c2 56 44 67\ -81 10 14 ef 15 d8 ea 01 c2 eb bf f8 c2 c8 ef ab\ -38 09 6e 55 fc be 32 85 c7 aa 55 88 51 25 4f af\ -fa 92 c1 c7 2b 78 75 86 63 ef 45 82 84 31 39 d7\ -a6 -Test: Verify -Comment: Example 3: A 1026-bit RSA Key Pair -Modulus: \ -02 f2 46 ef 45 1e d3 ee bb 9a 31 02 00 cc 25 85\ -9c 04 8e 4b e7 98 30 29 91 11 2e b6 8c e6 db 67\ -4e 28 0d a2 1f ed ed 1a e7 48 80 ca 52 2b 18 db\ -24 93 85 01 28 27 c5 15 f0 e4 66 a1 ff a6 91 d9\ -81 70 57 4e 9d 0e ad b0 87 58 6c a4 89 33 da 3c\ -c9 53 d9 5b d0 ed 50 de 10 dd cb 67 36 10 7d 6c\ -83 1c 7f 66 3e 83 3c a4 c0 97 e7 00 ce 0f b9 45\ -f8 8f b8 5f e8 e5 a7 73 17 25 65 b9 14 a4 71 a4\ -43 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -65 14 51 73 3b 56 de 5a c0 a6 89 a4 ae b6 e6 89\ -4a 69 01 4e 07 6c 88 dd 7a 66 7e ab 32 32 bb cc\ -d2 fc 44 ba 2f a9 c3 1d b4 6f 21 ed d1 fd b2 3c\ -5c 12 8a 5d a5 ba b9 1e 7f 95 2b 67 75 9c 7c ff\ -70 54 15 ac 9f a0 90 7c 7c a6 17 8f 66 8f b9 48\ -d8 69 da 4c c3 b7 35 6f 40 08 df d5 44 9d 32 ee\ -02 d9 a4 77 eb 69 fc 29 26 6e 5d 90 70 51 23 75\ -a5 0f bb cc 27 e2 38 ad 98 42 5f 6e bb f8 89 91 -Prime1: \ -01 bd 36 e1 8e ce 4b 0f db 2e 9c 9d 54 8b d1 a7\ -d6 e2 c2 1c 6f dc 35 07 4a 1d 05 b1 c6 c8 b3 d5\ -58 ea 26 39 c9 a9 a4 21 68 01 69 31 72 52 55 8b\ -d1 48 ad 21 5a ac 55 0e 2d cf 12 a8 2d 0e bf e8\ -53 -Prime2: \ -01 b1 b6 56 ad 86 d8 e1 9d 5d c8 62 92 b3 a1 92\ -fd f6 e0 dd 37 87 7b ad 14 82 2f a0 01 90 ca b2\ -65 f9 0d 3f 02 05 7b 6f 54 d6 ec b1 44 91 e5 ad\ -ea ce bc 48 bf 0e bd 2a 2a d2 6d 40 2e 54 f6 16\ -51 -ModPrime1PrivateExponent: \ -1f 27 79 fd 2e 3e 5e 6b ae 05 53 95 18 fb a0 cd\ -0e ad 1a a4 51 3a 7c ba 18 f1 cf 10 e3 f6 81 95\ -69 3d 27 8a 0f 0e e7 2f 89 f9 bc 76 0d 80 e2 f9\ -d0 26 1d 51 65 01 c6 ae 39 f1 4a 47 6c e2 cc f5 -ModPrime2PrivateExponent: \ -01 1a 0d 36 79 4b 04 a8 54 aa b4 b2 46 2d 43 9a\ -50 46 c9 1d 94 0b 2b c6 f7 5b 62 95 6f ef 35 a2\ -a6 e6 3c 53 09 81 7f 30 7b bf f9 d5 9e 7e 33 1b\ -d3 63 f6 d6 68 49 b1 83 46 ad ea 16 9f 0a e9 ae\ -c1 -MultiplicativeInverseOfPrime2ModPrime1: \ -0b 30 f0 ec f5 58 75 2f b3 a6 ce 4b a2 b8 c6 75\ -f6 59 eb a6 c3 76 58 5a 1b 39 71 2d 03 8a e3 d2\ -b4 6f cb 41 8a e1 5d 09 05 da 64 40 e1 51 3a 30\ -b9 b7 d6 66 8f bc 5e 88 e5 ab 7a 17 5e 73 ba 35 -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 3.1 -Message: \ -59 4b 37 33 3b bb 2c 84 52 4a 87 c1 a0 1f 75 fc\ -ec 0e 32 56 f1 08 e3 8d ca 36 d7 0d 00 57 -Salt: \ -f3 1a d6 c8 cf 89 df 78 ed 77 fe ac bc c2 f8 b0\ -a8 e4 cf aa -Signature: \ -00 88 b1 35 fb 17 94 b6 b9 6c 4a 3e 67 81 97 f8\ -ca c5 2b 64 b2 fe 90 7d 6f 27 de 76 11 24 96 4a\ -99 a0 1a 88 27 40 ec fa ed 6c 01 a4 74 64 bb 05\ -18 23 13 c0 13 38 a8 cd 09 72 14 cd 68 ca 10 3b\ -d5 7d 3b c9 e8 16 21 3e 61 d7 84 f1 82 46 7a bf\ -8a 01 cf 25 3e 99 a1 56 ea a8 e3 e1 f9 0e 3c 6e\ -4e 3a a2 d8 3e d0 34 5b 89 fa fc 9c 26 07 7c 14\ -b6 ac 51 45 4f a2 6e 44 6e 3a 2f 15 3b 2b 16 79\ -7f -Test: Verify -Comment: RSASSA-PSS Signature Example 3.2 -Message: \ -8b 76 95 28 88 4a 0d 1f fd 09 0c f1 02 99 3e 79\ -6d ad cf bd dd 38 e4 4f f6 32 4c a4 51 -Salt: \ -fc f9 f0 e1 f1 99 a3 d1 d0 da 68 1c 5b 86 06 fc\ -64 29 39 f7 -Signature: \ -02 a5 f0 a8 58 a0 86 4a 4f 65 01 7a 7d 69 45 4f\ -3f 97 3a 29 99 83 9b 7b bc 48 bf 78 64 11 69 17\ -95 56 f5 95 fa 41 f6 ff 18 e2 86 c2 78 30 79 bc\ -09 10 ee 9c c3 4f 49 ba 68 11 24 f9 23 df a8 8f\ -42 61 41 a3 68 a5 f5 a9 30 c6 28 c2 c3 c2 00 e1\ -8a 76 44 72 1a 0c be c6 dd 3f 62 79 bd e3 e8 f2\ -be 5e 2d 4e e5 6f 97 e7 ce af 33 05 4b e7 04 2b\ -d9 1a 63 bb 09 f8 97 bd 41 e8 11 97 de e9 9b 11\ -af -Test: Verify -Comment: RSASSA-PSS Signature Example 3.3 -Message: \ -1a bd ba 48 9c 5a da 2f 99 5e d1 6f 19 d5 a9 4d\ -9e 6e c3 4a 8d 84 f8 45 57 d2 6e 5e f9 b0 2b 22\ -88 7e 3f 9a 4b 69 0a d1 14 92 09 c2 0c 61 43 1f\ -0c 01 7c 36 c2 65 7b 35 d7 b0 7d 3f 5a d8 70 85\ -07 a9 c1 b8 31 df 83 5a 56 f8 31 07 18 14 ea 5d\ -3d 8d 8f 6a de 40 cb a3 8b 42 db 7a 2d 3d 7a 29\ -c8 f0 a7 9a 78 38 cf 58 a9 75 7f a2 fe 4c 40 df\ -9b aa 19 3b fc 6f 92 b1 23 ad 57 b0 7a ce 3e 6a\ -c0 68 c9 f1 06 af d9 ee b0 3b 4f 37 c2 5d bf bc\ -fb 30 71 f6 f9 77 17 66 d0 72 f3 bb 07 0a f6 60\ -55 32 97 3a e2 50 51 -Salt: \ -98 6e 7c 43 db b6 71 bd 41 b9 a7 f4 b6 af c8 0e\ -80 5f 24 23 -Signature: \ -02 44 bc d1 c8 c1 69 55 73 6c 80 3b e4 01 27 2e\ -18 cb 99 08 11 b1 4f 72 db 96 41 24 d5 fa 76 06\ -49 cb b5 7a fb 87 55 db b6 2b f5 1f 46 6c f2 3a\ -0a 16 07 57 6e 98 3d 77 8f ce ff a9 2d f7 54 8a\ -ea 8e a4 ec ad 2c 29 dd 9f 95 bc 07 fe 91 ec f8\ -be e2 55 bf e8 76 2f d7 69 0a a9 bf a4 fa 08 49\ -ef 72 8c 2c 42 c4 53 23 64 52 2d f2 ab 7f 9f 8a\ -03 b6 3f 7a 49 91 75 82 86 68 f5 ef 5a 29 e3 80\ -2c -Test: Verify -Comment: RSASSA-PSS Signature Example 3.4 -Message: \ -8f b4 31 f5 ee 79 2b 6c 2a c7 db 53 cc 42 86 55\ -ae b3 2d 03 f4 e8 89 c5 c2 5d e6 83 c4 61 b5 3a\ -cf 89 f9 f8 d3 aa bd f6 b9 f0 c2 a1 de 12 e1 5b\ -49 ed b3 91 9a 65 2f e9 49 1c 25 a7 fc e1 f7 22\ -c2 54 36 08 b6 9d c3 75 ec -Salt: \ -f8 31 2d 9c 8e ea 13 ec 0a 4c 7b 98 12 0c 87 50\ -90 87 c4 78 -Signature: \ -01 96 f1 2a 00 5b 98 12 9c 8d f1 3c 4c b1 6f 8a\ -a8 87 d3 c4 0d 96 df 3a 88 e7 53 2e f3 9c d9 92\ -f2 73 ab c3 70 bc 1b e6 f0 97 cf eb bf 01 18 fd\ -9e f4 b9 27 15 5f 3d f2 2b 90 4d 90 70 2d 1f 7b\ -a7 a5 2b ed 8b 89 42 f4 12 cd 7b d6 76 c9 d1 8e\ -17 03 91 dc d3 45 c0 6a 73 09 64 b3 f3 0b cc e0\ -bb 20 ba 10 6f 9a b0 ee b3 9c f8 a6 60 7f 75 c0\ -34 7f 0a f7 9f 16 af a0 81 d2 c9 2d 1e e6 f8 36\ -b8 -Test: Verify -Comment: RSASSA-PSS Signature Example 3.5 -Message: \ -fe f4 16 1d fa af 9c 52 95 05 1d fc 1f f3 81 0c\ -8c 9e c2 e8 66 f7 07 54 22 c8 ec 42 16 a9 c4 ff\ -49 42 7d 48 3c ae 10 c8 53 4a 41 b2 fd 15 fe e0\ -69 60 ec 6f b3 f7 a7 e9 4a 2f 8a 2e 3e 43 dc 4a\ -40 57 6c 30 97 ac 95 3b 1d e8 6f 0b 4e d3 6d 64\ -4f 23 ae 14 42 55 29 62 24 64 ca 0c bf 0b 17 41\ -34 72 38 15 7f ab 59 e4 de 55 24 09 6d 62 ba ec\ -63 ac 64 -Salt: \ -50 32 7e fe c6 29 2f 98 01 9f c6 7a 2a 66 38 56\ -3e 9b 6e 2d -Signature: \ -02 1e ca 3a b4 89 22 64 ec 22 41 1a 75 2d 92 22\ -10 76 d4 e0 1c 0e 6f 0d de 9a fd 26 ba 5a cf 6d\ -73 9e f9 87 54 5d 16 68 3e 56 74 c9 e7 0f 1d e6\ -49 d7 e6 1d 48 d0 ca eb 4f b4 d8 b2 4f ba 84 a6\ -e3 10 8f ee 7d 07 05 97 32 66 ac 52 4b 4a d2 80\ -f7 ae 17 dc 59 d9 6d 33 51 58 6b 5a 3b db 89 5d\ -1e 1f 78 20 ac 61 35 d8 75 34 80 99 83 82 ba 32\ -b7 34 95 59 60 8c 38 74 52 90 a8 5e f4 e9 f9 bd\ -83 -Test: Verify -Comment: RSASSA-PSS Signature Example 3.6 -Message: \ -ef d2 37 bb 09 8a 44 3a ee b2 bf 6c 3f 8c 81 b8\ -c0 1b 7f cb 3f eb -Salt: \ -b0 de 3f c2 5b 65 f5 af 96 b1 d5 cc 3b 27 d0 c6\ -05 30 87 b3 -Signature: \ -01 2f af ec 86 2f 56 e9 e9 2f 60 ab 0c 77 82 4f\ -42 99 a0 ca 73 4e d2 6e 06 44 d5 d2 22 c7 f0 bd\ -e0 39 64 f8 e7 0a 5c b6 5e d4 4e 44 d5 6a e0 ed\ -f1 ff 86 ca 03 2c c5 dd 44 04 db b7 6a b8 54 58\ -6c 44 ee d8 33 6d 08 d4 57 ce 6c 03 69 3b 45 c0\ -f1 ef ef 93 62 4b 95 b8 ec 16 9c 61 6d 20 e5 53\ -8e bc 0b 67 37 a6 f8 2b 4b c0 57 09 24 fc 6b 35\ -75 9a 33 48 42 62 79 f8 b3 d7 74 4e 2d 22 24 26\ -ce -Test: Verify -Comment: Example 4: A 1027-bit RSA Key Pair -Modulus: \ -05 4a db 78 86 44 7e fe 6f 57 e0 36 8f 06 cf 52\ -b0 a3 37 07 60 d1 61 ce f1 26 b9 1b e7 f8 9c 42\ -1b 62 a6 ec 1d a3 c3 11 d7 5e d5 0e 0a b5 ff f3\ -fd 33 8a cc 3a a8 a4 e7 7e e2 63 69 ac b8 1b a9\ -00 fa 83 f5 30 0c f9 bb 6c 53 ad 1d c8 a1 78 b8\ -15 db 42 35 a9 a9 da 0c 06 de 4e 61 5e a1 27 7c\ -e5 59 e9 c1 08 de 58 c1 4a 81 aa 77 f5 a6 f8 d1\ -33 54 94 49 88 48 c8 b9 59 40 74 0b e7 bf 7c 37\ -05 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -fa 04 1f 8c d9 69 7c ee d3 8e c8 ca a2 75 52 3b\ -4d d7 2b 09 a3 01 d3 54 1d 72 f5 d3 1c 05 cb ce\ -2d 69 83 b3 61 83 af 10 69 0b d4 6c 46 13 1e 35\ -78 94 31 a5 56 77 1d d0 04 9b 57 46 1b f0 60 c1\ -f6 84 72 e8 a6 7c 25 f3 57 e5 b6 b4 73 8f a5 41\ -a7 30 34 6b 4a 07 64 9a 2d fa 80 6a 69 c9 75 b6\ -ab a6 46 78 ac c7 f5 91 3e 89 c6 22 f2 d8 ab b1\ -e3 e3 25 54 e3 9d f9 4b a6 0c 00 2e 38 7d 90 11 -Prime1: \ -02 92 32 33 6d 28 38 94 5d ba 9d d7 72 3f 4e 62\ -4a 05 f7 37 5b 92 7a 87 ab e6 a8 93 a1 65 8f d4\ -9f 47 f6 c7 b0 fa 59 6c 65 fa 68 a2 3f 0a b4 32\ -96 2d 18 d4 34 3b d6 fd 67 1a 5e a8 d1 48 41 39\ -95 -Prime2: \ -02 0e f5 ef e7 c5 39 4a ed 22 72 f7 e8 1a 74 f4\ -c0 2d 14 58 94 cb 1b 3c ab 23 a9 a0 71 0a 2a fc\ -7e 33 29 ac bb 74 3d 01 f6 80 c4 d0 2a fb 4c 8f\ -de 7e 20 93 08 11 bb 2b 99 57 88 b5 e8 72 c2 0b\ -b1 -ModPrime1PrivateExponent: \ -02 6e 7e 28 01 0e cf 24 12 d9 52 3a d7 04 64 7f\ -b4 fe 9b 66 b1 a6 81 58 1b 0e 15 55 3a 89 b1 54\ -28 28 89 8f 27 24 3e ba b4 5f f5 e1 ac b9 d4 df\ -1b 05 1f bc 62 82 4d bc 6f 6c 93 26 1a 78 b9 a7\ -59 -ModPrime2PrivateExponent: \ -01 2d dc c8 6e f6 55 99 8c 39 dd ae 11 71 86 69\ -e5 e4 6c f1 49 5b 07 e1 3b 10 14 cd 69 b3 af 68\ -30 4a d2 a6 b6 43 21 e7 8b f3 bb ca 9b b4 94 e9\ -1d 45 17 17 e2 d9 75 64 c6 54 94 65 d0 20 5c f4\ -21 -MultiplicativeInverseOfPrime2ModPrime1: \ -01 06 00 c4 c2 18 47 45 9f e5 76 70 3e 2e be ca\ -e8 a5 09 4e e6 3f 53 6b f4 ac 68 d3 c1 3e 5e 4f\ -12 ac 5c c1 0a b6 a2 d0 5a 19 92 14 d1 82 47 47\ -d5 51 90 96 36 b7 74 c2 2c ac 0b 83 75 99 ab cc\ -75 -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 4.1 -Message: \ -9f b0 3b 82 7c 82 17 d9 -Salt: \ -ed 7c 98 c9 5f 30 97 4f be 4f bd dc f0 f2 8d 60\ -21 c0 e9 1d -Signature: \ -03 23 d5 b7 bf 20 ba 45 39 28 9a e4 52 ae 42 97\ -08 0f ef f4 51 84 23 ff 48 11 a8 17 83 7e 7d 82\ -f1 83 6c df ab 54 51 4f f0 88 7b dd ee bf 40 bf\ -99 b0 47 ab c3 ec fa 6a 37 a3 ef 00 f4 a0 c4 a8\ -8a ae 09 04 b7 45 c8 46 c4 10 7e 87 97 72 3e 8a\ -c8 10 d9 e3 d9 5d fa 30 ff 49 66 f4 d7 5d 13 76\ -8d 20 85 7f 2b 14 06 f2 64 cf e7 5e 27 d7 65 2f\ -4b 5e d3 57 5f 28 a7 02 f8 c4 ed 9c f9 b2 d4 49\ -48 -Test: Verify -Comment: RSASSA-PSS Signature Example 4.2 -Message: \ -0c a2 ad 77 79 7e ce 86 de 5b f7 68 75 0d db 5e\ -d6 a3 11 6a d9 9b bd 17 ed f7 f7 82 f0 db 1c d0\ -5b 0f 67 74 68 c5 ea 42 0d c1 16 b1 0e 80 d1 10\ -de 2b 04 61 ea 14 a3 8b e6 86 20 39 2e 7e 89 3c\ -b4 ea 93 93 fb 88 6c 20 ff 79 06 42 30 5b f3 02\ -00 38 92 e5 4d f9 f6 67 50 9d c5 39 20 df 58 3f\ -50 a3 dd 61 ab b6 fa b7 5d 60 03 77 e3 83 e6 ac\ -a6 71 0e ee a2 71 56 e0 67 52 c9 4c e2 5a e9 9f\ -cb f8 59 2d be 2d 7e 27 45 3c b4 4d e0 71 00 eb\ -b1 a2 a1 98 11 a4 78 ad be ab 27 0f 94 e8 fe 36\ -9d 90 b3 ca 61 2f 9f -Salt: \ -22 d7 1d 54 36 3a 42 17 aa 55 11 3f 05 9b 33 84\ -e3 e5 7e 44 -Signature: \ -04 9d 01 85 84 5a 26 4d 28 fe b1 e6 9e da ec 09\ -06 09 e8 e4 6d 93 ab b3 83 71 ce 51 f4 aa 65 a5\ -99 bd aa a8 1d 24 fb a6 6a 08 a1 16 cb 64 4f 3f\ -1e 65 3d 95 c8 9d b8 bb d5 da ac 27 09 c8 98 40\ -00 17 84 10 a7 c6 aa 86 67 dd c3 8c 74 1f 71 0e\ -c8 66 5a a9 05 2b e9 29 d4 e3 b1 67 82 c1 66 21\ -14 c5 41 4b b0 35 34 55 c3 92 fc 28 f3 db 59 05\ -4b 5f 36 5c 49 e1 d1 56 f8 76 ee 10 cb 4f d7 05\ -98 -Test: Verify -Comment: RSASSA-PSS Signature Example 4.3 -Message: \ -28 80 62 af c0 8f cd b7 c5 f8 65 0b 29 83 73 00\ -46 1d d5 67 6c 17 a2 0a 3c 8f b5 14 89 49 e3 f7\ -3d 66 b3 ae 82 c7 24 0e 27 c5 b3 ec 43 28 ee 7d\ -6d df 6a 6a 0c 9b 5b 15 bc da 19 6a 9d 0c 76 b1\ -19 d5 34 d8 5a bd 12 39 62 d5 83 b7 6c e9 d1 80\ -bc e1 ca -Salt: \ -4a f8 70 fb c6 51 60 12 ca 91 6c 70 ba 86 2a c7\ -e8 24 36 17 -Signature: \ -03 fb c4 10 a2 ce d5 95 00 fb 99 f9 e2 af 27 81\ -ad a7 4e 13 14 56 24 60 27 82 e2 99 48 13 ee fc\ -a0 51 9e cd 25 3b 85 5f b6 26 a9 0d 77 1e ae 02\ -8b 0c 47 a1 99 cb d9 f8 e3 26 97 34 af 41 63 59\ -90 90 71 3a 3f a9 10 fa 09 60 65 27 21 43 2b 97\ -10 36 a7 18 1a 2b c0 ca b4 3b 0b 59 8b c6 21 74\ -61 d7 db 30 5f f7 e9 54 c5 b5 bb 23 1c 39 e7 91\ -af 6b cf a7 6b 14 7b 08 13 21 f7 26 41 48 2a 2a\ -ad -Test: Verify -Comment: RSASSA-PSS Signature Example 4.4 -Message: \ -6f 4f 9a b9 50 11 99 ce f5 5c 6c f4 08 fe 7b 36\ -c5 57 c4 9d 42 0a 47 63 d2 46 3c 8a d4 4b 3c fc\ -5b e2 74 2c 0e 7d 9b 0f 66 08 f0 8c 7f 47 b6 93\ -ee -Salt: \ -40 d2 e1 80 fa e1 ea c4 39 c1 90 b5 6c 2c 0e 14\ -dd f9 a2 26 -Signature: \ -04 86 64 4b c6 6b f7 5d 28 33 5a 61 79 b1 08 51\ -f4 3f 09 bd ed 9f ac 1a f3 32 52 bb 99 53 ba 42\ -98 cd 64 66 b2 75 39 a7 0a da a3 f8 9b 3d b3 c7\ -4a b6 35 d1 22 f4 ee 7c e5 57 a6 1e 59 b8 2f fb\ -78 66 30 e5 f9 db 53 c7 7d 9a 0c 12 fa b5 95 8d\ -4c 2c e7 da a8 07 cd 89 ba 2c c7 fc d0 2f f4 70\ -ca 67 b2 29 fc ce 81 4c 85 2c 73 cc 93 be a3 5b\ -e6 84 59 ce 47 8e 9d 46 55 d1 21 c8 47 2f 37 1d\ -4f -Test: Verify -Comment: RSASSA-PSS Signature Example 4.5 -Message: \ -e1 7d 20 38 5d 50 19 55 82 3c 3f 66 62 54 c1 d3\ -dd 36 ad 51 68 b8 f1 8d 28 6f dc f6 7a 7d ad 94\ -09 70 85 fa b7 ed 86 fe 21 42 a2 87 71 71 79 97\ -ef 1a 7a 08 88 4e fc 39 35 6d 76 07 7a af 82 45\ -9a 7f ad 45 84 88 75 f2 81 9b 09 89 37 fe 92 3b\ -cc 9d c4 42 d7 2d 75 4d 81 20 25 09 0c 9b c0 3d\ -b3 08 0c 13 8d d6 3b 35 5d 0b 4b 85 d6 68 8a c1\ -9f 4d e1 50 84 a0 ba 4e 37 3b 93 ef 4a 55 50 96\ -69 19 15 dc 23 c0 0e 95 4c de b2 0a 47 cd 55 d1\ -6c 3d 86 81 d4 6e d7 f2 ed 5e a4 27 95 be 17 ba\ -ed 25 f0 f4 d1 13 b3 63 6a dd d5 85 f1 6a 8b 5a\ -ec 0c 8f a9 c5 f0 3c bf 3b 9b 73 -Salt: \ -24 97 dc 2b 46 15 df ae 5a 66 3d 49 ff d5 6b f7\ -ef c1 13 04 -Signature: \ -02 2a 80 04 53 53 90 4c b3 0c bb 54 2d 7d 49 90\ -42 1a 6e ec 16 a8 02 9a 84 22 ad fd 22 d6 af f8\ -c4 cc 02 94 af 11 0a 0c 06 7e c8 6a 7d 36 41 34\ -45 9b b1 ae 8f f8 36 d5 a8 a2 57 98 40 99 6b 32\ -0b 19 f1 3a 13 fa d3 78 d9 31 a6 56 25 da e2 73\ -9f 0c 53 67 0b 35 d9 d3 cb ac 08 e7 33 e4 ec 2b\ -83 af 4b 91 96 d6 3e 7c 4f f1 dd ea e2 a1 22 79\ -1a 12 5b fe a8 de b0 de 8c cf 1f 4f fa f6 e6 fb\ -0a -Test: Verify -Comment: RSASSA-PSS Signature Example 4.6 -Message: \ -af bc 19 d4 79 24 90 18 fd f4 e0 9f 61 87 26 44\ -04 95 de 11 dd ee e3 88 72 d7 75 fc ea 74 a2 38\ -96 b5 34 3c 9c 38 d4 6a f0 db a2 24 d0 47 58 0c\ -c6 0a 65 e9 39 1c f9 b5 9b 36 a8 60 59 8d 4e 82\ -16 72 2f 99 3b 91 cf ae 87 bc 25 5a f8 9a 6a 19\ -9b ca 4a 39 1e ad bc 3a 24 90 3c 0b d6 67 36 8f\ -6b e7 8e 3f ea bf b4 ff d4 63 12 27 63 74 0f fb\ -be fe ab 9a 25 56 4b c5 d1 c2 4c 93 e4 22 f7 50\ -73 e2 ad 72 bf 45 b1 0d f0 0b 52 a1 47 12 8e 73\ -fe e3 3f a3 f0 57 7d 77 f8 0f bc 2d f1 be d3 13\ -29 0c 12 77 7f 50 -Salt: \ -a3 34 db 6f ae bf 11 08 1a 04 f8 7c 2d 62 1c de\ -c7 93 0b 9b -Signature: \ -00 93 8d cb 6d 58 30 46 06 5f 69 c7 8d a7 a1 f1\ -75 70 66 a7 fa 75 12 5a 9d 29 29 f0 b7 9a 60 b6\ -27 b0 82 f1 1f 5b 19 6f 28 eb 9d aa 6f 21 c0 5e\ -51 40 f6 ae f1 73 7d 20 23 07 5c 05 ec f0 4a 02\ -8c 68 6a 2a b3 e7 d5 a0 66 4f 29 5c e1 29 95 e8\ -90 90 8b 6a d2 1f 08 39 eb 65 b7 03 93 a7 b5 af\ -d9 87 1d e0 ca a0 ce de c5 b8 19 62 67 56 20 9d\ -13 ab 1e 7b b9 54 6a 26 ff 37 e9 a5 1a f9 fd 56\ -2e -Test: Verify -Comment: Example 5: A 1028-bit RSA Key Pair -Modulus: \ -0d 10 f6 61 f2 99 40 f5 ed 39 aa 26 09 66 de b4\ -78 43 67 9d 2b 6f b2 5b 3d e3 70 f3 ac 7c 19 91\ -63 91 fd 25 fb 52 7e bf a6 a4 b4 df 45 a1 75 9d\ -99 6c 4b b4 eb d1 88 28 c4 4f c5 2d 01 91 87 17\ -40 52 5f 47 a4 b0 cc 8d a3 25 ed 8a a6 76 b0 d0\ -f6 26 e0 a7 7f 07 69 21 70 ac ac 80 82 f4 2f aa\ -7d c7 cd 12 3e 73 0e 31 a8 79 85 20 4c ab cb e6\ -67 0d 43 a2 dd 2b 2d de f5 e0 53 92 fc 21 3b c5\ -07 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -03 ce 08 b1 04 ff f3 96 a9 79 bd 3e 4e 46 92 5b\ -63 19 dd b6 3a cb cf d8 19 f1 7d 16 b8 07 7b 3a\ -87 10 1f f3 4b 77 fe 48 b8 b2 05 a9 6e 91 51 ba\ -8e ce a6 4d 0c ce 7b 23 c3 e6 a6 b8 30 58 bc 49\ -da e8 16 ae 73 6d b5 a4 70 8e 2a d4 35 23 2b 56\ -7f 90 96 ce 59 ff 28 06 1e 79 ab 1c 02 d7 17 e6\ -b2 3c ea 6d b8 eb 51 92 fa 7c 1e ab 22 7d ba 74\ -62 1c 45 60 18 96 ee f1 37 92 c8 44 0b eb 15 aa\ -c1 -Prime1: \ -03 f2 f3 31 f4 14 2d 4f 24 b4 3a a1 02 79 a8 96\ -52 d4 e7 53 72 21 a1 a7 b2 a2 5d eb 55 1e 5d e9\ -ac 49 74 11 c2 27 a9 4e 45 f9 1c 2d 1c 13 cc 04\ -6c f4 ce 14 e3 2d 05 87 34 21 0d 44 a8 7e e1 b7\ -3f -Prime2: \ -03 4f 09 0d 73 b5 58 03 03 0c f0 36 1a 5d 80 81\ -bf b7 9f 85 15 23 fe ac 0a 21 24 d0 8d 40 13 ff\ -08 48 77 71 a8 70 d0 47 9d c0 68 6c 62 f7 71 8d\ -fe cf 02 4b 17 c9 26 76 78 05 91 71 33 9c c0 08\ -39 -ModPrime1PrivateExponent: \ -02 aa 66 3a db f5 1a b8 87 a0 18 cb 42 6e 78 bc\ -2f e1 82 dc b2 f7 bc b5 04 41 d1 7f df 0f 06 79\ -8b 50 71 c6 e2 f5 fe b4 d5 4a d8 18 23 11 c1 ef\ -62 d4 c4 9f 18 d1 f5 1f 54 b2 d2 cf fb a4 da 1b\ -e5 -ModPrime2PrivateExponent: \ -02 bb e7 06 07 8b 5c 0b 39 15 12 d4 11 db 1b 19\ -9b 5a 56 64 b8 40 42 ea d3 7f e9 94 ae 72 b9 53\ -2d fb fb 3e 9e 69 81 a0 fb b8 06 51 31 41 b7 c2\ -16 3f e5 6c 39 5e 4b fa ee 57 e3 83 3f 9b 91 8d\ -f9 -MultiplicativeInverseOfPrime2ModPrime1: \ -02 42 b6 cd 00 d3 0a 76 7a ee 9a 89 8e ad 45 3c\ -8e ae a6 3d 50 0b 7d 1e 00 71 3e da e5 1c e3 6b\ -23 b6 64 df 26 e6 3e 26 6e c8 f7 6e 6e 63 ed 1b\ -a4 1e b0 33 b1 20 f7 ea 52 12 ae 21 a9 8f bc 16 -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 5.1 -Message: \ -30 c7 d5 57 45 8b 43 6d ec fd c1 4d 06 cb 7b 96\ -b0 67 18 c4 8d 7d e5 74 82 a8 68 ae 7f 06 58 70\ -a6 21 65 06 d1 1b 77 93 23 df df 04 6c f5 77 51\ -29 13 4b 4d 56 89 e4 d9 c0 ce 1e 12 d7 d4 b0 6c\ -b5 fc 58 20 de cf a4 1b af 59 bf 25 7b 32 f0 25\ -b7 67 9b 44 5b 94 99 c9 25 55 14 58 85 99 2f 1b\ -76 f8 48 91 ee 4d 3b e0 f5 15 0f d5 90 1e 3a 4c\ -8e d4 3f d3 6b 61 d0 22 e6 5a d5 00 8d bf 33 29\ -3c 22 bf bf d0 73 21 f0 f1 d5 fa 9f df 00 14 c2\ -fc b0 35 8a ad 0e 35 4b 0d 29 -Salt: \ -08 1b 23 3b 43 56 77 50 bd 6e 78 f3 96 a8 8b 9f\ -6a 44 51 51 -Signature: \ -0b a3 73 f7 6e 09 21 b7 0a 8f bf e6 22 f0 bf 77\ -b2 8a 3d b9 8e 36 10 51 c3 d7 cb 92 ad 04 52 91\ -5a 4d e9 c0 17 22 f6 82 3e eb 6a df 7e 0c a8 29\ -0f 5d e3 e5 49 89 0a c2 a3 c5 95 0a b2 17 ba 58\ -59 08 94 95 2d e9 6f 8d f1 11 b2 57 52 15 da 6c\ -16 15 90 c7 45 be 61 24 76 ee 57 8e d3 84 ab 33\ -e3 ec e9 74 81 a2 52 f5 c7 9a 98 b5 53 2a e0 0c\ -dd 62 f2 ec c0 cd 1b ae fe 80 d8 0b 96 21 93 ec\ -1d -Test: Verify -Comment: RSASSA-PSS Signature Example 5.2 -Message: \ -e7 b3 2e 15 56 ea 1b 27 95 04 6a c6 97 39 d2 2a\ -c8 96 6b f1 1c 11 6f 61 4b 16 67 40 e9 6b 90 65\ -3e 57 50 94 5f cf 77 21 86 c0 37 90 a0 7f da 32\ -3e 1a 61 91 6b 06 ee 21 57 db 3d ff 80 d6 7d 5e\ -39 a5 3a e2 68 c8 f0 9e d9 9a 73 20 05 b0 bc 6a\ -04 af 4e 08 d5 7a 00 e7 20 1b 30 60 ef aa db 73\ -11 3b fc 08 7f d8 37 09 3a a2 52 35 b8 c1 49 f5\ -62 15 f0 31 c2 4a d5 bd e7 f2 99 60 df 7d 52 40\ -70 f7 44 9c 6f 78 50 84 be 1a 0f 73 30 47 f3 36\ -f9 15 47 38 67 45 47 db 02 a9 f4 4d fc 6e 60 30\ -10 81 e1 ce 99 84 7f 3b 5b 60 1f f0 6b 4d 57 76\ -a9 74 0b 9a a0 d3 40 58 fd 3b 90 6e 4f 78 59 df\ -b0 7d 71 73 e5 e6 f6 35 0a da c2 1f 27 b2 30 74\ -69 -Salt: \ -bd 0c e1 95 49 d0 70 01 20 cb e5 10 77 db bb b0\ -0a 8d 8b 09 -Signature: \ -08 18 0d e8 25 e4 b8 b0 14 a3 2d a8 ba 76 15 55\ -92 12 04 f2 f9 0d 5f 24 b7 12 90 8f f8 4f 3e 22\ -0a d1 79 97 c0 dd 6e 70 66 30 ba 3e 84 ad d4 d5\ -e7 ab 00 4e 58 07 4b 54 97 09 56 5d 43 ad 9e 97\ -b5 a7 a1 a2 9e 85 b9 f9 0f 4a af cd f5 83 21 de\ -8c 59 74 ef 9a bf 2d 52 6f 33 c0 f2 f8 2e 95 d1\ -58 ea 6b 81 f1 73 6d b8 d1 af 3d 6a c6 a8 3b 32\ -d1 8b ae 0f f1 b2 fe 27 de 4c 76 ed 8c 79 80 a3\ -4e -Test: Verify -Comment: RSASSA-PSS Signature Example 5.3 -Message: \ -8d 83 96 e3 65 07 fe 1e f6 a1 90 17 54 8e 0c 71\ -66 74 c2 fe c2 33 ad b2 f7 75 66 5e c4 1f 2b d0\ -ba 39 6b 06 1a 9d aa 7e 86 6f 7c 23 fd 35 31 95\ -43 00 a3 42 f9 24 53 5e a1 49 8c 48 f6 c8 79 93\ -28 65 fc 02 00 0c 52 87 23 b7 ad 03 35 74 5b 51\ -20 9a 0a fe d9 32 af 8f 08 87 c2 19 00 4d 2a bd\ -89 4e a9 25 59 ee 31 98 af 3a 73 4f e9 b9 63 8c\ -26 3a 72 8a d9 5a 5a e8 ce 3e b1 58 39 f3 aa 78\ -52 bb 39 07 06 e7 76 0e 43 a7 12 91 a2 e3 f8 27\ -23 7d ed a8 51 87 4c 51 76 65 f5 45 f2 72 38 df\ -86 55 7f 37 5d 09 cc d8 bd 15 d8 cc f6 1f 5d 78\ -ca 5c 7f 5c de 78 2e 6b f5 d0 05 70 56 d4 ba d9\ -8b 3d 2f 95 75 e8 24 ab 7a 33 ff 57 b0 ac 10 0a\ -b0 d6 ea d7 aa 0b 50 f6 e4 d3 e5 ec 0b 96 6b -Salt: \ -81 57 79 a9 1b 3a 8b d0 49 bf 2a eb 92 01 42 77\ -22 22 c9 ca -Signature: \ -05 e0 fd bd f6 f7 56 ef 73 31 85 cc fa 8c ed 2e\ -b6 d0 29 d9 d5 6e 35 56 1b 5d b8 e7 02 57 ee 6f\ -d0 19 d2 f0 bb f6 69 fe 9b 98 21 e7 8d f6 d4 1e\ -31 60 8d 58 28 0f 31 8e e3 4f 55 99 41 c8 df 13\ -28 75 74 ba c0 00 b7 e5 8d c4 f4 14 ba 49 fb 12\ -7f 9d 0f 89 36 63 8c 76 e8 53 56 c9 94 f7 97 50\ -f7 fa 3c f4 fd 48 2d f7 5e 3f b9 97 8c d0 61 f7\ -ab b1 75 72 e6 e6 3e 0b de 12 cb dc f1 8c 68 b9\ -79 -Test: Verify -Comment: RSASSA-PSS Signature Example 5.4 -Message: \ -32 8c 65 9e 0a 64 37 43 3c ce b7 3c 14 -Salt: \ -9a ec 4a 74 80 d5 bb c4 29 20 d7 ca 23 5d b6 74\ -98 9c 9a ac -Signature: \ -0b c9 89 85 3b c2 ea 86 87 32 71 ce 18 3a 92 3a\ -b6 5e 8a 53 10 0e 6d f5 d8 7a 24 c4 19 4e b7 97\ -81 3e e2 a1 87 c0 97 dd 87 2d 59 1d a6 0c 56 86\ -05 dd 7e 74 2d 5a f4 e3 3b 11 67 8c cb 63 90 32\ -04 a3 d0 80 b0 90 2c 89 ab a8 86 8f 00 9c 0f 1c\ -0c b8 58 10 bb dd 29 12 1a bb 84 71 ff 2d 39 e4\ -9f d9 2d 56 c6 55 c8 e0 37 ad 18 fa fb dc 92 c9\ -58 63 f7 f6 1e a9 ef a2 8f ea 40 13 69 d1 9d ae\ -a1 -Test: Verify -Comment: RSASSA-PSS Signature Example 5.5 -Message: \ -f3 7b 96 23 79 a4 7d 41 5a 37 6e ec 89 73 15 0b\ -cb 34 ed d5 ab 65 40 41 b6 14 30 56 0c 21 44 58\ -2b a1 33 c8 67 d8 52 d6 b8 e2 33 21 90 13 02 ec\ -b4 5b 09 ec 88 b1 52 71 78 fa 04 32 63 f3 06 7d\ -9f fe 97 30 32 a9 9f 4c b0 8a d2 c7 e0 a2 45 6c\ -dd 57 a7 df 56 fe 60 53 52 7a 5a eb 67 d7 e5 52\ -06 3c 1c a9 7b 1b ef fa 7b 39 e9 97 ca f2 78 78\ -ea 0f 62 cb eb c8 c2 1d f4 c8 89 a2 02 85 1e 94\ -90 88 49 0c 24 9b 6e 9a cf 1d 80 63 f5 be 23 43\ -98 9b f9 5c 4d a0 1a 2b e7 8b 4a b6 b3 78 01 5b\ -c3 79 57 f7 69 48 b5 e5 8e 44 0c 28 45 3d 40 d7\ -cf d5 7e 7d 69 06 00 47 4a b5 e7 59 73 b1 ea 0c\ -5f 1e 45 d1 41 90 af e2 f4 eb 6d 3b df 71 f1 d2\ -f8 bb 15 6a 1c 29 5d 04 aa eb 9d 68 9d ce 79 ed\ -62 bc 44 3e -Salt: \ -e2 0c 1e 98 78 51 2c 39 97 0f 58 37 5e 15 49 a6\ -8b 64 f3 1d -Signature: \ -0a ef a9 43 b6 98 b9 60 9e df 89 8a d2 27 44 ac\ -28 dc 23 94 97 ce a3 69 cb bd 84 f6 5c 95 c0 ad\ -77 6b 59 47 40 16 4b 59 a7 39 c6 ff 7c 2f 07 c7\ -c0 77 a8 6d 95 23 8f e5 1e 1f cf 33 57 4a 4a e0\ -68 4b 42 a3 f6 bf 67 7d 91 82 0c a8 98 74 46 7b\ -2c 23 ad d7 79 69 c8 07 17 43 0d 0e fc 1d 36 95\ -89 2c e8 55 cb 7f 70 11 63 0f 4d f2 6d ef 8d df\ -36 fc 23 90 5f 57 fa 62 43 a4 85 c7 70 d5 68 1f\ -cd -Test: Verify -Comment: RSASSA-PSS Signature Example 5.6 -Message: \ -c6 10 3c 33 0c 1e f7 18 c1 41 e4 7b 8f a8 59 be\ -4d 5b 96 25 9e 7d 14 20 70 ec d4 85 83 9d ba 5a\ -83 69 c1 7c 11 14 03 5e 53 2d 19 5c 74 f4 4a 04\ -76 a2 d3 e8 a4 da 21 00 16 ca ce d0 e3 67 cb 86\ -77 10 a4 b5 aa 2d f2 b8 e5 da f5 fd c6 47 80 7d\ -4d 5e bb 6c 56 b9 76 3c cd ae 4d ea 33 08 eb 0a\ -c2 a8 95 01 cb 20 9d 26 39 fa 5b f8 7c e7 90 74\ -7d 3c b2 d2 95 e8 45 64 f2 f6 37 82 4f 0c 13 02\ -81 29 b0 aa 4a 42 2d 16 22 82 -Salt: \ -23 29 1e 4a 33 07 e8 bb b7 76 62 3a b3 4e 4a 5f\ -4c c8 a8 db -Signature: \ -02 80 2d cc fa 8d fa f5 27 9b f0 b4 a2 9b a1 b1\ -57 61 1f ae aa f4 19 b8 91 9d 15 94 19 00 c1 33\ -9e 7e 92 e6 fa e5 62 c5 3e 6c c8 e8 41 04 b1 10\ -bc e0 3a d1 85 25 e3 c4 9a 0e ad ad 5d 3f 28 f2\ -44 a8 ed 89 ed ba fb b6 86 27 7c fa 8a e9 09 71\ -4d 6b 28 f4 bf 8e 29 3a a0 4c 41 ef e7 c0 a8 12\ -66 d5 c0 61 e2 57 5b e0 32 aa 46 46 74 ff 71 62\ -62 19 bd 74 cc 45 f0 e7 ed 4e 3f f9 6e ee 75 8e\ -8f -Test: Verify -Comment: Example 6: A 1029-bit RSA Key Pair -Modulus: \ -16 4c a3 1c ff 60 9f 3a 0e 71 01 b0 39 f2 e4 fe\ -6d d3 75 19 ab 98 59 8d 17 9e 17 49 96 59 80 71\ -f4 7d 3a 04 55 91 58 d7 be 37 3c f1 aa 53 f0 aa\ -6e f0 90 39 e5 67 8c 2a 4c 63 90 05 14 c8 c4 f8\ -aa ed 5d e1 2a 5f 10 b0 9c 31 1a f8 c0 ff b5 b7\ -a2 97 f2 ef c6 3b 8d 6b 05 10 93 1f 0b 98 e4 8b\ -f5 fc 6e c4 e7 b8 db 1f fa eb 08 c3 8e 02 ad b8\ -f0 3a 48 22 9c 99 e9 69 43 1f 61 cb 8c 4d c6 98\ -d1 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -03 b6 64 ee 3b 75 66 72 3f c6 ea f2 8a bb 43 0a\ -39 80 f1 12 6c 81 de 8a d7 09 ea b3 9a c9 dc d0\ -b1 55 0b 37 29 d8 70 68 e9 52 00 9d f5 44 53 4c\ -1f 50 82 9a 78 f4 59 1e b8 fd 57 14 04 26 a6 bb\ -04 05 b6 a6 f5 1a 57 d9 26 7b 7b bc 65 33 91 a6\ -99 a2 a9 0d ac 8a e2 26 bc c6 0f a8 cd 93 4c 73\ -c7 b0 3b 1f 6b 81 81 58 63 18 38 a8 61 2e 6e 6e\ -a9 2b e2 4f 83 24 fa f5 b1 fd 85 87 22 52 67 ba\ -6f -Prime1: \ -04 f0 54 8c 96 26 ab 1e bf 12 44 93 47 41 d9 9a\ -06 22 0e fa 2a 58 56 aa 0e 75 73 0b 2e c9 6a dc\ -86 be 89 4f a2 80 3b 53 a5 e8 5d 27 6a cb d2 9a\ -b8 23 f8 0a 73 91 bb 54 a5 05 16 72 fb 04 ee b5\ -43 -Prime2: \ -04 83 e0 ae 47 91 55 87 74 3f f3 45 36 2b 55 5d\ -39 62 d9 8b b6 f1 5f 84 8b 4c 92 b1 77 1c a8 ed\ -10 7d 8d 3e e6 5e c4 45 17 dd 0f aa 48 1a 38 7e\ -90 2f 7a 2e 74 7c 26 9e 7e a4 44 80 bc 53 8b 8e\ -5b -ModPrime1PrivateExponent: \ -03 a8 e8 ae a9 92 0c 1a a3 b2 f0 d8 46 e4 b8 50\ -d8 1c a3 06 a5 1c 83 54 4f 94 9f 64 f9 0d cf 3f\ -8e 26 61 f0 7e 56 12 20 a1 80 38 8f be 27 3e 70\ -e2 e5 dc a8 3a 0e 13 48 dd 64 90 c7 31 d6 ec e1\ -ab -ModPrime2PrivateExponent: \ -01 35 bd cd b6 0b f2 19 7c 43 6e d3 4b 32 cd 8b\ -4f c7 77 78 83 2b a7 67 03 55 1f b2 42 b3 01 69\ -95 93 af 77 fd 8f c3 94 a8 52 6a d2 3c c4 1a 03\ -80 6b d8 97 fe 4b 0e a6 46 55 8a ad dc c9 9e 8a\ -25 -MultiplicativeInverseOfPrime2ModPrime1: \ -03 04 c0 3d 9c 73 65 03 a9 84 ab bd 9b a2 23 01\ -40 7c 4a 2a b1 dd 85 76 64 81 b6 0d 45 40 11 52\ -e6 92 be 14 f4 12 1d 9a a3 fd 6e 0b 4d 1d 3a 97\ -35 38 a3 1d 42 ee 6e 1e 5e f6 20 23 1a 2b ba f3\ -5f -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 6.1 -Message: \ -0a 20 b7 74 ad dc 2f a5 12 45 ed 7c b9 da 60 9e\ -50 ca c6 63 6a 52 54 3f 97 45 8e ed 73 40 f8 d5\ -3f fc 64 91 8f 94 90 78 ee 03 ef 60 d4 2b 5f ec\ -24 60 50 bd 55 05 cd 8c b5 97 ba d3 c4 e7 13 b0\ -ef 30 64 4e 76 ad ab b0 de 01 a1 56 1e fb 25 51\ -58 c7 4f c8 01 e6 e9 19 e5 81 b4 6f 0f 0d dd 08\ -e4 f3 4c 78 10 b5 ed 83 18 f9 1d 7c 8c -Salt: \ -5b 4e a2 ef 62 9c c2 2f 3b 53 8e 01 69 04 b4 7b\ -1e 40 bf d5 -Signature: \ -04 c0 cf ac ec 04 e5 ba db ec e1 59 a5 a1 10 3f\ -69 b3 f3 2b a5 93 cb 4c c4 b1 b7 ab 45 59 16 a9\ -6a 27 cd 26 78 ea 0f 46 ba 37 f7 fc 9c 86 32 5f\ -29 73 3b 38 9f 1d 97 f4 3e 72 01 c0 f3 48 fc 45\ -fe 42 89 23 35 36 2e ee 01 8b 5b 16 1f 2f 93 93\ -03 12 25 c7 13 01 2a 57 6b c8 8e 23 05 24 89 86\ -8d 90 10 cb f0 33 ec c5 68 e8 bc 15 2b dc 59 d5\ -60 e4 12 91 91 5d 28 56 52 08 e2 2a ee c9 ef 85\ -d1 -Test: Verify -Comment: RSASSA-PSS Signature Example 6.2 -Message: \ -2a af f6 63 1f 62 1c e6 15 76 0a 9e bc e9 4b b3\ -33 07 7a d8 64 88 c8 61 d4 b7 6d 29 c1 f4 87 46\ -c6 11 ae 1e 03 ce d4 44 5d 7c fa 1f e5 f6 2e 1b\ -3f 08 45 2b de 3b 6e f8 19 73 ba fb b5 7f 97 bc\ -ee f8 73 98 53 95 b8 26 05 89 aa 88 cb 7d b5 0a\ -b4 69 26 2e 55 1b dc d9 a5 6f 27 5a 0a c4 fe 48\ -47 00 c3 5f 3d bf 2b 46 9e de 86 47 41 b8 6f a5\ -91 72 a3 60 ba 95 a0 2e 13 9b e5 0d df b7 cf 0b\ -42 fa ea bb fb ba a8 6a 44 97 69 9c 4f 2d fd 5b\ -08 40 6a f7 e1 41 44 42 7c 25 3e c0 ef a2 0e af\ -9a 8b e8 cd 49 ce 1f 1b c4 e9 3e 61 9c f2 aa 8e\ -d4 fb 39 bc 85 90 d0 f7 b9 64 88 f7 31 7a c9 ab\ -f7 be e4 e3 a0 e7 15 -Salt: \ -83 14 6a 9e 78 27 22 c2 8b 01 4f 98 b4 26 7b da\ -2a c9 50 4f -Signature: \ -0a 23 14 25 0c f5 2b 6e 4e 90 8d e5 b3 56 46 bc\ -aa 24 36 1d a8 16 0f b0 f9 25 75 90 ab 3a ce 42\ -b0 dc 3e 77 ad 2d b7 c2 03 a2 0b d9 52 fb b5 6b\ -15 67 04 6e cf aa 93 3d 7b 10 00 c3 de 9f f0 5b\ -7d 98 9b a4 6f d4 3b c4 c2 d0 a3 98 6b 7f fa 13\ -47 1d 37 eb 5b 47 d6 47 07 bd 29 0c fd 6a 9f 39\ -3a d0 8e c1 e3 bd 71 bb 57 92 61 50 35 cd af 2d\ -89 29 ae d3 be 09 83 79 37 7e 77 7c e7 9a aa 47\ -73 -Test: Verify -Comment: RSASSA-PSS Signature Example 6.3 -Message: \ -0f 61 95 d0 4a 6e 6f c7 e2 c9 60 0d bf 84 0c 39\ -ea 8d 4d 62 4f d5 35 07 01 6b 0e 26 85 8a 5e 0a\ -ec d7 ad a5 43 ae 5c 0a b3 a6 25 99 cb a0 a5 4e\ -6b f4 46 e2 62 f9 89 97 8f 9d df 5e 9a 41 -Salt: \ -a8 7b 8a ed 07 d7 b8 e2 da f1 4d dc a4 ac 68 c4\ -d0 aa bf f8 -Signature: \ -08 6d f6 b5 00 09 8c 12 0f 24 ff 84 23 f7 27 d9\ -c6 1a 5c 90 07 d3 b6 a3 1c e7 cf 8f 3c be c1 a2\ -6b b2 0e 2b d4 a0 46 79 32 99 e0 3e 37 a2 1b 40\ -19 4f b0 45 f9 0b 18 bf 20 a4 79 92 cc d7 99 cf\ -9c 05 9c 29 9c 05 26 85 49 54 aa de 8a 6a d9 d9\ -7e c9 1a 11 45 38 3f 42 46 8b 23 1f 4d 72 f2 37\ -06 d9 85 3c 3f a4 3c e8 ac e8 bf e7 48 49 87 a1\ -ec 6a 16 c8 da f8 1f 7c 8b f4 27 74 70 7a 9d f4\ -56 -Test: Verify -Comment: RSASSA-PSS Signature Example 6.4 -Message: \ -33 7d 25 fe 98 10 eb ca 0d e4 d4 65 8d 3c eb 8e\ -0f e4 c0 66 ab a3 bc c4 8b 10 5d 3b f7 e0 25 7d\ -44 fe ce a6 59 6f 4d 0c 59 a0 84 02 83 36 78 f7\ -06 20 f9 13 8d fe b7 de d9 05 e4 a6 d5 f0 5c 47\ -3d 55 93 66 52 e2 a5 df 43 c0 cf da 7b ac af 30\ -87 f4 52 4b 06 cf 42 15 7d 01 53 97 39 f7 fd de\ -c9 d5 81 25 df 31 a3 2e ab 06 c1 9b 71 f1 d5 bf -Salt: \ -a3 79 32 f8 a7 49 4a 94 2d 6f 76 74 38 e7 24 d6\ -d0 c0 ef 18 -Signature: \ -0b 5b 11 ad 54 98 63 ff a9 c5 1a 14 a1 10 6c 2a\ -72 cc 8b 64 6e 5c 72 62 50 97 86 10 5a 98 47 76\ -53 4c a9 b5 4c 1c c6 4b f2 d5 a4 4f d7 e8 a6 9d\ -b6 99 d5 ea 52 08 7a 47 48 fd 2a bc 1a fe d1 e5\ -d6 f7 c8 90 25 53 0b da a2 21 3d 7e 03 0f a5 5d\ -f6 f3 4b cf 1c e4 6d 2e df 4e 3a e4 f3 b0 18 91\ -a0 68 c9 e3 a4 4b bc 43 13 3e da d6 ec b9 f3 54\ -00 c4 25 2a 57 62 d6 57 44 b9 9c b9 f4 c5 59 32\ -9f -Test: Verify -Comment: RSASSA-PSS Signature Example 6.5 -Message: \ -84 ec 50 2b 07 2e 82 87 78 9d 8f 92 35 82 9e a3\ -b1 87 af d4 d4 c7 85 61 1b da 5f 9e b3 cb 96 71\ -7e fa 70 07 22 7f 1c 08 cb cb 97 2e 66 72 35 e0\ -fb 7d 43 1a 65 70 32 6d 2e cc e3 5a db 37 3d c7\ -53 b3 be 5f 82 9b 89 17 54 93 19 3f ab 16 ba db\ -41 37 1b 3a ac 0a e6 70 07 6f 24 be f4 20 c1 35\ -ad d7 ce e8 d3 5f bc 94 4d 79 fa fb 9e 30 7a 13\ -b0 f5 56 cb 65 4a 06 f9 73 ed 22 67 23 30 19 7e\ -f5 a7 48 bf 82 6a 5d b2 38 3a 25 36 4b 68 6b 93\ -72 bb 23 39 ae b1 ac 9e 98 89 32 7d 01 6f 16 70\ -77 6d b0 62 01 ad bd ca f8 a5 e3 b7 4e 10 8b 73 -Salt: \ -7b 79 0c 1d 62 f7 b8 4e 94 df 6a f2 89 17 cf 57\ -10 18 11 0e -Signature: \ -02 d7 1f a9 b5 3e 46 54 fe fb 7f 08 38 5c f6 b0\ -ae 3a 81 79 42 eb f6 6c 35 ac 67 f0 b0 69 95 2a\ -3c e9 c7 e1 f1 b0 2e 48 0a 95 00 83 6d e5 d6 4c\ -db 7e cd e0 45 42 f7 a7 99 88 78 7e 24 c2 ba 05\ -f5 fd 48 2c 02 3e d5 c3 0e 04 83 9d c4 4b ed 2a\ -3a 3a 4f ee 01 11 3c 89 1a 47 d3 2e b8 02 5c 28\ -cb 05 0b 5c db 57 6c 70 fe 76 ef 52 34 05 c0 84\ -17 fa f3 50 b0 37 a4 3c 37 93 39 fc b1 8d 3a 35\ -6b -Test: Verify -Comment: RSASSA-PSS Signature Example 6.6 -Message: \ -99 06 d8 9f 97 a9 fd ed d3 cc d8 24 db 68 73 26\ -f3 0f 00 aa 25 a7 fc a2 af cb 3b 0f 86 cd 41 e7\ -3f 0e 8f f7 d2 d8 3f 59 e2 8e d3 1a 5a 0d 55 15\ -23 37 4d e2 2e 4c 7e 8f f5 68 b3 86 ee 3d c4 11\ -63 f1 0b f6 7b b0 06 26 1c 90 82 f9 af 90 bf 1d\ -90 49 a6 b9 fa e7 1c 7f 84 fb e6 e5 5f 02 78 9d\ -e7 74 f2 30 f1 15 02 6a 4b 4e 96 c5 5b 04 a9 5d\ -a3 aa cb b2 ce ce 8f 81 76 4a 1f 1c 99 51 54 11\ -08 7c f7 d3 4a ed ed 09 32 c1 83 -Salt: \ -fb be 05 90 25 b6 9b 89 fb 14 ae 22 89 e7 aa af\ -e6 0c 0f cd -Signature: \ -0a 40 a1 6e 2f e2 b3 8d 1d f9 05 46 16 7c f9 46\ -9c 9e 3c 36 81 a3 44 2b 4b 2c 2f 58 1d eb 38 5c\ -e9 9f c6 18 8b b0 2a 84 1d 56 e7 6d 30 18 91 e2\ -45 60 55 0f cc 2a 26 b5 5f 4c cb 26 d8 37 d3 50\ -a1 54 bc ac a8 39 2d 98 fa 67 95 9e 97 27 b7 8c\ -ad 03 26 9f 56 96 8f c5 6b 68 bd 67 99 26 d8 3c\ -c9 cb 21 55 50 64 5c cd a3 1c 76 0f f3 58 88 94\ -3d 2d 8a 1d 35 1e 81 e5 d0 7b 86 18 2e 75 10 81\ -ef -Test: Verify -Comment: Example 7: A 1030-bit RSA Key Pair -Modulus: \ -37 c9 da 4a 66 c8 c4 08 b8 da 27 d0 c9 d7 9f 8c\ -cb 1e af c1 d2 fe 48 74 6d 94 0b 7c 4e f5 de e1\ -8a d1 26 47 ce fa a0 c4 b3 18 8b 22 1c 51 53 86\ -75 9b 93 f0 20 24 b2 5a b9 24 2f 83 57 d8 f3 fd\ -49 64 0e e5 e6 43 ea f6 c6 4d ee fa 70 89 72 7c\ -8f f0 39 93 33 39 15 c6 ef 21 bf 59 75 b6 e5 0d\ -11 8b 51 00 8e c3 3e 9f 01 a0 a5 45 a1 0a 83 6a\ -43 dd bc a9 d8 b5 c5 d3 54 80 22 d7 06 4e a2 9a\ -b3 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -3b ed 99 90 52 d9 57 bc 06 d6 51 ee f6 e3 a9 80\ -94 b1 62 1b d3 8b 54 49 bd 6c 4a ea 3d e7 e0 84\ -67 9a 44 84 de d2 5b e0 f0 82 6c f3 37 78 25 41\ -4b 14 d4 d6 1d b1 4d e6 26 fb b8 0e 5f 4f ae c9\ -56 f9 a0 a2 d2 4f 99 57 63 80 f0 84 eb 62 e4 6a\ -57 d5 54 27 8b 53 56 26 19 3c e0 20 60 57 5e b6\ -6c 57 98 d3 6f 6c 5d 40 fb 00 d8 09 b4 2a 73 10\ -2c 1c 74 ee 95 bd 71 42 0f ff ef 63 18 b5 2c 29 -Prime1: \ -07 ee fb 42 4b 0e 3a 40 e4 20 8e e5 af b2 80 b2\ -23 17 30 81 14 dd e0 b4 b6 4f 73 01 84 ec 68 da\ -6c e2 86 7a 9f 48 ed 77 26 d5 e2 61 4e d0 4a 54\ -10 73 6c 8c 71 4e e7 02 47 42 98 c6 29 2a f0 75\ -35 -Prime2: \ -07 08 30 db f9 47 ea c0 22 8d e2 63 14 b5 9b 66\ -99 4c c6 0e 83 60 e7 5d 38 76 29 8f 8f 8a 7d 14\ -1d a0 64 e5 ca 02 6a 97 3e 28 f2 54 73 8c ee 66\ -9c 72 1b 03 4c b5 f8 e2 44 da dd 7c d1 e1 59 d5\ -47 -ModPrime1PrivateExponent: \ -05 24 d2 0c 3d 95 cf f7 5a f2 31 34 83 22 7d 87\ -02 71 7a a5 76 de 15 5f 96 05 15 50 1a db 1d 70\ -e1 c0 4d e9 1b 75 b1 61 db f0 39 83 56 12 7e de\ -da 7b bc 19 a3 2d c1 62 1c c9 f5 3c 26 5d 0c e3\ -31 -ModPrime2PrivateExponent: \ -05 f9 84 a1 f2 3c 93 8d 6a 0e 89 72 4b cf 3d d9\ -3f 99 46 92 60 37 fe 7c 6b 13 a2 9e 52 84 85 5f\ -89 08 95 91 d4 40 97 56 27 bf 5c 9e 3a 8b 5c a7\ -9c 77 2a d2 73 e4 0d 32 1a f4 a6 c9 7d fd ed 78\ -d3 -MultiplicativeInverseOfPrime2ModPrime1: \ -dd d9 18 ad ad a2 9d ca b9 81 ff 9a cb a4 25 70\ -23 c0 9a 38 01 cc ce 09 8c e2 68 f8 55 d0 df 57\ -0c d6 e7 b9 b1 4b d9 a5 a9 25 4c bc 31 5b e6 f8\ -ba 1e 25 46 dd d5 69 c5 ea 19 ee d8 35 3b de 5e -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 7.1 -Message: \ -9e ad 0e 01 94 56 40 67 4e b4 1c ad 43 5e 23 74\ -ea ef a8 ad 71 97 d9 79 13 c4 49 57 d8 d8 3f 40\ -d7 6e e6 0e 39 bf 9c 0f 9e af 30 21 42 1a 07 4d\ -1a de 96 2c 6e 9d 3d c3 bb 17 4f e4 df e6 52 b0\ -91 15 49 5b 8f d2 79 41 74 02 0a 06 02 b5 ca 51\ -84 8c fc 96 ce 5e b5 7f c0 a2 ad c1 dd a3 6a 7c\ -c4 52 64 1a 14 91 1b 37 e4 5b fa 11 da a5 c7 ec\ -db 74 f6 d0 10 0d 1d 3e 39 e7 52 80 0e 20 33 97\ -de 02 33 07 7b 9a 88 85 55 37 fa e9 27 f9 24 38\ -0d 78 0f 98 e1 8d cf f3 9c 5e a7 41 b1 7d 6f dd\ -18 85 bc 9d 58 14 82 d7 71 ce b5 62 d7 8a 8b f8\ -8f 0c 75 b1 13 63 e5 e3 6c d4 79 ce b0 54 5f 9d\ -a8 42 03 e0 e6 e5 08 37 5c c9 e8 44 b8 8b 7a c7\ -a0 a2 01 ea 0f 1b ee 9a 2c 57 79 20 ca 02 c0 1b\ -9d 83 20 e9 74 a5 6f 4e fb 57 63 b9 62 55 ab bf\ -80 37 bf 18 02 cf 01 8f 56 37 94 93 e5 69 a9 -Salt: \ -b7 86 7a 59 95 8c b5 43 28 f8 77 5e 65 46 ec 06\ -d2 7e aa 50 -Signature: \ -18 7f 39 07 23 c8 90 25 91 f0 15 4b ae 6d 4e cb\ -ff e0 67 f0 e8 b7 95 47 6e a4 f4 d5 1c cc 81 05\ -20 bb 3c a9 bc a7 d0 b1 f2 ea 8a 17 d8 73 fa 27\ -57 0a cd 64 2e 38 08 56 1c b9 e9 75 cc fd 80 b2\ -3d c5 77 1c db 33 06 a5 f2 31 59 da cb d3 aa 2d\ -b9 3d 46 d7 66 e0 9e d1 5d 90 0a d8 97 a8 d2 74\ -dc 26 b4 7e 99 4a 27 e9 7e 22 68 a7 66 53 3a e4\ -b5 e4 2a 2f ca f7 55 c1 c4 79 4b 29 4c 60 55 58\ -23 -Test: Verify -Comment: RSASSA-PSS Signature Example 7.2 -Message: \ -8d 80 d2 d0 8d bd 19 c1 54 df 3f 14 67 3a 14 bd\ -03 73 52 31 f2 4e 86 bf 15 3d 0e 69 e7 4c bf f7\ -b1 83 6e 66 4d e8 3f 68 01 24 37 0f c0 f9 6c 9b\ -65 c0 7a 36 6b 64 4c 4a b3 -Salt: \ -0c 09 58 22 66 df 08 63 10 82 1b a7 e1 8d f6 4d\ -fe e6 de 09 -Signature: \ -10 fd 89 76 8a 60 a6 77 88 ab b5 85 6a 78 7c 85\ -61 f3 ed cf 9a 83 e8 98 f7 dc 87 ab 8c ce 79 42\ -9b 43 e5 69 06 94 1a 88 61 94 f1 37 e5 91 fe 7c\ -33 95 55 36 1f bb e1 f2 4f eb 2d 4b cd b8 06 01\ -f3 09 6b c9 13 2d ee a6 0a e1 30 82 f4 4f 9a d4\ -1c d6 28 93 6a 4d 51 17 6e 42 fc 59 cb 76 db 81\ -5c e5 ab 4d b9 9a 10 4a af ea 68 f5 d3 30 32 9e\ -bf 25 8d 4e de 16 06 4b d1 d0 03 93 d5 e1 57 0e\ -b8 -Test: Verify -Comment: RSASSA-PSS Signature Example 7.3 -Message: \ -80 84 05 cd fc 1a 58 b9 bb 03 97 c7 20 72 2a 81\ -ff fb 76 27 8f 33 59 17 ef 9c 47 38 14 b3 e0 16\ -ba 29 73 cd 27 65 f8 f3 f8 2d 6c c3 8a a7 f8 55\ -18 27 fe 8d 1e 38 84 b7 e6 1c 94 68 3b 8f 82 f1\ -84 3b da e2 25 7e ee c9 81 2a d4 c2 cf 28 3c 34\ -e0 b0 ae 0f e3 cb 99 0c f8 8f 2e f9 -Salt: \ -28 03 9d cf e1 06 d3 b8 29 66 11 25 8c 4a 56 65\ -1c 9e 92 dd -Signature: \ -2b 31 fd e9 98 59 b9 77 aa 09 58 6d 8e 27 46 62\ -b2 5a 2a 64 06 40 b4 57 f5 94 05 1c b1 e7 f7 a9\ -11 86 54 55 24 29 26 cf 88 fe 80 df a3 a7 5b a9\ -68 98 44 a1 1e 63 4a 82 b0 75 af bd 69 c1 2a 0d\ -f9 d2 5f 84 ad 49 45 df 3d c8 fe 90 c3 ce fd f2\ -6e 95 f0 53 43 04 b5 bd ba 20 d3 e5 64 0a 2e bf\ -b8 98 aa c3 5a e4 0f 26 fc e5 56 3c 2f 9f 24 f3\ -04 2a f7 6f 3c 70 72 d6 87 bb fb 95 9a 88 46 0a\ -f1 -Test: Verify -Comment: RSASSA-PSS Signature Example 7.4 -Message: \ -f3 37 b9 ba d9 37 de 22 a1 a0 52 df f1 11 34 a8\ -ce 26 97 62 02 98 19 39 b9 1e 07 15 ae 5e 60 96\ -49 da 1a df ce f3 f4 cc a5 9b 23 83 60 e7 d1 e4\ -96 c7 bf 4b 20 4b 5a cf f9 bb d6 16 6a 1d 87 a3\ -6e f2 24 73 73 75 10 39 f8 a8 00 b8 39 98 07 b3\ -a8 5f 44 89 34 97 c0 d0 5f b7 01 7b 82 22 81 52\ -de 6f 25 e6 11 6d cc 75 03 c7 86 c8 75 c2 8f 3a\ -a6 07 e9 4a b0 f1 98 63 ab 1b 50 73 77 0b 0c d5\ -f5 33 ac de 30 c6 fb 95 3c f3 da 68 02 64 e3 0f\ -c1 1b ff 9a 19 bf fa b4 77 9b 62 23 c3 fb 3f e0\ -f7 1a ba de 4e b7 c0 9c 41 e2 4c 22 d2 3f a1 48\ -e6 a1 73 fe b6 39 84 d1 bc 6e e3 a0 2d 91 5b 75\ -2c ea f9 2a 30 15 ec eb 38 ca 58 6c 68 01 b3 7c\ -34 ce fb 2c ff 25 ea 23 c0 86 62 dc ab 26 a7 a9\ -3a 28 5d 05 d3 04 4c -Salt: \ -a7 78 21 eb bb ef 24 62 8e 4e 12 e1 d0 ea 96 de\ -39 8f 7b 0f -Signature: \ -32 c7 ca 38 ff 26 94 9a 15 00 0c 4b a0 4b 2b 13\ -b3 5a 38 10 e5 68 18 4d 7e ca ba a1 66 b7 ff ab\ -dd f2 b6 cf 4b a0 71 24 92 37 90 f2 e5 b1 a5 be\ -04 0a ea 36 fe 13 2e c1 30 e1 f1 05 67 98 2d 17\ -ac 3e 89 b8 d2 6c 30 94 03 4e 76 2d 2e 03 12 64\ -f0 11 70 be ec b3 d1 43 9e 05 84 6f 25 45 83 67\ -a7 d9 c0 20 60 44 46 72 67 1e 64 e8 77 86 45 59\ -ca 19 b2 07 4d 58 8a 28 1b 58 04 d2 37 72 fb be\ -19 -Test: Verify -Comment: RSASSA-PSS Signature Example 7.5 -Message: \ -45 01 3c eb af d9 60 b2 55 47 6a 8e 25 98 b9 aa\ -32 ef be 6d c1 f3 4f 4a 49 8d 8c f5 a2 b4 54 8d\ -08 c5 5d 5f 95 f7 bc c9 61 91 63 05 6f 2d 58 b5\ -2f a0 32 -Salt: \ -9d 5a d8 eb 45 21 34 b6 5d c3 a9 8b 6a 73 b5 f7\ -41 60 9c d6 -Signature: \ -07 eb 65 1d 75 f1 b5 2b c2 63 b2 e1 98 33 6e 99\ -fb eb c4 f3 32 04 9a 92 2a 10 81 56 07 ee 2d 98\ -9d b3 a4 49 5b 7d cc d3 8f 58 a2 11 fb 7e 19 31\ -71 a3 d8 91 13 24 37 eb ca 44 f3 18 b2 80 50 9e\ -52 b5 fa 98 fc ce 82 05 d9 69 7c 8e e4 b7 ff 59\ -d4 c5 9c 79 03 8a 19 70 bd 2a 0d 45 1e cd c5 ef\ -11 d9 97 9c 9d 35 f8 c7 0a 61 63 71 76 07 89 0d\ -58 6a 7c 6d c0 1c 79 f8 6a 8f 28 e8 52 35 f8 c2\ -f1 -Test: Verify -Comment: RSASSA-PSS Signature Example 7.6 -Message: \ -23 58 09 70 86 c8 99 32 3e 75 d9 c9 0d 0c 09 f1\ -2d 9d 54 ed fb df 70 a9 c2 eb 5a 04 d8 f3 6b 9b\ -2b df 2a ab e0 a5 bd a1 96 89 37 f9 d6 eb d3 b6\ -b2 57 ef b3 13 6d 41 31 f9 ac b5 9b 85 e2 60 2c\ -2a 3f cd c8 35 49 4a 1f 4e 5e c1 8b 22 6c 80 23\ -2b 36 a7 5a 45 fd f0 9a 7e a9 e9 8e fb de 14 50\ -d1 19 4b f1 2e 15 a4 c5 f9 eb 5c 0b ce 52 69 e0\ -c3 b2 8c fa b6 55 d8 1a 61 a2 0b 4b e2 f5 44 59\ -bb 25 a0 db 94 c5 22 18 be 10 9a 74 26 de 83 01\ -44 24 78 9a aa 90 e5 05 6e 63 2a 69 81 15 e2 82\ -c1 a5 64 10 f2 6c 20 72 f1 93 48 1a 9d cd 88 05\ -72 00 5e 64 f4 08 2e cf -Salt: \ -3f 2e fc 59 58 80 a7 d4 7f cf 3c ba 04 98 3e a5\ -4c 4b 73 fb -Signature: \ -18 da 3c dc fe 79 bf b7 7f d9 c3 2f 37 7a d3 99\ -14 6f 0a 8e 81 06 20 23 32 71 a6 e3 ed 32 48 90\ -3f 5c dc 92 dc 79 b5 5d 3e 11 61 5a a0 56 a7 95\ -85 37 92 a3 99 8c 34 9c a5 c4 57 e8 ca 7d 29 d7\ -96 aa 24 f8 34 91 70 9b ef cf b1 51 0e a5 13 c9\ -28 29 a3 f0 0b 10 4f 65 56 34 f3 20 75 2e 13 0e\ -c0 cc f6 75 4f f8 93 db 30 29 32 bb 02 5e b6 0e\ -87 82 25 98 fc 61 9e 0e 98 17 37 a9 a4 c4 15 2d\ -33 -Test: Verify -Comment: Example 8: A 1031-bit RSA Key Pair -Modulus: \ -49 53 70 a1 fb 18 54 3c 16 d3 63 1e 31 63 25 5d\ -f6 2b e6 ee e8 90 d5 f2 55 09 e4 f7 78 a8 ea 6f\ -bb bc df 85 df f6 4e 0d 97 20 03 ab 36 81 fb ba\ -6d d4 1f d5 41 82 9b 2e 58 2d e9 f2 a4 a4 e0 a2\ -d0 90 0b ef 47 53 db 3c ee 0e e0 6c 7d fa e8 b1\ -d5 3b 59 53 21 8f 9c ce ea 69 5b 08 66 8e de aa\ -dc ed 94 63 b1 d7 90 d5 eb f2 7e 91 15 b4 6c ad\ -4d 9a 2b 8e fa b0 56 1b 08 10 34 47 39 ad a0 73\ -3f -PublicExponent: \ -01 00 01 -PrivateExponent: \ -6c 66 ff e9 89 80 c3 8f cd ea b5 15 98 98 83 61\ -65 f4 b4 b8 17 c4 f6 a8 d4 86 ee 4e a9 13 0f e9\ -b9 09 2b d1 36 d1 84 f9 5f 50 4a 60 7e ac 56 58\ -46 d2 fd d6 59 7a 89 67 c7 39 6e f9 5a 6e ee bb\ -45 78 a6 43 96 6d ca 4d 8e e3 de 84 2d e6 32 79\ -c6 18 15 9c 1a b5 4a 89 43 7b 6a 61 20 e4 93 0a\ -fb 52 a4 ba 6c ed 8a 49 47 ac 64 b3 0a 34 97 cb\ -e7 01 c2 d6 26 6d 51 72 19 ad 0e c6 d3 47 db e9 -Prime1: \ -08 da d7 f1 13 63 fa a6 23 d5 d6 d5 e8 a3 19 32\ -8d 82 19 0d 71 27 d2 84 6c 43 9b 0a b7 26 19 b0\ -a4 3a 95 32 0e 4e c3 4f c3 a9 ce a8 76 42 23 05\ -bd 76 c5 ba 7b e9 e2 f4 10 c8 06 06 45 a1 d2 9e\ -db -Prime2: \ -08 47 e7 32 37 6f c7 90 0f 89 8e a8 2e b2 b0 fc\ -41 85 65 fd ae 62 f7 d9 ec 4c e2 21 7b 97 99 0d\ -d2 72 db 15 7f 99 f6 3c 0d cb b9 fb ac db d4 c4\ -da db 6d f6 77 56 35 8c a4 17 48 25 b4 8f 49 70\ -6d -ModPrime1PrivateExponent: \ -05 c2 a8 3c 12 4b 36 21 a2 aa 57 ea 2c 3e fe 03\ -5e ff 45 60 f3 3d de bb 7a da b8 1f ce 69 a0 c8\ -c2 ed c1 65 20 dd a8 3d 59 a2 3b e8 67 96 3a c6\ -5f 2c c7 10 bb cf b9 6e e1 03 de b7 71 d1 05 fd\ -85 -ModPrime2PrivateExponent: \ -04 ca e8 aa 0d 9f aa 16 5c 87 b6 82 ec 14 0b 8e\ -d3 b5 0b 24 59 4b 7a 3b 2c 22 0b 36 69 bb 81 9f\ -98 4f 55 31 0a 1a e7 82 36 51 d4 a0 2e 99 44 79\ -72 59 51 39 36 34 34 e5 e3 0a 7e 7d 24 15 51 e1\ -b9 -MultiplicativeInverseOfPrime2ModPrime1: \ -07 d3 e4 7b f6 86 60 0b 11 ac 28 3c e8 8d bb 3f\ -60 51 e8 ef d0 46 80 e4 4c 17 1e f5 31 b8 0b 2b\ -7c 39 fc 76 63 20 e2 cf 15 d8 d9 98 20 e9 6f f3\ -0d c6 96 91 83 9c 4b 40 d7 b0 6e 45 30 7d c9 1f\ -3f -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 8.1 -Message: \ -81 33 2f 4b e6 29 48 41 5e a1 d8 99 79 2e ea cf\ -6c 6e 1d b1 da 8b e1 3b 5c ea 41 db 2f ed 46 70\ -92 e1 ff 39 89 14 c7 14 25 97 75 f5 95 f8 54 7f\ -73 56 92 a5 75 e6 92 3a f7 8f 22 c6 99 7d db 90\ -fb 6f 72 d7 bb 0d d5 74 4a 31 de cd 3d c3 68 58\ -49 83 6e d3 4a ec 59 63 04 ad 11 84 3c 4f 88 48\ -9f 20 97 35 f5 fb 7f da f7 ce c8 ad dc 58 18 16\ -8f 88 0a cb f4 90 d5 10 05 b7 a8 e8 4e 43 e5 42\ -87 97 75 71 dd 99 ee a4 b1 61 eb 2d f1 f5 10 8f\ -12 a4 14 2a 83 32 2e db 05 a7 54 87 a3 43 5c 9a\ -78 ce 53 ed 93 bc 55 08 57 d7 a9 fb -Salt: \ -1d 65 49 1d 79 c8 64 b3 73 00 9b e6 f6 f2 46 7b\ -ac 4c 78 fa -Signature: \ -02 62 ac 25 4b fa 77 f3 c1 ac a2 2c 51 79 f8 f0\ -40 42 2b 3c 5b af d4 0a 8f 21 cf 0f a5 a6 67 cc\ -d5 99 3d 42 db af b4 09 c5 20 e2 5f ce 2b 1e e1\ -e7 16 57 7f 1e fa 17 f3 da 28 05 2f 40 f0 41 9b\ -23 10 6d 78 45 aa f0 11 25 b6 98 e7 a4 df e9 2d\ -39 67 bb 00 c4 d0 d3 5b a3 55 2a b9 a8 b3 ee f0\ -7c 7f ec db c5 42 4a c4 db 1e 20 cb 37 d0 b2 74\ -47 69 94 0e a9 07 e1 7f bb ca 67 3b 20 52 23 80\ -c5 -Test: Verify -Comment: RSASSA-PSS Signature Example 8.2 -Message: \ -e2 f9 6e af 0e 05 e7 ba 32 6e cc a0 ba 7f d2 f7\ -c0 23 56 f3 ce de 9d 0f aa bf 4f cc 8e 60 a9 73\ -e5 59 5f d9 ea 08 -Salt: \ -43 5c 09 8a a9 90 9e b2 37 7f 12 48 b0 91 b6 89\ -87 ff 18 38 -Signature: \ -27 07 b9 ad 51 15 c5 8c 94 e9 32 e8 ec 0a 28 0f\ -56 33 9e 44 a1 b5 8d 4d dc ff 2f 31 2e 5f 34 dc\ -fe 39 e8 9c 6a 94 dc ee 86 db bd ae 5b 79 ba 4e\ -08 19 a9 e7 bf d9 d9 82 e7 ee 6c 86 ee 68 39 6e\ -8b 3a 14 c9 c8 f3 4b 17 8e b7 41 f9 d3 f1 21 10\ -9b f5 c8 17 2f ad a2 e7 68 f9 ea 14 33 03 2c 00\ -4a 8a a0 7e b9 90 00 0a 48 dc 94 c8 ba c8 aa be\ -2b 09 b1 aa 46 c0 a2 aa 0e 12 f6 3f bb a7 75 ba\ -7e -Test: Verify -Comment: RSASSA-PSS Signature Example 8.3 -Message: \ -e3 5c 6e d9 8f 64 a6 d5 a6 48 fc ab 8a db 16 33\ -1d b3 2e 5d 15 c7 4a 40 ed f9 4c 3d c4 a4 de 79\ -2d 19 08 89 f2 0f 1e 24 ed 12 05 4a 6b 28 79 8f\ -cb 42 d1 c5 48 76 9b 73 4c 96 37 31 42 09 2a ed\ -27 76 03 f4 73 8d f4 dc 14 46 58 6d 0e c6 4d a4\ -fb 60 53 6d b2 ae 17 fc 7e 3c 04 bb fb bb d9 07\ -bf 11 7c 08 63 6f a1 6f 95 f5 1a 62 16 93 4d 3e\ -34 f8 50 30 f1 7b bb c5 ba 69 14 40 58 af f0 81\ -e0 b1 9c f0 3c 17 19 5c 5e 88 8b a5 8f 6f e0 a0\ -2e 5c 3b da 97 19 a7 -Salt: \ -c6 eb be 76 df 0c 4a ea 32 c4 74 17 5b 2f 13 68\ -62 d0 45 29 -Signature: \ -2a d2 05 09 d7 8c f2 6d 1b 6c 40 61 46 08 6e 4b\ -0c 91 a9 1c 2b d1 64 c8 7b 96 6b 8f aa 42 aa 0c\ -a4 46 02 23 23 ba 4b 1a 1b 89 70 6d 7f 4c 3b e5\ -7d 7b 69 70 2d 16 8a b5 95 5e e2 90 35 6b 8c 4a\ -29 ed 46 7d 54 7e c2 3c ba df 28 6c cb 58 63 c6\ -67 9d a4 67 fc 93 24 a1 51 c7 ec 55 aa c6 db 40\ -84 f8 27 26 82 5c fe 1a a4 21 bc 64 04 9f b4 2f\ -23 14 8f 9c 25 b2 dc 30 04 37 c3 8d 42 8a a7 5f\ -96 -Test: Verify -Comment: RSASSA-PSS Signature Example 8.4 -Message: \ -db c5 f7 50 a7 a1 4b e2 b9 3e 83 8d 18 d1 4a 86\ -95 e5 2e 8a dd 9c 0a c7 33 b8 f5 6d 27 47 e5 29\ -a0 cc a5 32 dd 49 b9 02 ae fe d5 14 44 7f 9e 81\ -d1 61 95 c2 85 38 68 cb 9b 30 f7 d0 d4 95 c6 9d\ -01 b5 c5 d5 0b 27 04 5d b3 86 6c 23 24 a4 4a 11\ -0b 17 17 74 6d e4 57 d1 c8 c4 5c 3c d2 a9 29 70\ -c3 d5 96 32 05 5d 4c 98 a4 1d 6e 99 e2 a3 dd d5\ -f7 f9 97 9a b3 cd 18 f3 75 05 d2 51 41 de 2a 1b\ -ff 17 b3 a7 dc e9 41 9e cc 38 5c f1 1d 72 84 0f\ -19 95 3f d0 50 92 51 f6 ca fd e2 89 3d 0e 75 c7\ -81 ba 7a 50 12 ca 40 1a 4f a9 9e 04 b3 c3 24 9f\ -92 6d 5a fe 82 cc 87 da b2 2c 3c 1b 10 5d e4 8e\ -34 ac e9 c9 12 4e 59 59 7a c7 eb f8 -Salt: \ -02 1f dc c6 eb b5 e1 9b 1c b1 6e 9c 67 f2 76 81\ -65 7f e2 0a -Signature: \ -1e 24 e6 e5 86 28 e5 17 50 44 a9 eb 6d 83 7d 48\ -af 12 60 b0 52 0e 87 32 7d e7 89 7e e4 d5 b9 f0\ -df 0b e3 e0 9e d4 de a8 c1 45 4f f3 42 3b b0 8e\ -17 93 24 5a 9d f8 bf 6a b3 96 8c 8e dd c3 b5 32\ -85 71 c7 7f 09 1c c5 78 57 69 12 df eb d1 64 b9\ -de 54 54 fe 0b e1 c1 f6 38 5b 32 83 60 ce 67 ec\ -7a 05 f6 e3 0e b4 5c 17 c4 8a c7 00 41 d2 ca b6\ -7f 0a 2a e7 aa fd cc 8d 24 5e a3 44 2a 63 00 cc\ -c7 -Test: Verify -Comment: RSASSA-PSS Signature Example 8.5 -Message: \ -04 dc 25 1b e7 2e 88 e5 72 34 85 b6 38 3a 63 7e\ -2f ef e0 76 60 c5 19 a5 60 b8 bc 18 bd ed b8 6e\ -ae 23 64 ea 53 ba 9d ca 6e b3 d2 e7 d6 b8 06 af\ -42 b3 e8 7f 29 1b 4a 88 81 d5 bf 57 2c c9 a8 5e\ -19 c8 6a cb 28 f0 98 f9 da 03 83 c5 66 d3 c0 f5\ -8c fd 8f 39 5d cf 60 2e 5c d4 0e 8c 71 83 f7 14\ -99 6e 22 97 ef -Salt: \ -c5 58 d7 16 7c bb 45 08 ad a0 42 97 1e 71 b1 37\ -7e ea 42 69 -Signature: \ -33 34 1b a3 57 6a 13 0a 50 e2 a5 cf 86 79 22 43\ -88 d5 69 3f 5a cc c2 35 ac 95 ad d6 8e 5e b1 ee\ -c3 16 66 d0 ca 7a 1c da 6f 70 a1 aa 76 2c 05 75\ -2a 51 95 0c db 8a f3 c5 37 9f 18 cf e6 b5 bc 55\ -a4 64 82 26 a1 5e 91 2e f1 9a d7 7a de ea 91 1d\ -67 cf ef d6 9b a4 3f a4 11 91 35 ff 64 21 17 ba\ -98 5a 7e 01 00 32 5e 95 19 f1 ca 6a 92 16 bd a0\ -55 b5 78 50 15 29 11 25 e9 0d cd 07 a2 ca 96 73\ -ee -Test: Verify -Comment: RSASSA-PSS Signature Example 8.6 -Message: \ -0e a3 7d f9 a6 fe a4 a8 b6 10 37 3c 24 cf 39 0c\ -20 fa 6e 21 35 c4 00 c8 a3 4f 5c 18 3a 7e 8e a4\ -c9 ae 09 0e d3 17 59 f4 2d c7 77 19 cc a4 00 ec\ -dc c5 17 ac fc 7a c6 90 26 75 b2 ef 30 c5 09 66\ -5f 33 21 48 2f c6 9a 9f b5 70 d1 5e 01 c8 45 d0\ -d8 e5 0d 2a 24 cb f1 cf 0e 71 49 75 a5 db 7b 18\ -d9 e9 e9 cb 91 b5 cb 16 86 90 60 ed 18 b7 b5 62\ -45 50 3f 0c af 90 35 2b 8d e8 1c b5 a1 d9 c6 33\ -60 92 f0 cd -Salt: \ -76 fd 4e 64 fd c9 8e b9 27 a0 40 3e 35 a0 84 e7\ -6b a9 f9 2a -Signature: \ -1e d1 d8 48 fb 1e db 44 12 9b d9 b3 54 79 5a f9\ -7a 06 9a 7a 00 d0 15 10 48 59 3e 0c 72 c3 51 7f\ -f9 ff 2a 41 d0 cb 5a 0a c8 60 d7 36 a1 99 70 4f\ -7c b6 a5 39 86 a8 8b bd 8a bc c0 07 6a 2c e8 47\ -88 00 31 52 5d 44 9d a2 ac 78 35 63 74 c5 36 e3\ -43 fa a7 cb a4 2a 5a aa 65 06 08 77 91 c0 6a 8e\ -98 93 35 ae d1 9b fa b2 d5 e6 7e 27 fb 0c 28 75\ -af 89 6c 21 b6 e8 e7 30 9d 04 e4 f6 72 7e 69 46\ -3e -Test: Verify -Comment: Example 9: A 1536-bit RSA Key Pair -Modulus: \ -e6 bd 69 2a c9 66 45 79 04 03 fd d0 f5 be b8 b9\ -bf 92 ed 10 00 7f c3 65 04 64 19 dd 06 c0 5c 5b\ -5b 2f 48 ec f9 89 e4 ce 26 91 09 97 9c bb 40 b4\ -a0 ad 24 d2 24 83 d1 ee 31 5a d4 cc b1 53 42 68\ -35 26 91 c5 24 f6 dd 8e 6c 29 d2 24 cf 24 69 73\ -ae c8 6c 5b f6 b1 40 1a 85 0d 1b 9a d1 bb 8c bc\ -ec 47 b0 6f 0f 8c 7f 45 d3 fc 8f 31 92 99 c5 43\ -3d db c2 b3 05 3b 47 de d2 ec d4 a4 ca ef d6 14\ -83 3d c8 bb 62 2f 31 7e d0 76 b8 05 7f e8 de 3f\ -84 48 0a d5 e8 3e 4a 61 90 4a 4f 24 8f b3 97 02\ -73 57 e1 d3 0e 46 31 39 81 5c 6f d4 fd 5a c5 b8\ -17 2a 45 23 0e cb 63 18 a0 4f 14 55 d8 4e 5a 8b -PublicExponent: \ -01 00 01 -PrivateExponent: \ -6a 7f d8 4f b8 5f ad 07 3b 34 40 6d b7 4f 8d 61\ -a6 ab c1 21 96 a9 61 dd 79 56 5e 9d a6 e5 18 7b\ -ce 2d 98 02 50 f7 35 95 75 35 92 70 d9 15 90 bb\ -0e 42 7c 71 46 0b 55 d5 14 10 b1 91 bc f3 09 fe\ -a1 31 a9 2c 8e 70 27 38 fa 71 9f 1e 00 41 f5 2e\ -40 e9 1f 22 9f 4d 96 a1 e6 f1 72 e1 55 96 b4 51\ -0a 6d ae c2 61 05 f2 be bc 53 31 6b 87 bd f2 13\ -11 66 60 70 e8 df ee 69 d5 2c 71 a9 76 ca ae 79\ -c7 2b 68 d2 85 80 dc 68 6d 9f 51 29 d2 25 f8 2b\ -3d 61 55 13 a8 82 b3 db 91 41 6b 48 ce 08 88 82\ -13 e3 7e eb 9a f8 00 d8 1c ab 32 8c e4 20 68 99\ -03 c0 0c 7b 5f d3 1b 75 50 3a 6d 41 96 84 d6 29 -Prime1: \ -f8 eb 97 e9 8d f1 26 64 ee fd b7 61 59 6a 69 dd\ -cd 0e 76 da ec e6 ed 4b f5 a1 b5 0a c0 86 f7 92\ -8a 4d 2f 87 26 a7 7e 51 5b 74 da 41 98 8f 22 0b\ -1c c8 7a a1 fc 81 0c e9 9a 82 f2 d1 ce 82 1e dc\ -ed 79 4c 69 41 f4 2c 7a 1a 0b 8c 4d 28 c7 5e c6\ -0b 65 22 79 f6 15 4a 76 2a ed 16 5d 47 de e3 67 -Prime2: \ -ed 4d 71 d0 a6 e2 4b 93 c2 e5 f6 b4 bb e0 5f 5f\ -b0 af a0 42 d2 04 fe 33 78 d3 65 c2 f2 88 b6 a8\ -da d7 ef e4 5d 15 3e ef 40 ca cc 7b 81 ff 93 40\ -02 d1 08 99 4b 94 a5 e4 72 8c d9 c9 63 37 5a e4\ -99 65 bd a5 5c bf 0e fe d8 d6 55 3b 40 27 f2 d8\ -62 08 a6 e6 b4 89 c1 76 12 80 92 d6 29 e4 9d 3d -ModPrime1PrivateExponent: \ -2b b6 8b dd fb 0c 4f 56 c8 55 8b ff af 89 2d 80\ -43 03 78 41 e7 fa 81 cf a6 1a 38 c5 e3 9b 90 1c\ -8e e7 11 22 a5 da 22 27 bd 6c de eb 48 14 52 c1\ -2a d3 d6 1d 5e 4f 77 6a 0a b5 56 59 1b ef e3 e5\ -9e 5a 7f dd b8 34 5e 1f 2f 35 b9 f4 ce e5 7c 32\ -41 4c 08 6a ec 99 3e 93 53 e4 80 d9 ee c6 28 9f -ModPrime2PrivateExponent: \ -4f f8 97 70 9f ad 07 97 46 49 45 78 e7 0f d8 54\ -61 30 ee ab 56 27 c4 9b 08 0f 05 ee 4a d9 f3 e4\ -b7 cb a9 d6 a5 df f1 13 a4 1c 34 09 33 68 33 f1\ -90 81 6d 8a 6b c4 2e 9b ec 56 b7 56 7d 0f 3c 9c\ -69 6d b6 19 b2 45 d9 01 dd 85 6d b7 c8 09 2e 77\ -e9 a1 cc cd 56 ee 4d ba 42 c5 fd b6 1a ec 26 69 -MultiplicativeInverseOfPrime2ModPrime1: \ -77 b9 d1 13 7b 50 40 4a 98 27 29 31 6e fa fc 7d\ -fe 66 d3 4e 5a 18 26 00 d5 f3 0a 0a 85 12 05 1c\ -56 0d 08 1d 4d 0a 18 35 ec 3d 25 a6 0f 4e 4d 6a\ -a9 48 b2 bf 3d bb 5b 12 4c bb c3 48 92 55 a3 a9\ -48 37 2f 69 78 49 67 45 f9 43 e1 db 4f 18 38 2c\ -ea a5 05 df c6 57 57 bb 3f 85 7a 58 dc e5 21 56 -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 9.1 -Message: \ -a8 8e 26 58 55 e9 d7 ca 36 c6 87 95 f0 b3 1b 59\ -1c d6 58 7c 71 d0 60 a0 b3 f7 f3 ea ef 43 79 59\ -22 02 8b c2 b6 ad 46 7c fc 2d 7f 65 9c 53 85 aa\ -70 ba 36 72 cd de 4c fe 49 70 cc 79 04 60 1b 27\ -88 72 bf 51 32 1c 4a 97 2f 3c 95 57 0f 34 45 d4\ -f5 79 80 e0 f2 0d f5 48 46 e6 a5 2c 66 8f 12 88\ -c0 3f 95 00 6e a3 2f 56 2d 40 d5 2a f9 fe b3 2f\ -0f a0 6d b6 5b 58 8a 23 7b 34 e5 92 d5 5c f9 79\ -f9 03 a6 42 ef 64 d2 ed 54 2a a8 c7 7d c1 dd 76\ -2f 45 a5 93 03 ed 75 e5 41 ca 27 1e 2b 60 ca 70\ -9e 44 fa 06 61 13 1e 8d 5d 41 63 fd 8d 39 85 66\ -ce 26 de 87 30 e7 2f 9c ca 73 76 41 c2 44 15 94\ -20 63 70 28 df 0a 18 07 9d 62 08 ea 8b 47 11 a2\ -c7 50 f5 -Salt: \ -c0 a4 25 31 3d f8 d7 56 4b d2 43 4d 31 15 23 d5\ -25 7e ed 80 -Signature: \ -58 61 07 22 6c 3c e0 13 a7 c8 f0 4d 1a 6a 29 59\ -bb 4b 8e 20 5b a4 3a 27 b5 0f 12 41 11 bc 35 ef\ -58 9b 03 9f 59 32 18 7c b6 96 d7 d9 a3 2c 0c 38\ -30 0a 5c dd a4 83 4b 62 d2 eb 24 0a f3 3f 79 d1\ -3d fb f0 95 bf 59 9e 0d 96 86 94 8c 19 64 74 7b\ -67 e8 9c 9a ba 5c d8 50 16 23 6f 56 6c c5 80 2c\ -b1 3e ad 51 bc 7c a6 be f3 b9 4d cb db b1 d5 70\ -46 97 71 df 0e 00 b1 a8 a0 67 77 47 2d 23 16 27\ -9e da e8 64 74 66 8d 4e 1e ff f9 5f 1d e6 1c 60\ -20 da 32 ae 92 bb f1 65 20 fe f3 cf 4d 88 f6 11\ -21 f2 4b bd 9f e9 1b 59 ca f1 23 5b 2a 93 ff 81\ -fc 40 3a dd f4 eb de a8 49 34 a9 cd af 8e 1a 9e -Test: Verify -Comment: RSASSA-PSS Signature Example 9.2 -Message: \ -c8 c9 c6 af 04 ac da 41 4d 22 7e f2 3e 08 20 c3\ -73 2c 50 0d c8 72 75 e9 5b 0d 09 54 13 99 3c 26\ -58 bc 1d 98 85 81 ba 87 9c 2d 20 1f 14 cb 88 ce\ -d1 53 a0 19 69 a7 bf 0a 7b e7 9c 84 c1 48 6b c1\ -2b 3f a6 c5 98 71 b6 82 7c 8c e2 53 ca 5f ef a8\ -a8 c6 90 bf 32 6e 8e 37 cd b9 6d 90 a8 2e ba b6\ -9f 86 35 0e 18 22 e8 bd 53 6a 2e -Salt: \ -b3 07 c4 3b 48 50 a8 da c2 f1 5f 32 e3 78 39 ef\ -8c 5c 0e 91 -Signature: \ -80 b6 d6 43 25 52 09 f0 a4 56 76 38 97 ac 9e d2\ -59 d4 59 b4 9c 28 87 e5 88 2e cb 44 34 cf d6 6d\ -d7 e1 69 93 75 38 1e 51 cd 7f 55 4f 2c 27 17 04\ -b3 99 d4 2b 4b e2 54 0a 0e ca 61 95 1f 55 26 7f\ -7c 28 78 c1 22 84 2d ad b2 8b 01 bd 5f 8c 02 5f\ -7e 22 84 18 a6 73 c0 3d 6b c0 c7 36 d0 a2 95 46\ -bd 67 f7 86 d9 d6 92 cc ea 77 8d 71 d9 8c 20 63\ -b7 a7 10 92 18 7a 4d 35 af 10 81 11 d8 3e 83 ea\ -e4 6c 46 aa 34 27 7e 06 04 45 89 90 37 88 f1 d5\ -e7 ce e2 5f b4 85 e9 29 49 11 88 14 d6 f2 c3 ee\ -36 14 89 01 6f 32 7f b5 bc 51 7e b5 04 70 bf fa\ -1a fa 5f 4c e9 aa 0c e5 b8 ee 19 bf 55 01 b9 58 -Test: Verify -Comment: RSASSA-PSS Signature Example 9.3 -Message: \ -0a fa d4 2c cd 4f c6 06 54 a5 50 02 d2 28 f5 2a\ -4a 5f e0 3b 8b bb 08 ca 82 da ca 55 8b 44 db e1\ -26 6e 50 c0 e7 45 a3 6d 9d 29 04 e3 40 8a bc d1\ -fd 56 99 94 06 3f 4a 75 cc 72 f2 fe e2 a0 cd 89\ -3a 43 af 1c 5b 8b 48 7d f0 a7 16 10 02 4e 4f 6d\ -df 9f 28 ad 08 13 c1 aa b9 1b cb 3c 90 64 d5 ff\ -74 2d ef fe a6 57 09 41 39 36 9e 5e a6 f4 a9 63\ -19 a5 cc 82 24 14 5b 54 50 62 75 8f ef d1 fe 34\ -09 ae 16 92 59 c6 cd fd 6b 5f 29 58 e3 14 fa ec\ -be 69 d2 ca ce 58 ee 55 17 9a b9 b3 e6 d1 ec c1\ -4a 55 7c 5f eb e9 88 59 52 64 fc 5d a1 c5 71 46\ -2e ca 79 8a 18 a1 a4 94 0c da b4 a3 e9 20 09 cc\ -d4 2e 1e 94 7b 13 14 e3 22 38 a2 de ce 7d 23 a8\ -9b 5b 30 c7 51 fd 0a 4a 43 0d 2c 54 85 94 -Salt: \ -9a 2b 00 7e 80 97 8b bb 19 2c 35 4e b7 da 9a ed\ -fc 74 db f5 -Signature: \ -48 44 08 f3 89 8c d5 f5 34 83 f8 08 19 ef bf 27\ -08 c3 4d 27 a8 b2 a6 fa e8 b3 22 f9 24 02 37 f9\ -81 81 7a ca 18 46 f1 08 4d aa 6d 7c 07 95 f6 e5\ -bf 1a f5 9c 38 e1 85 84 37 ce 1f 7e c4 19 b9 8c\ -87 36 ad f6 dd 9a 00 b1 80 6d 2b d3 ad 0a 73 77\ -5e 05 f5 2d fe f3 a5 9a b4 b0 81 43 f0 df 05 cd\ -1a d9 d0 4b ec ec a6 da a4 a2 12 98 03 e2 00 cb\ -c7 77 87 ca f4 c1 d0 66 3a 6c 59 87 b6 05 95 20\ -19 78 2c af 2e c1 42 6d 68 fb 94 ed 1d 4b e8 16\ -a7 ed 08 1b 77 e6 ab 33 0b 3f fc 07 38 20 fe cd\ -e3 72 7f cb e2 95 ee 61 a0 50 a3 43 65 86 37 c3\ -fd 65 9c fb 63 73 6d e3 2d 9f 90 d3 c2 f6 3e ca -Test: Verify -Comment: RSASSA-PSS Signature Example 9.4 -Message: \ -1d fd 43 b4 6c 93 db 82 62 9b da e2 bd 0a 12 b8\ -82 ea 04 c3 b4 65 f5 cf 93 02 3f 01 05 96 26 db\ -be 99 f2 6b b1 be 94 9d dd d1 6d c7 f3 de bb 19\ -a1 94 62 7f 0b 22 44 34 df 7d 87 00 e9 e9 8b 06\ -e3 60 c1 2f db e3 d1 9f 51 c9 68 4e b9 08 9e cb\ -b0 a2 f0 45 03 99 d3 f5 9e ac 72 94 08 5d 04 4f\ -53 93 c6 ce 73 74 23 d8 b8 6c 41 53 70 d3 89 e3\ -0b 9f 0a 3c 02 d2 5d 00 82 e8 ad 6f 3f 1e f2 4a\ -45 c3 cf 82 b3 83 36 70 63 a4 d4 61 3e 42 64 f0\ -1b 2d ac 2e 5a a4 20 43 f8 fb 5f 69 fa 87 1d 14\ -fb 27 3e 76 7a 53 1c 40 f0 2f 34 3b c2 fb 45 a0\ -c7 e0 f6 be 25 61 92 3a 77 21 1d 66 a6 e2 db b4\ -3c 36 63 50 be ae 22 da 3a c2 c1 f5 07 70 96 fc\ -b5 c4 bf 25 5f 75 74 35 1a e0 b1 e1 f0 36 32 81\ -7c 08 56 d4 a8 ba 97 af bd c8 b8 58 55 40 2b c5\ -69 26 fc ec 20 9f 9e a8 -Salt: \ -70 f3 82 bd df 4d 5d 2d d8 8b 3b c7 b7 30 8b e6\ -32 b8 40 45 -Signature: \ -84 eb eb 48 1b e5 98 45 b4 64 68 ba fb 47 1c 01\ -12 e0 2b 23 5d 84 b5 d9 11 cb d1 92 6e e5 07 4a\ -e0 42 44 95 cb 20 e8 23 08 b8 eb b6 5f 41 9a 03\ -fb 40 e7 2b 78 98 1d 88 aa d1 43 05 36 85 17 2c\ -97 b2 9c 8b 7b f0 ae 73 b5 b2 26 3c 40 3d a0 ed\ -2f 80 ff 74 50 af 78 28 eb 8b 86 f0 02 8b d2 a8\ -b1 76 a4 d2 28 cc ce a1 83 94 f2 38 b0 9f f7 58\ -cc 00 bc 04 30 11 52 35 57 42 f2 82 b5 4e 66 3a\ -91 9e 70 9d 8d a2 4a de 55 00 a7 b9 aa 50 22 6e\ -0c a5 29 23 e6 c2 d8 60 ec 50 ff 48 0f a5 74 77\ -e8 2b 05 65 f4 37 9f 79 c7 72 d5 c2 da 80 af 9f\ -bf 32 5e ce 6f c2 0b 00 96 16 14 be e8 9a 18 3e -Test: Verify -Comment: RSASSA-PSS Signature Example 9.5 -Message: \ -1b dc 6e 7c 98 fb 8c f5 4e 9b 09 7b 66 a8 31 e9\ -cf e5 2d 9d 48 88 44 8e e4 b0 97 80 93 ba 1d 7d\ -73 ae 78 b3 a6 2b a4 ad 95 cd 28 9c cb 9e 00 52\ -26 bb 3d 17 8b cc aa 82 1f b0 44 a4 e2 1e e9 76\ -96 c1 4d 06 78 c9 4c 2d ae 93 b0 ad 73 92 22 18\ -55 3d aa 7e 44 eb e5 77 25 a7 a4 5c c7 2b 9b 21\ -38 a6 b1 7c 8d b4 11 ce 82 79 ee 12 41 af f0 a8\ -be c6 f7 7f 87 ed b0 c6 9c b2 72 36 e3 43 5a 80\ -0b 19 2e 4f 11 e5 19 e3 fe 30 fc 30 ea cc ca 4f\ -bb 41 76 90 29 bf 70 8e 81 7a 9e 68 38 05 be 67\ -fa 10 09 84 68 3b 74 83 8e 3b cf fa 79 36 6e ed\ -1d 48 1c 76 72 91 18 83 8f 31 ba 8a 04 8a 93 c1\ -be 44 24 59 8e 8d f6 32 8b 7a 77 88 0a 3f 9c 7e\ -2e 8d fc a8 eb 5a 26 fb 86 bd c5 56 d4 2b be 01\ -d9 fa 6e d8 06 46 49 1c 93 41 -Salt: \ -d6 89 25 7a 86 ef fa 68 21 2c 5e 0c 61 9e ca 29\ -5f b9 1b 67 -Signature: \ -82 10 2d f8 cb 91 e7 17 99 19 a0 4d 26 d3 35 d6\ -4f bc 2f 87 2c 44 83 39 43 24 1d e8 45 48 10 27\ -4c df 3d b5 f4 2d 42 3d b1 52 af 71 35 f7 01 42\ -0e 39 b4 94 a6 7c bf d1 9f 91 19 da 23 3a 23 da\ -5c 64 39 b5 ba 0d 2b c3 73 ee e3 50 70 01 37 8d\ -4a 40 73 85 6b 7f e2 ab a0 b5 ee 93 b2 7f 4a fe\ -c7 d4 d1 20 92 1c 83 f6 06 76 5b 02 c1 9e 4d 6a\ -1a 3b 95 fa 4c 42 29 51 be 4f 52 13 10 77 ef 17\ -17 97 29 cd df bd b5 69 50 db ac ee fe 78 cb 16\ -64 0a 09 9e a5 6d 24 38 9e ef 10 f8 fe cb 31 ba\ -3e a3 b2 27 c0 a8 66 98 bb 89 e3 e9 36 39 05 bf\ -22 77 7b 2a 3a a5 21 b6 5b 4c ef 76 d8 3b de 4c -Test: Verify -Comment: RSASSA-PSS Signature Example 9.6 -Message: \ -88 c7 a9 f1 36 04 01 d9 0e 53 b1 01 b6 1c 53 25\ -c3 c7 5d b1 b4 11 fb eb 8e 83 0b 75 e9 6b 56 67\ -0a d2 45 40 4e 16 79 35 44 ee 35 4b c6 13 a9 0c\ -c9 84 87 15 a7 3d b5 89 3e 7f 6d 27 98 15 c0 c1\ -de 83 ef 8e 29 56 e3 a5 6e d2 6a 88 8d 7a 9c dc\ -d0 42 f4 b1 6b 7f a5 1e f1 a0 57 36 62 d1 6a 30\ -2d 0e c5 b2 85 d2 e0 3a d9 65 29 c8 7b 3d 37 4d\ -b3 72 d9 5b 24 43 d0 61 b6 b1 a3 50 ba 87 80 7e\ -d0 83 af d1 eb 05 c3 f5 2f 4e ba 5e d2 22 77 14\ -fd b5 0b 9d 9d 9d d6 81 4f 62 f6 27 2f cd 5c db\ -ce 7a 9e f7 97 -Salt: \ -c2 5f 13 bf 67 d0 81 67 1a 04 81 a1 f1 82 0d 61\ -3b ba 22 76 -Signature: \ -a7 fd b0 d2 59 16 5c a2 c8 8d 00 bb f1 02 8a 86\ -7d 33 76 99 d0 61 19 3b 17 a9 64 8e 14 cc bb aa\ -de ac aa cd ec 81 5e 75 71 29 4e bb 8a 11 7a f2\ -05 fa 07 8b 47 b0 71 2c 19 9e 3a d0 51 35 c5 04\ -c2 4b 81 70 51 15 74 08 02 48 79 92 ff d5 11 d4\ -af c6 b8 54 49 1e b3 f0 dd 52 31 39 54 2f f1 5c\ -31 01 ee 85 54 35 17 c6 a3 c7 94 17 c6 7e 2d d9\ -aa 74 1e 9a 29 b0 6d cb 59 3c 23 36 b3 67 0a e3\ -af ba c7 c3 e7 6e 21 54 73 e8 66 e3 38 ca 24 4d\ -e0 0b 62 62 4d 6b 94 26 82 2c ea e9 f8 cc 46 08\ -95 f4 12 50 07 3f d4 5c 5a 1e 7b 42 5c 20 4a 42\ -3a 69 91 59 f6 90 3e 71 0b 37 a7 bb 2b c8 04 9f -Test: Verify -Comment: Example 10: A 2048-bit RSA Key Pair -Modulus: \ -a5 dd 86 7a c4 cb 02 f9 0b 94 57 d4 8c 14 a7 70\ -ef 99 1c 56 c3 9c 0e c6 5f d1 1a fa 89 37 ce a5\ -7b 9b e7 ac 73 b4 5c 00 17 61 5b 82 d6 22 e3 18\ -75 3b 60 27 c0 fd 15 7b e1 2f 80 90 fe e2 a7 ad\ -cd 0e ef 75 9f 88 ba 49 97 c7 a4 2d 58 c9 aa 12\ -cb 99 ae 00 1f e5 21 c1 3b b5 43 14 45 a8 d5 ae\ -4f 5e 4c 7e 94 8a c2 27 d3 60 40 71 f2 0e 57 7e\ -90 5f be b1 5d fa f0 6d 1d e5 ae 62 53 d6 3a 6a\ -21 20 b3 1a 5d a5 da bc 95 50 60 0e 20 f2 7d 37\ -39 e2 62 79 25 fe a3 cc 50 9f 21 df f0 4e 6e ea\ -45 49 c5 40 d6 80 9f f9 30 7e ed e9 1f ff 58 73\ -3d 83 85 a2 37 d6 d3 70 5a 33 e3 91 90 09 92 07\ -0d f7 ad f1 35 7c f7 e3 70 0c e3 66 7d e8 3f 17\ -b8 df 17 78 db 38 1d ce 09 cb 4a d0 58 a5 11 00\ -1a 73 81 98 ee 27 cf 55 a1 3b 75 45 39 90 65 82\ -ec 8b 17 4b d5 8d 5d 1f 3d 76 7c 61 37 21 ae 05 -PublicExponent: \ -01 00 01 -PrivateExponent: \ -2d 2f f5 67 b3 fe 74 e0 61 91 b7 fd ed 6d e1 12\ -29 0c 67 06 92 43 0d 59 69 18 40 47 da 23 4c 96\ -93 de ed 16 73 ed 42 95 39 c9 69 d3 72 c0 4d 6b\ -47 e0 f5 b8 ce e0 84 3e 5c 22 83 5d bd 3b 05 a0\ -99 79 84 ae 60 58 b1 1b c4 90 7c bf 67 ed 84 fa\ -9a e2 52 df b0 d0 cd 49 e6 18 e3 5d fd fe 59 bc\ -a3 dd d6 6c 33 ce bb c7 7a d4 41 aa 69 5e 13 e3\ -24 b5 18 f0 1c 60 f5 a8 5c 99 4a d1 79 f2 a6 b5\ -fb e9 34 02 b1 17 67 be 01 bf 07 34 44 d6 ba 1d\ -d2 bc a5 bd 07 4d 4a 5f ae 35 31 ad 13 03 d8 4b\ -30 d8 97 31 8c bb ba 04 e0 3c 2e 66 de 6d 91 f8\ -2f 96 ea 1d 4b b5 4a 5a ae 10 2d 59 46 57 f5 c9\ -78 95 53 51 2b 29 6d ea 29 d8 02 31 96 35 7e 3e\ -3a 6e 95 8f 39 e3 c2 34 40 38 ea 60 4b 31 ed c6\ -f0 f7 ff 6e 71 81 a5 7c 92 82 6a 26 8f 86 76 8e\ -96 f8 78 56 2f c7 1d 85 d6 9e 44 86 12 f7 04 8f -Prime1: \ -cf d5 02 83 fe ee b9 7f 6f 08 d7 3c bc 7b 38 36\ -f8 2b bc d4 99 47 9f 5e 6f 76 fd fc b8 b3 8c 4f\ -71 dc 9e 88 bd 6a 6f 76 37 1a fd 65 d2 af 18 62\ -b3 2a fb 34 a9 5f 71 b8 b1 32 04 3f fe be 3a 95\ -2b af 75 92 44 81 48 c0 3f 9c 69 b1 d6 8e 4c e5\ -cf 32 c8 6b af 46 fe d3 01 ca 1a b4 03 06 9b 32\ -f4 56 b9 1f 71 89 8a b0 81 cd 8c 42 52 ef 52 71\ -91 5c 97 94 b8 f2 95 85 1d a7 51 0f 99 cb 73 eb -Prime2: \ -cc 4e 90 d2 a1 b3 a0 65 d3 b2 d1 f5 a8 fc e3 1b\ -54 44 75 66 4e ab 56 1d 29 71 b9 9f b7 be f8 44\ -e8 ec 1f 36 0b 8c 2a c8 35 96 92 97 1e a6 a3 8f\ -72 3f cc 21 1f 5d bc b1 77 a0 fd ac 51 64 a1 d4\ -ff 7f bb 4e 82 99 86 35 3c b9 83 65 9a 14 8c dd\ -42 0c 7d 31 ba 38 22 ea 90 a3 2b e4 6c 03 0e 8c\ -17 e1 fa 0a d3 78 59 e0 6b 0a a6 fa 3b 21 6d 9c\ -be 6c 0e 22 33 97 69 c0 a6 15 91 3e 5d a7 19 cf -ModPrime1PrivateExponent: \ -1c 2d 1f c3 2f 6b c4 00 4f d8 5d fd e0 fb bf 9a\ -4c 38 f9 c7 c4 e4 1d ea 1a a8 82 34 a2 01 cd 92\ -f3 b7 da 52 65 83 a9 8a d8 5b b3 60 fb 98 3b 71\ -1e 23 44 9d 56 1d 17 78 d7 a5 15 48 6b cb f4 7b\ -46 c9 e9 e1 a3 a1 f7 70 00 ef be b0 9a 8a fe 47\ -e5 b8 57 cd a9 9c b1 6d 7f ff 9b 71 2e 3b d6 0c\ -a9 6d 9c 79 73 d6 16 d4 69 34 a9 c0 50 28 1c 00\ -43 99 ce ff 1d b7 dd a7 87 66 a8 a9 b9 cb 08 73 -ModPrime2PrivateExponent: \ -cb 3b 3c 04 ca a5 8c 60 be 7d 9b 2d eb b3 e3 96\ -43 f4 f5 73 97 be 08 23 6a 1e 9e af aa 70 65 36\ -e7 1c 3a cf e0 1c c6 51 f2 3c 9e 05 85 8f ee 13\ -bb 6a 8a fc 47 df 4e dc 9a 4b a3 0b ce cb 73 d0\ -15 78 52 32 7e e7 89 01 5c 2e 8d ee 7b 9f 05 a0\ -f3 1a c9 4e b6 17 31 64 74 0c 5c 95 14 7c d5 f3\ -b5 ae 2c b4 a8 37 87 f0 1d 8a b3 1f 27 c2 d0 ee\ -a2 dd 8a 11 ab 90 6a ba 20 7c 43 c6 ee 12 53 31 -MultiplicativeInverseOfPrime2ModPrime1: \ -12 f6 b2 cf 13 74 a7 36 fa d0 56 16 05 0f 96 ab\ -4b 61 d1 17 7c 7f 9d 52 5a 29 f3 d1 80 e7 76 67\ -e9 9d 99 ab f0 52 5d 07 58 66 0f 37 52 65 5b 0f\ -25 b8 df 84 31 d9 a8 ff 77 c1 6c 12 a0 a5 12 2a\ -9f 0b f7 cf d5 a2 66 a3 5c 15 9f 99 12 08 b9 03\ -16 ff 44 4f 3e 0b 6b d0 e9 3b 8a 7a 24 48 e9 57\ -e3 dd a6 cf cf 22 66 b1 06 01 3a c4 68 08 d3 b3\ -88 7b 3b 00 34 4b aa c9 53 0b 4c e7 08 fc 32 b6 -Test: KeyPairValidAndConsistent -Comment: RSASSA-PSS Signature Example 10.1 -Message: \ -88 31 77 e5 12 6b 9b e2 d9 a9 68 03 27 d5 37 0c\ -6f 26 86 1f 58 20 c4 3d a6 7a 3a d6 09 -Salt: \ -04 e2 15 ee 6f f9 34 b9 da 70 d7 73 0c 87 34 ab\ -fc ec de 89 -Signature: \ -82 c2 b1 60 09 3b 8a a3 c0 f7 52 2b 19 f8 73 54\ -06 6c 77 84 7a bf 2a 9f ce 54 2d 0e 84 e9 20 c5\ -af b4 9f fd fd ac e1 65 60 ee 94 a1 36 96 01 14\ -8e ba d7 a0 e1 51 cf 16 33 17 91 a5 72 7d 05 f2\ -1e 74 e7 eb 81 14 40 20 69 35 d7 44 76 5a 15 e7\ -9f 01 5c b6 6c 53 2c 87 a6 a0 59 61 c8 bf ad 74\ -1a 9a 66 57 02 28 94 39 3e 72 23 73 97 96 c0 2a\ -77 45 5d 0f 55 5b 0e c0 1d df 25 9b 62 07 fd 0f\ -d5 76 14 ce f1 a5 57 3b aa ff 4e c0 00 69 95 16\ -59 b8 5f 24 30 0a 25 16 0c a8 52 2d c6 e6 72 7e\ -57 d0 19 d7 e6 36 29 b8 fe 5e 89 e2 5c c1 5b eb\ -3a 64 75 77 55 92 99 28 0b 9b 28 f7 9b 04 09 00\ -0b e2 5b bd 96 40 8b a3 b4 3c c4 86 18 4d d1 c8\ -e6 25 53 fa 1a f4 04 0f 60 66 3d e7 f5 e4 9c 04\ -38 8e 25 7f 1c e8 9c 95 da b4 8a 31 5d 9b 66 b1\ -b7 62 82 33 87 6f f2 38 52 30 d0 70 d0 7e 16 66 -Comment: RSASSA-PSS Signature Example 10.2 -Message: \ -dd 67 0a 01 46 58 68 ad c9 3f 26 13 19 57 a5 0c\ -52 fb 77 7c db aa 30 89 2c 9e 12 36 11 64 ec 13\ -97 9d 43 04 81 18 e4 44 5d b8 7b ee 58 dd 98 7b\ -34 25 d0 20 71 d8 db ae 80 70 8b 03 9d bb 64 db\ -d1 de 56 57 d9 fe d0 c1 18 a5 41 43 74 2e 0f f3\ -c8 7f 74 e4 58 57 64 7a f3 f7 9e b0 a1 4c 9d 75\ -ea 9a 1a 04 b7 cf 47 8a 89 7a 70 8f d9 88 f4 8e\ -80 1e db 0b 70 39 df 8c 23 bb 3c 56 f4 e8 21 ac -Salt: \ -8b 2b dd 4b 40 fa f5 45 c7 78 dd f9 bc 1a 49 cb\ -57 f9 b7 1b -Signature: \ -14 ae 35 d9 dd 06 ba 92 f7 f3 b8 97 97 8a ed 7c\ -d4 bf 5f f0 b5 85 a4 0b d4 6c e1 b4 2c d2 70 30\ -53 bb 90 44 d6 4e 81 3d 8f 96 db 2d d7 00 7d 10\ -11 8f 6f 8f 84 96 09 7a d7 5e 1f f6 92 34 1b 28\ -92 ad 55 a6 33 a1 c5 5e 7f 0a 0a d5 9a 0e 20 3a\ -5b 82 78 ae c5 4d d8 62 2e 28 31 d8 71 74 f8 ca\ -ff 43 ee 6c 46 44 53 45 d8 4a 59 65 9b fb 92 ec\ -d4 c8 18 66 86 95 f3 47 06 f6 68 28 a8 99 59 63\ -7f 2b f3 e3 25 1c 24 bd ba 4d 4b 76 49 da 00 22\ -21 8b 11 9c 84 e7 9a 65 27 ec 5b 8a 5f 86 1c 15\ -99 52 e2 3e c0 5e 1e 71 73 46 fa ef e8 b1 68 68\ -25 bd 2b 26 2f b2 53 10 66 c0 de 09 ac de 2e 42\ -31 69 07 28 b5 d8 5e 11 5a 2f 6b 92 b7 9c 25 ab\ -c9 bd 93 99 ff 8b cf 82 5a 52 ea 1f 56 ea 76 dd\ -26 f4 3b aa fa 18 bf a9 2a 50 4c bd 35 69 9e 26\ -d1 dc c5 a2 88 73 85 f3 c6 32 32 f0 6f 32 44 c3 -Comment: RSASSA-PSS Signature Example 10.3 -Message: \ -48 b2 b6 a5 7a 63 c8 4c ea 85 9d 65 c6 68 28 4b\ -08 d9 6b dc aa be 25 2d b0 e4 a9 6c b1 ba c6 01\ -93 41 db 6f be fb 8d 10 6b 0e 90 ed a6 bc c6 c6\ -26 2f 37 e7 ea 9c 7e 5d 22 6b d7 df 85 ec 5e 71\ -ef ff 2f 54 c5 db 57 7f f7 29 ff 91 b8 42 49 1d\ -e2 74 1d 0c 63 16 07 df 58 6b 90 5b 23 b9 1a f1\ -3d a1 23 04 bf 83 ec a8 a7 3e 87 1f f9 db -Salt: \ -4e 96 fc 1b 39 8f 92 b4 46 71 01 0c 0d c3 ef d6\ -e2 0c 2d 73 -Signature: \ -6e 3e 4d 7b 6b 15 d2 fb 46 01 3b 89 00 aa 5b bb\ -39 39 cf 2c 09 57 17 98 70 42 02 6e e6 2c 74 c5\ -4c ff d5 d7 d5 7e fb bf 95 0a 0f 5c 57 4f a0 9d\ -3f c1 c9 f5 13 b0 5b 4f f5 0d d8 df 7e df a2 01\ -02 85 4c 35 e5 92 18 01 19 a7 0c e5 b0 85 18 2a\ -a0 2d 9e a2 aa 90 d1 df 03 f2 da ae 88 5b a2 f5\ -d0 5a fd ac 97 47 6f 06 b9 3b 5b c9 4a 1a 80 aa\ -91 16 c4 d6 15 f3 33 b0 98 89 2b 25 ff ac e2 66\ -f5 db 5a 5a 3b cc 10 a8 24 ed 55 aa d3 5b 72 78\ -34 fb 8c 07 da 28 fc f4 16 a5 d9 b2 22 4f 1f 8b\ -44 2b 36 f9 1e 45 6f de a2 d7 cf e3 36 72 68 de\ -03 07 a4 c7 4e 92 41 59 ed 33 39 3d 5e 06 55 53\ -1c 77 32 7b 89 82 1b de df 88 01 61 c7 8c d4 19\ -6b 54 19 f7 ac c3 f1 3e 5e bf 16 1b 6e 7c 67 24\ -71 6c a3 3b 85 c2 e2 56 40 19 2a c2 85 96 51 d5\ -0b de 7e b9 76 e5 1c ec 82 8b 98 b6 56 3b 86 bb -Comment: RSASSA-PSS Signature Example 10.4 -Message: \ -0b 87 77 c7 f8 39 ba f0 a6 4b bb db c5 ce 79 75\ -5c 57 a2 05 b8 45 c1 74 e2 d2 e9 05 46 a0 89 c4\ -e6 ec 8a df fa 23 a7 ea 97 ba e6 b6 5d 78 2b 82\ -db 5d 2b 5a 56 d2 2a 29 a0 5e 7c 44 33 e2 b8 2a\ -62 1a bb a9 0a dd 05 ce 39 3f c4 8a 84 05 42 45\ -1a -Salt: \ -c7 cd 69 8d 84 b6 51 28 d8 83 5e 3a 8b 1e b0 e0\ -1c b5 41 ec -Signature: \ -34 04 7f f9 6c 4d c0 dc 90 b2 d4 ff 59 a1 a3 61\ -a4 75 4b 25 5d 2e e0 af 7d 8b f8 7c 9b c9 e7 dd\ -ee de 33 93 4c 63 ca 1c 0e 3d 26 2c b1 45 ef 93\ -2a 1f 2c 0a 99 7a a6 a3 4f 8e ae e7 47 7d 82 cc\ -f0 90 95 a6 b8 ac ad 38 d4 ee c9 fb 7e ab 7a d0\ -2d a1 d1 1d 8e 54 c1 82 5e 55 bf 58 c2 a2 32 34\ -b9 02 be 12 4f 9e 90 38 a8 f6 8f a4 5d ab 72 f6\ -6e 09 45 bf 1d 8b ac c9 04 4c 6f 07 09 8c 9f ce\ -c5 8a 3a ab 10 0c 80 51 78 15 5f 03 0a 12 4c 45\ -0e 5a cb da 47 d0 e4 f1 0b 80 a2 3f 80 3e 77 4d\ -02 3b 00 15 c2 0b 9f 9b be 7c 91 29 63 38 d5 ec\ -b4 71 ca fb 03 20 07 b6 7a 60 be 5f 69 50 4a 9f\ -01 ab b3 cb 46 7b 26 0e 2b ce 86 0b e8 d9 5b f9\ -2c 0c 8e 14 96 ed 1e 52 85 93 a4 ab b6 df 46 2d\ -de 8a 09 68 df fe 46 83 11 68 57 a2 32 f5 eb f6\ -c8 5b e2 38 74 5a d0 f3 8f 76 7a 5f db f4 86 fb -Comment: RSASSA-PSS Signature Example 10.5 -Message: \ -f1 03 6e 00 8e 71 e9 64 da dc 92 19 ed 30 e1 7f\ -06 b4 b6 8a 95 5c 16 b3 12 b1 ed df 02 8b 74 97\ -6b ed 6b 3f 6a 63 d4 e7 78 59 24 3c 9c cc dc 98\ -01 65 23 ab b0 24 83 b3 55 91 c3 3a ad 81 21 3b\ -b7 c7 bb 1a 47 0a ab c1 0d 44 25 6c 4d 45 59 d9\ -16 -Salt: \ -ef a8 bf f9 62 12 b2 f4 a3 f3 71 a1 0d 57 41 52\ -65 5f 5d fb -Signature: \ -7e 09 35 ea 18 f4 d6 c1 d1 7c e8 2e b2 b3 83 6c\ -55 b3 84 58 9c e1 9d fe 74 33 63 ac 99 48 d1 f3\ -46 b7 bf dd fe 92 ef d7 8a db 21 fa ef c8 9a de\ -42 b1 0f 37 40 03 fe 12 2e 67 42 9a 1c b8 cb d1\ -f8 d9 01 45 64 c4 4d 12 01 16 f4 99 0f 1a 6e 38\ -77 4c 19 4b d1 b8 21 32 86 b0 77 b0 49 9d 2e 7b\ -3f 43 4a b1 22 89 c5 56 68 4d ee d7 81 31 93 4b\ -b3 dd 65 37 23 6f 7c 6f 3d cb 09 d4 76 be 07 72\ -1e 37 e1 ce ed 9b 2f 7b 40 68 87 bd 53 15 73 05\ -e1 c8 b4 f8 4d 73 3b c1 e1 86 fe 06 cc 59 b6 ed\ -b8 f4 bd 7f fe fd f4 f7 ba 9c fb 9d 57 06 89 b5\ -a1 a4 10 9a 74 6a 69 08 93 db 37 99 25 5a 0c b9\ -21 5d 2d 1c d4 90 59 0e 95 2e 8c 87 86 aa 00 11\ -26 52 52 47 0c 04 1d fb c3 ee c7 c3 cb f7 1c 24\ -86 9d 11 5c 0c b4 a9 56 f5 6d 53 0b 80 ab 58 9a\ -cf ef c6 90 75 1d df 36 e8 d3 83 f8 3c ed d2 cc -Comment: RSASSA-PSS Signature Example 10.6 -Message: \ -25 f1 08 95 a8 77 16 c1 37 45 0b b9 51 9d fa a1\ -f2 07 fa a9 42 ea 88 ab f7 1e 9c 17 98 00 85 b5\ -55 ae ba b7 62 64 ae 2a 3a b9 3c 2d 12 98 11 91\ -dd ac 6f b5 94 9e b3 6a ee 3c 5d a9 40 f0 07 52\ -c9 16 d9 46 08 fa 7d 97 ba 6a 29 15 b6 88 f2 03\ -23 d4 e9 d9 68 01 d8 9a 72 ab 58 92 dc 21 17 c0\ -74 34 fc f9 72 e0 58 cf 8c 41 ca 4b 4f f5 54 f7\ -d5 06 8a d3 15 5f ce d0 f3 12 5b c0 4f 91 93 37\ -8a 8f 5c 4c 3b 8c b4 dd 6d 1c c6 9d 30 ec ca 6e\ -aa 51 e3 6a 05 73 0e 9e 34 2e 85 5b af 09 9d ef\ -b8 af d7 -Salt: \ -ad 8b 15 23 70 36 46 22 4b 66 0b 55 08 85 91 7c\ -a2 d1 df 28 -Signature: \ -6d 3b 5b 87 f6 7e a6 57 af 21 f7 54 41 97 7d 21\ -80 f9 1b 2c 5f 69 2d e8 29 55 69 6a 68 67 30 d9\ -b9 77 8d 97 07 58 cc b2 60 71 c2 20 9f fb d6 12\ -5b e2 e9 6e a8 1b 67 cb 9b 93 08 23 9f da 17 f7\ -b2 b6 4e cd a0 96 b6 b9 35 64 0a 5a 1c b4 2a 91\ -55 b1 c9 ef 7a 63 3a 02 c5 9f 0d 6e e5 9b 85 2c\ -43 b3 50 29 e7 3c 94 0f f0 41 0e 8f 11 4e ed 46\ -bb d0 fa e1 65 e4 2b e2 52 8a 40 1c 3b 28 fd 81\ -8e f3 23 2d ca 9f 4d 2a 0f 51 66 ec 59 c4 23 96\ -d6 c1 1d bc 12 15 a5 6f a1 71 69 db 95 75 34 3e\ -f3 4f 9d e3 2a 49 cd c3 17 49 22 f2 29 c2 3e 18\ -e4 5d f9 35 31 19 ec 43 19 ce dc e7 a1 7c 64 08\ -8c 1f 6f 52 be 29 63 41 00 b3 91 9d 38 f3 d1 ed\ -94 e6 89 1e 66 a7 3b 8f b8 49 f5 87 4d f5 94 59\ -e2 98 c7 bb ce 2e ee 78 2a 19 5a a6 6f e2 d0 73\ -2b 25 e5 95 f5 7d 3e 06 1b 1f c3 e4 06 3b f9 8f -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rw.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rw.txt deleted file mode 100644 index 2d932d07..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/rw.txt +++ /dev/null @@ -1,166 +0,0 @@ -AlgorithmType: Signature -Name: RW/EMSA2(SHA-1) -Source: generated by Wei Dai using Crypto++ 5.1 -Comment: 1024-bit RW key -KeyFormat: Component -Modulus: \ - e5eb47bc1f82db3001faaeabc5bbe71b7d307b431889ac10255262281ec5f5af\ - 8a790bd7bbec5efffa442cf2c3fd5ca4778763b9d15aeac0b9b71bdb13da8272\ - 7f4967ac685975f8ff05a763c864d100b7cc1142102aa2dd343ea1a0ab530255\ - 195c3a6400ecab7b27eff9b01ef6d37381fa6fb5401347f195354396772e8285 -Prime1: \ - ef86dd7af3f32cde8a9f6564e43a559a0c9f8bad36cc25330548b347ac158a34\ - 5631fa90f7b873c36effae2f7823227a3f580b5dd18304d5932751e743e9281b -Prime2: \ - f5bb4289c389d9019c36f96c6b81fffbf20be0620c6343e2b800aefb1b55a330\ - 8cc1402da7a2a558579a2a5146b30cb08e3f20b501081248f2f1de36cdfce9df -MultiplicativeInverseOfPrime2ModPrime1: \ - 88813a3d50b7c301948ee1985db19c9fd33a47c78c977024745e10483d9cc4f0\ - f573597ce564a91421d1d7457bc45a971f7d8b31403298da77799b57cf9a76de -PublicExponent: 02 -Test: KeyPairValidAndConsistent -Message: 2CA039854B55688740E3 -Signature: 1AF029CBEC9C692CE5096E73E4E9A52EC9A28D207A5511CCEC7681E5E3D867A4AE2E22DE4909D89196A272F1B50DE6FA3248BCA334D46E0D57171A790B6F4697E7BA7047DB79DECD47BD21995243DEBBF25915DDBC93C45875C14DE953792257C5C6825C905AFF40109C8CC7E793123D47AC1B5B6304A436CFA9BEEC8E0054E7 -Test: Verify -Message: 2A51DF4AF88613D91A37 -Signature: 6FF18F4471E1A8F850C910A181A9F28E69AACD8E8126969605E000A853197541AF9047E5D17315BF062B9CD8DF91196F0343285D9E31D5C72560C156782B6D0E5AF8F06D7DCDD8CABEC01B2438C168C40C21F6A8794648361BD2AEE13573A49ECA07A7EED97C0B9C5B1E508869E4CFD5FE1771924B1CF5A4BFF7D4379E5CD59F -Test: Verify -Message: 1CF8DDD95D780A89D7CF -Signature: 539C266B0313E0E256ED98EEF13E6AE64CED90C160A4999B3D47CBDA5285DAB0E0678C0E079CE9B8EB23E10EDFACFC19A80EEBB8F38ED5B5D6C8A988AB8CEC40A5A5BA102F75586167EAB6D5BF0CE8FF30C656895800F6F1B37D69FBBAF9055F7505DBEB537C0F986A1B5F0270DC12A640FFCB626F9763FDCFEFA1208C104003 -Test: Verify -Message: 2119A954F1AC0F3DCDB2 -Signature: 60C3CCF4F086B15B7F850B445F384333F7AE5A4B5EDE2820C7233239E1B86D6E4B4FCA4F50B087CE1DF17DA5D62672A17F2CF87A2875BBD9B138CAF6863821D6A4D553E9EB64C9254A8F9A6B960E57E39069D65E3F561AA1FA91643D42FEEFB9270D34AB0861DEA1E234EA587F580503D46A1989D413DAC2FFE0FC4CA663CE68 -Test: Verify -Message: F6959926E6D9D37D8BC0 -Signature: 249E1066542618CE0D236A7174708F801E7AB257931E9967A65C483ED66FB58598F99B6664AF0EAE221E2A6B271D7D17875ED02BF7FE35AA0786023858521CB79FEE0D134D9DDA609B0270FC9804BB6BF74AD90AE11EB339353533DC0D5A69E6B8758212B86024ED563767EA5D9B59655E0B8CC21244F720BA4ED663BF668E3A -Test: Verify -Message: 7A4C634DE6F16315BD5F -Signature: 308A5D65224201BED626CC83FB901EC84874EE03B2E7AB4E752EDBDE024C754E3CC9841CA062100A8843DE9183354B4E0596E8C68F1605828287884F0F9BA6968FC7A9F0CA09418A8485B90465E5D3F96CE4995A5FC7A6E5ABD9CC06BB8A2C3C8109F72EAE67FB4C108852C881CA645B3C5586F27F12FF3028ADE56E32AD9434 -Test: Verify -Comment: 1032-bit RW key -KeyFormat: Component -Modulus: \ - b660eb18786256c993ebc6dcb5892eac342f6d91229b73dc5d04f1afb9bb0dd4\ - eb0b48895f514b4c9afeaf86e91226f2299126d37528ce374e89cc312c06f47c\ - 81112bf5ca60ffc33b98318e04a17627269f1af461b6cb40f3be03b0113fb2d8\ - 404e154c7191306b36fd3efa73c784ad9189115d0bb1bd82b850d000e7cc8d20\ - 35 -Prime1: \ - 0bc31c063f43b3ade2cd633d554913339071d6ebed5fd665fc5dd7d47b80721a\ - 976c3b14fbd253f0f988c354725289f2897d7fb62c5c74af7d597a1e22aafba1\ - d3 -Prime2: \ - 0f816bf0add559afda38b008e4087f6a38b575c56fff453056eaaab3381c9552\ - 0969546f954d458d48e44850938b1db471cf4b40afc47e067fb5bce67ba98be8\ - d7 -MultiplicativeInverseOfPrime2ModPrime1: \ - 0b684eeec75b3e24e2d9947341b3f462258628af6f0b881396c887fe26a3408c\ - 40b13370710c82dd4a021a87bbaab5c0fc96cb1d015a783a764a8ab7b002903d\ - 21 -PublicExponent: 02 -Test: KeyPairValidAndConsistent -Message: EF0F1D56F4E5D587C212 -Signature: 3E544FEBB6623F5D392003B729FE2BFC20E2CB3ECAC22734DFCA55150254E616A41C5E54CE3B50FBC2FE2363EE9AF9B15C70615497B0A458F8AB6D850992EEEB56D65F87EA1BD6E2B4B7E40A0F5E1635C7DDB17110C61039CF712D3524C9C2C1F35D9163BE5C70276F46634514BE16EC09602782E88FE74EAEB2F50CBB0E3B5C4A -Test: Verify -Message: 2C9EA313EACF2C5DA43A -Signature: 1FEFF88814BB53E447E1E955AC8F1AF597C15C3866033E337AFBAB8627306F2EC1276621FF2176C89323CE32EA20F6AEC2CC271F1ED749408B2A3E43A23A44D6A3F38DCDDCAB696B239110AA7ECF12C6681B0E97E6FFF1B72F4F6D796BF82B9450AB8B3D28CA9D220BDF84ACCEA1DA5EDA0B470C3A82BBDD77B4C2723297608BD4 -Test: Verify -Message: EC5CC4228C3C70EE8F35 -Signature: 228BAA85062F10DCC9D99A23D340BC4B9E463D8AB86A6781A6D2143564303E2DC78772BF68449BE1E2711A68D5A15CF04A23573FB3870454308F583BBB5F2467069EF1395431E70F91BD56D846DC8DB2E88AB3D26A9770660B87A76D6C3575DE512BAFA8A0B901AD15B7D8E8BE2F176A182D16A9609F19A4298416245873175805 -Test: Verify -Message: D81F0C6F2D3D60EE19FE -Signature: 17EAA0C18178CD45A2B9100997F682E5F02BE09FBE4D8F345033951345CE98C8B3F13F2CA2A950CE7BDCBF83DBB700890E1F0B863D04C3ADB298F546A8F09F4DA4EF0DC6E7317207CB3CF691114E55D9EAA11C53BE55F7C214F62E6B0460DFA60C55B16EB55B29C9DBB908266C1BDBB03AD651EFB91905B142D852DCA0C4E3BBEE -Test: Verify -Message: FEF5EE07C74118DA30B9 -Signature: 2637E16E2599B6EC2F4728C73D3B29F483C2B881F1E1969C426027605EF080E9B17D258D5E1EBC6472A2501E04CF19C144537FCB38A1DA00D948EBD39FA11322D9230B62E2C12AEDB366BD85A2089588A8D52E941FD986D89828A342B83438A960B6FD87E9AD025AD75A692AA9DFEA873A9467B42D84879E85C5D11EFAB347FBED -Test: Verify -Message: 0B9554FFE4F6ADAB2C76 -Signature: 095952F24D9FBEF3A93A932865F4BDBB522CF24EBE153CE4BBB24CF301A1C7B51FE47B94F8F8B211CBC5A926FF6BAF9A6BBF7E15975D2DCCB95EF01AB7E641687870B0D01FC18B6B16FE17D3FC82931FBBCD4FD18C7F9588CEE8491876D72F98F2E7EEA90C12907210D6859053ADC7178B87BF8B4826954D6986FE761E71E1B7EA -Test: Verify -Comment: 1536-bit RW key -KeyFormat: Component -Modulus: \ - 9f8f8ab78ad635c71c9ef0fce9d4a958a9013ed69fcd67c385722668d4357c32\ - 3732c78179eaa17984531ba570aa0721a1e228957b1008010f1a2d6c42e09847\ - 9ffeaff9bbfeb3c8e101f968fc7ac74cfba210f76a6da160e65934d216368763\ - 8f59e414dc6f0448c0b4052c90f7dc565d32acae5da04e3e157dca184aba8362\ - bb28a2da6915d51d65f54fbeee69104a5a1b2304b87230c504b126dcf1c377cf\ - 1777b93be6903b50a44f054ae233b7cc24f950ded467cb8ffbdb17e7b6937605 -Prime1: \ - d0505c510a3b38a139d6d139818b04251d6ca46c2e717cfafbeebcd5fff8ae62\ - de4698e3241784f05e8c86f0f996db77259ebaac6983f092853639f619b75701\ - e562408cc1f5c543cada21fc26af36905b10a0df5b111efd754666bb3db4be63 -Prime2: \ - c41623ccb51e2474eb3dc5c2ef42cfd320a285ef7aefc1d1edcd5f566549cb79\ - 7285f01c89b9f749ca506b717c2a45b708fec2e7d611c5eee6af0a6d61219c7d\ - cab18961e98eea3b7797c61a75aed21d411de4fcf4a009a8238a832dd6e41277 -MultiplicativeInverseOfPrime2ModPrime1: \ - bc1ceeed917217387ead12254cfc183f82c79709499f510ce093d6d28bc1bf2b\ - fabc3d86d64a1c807605bd57f9ec533745d6e359270885c3eb7a36a02dff7137\ - 9bd453bf3fdc282afa2295d5e393f1c2c74edcbd2374c7740e8135ef0b8af258 -PublicExponent: 02 -Test: KeyPairValidAndConsistent -Message: 400AEF79EDBCEA796D71 -Signature: 15EB5A68CBCB0D6313BB2D14436237A716AC3159B059FBC29931933DB802D6925C01BDC6D90DD0DA25980F1C8199AB9CD3FD105A63D13B5C0101A0430455334492038FBE029BF4EE61F8A2F88D2A6D5424DE7C0CC314B5EA4F867B35224D574463BDE78B71904033C1455484865EB80AE1C2A7D1C229CD0A4D49C0F06A26E264AD42ACAA131F8C0C5EA4DC9EB5BD349D1EE12B3F91F4B9F2DABC3BCF0E216D4A34A3541169955BE45289CECE16DA6BC5352FF31D66538F64308D6FBB9C7DDE72 -Test: Verify -Message: 63F64BFAD5B830682F44 -Signature: 1003E58A73B018FF9F0F66D3BE9A8DD9D83097A0EB216AEEAA75B63C150AAE9E8BE2A5DE426D18FBC56865F4C9CA51A9BB6E99B70C59B7995246A1F4327C9E4A69517131DA66DDE98AE5D8355527D1C5E4D83CC7ED7B3B1F404F6FDF731DA615974F0777CD22C1E6FAA3569D1141900734C7F3262FE7B9ED291A934DE81A06EBF258F7159DE842737A32DAEC79EFE211C2739D3F5859CB9A633D2A16D78C347790241925C3E776F04B5D5F1900A7B48645DF16DC6F9E8C990AEFEE22FA1DA496 -Test: Verify -Message: B6AAE87E8D469A16A335 -Signature: 368EE32DDF9D5526E50B1645473DB79CE4B0EF3801F3DF050E8B6B10DFAA600A505FD1C91CAE1CD8CB8FA7BC2F81EDFEE7E74DCF7BDA9ED4FF87C39650E8A473672FD012A6A57C5DC44FFBBDA4A5DECD099A32791CEDC6170C8B367080792713041350D2483B27924822DD886A36EE575A3CD6C097162F758F5628D3EA301050AC848F0ACAEDAB8AD34D436E418AA53618AFAFC3168B7CFA641B1A88C86007FD1EDD8FE1D1A94FCE59B548DA3D8FE313A0A97719E19C857560763EFF1682CC14 -Test: Verify -Message: DB0F126516E3EDFF3D7C -Signature: 42076C3F6976EF4BBEAFEF0B4F7A8198CACE6F73436C59DF212474C94D00B0501C359CAB8950EB8937E8458964C817926A3181EED64EAB3A5274A9B3114406F62A62C51F4EDBEEF3BD948C21578996236D6D477B2701DD5A4818B08F5D4740CD23064798C3406133D0758D51717DB4575117DE887733D1E7170AA0845A81535444A962F2003A46361E8A8A1914DA6732C37334320F155E90E18D9E2A921034BEC81395AF69D61E22FEF90BC4F9127914B536BD2477552166C11F139519129864 -Test: Verify -Message: A58B1E5E98C44A8680BD -Signature: 100B8692C7A09EFB585A63B5D636EABFE9DDFE50D5235B11BDFD818D1810893B327ACC3B78942900C8F7498BDC1D2FB44330ADD3FEBC709046D8028F38AA7DCC768558E7D6469EDA306C0FCAE001C7B01544C80043864761355888C13960DD53BBD7854F2FBB7D9DE021BAD69769418712B6335A8C63143329363C65CB4170AA0C040559136EA9C19A6793024AF77BCF3EE793CAEDF07FD8A8E2C9C29B5F225F399BBA177D070314E319359394DB999D866A48D591EE8C662BA6394E396300FE -Test: Verify -Message: 7AF0498714B0D93AB959 -Signature: 35A959E3717468552590C26FA92009C3866955A1D14405AD33D3FA745D7591521A323BA031070B1FB60A1B6FE0C7198FC14EA41CE62EB6EB060FD073E816C9C85BB6251BF5235567E12951778A61D87F117137C347DE56337FBF9A3360D49330A98248233719FF862F83F772AC887F035820579F406D221191F4535ABA37401FF6E28216EC06AB8832D9AB3EAE4E1D3D780A1FA46883A79B657A7027597BCE4F21744CFC3704A449A204D3790F668E2EB710D5CF031BAA58359D35DDF92455D7 -Test: Verify -Comment: 2048-bit RW key -KeyFormat: Component -Modulus: \ - b6dee7375bf4385043b3cc2ac5cacbc14ad11a17574738dd2bd84d2d1e6c74e1\ - 6066c2a5c35bc3b87839858afb5ee5e8abfab408f38772866f6f833f39fab248\ - 3a2c34ed55ad7098f9f63d4ec70b7950f02daaaab10781a0008f993c4027e381\ - 6bfd45c52f59452a7b28873513dce415a84fc8bc06601567f91ec41647da2304\ - 5b6e01e24516724acc02947ad5aa2dba4d952bc4f49d18ada0b0f7cc5d488814\ - b921c0bc2b33d8828d80130df7d79b0992cec40d3bc7217d4a4dff3699345e44\ - dac968575194845aa7b60dcf3c712d9b0a384824c3579b40dba265457d50f69f\ - 02a140884d89b7fdee9f0a787e76a37c58c92cf2d3818c72097d41b3faa7aa95 -Prime1: \ - fa880a456f9c205a26e02c3357536531dec150be0ef8747f69ea30d987ff7dd8\ - 9e9a1075ebd39f04fa495bd26d8408a8de69113a9fbb52f20713d1d046a76b47\ - 8cf77c46454a7afda2ef418f63faf67c947d898bca109f3275999e8f2e60e2c0\ - eec133ff69e71a2d396632670b52d8ea03f7589d8144ab580b1d3e60efa1280b -Prime2: \ - badcc718dd2d761c4893c4831d56ada30fc5c7c148d473bedf7615b7e821b92f\ - 319676ce278349f1309fb3d264c1a22bde71b221354c7a4d31117b3ec3c9d480\ - 2e0a26bd8ec05d28b6502c65f35c687af7f8396b963ed029a2c5ae38dd7c5c96\ - 2a953c113c0f590957ab19a6e2afda6db84f22c0c31ae243debd2920fbe9fbdf -MultiplicativeInverseOfPrime2ModPrime1: \ - 48a56f93e044a8211861da6bde9ab61265c63e168e507b56cd6e6e5f4de57c2f\ - 5c0b626462d6c06790cf561fa12a350dc0c08767f2717914183fac90db36495a\ - 91c0e9c0fbcfef19c85075b3b744fc378a9f2045cd7fd144ecd39bd1a59f1483\ - 10f6982efb3ffe502b279c4c0cb2a7f9ef64ca8f38690c486afb5f659cf7f838 -PublicExponent: 02 -Test: KeyPairValidAndConsistent -Message: 00AA5515CDAE5CD0F0DC -Signature: 30EECA6B48D796552F5A6A3C11F28D730FA077422CAAB34FDEB879AE0F71DF21330E2F3BE5BF3A8CA372EBCD3DFA7C81B3398C31B0972D0B857926CB39732351AACEB8276D52B9D82F9C245FA0F1CF49E785A2BC00FF27FBCF777F84D05BEF17FCC0505820B029AC8F0CE17D2469372CE47E1428BB941004FE170EF87163E07298EFFCC1BFA7E7CB1F572C340CAA075A5962A15B69CE937BC7EFB492F501FC88CBF0119C351C8498782091EF6EFB19120195E5FF51DF86F90E90FAEB225AA2EE43AB4E8358101C0348C7E3859B9DEBA19464C74B74AC48A0B73FC8D2E7F8033E86208F0792B6E5B6DE36C99DEF604949811D1671EF6B0A4781B4E7A0A72AD855 -Test: Verify -Message: B8E2FB9EAE22FB2C0021 -Signature: 416D33F8C213CF81F805F54FC1D4E7C6A588A0965F1C9CAEEA1D41452E20935AAF2D30F957584B56621035430212A428E27A2F687CA9DBB596C19864AE692EF7BBA730F3D70CC2DDE15AB71E1E350C0C316EFA1A831ACD1441598B112482487DF72F58ED318182C7CD0906FE39C5655BF1313F29A15D60A6178CBF600C7FBFF8994840ED649C3C4026A463B3EA39C692B7D112B128BE49E1E32D4A7FF8D4513283D8DCD9CCB8FB7300BE0BDD4C44DAA2F7049B3AD83437093E623442AC69B48911CDA21E95E0775041F67F6E6AE01DCE646AEC20908E7C1B693600FE41ABA85AC0C778641E46C419083E41773C749DB3E1BD8FD764E271860D2D7F8E11BD6AB3 -Test: Verify -Message: 8C8C306A629373BAE647 -Signature: 0E9A00045FFD399D9DA9D0D7E543CF9FFD098BC23E72DD7763A64F22C7F0479CE866E31438B8F7DE31A18F35AF419BED6C67BE1540614D3310DD24F019E14FCC3AF73743F4C143D4B79CDF35C752A300F0A8251CCFF4AAF18785C533A7DF1A20AFE6770DEBD1B8BA2C83B2E345A04F833CD173E998FF9840C2F8A370FFDCFF5FD95CBD71B25FC9972192470FD145975344F64C2F6D68CB3513F48F9FC070021BEE8F6A4282D098C44DF655CE415E89B97994AE3ABE85986C7EE0AC348EF2A4F52D102EA80836E77E81AD3678803E53C83CF2F30D2D4950FB6B038CCB3F2690A9381EB34D6C09E88C090AB05E28047DC490EB8A1282FEB38E82FB0B18309284C4 -Test: Verify -Message: 15E7B7B7ED0F176B6799 -Signature: 39FF4B5FA50AE498F3C91A655E6865840D1FC401EE02DBC8460A59DEB8816E6680F712B7BAF8D4DC11A3B54BF906BE698306F0449BB43F3F223B944D930A1A3C718E8A9E2EEDEC5A07AB817C26A80CC2A2EE2846A597EAB8A999D38DB98490166F2574524038BBDF24B4E4622C843210C6B94987638C6976562EA9727385B152614C18349BD54AD95DE33D5354954B505E5259CCDA47E3CECEF3154F6E5481E536BAB568146A0BFCB66573714A7BA7ABE0385115720687F33D9C6EF6BB60272F1272CF349990E3A2FBCCE180B730792101089B164AE5A001F5263F7493AF148D6E0953E311AD12E4202D35F96DD30885663B5101F9B05675FCD2FCC4FCC4DDFF -Test: Verify -Message: B36724C92954C38D0288 -Signature: 3C8CD3614555568BBECA99174B7B203D0BC6FABE9E6FFE0C41EB4D9A2C601D2393CA1E01B7D7E99337758AC914C9F151311E5AE6708DAF1D8C825DA471652C6E13A8FE5802D7AE097BFC899A4EC8CA235B5982B9058C53AAD52823ACF692290EB8823C126635AB0BBF101C2B3149AB16183FA2DBB049DDB99C5E83723E4D4693CA3A08588AA868C677D42ABDAA6586EF192391D276C5E5AF0763ACCA6293F06250C51FDC2AD369CD44EB5F654E98761C881DDEC08E795FFB229B20522349B0714059E18B7B23A48875EAB12ED3F0A011D3A985DD7384B0046F39FA6C1A331F3D4C5125100BA58666935C68A7A10849D9C74850BAB82AE15EC950A283F3E7DAD8 -Test: Verify -Message: FA95400C2B14E064F76A -Signature: 3F67F9DBEB88E6AD057BEDC3D97030555A908867EC578A6CA572137CB61C21036AADE6DDC5592EC7CCB6B263E51B4C886A51904C858040E493D64B9ACE5BAA50C4A66D04ACCDFE0039D8541C4363DEFFCF93BDF5F5CC1FB64855D956B5EFD42D4C9B96B9CBAA97A32F02AAB307674E53404E6836DB5C96B59572ADBFD1113B87608ACE6D0898CB02E35575CC28D38A9FF8C1C4AD36BAA991DEFAB533F0A6C9C2F0F0815F1D659ED576E5DB18494A54B6817D9E34A134F3B9A0F1E8C77FC204B6EE087C0445A7036C935117E338D092F6E1FF4DF7605525C409456A5195233A176B29B2FD8FB2808D0412FCA0541B2BB6800BD8BB9DC9DC25230166071E8D961E -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/salsa.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/salsa.txt deleted file mode 100644 index b00ff961..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/salsa.txt +++ /dev/null @@ -1,463 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: Salsa20 -Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?rev=161&view=markup -Comment: Set 1, vector# 0 -Key: 80000000000000000000000000000000 -IV: 0000000000000000 -Plaintext: r16 00000000 -Seek: 0 -Ciphertext: 4DFA5E481DA23EA09A31022050859936DA52FCEE218005164F267CB65F5CFD7F2B4F97E0FF16924A52DF269515110A07F9E460BC65EF95DA58F740B7D1DBB0AA -Test: Encrypt -Seek: 448 -Ciphertext: B375703739DACED4DD4059FD71C3C47FC2F9939670FAD4A46066ADCC6A5645783308B90FFB72BE04A6B147CBE38CC0C3B9267C296A92A7C69873F9F263BE9703 -Test: Encrypt -Seek: 192 -Plaintext: r32 00000000 -Ciphertext: DA9C1581F429E0A00F7D67E23B730676783B262E8EB43A25F55FB90B3E753AEF8C6713EC66C51881111593CCB3E8CB8F8DE124080501EEEB389C4BCB6977CF95\ -7D5789631EB4554400E1E025935DFA7B3E9039D61BDC58A8697D36815BF1985CEFDF7AE112E5BB81E37ECF0616CE7147FC08A93A367E08631F23C03B00A8DA2F -Test: Encrypt -Comment: Set 3, vector#243 -Key: F3F4F5F6F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E0F101112 -IV: 0000000000000000 -Plaintext: r16 00000000 -Seek: 0 -Ciphertext: B4C0AFA503BE7FC29A62058166D56F8F5D27DC246F75B9AD8760C8C39DFD87492D3B76D5D9637F009EADA14458A52DFB09815337E72672681DDDC24633750D83 -Test: Encrypt -Seek: 448 -Ciphertext: 5A5FB5C8F0AFEA471F0318A4A2792F7AA5C67B6D6E0F0DDB79961C34E3A564BA2EECE78D9AFF45E510FEAB1030B102D39DFCECB77F5798F7D2793C0AB09C7A04 -Test: Encrypt -Seek: 192 -Plaintext: r32 00000000 -Ciphertext: DBBA0683DF48C335A9802EEF0252256354C9F763C3FDE19131A6BB7B85040624B1D6CD4BF66D16F7482236C8602A6D58505EEDCCA0B77AED574AB583115124B9\ -F0C5F98BAE05E019764EF6B65E0694A904CB9EC9C10C297B1AB1A6052365BB78E55D3C6CB9F06184BA7D425A92E7E987757FC5D9AFD7082418DD64125CA6F2B6 -Test: Encrypt -Comment: Set 6, vector# 3 -Seek: 0 -Key: 0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C -IV: 288FF65DC42B92F9 -Plaintext: r131072 00 -CiphertextXorDigest: E00EBCCD70D69152725F9987982178A2E2E139C7BCBE04CA8A0E99E318D9AB76F988C8549F75ADD790BA4F81C176DA653C1A043F11A958E169B6D2319F4EEC1A -Test: EncryptXorDigest -AlgorithmType: SymmetricCipher -Name: Salsa20 -Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/reduced/12-rounds/verified.test-vectors?rev=210&view=auto -Comment: Set 1, vector# 0 -Rounds: 12 -Key: 80000000000000000000000000000000 -IV: 0000000000000000 -Plaintext: r64 00 -Seek: 0 -Ciphertext: FC207DBFC76C5E1774961E7A5AAD09069B2225AC1CE0FE7A0CE77003E7E5BDF8B31AF821000813E6C56B8C1771D6EE7039B2FBD0A68E8AD70A3944B677937897 -Test: Encrypt -Seek: 192 -Ciphertext: 4B62A4881FA1AF9560586510D5527ED48A51ECAFA4DECEEBBDDC10E9918D44AB26B10C0A31ED242F146C72940C6E9C3753F641DA84E9F68B4F9E76B6C48CA5AC -Test: Encrypt -Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/reduced/8-rounds/verified.test-vectors?rev=210&view=auto -Comment: Set 1, vector# 0 -Rounds: 8 -Key: 80000000000000000000000000000000 -IV: 0000000000000000 -Plaintext: r64 00 -Seek: 0 -Ciphertext: A9C9F888AB552A2D1BBFF9F36BEBEB337A8B4B107C75B63BAE26CB9A235BBA9D784F38BEFC3ADF4CD3E266687EA7B9F09BA650AE81EAC6063AE31FF12218DDC5 -Test: Encrypt -Seek: 192 -Ciphertext: BB5B6BB2CC8B8A0222DCCC1753ED4AEB23377ACCBD5D4C0B69A8A03BB115EF71871BC10559080ACA7C68F0DEF32A80DDBAF497259BB76A3853A7183B51CC4B9F -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: XSalsa20 -Source: created by Wei Dai using naclcrypto-20090308 -Key: 1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389 -IV: 69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37 -Plaintext: r139 00 -Ciphertext: \ -eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880\ -309e645a74e9e0a60d8243acd9177ab51a1beb8d5a2f5d700c093c5e55855796\ -25337bd3ab619d615760d8c5b224a85b1d0efe0eb8a7ee163abb0376529fcc09\ -bab506c618e13ce777d82c3ae9d1a6f972d4160287cbfe60bf2130fc0a6ff604\ -9d0a5c8a82f429231f0080 -Key: a6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff88030 -IV: 9e645a74e9e0a60d8243acd9177ab51a1beb8d5a2f5d700c -Plaintext: 093c5e5585579625337bd3ab619d615760d8c5b224a85b1d0efe0eb8a7ee163abb0376529fcc09bab506c618e13ce777d82c3ae9d1a6f972d4160287cbfe60bf2130fc0a6ff6049d0a5c8a82f429231f008082e845d7e189d37f9ed2b464e6b919e6523a8c1210bd52a02a4c3fe406d3085f5068d1909eeeca6369abc981a42e87fe665583f0ab85ae71f6f84f528e6b397af86f6917d9754b7320dbdc2fea81496f2732f532ac78c4e9c6cfb18f8e9bdf74622eb126141416776971a84f94d156beaf67aecbf2ad412e76e66e8fad7633f5b6d7f3d64b5c6c69ce29003c6024465ae3b89be78e915d88b4b5621d -Ciphertext: b2af688e7d8fc4b508c05cc39dd583d6714322c64d7f3e63147aede2d9534934b04ff6f337b031815cd094bdbc6d7a92077dce709412286822ef0737ee47f6b7ffa22f9d53f11dd2b0a3bb9fc01d9a88f9d53c26e9365c2c3c063bc4840bfc812e4b80463e69d179530b25c158f543191cff993106511aa036043bbc75866ab7e34afc57e2cce4934a5faae6eabe4f221770183dd060467827c27a354159a081275a291f69d946d6fe28ed0b9ce08206cf484925a51b9498dbde178ddd3ae91a8581b91682d860f840782f6eea49dbb9bd721501d2c67122dea3b7283848c5f13e0c0de876bd227a856e4de593a3 -Test: Encrypt -IV: b2af688e7d8fc4b508c05cc39dd583d6714322c64d7f3e63 -Ciphertext: 418078fe843f5984dd3c7975d1ff51af4dceda640999aaa3c28618ae286ca15051cb4d55f9da22a213ef14a2b905b52c99a557854c7f2a6d6ed6f69c1c6649f3fb67b8628468029b3367920c2e1148aa1f3b9c695cb1426f09ce84045842946e0454e41ab1edb32cae4b95669de4e2ccaf00ba86ffeae6a9c5fce4153baddb0d8998a600537a9649939cb7d7a9c4e8cbca0fab77963abd516699879de0b1971dc7328668111ff5b77c253b9e6346d1a2ce6e390cd736156ad7f44b339cfb141f00e7a766c06e130b0c31d88980d2ad8814a2d641599162ab8af25d93067f06a49637eaf6523806b8fa07d56628bb -Test: Resync -Key: 9e1da239d155f52ad37f75c7368a536668b051952923ad44f57e75ab588e475a -IV: af06f17859dffa799891c4288f6635b5c5a45eee9017fd72 -Plaintext: feac9d54fc8c115ae247d9a7e919dd76cfcbc72d32cae4944860817cbdfb8c04e6b1df76a16517cd33ccf1acda9206389e9e318f5966c093cfb3ec2d9ee2de856437ed581f552f26ac2907609df8c613b9e33d44bfc21ff79153e9ef81a9d66cc317857f752cc175fd8891fefebb7d041e6517c3162d197e2112837d3bc4104312ad35b75ea686e7c70d4ec04746b52ff09c421451459fb59f -Ciphertext: 2c261a2f4e61a62e1b27689916bf03453fcbc97bb2af6f329391ef063b5a219bf984d07d70f602d85f6db61474e9d9f5a2deecb4fcd90184d16f3b5b5e168ee03ea8c93f3933a22bc3d1a5ae8c2d8b02757c87c073409052a2a8a41e7f487e041f9a49a0997b540e18621cad3a24f0a56d9b19227929057ab3ba950f6274b121f193e32e06e5388781a1cb57317c0ba6305e910961d01002f0 -Test: Encrypt -IV: 2c261a2f4e61a62e1b27689916bf03453fcbc97bb2af6f32 -Ciphertext: 7030af4a9db8a6b95f55f962efefcc60d8ceb0d5d920e808cebd8cf6f31542d227a67c9db8888cfcb9410ae357f8a3da06a608a93b7fd5513978c6b8b837f6ecaafd3366495cdd3ab719d9d4c2ac74d6ea2eb117f30369ea62727fa6dc7982f668fa3bf44c9da8e70ff8c18b07d63aa01afe1311bdafc457d06c69aaea0dfbb1fc89d1574ad1e7be8b459d4cf36bdd88db0363219652089c50 -Test: Resync -Key: d5c7f6797b7e7e9c1d7fd2610b2abf2bc5a7885fb3ff78092fb3abe8986d35e2 -IV: 744e17312b27969d826444640e9c4a378ae334f185369c95 -Plaintext: 7758298c628eb3a4b6963c5445ef66971222be5d1a4ad839715d1188071739b77cc6e05d5410f963a64167629757 -Ciphertext: 27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360db1bdfea7c0aa613913e10f7a60fec04d11e65f2d64e -Test: Encrypt -IV: 27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360 -Ciphertext: ed158a1dd07f4316d403af3e6977afaac8205d678b38fa5928c61e366ff27003143d5d20482a2ea76a50756225a4 -Test: Resync -Key: 737d7811ce96472efed12258b78122f11deaec8759ccbd71eac6bbefa627785c -IV: 6fb2ee3dda6dbd12f1274f126701ec75c35c86607adb3edd -Plaintext: 501325fb2645264864df11faa17bbd58312b77cad3d94ac8fb8542f0eb653ad73d7fce932bb874cb89ac39fc47f8267cf0f0c209f204b2d8578a3bdf461cb6a271a468bebaccd9685014ccbc9a73618c6a5e778a21cc8416c60ad24ddc417a130d53eda6dfbfe47d09170a7be1a708b7b5f3ad464310be36d9a2a95dc39e83d38667e842eb6411e8a23712297b165f690c2d7ca1b1346e3c1fccf5cafd4f8be0 -Ciphertext: 6724c372d2e9074da5e27a6c54b2d703dc1d4c9b1f8d90f00c122e692ace7700eadca942544507f1375b6581d5a8fb39981c1c0e6e1ff2140b082e9ec016fce141d5199647d43b0b68bfd0fea5e00f468962c7384dd6129aea6a3fdfe75abb210ed5607cef8fa0e152833d5ac37d52e557b91098a322e76a45bbbcf4899e790618aa3f4c2e5e0fc3de93269a577d77a5502e8ea02f717b1dd2df1ec69d8b61ca -Test: Encrypt -IV: 6724c372d2e9074da5e27a6c54b2d703dc1d4c9b1f8d90f0 -Ciphertext: cfb653dd50a04a8580847d5bb98dc15e27c60f5a70da635718ba6d589f47935ed476fc960ffaf3b8750a59171b1434429a977ba878aea7ace8dd083a9238585112591165d0948a86e89e6118d572aa85667cceffd78a60baa5a152dc5e29bdd93f7389edde1541eec2f3aac38ea2bfc812f73de7e2e7b1322468f823a2c7c16e30fe9283894ac057da5c45a67f4988b4edafeb51c1b4a51a849d188b15838552 -Test: Resync -Key: 760158da09f89bbab2c99e6997f9523a95fcef10239bcca2573b7105f6898d34 -IV: 43636b2cc346fc8b7c85a19bf507bdc3dafe953b88c69dba -Plaintext: d30a6d42dff49f0ed039a306bae9dec8d9e88366cc19e8c3642fd58fa0794ebf8029d949730339b0823a51f0f49f0d2c71f1051c1e0e2c86941f172789cdb1b0107413e70f982ff9761877bb526ef1c3eb1106a948d60ef21bd35d32cfd64f89b79ed63ecc5cca56246af736766f285d8e6b0da9cb1cd21020223ffacc5a32 -Ciphertext: c815b6b79b64f9369aec8dce8c753df8a50f2bc97c70ce2f014db33a65ac5816bac9e30ac08bdded308c65cb87e28e2e71b677dc25c5a6499c1553555daf1f55270a56959dffa0c66f24e0af00951ec4bb59ccc3a6c5f52e0981647e53e439313a52c40fa7004c855b6e6eb25b212a138e843a9ba46edb2a039ee82a263abe -Test: Encrypt -IV: c815b6b79b64f9369aec8dce8c753df8a50f2bc97c70ce2f -Ciphertext: ab7204ab4f995c2d87376c3586f0261250907ab2c25e2d232f10f51f0f3a3f11ff704ba188a508301fb9d5f7e4d55070631ecd2e3be5d79d4fa67f4f4acb3879afc2dc18c09446489b79dd3043f74027e9a24a54d8babe757c9a3470a95cb7b7b093331e32534b337d697046f7349bcfa89036b3cf50ecfc6f1e61300a49b6 -Test: Resync -Key: 27ba7e81e7edd4e71be53c07ce8e633138f287e155c7fa9e84c4ad804b7fa1b9 -IV: ea05f4ebcd2fb6b000da0612861ba54ff5c176fb601391aa -Plaintext: e09ff5d2cb050d69b2d42494bde5825238c756d6991d99d7a20d1ef0b83c371c89872690b2fc11d5369f4fc4971b6d3d6c078aef9b0f05c0e61ab89c025168054defeb03fef633858700c58b1262ce011300012673e893e44901dc18eee3105699c44c805897bdaf776af1833162a21a -Ciphertext: a23e7ef93c5d0667c96d9e404dcbe6be62026fa98f7a3ff9ba5d458643a16a1cef7272dc6097a9b52f35983557c77a11b314b4f7d5dc2cca15ee47616f861873cbfed1d32372171a61e38e447f3cf362b3abbb2ed4170d89dcb28187b7bfd206a3e026f084a7e0ed63d319de6bc9afc0 -Test: Encrypt -IV: a23e7ef93c5d0667c96d9e404dcbe6be62026fa98f7a3ff9 -Ciphertext: 5c77efcb16097df824bd58cd3498e07af1c761740b5539929115e2caf3bc10eed2a16254a4306f4e20827247900276ce887362990c070c0f79e15987473b7ad240e7a9f8e6e3f020fb337438cc3c8b81c4cdbfbdd7b543b13a48a4959744f3efcb99a939c0599ce32f816d12c2b47a2f -Test: Resync -Key: 6799d76e5ffb5b4920bc2768bafd3f8c16554e65efcf9a16f4683a7a06927c11 -IV: 61ab951921e54ff06d9b77f313a4e49df7a057d5fd627989 -Plaintext: 472766 -Ciphertext: 8fd7df -Test: Encrypt -IV: 8fd7dfcb16097df824bd58cd3498e07af1c761740b553992 -Ciphertext: 85e098 -Test: Resync -Key: f68238c08365bb293d26980a606488d09c2f109edafa0bbae9937b5cc219a49c -IV: 5190b51e9b708624820b5abdf4e40fad1fb950ad1adc2d26 -Plaintext: 47ec6b1f73c4b7ff5274a0bfd7f45f864812c85a12fbcb3c2cf8a3e90cf66ccf2eacb521e748363c77f52eb426ae57a0c6c78f75af71284569e79d1a92f949a9d69c4efc0b69902f1e36d7562765543e2d3942d9f6ff5948d8a312cff72c1afd9ea3088aff7640bfd265f7a9946e606abc77bcedae6bddc75a0dba0bd917d73e3bd1268f727e0096345da1ed25cf553ea7a98fea6b6f285732de37431561ee1b3064887fbcbd71935e02 -Ciphertext: 36160e88d3500529ba4edba17bc24d8cfaca9a0680b3b1fc97cf03f3675b7ac301c883a68c071bc54acdd3b63af4a2d72f985e51f9d60a4c7fd481af10b2fc75e252fdee7ea6b6453190617dcc6e2fe1cd56585fc2f0b0e97c5c3f8ad7eb4f31bc4890c03882aac24cc53acc1982296526690a220271c2f6e326750d3fbda5d5b63512c831f67830f59ac49aae330b3e0e02c9ea0091d19841f1b0e13d69c9fbfe8a12d6f30bb734d9d2 -Test: Encrypt -IV: 36160e88d3500529ba4edba17bc24d8cfaca9a0680b3b1fc -Ciphertext: f003b213737415a81894a3d3d8fe4e4434d4df2b253d60c44609bdc0414cedf8bae297ecdb1d0b92393dd6dd7027b555388ac8a66308082fc6327ad94ad96223003de15c48a06e9cd99b5561e7fc5949c6ba8cf11d6ba1374ec32062caef541e7252d168781aab4c637793433b3998c5a5013fd35c336600a02765ddbf52b97ae80dbfbbe55e43c6bd5f746a1c2df4c80611c76a90308c47b2807876249d6d3c507a1a96c2bbb8242ccd -Test: Resync -Key: 45b2bd0de4ed9293ec3e26c4840faaf64b7d619d51e9d7a2c7e36c83d584c3df -IV: 546c8c5d6be8f90952cab3f36d7c1957baaa7a59abe3d7e5 -Plaintext: 5007c8cd5b3c40e17d7fe423a87ae0ced86bec1c39dc07a25772f3e96dabd56cd3fd7319f6c9654925f2d87087a700e1b130da796895d1c9b9acd62b266144067d373ed51e787498b03c52faad16bb3826fa511b0ed2a19a8663f5ba2d6ea7c38e7212e9697d91486c49d8a000b9a1935d6a7ff7ef23e720a45855481440463b4ac8c4f6e7062adc1f1e1e25d3d65a31812f58a71160 -Ciphertext: 8eacfba568898b10c0957a7d44100685e8763a71a69a8d16bc7b3f88085bb9a2f09642e4d09a9f0ad09d0aad66b22610c8bd02ff6679bb92c2c026a216bf425c6be35fb8dae7ff0c72b0efd6a18037c70eed0ca90062a49a3c97fdc90a8f9c2ea536bfdc41918a7582c9927fae47efaa3dc87967b7887dee1bf071734c7665901d9105dae2fdf66b4918e51d8f4a48c60d19fbfbbcba -Test: Encrypt -IV: 8eacfba568898b10c0957a7d44100685e8763a71a69a8d16 -Ciphertext: f17808cf21dba4762ced5fcc264f615a4619d8d5ee3278dbdacf14a799f8ee5f8a38a7fd9d262b336e51a8790c90fb8f0b63a49edae81f9a200ad73d9ed5ce6257524b506d7a219013e3e44a1f2a264b7f7f121e5d4765d0bdfe4a36fc51e48ee21e9dcbc3dc2541405bbdb90490fd786b942a07786094fc990be21e5b746d522cad26269a76c85134ee654f33485807fc28cf87ac37 -Test: Resync -Key: fe559c9a282beb40814d016d6bfcb2c0c0d8bf077b1110b8703a3ce39d70e0e1 -IV: b076200cc7011259805e18b304092754002723ebec5d6200 -Plaintext: 6db65b9ec8b114a944137c821fd606be75478d928366d5284096cdef782fcff7e8f59cb8ffcda979757902c5ffa6bc477ceaa4cb5d5ea76f94d91e833f823a6bc78f1055dfa6a97bea8965c1cde67a668e001257334a585727d9e0f7c1a06e88d3d25a4e6d9096c968bf138e116a3ebeffd4bb4808adb1fd698164ba0a35c709a47f16f1f4435a2345a9194a00b95abd51851d505809a6077da9baca5831afff31578c487ee68f2767974a98a7e803aac788da98319c4ea8eaa3d394855651f484cef543f537e35158ee29 -Ciphertext: 4dce9c8f97a028051b0727f34e1b9ef21f06f0760f36e71713204027902090ba2bb6b13436ee778d9f50530efbd7a32b0d41443f58ccaee781c7b716d3a96fdec0e3764ed7959f34c3941278591ea033b5cbadc0f1916032e9bebbd1a8395b83fb63b1454bd775bd20b3a2a96f951246ac14daf68166ba62f6cbff8bd121ac9498ff8852fd2be975df52b5daef3829d18eda42e715022dcbf930d0a789ee6a146c2c7088c35773c63c06b4af4559856ac199ced86863e4294707825337c5857970eb7fddeb263781309011 -Test: Encrypt -IV: 4dce9c8f97a028051b0727f34e1b9ef21f06f0760f36e717 -Ciphertext: 534f5151319c299d7356be2275ed2137fab66742797370b511e5150dcf7bc75c06d5249e8e8bd7c16e563cc7d99368a7a7f47f811a2ae2b632c73e9f49641bf9954d4df19c2778221d780f799806757738b327e6aeebab6bb22137f8b994c1e08baff75bb2774576bce2deb599817fc7a69860c538efffe91439f4714e4629b00a25b5b1a6be8aa7da2be33bad953481926e0067a70d4ff1a7bd0111e605ef6a2d66fa7af43d746c24a5d464dd6f75773aa9b65bbdfad9b82fe80f182b144cea9211d0b2472de873008509 -Test: Resync -Key: 0ae10012d7e56614b03dcc89b14bae9242ffe630f3d7e35ce8bbb97bbc2c92c3 -IV: f96b025d6cf46a8a12ac2af1e2aef1fb83590adadaa5c5ea -Plaintext: ea0f354e96f12bc72bbaa3d12b4a8ed879b042f0689878f46b651cc4116d6f78409b11430b3aaa30b2076891e8e1fa528f2fd169ed93dc9f84e24409eec2101daf4d057be2492d11de640cbd7b355ad29fb70400fffd7cd6d425abeeb732a0eaa4330af4c656252c4173deab653eb85c58462d7ab0f35fd12b613d29d473d330310dc323d3c66348bbdbb68a326324657cae7b77a9e34358f2cec50c85609e73056856796e3be8d62b6e2fe9f953 -Ciphertext: e8abd48924b54e5b80866be7d4ebe5cf4274cafff08b39cb2d40a8f0b472398aedc776e0793812fbf1f60078635d2ed86b15efcdba60411ee23b07233592a44ec31b1013ce8964236675f8f183aef885e864f2a72edf4215b5338fa2b54653dfa1a8c55ce5d95cc605b9b311527f2e3463ffbec78a9d1d65dabad2f338769c9f43f133a791a11c7eca9af0b771a4ac32963dc8f631a2c11217ac6e1b9430c1aae1ceebe22703f429998a8fb8c641 -Test: Encrypt -IV: e8abd48924b54e5b80866be7d4ebe5cf4274cafff08b39cb -Ciphertext: e8c59b616dd10474930c432422d23d8df8dee1c626def1278eb6c9828435c0c8a98aea9d350752a78cf0cf1de7973436605f22b0d40b9059d777c55c8fd02cd9dbab6888161ed28979c64b700d7ea48038edf36af21078713f844f5f23a4f271aad3562ed2cd773de622fff2f0b5785672760a7064e5415c76ffec522eb1225868345e89a9fcbb4f12c1176b01550fe7a74f750dc43d6fa4718c33ba99b0084c7a1a8e245c8566056296aabe13af -Test: Resync -Key: 082c539bc5b20f97d767cd3f229eda80b2adc4fe49c86329b5cd6250a9877450 -IV: 845543502e8b64912d8f2c8d9fffb3c69365686587c08d0c -Plaintext: a96bb7e910281a6dfad7c8a9c370674f0ceec1ad8d4f0de32f9ae4a23ed329e3d6bc708f876640a229153ac0e7281a8188dd77695138f01cda5f41d5215fd5c6bdd46d982cb73b1efe2997970a9fdbdb1e768d7e5db712068d8ba1af6067b5753495e23e6e1963af012f9c7ce450bf2de619d3d59542fb55f3 -Ciphertext: 835da74fc6de08cbda277a7966a07c8dcd627e7b17adde6d930b6581e3124b8baad096f693991fedb1572930601fc7709541839b8e3ffd5f033d2060d999c6c6e3048276613e648000acb5212cc632a916afce290e20ebdf612d08a6aa4c79a74b070d3f872a861f8dc6bb07614db515d363349d3a8e3336a3 -Test: Encrypt -IV: 835da74fc6de08cbda277a7966a07c8dcd627e7b17adde6d -Ciphertext: a91f3039c37f753857510f121cbbab8f942b41a4d04815729361268c84abed9fd3dd2c0a84ea5dc3cab46245f720d8f0fd81ce4c7837aae561186f66ae70db9e5c2238f1b417b0ab001eada16d1f9bcc2ed74d335fe8da60bebd8b1c4ae4c51d8c46eec7d1fd575a5824bced85b02bfcb1e11d5686471b2791 -Test: Resync -Key: 3d02bff3375d403027356b94f514203737ee9a85d2052db3e4e5a217c259d18a -IV: 74216c95031895f48c1dba651555ebfa3ca326a755237025 -Plaintext: 0d4b0f54fd09ae39baa5fa4baccf2e6682e61b257e01f42b8f -Ciphertext: 16c4006c28365190411eb1593814cf15e74c22238f210afc3d -Test: Encrypt -IV: 16c4006c28365190411eb1593814cf15e74c22238f210afc -Ciphertext: c86458ffa23d50437f3385ea7d3fbae5cdc1df7a14658b8316 -Test: Resync -Key: ad1a5c47688874e6663a0f3fa16fa7efb7ecadc175c468e5432914bdb480ffc6 -IV: e489eed440f1aae1fac8fb7a9825635454f8f8f1f52e2fcc -Plaintext: aa6c1e53580f03a9abb73bfdadedfecada4c6b0ebe020ef10db745e54ba861caf65f0e40dfc520203bb54d29e0a8f78f16b3f1aa525d6bfa33c54726e59988cfbec78056 -Ciphertext: 02fe84ce81e178e7aabdd3ba925a766c3c24756eefae33942af75e8b464556b5997e616f3f2dfc7fce91848afd79912d9fb55201b5813a5a074d2c0d4292c1fd441807c5 -Test: Encrypt -IV: 02fe84ce81e178e7aabdd3ba925a766c3c24756eefae3394 -Ciphertext: 5526b8ff95272e95ad298c30f9f165353ecf0f68aa2943476ec53c386cf07c465b677be13d01279779965dda94d23fe9452dc4934e344c2ee0f6f5e32efc2b3f79630492 -Test: Resync -Key: 053a02bedd6368c1fb8afc7a1b199f7f7ea2220c9a4b642a6850091c9d20ab9c -IV: c713eea5c26dad75ad3f52451e003a9cb0d649f917c89dde -Plaintext: 8f0a8a164760426567e388840276de3f95cb5e3fadc6ed3f3e4fe8bc169d9388804dcb94b6587dbb66cb0bd5f87b8e98b52af37ba290629b858e0e2aa7378047a26602 -Ciphertext: 516710e59843e6fbd4f25d0d8ca0ec0d47d39d125e9dad987e0518d49107014cb0ae405e30c2eb3794750bca142ce95e290cf95abe15e822823e2e7d3ab21bc8fbd445 -Test: Encrypt -IV: 516710e59843e6fbd4f25d0d8ca0ec0d47d39d125e9dad98 -Ciphertext: aadb7c36647ded09fca7587edfa9bbe81911925fa8996330c8e7b77601075e5f94404db9f82c67e2cd39d1649062d4c30cf23bc28f9ddd6d5b9ec586a7de7f8ef45560 -Test: Resync -Key: 5b14ab0fbed4c58952548a6cb1e0000cf4481421f41288ea0aa84add9f7deb96 -IV: 54bf52b911231b952ba1a6af8e45b1c5a29d97e2abad7c83 -Plaintext: 37fb44a675978b560ff9a4a87011d6f3ad2d37a2c3815b45a3c0e6d1b1d8b1784cd468927c2ee39e1dccd4765e1c3d676a335be1ccd6900a45f5d41a317648315d8a8c24adc64eb285f6aeba05b9029586353d303f17a807658b9ff790474e1737bd5fdc604aeff8dfcaf1427dcc3aacbb0256badcd183ed75a2dc52452f87d3c1ed2aa583472b0ab91cda20614e9b6fdbda3b49b098c95823cc72d8e5b717f2314b0324e9ce -Ciphertext: ae6deb5d6ce43d4b09d0e6b1c0e9f46157bcd8ab50eaa3197ff9fa2bf7af649eb52c68544fd3adfe6b1eb316f1f23538d470c30dbfec7e57b60cbcd096c782e7736b669199c8253e70214cf2a098fda8eac5da79a9496a3aae754d03b17c6d70d1027f42bf7f95ce3d1d9c338854e158fcc803e4d6262fb639521e47116ef78a7a437ca9427ba645cd646832feab822a208278e45e93e118d780b988d65397eddfd7a819526e -Test: Encrypt -IV: ae6deb5d6ce43d4b09d0e6b1c0e9f46157bcd8ab50eaa319 -Ciphertext: 89e9c51abd31d6156b96c4e82ef0dfe5c376bd6324750fdbc46e5ae63897323c816fb5bb8e6bf4335853e512cc334dbbfecccfe4e5c8fe8289963ee7127f3ac56bc26b7bd4f0d1e0afb06bde930e7587eedf07995d5052bbff5453147c1555a7c8534111295bb5ab9e89645cc330ae3e0d9294c9e7d6d841579e93aefeaed879f8e8299459a3c07e3c9dee497360510668c5246970ad39077e8d8935b0d885f11d2f06dee0d7 -Test: Resync -Key: d74636e3413a88d85f322ca80fb0bd650bd0bf0134e2329160b69609cd58a4b0 -IV: efb606aa1d9d9f0f465eaa7f8165f1ac09f5cb46fecf2a57 -Plaintext: f85471b75f6ec81abac2799ec09e98e280b2ffd64ca285e5a0109cfb31ffab2d617b2c2952a2a8a788fc0da2af7f530758f74f1ab56391ab5ff2adbcc5be2d6c7f49fbe8118104c6ff9a23c6dfe52f57954e6a69dcee5db06f514f4a0a572a9a8525d961dae72269b987189d465df6107119c7fa790853e063cba0fab7800ca932e258880fd74c33c784675bedad0e7c09e9cc4d63dd5e9713d5d4a0196e6b562226ac31b4f57c04f90a181973737ddc7e80f364112a9fbb435ebdbcabf7d490ce52 -Ciphertext: b2b795fe6c1d4c83c1327e015a67d4465fd8e32813575cbab263e20ef05864d2dc17e0e4eb81436adfe9f638dcc1c8d78f6b0306baf938e5d2ab0b3e05e735cc6fff2d6e02e3d60484bea7c7a8e13e23197fea7b04d47d48f4a4e5944174539492800d3ef51e2ee5e4c8a0bdf050c2dd3dd74fce5e7e5c37364f7547a11480a3063b9a0a157b15b10a5a954de2731ced055aa2e2767f0891d4329c426f3808ee867bed0dc75b5922b7cfb895700fda016105a4c7b7f0bb90f029f6bbcb04ac36ac16 -Test: Encrypt -IV: b2b795fe6c1d4c83c1327e015a67d4465fd8e32813575cba -Ciphertext: 0a8a907dc7f30f6f68eec465ead25768383956a304aa32e4ccea6e3756cbb19f2751e3b68339ade1499004a88170e44620529d3c568cb1e014c16548830dfbce1b47a2dcdd28e59bb0daf5908c5ff51817bd119fe33bda07d63e93a3522685eb101d912b02d093780d10884959ae4a49e2fb7fca51b81394f09314879a41f6dc2f4a7dc34e88da4747a5a1fc15dcb207d13222f08f91f079eafbded0d6036325f607ff29ff2fc7635e8c3767d61a3b7814227d6a2798d623bfdf674604e4e9e03529 -Test: Resync -Key: ea060c72f6e0080fd4a9a2131c9d684902415cab34fce4e52d62273e3c385f37 -IV: 5826043957a27509423fdd82f34935928a4b23a84ede72c8 -Plaintext: 20ae58dbf5c20225c35518711a86a19a61d5ba47ab17e8c5fa9658333d40ed31bffb79cde927c36baf61ed8df37acac330f64471bd91d90bfafa72dc8cdb6ed95ec6610cd6e8f2859255216a3eb4b573410d5644a40e4f0fa785d556304489c0023a1991eb0d01b5 -Ciphertext: 6025c4d5bcc769cc3e67b88340b4101690eb283654c761f8a0af360926313129f16d1c9358ecbaf66acd85787c7c1f52a953bc05e91d43bf3d94d341bffc5913435fb3a8e6264ccd1c355472929a140fe30a22689b055082c70395e0b070a3f0967ab36848cdf3d9 -Test: Encrypt -IV: 6025c4d5bcc769cc3e67b88340b4101690eb283654c761f8 -Ciphertext: a420fde6c359342819ed9c07853c594c0098fd2a3c8da24713dbd12261b528e43af7dd52ddf1a1b553d08c20b0ab399c38a067fb115368c990d9e839735c8427aa885eacb5c2900d1d04afdd3d35793f11c78dd826c5d09351f39823a13976eaa5a49b0bdb054043 -Test: Resync -Key: 115aaaa3a3827fb05175412dc6478747d7c128ce2637b6afdfe3213f7b0b6991 -IV: f8cbe32bdb4c8eac3a571f186ef683b9eb902302ff7ac746 -Plaintext: b09472fbdaa3e4bdb7b04c8819fb3257f764154d09cea22e9a67b40f7e601a97c469811773d2733eb4ab0da6249f237d4c063012fd06714a726b24a512daa7e287d39818980a6720abc45f10aab7d71da318244507b5a9d0aeae76ec5efd3b5ce167c38196744d13b07a14805ee49dc4421e0c59d559e8518a9911682ce1d2b307ccba48dd98c003103421ae6253c6a2476dda5d11cb3d5e7d6dc2c02499d5731095ee89f77c7d4ef27231fd6e9e854d1ed84b0b47bc4794e68e055e1d83d75ab527a53ebefa4d363f952562ac1aa47635296d55e2d5d1b8e214c95445bd586c7f82b31839ff78a60f0063 -Ciphertext: 50c5e2584d473a696c797ff1668137e331bcd9a1ecd5c146422a9140de87c10996d407c5eb8335b5bdb7a9b1613ccc198d5157c6f89d409e1ce7958605d68d442e1b10179c13e12ec33f98d676ae4be95ac7a82786402b1491918a6526e9676037d04fa7aebfd9afd39f6d10dc663877ebbb67aa82c6089529218db9622bd0af7e722e72265e25524d827da8eea6d7e0daf94c516ba24ecca2d820959c0dc939252158903d97139f6fcd81752deb3e9108fc62178bf54797c428e0887d1849fb5004c3b76f0d466afffd47f5066d6dfcbe4782319738e90fa19de6b99861bfc9e8112df4573bb38b1b9e35 -Test: Encrypt -IV: 50c5e2584d473a696c797ff1668137e331bcd9a1ecd5c146 -Ciphertext: 280303c6467f6badc300961c549c33f249c6d2df0596a459383b4c995b296854dea2072d04e46cd47c3380c4be6f6456e8759a5ab2025bd20ae6d116b0bba77b4f03aaa118c73e50f48755a89474c4380e8bbecffc4d6c84514711094ef67c2ed8b81a07c2afa41a19709e69d0bea22067eb3ce3618d80066f9c9f333eea1a624cc4d4dbfb0134004d1d6d295751c7a134cfd29cc85045734e2a4400c261cca16bca4c7e4622837eeed6ddc64c0999347248081aedd3f4d911ad5c92aa491b05510adcb0bcd7c0711a964f176775f11d8b00d9e4264afbb4d6b6a81760d964ca495485895ebba1dd1d2bf9 -Test: Resync -Key: da4147528d2e7862009aa772051e60e309721eeef4b4bcd7f98ae8d0561960b3 -IV: b625057bd07c1385fc08bdc14d735e5832dce5aa0045d9e4 -Plaintext: 6db3a848beb8a6e9670ed91427364c9b042d000a14eb2ac4c6097625e20b2e8eb367c156f927262d2251974d5953f17d00b4ed6b4d93513a19ee6b4f1a159bec8ff94151a7bdd6074d12d343fd852fa69a26302a11caf57417e950723c5a5e795de4cb6523fede7af6b6cb68f41931a1eebea6079e8018fe4116e7b03df7 -Ciphertext: 399c5bf3b894e3dcb5881fdcd927d8cf4ececa5140b2425df5cb2cb993b6901f736e94fb847de41b7c32ae990510402ce5e99a34b5acbb3b5aefbe55be4707025ffcfd6605b6ebeffca3c1ed3c42cba900eb5f14c195e5c574eae67e7355b780403e44ebc91f81fb04f95759f78999fe619d5b8f9fb2185c0e14cadfa8dd -Test: Encrypt -IV: 399c5bf3b894e3dcb5881fdcd927d8cf4ececa5140b2425d -Ciphertext: ebb1d4ebb394e185fddd72fad5efa8434465a9ce758fbdae25cdc6b1278b2e137f5afa706c5a8e95684fcf6645c6c2f67f698621c7d6c7f1899be12e2f6c9e480315c12f02405b8bcf45f4a715eeb72f12e0fef15740734747764e698ee88d05ab30028c9ee237a48b50c8fc453b7d370daad88e57a572a9cb8091526861 -Test: Resync -Key: d61f8e75dc9295dc029292764f3ed08dfb6fd725cae4b0e47aceecaefcf654d8 -IV: a6046a92ad15e9f9d8027ff39bfbf534d46fec35bc9cd94f -Plaintext: c11f014781804645ca22ca213a5558a038090341f3f70aa1df0bf135fb8d0184d77783b519c9c2b2b0b748880a85bab986de7a37a4a11bcbb5c0c87676d7808fd41abbfd0d7a11a7c545405a4ae42f60baa22ccee6de0272e79610c7b885b70ba9bf027657abae393cc8f56735faab9f6fbe36e7a4d99ce15cdac24223880bfb5865ac7acf01ea833098fb148406e6 -Ciphertext: f3b2a1188c33e96124f383b8b75dcacbf782f728eaf436db05551ae2be1a77f09c9ea009d8651329d0a812580d1e11d0f64c44e245bf30dd9c8033b72d0e5049131063c5fc2a3f219e6c1bd993c8961cc174eebb655574dd45b73d0d804f5190f92e385dfd7c2a4ff430ed6dabd41db040aca8ece7f11de796478026f48337f763cf69aef12609384f0ae72ee38c8c -Test: Encrypt -IV: f3b2a1188c33e96124f383b8b75dcacbf782f728eaf436db -Ciphertext: a9b213db6c8e161687e1b63f32a806f15aa8b3ee60cd37d7d437f90b446c3361d37893b702dfe774e5e5ce486399cd408fbf6ca1005768bf7825130c061e43f6077080438514f1a8ecdc6ff7cc264122b1a55c849c76328e833667326f23670590b77f2bfb9a666bcc4c44c16efd6c506c37ec62de8e5365ee894670ac4264b807a8455d8df05ba45af51ff1fee343 -Test: Resync -Key: 0f2850f98634181f49e53bf49d2f822fbf75e5f77c6cd7487541c514a4101ce7 -IV: d6defb4e74c327d89123bdc1d1c6d2fce6b745079bc2c9ef -Plaintext: a064bd9bdab0ee26530c2d26be556cd67295180bca445dfc87954bc51b28a21b606a229cf5a41fa104c51c3f32003a65064ff73e66691e4d2b1a22d236232be18677d54aba7ad49edcc9284897a7f88945513460166e5dfd7650959c05328abc0a7e95c352dbc227ca17 -Ciphertext: 51de41664070aec657612a57641c0c83ae14f5b3b25b25d916e0cdfae1c1bd21f7b47d9ab02b6841e115394cad58a568c1d7c2559a1d3fcd9cb4b25529d26e475ae313e6487538d16376a6b24e5cf27d2dbf4c83bd18996594f60549f34a8683b04d05198893a816adbb -Test: Encrypt -IV: 51de41664070aec657612a57641c0c83ae14f5b3b25b25d9 -Ciphertext: b5f57b5f00d2bf5f48828a4e793997e6d12b0f14953f5b1634cba91867776f75d2d2d247799a46080372046518416c60a07a65b2aa1318238597c320360a279e7633045bc43cf41bf9d366eafc7613b090a41fd8db3f684afc03d96c82a40b46e2994438febf268020c4 -Test: Resync -Key: 5cf680e8a11eb005d03fdc3d4ec0e129e6aceb47262dee6c452a5b8b0ef1b450 -IV: 6a6920ddba39b5a2640976ca10c97bf308a8cdd70ea98260 -Plaintext: 1f322b31f5f577a596b0fbe567864c7ce2973b41f924205defe08e2866b7fb5c1814d664d33957614e91668bb15d9848ffb93dc08c1f74c5f5e1f88148d1a1a7ad47395b75834de4988adfbf7e58a38157544c2be5b913152c1d00 -Ciphertext: 64d6c9ca4db201d95afc0dce28f6e47d51c2856ccbbc8f4c2e2bd2d834aca165dedd117b0be9a7dcd21eb22b508f4ecd0236075b064a0ced23e324b18b2bf2cda1c4416f78c740e51ce687cd37842be368fc4e6ba7cb312d89ea7a -Test: Encrypt -IV: 64d6c9ca4db201d95afc0dce28f6e47d51c2856ccbbc8f4c -Ciphertext: 9f4090fc504efc0f6bb5f76ac9881e1379da9f700737d86e9636714debc5c4eb3276fcff90bf71c32a71e06c199b3431475ab77410e83a7eba158723efb383a5437731a136758aaf7d39f0def719b0dd46798d9d53a30cd1b91eb3 -Test: Resync -Key: 9d27327495159927d0dd93e258908590343a57f6583e0d8aca07070ce41fd37a -IV: a01d1d7d1d43de5fcd60277f84dd8b93d08d480a77961f71 -Plaintext: e2ce8d1f9ee9329c3599e1880b9e6cb75d52e86f48ca89b829d4d7ca16d3e1b496b8b46097501793cdf6764ffd44b44013c7aadbf0ccfa4eab012529373a9022480f58877332b81f3c703ca80a77f429d944d5a877d89c6f64214c9ea6d3a098d9057d519354cfbb71a4bcddaee65de22e4d782ef0065952b891c9494d8a509e86d08ca31594015d3c31931d417cd048e59945d42ab74983434d14ef4e078f30ec2fe9ceb7e247d557b1d2593ab35896082c1c218dd73a868bc5cae74862b898395681234b20fa1ae9cab6a49b94bcc38a3a4a91cefc7745d094d9d8cab730cda4079705e4afd0f5e401 -Ciphertext: 94e0d546dbdcedd76e26629484ffd9b67b9c15f61b07df7ef0efce41270bdc9039ffad321c5b2d2847f6f4d5d105676fde08b8c47df248850dee1272d51feb42d503e58d67b61fff0a20abd999a5ad5942676aca3f31ce08614106fb692ae230c2a74339eb38c074bb59cf5ab42fcc428a0d629c12fbc3d845e84ed76c3f774e92c1109be12f00aa8ebd2a137a914e655081e6e60176cc98e849165d9d93235c605c8562f51bb407aeb8f330692d6245297817eebd32fa2ee96520b560e37019e9aadaea40f25ac4c5446fe93c5b39fc90152f088a5a936ba4efb10db7f246143f2cd151b1f1155e05a8 -Test: Encrypt -IV: 94e0d546dbdcedd76e26629484ffd9b67b9c15f61b07df7e -Ciphertext: 33203e910f56c5e1a63f3a801fdd772dfd1c3b0f3e012772bf0796337d95f4562c349f65557e76dc0aadb982d1aa3a3a865db36418bd1efcae36095fdb3ad68e1df72622d45d5336224caeb237adf9c19b02e23a1b9d4b32a5b6f39595a93d495a74cceeb4254e0b75f54277b80b153f62c8b5bdccae8d3ce24d8ee258f6d4ec6d631f6d1c8e8daa049d33076bea38acc5fda4a8822a16a693c936b340eb7951cd1ab0f7f58206252b0ebe46c77214dc86db136f8e170fc402f31e1c7ef9bc409b19260e4164c145aca28846ead4dc91783bcb1bd914a23d7bdf83745cb74c7ba66eca45457c53f42280 -Test: Resync -Key: b1a6c9bc9870d808a81612d0f4b335cbfd8b305150a6140627df06d9f8b24c0e -IV: 7313e9e505147d4a4c2023259ba01197169bac01af0d5bb0 -Plaintext: 479d7baf87a385c781f0dee6e51ee4f94eb2ee3e93bdbb3f402b0252496225d4118511ff893f4ddebcd31149920e259006cc7353ec5a95da4bc61ee6863282edc341afe9541d44958c2855b6714625ed2fde62db387e114fe837bbecee398351d187e0c93e0a0618f9d923504dd662c11e43af794e7ac7c99816c180ccfe1779bd2dd476ed68eb1736f421922fdc6696 -Ciphertext: 30a86c8b6a55670856e6d1b31d59602e05819022f12df1c67294fa138d65d5fd9f5e9192ad09604e08005537832d07ad5f4743bdbf137b7e18b8811066c7e411291fffc6e6ab55744789a225f15086173495279a4c628ffe4b1f8bb4d886bf74ada7d783b143edda1675ca9493ac1da04ae62584ce41c8a2c4f9fae79d94363bcf79c343e51ce5694c639bdbd8405781 -Test: Encrypt -IV: 30a86c8b6a55670856e6d1b31d59602e05819022f12df1c6 -Ciphertext: 33c313c0da87030169b7da6963644cdd257891b14fc1e4387d35faadc39279cca215e7079ec4272bc259e6499b0cb6dd52c6dff5965c7ddc9e951ac5c0056b4065a6f8eb5cc8e5373633a4aa3aa1736a67be11ef63c3418b1fe57730d6cce0f40e5bf02e61f6aae1404a813fd2a2a870960833be71dc73bff4a98718d64cb146a2ca5d41fcba85a56fa3d0413d0a807b -Test: Resync -Key: 4f9f97fd4ba7db6365f5fec9fde4e752c8bbde48a7ea986b878302e4cc8af9d5 -IV: 05788b5db4e3711eca900a2bfe6f78de44e98a70362504d7 -Plaintext: eb50b1e352f3fae6921fa7884c99365411928a2ffa33e3106768a773246c31cb0bca5cc166819b3b05819017f06c8b8932607db6d66d58d6a2f7356e4666ff7bec3a2223c12777fa54d9ed1dc139d9512c52e1e53762badc7e6f8da576afd940fb4a29d89e76fcdc93e515d69a6ca9efe5d053b7600b458b6719852ec4ad3c59d0b0a69971ac6ae53118c186f2d1a57e350ac3c8ad7d4e087c8f32816462f0506122fc01caa8c93aeebf0edf0c8e1cb726bfc861 -Ciphertext: c63f829e84c1c9709c49780a445bbf0dd441acc5304e0433ce0cd70af3fe98d36bd9e6fab17e6e8b50fda157e3ce9d2a928e8c234dd1700999047db4a28ea40a9657172a471f962d872a1d3342c12965aa1f1484e760979181ec8fde5472f509f76748fb4557b9b73fd517f70b20795caa1cd19e4dd5ac65e8f4cdb65a4ad60e0dd64407dc5232a5a893ace71acb35700fe059bb641497a2db63caf083942b7fe530092e90014bc5b6f889710ba3fc50d086fc32 -Test: Encrypt -IV: c63f829e84c1c9709c49780a445bbf0dd441acc5304e0433 -Ciphertext: 625aa1ac285ed59cb4b17da0ddb32a772eaf95181d0587fa92be22d1f5b65e403de9c0caa3301aa569ef9396c4cd06cffb602d5b5e6d2238712e74de51b0620733e1ba802038de3735b2a08951cbf17759f90cb0c4c4eb6a1acf147b54b7ac7372bafa4377fe7510d06a9c4ed6f972a669e270610a7084b61d4b52d2931803b805440b3d5e333ccdb0f3e7c0d013f068b2b402680a83210d71051da3529299343813150fb0f26ec053a8dac9993568e9b0c703ed -Test: Resync -Key: eee68b65fafe9a5bf2f9f92512a716e5af3740efea15e596f4ea0b5aef23550a -IV: 4d312f84330a107250b68c0b1df417ef713615b704d99b71 -Plaintext: 95ccd08ed2ab0fb87f55786f1f10d33c7713bef4435c3699b13982235ed040c9d9cb1b1f335cac0faf8654812f6874408bf20b129558a2c342c07c7f42a30700b374d18b91d881fc0f153f4ec1a55633a92d637212a11d122a9a1eb085439ea1226ea7124e8bd1c644a1996fa6369dedcacd5c766d7dc9a8c8682c5729ccf4d59433ba8e1569fe826089995414afd576ffb9686a30725fb9e5d7 -Ciphertext: 6c832a8147658a1741af29b0f558fa3773c81429f91a5cef270f7154988f97d4b28549604909f726a8a6e89d625089ea387b2725861963480424d9835d7e2fea93a5bd3bf86c7827fb22e7a68efea1a05c45f9606d4ab7add687d9418ba60517cecb3503287fbc5b2c9f0f9b5faa991337b394dfac7514dc38ffe019a1e7c74e5ad23f4e3bddb74ffc8a81f521d0b6044f98238f7c2a38ab14c0 -Test: Encrypt -IV: 6c832a8147658a1741af29b0f558fa3773c81429f91a5cef -Ciphertext: 7e1ef21dad49405e2fc86c50bf045eb14c65e58acb64e210af9ad8ebb5679021721312b96514d8681fa9d52c01c83f7d871401ec345a334648e0fc2ca294ced407ff98f1d1bc4afd83bb325072a5367d9a014092bc99699713bf84587fe2ee998bf8df35aacf61a96be157bddfd52e5b5a1d4a2e3bb109502e608f286aa8f0d5f67b4072ad9b60971ee8cf9fe966015260e61802f19f4bc8a29c -Test: Resync -Key: 188fbb5bea95b5101e056b93d8890c68e1328966089ebf424defa1bcb96e88ff -IV: b51304a0194bbb2490fced46fd0f39c3e87ea5196ca67ce3 -Plaintext: cd78c7c8f308addbd9acb6352d1b5b8a6ddee8a6f51401556e612d4c18960d152e6973381f45b19693e8ab6643424f01e9ab27de29f4ea16465d95674f7c939b -Ciphertext: 81a468948c618db0de96ad5cdd8b577c8253df097128cea4ffc7044f3eefa1b486b9159545fe135ea8a862fefa015f663febbd9b9527cba516551949013e9601 -Test: Encrypt -IV: 81a468948c618db0de96ad5cdd8b577c8253df097128cea4 -Ciphertext: 0510193beecfda67addf420e9c52130dbc8883cbe27d3e013207dc0ef3ff4e0b92e9ea2a2b644ffbab55c942acd63ddb7f1cff8d51d27b0a7d2853584dcc0bd5 -Test: Resync -Key: 2fb88c256a737eacf97ce4e1d13f1e20e8b2426f19076d7901bf6696f38a81b4 -IV: 12a82872b47b2c5b73cbb38904a08d283701eba289c057b0 -Plaintext: 3caae8a0c99f38cb7b2e45ea91dd5dc1331f0efff9f69a5dab0164693e986ba0da48a84321f618cc7e4b4e4d66acd8a71b69e23dbfbc6bca0c4ae279f3583b08705100adb7a4aecc0d72955a7305f4e7e2765b0a1bebea9d7e044e360d44b402f01357dc9a3e83fb46b48a683c1ad450a255bf45fe801db33414d985fd3a337c857d370ddd05c3313ae2eee0c8cb1d12a2fb650ea6e4851f2ca27badaf36dede18a9f8a62a502f6c2ff94d591cc27438e7215ce6e6abf76c22190b7201763cbc8d3a2be1f366f69eca6e5386883f56bd1c -Ciphertext: d446cbadf5afb1f21d7748a5973e8650d1dbdceaf5b837cdecf972bd091734a71ee1692fca675f4972d1e8db716873a03f9a5516f409982316cdc9f66ca0a8018dd055af0086397a86cf7574253d53fabd3aeefdc54dc2eae48b5b61a31dfb8db6531d2185034b81f745a3b88fa11453df073343de8bbd35a45f9cdff45b52e5352081f1f1a003a58200a4aefe27c87e930b77b8dc5b0882dc848437892e1902d126813e31ee27526d947bad5e8f9cf16a302da1a8f3883e3c9b257091e708ad58f4e716bb49e660cbf1f6fa709d64857f -Test: Encrypt -IV: d446cbadf5afb1f21d7748a5973e8650d1dbdceaf5b837cd -Ciphertext: 4125c6831bd2d39c1b1a2e12c505ca077fede7c553d486ae9a87ca3232d27974fb35c9a18a6315e5feafbffa943e52e9c46aa0eff6bce2f2dbf703c641ac570a92551f8a6e9aee14e8bc433b36e06bbefb0a292279f688e5d06dcdf317eded20f9dab8fab19298b146e1555b772d9f9c95e920356282ae691436a8505051190bd840b234fde486726dabec5e0755f4335b8ff4e30c30bd4f473a6af3fa3e7542f2b720784da760753938a682e86cf7ee18c5b5f7f515ff0380134d375e434934508f7cdd7602ffe2039a376d443c048103 -Test: Resync -Key: 7066fe1125429407b653fd090262bed2a3f7f3be2fa8f160f3344f327b1e53da -IV: beec3787c335739fa5d7ad15b85b7e3e7c9438367434872a -Plaintext: 9dad7f5ca1 -Ciphertext: 014a1f27cc -Test: Encrypt -IV: 014a1f27ccd2d39c1b1a2e12c505ca077fede7c553d486ae -Ciphertext: 20539f2d9f -Test: Resync -Key: 3154d3f5bb56b00b34a255425057e99ed9effd1cb0168d16157fd769ddc665ba -IV: f7f9f18f9648f6dc06ac643ea77f1493a9fea3390a98bb0c -Plaintext: 80a488703cf316be904ac8394437ea02ae2c027b7880ebec58416429ea060db543839d781d82a0fa209077e4b1 -Ciphertext: a07abc8ef3641cf33179296ca401bb291a9547d3e6d1b0886ac31d26d2f3281a6a568cc042593132a3cc1082be -Test: Encrypt -IV: a07abc8ef3641cf33179296ca401bb291a9547d3e6d1b088 -Ciphertext: 27ff7646fa8c6b98b1a732841e1596caba7b87eb40508ef0f8ef390aa5e36c0296ba84b686701d5e3d34b16508 -Test: Resync -Key: 81426f03ae1578d8ec1407827db18640d9d90d2bb773971f4ef14f859bc19e06 -IV: 479961f75954ed4f8024108cdb149ca3fd53e6a239a01e86 -Plaintext: 9cd08cf58e13e94e02c9a40269875392251353223f5329412e2a5e34328ea18c414d4c730b4e1c0bc140953f4ecf4ffc8aec963e59305d4d -Ciphertext: db3ea5b5fdc9671ec56b3f1cecbb2a552b0ea4ce9be508863f3dfb3238d4fb91b896727357fe454a08114200ea7226787fd2ab154d53eac8 -Test: Encrypt -IV: db3ea5b5fdc9671ec56b3f1cecbb2a552b0ea4ce9be50886 -Ciphertext: a887b52b3e97e6c899e1d68e57f283633ec9392438d17fb645702ae3b0ae0aad3a7c6eff0baff9f5357328307f628f470891884c264973fd -Test: Resync -Key: b3c260036b79cd3345e04cbee474dfea3a7c773db2ccb29d4c36a1b8c8b252e7 -IV: 1277840fe82046c024e6f4f53b4ff761c7c9bd1fea6c855a -Plaintext: 6a6dac1bc93b9b5c0dde0d1e6a534914dc2a6d51e6f8af3e9d42b88bedc2173782a2314b33f795cc2e4536829871d77186168f5461d18130581664586256 -Ciphertext: ff5e71022c6522998a2d10843fda170796a70d186e5fca2afcf529c6d075c5212c793fb322c1675d0bd3cc6b18f2715678812e81a8727a2d6ac1158eacf6 -Test: Encrypt -IV: ff5e71022c6522998a2d10843fda170796a70d186e5fca2a -Ciphertext: 7e8b5b4d250c13e38b5dcaa5532295e649ab3669fa594cf30eb81a54b25b3fed4f35be97afe4a2a37b7404acb41ad31d737fa9f272e1c57b3754830b4823 -Test: Resync -Key: 14fabd52e0fff9dae88d54815d82a56c4d4a660db5f214288cec1982e56fae81 -IV: 55b8328a312dff104c7f0720af0b7624f9281731b9f5f4b6 -Plaintext: 71bfc290baeeb0380732aa4312982c0dd0cc06cf2ee53adb0ae61c64228b80c073e7687ad3d3f888151b4066f415b62cf851d2987a3c816255ac40b62f453f350da8c4e1ec6dd0985e721b45a063381e997f629a7fbcd44fead19adc289f58f104fd37ec93a35305ba6fa44844d22e80a853e6db1d466ba2ad09ee2d30b3f47dd01b4d7b5d498cffd934cd3e005dc91e9e951951d5b937b319de0a7ba23c7918b1d74d3551b6500d39e6d626fa9cac8ec4e744713a93d5edc8413e2fba1d3b9b0f70509e38a66a2a2d70c510b57e15ac0c4b2aa7c5d6eb088fcdf6cbfef2c6dad19d7f17437cd261636c6d -Ciphertext: 7fc8bc27994031b3c35632590a15607ccaf1be15c542eea5b71ea1f7fa3abee79cb1281a00adb05e6fee4e65e8cba616a5789629d8fc617fae9bde9d92f6c8779374b1cd32a8e9277d0cb052c7658b3ab24ee1e55e5dd88a76266e9fb5661f576000968a9af71a3edb59ef3974e76aceb41c3de2fcb204a0022f302316eb01a0a8d74378599a7f72987e9abbd6f1a8af152ee89455840584010da73b01bbd7b01093a8c38049dc7a5ee0ee80daa98de46803ed75d0a97083ca328e7642a07e1c037346a280a856a64bba53b050272b7ba9742ef62aa89e34500f0efd7bce800bcac91981556a878d102ceb -Test: Encrypt -IV: 7fc8bc27994031b3c35632590a15607ccaf1be15c542eea5 -Ciphertext: bfd5908a43916afa5e2709b2e43ac62f406a4e677b855d70b216ae92cd444fa47f5568558c3cedece54e8b436e904e927175b455d96672a8cbdb4316b9e48a704216e30e9955ae7107f9f7770768bfd3ce71416bd337710bdf4e8789c8537a37f7c995c616a437ee406ca20c8f333a7c2f84ef87dac8c32f5b9678e344645bd356dbff32089fd195d982d3bb94b06b5b232580b492cb754659df62c9b5186b26bc2485409ff95bdc0c1c4c80bfaae878abebd373b159507b5894c5a9f8402447559b5aa7c3b491b97adf202847d0f74605a2502b193b6440a6b1765d538e38a2206630dfda4123fbbe4da6 -Test: Resync -Key: 75fe951556aae3d6ee93670241b7adac6907fd9285dbdf165834fa0cbf741b00 -IV: fff3e1ebb2e48520be552d2f0b617291c42a946f38804243 -Plaintext: 2b56b7dfaf5969d84a88aaa10dd12682f15d8a9a942deb6eba04a9a7ff38f2d0a947b414cbf7f1fca82d74b4ef98880368ba58ab7da98e8d6a6c46cc47cf0536961920e46095627b73737ea19e393c2f19d1f252ddd74b8fe050d95d21004b8997678eb565db0e369cb8bd326942e634a20845c61265da8a21448357f3eb -Ciphertext: 4b3bbef56b4400b130f8df0ab25bb28ece9160c430417060e48e691e6cc4ba119b0c34f5e76d4f1b7963785b4c6a9fb0b42c9f4eed92f8d0989710456c7f8d228fb26359f6e2549439ff5610dacaeb1df4f43a39cb3802ab1c87ce73f731ab1127ea9c2e82fb372be407a8c2b1af40398b33582e842ef0862f120a96c75b -Test: Encrypt -IV: 4b3bbef56b4400b130f8df0ab25bb28ece9160c430417060 -Ciphertext: 76c77925fc94b86624decfd2014fa505a6343054ae55c5be6d12c43018944b5d1c2aa08b9c11ae00d0c8779e70f220ffa59847969e54228d89b4351471fcdb9f0f76f18fcb896983d09dc5e8d9ee666f5abcb4d9e7bebbba824092c65646c3bee46d07609057e44b36dedfc02ce576506aa1274d550afc57d973fbd60294 -Test: Resync -Key: ea7bcb7f8712f9aa149a311d906dbcba443319f68a441a68a263c7bd0fe10fbc -IV: 620e57a9ce4b3d438c968e603f3c1518ab70be5b7bbecc62 -Plaintext: e40ef8606c72444fd3feeb1873f7ccdd3900760af66c269ad1ee6bf1e4546b1a556d4a90f6397527b270021c226dad5353a142c22963bb818548c3ed504965b2e6eb9744a15ca3c00fef2835d34592b90cc4bef8be904987dfc35e92f835ba15f054ceb760ad903d56c65854fd21f6a03ce9f8f16c04ef7ad9507b5cfa4b373eb544f2bc61bc16e371db087fb7bb749463c16f75 -Ciphertext: a31ae696ac9d66241bf9c826a381c4610de7f6416b153d7f8cc17484f1eeb63b2bc25d7c9b8a486e3e8eed6d34b4604ab5dbca373a80c29d50f416bb4ffb8485bfc6f7b61328f7c708360cf93370b7224b7cba075becafeb5cb62938b396dcc789900d8cb8315ceb460a753f20baabb4c6f61526a012e305c28bcb59fed20565ad1afce39f98b354b67a33daa8425479a07c0dd0 -Test: Encrypt -IV: a31ae696ac9d66241bf9c826a381c4610de7f6416b153d7f -Ciphertext: be217c97aca7ee0c1be18f1d93ccdd0f26d751bbbc36ca29f12bbf4afe83bbf7a749d325aad3b6af4913dbb83b09ade5ec79d88b755f7b2ba63df6ec458627c83e28e4742bd49396f19463bd597902de42ac46ba675d2f0c9db8d39dcc56a5e9233264be90cfed284302b965ab0f0748dcadcd02354c1f81d640a359b8ee5aa58a1908de1356031432b6f12e22ae9ee9f847f0a0 -Test: Resync -Key: 017f97c643425ef0ce5c0a6a0c6dd67aa6181e6aed360adcb103bba88773e1b1 -IV: 8189c8cd17a945196321cb6147cf483d785eacbea352fe3e -Plaintext: 145a3d3ac4c5b57d68d26a1ddabc71289929b6dbf317acbb3d83313c9e4861fa9d9679de974e4f7eea83129cb8f4221df16cdf545e000e087735cb37cb321d097b7b2f4874b74af6a6da9c429b1e62d418066bdff5ea0ed7c3 -Ciphertext: 90551d5f8ebaa8c1aeb52d893ddec3e9cb95f77b8bd5f6d0b3f8a3fae5fd8d9c1e42a96360e8e7e6cc9b7711ee1d61b4d67e6c2d682215c59a72778756dcc3fa93068889219579b2a1ddd85b0e69880913cd2e9be47b93ea70 -Test: Encrypt -IV: 90551d5f8ebaa8c1aeb52d893ddec3e9cb95f77b8bd5f6d0 -Ciphertext: ef58a8589c2996e1fd990d7ec412353edcef7dff079ae0ffbf430f3a479818352647fd8640a518575a3210fa45f7df5bd63532273d54c442ff02918aa79176c137cfea1a6ae167464183ae716a0f6057be891537059ac3322b -Test: Resync -Key: e9a7e6aba47b1d9c1df629c6920ded6894b85d3e7fd211bbcc7a9335e5cbf7bb -IV: af86ca3a196464931fd579bff601c9fe7fcc7a10d7778d22 -Plaintext: ee681bb5ecd15201f433a8f89871109aff85ed5a4a16a7ffe032fff60f1acca78cee6532f7740be05438da05933c8d29fc880533d589f6029291cd0a965113e042b27734968784f871f9e9e6c2a7342bc01fba3ef666aa0e018957169f2213f492acd0d2ab82dec47d8afe7a6bedee72d0c5c7ac0d86d0af5238da822ad4e6346cf2ac76faa64d34051a91659009976d140534a4f2a80f2758a912eed692b62bda4a46649fe58563707478746c77d658f481ebf90c2cd5ff3276fa8dc36739084640e319282d74479084a15838b9822056e900f2050d0f48ed52a3a3ffbdfe3a1831 -Ciphertext: b049fa161f19691f3bfa783327d2663eb8b7f188b301b17336f68630d8e001349f659428fd29359c15e95aa3f5a9f46a92d214e0085ab661b511831d00fb6f496e171b8c139def92be2ad8f6d94c2fde48f9d77ea338b920b2d8d6ad380ce761faf170bbc05128e65149b29d32aeec45e2882362dd2d0e3c7cf9634b9f52c578cb2e1d51b5aad6447f4d1860b1a1f1b7e45bcc002a5f4f03dd7116216414b0be23876b35ffb58f466a4087c992340437e89b12151a7d8f1af04aed585f5feee36f60c1b0e19251c7587e8590e7b6bae774f3ba5f3be2d726c8da4da3824debffedc3 -Test: Encrypt -IV: b049fa161f19691f3bfa783327d2663eb8b7f188b301b173 -Ciphertext: 7cc5bceb953ed1acf44c3a448a15f07c4e4db33f863bbc2368acfe699cd18f0580e3ff8545b946c15dd0f5c15e355fc4a10e340035e91c60b757cb69bbee8d2a22b20066b15929bf3506f2b271326509552b6430f4b82cf9b38ae83124f9b448dbbe049d7b3a98bf25678a72965f9656df149bc068e4cbea8573befef8c70b32d1dae7dc9b74601db95866dc7b5a3b307ac6ab9d09f3c55b6aaeb34c8b0e77c724666a4cea694ee90129568a46bb0f8380d8bac4f6151e84d357f32488ef8d62a08cb02255de04612bec676db471ea2199b9e86fb8ad89b259c0d1ac487cd95a5430 -Test: Resync -Key: af768581d5e401b02de76e6986de0bedbfb7130b9014727194c1d3f02c747fd0 -IV: c4568db83cf9eed0c05629951afa4fe5b72c055d89421efa -Plaintext: b34095f5b7660a03edb3e2277dcd3241270c9a7b890cd682214ff979b725148b1d836346ad84bd776ad748f6fb063c15fb763ca5005e9af95840f2677c1904090a19d83dcbf1011a48c23b620eda573b4a61bb8b86fbb7260090ff6f788a9dc27b5c95c3a3ebff1dc6f72446a23740179bf4dcb0169624d1ce2bf17c79dfaa35c7e12e313488919adf7e56f2d61cad070c164797b9d2dbaf5b954b56fd43e15b61f2cddde618bff31ad545ff163f2482024388ec470329835a8deb0f230760 -Ciphertext: 5b132bc08ec5bb09b5c92587a661c25ec54b8f65a581ab5f788c97c959e39cfb93032c6f63a489deac9eacb0b1a40b14ed152077fdc7b8b6dd5f94501d319d1f5cdfac56dbbedf8a5430843ca36507a363d5694e277ad8c0dcd0c0bd729bbe4b64823acff976f39973ae2d3eaa415f32db86a207f3220054306d99558e27ced2a683699a65d13eb67abb38230137de63c5c758a2149a773d403442cb826d70064c57aa4a778cb3e00a36cc4ebba6ec83dc178a7e4a3fb07c22b77a9c00e889 -Test: Encrypt -IV: 5b132bc08ec5bb09b5c92587a661c25ec54b8f65a581ab5f -Ciphertext: 907a2c78d9e0064b600c1d20985b6268b48cb8e7af87f615f8c298316b186ef64470b1c3c05f46096697d84ac390a3d2e37cb2306b718e7c48fb624bb1c5b3855951444f83e0433e26bbe2e05d8ad375633447a9f1c0856e35c6996c4fe4a477f503a47818ccd364b099b8d640ff2540f892e6a8e915a90b96b3ec13ec18e81a5c5e9f6054e6c90b49892e22ad1f0911a33740fe0719845f5428b0911b220ccec09a73cd8a790afe1ad4b76480c5e7718755fd2c29ea2f5f3cd7608ecb7bbb -Test: Resync -Key: 215f4b041d68a316d29cbea833a9d4170c32c5ea0aa34e90b4381e642f74231b -IV: 0b9e85d8e3d62b0c5b45ef1ead0b180348c0c82b2325beb2 -Plaintext: 68a7cfb070a3ffbb5a1456ff96703d56f84fbf74d92573368def92bde3b49dc9cf8ea87dd8a51d4c12cd9b4e1d20d5939a20b86bdb9fe5c76a10bef983c871c559741ac89155eb6d1a226c2a371c03f3bdf2b4bc -Ciphertext: 68d6236f9df3727c9a457609c0b59e393864855160b1e2074257f72d8b122c99fda40d6092cc96c8134823ab93545a6f8b43e8efca9502b5db2ecb86af5798b45639dc41b34df49782388cad7d1826d9d165b79f -Test: Encrypt -IV: 68d6236f9df3727c9a457609c0b59e393864855160b1e207 -Ciphertext: ab148bbc10bdb9a086c2c94c641225bdd8bca6f04d11a7cc5ba7eb728f1fd84522d3861a648ccae4e03f34162058f560028680d986c4a71e5369a312af02d135684b348b2cf42df1ab7ca841d474b3b51b8b52bf -Test: Resync -Key: 2ecbb5a282ee515b3226952d11d0579607f653a708d18920d18dc5106f76074f -IV: 53f67a3bada58382426b7d2142c327c7a9fa75a8634463c7 -Plaintext: 0878ed1298af132502bb5144066d26042e4a2990 -Ciphertext: f8ef2dc3ffca9dfa4d006bd9d3c00d7517fe0971 -Test: Encrypt -IV: f8ef2dc3ffca9dfa4d006bd9d3c00d7517fe09714d11a7cc -Ciphertext: 488bfbb9058907da6218b81138c26f306b3e214c -Test: Resync -Key: 473ee670e4b93e070c69e4c9f9d1a1808aca67c02dc9b8250034b9a19f0a306f -IV: c7bc3457a0d5b3384ff35ac10c8b09a114b09ad8e3d1ef6b -Plaintext: 09ba3c2aa122ee53878bf46711922fc946d67085ff68c3c5f07da6749194737b715bdfd4d052366fc6761c5aad4931808033b620f7e47d3c6bb65e355d66f4f577ee42a1881a853acfa6e710673b72ba15cc169333aef8fc63635ae5a7af8154d19409f57121d6580d10796585236812bdee04346084c9a831aea5d4be2ea248a90b9d71fb00823c2fdb522ff00e7482bd9d178766ad26807d963002104d3e42d2 -Ciphertext: 12fa7fe0fa0791d6a1ccb22f025563a9f61b1dbaf825bb59ae7523b531da1d720b816f42c12adeebe8171309aa65a5357d46e719e260af1ed2eb2096ab59a00f08671acf0e3a4ca67843641a5d9be4e2c00f8da7d37349f2560dabd133dab9dfe2ff6f3c087099ebcd2c4420b6485a8e810392310a8dfb61eb850ae70680882e98d8c97c1c922e6358c0ff3a6cb6df77f0ff86f4b2697c698c0440305d3ff03c1e -Test: Encrypt -IV: 12fa7fe0fa0791d6a1ccb22f025563a9f61b1dbaf825bb59 -Ciphertext: b069c6b32e99129d65d0e17dc92106edb3949710ea7f84638137073b706d790f4c57db477f4f40161c029f1663ca17fa6ffbe8f6d1e10d94718cc7cb75549307c2e3da305bd33263d7f80d8da26ddeeecb95a241f0d0dd636ca54f7129ee35bd49c707c52aff4a6fb5f520575d693949b8a1ece03cf093663c86b8cf97c89b87fc76cf76d9dce6791c499208fcf7a2b7e868f625a940b5721bee984bf3ba0925cd -Test: Resync -Key: 95d049394412ccaaa002264f391f2448837b9a9eaeeec49ae73f21c3bfb83016 -IV: deb9499a1b4043f0c116133700eae22ea61f45ffad305c03 -Plaintext: fba6e561dbb8d9d3dca1b6073d29103b758c463c5ad756920f66dcfe88fe0e4fc21b6aa382b6b96ef5785d51bf4c6b2375f7ca4494e711a34fef708ec09dd10311d312f7aaef6828f112ffa786263f1f9507ecd5fc3a80bc3fa75c17d272ef1c7cac66097a46df791d0d61a22a68dc4217f7ce54abbf7d4fd3fcedfb4d92c4a87657e15aa3417b62 -Ciphertext: a081927e375175dc84df664d824c351c9417614523e0c30d9fc5b6ab5aadcbd9d3a2fc28cfd7c11a807dfbcfdc7d28a54a5c44e52f6e9806a1c08a5fb06f322d22a91f5aa5097b9cb12ac29d5bdbbf8312fcde98b79c6cae3a26c9828874f9c8e2b072b6c1c70f15a1b6464c722fe183fb1367e03bb3991d8de30396aafe160b4669462ace11bf46 -Test: Encrypt -IV: a081927e375175dc84df664d824c351c9417614523e0c30d -Ciphertext: 2629e5e9e550bcb2d80ad3134a2ceaa80ebc96a68d4cb9b0bfc1e78b8b9b06b6ee34e242a174f65f2c74688b740aa9d52f14e900436c020c10b860f7cc8063dffa9b5baf2202a8ca05a3b52bea40bf7dc3c9444989f33e2ff0cc841742df284ea75c6dcfc9a2eee78dd9ce6b29255979b4abd333ed1ed92d19661850d42ca425a30d3aaf95a201d3 -Test: Resync -Key: 9a1831352b9bd922b41cde1ad94b40b3c2f622ffdd633d03f5638d2ca01b892a -IV: 4539205c887f099743e9ebd3aa4ef88ca7eb0a957a1cf8a2 -Plaintext: b4a37464a37b3691c7fe66a81572f535d780925b3b28dbc85b574edc2b6753278994fbcdac780c6f09e153fcd8a2ffb6e873c440dabcbd081e7bb35098c29dc97248dae7781dbc3b00d7c097c75a2f3cc88bf6dd1989 -Ciphertext: abc902e1dc5c4e5d858597347ebf523cfa233ffa1c38b7d8e8df8cb5dc75f08e74cc7077352efccdd18e39820bf03a39ae1aa56b3f07d92b148b26d6214d710167004b338c1f9868b6932b3d999e60f84ec839dc09cd -Test: Encrypt -IV: abc902e1dc5c4e5d858597347ebf523cfa233ffa1c38b7d8 -Ciphertext: 7b2d46034c39cf770b075dbf8eaaa19492e51e451d1ba97a0f4a71c466dea5dfa1d506ff3c7cb90fe276dfd73a6c0ce88e0df56ec0429872dbcae451dd19d2f3e58ac420e83c97909dce9673e7785cf3a11df9a0b062 -Test: Resync -Key: beed63202b4bb586cadbbb8b6893bc6ca2c07217a3b9275b499245aaace55383 -IV: d22603bfe4fe47187d969fce3aefe24beafb9337ef886980 -Plaintext: 375fe2819168ed3a1bfa7f46e037af06f202f1927b78606a46a35f41e23806817a4151872a5738ba76fc6bc736208124d2da5aaa952276125eb5ee95ab9668a7e773a2c429acf296979436ab21bf8bd77f31ab3023bd7fdbe28b93fe92ddabf0bdb1d990d628bf43942d728cddd330c8b79ab6a270877b789a714095074823637880bb380ad826c3a5ec6fd46c0e2b5887dbcfb101fd84 -Ciphertext: a9b65651c6b7b3a6322c21538d9732f2f31beabe4e94c288aff4cc0bd18dea04f15215343a07e16eda6eb535a04f0fa6100bbafd8fb7e89ed087e662cd5537ed321351d19b56a6dc4a8cf50078f7bc9bb9d2982a0ffc8d24e1814935a9ca38edc6b04105a8ac488437946af107e1bf0838db8ec4066646692fc61b9d94d09a83d63913838c1e88ef6845de6b32e261ae972a6b70e72d6e -Test: Encrypt -IV: a9b65651c6b7b3a6322c21538d9732f2f31beabe4e94c288 -Ciphertext: 685c9adf5239c2f521ac91e3a335267b34ce2aad1760f8771c51ac8c48ae1b93938ae2fa2f988b7c87a43c8cd4a97b5e65c2d11aa878c69349308922bf63dff3a5579d549d22c0028a336aac48bdba88cd9654e37746d2728ddf653c7eed0b0404df6f5a4342d0d7e1df8841da0a249313e105e2863d63fbed1ee621ef5e57f48753dbe3d2fc08d15b5244bdf0369c1741fe92fe3b677e -Test: Resync -Key: 8d4b9a4e7e3107c54a75a7c74b93ddf9c44adeffb07a503a05d6a5f287244808 -IV: 7abba4d58cf460f394f80bc9a080a355961c4a2511f50947 -Plaintext: ed3eccc8be0e5ae6d90eed3b15357050171716c7ae56bc9ef7224db5740257361b83aec0d8c7dc7a9e1df44e0f3fd1b8275bb6c5d6fb8d172df4918f39bab0323a5fa7c4a98aef3a482394882daf5403767f639c0d651f01b9b294d511876c4c3c471f7b684900c54cbbc1143d8aa690d7ab98a41fd9236c31692b7d2406beab5202e1b617ee43a6b9c8324404c4862e5fc0301ba8ac7d7b65df1eb36bf038c85e51a03f1b38a6fa74b0163657eebe640343b83a94ef09308ea3f98cc30ad9 -Ciphertext: 5cf10e20d44ba83ba4b201c7176846976b1a10a98d37f006a9b1ba01b4c81db6e97514d0dad76855d95483f3765b26ecb5f8403f8bd65a79cdc220bbc39a35538dfc757431c20b22cc825633a9af1be926f1072b38d2e89dcc903f2d257592ca97520c869abd4f2ec41b10adf0a2f7c56296975869dbc3a2e1465d32b7781991747ad3d141fb0c343419b76c5ce4facfc257f666c1dd020bdc8f189aea79d5c77e63f42da60510ba86ec2b1c934b90d77793b5951faf1c94b5e3ce38d869b0 -Test: Encrypt -IV: 5cf10e20d44ba83ba4b201c7176846976b1a10a98d37f006 -Ciphertext: e23e817a9c4c2740922734bbe3cc5fad938020ed34c0fe401d4da9cee010d4d1056b71d28856ea327d495c643d819d2d4ba6d97820909a7ac222b892aac4ab130610fbe29311f28432303af69d3dbd3a696fb35582aef9b7040a7e85f6c48d31a3d0c3f1cddb5251bc01a5ce0ace8c95882228ddf7c57aaf1890d70b899631a09af5f4130b436a69ab8623e0260cadebad595ba3d27da5df9e62544876d4daa3fe7af8ba8bdbb7246af0289903d69928c43a1c720b948e2d5a0e8b0d062fca -Test: Resync -Key: 39efc9016ceab203c0e172a335d7dc2916ff577f168904648dce170abf5d21ba -IV: e4e0a36fd930f726ff81007cc919ba0da8aacb5abab72394 -Plaintext: c1229356fb463b251270dae5bfe6772135af17b0624454edee3490ae95616c8b4efaab8a6b6f2a83b083d4ef19a86950c6b570d9000e94255087ecaeb56fead57eb8c51ef71fc802f9fd9d14f462fb5568d4206815e7f3473442b5f9ccc730fbf86a45a008f2b784d14791dcda532578e3ba17a0a3733bd518e15d2a65eb6c79a2130d988db4ee07f1f557a9a08aaa77f28744cf928829c940f70ec541a07b2646f4860fbda22f95cd20018deb68159aec40a889e534dd071a076b46d29a3445c8cebdf2ae0ea6ca7ecdfd203e5941581db5a84e66828f2c3e1b -Ciphertext: c885db1a0c9211392f2cf3cd655170409d53fa559acc66faf0f75766b4501ce80b739f51b985ab10ebcaae7adc2b58c1315ded28b77a2c1c1e3bb65b7d9866827a8b4a39f316222bf0522f3c4cd1ab367c6135cd1b104fcaf4cc746e12d3c72a5cf781d487e1a297d83822c6b68c1b5a9a9505a9b64963d64b2d50ef487057aec172cd070533c400fe0d83f79f4affb1be18fd9429d5dda1ed35c71d674fe98788e3b488bb3b5a781fb6689f8732aa8e4674a5df2643b03a332fdc3d5e10bee7014753a745b4e7bd2b579b8885955d8141fca840204da3eeceef -Test: Encrypt -IV: c885db1a0c9211392f2cf3cd655170409d53fa559acc66fa -Ciphertext: a65f1a87049667811331f8305128b6c06fc3becedae1661dcbac3a627d27cf80429687178b1ff1577cc99bee4b311c480dc3053a74fa523660e9af670d852a032e69b65bb2af61af8a2db4d3aad0a4b27ee74bc2203ac502d188975463f050e3369259d676881b1b318a1cd26094923d2c6fb15c0b522952c176c3cbc01252a4d64f875aea09a9295957be06209ae896410f5665422df60dc4038dc9ad1a45f16350bb433054b9a14061b5eed9cde905ea59f15bd1f58811dd4df49531138431e9d57a8a9adbd4d4fa472077ccf40a2a61affb82242db08f3d27 -Test: Resync -Key: 3070f0db09c523507d36404dac79038a393e9f0e3cf5f870b16d2a06da68dcd3 -IV: 4afe87bf79eb938d786ba54c26fd6d7e62261eeae8b62202 -Plaintext: f4ea120b47d15466ade07df0f2ff508759d9cb1035ceeab43920e9094fa50b868673b07173557d4b994b1e9d35078c1c7369df6b6adb2ec0e6bfd280fea8ac31db44beb0c2a4ddc6198957bd0592e3e587d304863b893ff8eee0efc70ced5d712651c3e9dd1a0de0480fd8cccbae4c50dccbacb83dcdc3e2cef7dbc645f0af468163fb0e015ef48ad74694dfbce2db8430a6e91645fd16adbb72e21a0fbaedf5ecff829cea9cbc22f82902748aa52da5ce903d9f2bde77efef5fa3970c720e89f25dd05157247bf0de2d2129c3f856238d4fad -Ciphertext: 46f396f0d2d54189968bf56b5b2f35588c3ad851e00fac6507598f3ea0193a586c00b18677811cc305b0261d9aebbb9c0485a5800c940aa4f09c4fbdede12553824c429c7954e0b8dad889203d292517b98a64e8d7a37c1364eb0934751323d9b9f8498f50d729e977fb742880222f22ac5d7bfebe6905a4c344d82027398a70c334635792deb0f20b83861b05e731f5627aee17df20413c79957556e66a970085e9ad40a73d9a964381584976c6f111619a916fbb5f5d305df862d5a56bac9ff9b436f31c85f34ff890b5ad3299eda2b8642d -Test: Encrypt -IV: 46f396f0d2d54189968bf56b5b2f35588c3ad851e00fac65 -Ciphertext: 358a8f5e5c6fe93c3d6d7d2f90f5973ba2c0cf7c4579c92a52d1ce6203ddd90188d3e36ff7cbe94e7adb4ec7596e89edcf3a94dba1fe64eeb24e8bec5fed2ef6faa4f0d16faf5853e8f69ee0ca0e048658507bd155bfa13d487c3b994f3a1b8871996eedc2d899d9d79ecd8ff968000b863337dc04d9ad8d05696659f8a1cae880e471621ea13ec42d163eecfdf9cd07bf0b10d6f4634ff16d26c700c88831efc82ac0abd0269b93e302422cfc2dc4088e28bc22ed6c06c9b51774bf3aa4088a6a18fa3d3608f9927837efc3382b25a7ab873c -Test: Resync diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seal.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seal.txt deleted file mode 100644 index a1ca35f4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seal.txt +++ /dev/null @@ -1,137 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: SEAL-3.0-BE -Source: generated by Crypto++ 5.2 -Comment: verified against partial ciphertext from 1997 SEAL paper by Rogaway and Coppersmith -Key: 67452301efcdab8998badcfe10325476c3d2e1f0 -IV: 013577af -Plaintext: r1024 00000000 -Ciphertext: \ -37a005959b84c49ca4be1e050673530f5fb097fdf6a13fbd6c2cdecd81fdee7c\ -2abdc3e764209aff00a12283ef675085c1634b53289059e6a7ab5ed9480c01eb\ -4c64569a8dce2a23feed0ef58f6f5ac3f74145127dbcaec4bcb6b1a459bdc287\ -58ba0523f721c3e154433dc7353f02ef487b07ad309ef5e44e6cc19026f5fd57\ -07cc32ec12b9c01fe0c58beb2fe73ea79e24093f05911663a76b21beab18cede\ -17275c54d18fcd3e4cf32279347b22f8751119fb56d92f55d511e4ecc1334085\ -e74934455a2daec3f1821c54b4cb809053b8d837de4186600afedf8bd72dd56e\ -223745c19f76edba01e9b5346666d01f677fbd68fa5010fd7db8b06829a90da0\ -e81b84756a70946a6c05e16d225a2e11af586bb1c5b1d21f5349f8e5e3ee41f4\ -232d554954d1bc86064754b86c1dc92d7a9de30086d8eb4a7c86db9c380f13b9\ -52e11c5b89f1be0a6b52c6e7a053da7359c5fd7f50c70232d86aff08c5ff1746\ -d3bd074d79ad6fc657e0cbbe5d02c4fce55d3c31fef4642ed738f751430f2f1c\ -f6e453ef6edeb9540cec52c697d4864201e141e06c3ddf5aaa64a1a984247e96\ -d2cf1e7fb2bc239919369f4a0bf9d111d0d8be64afae86214d5f62e64f25e8f1\ -3e12680ec170ad6234cbbda938df53cc17a12afea1eb4005122a65cb42bedb76\ -edf029db910fc81b81f3dd28341fed4064ce37648548e5852d4aebb7923016f9\ -afcb07ae7bc11800e217a0062f0b53ffa8d471aa78ca6a13b7f5647189106773\ -0a311d6fe4ff57f05f9a58aa742696b6cbb3ec539da0c2aadd6a60d2a33c26d5\ -8a343448ed912aafb98568c6ae1cb1efaeafd81a6e3e7c450f8e2be4c6cc18f9\ -5e8a1c6c59190a2798e912a614c1e7d0f7e74b1baf8e5682f5442f998b24fa86\ -d1e5f673002e2c92db8ebf7abb1c9d267a9763f4bd54f7bbf07c4466dac0bf3f\ -faf5666a43a52f0812e76df5f9d4da8ed1bc6d4ab29b34718facb4bebc11e907\ -fe9b0e3937de7769fc5b0cc52b3e50d57e02b9b4022949aaf3698bc58f696073\ -ec972a425caee9700864d3d166130ee09d51320b9d51bc9b4aa575c789786242\ -0698d9e1f6426fd141a32c9f55c24e5149e274983035ac1c44833b0179aed63e\ -a2b2b61afa54700155e55c7c343412584f7b0fe73d63c5ad88718dde3000ac1d\ -b4050ae2610032e6b389eec48952a1a2ed0016e525ccd9616706caba89ed07d5\ -4f15ecfaabbc91b7c82c5904bc0f83d44888997faa11fe8fa7333cb8c5b16e31\ -52233c80fbc9f71d9ee8fefa50d67a7e45b93d3469ba4078bb1ed5859e7a8e62\ -b26bacf538507fa6bd43e18d67d7aaf27baaa68d233ca392ce33e257d5ddf3fa\ -ef6a951430d686f65ee9afaf6aee0677b41098922b41fba202ef05a27d614612\ -5daebeb147d617c8df42dba0b91dfbf8ab5805ee9877e495881035fbb7342c24\ -e24f3b85c88671184152ab0d395a9a81afab3bf93bea49cb23ee6bd1c9fb84e6\ -4ecd462f60119ceeae7f1d2150bd36fe7ef2782b0fd12b55df119a517103d489\ -0a739b715d3d33e2ae9fe659df4bc0136c0b243538eaa8f9b813043d66ae15c8\ -261c94c0072afc802668b3151ad1c0ab0f034eb3e8f2fce0c9fbc8f68404fb93\ -a1cd11f4eb9a5eeb9117462ea602ae41fbfe0074323e56e15deb04d41f3510cd\ -1df417f759f4c2bee72bab88833e7d3d9837801f16901ee12581588fa7037f74\ -073b2166405d79098098fb196cc4b1733e45796fa7fc977cbd23853e5943b2ad\ -e154856565a455189198f6ba50b9cc6fda0c309a413ccc746bc8261fd6b060f0\ -5cfcc82894125b3f1e0b0c47257fd838cf295aa13102724163a9fc2598fe8572\ -d0bf844518dccc1ee16eb8e4c9935b78fb969b7c3104091079079a7688f1e833\ -0335f63eabfdd3224a506bae4ea3022a8a4959f4fa410ad7111488a39e3c1cd7\ -a28ce83255de2c4477fe62f660af3b7ba049240aa5212e4e9fffd8b66fd51b17\ -0bdf6c7e7214361a7efdceae86878f49716c0859ce2e24979bae82d98025720e\ -06d7904c9646f1b1058b1a7c93ee4fd728c4f19051adf2ca30f4d54cf65be23a\ -7198e5be5765c018bbc1d2344fa8d1aa908cb8f789ea793c6c60d9a7ba9eebcf\ -7aee50a54810cbe3b632144956a157c220e33a232c169cc9ae64d6aa3560a185\ -fc2d94f15b389eebad8d07662c2be6d6349ece8ef88aea27d430ec9512ff1bc0\ -c5560862fa4a833af750d968e9fb545e3879571ec021735761da937e294820c6\ -585ae00e8023f48a4e1f392217df763a09e540ca615188345512179f8889902f\ -38c626ea3a333fc367818b058dbb8d6aa474ff3438b2de2b32822fdb93f77618\ -83b89223e0e616c885fa3414905d098d82a5359f629ed11589974393cfaf4695\ -da7ee36346d088a6ea6ef21ad6245da8de9956fcefc930c4e2759b596e3f98d9\ -2483b2bd82b74269caae2014f796ffcfe5db58759f0cd4e527b16f989d9cbab7\ -f20282ee2e666cc19ad64aa7a36193ff248002c762280a98f3ad2bf07b32f26b\ -eff5a5586d967d844aba69f7297bb1e28075273f39aa6e7c6c7308728da8ad30\ -31a2d20ebe99940732f93d0440b6e3b481774b69eb76179496350983031c2611\ -a27d885d91ac37debc02512edd06e1d10061325c5e04269c0c14942d10f03f83\ -06ef173d645478d79c74990a82df4b13f2754f273227f96988c25bedaf392534\ -69d73d642305f8058ce4713f65a36b822cd98da3fd805c4408d18dde4ee8e794\ -72e38f8683edbbfdce8d085e005407666eefba25d8c3368c6cb656a699b30736\ -31b8024eb6859019feb76bdb5a0d7f17c92a37fe6bcd14630c1a62bdde1e41b5\ -e9ab7306183a16c31554821ad44229ebce2e552f9a09fd1607dec8c92a1e893a\ -b80c331cdc7860093503cedfd44b3403b3501415916303baef0c68d12efa7c54\ -a11af3a7df5d23df98cfba907dafad0a8989c710d4602fc75f663fb16039d94e\ -f860f358bbf05ac9c34865141030513c4cda32e9b777d9fd9e4ebdc1ad0b24f6\ -799f815e29b8e2259f94b0215b94b349938556736d3ed578cdcea9024d71f174\ -376f05b3c203cc56476dd92d07ecf7e283cc181225a2b690eeaf3cffd35bbda9\ -c4ed0456661e2e39f6be537d2446f65cae13a6dea668b04f8f223601629cd3d1\ -1b75180dfea19435bae5e0622c5005371d4198b8dc1e0c40adbbe08d3651d345\ -4d68507f7f0b56d4bf2a328bb68854064699d0a38d7468ef64ddb4139644fabb\ -d21ad79b5f28a5612e445dc5673b2038e3f7dcf17a12ab32da214fb28500ea79\ -00491554da45661a03e2a878d1006d4fba8e22a7e5dded9b02fb8b5e6d166aad\ -43f8ef3eec4a7050a0304d46cc0be3ec97f0bdd137eea7c001bd8519101ff3af\ -76d1d7710c22c5b0a69c10df3493283254f5afa2ce4b3959d3be512e6ddb78da\ -30cc0a338d675c8fc3fcbbd313b696c660a85fa13ec9fa13ac8e8dbce8335575\ -608d5962ecb516b9ac186206e1ffb971924e9301e6fc220d0769ea1cd954e2fd\ -dc591ea026e369509d427ad062b81ca5e8873432a0d7a031b7f26702840fbb5e\ -5e9e6c8794dbec841822ca92aea2a22709182a3cda136b7b3569d85be6213817\ -06b2852b7de3e20907739958726334ad0c2c3b7327d0060b3f6cd319bf6666e0\ -9de3ee588abb948a6df37d5ac2b18c82d63ca0a0dcc6f1c1e2ae609999f60738\ -714df767fbf14b12b7a002ce0dad86f8adf777ff7ccc9b08180faa0d96b44023\ -3ca5398525eaaa9afba9e0ea4f2cfbf5a3e868f99ddc1a86ee36baf2ab56f9b0\ -b1ff1ff591033e579847267b9557217e0991d2c90e61f7e58321d9bdaba96c9c\ -63e9d3924f0a8c7ac6d4fc94d74d7bc1a96aafad76fca0fa4017d76f00f5cb5e\ -96058fafb57caf07cbcf665fea359cfa2cd4084796e3ea2ccf30bbe6e8f7efea\ -60190fcf2700d1d27b80ff53d8071aeee1ed8708617c92d821f83c9a7ea90c72\ -f19a58e9179cbed5f4f86a80c28e0fbc3fac50d5eea3117df747ab076044f1ef\ -61c7bb95ab31ca2f4f6e61d19e906230694158df40a72fb748dd79d0fd0617b7\ -24b23c6d0569d170731ee07dfd637820f10fbe860a179f2a24775b1f27a2e528\ -a5808d13cc3f995d2cf0c4a832915e19bd6293bfae8eeabcf85de223c4dea84f\ -0d095815cd34ab885d6c50816bf8fd07d4e58aa8c8fbf34344fc3279c1efa142\ -68471ff263f121bc501439c9fe1ae45c946b348a00535ae451d17f3edcecea67\ -5a7dde387813246bb8312147163f813159413fd550e00204c441b0eaf4d12c79\ -520a3d3bd75b00e20a5284457fc3999ac7ce1f1202e5bd651047c74eac7ff92d\ -7f214d6583304f6dda309a01230198b1e656c9707f2f27663c1855771af7f449\ -0e3f3f8da53f0492654a3c40d15620e2fd2a68658ecaa8fb5601775a393878a3\ -110d75e6b968db8eb81c2ecba5852b2eaf7f9b8967b60f92ee4af138a5e777b7\ -aad802e39d7237a17b4a79d9a467a4be1be5121de907400ee5586f0f94bed1db\ -35dcd7995ec93b49b0f6dc7a1e3e4cc0ad1945e60dbe0d24948eb94ddbc45e20\ -fe0bea593df4e6d38647fb623df65f6fbd1e36f318decf77824abd6bdf95eb8f\ -a5f29b650f36b77a305bf9c15b034a7ce1f482ccba079171a6476863a70bf49f\ -cc488177e461837c64d5f5419ae0a344010df2d6edb170b1461ef27024199b15\ -44144dc327eb225f1ee99ab4f07bf2f934042f2df86252c4058212b2e5cf35dd\ -14df206c1dba5445d41f211911e1053813a09e7fea3d5de5cac92acfe36b3ef6\ -8d4767c52a31c8ccba0eaa85874892d813ae601db1ffd5cd42ec1e98534056e2\ -753b5fa30f993016b787de9620a1242986370e005ff4495315c2b1aedb59a32e\ -47be953ea41f15fbe7a115d10328f67e59c538948ceef3f4a338a030ad198b2f\ -c89f067b336f28085a4ca061a38ae6190de48981de1c942ea83a9143b1faf94c\ -2f462a9de5d14b915bfc52e916d16f11cf59a28a3d933fedb48ac06b7cdd29a0\ -720ed851863bafe7a149f403881afe46b940ca37c29b7e49a730b28404179449\ -73274553b70fb11da65acc1c5420677288c624e67542f230da340d1e9b8dc5a1\ -90b69bf5e67e77929250a802f07cdf0716db567209774367aae32e0c1e90928f\ -61c43eaa372f1e9ec70aa0dd506734d23825213edaf184a24a1bb128811db664\ -783cb27cac1edd074d79d1259f84da9e0e5c75923a4dbfaa8a6283dd2279ba69\ -bcd1d78970d7a54a0d31c44071cbf05527010e2ff808cadefd74d906a8ad8c32\ -a01845d3ad78bc6ed96a688dfff171d80d931409d94c83da2bc54ad9790e9a6b\ -a5093384850090a961572f6fdb929a1a6baa98c015e95b0a6da10de04b8471c1\ -aeac19b6c887c1c81dad641d55ab1a29250d14dc41a042f83eb8a6bddcb662a9\ -3e00cf6adaed95cb52b36692f43a8e9b85ba7723d70e5ada851a16fe102ee1c6\ -d3bf8be1634ade9fa6b44626c734788b3aed0c287ab7e80ae5fc1451ddb037c0\ -f729309209226022f13e6f8aa592445db33bb1f29101e0df15db15df0bab6411\ -5bc12f0bbf430551473dbd274db2eea9905eab75f290ecbd903b675f1ad9ac2f\ -2196d00139e7671ac8b95a8cc8e244511d481863b509e5bb7573b6ce49cf0fc9\ -53de75523ca31a64012d11bb7f60f1f67b199a4f2013f6ea3808e2639eb5f263\ -1c19568bcf36071235de8ae7b2d5815e2e0a2e81098a6b4d6179e29ed0a92bdf\ -585a2905f0496ba58eb3d740efa54b664d1a6134fed9fede636504aa691e08e4 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seed.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seed.txt deleted file mode 100644 index a08a1027..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/seed.txt +++ /dev/null @@ -1,19 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: SEED/ECB -Source: RFC 4269 -Key: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F -Ciphertext: 5E BA C6 E0 05 4E 16 68 19 AF F1 CC 6D 34 6C DB -Test: Encrypt -Key: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F -Plaintext: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -Ciphertext: C1 1F 22 F2 01 40 50 50 84 48 35 97 E4 37 0F 43 -Test: Encrypt -Key: 47 06 48 08 51 E6 1B E8 5D 74 BF B3 FD 95 61 85 -Plaintext: 83 A2 F8 A2 88 64 1F B9 A4 E9 A5 CC 2F 13 1C 7D -Ciphertext: EE 54 D1 3E BC AE 70 6D 22 6B C3 14 2C D4 0D 4A -Test: Encrypt -Key: 28 DB C3 BC 49 FF D8 7D CF A5 09 B1 1D 42 2B E7 -Plaintext: B4 1E 6B E2 EB A8 4A 14 8E 2E ED 84 59 3C 5E C7 -Ciphertext: 9B 9B 7B FC D1 81 3C B9 5D 0B 36 18 F4 0F 51 22 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sha.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sha.txt deleted file mode 100644 index 7980daa4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sha.txt +++ /dev/null @@ -1,59 +0,0 @@ -AlgorithmType: MessageDigest -Name: SHA-1 -Message: "abc" -Digest: A9993E364706816ABA3E25717850C26C9CD0D89D -Test: Verify -Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" -Digest: 84983E441C3BD26EBAAE4AA1F95129E5E54670F1 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: 34AA973CD4C4DAA4F61EEB2BDBAD27316534016F -Test: Verify - -AlgorithmType: MessageDigest -Name: SHA-224 -Message: "abc" -Digest: 23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7 -Test: Verify -Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" -Digest: 75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: 20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67 -Test: Verify - -AlgorithmType: MessageDigest -Name: SHA-256 -Message: "abc" -Digest: ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad -Test: Verify -Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" -Digest: 248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 -Test: Verify - -AlgorithmType: MessageDigest -Name: SHA-384 -Message: "abc" -Digest: cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7 -Test: Verify -Message: "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" -Digest: 09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: 9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985 -Test: Verify - -AlgorithmType: MessageDigest -Name: SHA-512 -Message: "abc" -Digest: ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f -Test: Verify -Message: "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" -Digest: 8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909 -Test: Verify -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -Digest: e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/shacal2.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/shacal2.txt deleted file mode 100644 index 19a3d86e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/shacal2.txt +++ /dev/null @@ -1,5123 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: SHACAL-2/ECB -Source: NESSIE submission -Comment: Set 1, vector 0 -Key: 80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 361AB6322FA9E7A7BB23818D839E01BDDAFDF47305426EDD297AEDB9F6202BAE -Test: Encrypt -Comment: Set 1, vector 1 -Key: 40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F3BAF53E5301E08813F8BE6F651BB19E9722151FF15063BA42A6FEF7CF3BF3D7 -Test: Encrypt -Comment: Set 1, vector 2 -Key: 20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E485005217441B60EE5B48EE8AF924B268B6B952D7F593E6102AC83D7DA72838 -Test: Encrypt -Comment: Set 1, vector 3 -Key: 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AE70E355CB7E26FF12421F46CDAD5CB98367FE0E86CC234EDF97481765CD1AD9 -Test: Encrypt -Comment: Set 1, vector 4 -Key: 08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 00CECD0B01311F881018E7A20BCE169766C089D91FF161346C4E1BD122EA199F -Test: Encrypt -Comment: Set 1, vector 5 -Key: 04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 47A879CB6785AD37119C450CD50E9A36FE318FA8E7B6C6E0FA963430122F33CD -Test: Encrypt -Comment: Set 1, vector 6 -Key: 02000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CF3D53B9F9F7CA2C66738A4C09CEA9212C056F525BDC26F263FBA1B482EDF503 -Test: Encrypt -Comment: Set 1, vector 7 -Key: 01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A274D404E83E82817389A2CB7B528C792A0E80DE879A5A67DE633B0B7DD57B7B -Test: Encrypt -Comment: Set 1, vector 8 -Key: 00800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 09B3AB9332301D4E3C239D192A4221AFD43F6829A705D396FA96BDE1E716BC38 -Test: Encrypt -Comment: Set 1, vector 9 -Key: 00400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D3B9AB867A6868C4400D200979055C8F9E3A6BFB40D1F9E376B9EC89223D7050 -Test: Encrypt -Comment: Set 1, vector 10 -Key: 00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4F27041481DCF574586CD6D5B72F2E806B0DBC351FEEA624112897A8A64CDBA9 -Test: Encrypt -Comment: Set 1, vector 11 -Key: 00100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 77CEC8EA64BB7FAE966D030FE4CF318C318DBEBAEB896F31FAA3C9CBA0AE125D -Test: Encrypt -Comment: Set 1, vector 12 -Key: 00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E6F96E0217B8BDC6BBF30CB91C05325F493EB076E505FC6469AAA2BBB3A8A60B -Test: Encrypt -Comment: Set 1, vector 13 -Key: 00040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: ED949C1CFC555EC7192464AE86EC0334AD1198C2DBA36DB38CDF7160C950D474 -Test: Encrypt -Comment: Set 1, vector 14 -Key: 00020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 41EB01CC3875F31A6C8D7008C958BBB164813C59435B01879199979FC4762B26 -Test: Encrypt -Comment: Set 1, vector 15 -Key: 00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CCE7C4F96A665DDD23F39A78A3C7898E5F945FE908F1707DBED08BA6BCA3A58E -Test: Encrypt -Comment: Set 1, vector 16 -Key: 00008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5FDBD5741AB5BC53E8C75F4497E37D5BE92B89D2424A11BBF189449AE005E2E8 -Test: Encrypt -Comment: Set 1, vector 17 -Key: 00004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E6C00B21A5B89F4FE9251E53E7AFE30D6C8721678BF842575EEE185E85632778 -Test: Encrypt -Comment: Set 1, vector 18 -Key: 00002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FC19871F6E933014D92721D77BDF4E0EF528A325D5DC979536D6C46457CA066F -Test: Encrypt -Comment: Set 1, vector 19 -Key: 00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A195202A93364212B989EB2C667EE05881657AD95FB6B3EE62DD21EB73347E56 -Test: Encrypt -Comment: Set 1, vector 20 -Key: 00000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A25B4FB9B4F8418514A1A04078DFBDF73B83B936A887AD6B1B672F1C2AF128CF -Test: Encrypt -Comment: Set 1, vector 21 -Key: 00000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: ACB2AB0F22068D36C160D668ED300DCF32C66FB8447594878DE1B1A83B414E13 -Test: Encrypt -Comment: Set 1, vector 22 -Key: 00000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A5AD217E39C9B40A921B4E52B1B47649C72631E7A99FE4897A92CD1A65BF8BFF -Test: Encrypt -Comment: Set 1, vector 23 -Key: 00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1185C198ABA5AD97F5DF7850284CD5E34BBE5E0EEC3CE4ACC4FC0A3CE3FA3BEE -Test: Encrypt -Comment: Set 1, vector 24 -Key: 00000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7AC85AA2C5A9A219B8E437C65913738628EE442F56BD57292C8A1B36026B6664 -Test: Encrypt -Comment: Set 1, vector 25 -Key: 00000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6140F926FA90F091603D23A4876A3A5598890CB1F2FDE64E43C50630BE4101D2 -Test: Encrypt -Comment: Set 1, vector 26 -Key: 00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 365135682290CB40D83228B3F26FD63266EED9C72DAC991510FEFA9B56466E8F -Test: Encrypt -Comment: Set 1, vector 27 -Key: 00000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 928EED2E262D9E398ADA06151ADFB35F34018114E97414C75E390C8EDA8D2440 -Test: Encrypt -Comment: Set 1, vector 28 -Key: 00000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E362280E66204F47E8FB782D18522AA3E1D527C15EBA88E76DB5AF44E156BB45 -Test: Encrypt -Comment: Set 1, vector 29 -Key: 00000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 807E3938AF9C9F0233FDA70B0E26028B390101F238ECFBD53EAE8E2D86552DBF -Test: Encrypt -Comment: Set 1, vector 30 -Key: 00000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E7D3FA388C4E07ADD32E188BD09264A2BD19F0F7EC5712AC05C47B49C7FD6651 -Test: Encrypt -Comment: Set 1, vector 31 -Key: 00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 891CFD4A18F35239FD4463DE95FE9CAF4569AC82766E457315C123FB5FE6A397 -Test: Encrypt -Comment: Set 1, vector 32 -Key: 00000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5C8E12B2572ED949494B324383806FD61B7CF0479DEB5D62028E83B7091BB039 -Test: Encrypt -Comment: Set 1, vector 33 -Key: 00000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6F071D68C107B19B9949A6B7AF2C79EDC40FBA9BD07674AB3B1DB8CDE0A9637D -Test: Encrypt -Comment: Set 1, vector 34 -Key: 00000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FD720D4ECFB7B68BA48C52E2F69FE268773D73B41723AA51127895B14C516F34 -Test: Encrypt -Comment: Set 1, vector 35 -Key: 00000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0D3D7DEB1F8742BB22C4A3FB88C7C07CDCC8165ECF624C95FD8838D90D465B0D -Test: Encrypt -Comment: Set 1, vector 36 -Key: 00000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 06A524998D1FEA6AF6E4015B9A16B7A447F50AE0A8902E6E3308D3B47E98C4F1 -Test: Encrypt -Comment: Set 1, vector 37 -Key: 00000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9FBDF43AB1294164BC968E113673BB11195AE39267BF2537F0E429E3C10B5D2F -Test: Encrypt -Comment: Set 1, vector 38 -Key: 00000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 81C4C7F2144555C888D876787EE62BC03EBB57093DB3DDE806918707684C8C52 -Test: Encrypt -Comment: Set 1, vector 39 -Key: 00000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F62E7B237C98C5727D4F267AE17932AAC4DAEF0CAF4C02176B4CBB902ED164D1 -Test: Encrypt -Comment: Set 1, vector 40 -Key: 00000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 99CAD86B7E78D9B2ED9DA56F27C9AECB49CBFFC287930CEBC1BF06EA94541E9B -Test: Encrypt -Comment: Set 1, vector 41 -Key: 00000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: ED1F4429D5C36B2C16D598A2CE52D9C84E9DE7CD0B4899E47ADCB999CAEDB0CA -Test: Encrypt -Comment: Set 1, vector 42 -Key: 00000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3FEF41084D9CFF6111C40F9656C46D3892323465630B0C1D082255222847D9D0 -Test: Encrypt -Comment: Set 1, vector 43 -Key: 00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AB7D2B41135ED54EC7AB11C67D20BC35F0C8652D209D675AAB3A33FA264C9380 -Test: Encrypt -Comment: Set 1, vector 44 -Key: 00000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1208F63F213F1A55127900FFBFEB0569B693376D9310C9A9E36EA1DE22CB5A59 -Test: Encrypt -Comment: Set 1, vector 45 -Key: 00000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 10C38678BC2465923063E41B4339D96F3DC5A64CA77A9C9C132D75BC4EC517F1 -Test: Encrypt -Comment: Set 1, vector 46 -Key: 00000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5342519F1181700EDC380133226AE072971AC1AC6DF72440FD817C9ACB862E68 -Test: Encrypt -Comment: Set 1, vector 47 -Key: 00000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 09D02729C71C6E5E852272B853E87C1BAB5E522875E5D8063501ECE10315B4D6 -Test: Encrypt -Comment: Set 1, vector 48 -Key: 00000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 33D7D4F58BDD14244621A960A076573892ABDDBEF36109289A3E8A4EC536E95F -Test: Encrypt -Comment: Set 1, vector 49 -Key: 00000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 81A4590D64E2140414B913AC73BECEC19CAC798C313196007E39EF4F75C7DDB5 -Test: Encrypt -Comment: Set 1, vector 50 -Key: 00000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 942ED16EC4A9D72D74ABFB7E79CDE840997DD2AD83C9DDFAD02528A9A7E0AAC3 -Test: Encrypt -Comment: Set 1, vector 51 -Key: 00000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8376BF03EAE71EF035E18903AC0CC2CCC93610C48050DB096BE758743234CD63 -Test: Encrypt -Comment: Set 1, vector 52 -Key: 00000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B5613234B5F9D1201A9A581D59BD744B8E59728E5E330B74CBF03B9E81C950E0 -Test: Encrypt -Comment: Set 1, vector 53 -Key: 00000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4750E864B881A2764EC508D0DD4AF06B7B1B123FDCCCA141A74DEAF28070B408 -Test: Encrypt -Comment: Set 1, vector 54 -Key: 00000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B3F29EE6BDF09A16C4EA8C1539CD033B17706436FC40DEBD95DA70BF05BF1856 -Test: Encrypt -Comment: Set 1, vector 55 -Key: 00000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3A91B7730E3FE044B75E75B9BB09BC1550AD5AC9F495AFFB524FAD90A51112D5 -Test: Encrypt -Comment: Set 1, vector 56 -Key: 00000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D262DF12E3D8DA99A9F7F011D607905DCBE9AB03C317E81E4BCD076F3C55EBB2 -Test: Encrypt -Comment: Set 1, vector 57 -Key: 00000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 827BD4A79FD82594F645A02F9546906ADCBFF47E2F2D0D0DAF89A200389A5E00 -Test: Encrypt -Comment: Set 1, vector 58 -Key: 00000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E83B866B294780E36058CBCB62BC3C509604F9EB9A44F1CFAFD50F248359A106 -Test: Encrypt -Comment: Set 1, vector 59 -Key: 00000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8695B4BC5DC6528183B94D5257DC668DCAA0E5A855B76555B65FCCF941A8CCAC -Test: Encrypt -Comment: Set 1, vector 60 -Key: 00000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3B5D549F736D15CFD0F39A42CB1ACBEA370ADAA9EBC7C012AF2E30463DF98E03 -Test: Encrypt -Comment: Set 1, vector 61 -Key: 00000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1C29F7919784BDF30E566B75DBA4C911FC48C1CD7F845406B86DA540B71C572E -Test: Encrypt -Comment: Set 1, vector 62 -Key: 00000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D530E5B30338589A6AE67E0C1E2C57AF02CCEFF84705BC4AAD0D93375E7F2DAB -Test: Encrypt -Comment: Set 1, vector 63 -Key: 00000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AE92CD3DA2022DC9C91E381DA62D8FFA646FD02A1A5A3249AEAD35B729C48329 -Test: Encrypt -Comment: Set 1, vector 64 -Key: 00000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 111318C5C6DAE45DF4FAFF404AE2140300DBBF9361E926900F3ED7F731385A52 -Test: Encrypt -Comment: Set 1, vector 65 -Key: 00000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AA0DAA9A0025B5B3243367C7FC22F56F65A52B3CEEA060825C1FD2813953BEF8 -Test: Encrypt -Comment: Set 1, vector 66 -Key: 00000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 11EA951B966D0B3DF0D6AA00059281E6944CBB9921F84209265938CCE91F4910 -Test: Encrypt -Comment: Set 1, vector 67 -Key: 00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DFDE0D41A657B700DADED5F9CB341481A0183AC1BB51291E8719F77251B478F6 -Test: Encrypt -Comment: Set 1, vector 68 -Key: 00000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A8A42F8E3C2BD71D415EF9FBDBB9DA86B32CFC24EBDADC656B7BFF17FC8BE365 -Test: Encrypt -Comment: Set 1, vector 69 -Key: 00000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1755CB48D8057669C488DF3A2296651F3FB64AA173DC6FCBD2C1113A084679C1 -Test: Encrypt -Comment: Set 1, vector 70 -Key: 00000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CEFD04E10B318145993C0AF4B4A64F623BCE0E04CE04E6D3DDE14EC6DFC0CDEE -Test: Encrypt -Comment: Set 1, vector 71 -Key: 00000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D9C83924493AE365C6369317A4393F904D530C1D30B2FD1A2E4126D0A532A743 -Test: Encrypt -Comment: Set 1, vector 72 -Key: 00000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9B8FC0A924382EBD28AA3F6871B17E1BA9C94418FC3533B446C2DE8C188EABB6 -Test: Encrypt -Comment: Set 1, vector 73 -Key: 00000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F91346BFBC0E05A4076B8CD5640E9DD278D4A7755A6D870565AC2A7E60A7F5AE -Test: Encrypt -Comment: Set 1, vector 74 -Key: 00000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 58D205808D4A580FF8111B9EF06BEE613D51E3B2E026B296F5E9F8520C7319FE -Test: Encrypt -Comment: Set 1, vector 75 -Key: 00000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 15D0C54FC35621B206A4A50EC3DADCEDFE4CCA17C9C5396A18901099A3389086 -Test: Encrypt -Comment: Set 1, vector 76 -Key: 00000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 48DE43EC8F644BCCFF61A52D93BEDEEBA38C71C196203A4A5AD9145416EFF31E -Test: Encrypt -Comment: Set 1, vector 77 -Key: 00000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 253057DA247A8D7A1B4A23E87B67D49669ADE1FE5EF32E08058F2DA6E82D1C25 -Test: Encrypt -Comment: Set 1, vector 78 -Key: 00000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6494B08A0B0CE628E34EC6D7EFBC436687D242131974789ECF20911C0CF16839 -Test: Encrypt -Comment: Set 1, vector 79 -Key: 00000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5088AC91D68173FE292A64D04D9A8083535649D44D7F00F23F389810F5F2528E -Test: Encrypt -Comment: Set 1, vector 80 -Key: 00000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FFF5D0D5296B0C3553DD43C429F51AF844EB6100E373A6A7A16B79A73392AC58 -Test: Encrypt -Comment: Set 1, vector 81 -Key: 00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4A805BF70CBBAC2FACF405789FE96C4EF097D36F6982B843246C353E77539863 -Test: Encrypt -Comment: Set 1, vector 82 -Key: 00000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5F5F6828D3D2FDF24B4AC2F1F4080F40E9564CD8F9BAFC34E5567F96E2F057BA -Test: Encrypt -Comment: Set 1, vector 83 -Key: 00000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5BFAD855773EF036BAE365C18B6C5784E8BD4673514B0499E7ACFA38F7832927 -Test: Encrypt -Comment: Set 1, vector 84 -Key: 00000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B38604950FA73165F940D4DB527D09CD0B233276CD3808B5CADCCB9FA859AEEB -Test: Encrypt -Comment: Set 1, vector 85 -Key: 00000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B96570996489A74726A70C02CD55FB9D4C3ADE0B69FAE7C37899E3D560A5132F -Test: Encrypt -Comment: Set 1, vector 86 -Key: 00000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0B8612F83912A9EF1082E9D08C772738908BCCD20DE47D64ACA1500633163479 -Test: Encrypt -Comment: Set 1, vector 87 -Key: 00000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CCC75B4A84D08B14495AA8349B0AF79480FF6D0695561710AA16739A54504E58 -Test: Encrypt -Comment: Set 1, vector 88 -Key: 00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BC3F95A0CB0DCAEDB78E3D6E855267E34F3168C436774E28035D144406E803DA -Test: Encrypt -Comment: Set 1, vector 89 -Key: 00000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BD0A34B0509EFA39D9D091577FC4296F563AF5F3AF9E030FCC3661C0BD82738E -Test: Encrypt -Comment: Set 1, vector 90 -Key: 00000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EC82DA0C15A50EB98E97532C509DBAC9C392DB79ADDC139F9ADC6091708CD726 -Test: Encrypt -Comment: Set 1, vector 91 -Key: 00000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7F164D165F7585E8306E38D44211325D0C6C177C523F13F69DB39DFEDF5BFD3F -Test: Encrypt -Comment: Set 1, vector 92 -Key: 00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 73F36AF678E74D413BE851E77F5E55DE1DD92D5237DBAE75E3AB6364D1F181DF -Test: Encrypt -Comment: Set 1, vector 93 -Key: 00000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BE25140C4E7804B22390822501718BE09E7F494594EBD2BCB35A36AC2F0CA095 -Test: Encrypt -Comment: Set 1, vector 94 -Key: 00000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 33171A271100D5CC5CF651ABF60977CD15B718863213DC243CAFA6CA86041094 -Test: Encrypt -Comment: Set 1, vector 95 -Key: 00000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 323FF7A80198298E438C833032CE609D4E6C5C107C9069E8B216080DE5C0880D -Test: Encrypt -Comment: Set 1, vector 96 -Key: 00000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D8FB3E266B96E48524159A3BE04CC85B3DB70F2FE649A01259E4FCCBCD3E7BAF -Test: Encrypt -Comment: Set 1, vector 97 -Key: 00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 88B2171E37F3E861B6A69397BCC46044EABBC424E3359D11C96A62CB33F6C56C -Test: Encrypt -Comment: Set 1, vector 98 -Key: 00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 96168ED95200986AFF506D3C2F043DFE03356345C52AD205BDC91423C6079824 -Test: Encrypt -Comment: Set 1, vector 99 -Key: 00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4FDE2AD110847B5F4F2BD20CE5047913B12A682D119D9A8C8395B9958771FC22 -Test: Encrypt -Comment: Set 1, vector 100 -Key: 00000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F703282E54592A5617E10618027BB67F639E43A90767150D8B7F5E83054B3CBD -Test: Encrypt -Comment: Set 1, vector 101 -Key: 00000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6673138D1A64DD26CDD2F62CAB0BAB2318DE17507BAA307A189EC4997F9C3F89 -Test: Encrypt -Comment: Set 1, vector 102 -Key: 00000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 328B2F4069F398422D78E359F19938B8BFBC9E073C2162A0829265CFD48B89CA -Test: Encrypt -Comment: Set 1, vector 103 -Key: 00000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 02B14A28344C4164DDF0EDB594D581AE847FC0090EE6B933B8B8B91EAE90F5B3 -Test: Encrypt -Comment: Set 1, vector 104 -Key: 00000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 506221E93DBCBA6787757CCBBB0D5CDE9D06CFE3A23A8942A13C5B3849B2D2B9 -Test: Encrypt -Comment: Set 1, vector 105 -Key: 00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 53A01AD91AE1C7F0DCBE19CF701A895E03FD866F77ABC7B174B327A0576D7719 -Test: Encrypt -Comment: Set 1, vector 106 -Key: 00000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B27AB67ACB784CB231A76D05B2539F0146F5C2F330987DE2C91AEAF8511DB9D1 -Test: Encrypt -Comment: Set 1, vector 107 -Key: 00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 682263AAD3FF0B227983D20CB8A8B572427A2EE1B85A7FBB0961C722A7DE70CE -Test: Encrypt -Comment: Set 1, vector 108 -Key: 00000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E8AA0C754FBFB2BAF1025C8C13101552FA32E4031843E3DC56D2D819476CBFA6 -Test: Encrypt -Comment: Set 1, vector 109 -Key: 00000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7952391AEB6094458B28B543B9A5AC1DDB0CB18AEB431BE7CC7A4D45CCBEBEB0 -Test: Encrypt -Comment: Set 1, vector 110 -Key: 00000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 138599B1B9406E932D6229A4FFD959EE02E626022342FF233269A00DA1F58384 -Test: Encrypt -Comment: Set 1, vector 111 -Key: 00000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 87FA25FEBEFB539BFA46F9FAF8D62DB8E3C126D7409813A3B2FFC760FF19D390 -Test: Encrypt -Comment: Set 1, vector 112 -Key: 00000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 943B778E6053E3CBC59E9423A6D8AE678D369D5E27AB56D668DAD944D0A238F4 -Test: Encrypt -Comment: Set 1, vector 113 -Key: 00000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 00D31AA7620BEE29169C62966C53058F05709CD7C6A6584AFA80D7B2B7D9414C -Test: Encrypt -Comment: Set 1, vector 114 -Key: 00000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9A6DD9EAE3286D48A7548C0A8A4CE8FFFB61B362C95C897DCD1CB1D8BBF76DEB -Test: Encrypt -Comment: Set 1, vector 115 -Key: 00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8231E89C8C74641DA6CD862B98B5DE749D6751B44361B763DF888F3D2312FAD5 -Test: Encrypt -Comment: Set 1, vector 116 -Key: 00000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AEE13BA9322E1089262CEB199FD96E8A3C1E29142C6542961CA0B70782A4FD65 -Test: Encrypt -Comment: Set 1, vector 117 -Key: 00000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 89EEFABFFF030B563CAA5965CFF0372E0518BA1BF9A6E07D279C20AF3D52B9E5 -Test: Encrypt -Comment: Set 1, vector 118 -Key: 00000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9EB46332AE8F271D9613A5FD1D6E1B06ED7A553C874A44A6F3A0615D46AA079D -Test: Encrypt -Comment: Set 1, vector 119 -Key: 00000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FDB79EB3D755AC9338093917F84742BB1D62197D9730AEFCBAA9B3A4CEEC0B5E -Test: Encrypt -Comment: Set 1, vector 120 -Key: 00000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 64D439442C3FB4B580E0C7BC212F5589B395F6D100AA8165E4599A34F288D31D -Test: Encrypt -Comment: Set 1, vector 121 -Key: 00000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 09F8A382936078076F496A14B7BFD77CF4E549171FBDD8106AD0C2F87FD9C151 -Test: Encrypt -Comment: Set 1, vector 122 -Key: 00000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AEB59849B6291FC1B8917642088608C4B9EE364C8C1FAE502F1ECD5BFACBC96A -Test: Encrypt -Comment: Set 1, vector 123 -Key: 00000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 006136B68224BF8BF47C0298FE7E2A4B72964A6C9F36EB709C452F0319B6A104 -Test: Encrypt -Comment: Set 1, vector 124 -Key: 00000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 55912F44A9A3493CF0A4DEF2F77978ECE0868ABF30BBAB15A96AFE15575AA90A -Test: Encrypt -Comment: Set 1, vector 125 -Key: 00000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 81BA612B664481588AB16246226CC1B59A08A7FE0FD64B0111C67C4BF344D2C7 -Test: Encrypt -Comment: Set 1, vector 126 -Key: 00000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6B7930B1609C35095BE581F8F73709A65781DC1D49381411F6474CEBE6D16182 -Test: Encrypt -Comment: Set 1, vector 127 -Key: 00000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7308AEC23D25A231B26448AFE78D5047804C5011B9B5F95C16DF2670551F0001 -Test: Encrypt -Comment: Set 1, vector 128 -Key: 00000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FBE855BD6540594E2D90566E7A30F57516EE170817B66C2468615D5D3D5DF03B -Test: Encrypt -Comment: Set 1, vector 129 -Key: 00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B072D598869D6EFCC8856A2B4686EF05A37DDB3F26DFEDA2F9C406B7250801F5 -Test: Encrypt -Comment: Set 1, vector 130 -Key: 00000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0CF58B2665B889C06836E699DC2B4C615106541987229D686D43614D3BFC290B -Test: Encrypt -Comment: Set 1, vector 131 -Key: 00000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F591E78CE6A8A375CBF821D222A49C862A461DC52C74065BA6349598CC7CB6EC -Test: Encrypt -Comment: Set 1, vector 132 -Key: 00000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A32B883113DE96B7AFD4ABE8E1703C8D724397542527E27F0CA32C89332980D9 -Test: Encrypt -Comment: Set 1, vector 133 -Key: 00000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9B2C992F4CA0E70E0DDB03400AD24C4F20AD5F32940537B33F375C7979968537 -Test: Encrypt -Comment: Set 1, vector 134 -Key: 00000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0DDEEEBC428F117B094FD27B614F6BDFEC0D71D61F8F93F9A09E0443F2FEB659 -Test: Encrypt -Comment: Set 1, vector 135 -Key: 00000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D58740E259B1C9A5DADD2FA5FFB768ACECD0DA6FE40D7D59F3CF6FCD4838FEDA -Test: Encrypt -Comment: Set 1, vector 136 -Key: 00000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E6F318C17501C28164BE9CA692E92D4CF4835E2778B126E9841CA0F132CCAA61 -Test: Encrypt -Comment: Set 1, vector 137 -Key: 00000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3776A0BB5880EB65386F20D11BCF308C2DA3B010F7E2DAF3FB8B55B523E7CBC3 -Test: Encrypt -Comment: Set 1, vector 138 -Key: 00000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3926539CFD76BB79E50A571D75AA51B94864A79CA5DCAF6CE451FC068E487625 -Test: Encrypt -Comment: Set 1, vector 139 -Key: 00000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A8D9B6254BCD0BC32CA3ECF7A7A80882DDC178F47D8E91F760883D589D94F45C -Test: Encrypt -Comment: Set 1, vector 140 -Key: 00000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A2C3810606AD6AAAA571C8A783A686E9F713D0A1238C3E621347622C569C7BB6 -Test: Encrypt -Comment: Set 1, vector 141 -Key: 00000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 902FF7C8DA5B1D171603F48C02E72B611C40E4B15F06BF4A7DB914AAA7E63036 -Test: Encrypt -Comment: Set 1, vector 142 -Key: 00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 55AAAB17A700544B1384EA512146F65A2F871C30F8EF7AB84DD96E004E924403 -Test: Encrypt -Comment: Set 1, vector 143 -Key: 00000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E9F049D8DD032202BC5E16F061B0449AEFD91845A4786A045E35739826E283AE -Test: Encrypt -Comment: Set 1, vector 144 -Key: 00000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6347929B2B5B6634C2674CC4AD3B04B321F7404101E79259A35053E552369548 -Test: Encrypt -Comment: Set 1, vector 145 -Key: 00000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3C8D318014177555818122F69A95BED7A175464310A9B53DD4AF3C5887970D39 -Test: Encrypt -Comment: Set 1, vector 146 -Key: 00000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A3CE794DEA39A03EB4337395E3713ACA02E15148CC9302083E9F2FD55A921BF5 -Test: Encrypt -Comment: Set 1, vector 147 -Key: 00000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2EE444D85842D41D9AEFBB7ECE34EEB71720AFB04498F9B4CFB87C10AC842D3A -Test: Encrypt -Comment: Set 1, vector 148 -Key: 00000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0050EF8A2E0EAC79CD1BCC82F52F04410DA08263A320DA47B500DD72FBAA3487 -Test: Encrypt -Comment: Set 1, vector 149 -Key: 00000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 51721D61A2032DB004C8B83F7509B045A5190892FBC5AEB9BAA4B27D7969C791 -Test: Encrypt -Comment: Set 1, vector 150 -Key: 00000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 016D3D0A0C9B1EA97A12AB7BFA23BD4A973D5F10C06581A6DA92668BF3B4026E -Test: Encrypt -Comment: Set 1, vector 151 -Key: 00000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 687DAF7B782EB92EE2F8812ABA81A1F8EC353797544602A8EF2D2D6C1AC7EB48 -Test: Encrypt -Comment: Set 1, vector 152 -Key: 00000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 538008D0A4465A705313E0A03DE02BDFF7D9F0F0226F630DAFEA5434D9ADD7EE -Test: Encrypt -Comment: Set 1, vector 153 -Key: 00000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2F65E608EF3E4C202C347ADDB9733132350A7AC9E544C5D7D76F9527DB3640AE -Test: Encrypt -Comment: Set 1, vector 154 -Key: 00000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1EF33EF878790A6E16E18377C474700E6AF64C0C56F5FE8E7A1A83D990BB7B9B -Test: Encrypt -Comment: Set 1, vector 155 -Key: 00000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3369751D8735C5B82164E9FDFAA8B224AA4BD3FC2CD3DC48C60A1C290AE189BD -Test: Encrypt -Comment: Set 1, vector 156 -Key: 00000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 428F02228A58756A94871F5DCB37F54AD21345ABEDECB6D12630E51ADF4D6128 -Test: Encrypt -Comment: Set 1, vector 157 -Key: 00000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 521221AE0F51055948753BAC7A30394DA0F3DCB485364AB512E62D9CDC24FE48 -Test: Encrypt -Comment: Set 1, vector 158 -Key: 00000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7E44783F40C4A3EBB40E5D4E22A9BECAD3008D8B1AE64929B666664D8D8680D9 -Test: Encrypt -Comment: Set 1, vector 159 -Key: 00000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 48F54AE18072D2E58922EB0B14E4C32CD72807BF436A01164B0B5027ADCE6121 -Test: Encrypt -Comment: Set 1, vector 160 -Key: 00000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 671E9014ABC8FBBA21A307FAFF3FC7C89231ACA932F58C2D79DA323F80B3F87B -Test: Encrypt -Comment: Set 1, vector 161 -Key: 00000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4473A8EF3585DDC8AB5858DB58FD87FA42E724D2374D7888FCFA66D82B30145A -Test: Encrypt -Comment: Set 1, vector 162 -Key: 00000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A4AD8D6A847FF420E96E1E592852FC7B362F1E0DBBE417B0CFC80C1200C5BB97 -Test: Encrypt -Comment: Set 1, vector 163 -Key: 00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B10D378FB56687BDDE7462A91FD0C42C773097765AC4C332B5007D1D47670EE0 -Test: Encrypt -Comment: Set 1, vector 164 -Key: 00000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 788D00A54C0A6FB10067E08B8F2C60B4DBA05B58D3C8CEEABE49C2FD2FD7D6C2 -Test: Encrypt -Comment: Set 1, vector 165 -Key: 00000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CC54D8465F9529077237703DF4DC136FCD7A9D2FF3B89FF0D226EA3B234B6113 -Test: Encrypt -Comment: Set 1, vector 166 -Key: 00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A0DAF3D3568FA9134C9C1B6EC5137B72715271DEC644F1268FDFA88A89989371 -Test: Encrypt -Comment: Set 1, vector 167 -Key: 00000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0BBCCB3D83D7B6D3AA96AD5687C4895CD990146E293733A649B4D7EC48E9A93C -Test: Encrypt -Comment: Set 1, vector 168 -Key: 00000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DDF8388BA3EA8FDC869D54D38D6BFE47FB7C5B6D81B3D80AE8B7DE00F4581EC1 -Test: Encrypt -Comment: Set 1, vector 169 -Key: 00000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FF4F175CADFA435B31D5766FE6FE73B88B33BF5A87D79A2B47FCEB6BFE6E39AF -Test: Encrypt -Comment: Set 1, vector 170 -Key: 00000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9B28804310814CF3C9782CB23FAB7FE19D5BDA5E9553F23E7876A6426316365C -Test: Encrypt -Comment: Set 1, vector 171 -Key: 00000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 94831F56AC794746628AF8A0684ABFE6A1113EB5B95939A8223D5C0C08BF52FD -Test: Encrypt -Comment: Set 1, vector 172 -Key: 00000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 689C2CAC1FC6999B8BA48B767A995871D80AB561FADF20D8613274CFFD00BF32 -Test: Encrypt -Comment: Set 1, vector 173 -Key: 00000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4CC4412727B69CE43E6B85D89F03DAC6982CF867FB98801DA1F0E8720123699E -Test: Encrypt -Comment: Set 1, vector 174 -Key: 00000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8160A24A68E81E4A839E1C16086983BE98652856CC621B3F7612A8B1324FA33E -Test: Encrypt -Comment: Set 1, vector 175 -Key: 00000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 024B19F8BE7203D9E5589AB96B86BD68A488D7994813D0231C835637B9E59A64 -Test: Encrypt -Comment: Set 1, vector 176 -Key: 00000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 954714BFD736CB391604E77367C2875EF291C02EED35B6DD6A20D58FBADAFB84 -Test: Encrypt -Comment: Set 1, vector 177 -Key: 00000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6E95756FEA083B4AB4E624B5CFB00E31CAEA9C03CE4A1F51104BF6E7A86495F3 -Test: Encrypt -Comment: Set 1, vector 178 -Key: 00000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 93176B234B0A25F30649FD3172F75F181CD47C75D795FCFD5A537F18B101B24D -Test: Encrypt -Comment: Set 1, vector 179 -Key: 00000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 51637CD02F79DA935C5A317C1F8AC79E47E255E4A83F3F04DBA2998DF5118D39 -Test: Encrypt -Comment: Set 1, vector 180 -Key: 00000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 15C15F38B0CDEC62A426CF4AED25096DCCF1B2C7CF49A223F4D3ED7E06CAD2D7 -Test: Encrypt -Comment: Set 1, vector 181 -Key: 00000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 14520B3D7B8734A8D4E07CAB93744560D60FE7C9122C97F2ADB97D811074D225 -Test: Encrypt -Comment: Set 1, vector 182 -Key: 00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F16ED0E9813C694563BF3557D73085C8761642B6B003291B31C681D3A9421E73 -Test: Encrypt -Comment: Set 1, vector 183 -Key: 00000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BD3B03B8DF1994DDD3BE4509BB2B4AED0F7D0F7638102C58B15ED9DC9FAD5261 -Test: Encrypt -Comment: Set 1, vector 184 -Key: 00000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 45813D3ABF443D14B8519A10BA667F16C2EC757B309B978E26FFE56EE0BA00B1 -Test: Encrypt -Comment: Set 1, vector 185 -Key: 00000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A13D32CA09C34BBA16813BE8F4D56AF772B67327C7CDE0756B3D5CECEF2BCD2D -Test: Encrypt -Comment: Set 1, vector 186 -Key: 00000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EC7D07D6F3AD0351131F15816F8044CBB1592324F62903B9DD6180D88E09EF07 -Test: Encrypt -Comment: Set 1, vector 187 -Key: 00000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 873F46936C8CC3A23CCA3EA3288CA070CC41F128296FCE6E7AAD2B7381BBAEBB -Test: Encrypt -Comment: Set 1, vector 188 -Key: 00000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0AF0BB23EFCF86B273A27D84435F53F9984183E4C0D2F69945E79BAC8674C3A5 -Test: Encrypt -Comment: Set 1, vector 189 -Key: 00000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7B9A8CD1942564414FE5C1237B680970A306CCB0CF73F1123D2E823D084F3126 -Test: Encrypt -Comment: Set 1, vector 190 -Key: 00000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C21A4ABA37069F7173A704B16C2DB945301BD4B08D3202BCBCA4AF8E5BA8A963 -Test: Encrypt -Comment: Set 1, vector 191 -Key: 00000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5B2F725ECF531E569AC6B69408259547B9B054CAAA20B6727FE7654FAE4386D2 -Test: Encrypt -Comment: Set 1, vector 192 -Key: 00000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 58E6E58AD73C9DA9A19CBCBCB6E89B44951781A027D5C5CBEAABD95D55BE1CDF -Test: Encrypt -Comment: Set 1, vector 193 -Key: 00000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8F076E12AB23D9CABFD006D16E1D554AB367CE88B3FDD44717824387DC9D4B43 -Test: Encrypt -Comment: Set 1, vector 194 -Key: 00000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C5A351191F18886099542CE6B3025D6F0F4EF8A9A1C804803166BC2699D4B3C2 -Test: Encrypt -Comment: Set 1, vector 195 -Key: 00000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 39BF10576DBE0BA332EF36C38CD96F4F0043B8A0C6CCCCD3521F169821CC4C0E -Test: Encrypt -Comment: Set 1, vector 196 -Key: 00000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 12EC53C9420154F7D5334D4BF94BE3B4CCB044FDF56B4A92E245F016BBE9C057 -Test: Encrypt -Comment: Set 1, vector 197 -Key: 00000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 569D436AFFBB65451ECFDDDC7BABD5608BC183E9437F30B5058C505158BCE7EE -Test: Encrypt -Comment: Set 1, vector 198 -Key: 00000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4E53AA49C4A8E0A00FA51E3DBE4D6BD6ABC1505C2E3FDADAC282BBDF5987E075 -Test: Encrypt -Comment: Set 1, vector 199 -Key: 00000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E0BF45509232C9F66517F057FB01C2E0E08906842B59DA4980413F629388C088 -Test: Encrypt -Comment: Set 1, vector 200 -Key: 00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CC5A42F9BBCD1A5BE0D8EAC69A184E1693AE5F1C9FDAA05B8CB5330D5D63A2C0 -Test: Encrypt -Comment: Set 1, vector 201 -Key: 00000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4247A5AA925AEAF29EA9FCC3C942DC47FB1A13213B302FE0C6F33243C631D2A0 -Test: Encrypt -Comment: Set 1, vector 202 -Key: 00000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DAC043890BB61728CFC30E3A860BFF9474DE05CA104C242BAF498344470319B5 -Test: Encrypt -Comment: Set 1, vector 203 -Key: 00000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 214703F986092730BDF01020A825628FD06CD22C9F385CE14BBB2738A38A1E94 -Test: Encrypt -Comment: Set 1, vector 204 -Key: 00000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AD3EED667396E27E4EF749BE1BC2D222380AA5C070B7246EB3A8249D9003BE1E -Test: Encrypt -Comment: Set 1, vector 205 -Key: 00000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 57B33C626E776BAAB8D655DD93125D49BFE92177BB63AA9902A44E4CC6F90666 -Test: Encrypt -Comment: Set 1, vector 206 -Key: 00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3ABEB777D6240D198677B50B14545714D71D2F46885513688406B201F689C3BD -Test: Encrypt -Comment: Set 1, vector 207 -Key: 00000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0B9E5A4358BCD0CA1AF306274CA676B515499878D2ACA0AD7865139D36910018 -Test: Encrypt -Comment: Set 1, vector 208 -Key: 00000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9EAB0FE92E1B83FAE87EF6369BD0EED91D10DCFC5810FA0188D06929CF927422 -Test: Encrypt -Comment: Set 1, vector 209 -Key: 00000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BC205D90F13A69AA6C45979861B1E5737A69C61F726D252F773E528276B9F1B7 -Test: Encrypt -Comment: Set 1, vector 210 -Key: 00000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CEB885427DF7C988804E7C2401BD703CBB8F3D3D50AFD6CE9F56D32F802F8219 -Test: Encrypt -Comment: Set 1, vector 211 -Key: 00000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C61CE53D0A5E771E6AC98830D496079A34ECE8967D737D0EBE393E7549679BA3 -Test: Encrypt -Comment: Set 1, vector 212 -Key: 00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 842F934F9C3E9690F3AABC753B6C27F7F3EF7B199ABFDA287686F35E2884A2F5 -Test: Encrypt -Comment: Set 1, vector 213 -Key: 00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EE357FEC92355A11FDCE30B089E4F5918A90025832DB3562C762A8421F3B6625 -Test: Encrypt -Comment: Set 1, vector 214 -Key: 00000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C9CC50B7CB29557DCDC64C995B24D2E0E8AD8FBB4906A8DF06D67A69B1AAB8A6 -Test: Encrypt -Comment: Set 1, vector 215 -Key: 00000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D6DE0F6B51BCBDA8D44D7EEA5F91C85B78F42B6612A35662CE3AB3043E87701D -Test: Encrypt -Comment: Set 1, vector 216 -Key: 00000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E3F3E3A5317DCBE044E1A97CAD714449DF0F8E9C319F5C12C19917B2F47F1FD7 -Test: Encrypt -Comment: Set 1, vector 217 -Key: 00000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3A1A26993055B3B30BA84236212646D2622680117D2813316223EDFFA1BBB22B -Test: Encrypt -Comment: Set 1, vector 218 -Key: 00000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 192EE13F6909D98437E8F424DE7DC873D82330DE64B379F3F8985658B00033DA -Test: Encrypt -Comment: Set 1, vector 219 -Key: 00000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DEB92C0159D40548317AEAF996819352F43CB1E487885A0851234A43E4C5CB2F -Test: Encrypt -Comment: Set 1, vector 220 -Key: 00000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C671DF68881157258EF58E7C7E712351FC9D743A2C4ECAAC9D3ABE98F9701B3C -Test: Encrypt -Comment: Set 1, vector 221 -Key: 00000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7A8BA935035DFE8F1DE34EA373FB60E147E6D5572686212BF95B6E0C115D15B8 -Test: Encrypt -Comment: Set 1, vector 222 -Key: 00000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AA95483043360A3CCD5E98C8D5088F9F7154DA3E36F517C459F03B94EA8B5DCF -Test: Encrypt -Comment: Set 1, vector 223 -Key: 00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F716EF1B45585282C50AD6EB1EAD2D19AFBF57235E5D56A015882C55EECC2044 -Test: Encrypt -Comment: Set 1, vector 224 -Key: 00000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CECA215484E90CE7AF49BED4B5F84543D05CE120973EE8510E0A410FA391BE3F -Test: Encrypt -Comment: Set 1, vector 225 -Key: 00000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5AF45DB110A67D0CC49D1A1BB5765ACDDD6482BD88664A4A511BEB8DCDDC08B3 -Test: Encrypt -Comment: Set 1, vector 226 -Key: 00000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E0AFCA91B3CCF0A0C4E332C4F75BC17E5956B0F3A438F0B0ACA0E9B08DA9A1C0 -Test: Encrypt -Comment: Set 1, vector 227 -Key: 00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C559C00EB5C49F2321975A264F855C291DB8FF942FC4617193236318D55DA27A -Test: Encrypt -Comment: Set 1, vector 228 -Key: 00000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 88BCDD04989FE085F888A57176463662C57DC70DD3888F427B68BD5A36C3297A -Test: Encrypt -Comment: Set 1, vector 229 -Key: 00000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3C6302F9C2C8997C41FA0F0187B9E19D14FC2196A001D39F56BF5200E76D4F66 -Test: Encrypt -Comment: Set 1, vector 230 -Key: 00000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 641DA3FF9CC2C5AD625FD131D91E1AE5AD3088DF404384BD885917FD1AFDB9AB -Test: Encrypt -Comment: Set 1, vector 231 -Key: 00000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1A05DEF28E631857C796D665FA66F8A4743F9A340904EC1C084AB022E63E3A0A -Test: Encrypt -Comment: Set 1, vector 232 -Key: 00000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 04DF8F3469AFEA2F63ECA1FA64FC18F1E42B42F7666BDCBFE6CC1C68614D85A7 -Test: Encrypt -Comment: Set 1, vector 233 -Key: 00000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 21AA974CF45CF84383024A8E7D3427BCD9A0A4F4B2AA83FA44911615B2D9A27E -Test: Encrypt -Comment: Set 1, vector 234 -Key: 00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 74533E9973B565E0B7F9DB65A63B70BC5840EE4E1B6D927033CC1F733BD78AD1 -Test: Encrypt -Comment: Set 1, vector 235 -Key: 00000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E818E22E590974A00FBF40C1A1DD100F5C2E3A76C594D129DDE0C9119CC1A836 -Test: Encrypt -Comment: Set 1, vector 236 -Key: 00000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 00BEF3BB9263863455A8736A114E7DF13C903D6D9FE065FED48E6634EE9B9156 -Test: Encrypt -Comment: Set 1, vector 237 -Key: 00000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A0D418EAA61D8B6234D8B07D4652F61EDA48B00764E124DE5D7545973E4BFB0D -Test: Encrypt -Comment: Set 1, vector 238 -Key: 00000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 21472EDC58EB9D2EDE5D8A24DE18784500420820C388408E2D09C8935D3208CA -Test: Encrypt -Comment: Set 1, vector 239 -Key: 00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 278849105940CFDF61AB8DF9A37427A24BD452C244988E7CE85B8FF94A913F71 -Test: Encrypt -Comment: Set 1, vector 240 -Key: 00000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7B35DC73EBA6408C2486D59ADA0A17B89ADC10E405E029E51B8FA7096704DF23 -Test: Encrypt -Comment: Set 1, vector 241 -Key: 00000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D81FC2305382B4110925F4EEEE6C93C3356B30F4E083B47C0FFB429DC8A317A5 -Test: Encrypt -Comment: Set 1, vector 242 -Key: 00000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B1CC26F822DAA8B4EF2DC5C08792C21A985D285697C9BC49E038331996F2DE35 -Test: Encrypt -Comment: Set 1, vector 243 -Key: 00000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 565635B8CF39652AD3F94F9658FBF2310A08DC25975102D9E0A658574E5437C6 -Test: Encrypt -Comment: Set 1, vector 244 -Key: 00000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3A9E77725182484E375528415C99C9BB2795A0841FD9F7E7D2DDE20A6CD71C04 -Test: Encrypt -Comment: Set 1, vector 245 -Key: 00000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BD3F45893A96EF8C218B3C22079E64BF847F3C41D87F1AC68E62B32E5A59D350 -Test: Encrypt -Comment: Set 1, vector 246 -Key: 00000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 44BBB67723B8FC5778D18FFA60F1A7DF16F2A4583BA07E3B2A9A4286765AF743 -Test: Encrypt -Comment: Set 1, vector 247 -Key: 00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 06198963CE32DC41A3869CB3893E1602D21EA64DD206C2DEA9FA79F756260BF8 -Test: Encrypt -Comment: Set 1, vector 248 -Key: 00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 82EA3EC56648E3152D541EA5EA76F9C1D12A373D5183CFFDBC49C0FCE25AC9BA -Test: Encrypt -Comment: Set 1, vector 249 -Key: 00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2D6F44E5104C9A6B28DA5731FE95AD5ED73051B4D405FCB77D2845A3306CD9EA -Test: Encrypt -Comment: Set 1, vector 250 -Key: 00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 360DF8BA5BA3F245E4751C6B1D81CCCC7160D6DE8CB12B496DEF04A78B0D3DD6 -Test: Encrypt -Comment: Set 1, vector 251 -Key: 00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BE0B2DE97E0528C5A135A81F2DA7431C8BF01A456411CB826F1205A9E57A44D2 -Test: Encrypt -Comment: Set 1, vector 252 -Key: 00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4CC729EFC23033F244182FBAE629ABF4386CDB279C6394C7CC914724604D8736 -Test: Encrypt -Comment: Set 1, vector 253 -Key: 00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BA44E9372A4EDC847FE6601F0DDBCF40864B2BB5C4EFF9B3038F7EAD6672907B -Test: Encrypt -Comment: Set 1, vector 254 -Key: 00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DF3109ACA9E8546F5140E6705EDD69EB5512F0C5B3567D6EE132700820839B77 -Test: Encrypt -Comment: Set 1, vector 255 -Key: 00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D909866F49103120A46CD4F2A98B2A2169E3E9AE7BB5AD36CEBD675F62B73018 -Test: Encrypt -Comment: Set 1, vector 256 -Key: 00000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 63081A9DE55FA28CFF0089A3D4A52568BFC0D3A172B1750180A91BA12EC3E38A -Test: Encrypt -Comment: Set 1, vector 257 -Key: 00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7FBD9ADE476739C69CF906B611639D554ECF25BA26AC87A11EF30856DE890D28 -Test: Encrypt -Comment: Set 1, vector 258 -Key: 00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 495FB031327D3AE9CCA3F449E73571539EF9FD88589B5C3142F5A4461CAFF9F1 -Test: Encrypt -Comment: Set 1, vector 259 -Key: 00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1E958BF17F89DD463B49BDE9B05D01DC2557DC4CE072C24D0527E45BA1C8026C -Test: Encrypt -Comment: Set 1, vector 260 -Key: 00000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 92093F21E7CFDCD81765E71ED960121F84C6FE1CDA50B00592ED0DB9A8808FFA -Test: Encrypt -Comment: Set 1, vector 261 -Key: 00000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 122E0C5E19B0636ADE10F1A14FF4CA69EC426B4F311C109F6B137BEE274B1912 -Test: Encrypt -Comment: Set 1, vector 262 -Key: 00000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2CE82AD1BF9BDA86355188CF5605CEAB73E98BC617CDC3D5C8598F11BA96F6A5 -Test: Encrypt -Comment: Set 1, vector 263 -Key: 00000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B14A656DB71E54DF9D443E899417FF4F79E033106AA34D8669EEF0E9918FF4C7 -Test: Encrypt -Comment: Set 1, vector 264 -Key: 00000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 47ECD5C02C3D702FC36817981781B1A4593E240773121F763EB788D46E990C5C -Test: Encrypt -Comment: Set 1, vector 265 -Key: 00000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 91B74FC5E6FC8C6C30F33CE83BC0055190373FC589C0516F248227531C6B853F -Test: Encrypt -Comment: Set 1, vector 266 -Key: 00000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AC8F0393E6D8881EFF753E7CE47EC441106AFE1315E712BB439F2F2DD4318670 -Test: Encrypt -Comment: Set 1, vector 267 -Key: 00000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5765316B484E3091FB5135ECD4A5356293BD87512688EF14C719B61857767E1C -Test: Encrypt -Comment: Set 1, vector 268 -Key: 00000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FAD76A9798E8DD194095DACF92F83779DEDA70C413033DADEE55B4C94B98B426 -Test: Encrypt -Comment: Set 1, vector 269 -Key: 00000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 87F337C9D5763F38C679C5EB9A67F72B4581487ABC5ADCD5BABF4C71B5EB6F7C -Test: Encrypt -Comment: Set 1, vector 270 -Key: 00000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 526B4C3E3FE096F47D32A403A7D20EE269A42F68939B2FA8254A1812D9EC6069 -Test: Encrypt -Comment: Set 1, vector 271 -Key: 00000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 342C0D2D0A5048DC98F2E8CDBB84CC610E30BEBC12F7572CB416CBFCFA24039D -Test: Encrypt -Comment: Set 1, vector 272 -Key: 00000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 47D03635744E2D917F799F77A7E09E6F064CE224A4A1D507090DBE200DBD022A -Test: Encrypt -Comment: Set 1, vector 273 -Key: 00000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0DCE2CCCD9628DD4F6552A020B9447D35DEEFCFE5D8CDD8223AB3BA9090D8141 -Test: Encrypt -Comment: Set 1, vector 274 -Key: 00000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AC5622C3DDECDB0A46F796596ED595926B2783E6A884D18517F7344CCAB3A2C0 -Test: Encrypt -Comment: Set 1, vector 275 -Key: 00000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 80E59C358DC6F0B5749FEAF45A9BE7F884842839EE6B47024083F52A8636C2A6 -Test: Encrypt -Comment: Set 1, vector 276 -Key: 00000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8E57504AD8F6DA6D8633D413362E961A6D69B18FA1B501DB846080A5A9C9C700 -Test: Encrypt -Comment: Set 1, vector 277 -Key: 00000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4956C679E9B58DDE2185BB018A7D6C61C918FA0AA9D6102E7DEF1183DB768FB1 -Test: Encrypt -Comment: Set 1, vector 278 -Key: 00000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2C25F9CD0DB2444EE43D0AD2C3AF0303D1487528F45AFD346617D164F80635B9 -Test: Encrypt -Comment: Set 1, vector 279 -Key: 00000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5292E96CB2110AD3FD231C5B2BCD1A8986333787664D1A551B9B750B2AA39A11 -Test: Encrypt -Comment: Set 1, vector 280 -Key: 00000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D189129077C79106AEACA4E3463FD0650AC493ED981DC252531C072F18E1E292 -Test: Encrypt -Comment: Set 1, vector 281 -Key: 00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F9490DB8BAE36E28E73419D1D57869D760D772DC8752D1DE948262755B4ED503 -Test: Encrypt -Comment: Set 1, vector 282 -Key: 00000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 994EB2D9BE7C9FD547426F295F15DE3BC8F4A2B3955C7028ED890B1DE0FBE21C -Test: Encrypt -Comment: Set 1, vector 283 -Key: 00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 464BFD1EB42B595AEF9700C7C4C184A2132B5F1E85625592E48A233FA7840EC3 -Test: Encrypt -Comment: Set 1, vector 284 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A097C32D58D5A932AC9DBEE942DCCE547222E37E97DC3B29A63AAF118D5B01CF -Test: Encrypt -Comment: Set 1, vector 285 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D3D13CC4379D2817B8CF8E06312FC727A3BA3C58F96E478E4EC5BC7BAEDDCDE4 -Test: Encrypt -Comment: Set 1, vector 286 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 577C709C26BD52547BD7C0D3F9CDEBEC0F266178905C4C067B75A01D799EF910 -Test: Encrypt -Comment: Set 1, vector 287 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 08FCEF6A263916C53AEBB6CCD2623E7BA3C38C871C5A8B64106308B74A7AE1B6 -Test: Encrypt -Comment: Set 1, vector 288 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A22F794F4913B2B1CD930FA26EC219081F297DE4EC808771C9B375782F891D67 -Test: Encrypt -Comment: Set 1, vector 289 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 52F2C9714DAD06FCF5FD8962131D33952A6D68C2A90B8C08C3AB86B09A2C77C5 -Test: Encrypt -Comment: Set 1, vector 290 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 60BDED5533E692A9F073AAED43A5D5A81378E73A953514ACD5B0997B61848E3E -Test: Encrypt -Comment: Set 1, vector 291 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 38921BE2443A8101FBB44BCB4C5B87AB5026AA34C78B7FCDE07E102E142B6162 -Test: Encrypt -Comment: Set 1, vector 292 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D49C075CC20268EE889A10E27F2D4EAA99A1764F765621FE97687ECB6067E5AA -Test: Encrypt -Comment: Set 1, vector 293 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 50FC6782B3285D35117C0FA81039A7F264FC4EB492F3B86A233D45F2834F153A -Test: Encrypt -Comment: Set 1, vector 294 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1CC0B39D670A88D424F5D40B2F9256AF3736689BD82F0EB315AC9056F7EC63A0 -Test: Encrypt -Comment: Set 1, vector 295 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CF66C3CD4B08CB0E4D25186BF84BE3AAAB1C435F07D12593AD001F70894030FE -Test: Encrypt -Comment: Set 1, vector 296 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 352572656D0EB6E0CE604C1A913ED733D465A480504B61B0F9BBA77122FD20D3 -Test: Encrypt -Comment: Set 1, vector 297 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 096E9F34E6E277EDB994954C3705F6904452001D3A3E799A1D0230D430E207D7 -Test: Encrypt -Comment: Set 1, vector 298 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 277BC612F90A6D0735B86168C021098F134D1627D0FEF38607038415D1BADF84 -Test: Encrypt -Comment: Set 1, vector 299 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2376E2CE884AEC093E22A3C119D573609225FD5DC9B3EB7602C340D1AB51BDF2 -Test: Encrypt -Comment: Set 1, vector 300 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3EE2E39ADB49F92D09D55ACC817B5B2F22FB202951AEFB6DE8998D2932145669 -Test: Encrypt -Comment: Set 1, vector 301 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E508313113570BBB5A1E63F46AB52B57ED0676A061936F093961D34409F1B962 -Test: Encrypt -Comment: Set 1, vector 302 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 198A9A0A5B04AE936CB19E02A5B2A254A2DD5A4D71F6C676C0A826CD261CE8C0 -Test: Encrypt -Comment: Set 1, vector 303 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EFEB9C3D34865B89275EFB9DCE1929697FC9E68ED9E9E32E2CF267DE57388E77 -Test: Encrypt -Comment: Set 1, vector 304 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 61016E27DF83D9DE642AE01D7D56C4BFE881C8BDEDD15C503BDC28D3F7107754 -Test: Encrypt -Comment: Set 1, vector 305 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2FB5FDEC05BD94EF5A7F0DEA7A368F7C2B26ABC5789FEAE7B7B6A5E6C364041C -Test: Encrypt -Comment: Set 1, vector 306 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F765AE08A03CF705D4BE6A6AF8A34CDE7A14F599B2CB7E2FCF2770F0CFD4F7AC -Test: Encrypt -Comment: Set 1, vector 307 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D38105C4DE4742F16E6AE7C1C3C85A515DA8BC758456E4B5D64C0539B76D473B -Test: Encrypt -Comment: Set 1, vector 308 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BFE3A705729C82DDE1297DF492A8F8ABAFBF2F436830B3716FC206D6931BBFEF -Test: Encrypt -Comment: Set 1, vector 309 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B81E7CB312AC5FF0A1795FCD4AD8B3D84FE6C8B796584DE794B7E230823E6AF0 -Test: Encrypt -Comment: Set 1, vector 310 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 605C8D477420CF7D8218CB8A6B3624700BADE8D1384B04995F3C942DE38ABA6D -Test: Encrypt -Comment: Set 1, vector 311 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 87A3F6DC69A7675F27CD00D7A84251366CCCA92775D680EBEBB48B92A5781D7E -Test: Encrypt -Comment: Set 1, vector 312 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 71625BD75BF6A89C643553D382B325EDACCFB4BF5F1617DED0C44BAB96A9F72D -Test: Encrypt -Comment: Set 1, vector 313 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: ADF64E64C1A8D854C421F5AA8CCBE789F3643B0D769A2CDC68D7C3AC85FDB634 -Test: Encrypt -Comment: Set 1, vector 314 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3C1AB3A3A85B1EEAA057557DBB59FC28479B38BEE67F4CDA0CD49880DC15ED0F -Test: Encrypt -Comment: Set 1, vector 315 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 026071B93A8B85F000539539626BBF664273EA701B63D487208962F8CC14F1DA -Test: Encrypt -Comment: Set 1, vector 316 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 61EC580BC31488BD8993C9B9D6B430BEBAE04F9807F199808CF05B0B4F083F9A -Test: Encrypt -Comment: Set 1, vector 317 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DF9093A33937B0B3ACAEAC1840C8E1358CC90FB0B6C0834D4CE4F442830127B7 -Test: Encrypt -Comment: Set 1, vector 318 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5683A2E768F9E105E9ABF7B71DE48833367D19E961D9D95577D2C4E48716EE9E -Test: Encrypt -Comment: Set 1, vector 319 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1D33978B4B75C10ACB850BBD98BB2CCB31F7D6F561E34AABAEB929C2F7762219 -Test: Encrypt -Comment: Set 1, vector 320 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6197C557619E4B791888DFD695B4BF55B7F72258968E26B9B74A6A3814267DD2 -Test: Encrypt -Comment: Set 1, vector 321 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9AD5C65433732C4ABF08BAE9015692F509775FC0450677CB1E76A060974B8807 -Test: Encrypt -Comment: Set 1, vector 322 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 44AA2FB88757EA695083CE00105D5B77C2DCE04EE1315D99040A1495E97EEB42 -Test: Encrypt -Comment: Set 1, vector 323 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9C637BA9B011A62B15BE522D6C514092358222CDB01A2A35B895B1E57DF1303B -Test: Encrypt -Comment: Set 1, vector 324 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 21774A71C07FC295C4BF477A512445B2AC9AFD6619DCF0124CBD735BC823F945 -Test: Encrypt -Comment: Set 1, vector 325 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3D74A1E781FEE340DD9D912F6A681F85C0EF78BAE81D3E50A5DB8A311057DCB3 -Test: Encrypt -Comment: Set 1, vector 326 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5B851E24E32EEB5BFAB09D26E86BBE4DA23C43C8E88635413516825D1F56DC43 -Test: Encrypt -Comment: Set 1, vector 327 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E79FAFD3076C0F879222F86A0671104F350B115A6AC107F5C66BB673CB047948 -Test: Encrypt -Comment: Set 1, vector 328 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5E8EBDFCEF4F70640695CF76FE7912F5E77F55095F0A3EC15CE692AED2C7312E -Test: Encrypt -Comment: Set 1, vector 329 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 99EC9D6724631EBC582C22B1B002C8F63B386EF1A96A9E4D162F698F3EC13944 -Test: Encrypt -Comment: Set 1, vector 330 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9DCF4937F7E089B09AF8F441538E2577E315212AA56EB20209F040BE602509C3 -Test: Encrypt -Comment: Set 1, vector 331 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 063CE595D4EEC463726FDB74E5254B5AFB965D2729D02F1890E70E33C4C7AE49 -Test: Encrypt -Comment: Set 1, vector 332 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 18F5B3F2F2B54FF37C354F3181228FBAA7D337791671988801C19333165EAD35 -Test: Encrypt -Comment: Set 1, vector 333 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 912671C8099032B1C0AE139D8F029B153B22B999DC30170DAAE3904CBDEFF083 -Test: Encrypt -Comment: Set 1, vector 334 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CAE46BA93F81E1AD26A8FACE45566E162B8F4CAE831B4B80F93D2A809D3C557D -Test: Encrypt -Comment: Set 1, vector 335 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 31708CCF07D82433A61053273FBC5543BAA1A73B836624FF092361E55631531D -Test: Encrypt -Comment: Set 1, vector 336 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B5F46BFA7B367DCE7998428525483F775D8F5F1A8DB9F7E3EB848F887283028A -Test: Encrypt -Comment: Set 1, vector 337 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1D1B9489F66B8FDC1902C02CE15E94727352C2F6A302C12A6F9672BC44014F6F -Test: Encrypt -Comment: Set 1, vector 338 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8EDD86FA2225D954B3F9F57A0433ED692E99F7ED55EF0A8D112468AEA58717A2 -Test: Encrypt -Comment: Set 1, vector 339 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6F1414CBA350BB5DF73F7B23FCC0859BC2F081374BD4FBA7571DEC9343BD939A -Test: Encrypt -Comment: Set 1, vector 340 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 84535A21BFDE843B9E70AEEC9E5EB915FCEFF57449B7872142AA0669EFF250BF -Test: Encrypt -Comment: Set 1, vector 341 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C4CC653F5CFA6C13C4693967D4CD1398B8808982F0C1D6D9B4CC9A6FCAF41E8B -Test: Encrypt -Comment: Set 1, vector 342 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0949688EEF8CFBB88589CAB3EF58912A2C413E413EF122BB7F4C0E17BF723E71 -Test: Encrypt -Comment: Set 1, vector 343 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AFF2976C45A69940BB88C71381DAEDD767BAF454331FCC5666624EB052CE05CD -Test: Encrypt -Comment: Set 1, vector 344 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A7D73428AA840EFCBFF0C856409C9B19CBDC19BE376EBC75DFC008A6BC9EAB37 -Test: Encrypt -Comment: Set 1, vector 345 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3C59AA18035D96933FB938DE0331DBE42DA57B539A77D660DBFA12B62611760A -Test: Encrypt -Comment: Set 1, vector 346 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1F982024A86CEBEF27F0D19765907131C5EA1385761E92C7432D55A118AF2FD0 -Test: Encrypt -Comment: Set 1, vector 347 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5D5CE5B2BCEC679BEE0B894E4E0FD2E5ABD345D8F8061A02BD4B1873C3A9B612 -Test: Encrypt -Comment: Set 1, vector 348 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 54C62940FC9BD4D96A0D19CE92F6880B5F45A422DF0400E868020ED5B42BC287 -Test: Encrypt -Comment: Set 1, vector 349 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6A7B7E894CB7FE3A0153B5CC6E78351A07AEC726CCAF93A2C426C83760974035 -Test: Encrypt -Comment: Set 1, vector 350 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D2DAC7485B1818A7A2976F164C80AB5FE47B7CBDA4048000D09DAC65857A8387 -Test: Encrypt -Comment: Set 1, vector 351 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7C545CC73456F1C1B06C5B5A05A9659F5D30A4D78E9D85C29A38735BEF098E0E -Test: Encrypt -Comment: Set 1, vector 352 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7E3FA28ABB96C7CFAC0DFAFA5BF2E469D75ECF690FA876F3307D851D3CF0AAC4 -Test: Encrypt -Comment: Set 1, vector 353 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 46FFBA6995D7D6A2B58AB5F995AE3A305CB0385242428FD092FE777556AB05B5 -Test: Encrypt -Comment: Set 1, vector 354 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 052E5126AEDA420CC39EEF255B816BD475DBD36635B090D04C43410F40236BE2 -Test: Encrypt -Comment: Set 1, vector 355 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 80BBBFF3EB0CE3976503A85240226D7FE177B4F30C753F081D7E1F3F8F0FC176 -Test: Encrypt -Comment: Set 1, vector 356 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4A748837D0A7950876ABC89127A6D6FE5B646C7FE9DF8005CBBC3832DFE488EF -Test: Encrypt -Comment: Set 1, vector 357 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 84F35DFA249674C24E6DFB3947E3F3475817DF9548B301D4741B79EF9D26629A -Test: Encrypt -Comment: Set 1, vector 358 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BEC48DE878DD3533F3614B3A0A4BDF5FB34DBA96AE94508FC0D3927032CC6E61 -Test: Encrypt -Comment: Set 1, vector 359 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 80DDDED6AF53DB0459359FE311F32C5DFE85F281C45365BEA7A2D6BA8A2D5EA9 -Test: Encrypt -Comment: Set 1, vector 360 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 43BA1E833A673FB760B13DA40C509EBB7170CA05E7BD2728A7FDA0EB8E3020B8 -Test: Encrypt -Comment: Set 1, vector 361 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 917FDDD2206E751DBAD9BD2EAA3E1FDD7C6CFC7782367B563DE6E116D0E4A3B9 -Test: Encrypt -Comment: Set 1, vector 362 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3AD03FD2841A7C8E8BA49100FCA794DAAF29995A9CDCC6D4F868914C890C3BFC -Test: Encrypt -Comment: Set 1, vector 363 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 79A9305A48A10F739B06EBD24DAACBF5289ED6A83415021DB1CAAB542E417DDB -Test: Encrypt -Comment: Set 1, vector 364 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 195DA96825A0F6B94A71E2EDD934FB184F375EEF66411567815A4A6E966CAC0C -Test: Encrypt -Comment: Set 1, vector 365 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 513239A738978DE007138E83F5CD13A0A9BE374CF61B09021767CAE284D5510E -Test: Encrypt -Comment: Set 1, vector 366 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6BC70608C85D884873CDE727CF2B8A4E9563DA58242C907A3E87C2608AC0F1F7 -Test: Encrypt -Comment: Set 1, vector 367 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F47D47E5D0013BF10141C7BF92642E4CCCF8020347B59F1FAB145849EEF0A2E1 -Test: Encrypt -Comment: Set 1, vector 368 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 879D4097A300F6575BC2021F218E9AE9FED113AF9B4FC9179C621244A9E2A090 -Test: Encrypt -Comment: Set 1, vector 369 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 91EF2BE82D9080A366AC7C4344E457E5F46DA5BD54DD50C97D2910D1478BFA21 -Test: Encrypt -Comment: Set 1, vector 370 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0EED2315EF9B9278CCAD8EE2E33493F5A4FDAE31EC1DA863C017E8AEB77C2867 -Test: Encrypt -Comment: Set 1, vector 371 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FE80FF0F839BE1F911A21C97B36D439ED66F9965293890D98D8A3A98F2CFAE1D -Test: Encrypt -Comment: Set 1, vector 372 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4E241C22B26385E268F868E37873C36B173625048DAAE4ADE3C2E09D856A8AE9 -Test: Encrypt -Comment: Set 1, vector 373 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 71DA83DEC321D3160433BD8E2C2345921A6505444C9B1949B4D6CE400F1FBDBB -Test: Encrypt -Comment: Set 1, vector 374 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 21FF7AA748E96269211F129671E4F7A25BC55D92A144B7BEEB75F445FDCCDDB3 -Test: Encrypt -Comment: Set 1, vector 375 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 070290F0A10324414DCFD323822ABD2256ADDA0913FEDC70EA53F3F88EEB7AB2 -Test: Encrypt -Comment: Set 1, vector 376 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A112192AEDC7824247A9239BE92E45928416D086FEA09D4370DDFE862493AF4E -Test: Encrypt -Comment: Set 1, vector 377 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B0CD1E1BF87C1C63C455C8A285DF739A85706A587CDF0726C4615590DD25BDDE -Test: Encrypt -Comment: Set 1, vector 378 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F5EBFED2EF7706C5DEF09E94641FDA500100F500E431C601C879CC65CE260DF6 -Test: Encrypt -Comment: Set 1, vector 379 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 02CA5B7EAA7F906B706DD5B13A6C121927EAE22FB51C7259A781A916C5906E7D -Test: Encrypt -Comment: Set 1, vector 380 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 10569B20052606FEEB9956C2882702477F1D48F82B09C0BE1C97C3150F5F7D1F -Test: Encrypt -Comment: Set 1, vector 381 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 95C649C5B1ADCE59BE93F701C01D815D7A32D151179FC1B6610B3A2A98EE1295 -Test: Encrypt -Comment: Set 1, vector 382 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7E1DD644C151A0C1055E0AEB7A9DBE80BE09CCDE6C69797D00E7B391A6311D1D -Test: Encrypt -Comment: Set 1, vector 383 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6A82511AEBE5A82B6392CCA180B10F77FF0C14A7CF8CED894E1C8EDF9BAB29DA -Test: Encrypt -Comment: Set 1, vector 384 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AD05B4B2F644469BCCD1BE1D028B1FB26F270088E56D8B73364F958730B0C9D7 -Test: Encrypt -Comment: Set 1, vector 385 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8B4110E53906CBD07EC61AC8DC8C97C475085AE6AE6418C45CAD7495B2C2F4A9 -Test: Encrypt -Comment: Set 1, vector 386 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FC44F97B9B3791B98D941B460C585BC7A485024F2B15370605FA64BEB36F10F6 -Test: Encrypt -Comment: Set 1, vector 387 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 95E1B79F255E9E477D756B0123F22397C723D63F3D6AC710A1647E5D6229AC25 -Test: Encrypt -Comment: Set 1, vector 388 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 523D59EEA567CAE613403BE8C8769E9E375F290D7FA2DFF64C9B41120E96F0C0 -Test: Encrypt -Comment: Set 1, vector 389 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DCD843BF9123A86C9938CB833C815217E37325B4ECF9A43E8E878ED2CDB257E3 -Test: Encrypt -Comment: Set 1, vector 390 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4D737BB7B6B2EA155FA64CAA9124588594AD9D3239B03A0B5F1A1670EF37C309 -Test: Encrypt -Comment: Set 1, vector 391 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D884858B07B3ADC2AB0067E24CEF443AF6D3CB691C7D3EDDFAF672763DF6991F -Test: Encrypt -Comment: Set 1, vector 392 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 24923E668BA92F02D0545738A1F3A81AD3EACC6F3E65A3C6879FEB3D55C3BEF5 -Test: Encrypt -Comment: Set 1, vector 393 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 98006EC6FFEE6DC3FE9D53FC632D1D82E8DC5BCB0BE0BBF1782701F858934432 -Test: Encrypt -Comment: Set 1, vector 394 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1C7CD45E2FDF746F2F6B7FCE3510DD14CAC7420FDA6BC9C6D3287E894D2B9EF5 -Test: Encrypt -Comment: Set 1, vector 395 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DF1B2CD5A9A7ADC85A257882E53150F9B3BAD4B5EFEEE8B4B212F8FB08F11194 -Test: Encrypt -Comment: Set 1, vector 396 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5DF3202330B96E2C8D45284BC1D8CC34C076B18600495EC43F847D09B9AB08C2 -Test: Encrypt -Comment: Set 1, vector 397 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CEE878EA6317D3B4E2CC695FCCC5EE04B7415B735F2D11B9A8891293D5D5E818 -Test: Encrypt -Comment: Set 1, vector 398 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3753BC3550155B6880CF1AAE6365FA5EA4F277B4E01FD26133A5C69F5620AC9F -Test: Encrypt -Comment: Set 1, vector 399 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8FF623E4246D8B7D14904BFB478256CA55EBD9E383B672A91D512AFD606BA629 -Test: Encrypt -Comment: Set 1, vector 400 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C823B856B5E462FAD71A1D9C8F02CE1FE48650BD53BD620D021ADB1C53C21B84 -Test: Encrypt -Comment: Set 1, vector 401 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 22D0CD94534D8DCC359095D77008069E57851298103A13ACB50BF6FA778CB9A3 -Test: Encrypt -Comment: Set 1, vector 402 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 413F7657C9E46D928AE307FE794D1B10FEEB433D7F829C66118E155227F811BD -Test: Encrypt -Comment: Set 1, vector 403 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 12A9E9ABCC1916594307C982852A6750FFD5D9DCFDA261EC54C2D465BBB0FB64 -Test: Encrypt -Comment: Set 1, vector 404 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EEB4897AEABADA871D368A00748CB437801933D78A14687EDDB3D526BBC2BFF7 -Test: Encrypt -Comment: Set 1, vector 405 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2444A95492348F7AB5C8EFE89839C6491833EF227637640F8199262DA70E5406 -Test: Encrypt -Comment: Set 1, vector 406 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CD0F1C806CE40D9901A04A23B52BBCFF51D20E964BA2ADCFE9AEE7CC8FE4A3B5 -Test: Encrypt -Comment: Set 1, vector 407 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 30E58CD115B75139A5D2ECC5253F6467FDEF4DFA307D11132570F90E657BC254 -Test: Encrypt -Comment: Set 1, vector 408 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 563FF22D971BDFACD7A90EDE80F076126CB16A759FDE6DB83E0DEE71CA48F33F -Test: Encrypt -Comment: Set 1, vector 409 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D235A2277B7D3A772C3D092D2E3D92248865EFED8C2577D3D087C5BE84891667 -Test: Encrypt -Comment: Set 1, vector 410 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3CD74A025D1C2044875FE1D97351608E0203CE65F2EB283633505AFDC3C6393B -Test: Encrypt -Comment: Set 1, vector 411 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FDAAE4CA8FD698D4330AD8217D40C8368AE9A825BE3359CB881FA74315ADA4DD -Test: Encrypt -Comment: Set 1, vector 412 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A9BBBED3051D1EB40AA806CF6505EBB4A0D3BAE671AFA03BD2586B01ECC6B9AD -Test: Encrypt -Comment: Set 1, vector 413 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 468AC86525069F4A9F1F7036BB2FC3D042296707B9FE8328C9514DA52FCBBCC2 -Test: Encrypt -Comment: Set 1, vector 414 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 96498A45E45E26AA2A1DD58E7374BCDA71420627B332F94FE98E045251B432C0 -Test: Encrypt -Comment: Set 1, vector 415 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 36FB6B4DAE5EDE9971BC2F5A353A3D5954961D9C8F7D38063A9F8556881F1E1B -Test: Encrypt -Comment: Set 1, vector 416 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4206BEA972707980637FCD2B990F2B8EAE3243C9178487047B1A9BE2C7F6225C -Test: Encrypt -Comment: Set 1, vector 417 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BF2763F46F4EF8CF40E42B6E4F161785D3478BDD1EA0BFAB30763B98BBC64720 -Test: Encrypt -Comment: Set 1, vector 418 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E7B97A297B534B1842528055982B7C382CFFDD161D69725789BF0CC35339D0A8 -Test: Encrypt -Comment: Set 1, vector 419 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F8E68E206729EDF06C9379DC6F87891FFB6D5DD75A040D4F0E17BDF28308E6E0 -Test: Encrypt -Comment: Set 1, vector 420 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DA69958998715C7517B9864E3A81F5960A48E9071FEB047084683D95A8532751 -Test: Encrypt -Comment: Set 1, vector 421 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 99456A498166535817F3DD3B47696CC74777ADE25DFA5CB5A3DF1A47DBCF0F17 -Test: Encrypt -Comment: Set 1, vector 422 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: D2D061B7FEDCA0663FE8F738042D1CE7D0EFB3BCED73977087FAB06192A361C1 -Test: Encrypt -Comment: Set 1, vector 423 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: ABF4E053FD99A777A5C95F057A1D8D3BC433D212220FE2BD5074C7E7B4AAA636 -Test: Encrypt -Comment: Set 1, vector 424 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 335F971AF070B59191F61547DC555F2AD86B263B23AAD53A80D6DA0C8A73C6BB -Test: Encrypt -Comment: Set 1, vector 425 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C2EE398458AD869FCFB5DBAD16CB66F2CDEBE8D9D2C0FC4B258553D7D648E281 -Test: Encrypt -Comment: Set 1, vector 426 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 659BDB67C3BB43D43CF53EF14411F9B5B2B3C8C9B961087622BF1F0412596D81 -Test: Encrypt -Comment: Set 1, vector 427 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 21E2DA7422F753B1B625D95BFE5FD1C52CB5DFEDF0F2662EF17416E44F671525 -Test: Encrypt -Comment: Set 1, vector 428 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C14725058665DCF8D701BB4A3DD5490DDA85E2754D9B233C008B5FC3559837B0 -Test: Encrypt -Comment: Set 1, vector 429 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BF0D7F94DF1C7CA59CAF588BEDB316CB4E31A578B76C1E5213EB663C0E850F97 -Test: Encrypt -Comment: Set 1, vector 430 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C81ABCB56C58DB2D5A329C6777091857DA4A5CBCB9D05AD6B0D4A2D4E915A7F4 -Test: Encrypt -Comment: Set 1, vector 431 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F9D7611F502D0CED242909E032173BAF5A43DAF7009F53E25E109D7F4FEF9981 -Test: Encrypt -Comment: Set 1, vector 432 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4EC0E7F808A10BFD4676E5CCA67E1D48806F346B702B2827810487EE56907C71 -Test: Encrypt -Comment: Set 1, vector 433 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 34C183C96FE5D9D2B4ED564EE9726551B27E1AF24848B5D711503E88BECBE458 -Test: Encrypt -Comment: Set 1, vector 434 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3E5EA6B326751B501C91C4A575B0ED6AEA9D60A14908187ACB3FC145B5468131 -Test: Encrypt -Comment: Set 1, vector 435 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DA3904568BC8844CB594F44FE13F5D663B55EE6995D2232A999D591F2FCE7812 -Test: Encrypt -Comment: Set 1, vector 436 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9293ED1C3C5B1A91B54A43BC63603F2EAD345EF9A7D3E69BD955EF1B8D36FD13 -Test: Encrypt -Comment: Set 1, vector 437 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 65C5CE0CC96FA6085A23EF00299B6D8518673DC9B8BF764DB595A8A7F8E940C7 -Test: Encrypt -Comment: Set 1, vector 438 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: EF95E25669CF4079F8BA728F41BD115F2913D8CFE0116C86032CD133E4787011 -Test: Encrypt -Comment: Set 1, vector 439 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7860315B44671B93718FEAB94BBCEE6B1006354914A90C3BF2DA1B6FA62F48AB -Test: Encrypt -Comment: Set 1, vector 440 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2AA9968D7011FB1F33B97DAD01C2708A6826C030AFCCA35B222B2E47C89F14E1 -Test: Encrypt -Comment: Set 1, vector 441 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CA9DD4F0771447B9AD0664DDA2921192568C2012246CCF5E95CD6CF3FBC44DCA -Test: Encrypt -Comment: Set 1, vector 442 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 38D51B18372FD7E7A617D7BCBCC658CB16014B05ECA242AF52B40AEDF6952DE4 -Test: Encrypt -Comment: Set 1, vector 443 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 640D035CFD65FE70D089866A53F21D00F86FDB1CEE2880F9FA7D382D424978A1 -Test: Encrypt -Comment: Set 1, vector 444 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B41B62EC90FA9CC037F1BC74AEED25226917DD3B2B2E5C11EC6AE7601CF3F0E2 -Test: Encrypt -Comment: Set 1, vector 445 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A4340A36C7E640C83D2401AAE6F9F103BC9B568EF5B7F67663E64B820974B235 -Test: Encrypt -Comment: Set 1, vector 446 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CAEF6FE59B0C05DDFE4F233412A185038077B7138EE9BA5FF4815C63C2BE84D2 -Test: Encrypt -Comment: Set 1, vector 447 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F5D76FAAF12F566711DAAAC0E1F71260354FBA7BC0DBC34D7A2B6FE8E19DC672 -Test: Encrypt -Comment: Set 1, vector 448 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DB1B22D80BD5BEA8D3F5F445E296FF3506C98C6FAE617D6C8DD943BC535AF864 -Test: Encrypt -Comment: Set 1, vector 449 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DA02BA2C706095D3EB008EFFEB5E501FFF78B59EC34CBCAF0D7CE82268CCAFBA -Test: Encrypt -Comment: Set 1, vector 450 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F878759262E5C2BA6CBC2091406D4045F876767C475582965B185DC9437ADD1E -Test: Encrypt -Comment: Set 1, vector 451 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: CA268715277F1CABC2062D4EDFD667759829782F793715199EE172917DA35C5D -Test: Encrypt -Comment: Set 1, vector 452 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 01BACD8388BF42064C8E927B3629C0DA82A0FEC4883EC068DC48483C43512BC5 -Test: Encrypt -Comment: Set 1, vector 453 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3D782388FD4ECBFEBBD49F2FBCF80A687E4CC0B8FEF51F097DEB679F49CB8B06 -Test: Encrypt -Comment: Set 1, vector 454 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 392E11AF1FD4A97ED260B680930C95DF26679260EAE0C025C405CDCDBC8E810D -Test: Encrypt -Comment: Set 1, vector 455 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 10E6AA6CAA90220E6D8963837D9EC3D46F8E9679379345282573753F2093E0F2 -Test: Encrypt -Comment: Set 1, vector 456 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E3EF5E9644294206A5707EF83C54E5EF5F4DB9841383C3EB767DEA722E9B7D0E -Test: Encrypt -Comment: Set 1, vector 457 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0EDD01B5FE46475139F14371B548B58C5E33830D6EA6864BFBAB36D25345F8F3 -Test: Encrypt -Comment: Set 1, vector 458 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7DB72BFBC00A04E38DD4B9F2EA5C0114D19B2956EB959BEAD3E29DFB9BFC9A2A -Test: Encrypt -Comment: Set 1, vector 459 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7DB561AF481CC8B010BFD18A0216E2554888BBDD4E90B00476809B48601C9306 -Test: Encrypt -Comment: Set 1, vector 460 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 4EAB74E6D12574BCDEF95BC0CAD67C7E04B24472431607EBAD5F915F1116C9CB -Test: Encrypt -Comment: Set 1, vector 461 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5A48DE560FA1ABF0F85BFF9A0A1928020A6C51AD3FE7C1392C2A875401DE62F0 -Test: Encrypt -Comment: Set 1, vector 462 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 074956F37AF065DBEDB2D68C602A4B65B7D614F8A0B284539E234B307CFDC495 -Test: Encrypt -Comment: Set 1, vector 463 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9BB4837A582A5CB30579DABEEC41ACCB3786AA9BE52DDC88065BE0FFD33917EC -Test: Encrypt -Comment: Set 1, vector 464 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E1E690D74FC254D1D2A8238096285CC100013E8A8BB55FE92F6DF69DB217773E -Test: Encrypt -Comment: Set 1, vector 465 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: DFE35C2BC6ADFEBE4D9E8F84160AD6315CA43F0F022DDC629106E008F29C81AE -Test: Encrypt -Comment: Set 1, vector 466 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 8106B2FE206F9F8738BEC324B531E6943F00B20EC35DEADCB508197EEEBA5473 -Test: Encrypt -Comment: Set 1, vector 467 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E46E36293B659E73FAA1722AF29651621598FF2E92694C99F7BB0C792B93BAB2 -Test: Encrypt -Comment: Set 1, vector 468 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F3CAB9F84AF81A06F9F350C345B44E053C8F1EE36D62159B4993950BB76D0948 -Test: Encrypt -Comment: Set 1, vector 469 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E3381C1644BBBB29290D30F15C96956BF4AEFE443FBDA0DB3EF2CEE7081D1DB3 -Test: Encrypt -Comment: Set 1, vector 470 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A4DD97D2710285907527C4FAE5676774D937FEC609F8489A16384568FAAA699F -Test: Encrypt -Comment: Set 1, vector 471 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 43C608E43584C631E620672EB0A92707C396ACC12CBCE0810A28F7EA3491E0A3 -Test: Encrypt -Comment: Set 1, vector 472 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A1DC3C2AE54BB2FA291913562F05E021AF361E422D39C89D8CFDBE4B672B63ED -Test: Encrypt -Comment: Set 1, vector 473 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 890CB43DA15A1D69A10EA9322B8C14D61AD537462439A735472CEF9428C8A2D9 -Test: Encrypt -Comment: Set 1, vector 474 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9119548582EB7EA7F4AA1B224A6825B786F316EAA7AAA18B61B56D64AA4CBA29 -Test: Encrypt -Comment: Set 1, vector 475 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 574DD7CA20662ECBC730FA7CE314094E427FB8250E0F636894B650DA35A7F0CE -Test: Encrypt -Comment: Set 1, vector 476 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 3575DEA861D0F97DA32438DB834020996820BE85EAE5ED15A7983A31C7669C70 -Test: Encrypt -Comment: Set 1, vector 477 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 27EA06CBD196073357F1F790191D14796FE2BEFBE18B8C48D7566528B3DDA4C6 -Test: Encrypt -Comment: Set 1, vector 478 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 11B190730F6EDE90C8B3FEE01E722ADDD21BEB4324A358F86F524E4B7F7AF975 -Test: Encrypt -Comment: Set 1, vector 479 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 07E3CDB5130D8FF7A2A31335AD478FEF10805E266C00646CFBBEE81F2B3C1711 -Test: Encrypt -Comment: Set 1, vector 480 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A0ED0FFEEBCBF4066EE550E63065B08569B92BCC938002A5469ABD1C397233A0 -Test: Encrypt -Comment: Set 1, vector 481 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2C9CDE299A4C507EC03C617EACE2358E76BC1AD338FE5A66A9105F18788A8836 -Test: Encrypt -Comment: Set 1, vector 482 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5163F9C4ECECD047E83BDF1D6EE233487646A96FE43B4B08C41324FD8ECB271B -Test: Encrypt -Comment: Set 1, vector 483 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: AA2AE4BF506AB3D7607A29C3EF90B4C7933EE58ED3AB3720817FE3C611A850AC -Test: Encrypt -Comment: Set 1, vector 484 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B04B4C802D91D9ADE76EBAFCDBA0A96A8A83DAEB7069370D6E901A42291EB8C6 -Test: Encrypt -Comment: Set 1, vector 485 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 91A99BC40CF38388B4AA77798D720653492CCED5230382ED587A305A2A1A6BCF -Test: Encrypt -Comment: Set 1, vector 486 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 91FB386F3B9AF82F93836005CBD9ED6727B9BBF1F669EAE6D06DA6D04D1AC082 -Test: Encrypt -Comment: Set 1, vector 487 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 01F8956120BF068AE7241BB96FF086C2D67547B549A8743FC0569978F201678E -Test: Encrypt -Comment: Set 1, vector 488 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A8C562A616F918A669A29C0724B76E3D04B125E0AB5A09E8CE60F54E4816EC90 -Test: Encrypt -Comment: Set 1, vector 489 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B41D3BC188419DC929D611197D17FB4D29B78CD7FBC03B904219DD8A2FEE210C -Test: Encrypt -Comment: Set 1, vector 490 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B119861B67AFE45C0134E2336CAC90BAFD1EB94C557EBA6DFDCBE69367B37981 -Test: Encrypt -Comment: Set 1, vector 491 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A2317FD4C041AF4D87C46FC684FBEE8DB65E4D43E5EA74237988A7EB67404656 -Test: Encrypt -Comment: Set 1, vector 492 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 641794C292A1A590F909D01F175E012671AEBF1E432295AED662E74C1EEA5DD4 -Test: Encrypt -Comment: Set 1, vector 493 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7984AC47362281DF446BE46AEC5D9A94B842F6F5BCCB01FD564318A49F94042C -Test: Encrypt -Comment: Set 1, vector 494 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 74F84174C9E2EBBEE396727DBB1C9CFAE2809D802F7E7CF8F7515FA3A629ED98 -Test: Encrypt -Comment: Set 1, vector 495 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7A9E862E27444A492C91CA2EE5E93369FEB74BB881AAC74F895D97E61500FA99 -Test: Encrypt -Comment: Set 1, vector 496 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 638E347CEC7121A668AF985E56F7F3934D852FCF53283B767BAC213337AAE99A -Test: Encrypt -Comment: Set 1, vector 497 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 45DC398895DA1B415708B4BC8B7EF133849E0E8E99945AE4D9C894FDF6D2815D -Test: Encrypt -Comment: Set 1, vector 498 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 1ACF1203B698FE2E3375E251EBBC05D387FECABDE6A9194DF5195F3FBF1E3502 -Test: Encrypt -Comment: Set 1, vector 499 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F6A064BDC6EE0777B09CC1A0154F28AD282D4D6E48F9DE11CA083B8A9F454891 -Test: Encrypt -Comment: Set 1, vector 500 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: FE68FB721E181EA8A62CDD3CA0278C6EB1344DF07E73676D3F0DC501D99721C3 -Test: Encrypt -Comment: Set 1, vector 501 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 72923AD92EF01BDB90B9639DD411E4540CE0F531A0AE401547FBA03CB850B63A -Test: Encrypt -Comment: Set 1, vector 502 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0B1D0F485A4DE59658FE61F1F0010D9EF5A2BA97624CC3687D94EE4335777138 -Test: Encrypt -Comment: Set 1, vector 503 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7423264FBF5EA94BA461BD80B2518B1CAF3757CF5BAB4511144637F5DC917168 -Test: Encrypt -Comment: Set 1, vector 504 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 589FADA29BEA438C12CA96241AA492FCFED48C1C1C05C16C88CD7A8B46E16A0D -Test: Encrypt -Comment: Set 1, vector 505 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 319B5D23945A98C9480E6460CBCB86A8B36038A28500A36182B228060713F58B -Test: Encrypt -Comment: Set 1, vector 506 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: B81B723D3E18A074078B7D041E55B9B130953ECF70BF773273A28E11238651A5 -Test: Encrypt -Comment: Set 1, vector 507 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E660AC40BC4700D4CE85AA43A2A39A24D0F255E64A9251D7442AEFB6EDFD43A8 -Test: Encrypt -Comment: Set 1, vector 508 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: C27914CB70EA29C06B321E4F61730CE6679A342733738BE72C97EED40802EC17 -Test: Encrypt -Comment: Set 1, vector 509 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 764B78FA0EC12E017D9F7C69FF53FA8FA00E7185888F36DBC3CA9A10A6122FBA -Test: Encrypt -Comment: Set 1, vector 510 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E2F9F554823B38D2099DD27E0AD6AD69BE137626840B41B7CF081D7881C47CC7 -Test: Encrypt -Comment: Set 1, vector 511 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 403E453BBAF997A75C4517B588431C75BCF01208B378A4F4FBB138217A9CA4A2 -Test: Encrypt -Comment: Set 2, vector 0 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 8000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2CAE7C0460EE2FC3200923A1B6C2ABEEA746C8B44F6C3FB941BD3AF02A3E6E3E -Test: Encrypt -Comment: Set 2, vector 1 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 4000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 45FAAFBEE792EA704EE3D08CFA9D9F5CF93FEB3443E0049DE5898A48F5A3D92B -Test: Encrypt -Comment: Set 2, vector 2 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 2000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 720F072E7796310AC1BDDD3714581EB95896723DA3E61E0892B43F65A4153965 -Test: Encrypt -Comment: Set 2, vector 3 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 1000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5E6671D1F792673D63940E69D78A3471B3C150707DA72E6C25CBD2C4DA2B9778 -Test: Encrypt -Comment: Set 2, vector 4 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0800000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 2E96F027C2B62ED2D2EE692A992ACAB827D16FDA71DD98109A645E4094923D3B -Test: Encrypt -Comment: Set 2, vector 5 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0400000000000000000000000000000000000000000000000000000000000000 -Ciphertext: A38D7F334B21394B28A29FC9CBC68AD9F2AE85E7434D1C2F57AAA4C1A49DB759 -Test: Encrypt -Comment: Set 2, vector 6 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0200000000000000000000000000000000000000000000000000000000000000 -Ciphertext: F67B5037CE9193023095D43DE312523F99E6CBCDF43EC00A947284496E311DD6 -Test: Encrypt -Comment: Set 2, vector 7 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0100000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7DC030A91C39EC8558AC10044AF79D4CCA92BBC8093B3A2456E26350E35EEBDA -Test: Encrypt -Comment: Set 2, vector 8 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0080000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 99260425AA126953E04A3D959F9153404521EC64C3B35E61EEBA67AAD2C1295A -Test: Encrypt -Comment: Set 2, vector 9 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0040000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 65C380354899581B2B40EDDF40A0695FB608DCDD11C6B0C2CA6BB427DB1D2A9D -Test: Encrypt -Comment: Set 2, vector 10 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0020000000000000000000000000000000000000000000000000000000000000 -Ciphertext: BBD1C4488D41FB1B096E835AD29FC3DC5B97496BA638625D78B99C5ABBDFA13A -Test: Encrypt -Comment: Set 2, vector 11 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0010000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7AFDEE496D690233ED0717E2D92DE3A102FDF902E51E69FFCE244B84A69CA826 -Test: Encrypt -Comment: Set 2, vector 12 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0008000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 06D8C3E7AAC698D143013B364BD7ABC4E4EB6BA82BBAB2A4A0B486E70E24592C -Test: Encrypt -Comment: Set 2, vector 13 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0004000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 727A8BF64932039C3409ED31CFC0171651BA69D551E8073A4BD1D35F31F52336 -Test: Encrypt -Comment: Set 2, vector 14 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0002000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 9EE7CA05C4161860014BEA89FB2DED90B4F0B362AD67789C6045C9C71310A8AA -Test: Encrypt -Comment: Set 2, vector 15 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0001000000000000000000000000000000000000000000000000000000000000 -Ciphertext: E924224559E43960EC44165CAD471CFED381B279B3EA4AF96BDB071BE987DA0D -Test: Encrypt -Comment: Set 2, vector 16 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000800000000000000000000000000000000000000000000000000000000000 -Ciphertext: FF189222046B5F4FB491CDC9A98130D772629F3EF44A06894268C507C25061AF -Test: Encrypt -Comment: Set 2, vector 17 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000400000000000000000000000000000000000000000000000000000000000 -Ciphertext: 6B053BA7765F2A62595A1E83444B52FCF16C8BBBEB21B437E6FC8C5F03B3673F -Test: Encrypt -Comment: Set 2, vector 18 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000200000000000000000000000000000000000000000000000000000000000 -Ciphertext: 0FB836DC6BCDA1C2955CC7A6F25E72C5FFFDE1075D820217157051FB5BD3D3EF -Test: Encrypt -Comment: Set 2, vector 19 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000100000000000000000000000000000000000000000000000000000000000 -Ciphertext: 200EBC8B8217D9A6895253F9366543027E5F493DBA1A5AD4FC7AB66FB806308E -Test: Encrypt -Comment: Set 2, vector 20 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000080000000000000000000000000000000000000000000000000000000000 -Ciphertext: 45B33F2465C674941B7E26C5986E42F6814A71323B420E401DCC8DA200FC3C08 -Test: Encrypt -Comment: Set 2, vector 21 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000040000000000000000000000000000000000000000000000000000000000 -Ciphertext: D2BF0A074053A01A227DC439311BF8BD696203995285A3A2CD3674A0CC6A65B2 -Test: Encrypt -Comment: Set 2, vector 22 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000020000000000000000000000000000000000000000000000000000000000 -Ciphertext: 5FFFAB58BA2CB27AE92E10F36F99A8EFEDF9DE2446A9C2E82E48F22FB1ED8C5D -Test: Encrypt -Comment: Set 2, vector 23 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000010000000000000000000000000000000000000000000000000000000000 -Ciphertext: 835A1BD7A3688BA0F7C572417A06FCCBCE0A69C7FCDF10C8BCF4469AE80DF11E -Test: Encrypt -Comment: Set 2, vector 24 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000008000000000000000000000000000000000000000000000000000000000 -Ciphertext: 559D1BECB3DBBE40A7E31C66D97D292821B934818172553FC1CE68AD8E6A741F -Test: Encrypt -Comment: Set 2, vector 25 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000004000000000000000000000000000000000000000000000000000000000 -Ciphertext: D962BE9A9C4F8DDA6F0EC42DB8B48FA14A1E91E639BD85FF26A2543D9FDFA9A9 -Test: Encrypt -Comment: Set 2, vector 26 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000002000000000000000000000000000000000000000000000000000000000 -Ciphertext: 588B2319C62ED25ECEAB7C327B212F5FCD5D89DE8A85AA3713BF332CF5F715DF -Test: Encrypt -Comment: Set 2, vector 27 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000001000000000000000000000000000000000000000000000000000000000 -Ciphertext: 67EDE571C64AFF87D7AE5294E64F1709F920A10D278E1629FC8B2BE7EF5ABE0D -Test: Encrypt -Comment: Set 2, vector 28 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000800000000000000000000000000000000000000000000000000000000 -Ciphertext: 60D9E58A6828847F9644DC165EB508B5A2BC67219B969B605B3CFAE109C9CE47 -Test: Encrypt -Comment: Set 2, vector 29 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000400000000000000000000000000000000000000000000000000000000 -Ciphertext: 5A0C538CB78F13404BF8D8AF5C43A17F04AD0D35DAD45F88E26B9D1C204B5AFB -Test: Encrypt -Comment: Set 2, vector 30 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000200000000000000000000000000000000000000000000000000000000 -Ciphertext: 724EE8B7D7BCAC2587C42D92FFCDF7EDFF91F06AD43ED353F332E1FAC3B70F5F -Test: Encrypt -Comment: Set 2, vector 31 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000100000000000000000000000000000000000000000000000000000000 -Ciphertext: D50F11DACBF340C1315419D1983028DCED83F8350FE50DA4F9554DFA641E99E1 -Test: Encrypt -Comment: Set 2, vector 32 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000080000000000000000000000000000000000000000000000000000000 -Ciphertext: 9460ACD1B739015ED197B2659353AAC465339FAD9D1AFB845A337630332C1C55 -Test: Encrypt -Comment: Set 2, vector 33 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000040000000000000000000000000000000000000000000000000000000 -Ciphertext: 7D7A56F8A89463C4CE519B96854200C6E05703651CE3ACD5549B59D0B9788B93 -Test: Encrypt -Comment: Set 2, vector 34 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000020000000000000000000000000000000000000000000000000000000 -Ciphertext: D07E4F830ADF1DE4886C614CDB6B3D988884293AE65A63B3E9886A8727C022B2 -Test: Encrypt -Comment: Set 2, vector 35 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000010000000000000000000000000000000000000000000000000000000 -Ciphertext: 56CCEC1812B3B83086208DBF0C98119DC1CAE316E91B09F4F6F36BDCF73F8873 -Test: Encrypt -Comment: Set 2, vector 36 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000008000000000000000000000000000000000000000000000000000000 -Ciphertext: E8C3012B0EEB2D18DEA4C06BAC2906DF858BFB8A4D86D6841C02A9E45B2D0455 -Test: Encrypt -Comment: Set 2, vector 37 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000004000000000000000000000000000000000000000000000000000000 -Ciphertext: E10FB90CB2F5F830763FCEFA386A8E70052AB8994A55DC95FEDF8B71E11D2636 -Test: Encrypt -Comment: Set 2, vector 38 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000002000000000000000000000000000000000000000000000000000000 -Ciphertext: 848DFB81A0D4D13A40F9119AB77A3B6D2B96E76396B39984739FDF31ADBC376F -Test: Encrypt -Comment: Set 2, vector 39 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000001000000000000000000000000000000000000000000000000000000 -Ciphertext: 61068A490E20E07686D8A77B81718A3214508E3FE3DA6A6BBAA8ABD67B98623F -Test: Encrypt -Comment: Set 2, vector 40 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000800000000000000000000000000000000000000000000000000000 -Ciphertext: 9197E2A5212260324CA6E6FA0BBA56B4E5D9934C8B9E42D9F43E901C0994082C -Test: Encrypt -Comment: Set 2, vector 41 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000400000000000000000000000000000000000000000000000000000 -Ciphertext: E9DC3C1445CBFF1B863CF3FB6B338B4EC29F2C083E65A4BBCC2F1FAC22CCA8DD -Test: Encrypt -Comment: Set 2, vector 42 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000200000000000000000000000000000000000000000000000000000 -Ciphertext: 80039358C99E64A255D5E4E334C830FFEC8E0CBF2EB6030DE7DCE1A938821938 -Test: Encrypt -Comment: Set 2, vector 43 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000100000000000000000000000000000000000000000000000000000 -Ciphertext: E508D93429BBE95EE38672A2F653841701F391C68235391367F16415C2C84ADC -Test: Encrypt -Comment: Set 2, vector 44 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000080000000000000000000000000000000000000000000000000000 -Ciphertext: 710463874DF68B8930CC5CD6A00ABA2BCE27352997F2582EF472ED5F5AFE75A8 -Test: Encrypt -Comment: Set 2, vector 45 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000040000000000000000000000000000000000000000000000000000 -Ciphertext: E90AD04D26F4FF6D25D193CD2C34A2E1C6A1E570CCC705B873CACC94E61F79A7 -Test: Encrypt -Comment: Set 2, vector 46 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000020000000000000000000000000000000000000000000000000000 -Ciphertext: 8E19B69D55C9A2B2CCEACB50EC8007F39C81A0F261A8568D1298967C132BB790 -Test: Encrypt -Comment: Set 2, vector 47 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000010000000000000000000000000000000000000000000000000000 -Ciphertext: 4051E2FA9032676DC6E11CE947C64C9A0C0FC262AA41F40FA0C4093D1E4FA924 -Test: Encrypt -Comment: Set 2, vector 48 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000008000000000000000000000000000000000000000000000000000 -Ciphertext: 5DA6F415CCDF1A2D3335A0BEBB879D88CB9C871744111004C0E5AA6D27EB0311 -Test: Encrypt -Comment: Set 2, vector 49 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000004000000000000000000000000000000000000000000000000000 -Ciphertext: 684C24EC1DD06F6B565890190BE1F8BC7F4537CF5F9CF038ECB6D1D86164503A -Test: Encrypt -Comment: Set 2, vector 50 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000002000000000000000000000000000000000000000000000000000 -Ciphertext: 6D259C132726524987D4FD96C1ECD943D6B87BB98C61C4FFE41E282EC82F246A -Test: Encrypt -Comment: Set 2, vector 51 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000001000000000000000000000000000000000000000000000000000 -Ciphertext: 14707F80CC43E4E6321362B0ACFF84FE57E9D477B56637D01CAA09B232D726C5 -Test: Encrypt -Comment: Set 2, vector 52 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000800000000000000000000000000000000000000000000000000 -Ciphertext: FE98609B71F9CD65CD377C98BC4117EC8708E58D15361F9CAC02C64F0452B80D -Test: Encrypt -Comment: Set 2, vector 53 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000400000000000000000000000000000000000000000000000000 -Ciphertext: 1B78E77F935EBA86B28C9B37818245E2865AF84A73C9DAA735E42E6009AA07F3 -Test: Encrypt -Comment: Set 2, vector 54 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000200000000000000000000000000000000000000000000000000 -Ciphertext: F354ADD75ED9E121B1BFAD9483C6825AEF57BAA2DF08B519640E022E196B313F -Test: Encrypt -Comment: Set 2, vector 55 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000100000000000000000000000000000000000000000000000000 -Ciphertext: 7E0D7DCC0642CD5BF0C39460C4C183E5F321BCAB5EEA0AC7021E1AECE423E2A9 -Test: Encrypt -Comment: Set 2, vector 56 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000080000000000000000000000000000000000000000000000000 -Ciphertext: D1CCBD3EEA6ACF918569BEC2C900723B4359CA19C58E32ED65FDCBAA30A41C98 -Test: Encrypt -Comment: Set 2, vector 57 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000040000000000000000000000000000000000000000000000000 -Ciphertext: 361246D37645483C6D13C6500326694A0D577604CDF7CD36586B6C7F96FBE077 -Test: Encrypt -Comment: Set 2, vector 58 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000020000000000000000000000000000000000000000000000000 -Ciphertext: 0BC890CF369C233EDB99A51CEC75BFF60FB36BFB3EC15F253054F8865CB16DFF -Test: Encrypt -Comment: Set 2, vector 59 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000010000000000000000000000000000000000000000000000000 -Ciphertext: B5ED5183A00C882F8D213AFCE35C14E940407B7C2A8C9A5A19F289AED42DFAD7 -Test: Encrypt -Comment: Set 2, vector 60 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000008000000000000000000000000000000000000000000000000 -Ciphertext: 22B4EA3A5718D6CEE4EA78725F5BAC735C539C343D7B45121EDDA22CA39D9413 -Test: Encrypt -Comment: Set 2, vector 61 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000004000000000000000000000000000000000000000000000000 -Ciphertext: 94ECEC21BC3426C7214F266B6442F85B6AE765BD6206A951B2AA14505D19FBCA -Test: Encrypt -Comment: Set 2, vector 62 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000002000000000000000000000000000000000000000000000000 -Ciphertext: EF77932A5749126D65BD88330C18D91EDBB7FB53D7B3B675EE148EFC893559B9 -Test: Encrypt -Comment: Set 2, vector 63 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000001000000000000000000000000000000000000000000000000 -Ciphertext: BB9E132DC5DE8035433FBEAC46395E861BDA17A4892FFE6BD1B10D6B4D6AE0F3 -Test: Encrypt -Comment: Set 2, vector 64 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000800000000000000000000000000000000000000000000000 -Ciphertext: 7B536CF871F7FF406AD640683F405F0E14D72E77CDD2AB091D9A8E169155CE24 -Test: Encrypt -Comment: Set 2, vector 65 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000400000000000000000000000000000000000000000000000 -Ciphertext: 2417835AB4BD0A1D3439310480224C52796F3DB3536419F51A09551DFD4A6799 -Test: Encrypt -Comment: Set 2, vector 66 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000200000000000000000000000000000000000000000000000 -Ciphertext: 8E49C9819DFF2DEFCD8DF3E9EA910F79A9A932F43E4B763D6988CC0924C20544 -Test: Encrypt -Comment: Set 2, vector 67 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000100000000000000000000000000000000000000000000000 -Ciphertext: 1D364FDEFCB51560E4408CF25FC05E7698235D271E725590533CE24E3F3EC1EE -Test: Encrypt -Comment: Set 2, vector 68 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000080000000000000000000000000000000000000000000000 -Ciphertext: F1C0422AC64E4D566E799ADA6CE33B59C31051C55ED2212841460CE330F2763E -Test: Encrypt -Comment: Set 2, vector 69 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000040000000000000000000000000000000000000000000000 -Ciphertext: FA90883588183011F2748ADBC5217BA38CF6787FFD8BFCBEA06ADE193B1313C5 -Test: Encrypt -Comment: Set 2, vector 70 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000020000000000000000000000000000000000000000000000 -Ciphertext: 84EE69F947AEAAA0F1F2DA8C1508733D31F62FEBCF7085C68DEA5A602A566EBF -Test: Encrypt -Comment: Set 2, vector 71 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000010000000000000000000000000000000000000000000000 -Ciphertext: 260C06AB73B581E29C34FEE05363F532D4C693B5E8025291FC99C48F9CFCEFF8 -Test: Encrypt -Comment: Set 2, vector 72 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000008000000000000000000000000000000000000000000000 -Ciphertext: 98184C744C6A24B329A7827CE0F5B30AE709493A22F9064D1C3F7FED046D1C2A -Test: Encrypt -Comment: Set 2, vector 73 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000004000000000000000000000000000000000000000000000 -Ciphertext: 3CCDF1C3103B356E7A460410D91F1F00F749EB96F3E89F91248FB5E0949806EF -Test: Encrypt -Comment: Set 2, vector 74 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000002000000000000000000000000000000000000000000000 -Ciphertext: 49AB6245E93A6CF84BF66A7451D134535362CB8A8CE2E47012BF8B4EF02894D4 -Test: Encrypt -Comment: Set 2, vector 75 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000001000000000000000000000000000000000000000000000 -Ciphertext: 7A92C7BB97CB99AD15EA9DA3A629031901840D23EA4227C699944882E2E8F3CC -Test: Encrypt -Comment: Set 2, vector 76 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000800000000000000000000000000000000000000000000 -Ciphertext: 00FC7EBE56FCB696D9606FBBEEA6955871B7A03CDCAAE25DFC47D06145371AD3 -Test: Encrypt -Comment: Set 2, vector 77 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000400000000000000000000000000000000000000000000 -Ciphertext: FFF7327A979B527486052C1B99DECCFCC5E680D39613DE4107E8A04980DDFD70 -Test: Encrypt -Comment: Set 2, vector 78 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000200000000000000000000000000000000000000000000 -Ciphertext: 1E950B49D7D446867ED48272D220BCCC35B104A76A107880FB37D8AE55E69F58 -Test: Encrypt -Comment: Set 2, vector 79 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000100000000000000000000000000000000000000000000 -Ciphertext: 3B97EDED4E70497DAE02FD51E10AB26888096D2D182A7BC7EE55B6F3243E0144 -Test: Encrypt -Comment: Set 2, vector 80 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000080000000000000000000000000000000000000000000 -Ciphertext: 94414A0116665FFD8D1589B050A1663DBA15463206DA4E6A735B58FA7B4AA7ED -Test: Encrypt -Comment: Set 2, vector 81 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000040000000000000000000000000000000000000000000 -Ciphertext: D586FFCBBF32561B9659306068DD31C2A1FBC8DDF99CF0BDAB3DCC0664B403C7 -Test: Encrypt -Comment: Set 2, vector 82 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000020000000000000000000000000000000000000000000 -Ciphertext: 061E17DB1EAF9884C940B8C72E884C8D9D46819FDDF6724239168DDBEE170B9B -Test: Encrypt -Comment: Set 2, vector 83 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000010000000000000000000000000000000000000000000 -Ciphertext: D70F322E45E1D64B3D91249E9DE766DB7EF9084120C13D0215F31A6DE2E791C6 -Test: Encrypt -Comment: Set 2, vector 84 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000008000000000000000000000000000000000000000000 -Ciphertext: 5018967FCA5E67F24DCCE2190D24CD3E24A0B709B70DC38F1A4B4FE39CDCD2E5 -Test: Encrypt -Comment: Set 2, vector 85 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000004000000000000000000000000000000000000000000 -Ciphertext: 9108A0540D8D02658268185F06DFF6F2248681D0D9F9F4C6658942FC27C68246 -Test: Encrypt -Comment: Set 2, vector 86 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000002000000000000000000000000000000000000000000 -Ciphertext: 6595E74A5943DFE1A3FC19ADEBF190CDEC4C2EA0B7CCC6364E0AF7222CCEAA46 -Test: Encrypt -Comment: Set 2, vector 87 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000001000000000000000000000000000000000000000000 -Ciphertext: 5F156FB20AFD4BC0E4E4B2BA7700A38FFCAF9229E3CBA8C99915B692A76ACDEA -Test: Encrypt -Comment: Set 2, vector 88 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000800000000000000000000000000000000000000000 -Ciphertext: F0584D66033584791BED0EB67D2A73AA918E0F88F08683DC1F67DB7DD3375326 -Test: Encrypt -Comment: Set 2, vector 89 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000400000000000000000000000000000000000000000 -Ciphertext: 5EB0956E3DA8ECFC571D5BD1C4EF430FBB10117C6684B8530B6552B812780EBF -Test: Encrypt -Comment: Set 2, vector 90 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000200000000000000000000000000000000000000000 -Ciphertext: E8C8CB56ED63B5BA16DD833CC9C7AC77E425C284FFD547E8F9FE10410CA02FF3 -Test: Encrypt -Comment: Set 2, vector 91 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000100000000000000000000000000000000000000000 -Ciphertext: 68704A278A231ED468C1F0CFF43A4FC61253EACBE2BDCE1ED86D89F43263016D -Test: Encrypt -Comment: Set 2, vector 92 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000080000000000000000000000000000000000000000 -Ciphertext: CA16F899842EE79CBAC4D7CD67172C7DD537E6EA21D48C15B0B34B29BF87E79B -Test: Encrypt -Comment: Set 2, vector 93 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000040000000000000000000000000000000000000000 -Ciphertext: 9E6E7B31FF5D4D5C7D1C264273A27DA542BFCC6116B7DFDEF6332690B7304BDD -Test: Encrypt -Comment: Set 2, vector 94 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000020000000000000000000000000000000000000000 -Ciphertext: FE466983DED41AFB1908DF12A5532054C6DB320F0ECBDCE7610BBE2A07AA7F68 -Test: Encrypt -Comment: Set 2, vector 95 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000010000000000000000000000000000000000000000 -Ciphertext: D2D93C1B66FD710F8B72564A44ACA93995938FEE7C38DE482C9586E3413EB40C -Test: Encrypt -Comment: Set 2, vector 96 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000008000000000000000000000000000000000000000 -Ciphertext: 6623F853780833A60B60E6467CFA3D3D000228F2C8334F8B00CFE119133D41C7 -Test: Encrypt -Comment: Set 2, vector 97 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000004000000000000000000000000000000000000000 -Ciphertext: 1CED4727527E1C3107A89E77645241D240F3F113AC2BF8319E5D8EFF68997595 -Test: Encrypt -Comment: Set 2, vector 98 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000002000000000000000000000000000000000000000 -Ciphertext: FA450B3D8A7C03B643DF6EC70867D0502AE20235335AF5932A7016D71A6059A4 -Test: Encrypt -Comment: Set 2, vector 99 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000001000000000000000000000000000000000000000 -Ciphertext: A6F76AB74CE44538579369F5367B826C4EA72EB6EE08A0CFE1272EB435FDFEFC -Test: Encrypt -Comment: Set 2, vector 100 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000800000000000000000000000000000000000000 -Ciphertext: 8108B48A62A0E0CD58B066C10613E2B589CFB0BCEF4EB58BBF8C88E84A2CD258 -Test: Encrypt -Comment: Set 2, vector 101 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000400000000000000000000000000000000000000 -Ciphertext: F335D10835B018414786D30923663B77B2E0CA65423B96BFA885B9797138CF4F -Test: Encrypt -Comment: Set 2, vector 102 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000200000000000000000000000000000000000000 -Ciphertext: 87D8E75FEDA12025B9517BBF8421E837872E8978E48DA51BB8B8574C04731091 -Test: Encrypt -Comment: Set 2, vector 103 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000100000000000000000000000000000000000000 -Ciphertext: B8A50E6EDFF9711C6064812423F5DC5D77970BE65B545C042A02BACB30A4CD6F -Test: Encrypt -Comment: Set 2, vector 104 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000080000000000000000000000000000000000000 -Ciphertext: EB98815E5A9337DF35F98D7CF27183EC8423D5F9D145326638B864E0F994DD7D -Test: Encrypt -Comment: Set 2, vector 105 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000040000000000000000000000000000000000000 -Ciphertext: 3E5DDB36ABD739986483DE7A9EEF2468461A02B55CAA24100394442F0946F337 -Test: Encrypt -Comment: Set 2, vector 106 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000020000000000000000000000000000000000000 -Ciphertext: 809F726C3BB19BD09D4412B64777085D968ED4E612286008C4BAC69F671E7E31 -Test: Encrypt -Comment: Set 2, vector 107 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000010000000000000000000000000000000000000 -Ciphertext: 28F2EE8D382DF1AB0CF82B93C7A09B87180E8D19C35657302EFE1B1C4CA11ED4 -Test: Encrypt -Comment: Set 2, vector 108 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000008000000000000000000000000000000000000 -Ciphertext: 76E6887FC464215C9576BB233F5A3A7D98CA73F9B2D06E3BB81BC34AF02C8CE9 -Test: Encrypt -Comment: Set 2, vector 109 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000004000000000000000000000000000000000000 -Ciphertext: E8CEF712D7AF841C4FE7800CB04C27E25BDB41BECFA894588F73776CAAE2A0FA -Test: Encrypt -Comment: Set 2, vector 110 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000002000000000000000000000000000000000000 -Ciphertext: 868D3A678A216D01A765046E2991A21F9626493063AFE771E3369E5DA2BA7E9B -Test: Encrypt -Comment: Set 2, vector 111 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000001000000000000000000000000000000000000 -Ciphertext: D6465061FA1B143E1F6A3FCC1601D2D9FAEEF995C457E9EE301A27E8139D1AFE -Test: Encrypt -Comment: Set 2, vector 112 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000800000000000000000000000000000000000 -Ciphertext: B42BB57D2F25612AAB33EF3213D6D210D9831502A1C4D51C4E72148CBB9893D1 -Test: Encrypt -Comment: Set 2, vector 113 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000400000000000000000000000000000000000 -Ciphertext: CE0EC3C44BFAABE6E18B3506E01199B0F2E0BCA4EA6C29D367EDDD0E83A1C65F -Test: Encrypt -Comment: Set 2, vector 114 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000200000000000000000000000000000000000 -Ciphertext: 627101F50E134D6F33EF70AF0E32A3AF7C3237E3A5D99319719F175DD0392383 -Test: Encrypt -Comment: Set 2, vector 115 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000100000000000000000000000000000000000 -Ciphertext: CBCC83BE624059BD8B950BCF486AFBC342CF3575EBA6950FB39C03DB4822EDD9 -Test: Encrypt -Comment: Set 2, vector 116 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000080000000000000000000000000000000000 -Ciphertext: 5EAD7961798903C315DD89BE57105FEA164CA06A4ECDBB5CB10B76711C3E49A0 -Test: Encrypt -Comment: Set 2, vector 117 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000040000000000000000000000000000000000 -Ciphertext: 69169E6E11EAC935E12E6E30EFCEDD7236EAED9C5E1E3B215CD7167AB88B199D -Test: Encrypt -Comment: Set 2, vector 118 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000020000000000000000000000000000000000 -Ciphertext: 5B08F07728399920CA30DC57CE94CAE85A44530033B2AE6BB7F8E29D7934C437 -Test: Encrypt -Comment: Set 2, vector 119 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000010000000000000000000000000000000000 -Ciphertext: 8FAD35B4FBC3BBAB2F4BF00D8A1651BE3FD77085AC5E6C7F6E2EDF5048F86068 -Test: Encrypt -Comment: Set 2, vector 120 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000008000000000000000000000000000000000 -Ciphertext: 71B22D911D9E754A76EC052CD7DC503CDE9A16E9043A04CFA244D8EB19FC21AA -Test: Encrypt -Comment: Set 2, vector 121 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000004000000000000000000000000000000000 -Ciphertext: 062A10B7F5E3E8D7F3FC2C14E10EC9CA947A8FDC0EBC01E3A127BAFE689D6577 -Test: Encrypt -Comment: Set 2, vector 122 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000002000000000000000000000000000000000 -Ciphertext: 0FC375F0F68567F1827C7218132B434E84DA6377DB50AB330E8D9BD2754BD1B8 -Test: Encrypt -Comment: Set 2, vector 123 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000001000000000000000000000000000000000 -Ciphertext: 0E4C1117D462EEBCF5FCD7AC9807AF40C403910421CD19A4634B1C86113EB387 -Test: Encrypt -Comment: Set 2, vector 124 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000800000000000000000000000000000000 -Ciphertext: A9DB2CD2A23780D8BC5A2567961BCA24A41531157D4A229046B47DE48CAE0FDD -Test: Encrypt -Comment: Set 2, vector 125 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000400000000000000000000000000000000 -Ciphertext: 7195678F00F98B00706E7C497E5FA2BC648EDA00B4B7DFAC6234C8232DF8E071 -Test: Encrypt -Comment: Set 2, vector 126 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000200000000000000000000000000000000 -Ciphertext: E5C1970C7C0B8E7E1BF871219486359C2E5037BE6E8E637BDB9F11051FB36A16 -Test: Encrypt -Comment: Set 2, vector 127 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000100000000000000000000000000000000 -Ciphertext: 2426496DC3B09404B609157E2273D526C3E6909B82F65527B42ABDD6348CF602 -Test: Encrypt -Comment: Set 2, vector 128 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000080000000000000000000000000000000 -Ciphertext: F9870238947E1575AF11D14D12E593163B98BA12E79F05563CBFFBCFB23FDC38 -Test: Encrypt -Comment: Set 2, vector 129 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000040000000000000000000000000000000 -Ciphertext: 2B1E410ACE9E8875F965A29D90773B68CAC452AE98CEB5922B7BAD936ACC421B -Test: Encrypt -Comment: Set 2, vector 130 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000020000000000000000000000000000000 -Ciphertext: 180285A7AD7DD8FFD619970804F0FDB9706D5F5C467F815D0B1A455DED9D9300 -Test: Encrypt -Comment: Set 2, vector 131 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000010000000000000000000000000000000 -Ciphertext: BAEB5C1C68D72F1AE4735F6B75CDF9265E4F6F55DA934C4F118A3728AA2BC0D5 -Test: Encrypt -Comment: Set 2, vector 132 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000008000000000000000000000000000000 -Ciphertext: 9DEBFCC984F55E97C0064335C8A4B7489B7BDD75560EA51982114FCE4D481032 -Test: Encrypt -Comment: Set 2, vector 133 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000004000000000000000000000000000000 -Ciphertext: DF3B0B54DF4D1814A6F46B8F8B37E27AE8B9EC54B97BF9C523F1EC713EDDFFEE -Test: Encrypt -Comment: Set 2, vector 134 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000002000000000000000000000000000000 -Ciphertext: 37AA04C74A1E8ED165BC1B4C97265A32B5579D9B2A7B7C883A98B616D5C24FAE -Test: Encrypt -Comment: Set 2, vector 135 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000001000000000000000000000000000000 -Ciphertext: 83815356746186AE4CC327AB3A8CE04EF66ABD32D44D7089F1D7E301BFE006D6 -Test: Encrypt -Comment: Set 2, vector 136 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000800000000000000000000000000000 -Ciphertext: 2C6C7878E099F55653CA784A0BE4C9EC6201AFDCF99CDDC1ED862D4FE88CFDC8 -Test: Encrypt -Comment: Set 2, vector 137 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000400000000000000000000000000000 -Ciphertext: 424804513D38537C024955F2CCB29BECFD801FC06CD8EC5DE353872F0B50616F -Test: Encrypt -Comment: Set 2, vector 138 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000200000000000000000000000000000 -Ciphertext: 48C31A55ED4716825D43FF671C01A86CDD792AABF78703ADC58F5FD65B3C0DE1 -Test: Encrypt -Comment: Set 2, vector 139 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000100000000000000000000000000000 -Ciphertext: BF99E4263F2C512CDE33A91E04FACA55052444E40FF79F09716FC06D24FDDE1D -Test: Encrypt -Comment: Set 2, vector 140 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000080000000000000000000000000000 -Ciphertext: 1A40488BA16A5D0AE6381018F15ABF95C78FB05867E3D7E213CAD7BA3DC9EA3B -Test: Encrypt -Comment: Set 2, vector 141 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000040000000000000000000000000000 -Ciphertext: BEAD8979A1A485959C3E9C8BF9CCF7CF850EB205296E1E8FF8BCAFBB011FF21D -Test: Encrypt -Comment: Set 2, vector 142 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000020000000000000000000000000000 -Ciphertext: A8EDCC85F5A941B4434BD4DAD5E39EEAD102DA25BBB2C3D143572AC7425ED819 -Test: Encrypt -Comment: Set 2, vector 143 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000010000000000000000000000000000 -Ciphertext: 631126B3A837AA4C999EFE6A687BBA58751464A6395670213C8445CC8409C33F -Test: Encrypt -Comment: Set 2, vector 144 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000008000000000000000000000000000 -Ciphertext: CA4A5FD3A3D2DA973E16C0A849E374C5A293351A66415B45107BD228CB842B19 -Test: Encrypt -Comment: Set 2, vector 145 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000004000000000000000000000000000 -Ciphertext: A61FDF733DDEC4C3AE51BE778BDD6E34BED64449ABCA7A718EAA513A2A5A9014 -Test: Encrypt -Comment: Set 2, vector 146 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000002000000000000000000000000000 -Ciphertext: 2C632530E7FCD550B5F9D14E21409AFD07C7E1FBF04B3B3FEC8C61AC8A1591ED -Test: Encrypt -Comment: Set 2, vector 147 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000001000000000000000000000000000 -Ciphertext: B2D97A1D343D3D5E1A7E444BA6E57D2E5ED42E02F719ECA22BA47E796AB37B18 -Test: Encrypt -Comment: Set 2, vector 148 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000800000000000000000000000000 -Ciphertext: AC515AAC675C2C3E46A8F77578189149327413CF40B48E16BF83D3500C2B1355 -Test: Encrypt -Comment: Set 2, vector 149 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000400000000000000000000000000 -Ciphertext: C8ADC6079B92459A8E975FFFE2352A90629CF9E8D53630536D9EBC7DAC4C467E -Test: Encrypt -Comment: Set 2, vector 150 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000200000000000000000000000000 -Ciphertext: 97B2C40964B25AE5CBD092E36B37A3BB4520570A9920034C584C66600D3857D9 -Test: Encrypt -Comment: Set 2, vector 151 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000100000000000000000000000000 -Ciphertext: 99A017D3829CEFE10DDD33D33F53EA470A2A74A35ED3BED8B7E9D6EF3B790153 -Test: Encrypt -Comment: Set 2, vector 152 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000080000000000000000000000000 -Ciphertext: 6141854199F9E01CFE4A35DF918B805985ACC8F8A7456FFBF91D27D4E85E4C49 -Test: Encrypt -Comment: Set 2, vector 153 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000040000000000000000000000000 -Ciphertext: 28BC7571E7C921B31BC2D7BF55853C2CC5B815B39471907DAE152F685791378B -Test: Encrypt -Comment: Set 2, vector 154 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000020000000000000000000000000 -Ciphertext: AD751D4D9D635900C22B6166328ECD85FB4A1610D055793BF04A83CB6F5F02DB -Test: Encrypt -Comment: Set 2, vector 155 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000010000000000000000000000000 -Ciphertext: 8670009356A0A3BD402CF218664826C05BE1651C6E606C011967F8F9C3835017 -Test: Encrypt -Comment: Set 2, vector 156 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000008000000000000000000000000 -Ciphertext: 6CE35F565BC4F38D73116267C49D345B7B19D57D5C90136CAF512F76AF47FAAD -Test: Encrypt -Comment: Set 2, vector 157 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000004000000000000000000000000 -Ciphertext: FD0DF28AFE47414F99219AD120F33DCA6F8756B2264349911041B0AEC9D77A43 -Test: Encrypt -Comment: Set 2, vector 158 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000002000000000000000000000000 -Ciphertext: 49CE284D7A18A0608E5E3768286E919DE97DD81B369AB0A012AD7BDC491DED1A -Test: Encrypt -Comment: Set 2, vector 159 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000001000000000000000000000000 -Ciphertext: 12B27FEC757A809C68F670698E5CB40E762855022FC12DE2332DB9814FC6E5E2 -Test: Encrypt -Comment: Set 2, vector 160 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000800000000000000000000000 -Ciphertext: 53074884476D09C729F35C3906046C2DCBA7F12BF59CDD3CE73ABF91847C6369 -Test: Encrypt -Comment: Set 2, vector 161 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000400000000000000000000000 -Ciphertext: D29E3C55DD3D867D7263D2C961FDB6A97B8D827AB73A20479ACB06DF992AEC24 -Test: Encrypt -Comment: Set 2, vector 162 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000200000000000000000000000 -Ciphertext: 4BE421463C6F2CC8118A50684EB5FC98323EA27F03D4B98EC05727BA0FFA40E8 -Test: Encrypt -Comment: Set 2, vector 163 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000100000000000000000000000 -Ciphertext: A96EC7F07298F9D86A811D0110D60E65C80F3E913B575831A5E8533932196B24 -Test: Encrypt -Comment: Set 2, vector 164 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000080000000000000000000000 -Ciphertext: F12B579997BA4203D8A0FF36181E4C1B50C703FE32CF18D9BF84355BC404D135 -Test: Encrypt -Comment: Set 2, vector 165 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000040000000000000000000000 -Ciphertext: 35EBB3FE5FACC9B9D321E82A73C344CA05D0E73372579349A1F365DEA0105292 -Test: Encrypt -Comment: Set 2, vector 166 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000020000000000000000000000 -Ciphertext: 0F1F0518D57ADC91D810B5899EB7EE7900D05AD8AD2960FE07893F30859B636F -Test: Encrypt -Comment: Set 2, vector 167 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000010000000000000000000000 -Ciphertext: A6CAF97EF17BEFDCF3412D7F45F72C1F1726198ED3B5CD905DF9078DCD70F882 -Test: Encrypt -Comment: Set 2, vector 168 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000008000000000000000000000 -Ciphertext: E287019353E8C71C62178B3AF7A3ECA210D79F803F43C09B6C08F295367A30CA -Test: Encrypt -Comment: Set 2, vector 169 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000004000000000000000000000 -Ciphertext: CF7A7ECEA347875A7B9191BF9FFDC3FB53512052FA42370E39BF5D906EE82D4E -Test: Encrypt -Comment: Set 2, vector 170 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000002000000000000000000000 -Ciphertext: 7E362B5B5ED5CAB9A518320E498FDB915BFD72BB5C588495AC49FC2D5CEC2134 -Test: Encrypt -Comment: Set 2, vector 171 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000001000000000000000000000 -Ciphertext: 69254195C6A9A4D334F8F0558A6C9635EB8A397E5AB672E81DC194AFA5C3A8B7 -Test: Encrypt -Comment: Set 2, vector 172 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000800000000000000000000 -Ciphertext: 3934A6BA3DE9885771111CBA59D50EC684F8F612AAAE3E511C0A211D972723C4 -Test: Encrypt -Comment: Set 2, vector 173 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000400000000000000000000 -Ciphertext: BCEE40ADD3CFDE924F58786640A56A68FE83615EDD82873DF6908057AF39F74A -Test: Encrypt -Comment: Set 2, vector 174 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000200000000000000000000 -Ciphertext: 70F4E0381A989C486A45FAE5B108373E950843EE48DC2A43E7AA625BF3AC9838 -Test: Encrypt -Comment: Set 2, vector 175 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000100000000000000000000 -Ciphertext: FAED24C44DE7F447CD1169F4D8D734E55154B73F79B31AD1CD310C7F5529433A -Test: Encrypt -Comment: Set 2, vector 176 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000080000000000000000000 -Ciphertext: 887BA60DED98C75DADDC1CD0824E7E6C76D947617A919A3B870B489CD1B7F6B2 -Test: Encrypt -Comment: Set 2, vector 177 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000040000000000000000000 -Ciphertext: 33D833FFDB7BEB6BBAB4DDACA6784B88C4B76A49641AA01BC980AB31084F4351 -Test: Encrypt -Comment: Set 2, vector 178 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000020000000000000000000 -Ciphertext: 8CDEF08AB44C2CB2AB5EC94437E501A96999B30C045A79DE99E220595B95DA2F -Test: Encrypt -Comment: Set 2, vector 179 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000010000000000000000000 -Ciphertext: 029247C8EC0610E7F5B49FA4191E99CDECBC1E44DF123270901A57DE8ED64850 -Test: Encrypt -Comment: Set 2, vector 180 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000008000000000000000000 -Ciphertext: 08487E1E53C677CA34640459BDBF7C53247DD54624B9C2156A59F24A818A258E -Test: Encrypt -Comment: Set 2, vector 181 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000004000000000000000000 -Ciphertext: 2C7C0444738DB202D9236CF00E1B75F579E18CAD4341093675F66732746F8060 -Test: Encrypt -Comment: Set 2, vector 182 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000002000000000000000000 -Ciphertext: F493AF90C19A9EA6460AE35418D4857236D678B570352665092854CFF9FB684E -Test: Encrypt -Comment: Set 2, vector 183 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000001000000000000000000 -Ciphertext: 4575CF8865954F9FDCC9C2F7A41BFD52B1C770E2C7609151E41D9B1D0489500C -Test: Encrypt -Comment: Set 2, vector 184 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000800000000000000000 -Ciphertext: BA0606FA831D4EF759CF457F88B0EEDFDF13BD3ABF72547456052C877B9E3A3B -Test: Encrypt -Comment: Set 2, vector 185 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000400000000000000000 -Ciphertext: 10E979D310CAD332AA3DC860EF69B2BBD96E817BFB93393AD4D8B141C0A301E4 -Test: Encrypt -Comment: Set 2, vector 186 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000200000000000000000 -Ciphertext: B46DE2A7729FAF7CEE978353D4392EA23FE1BB36732D101377C603125125FE62 -Test: Encrypt -Comment: Set 2, vector 187 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000100000000000000000 -Ciphertext: F03E1B911C1EDD769CAD59A744FAD47CB5E19502C1E7F4F0B3197101F3B673C1 -Test: Encrypt -Comment: Set 2, vector 188 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000080000000000000000 -Ciphertext: A9128F8B0C1809095597110471DD7F10040AE71626E8C694BA529B4C9E1353A2 -Test: Encrypt -Comment: Set 2, vector 189 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000040000000000000000 -Ciphertext: B9EDCD81B2CFB461C1FC554ED71CCC958AF4B2B726C011173F4058C40211C496 -Test: Encrypt -Comment: Set 2, vector 190 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000020000000000000000 -Ciphertext: 400F0635E34B796116E3752A0EDA47C3ABC19641DDD60427B4CE3AA8700CEA8E -Test: Encrypt -Comment: Set 2, vector 191 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000010000000000000000 -Ciphertext: 0E526F1012B80F22F946FD51D776187DEFD554B1F5806102E7DD9277FE06B826 -Test: Encrypt -Comment: Set 2, vector 192 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000008000000000000000 -Ciphertext: 1FC0DA71F72D08CDD0F59120C4A88E793869A2C598BAB97C92D6C63C0FAEADA9 -Test: Encrypt -Comment: Set 2, vector 193 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000004000000000000000 -Ciphertext: C493FDECD4D49D5FC6D8590C70BEAAD97EB7694244201CA4CF1732E03D7A4251 -Test: Encrypt -Comment: Set 2, vector 194 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000002000000000000000 -Ciphertext: C532BFE04C6CA7E8B4ABFF9E8BD9C676CBC9AA78FEF4A2DC5CC907742B3ED64F -Test: Encrypt -Comment: Set 2, vector 195 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000001000000000000000 -Ciphertext: 5C8F3ECB07F0264162A9C01A6BB2BC5CF3C7B9ED315803BF86A72406C2655242 -Test: Encrypt -Comment: Set 2, vector 196 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000800000000000000 -Ciphertext: 8C13C039C13DF9C8D821D33E85AFE93EEAFCFC2A2F06D85B3BDE2743FC37AD3F -Test: Encrypt -Comment: Set 2, vector 197 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000400000000000000 -Ciphertext: 3D990835001730714D0880420F57041E37A7FAF1FCA991AA38C409C80F2DC61F -Test: Encrypt -Comment: Set 2, vector 198 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000200000000000000 -Ciphertext: EC44357D4F18EBE148B47AB546D6A5F3E08F8F6C9E2B8B6B99FF303814BF43BA -Test: Encrypt -Comment: Set 2, vector 199 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000100000000000000 -Ciphertext: 00C3B30C81FBC65B9E12C8D6429104FDF40D322D47A59E637FC8CE749725BDCC -Test: Encrypt -Comment: Set 2, vector 200 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000080000000000000 -Ciphertext: 6136C065D96E7F18AB296F86AF04BB264A6DA61DEA7C5413C9131B7EBE551B88 -Test: Encrypt -Comment: Set 2, vector 201 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000040000000000000 -Ciphertext: 2A363A08CAD79DF6A3F2DF5D842B14935C5D09C9D6C78C4989ADCB018A735A5D -Test: Encrypt -Comment: Set 2, vector 202 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000020000000000000 -Ciphertext: B25955B31CC449A42502D1AB61D699DE558BA2C7825BA06B17B239851E575880 -Test: Encrypt -Comment: Set 2, vector 203 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000010000000000000 -Ciphertext: CBE2FD81D74436E167D6A5CF8F7DC07338885146351483E4474CD213D853A6FE -Test: Encrypt -Comment: Set 2, vector 204 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000008000000000000 -Ciphertext: 66DE9DCBF2B85FF944EDD40B3D81F5F8699DB1982C045667FDE9A499A7777DD6 -Test: Encrypt -Comment: Set 2, vector 205 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000004000000000000 -Ciphertext: D940E3F69C42E847312E473E362FD609BE7780D99DAC30F8F095D58EFDC58D59 -Test: Encrypt -Comment: Set 2, vector 206 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000002000000000000 -Ciphertext: 60FBA04239A8C312E10C7773673E94678CB1E13B069759AF304C56CCA6F490DD -Test: Encrypt -Comment: Set 2, vector 207 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000001000000000000 -Ciphertext: D67E081F763F322BA82FA01E184C355A65DE8028E47BF0DB5FCAEDA8C2593F02 -Test: Encrypt -Comment: Set 2, vector 208 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000800000000000 -Ciphertext: 434868F9A6086D0F9218E02CB9534E9EEE88B90C6174A4306B0D0843A35CFDFD -Test: Encrypt -Comment: Set 2, vector 209 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000400000000000 -Ciphertext: B6CCB5899745E29FEE7870B22C2F989D84C98C4510DEA892666E187CDEF77E1A -Test: Encrypt -Comment: Set 2, vector 210 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000200000000000 -Ciphertext: E798F9255A21E0ECDC4BA638F0BF03BAA0AD7810844837582193D7FB3E11B5DF -Test: Encrypt -Comment: Set 2, vector 211 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000100000000000 -Ciphertext: 9BAE51C5C4DF9E55570EF0FE5F2C6AC0CF9FD953E65CD07ED12378BD5A0F2911 -Test: Encrypt -Comment: Set 2, vector 212 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000080000000000 -Ciphertext: 95ECC45EEDD4537D6A7D54D60A64CBFB6728982441C7EE10B7A84A80B51EE171 -Test: Encrypt -Comment: Set 2, vector 213 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000040000000000 -Ciphertext: D8D77750B38E522216DA0A1A9DB7C56788E504708A2048B66946FB83C1981FCB -Test: Encrypt -Comment: Set 2, vector 214 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000020000000000 -Ciphertext: 0CAA8435D051798DB289708EC6CC4C98F0018AB7F068FA0E40443A1F227002CD -Test: Encrypt -Comment: Set 2, vector 215 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000010000000000 -Ciphertext: 5410408C0306460E6033543669A26A63F7C7BBDFEF4273C9BAD8AC472EDAFB67 -Test: Encrypt -Comment: Set 2, vector 216 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000008000000000 -Ciphertext: DD3A0F7B61D056015B54A329882E942ECA3C5C3F64ACFE71E3255A8F53E1AD73 -Test: Encrypt -Comment: Set 2, vector 217 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000004000000000 -Ciphertext: 80A70BE4CC4C61C0F7F501E8068C75CEA78DC11A224D0C47C09D20361C99CF00 -Test: Encrypt -Comment: Set 2, vector 218 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000002000000000 -Ciphertext: BEF3417464A46BBD2B7E9FB967F4FBF406C2B5B9C8B076B770C199C003786A40 -Test: Encrypt -Comment: Set 2, vector 219 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000001000000000 -Ciphertext: C1756ADF6EEF9837B43C4B032B17A79C3A583EE37981CC495CA95893F34218A6 -Test: Encrypt -Comment: Set 2, vector 220 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000800000000 -Ciphertext: 90273FCA31968871BE3D5C76AFCB47D9ECC31A48B87988FD359E93AFF6815F4D -Test: Encrypt -Comment: Set 2, vector 221 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000400000000 -Ciphertext: D0A5F666F7A819EF8BA114C1872158179731F6989997E13AFD73DB252E5CD2A2 -Test: Encrypt -Comment: Set 2, vector 222 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000200000000 -Ciphertext: D4E3DA34C47E5A86A723ED5B9F615B283E4CD54E9F2ED9EAA98A7AB8DE41B14C -Test: Encrypt -Comment: Set 2, vector 223 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000100000000 -Ciphertext: 547227D086EBB538F5836B8E1E65601209AEB6DFD1C450C014C559D879D71862 -Test: Encrypt -Comment: Set 2, vector 224 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000080000000 -Ciphertext: 9E52F033EFE0762ED108095BDF6CD8A89F8E1028F0D3D9B39B601C1084F95F74 -Test: Encrypt -Comment: Set 2, vector 225 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000040000000 -Ciphertext: A049C5B9BD63EBEB23B34EA2F27813D29EDC044E2486D709AC7D2C731557066B -Test: Encrypt -Comment: Set 2, vector 226 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000020000000 -Ciphertext: 1A9CDD2A99C5ED7FB2A6A1870230B0BD6890567E0E4439E248548DF25CB6126E -Test: Encrypt -Comment: Set 2, vector 227 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000010000000 -Ciphertext: 41F2CDA0EFE97BCE8689CF33201B4E57E0600BBB1F274DF3D589915F8EA5C372 -Test: Encrypt -Comment: Set 2, vector 228 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000008000000 -Ciphertext: 1F4712D7AB6D127ABDA90DA977CFC60B44F84859AE4B705851CF687E01E1E250 -Test: Encrypt -Comment: Set 2, vector 229 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000004000000 -Ciphertext: DC93D915CBBC140EDB08B34406F71B4CD38274E92DE8FAF355D274AE7929BC28 -Test: Encrypt -Comment: Set 2, vector 230 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000002000000 -Ciphertext: D2D9A648EDAF9339D7EE52419CC33C42E4CA91AA670D14B78952F41F889122E5 -Test: Encrypt -Comment: Set 2, vector 231 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000001000000 -Ciphertext: F34BA77405D00CAFC3E6786CDB26263C10CDC4D6AFAEDF4C26566A51DB82F5F9 -Test: Encrypt -Comment: Set 2, vector 232 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000800000 -Ciphertext: 21A7EAD6D95FC7AB788206CEA15A25CC4AEB69BAA96C78D5E2851DDBA25523F0 -Test: Encrypt -Comment: Set 2, vector 233 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000400000 -Ciphertext: 822BC3900195E6F224805E77B2460A65FA1A11CFD473F1DFA65351CBB4EFDFEB -Test: Encrypt -Comment: Set 2, vector 234 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000200000 -Ciphertext: 648A71BE1E77866181F980B37690D5C8A37DF29BB2EBC3A41665CD0CCC2E8EF8 -Test: Encrypt -Comment: Set 2, vector 235 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000100000 -Ciphertext: 808E32C933955FF7C8D6F1A4C6754CB3B7311612CFF846D02C81B712C78EB63E -Test: Encrypt -Comment: Set 2, vector 236 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000080000 -Ciphertext: E074251CC7C5BFFCE2CA45933206B2EE8864156A4626C03EA030B71F8BD454BE -Test: Encrypt -Comment: Set 2, vector 237 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000040000 -Ciphertext: 72EBE213A06F63603B49A750808F348FF7C9E4EC72884FDA7C58968EC5A25EED -Test: Encrypt -Comment: Set 2, vector 238 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000020000 -Ciphertext: 20618612C2AF418DE3E185AF7973D508DC31DE1E9D9FB4FDF9E95FD592F567EF -Test: Encrypt -Comment: Set 2, vector 239 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000010000 -Ciphertext: F94C66D4884A657BF0A6A6EA31A90A07F193F55465575FF1BF8DE68F3441BF4E -Test: Encrypt -Comment: Set 2, vector 240 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000008000 -Ciphertext: 9636DCAB40FB991FC330D8EFD671FF83BAA0C9E33D7A146D5E7ADC53592B605F -Test: Encrypt -Comment: Set 2, vector 241 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000004000 -Ciphertext: FC21689B5F46A011ECFE1E314E03ED7105BAC620193714B2290087C17FB763B6 -Test: Encrypt -Comment: Set 2, vector 242 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000002000 -Ciphertext: ABD2583E0FCC95122FDC700AF9B1FDA50D91E752E19BE9D2EE4F5E22033D53C6 -Test: Encrypt -Comment: Set 2, vector 243 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000001000 -Ciphertext: 3501CD56EE5EA39AB32F38371E5C2CF6EEEB9DA82D210A8D88AE8F29917AE9F4 -Test: Encrypt -Comment: Set 2, vector 244 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000800 -Ciphertext: 7559A2AA6CBFA8A181565EDDDE323DB80CE740545FFEE13B4851980AD2451E24 -Test: Encrypt -Comment: Set 2, vector 245 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000400 -Ciphertext: CEF6DBFD1FBCCBB587BD748D6CC992F8EF671A829E2D6AD73D1DC1C1B2A9E8DD -Test: Encrypt -Comment: Set 2, vector 246 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000200 -Ciphertext: 46FBBCD26A1F879746BDF4FF7804A5C105F621837ABCF94F17123B700A58A08A -Test: Encrypt -Comment: Set 2, vector 247 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000100 -Ciphertext: 0B10D2DA0E0FB6F067D641FF7F8C9C8FF4E2D689450787B7136ADF38DC1F2948 -Test: Encrypt -Comment: Set 2, vector 248 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000080 -Ciphertext: 4492E09E73459BF74417FC0D7190DA719A891C9CAE14801944FFB24912E377A8 -Test: Encrypt -Comment: Set 2, vector 249 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000040 -Ciphertext: 76D72C3D3AF6F2FF6AFBC0C1A553E6F8171D81D6BB1CB3C3A6C43ED826A88FAA -Test: Encrypt -Comment: Set 2, vector 250 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000020 -Ciphertext: D912041134584B69AC01938EC88913DBCFF7CDBE93CDF7443BD465F1B2E3F7F5 -Test: Encrypt -Comment: Set 2, vector 251 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000010 -Ciphertext: F0883EB64A5345CC9A0055D4E882D199EFFC334C05B53BC4132AC1A51BA39A9F -Test: Encrypt -Comment: Set 2, vector 252 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000008 -Ciphertext: 276246B0D93A4E6FF05832F51D2BF60641B63594EB90A1E08A7D98C6DDAE1461 -Test: Encrypt -Comment: Set 2, vector 253 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000004 -Ciphertext: 6AA2B04BF65F4213583CED5347537123DC3BE0703209170D1D34B0B8A66C1C58 -Test: Encrypt -Comment: Set 2, vector 254 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000002 -Ciphertext: DC438414927E453DBFD91DC60C635EE4273A9921A134DB513AB2BBDBAE64A9AD -Test: Encrypt -Comment: Set 2, vector 255 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000001 -Ciphertext: 45D43E9288738C5AD1A683D8DE59CEDD22D666A2B7078EB1301B532A272D570B -Test: Encrypt -Comment: Set 3, vector 0 -Key: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Plaintext: 0000000000000000000000000000000000000000000000000000000000000000 -Ciphertext: 7CA51614425C3BA8CE54DD2FC2020AE7B6E574D198136D0FAE7E26CCBF0BE7A6 -Test: Encrypt -Comment: Set 3, vector 1 -Key: 01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101 -Plaintext: 0101010101010101010101010101010101010101010101010101010101010101 -Ciphertext: C4B7C6A9738C77EE28F7E685C8358E0AF88FB6D23955EE6DF49FE3F5DA16F826 -Test: Encrypt -Comment: Set 3, vector 2 -Key: 02020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202 -Plaintext: 0202020202020202020202020202020202020202020202020202020202020202 -Ciphertext: CD108DD9EC1000B79C75AA3DCC88F913E6F52773853035A5C44F3245B134CBFF -Test: Encrypt -Comment: Set 3, vector 3 -Key: 03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303 -Plaintext: 0303030303030303030303030303030303030303030303030303030303030303 -Ciphertext: E8F9DE8F066B675AE90C919FC4981603485BBB92382D8C844CAF707973D5276D -Test: Encrypt -Comment: Set 3, vector 4 -Key: 04040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404 -Plaintext: 0404040404040404040404040404040404040404040404040404040404040404 -Ciphertext: 6AA777340200C1B65AB25193A8BB267C233DAC7E1B3C523D406FC5B567B7B586 -Test: Encrypt -Comment: Set 3, vector 5 -Key: 05050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505 -Plaintext: 0505050505050505050505050505050505050505050505050505050505050505 -Ciphertext: 6B14A9C454143376DBDC3C93FB8096B09C01456B0B55412FD9692CD7CB587069 -Test: Encrypt -Comment: Set 3, vector 6 -Key: 06060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606 -Plaintext: 0606060606060606060606060606060606060606060606060606060606060606 -Ciphertext: 3FED53DEF4FBC1D012B36562132AB40049818DA4E62E86716DE5EF70790B0D6A -Test: Encrypt -Comment: Set 3, vector 7 -Key: 07070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707 -Plaintext: 0707070707070707070707070707070707070707070707070707070707070707 -Ciphertext: 7A428F7A6841BC8F0E99335C5021C413D2639321DC8D9F280A2F0EF4B420A212 -Test: Encrypt -Comment: Set 3, vector 8 -Key: 08080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808 -Plaintext: 0808080808080808080808080808080808080808080808080808080808080808 -Ciphertext: A23BE32D37FA4054EC45D6A9CC643AF9124EDAA4AD9ABC7FAAB449D39D11B128 -Test: Encrypt -Comment: Set 3, vector 9 -Key: 09090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909 -Plaintext: 0909090909090909090909090909090909090909090909090909090909090909 -Ciphertext: 972195D6756F7D3A4D13BF49BFBCE7D164460355150C297A41CCC6AA9F31C5D6 -Test: Encrypt -Comment: Set 3, vector 10 -Key: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Plaintext: 0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A -Ciphertext: 2AA722C58EBDB7701225BA9C3B1F7C946D57DEDC74FEDDB637EB14E27A0F0CC9 -Test: Encrypt -Comment: Set 3, vector 11 -Key: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Plaintext: 0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B -Ciphertext: 1C9A0420B9F6EF013FB3ADB4F20C862B61702BA479276E3187322B33D4B128C2 -Test: Encrypt -Comment: Set 3, vector 12 -Key: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Plaintext: 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C -Ciphertext: 666CC3862BAACADA4D35A9079D52438FB3B4416C9938397E61D48066B6476068 -Test: Encrypt -Comment: Set 3, vector 13 -Key: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Plaintext: 0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D -Ciphertext: DB94504EF884901FAA5778199329A2DCC9AA50A4453172CE8ADE11BFE54234E9 -Test: Encrypt -Comment: Set 3, vector 14 -Key: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Plaintext: 0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E -Ciphertext: DF0B4204DB7E0924BD2931C131E6DFEB013A5844F717DF7A2DEF86FBC2125DA6 -Test: Encrypt -Comment: Set 3, vector 15 -Key: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Plaintext: 0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F -Ciphertext: D7C2D4257254E7A05657047B43B65AB778C9E6ACDE53F14000FDFC346CEE4BA6 -Test: Encrypt -Comment: Set 3, vector 16 -Key: 10101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010 -Plaintext: 1010101010101010101010101010101010101010101010101010101010101010 -Ciphertext: F64819DFBEBE0A6DB650E7072CE28EA606586418B317785FF0AD44212A84C82C -Test: Encrypt -Comment: Set 3, vector 17 -Key: 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 -Plaintext: 1111111111111111111111111111111111111111111111111111111111111111 -Ciphertext: 155B7E6FFCC0AA874E22494545374E97C08A3D1B1045A0F35FFC54B2842D02A4 -Test: Encrypt -Comment: Set 3, vector 18 -Key: 12121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212 -Plaintext: 1212121212121212121212121212121212121212121212121212121212121212 -Ciphertext: FEE12FD9E87DCB4FE5C5249E3EAEDA0514F6A4826C1A5ABC87E22B95D4A84851 -Test: Encrypt -Comment: Set 3, vector 19 -Key: 13131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313 -Plaintext: 1313131313131313131313131313131313131313131313131313131313131313 -Ciphertext: 1DA785C2A2CEFED459474EE5401F5B795F6ED468DBB924CFFCF65EF465DE9534 -Test: Encrypt -Comment: Set 3, vector 20 -Key: 14141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414 -Plaintext: 1414141414141414141414141414141414141414141414141414141414141414 -Ciphertext: 4434A4D83273B06B64AF4ED1D70EEAD50DBFC44C5931A7B7B98FF9F514B229E9 -Test: Encrypt -Comment: Set 3, vector 21 -Key: 15151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515 -Plaintext: 1515151515151515151515151515151515151515151515151515151515151515 -Ciphertext: 1AB982A6C64C2C42D05F9FB8ED9BE0EEB5B48CEE8EAB0250D98D43157E999EDC -Test: Encrypt -Comment: Set 3, vector 22 -Key: 16161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616 -Plaintext: 1616161616161616161616161616161616161616161616161616161616161616 -Ciphertext: 83291A3265ACAB71E5CCCF0281A433579F39AE6C2FB7CB7528D7F820158177FF -Test: Encrypt -Comment: Set 3, vector 23 -Key: 17171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717 -Plaintext: 1717171717171717171717171717171717171717171717171717171717171717 -Ciphertext: 90F1FF9F69854321CFC6D0A4541CCDF73C1A1DC737D96FB76F0DDD0BB0097BBA -Test: Encrypt -Comment: Set 3, vector 24 -Key: 18181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818 -Plaintext: 1818181818181818181818181818181818181818181818181818181818181818 -Ciphertext: ABF9813765AFBEA9BF26026716294D5C5B309243339ECC9F21CEADE6E7083266 -Test: Encrypt -Comment: Set 3, vector 25 -Key: 19191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919 -Plaintext: 1919191919191919191919191919191919191919191919191919191919191919 -Ciphertext: 7B5C8222D85392E82E703ADFB0FF02DBD2297791B84E26A3A1ED12309247D064 -Test: Encrypt -Comment: Set 3, vector 26 -Key: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Plaintext: 1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A -Ciphertext: 227355246FCC9106FA5572475E8C466F1140CD75A8A84DFCD2B0908392914FD7 -Test: Encrypt -Comment: Set 3, vector 27 -Key: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Plaintext: 1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B -Ciphertext: E5E5A887FA888691FF93014C2E368DC10775A447A5EF4B632A089DA82D245BE3 -Test: Encrypt -Comment: Set 3, vector 28 -Key: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Plaintext: 1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C -Ciphertext: BA417FC94107761C0969EF6EA7DDC74E5F85CAB61E2271CEB6D9C98B139F4576 -Test: Encrypt -Comment: Set 3, vector 29 -Key: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Plaintext: 1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D -Ciphertext: F3B85912DF6950B9AE28CE08E456D494E0C949A36FA102540C51827AEC9168AB -Test: Encrypt -Comment: Set 3, vector 30 -Key: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Plaintext: 1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E -Ciphertext: 1AC0ED993D24366380522B05F97B6FC64B199241A1D556B992632AEE400F0494 -Test: Encrypt -Comment: Set 3, vector 31 -Key: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Plaintext: 1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F -Ciphertext: 3550CD591130231B0F01F6860B699715B98B9497B4035C7323000D67C5F0B1B7 -Test: Encrypt -Comment: Set 3, vector 32 -Key: 20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020 -Plaintext: 2020202020202020202020202020202020202020202020202020202020202020 -Ciphertext: E267D6113C27170A3EE6DF496E801A6131BBD3444365D7C03791E25610F1A0E4 -Test: Encrypt -Comment: Set 3, vector 33 -Key: 21212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121 -Plaintext: 2121212121212121212121212121212121212121212121212121212121212121 -Ciphertext: 3D71B778381E70BCC1A7B8411208225FC922857E862FC17312E3782CEA289B15 -Test: Encrypt -Comment: Set 3, vector 34 -Key: 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 -Plaintext: 2222222222222222222222222222222222222222222222222222222222222222 -Ciphertext: 16B41DE00DBF29B96CC59E246DE3188B786E097394E9EEE2250169AE00306FD8 -Test: Encrypt -Comment: Set 3, vector 35 -Key: 23232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323 -Plaintext: 2323232323232323232323232323232323232323232323232323232323232323 -Ciphertext: 99DDE88C9F26D270B3C507A25FE49955A0FEA6C8FEBAD133842DA1CE730EEB7F -Test: Encrypt -Comment: Set 3, vector 36 -Key: 24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424 -Plaintext: 2424242424242424242424242424242424242424242424242424242424242424 -Ciphertext: 9766D3F9E73987EE10A20605C8338C0759A7024CF2DF549DE5084EC4902C550A -Test: Encrypt -Comment: Set 3, vector 37 -Key: 25252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525 -Plaintext: 2525252525252525252525252525252525252525252525252525252525252525 -Ciphertext: 0FFD89849C8EC5A46B8F43C799ED305AF602C73E810FC729A8C9BB0F5C55CD54 -Test: Encrypt -Comment: Set 3, vector 38 -Key: 26262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626 -Plaintext: 2626262626262626262626262626262626262626262626262626262626262626 -Ciphertext: 91956E101CE4546623A5BE49811F167476CB568972CEBF7A59EB27DA524A0C6B -Test: Encrypt -Comment: Set 3, vector 39 -Key: 27272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727 -Plaintext: 2727272727272727272727272727272727272727272727272727272727272727 -Ciphertext: 7DEC5ECE0D590EE3E099C07F2DD6A6A9C71632D277803FD007275B93369ABED0 -Test: Encrypt -Comment: Set 3, vector 40 -Key: 28282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828 -Plaintext: 2828282828282828282828282828282828282828282828282828282828282828 -Ciphertext: 039C192AFC54EFDE1ED3610B0E9F95AA08D7CDC6AE71A66B5C508E4D14C038CF -Test: Encrypt -Comment: Set 3, vector 41 -Key: 29292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929 -Plaintext: 2929292929292929292929292929292929292929292929292929292929292929 -Ciphertext: D558F8F4562BD8FE816FABF621556C8416C6FD00209028DF978F8915CC093E16 -Test: Encrypt -Comment: Set 3, vector 42 -Key: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Plaintext: 2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A -Ciphertext: 1AE21791ED4B610DD693012518759D6E9C1BBF206482EEA43470F02B493CFFB8 -Test: Encrypt -Comment: Set 3, vector 43 -Key: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Plaintext: 2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B -Ciphertext: 34F2112E8FBD1B373BA8400B05321F658FDFE0DC87C1304C36766DE71840A4DF -Test: Encrypt -Comment: Set 3, vector 44 -Key: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Plaintext: 2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C -Ciphertext: DBF9B56BBF2E50DF321CA687F8BE0E6222E7DF52B4A142174058CC119D9EC0DA -Test: Encrypt -Comment: Set 3, vector 45 -Key: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Plaintext: 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D -Ciphertext: 8B2757374F778FE0B30D11AD7116CE37E2AB858A4E1C50D1115B6E328F3635F5 -Test: Encrypt -Comment: Set 3, vector 46 -Key: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Plaintext: 2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E -Ciphertext: 06588A873366FAA47323C9A098A759718DFB0E310C91A4E38B42CC56A0757811 -Test: Encrypt -Comment: Set 3, vector 47 -Key: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Plaintext: 2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F -Ciphertext: 7B861B18E3F322D8000BDDCBCE3B50405AA923375568F16AE84411E91DB879C3 -Test: Encrypt -Comment: Set 3, vector 48 -Key: 30303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030 -Plaintext: 3030303030303030303030303030303030303030303030303030303030303030 -Ciphertext: 170F74A4D692C302551EE17CD544D65185112D2A5E812D203B36FC39BF1DA9C7 -Test: Encrypt -Comment: Set 3, vector 49 -Key: 31313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131 -Plaintext: 3131313131313131313131313131313131313131313131313131313131313131 -Ciphertext: 0178F59DDAB05A4DFAF66FD406170E08227096EF9712CB481A26EBD82F470D7A -Test: Encrypt -Comment: Set 3, vector 50 -Key: 32323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232 -Plaintext: 3232323232323232323232323232323232323232323232323232323232323232 -Ciphertext: 8BAC479F3A92DF71F973AA457E19D75FB0F1A0FE68FF440A86154721BCC345D4 -Test: Encrypt -Comment: Set 3, vector 51 -Key: 33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333 -Plaintext: 3333333333333333333333333333333333333333333333333333333333333333 -Ciphertext: EB50A10C7A0ED9960CDE0C3EDB899A6B67324B1EE23DE4BB13F60D187C3CBA35 -Test: Encrypt -Comment: Set 3, vector 52 -Key: 34343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434 -Plaintext: 3434343434343434343434343434343434343434343434343434343434343434 -Ciphertext: 00AA782AC61FD06DC781E3C5662C65BD1043EC28D056C98F07074DA7C11C1E1F -Test: Encrypt -Comment: Set 3, vector 53 -Key: 35353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535 -Plaintext: 3535353535353535353535353535353535353535353535353535353535353535 -Ciphertext: 23B9F2F26CFC51ECC6DD1AFE614C2DAE8348DA033F9B67AEAA87B71F5377D95D -Test: Encrypt -Comment: Set 3, vector 54 -Key: 36363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636 -Plaintext: 3636363636363636363636363636363636363636363636363636363636363636 -Ciphertext: 9655D4B1CBEF855401274C3339C16DB9B5A9651F60579CFE8554B6EE25DCCA0E -Test: Encrypt -Comment: Set 3, vector 55 -Key: 37373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737 -Plaintext: 3737373737373737373737373737373737373737373737373737373737373737 -Ciphertext: E072ED2DAD79B07C48B50ED31E02FD9705562525D49DBF45DACCFDF35D5A6965 -Test: Encrypt -Comment: Set 3, vector 56 -Key: 38383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838 -Plaintext: 3838383838383838383838383838383838383838383838383838383838383838 -Ciphertext: 287638BAE945B88A95029155BC47D033B5C5C4C191F079C234C6E97683FFABA0 -Test: Encrypt -Comment: Set 3, vector 57 -Key: 39393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939 -Plaintext: 3939393939393939393939393939393939393939393939393939393939393939 -Ciphertext: 500CD3B02BF6FA8C66D1ADE0CE43B325A759CD3426096084A261F054D798F885 -Test: Encrypt -Comment: Set 3, vector 58 -Key: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Plaintext: 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A -Ciphertext: 17614BAB583F2DCF809A2AEE973A4875251B571525521B3A8C47303450B6301F -Test: Encrypt -Comment: Set 3, vector 59 -Key: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Plaintext: 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B -Ciphertext: 978C8DFD9AC74FF670CC8B31EDC8EC15DDBC2854375ED9BA07BB0F7B96C70BB3 -Test: Encrypt -Comment: Set 3, vector 60 -Key: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Plaintext: 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C -Ciphertext: 994CA36F6230C7DB63CAD61342FAB3F155C361DAD458FC457AD09ACCAB2EB43F -Test: Encrypt -Comment: Set 3, vector 61 -Key: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Plaintext: 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D -Ciphertext: AC06659932208AC1DD5F07448A7407232F1410CDAC92F7C5305C4043C559345F -Test: Encrypt -Comment: Set 3, vector 62 -Key: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Plaintext: 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E -Ciphertext: B55616F0743A29655FEC468CD30C8C65F7925327665670BA9E41A2E09C05C63B -Test: Encrypt -Comment: Set 3, vector 63 -Key: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Plaintext: 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F -Ciphertext: 78F4852712C3547547A114E73F52C6128EDD3F29E0B2C938D6F9F69AF2303FD2 -Test: Encrypt -Comment: Set 3, vector 64 -Key: 40404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040 -Plaintext: 4040404040404040404040404040404040404040404040404040404040404040 -Ciphertext: C97909916EE86FFDCE8A92903046109B53F788A53039434DF1A394DAD6F697A2 -Test: Encrypt -Comment: Set 3, vector 65 -Key: 41414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141 -Plaintext: 4141414141414141414141414141414141414141414141414141414141414141 -Ciphertext: C3FD3C59D37D44AF9EE6B87AC0939A4A4B2FBAAC23E80E72B1CAC352FE30A8E2 -Test: Encrypt -Comment: Set 3, vector 66 -Key: 42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 -Plaintext: 4242424242424242424242424242424242424242424242424242424242424242 -Ciphertext: 94C70F7654479BC9DA9854129F57F3E69C31B63900A404F577AF1C83CD96E5D6 -Test: Encrypt -Comment: Set 3, vector 67 -Key: 43434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343 -Plaintext: 4343434343434343434343434343434343434343434343434343434343434343 -Ciphertext: 71DD024E9CE700B373A275AA870A68B5DAD9E47D38BC18F34073319041A1CADF -Test: Encrypt -Comment: Set 3, vector 68 -Key: 44444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444 -Plaintext: 4444444444444444444444444444444444444444444444444444444444444444 -Ciphertext: 274D101B2BD0E7CAFC9E5559DC68567DC8975056B84573C4294D78513B7406D8 -Test: Encrypt -Comment: Set 3, vector 69 -Key: 45454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545 -Plaintext: 4545454545454545454545454545454545454545454545454545454545454545 -Ciphertext: 8DCE5B5C376E42F11A322D8CBCEB8C0AE1EC24F3C65D72B326708FEAF13E3B51 -Test: Encrypt -Comment: Set 3, vector 70 -Key: 46464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646 -Plaintext: 4646464646464646464646464646464646464646464646464646464646464646 -Ciphertext: D62D3BA9BBD23F4424EB929AE7A4CD83A70FA7EFD2E6CCFED23E1176AFDB69CD -Test: Encrypt -Comment: Set 3, vector 71 -Key: 47474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747 -Plaintext: 4747474747474747474747474747474747474747474747474747474747474747 -Ciphertext: FE7670925FEA3AAE1F039590EA230C094C3E434BF1350B12D4EA26E48A6EF7F0 -Test: Encrypt -Comment: Set 3, vector 72 -Key: 48484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848 -Plaintext: 4848484848484848484848484848484848484848484848484848484848484848 -Ciphertext: 3A57E728BFA31AA36C8E4ED38A34B465BA233AD066225F31651C93B870AAFE6D -Test: Encrypt -Comment: Set 3, vector 73 -Key: 49494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949 -Plaintext: 4949494949494949494949494949494949494949494949494949494949494949 -Ciphertext: 3B56014035A28EA6F2F2B09429FED7FC0F5B76D5458F1EB4F3AAA7E7F6610C65 -Test: Encrypt -Comment: Set 3, vector 74 -Key: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Plaintext: 4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A -Ciphertext: 2D28A28ECABAC61B540CD933BE43AF16F11429EDE8E7B62121CD853054363730 -Test: Encrypt -Comment: Set 3, vector 75 -Key: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Plaintext: 4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B -Ciphertext: D8A892E3C24C6A2EB8446B3737A0E3AA1478811B819FFD3440B5307185906518 -Test: Encrypt -Comment: Set 3, vector 76 -Key: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Plaintext: 4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C -Ciphertext: 798AD5E43127299B61247059F508268CDBA78B46D4FD28C200AE1052C52294E7 -Test: Encrypt -Comment: Set 3, vector 77 -Key: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Plaintext: 4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D -Ciphertext: 63F43065BA1F262D950219D71B9CD5FA78D6798BCAA981FE3391FF8EA735E4C7 -Test: Encrypt -Comment: Set 3, vector 78 -Key: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Plaintext: 4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E -Ciphertext: E8E461EB5FD98011A37765ECA336B080D58B35C636AD6F423893EE768913255C -Test: Encrypt -Comment: Set 3, vector 79 -Key: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Plaintext: 4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F -Ciphertext: 7348E30FFC0C4F5569B6490622A34FB015C364944553582355887BC472279E8D -Test: Encrypt -Comment: Set 3, vector 80 -Key: 50505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050 -Plaintext: 5050505050505050505050505050505050505050505050505050505050505050 -Ciphertext: BE28CB05EEEEDA8FD8971E9970ECBCA25856F66E95AC8B987C69F04BE3276CD7 -Test: Encrypt -Comment: Set 3, vector 81 -Key: 51515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151 -Plaintext: 5151515151515151515151515151515151515151515151515151515151515151 -Ciphertext: 5D336C5E34D4EB95CFAB87C542C72A748AA45E7F77D841A738017927C7908804 -Test: Encrypt -Comment: Set 3, vector 82 -Key: 52525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252 -Plaintext: 5252525252525252525252525252525252525252525252525252525252525252 -Ciphertext: 2942A594A7964F41460EB6037DDE2C28FFBFFB3C21F7EFF43F06632DA980ED8B -Test: Encrypt -Comment: Set 3, vector 83 -Key: 53535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353 -Plaintext: 5353535353535353535353535353535353535353535353535353535353535353 -Ciphertext: 1C0F7A4E3147BC7F8150D8144ED31D0054FF15414E5DBF289BFEC160D22684AC -Test: Encrypt -Comment: Set 3, vector 84 -Key: 54545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454 -Plaintext: 5454545454545454545454545454545454545454545454545454545454545454 -Ciphertext: 7931C7B9D78CB50610B1BEF596268B94446FCDA44C3EE7CEE53121AC519C4001 -Test: Encrypt -Comment: Set 3, vector 85 -Key: 55555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555 -Plaintext: 5555555555555555555555555555555555555555555555555555555555555555 -Ciphertext: F4E331C357C603EE5ED5547D75B54631A68D7CD74C5075198D0FC38E5661F556 -Test: Encrypt -Comment: Set 3, vector 86 -Key: 56565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656 -Plaintext: 5656565656565656565656565656565656565656565656565656565656565656 -Ciphertext: 378C2887958E31971E8F59C882730E48407E4DA9C26D4C76B672CD53202AB1B8 -Test: Encrypt -Comment: Set 3, vector 87 -Key: 57575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757 -Plaintext: 5757575757575757575757575757575757575757575757575757575757575757 -Ciphertext: DBE68FE249F4A8D36E1CB49DBE20ED58649CCC502F85895875C1FE82269219DA -Test: Encrypt -Comment: Set 3, vector 88 -Key: 58585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858 -Plaintext: 5858585858585858585858585858585858585858585858585858585858585858 -Ciphertext: 103BD780F3B382C4B28E6E1CB41CBEE22CC1BB64E4A0147D658EDA96A6E7FEAB -Test: Encrypt -Comment: Set 3, vector 89 -Key: 59595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959 -Plaintext: 5959595959595959595959595959595959595959595959595959595959595959 -Ciphertext: 382EF838282E0F4BA729083542BB8CB48AB874FF568DFDA56AFC4ED266DD3243 -Test: Encrypt -Comment: Set 3, vector 90 -Key: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Plaintext: 5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A -Ciphertext: 088665DE8F9DC9298DEF4164C12526597F56859AAC2C96A95645A06014BA689A -Test: Encrypt -Comment: Set 3, vector 91 -Key: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Plaintext: 5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B -Ciphertext: EC988946646A1B2DCC7EDEC4FCAB11BF29055A226F4C75D28F9DFB8D2EB5C9B6 -Test: Encrypt -Comment: Set 3, vector 92 -Key: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Plaintext: 5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C -Ciphertext: B77221CE7F68292BD4E3A55E8EC7BD1FC68B1B6B02F1008586248833C1089F5C -Test: Encrypt -Comment: Set 3, vector 93 -Key: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Plaintext: 5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D -Ciphertext: B3E4AA5DE6D25A6237FDD97540191D669C64E54A7D3C544E949489355AFC82B5 -Test: Encrypt -Comment: Set 3, vector 94 -Key: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Plaintext: 5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E -Ciphertext: AAA6FA046AC4270B22A742C4C29445EB38511E5048414886EBF39523B7EAF76A -Test: Encrypt -Comment: Set 3, vector 95 -Key: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Plaintext: 5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F -Ciphertext: 4D23440171778573BE7B515C68FA99D0426A32111CA493337E7C55280A90F697 -Test: Encrypt -Comment: Set 3, vector 96 -Key: 60606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060 -Plaintext: 6060606060606060606060606060606060606060606060606060606060606060 -Ciphertext: 8EE711FB281CBAA99917C85F0623B68E2EDAFEFCC3B1B841883D71BA6683568A -Test: Encrypt -Comment: Set 3, vector 97 -Key: 61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 -Plaintext: 6161616161616161616161616161616161616161616161616161616161616161 -Ciphertext: EC29DAE53DB4475F8900311F425FE60CB834A82F2A6A2DB4810F95F4D6991B84 -Test: Encrypt -Comment: Set 3, vector 98 -Key: 62626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262 -Plaintext: 6262626262626262626262626262626262626262626262626262626262626262 -Ciphertext: 91E58DDE741553572B5D6F3DAD25953906424FF217497226746A25C0CE1C7D0F -Test: Encrypt -Comment: Set 3, vector 99 -Key: 63636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363 -Plaintext: 6363636363636363636363636363636363636363636363636363636363636363 -Ciphertext: B6EC4D9421AB011D4EEDBC32B289E45AC44CAEB1DC5FAEA752DFFA0137325067 -Test: Encrypt -Comment: Set 3, vector 100 -Key: 64646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464 -Plaintext: 6464646464646464646464646464646464646464646464646464646464646464 -Ciphertext: D9CB13EA06CADF09AC446F9B09553FFE3BF4F1152997B171C03E609D4BD60ADB -Test: Encrypt -Comment: Set 3, vector 101 -Key: 65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565 -Plaintext: 6565656565656565656565656565656565656565656565656565656565656565 -Ciphertext: 2D07CA161326ED154D9E3FF650963557EC369A91ABB0D49FC1F32AEF39A3B12E -Test: Encrypt -Comment: Set 3, vector 102 -Key: 66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666 -Plaintext: 6666666666666666666666666666666666666666666666666666666666666666 -Ciphertext: 28E8B606EE621D2C5B865B8208C7BD40C3596931CE3FF8FA5AD7EB8EE4480E95 -Test: Encrypt -Comment: Set 3, vector 103 -Key: 67676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767 -Plaintext: 6767676767676767676767676767676767676767676767676767676767676767 -Ciphertext: 9B9B3A23DA29539DA1E9BAA20449750EC192CE14A5063E1A2FFAF5039A665754 -Test: Encrypt -Comment: Set 3, vector 104 -Key: 68686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868 -Plaintext: 6868686868686868686868686868686868686868686868686868686868686868 -Ciphertext: D770E305A9C2D257759D8AE9E70C408D1CB090F976BBAFF3A56730A78BA8BF4F -Test: Encrypt -Comment: Set 3, vector 105 -Key: 69696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969 -Plaintext: 6969696969696969696969696969696969696969696969696969696969696969 -Ciphertext: 453988B10DFD852D1AFD11E96C50024571CCB0F19E7C3C4981F8B8BDCD11F720 -Test: Encrypt -Comment: Set 3, vector 106 -Key: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Plaintext: 6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A -Ciphertext: 17DFD98CB5C24610DD631C4E2749A679D68F854F21AABE8BF67605A256452AD8 -Test: Encrypt -Comment: Set 3, vector 107 -Key: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Plaintext: 6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B -Ciphertext: DA260145EC80E19C18685540AC71FA460DD4427168E37BC6E0F967D90C306FBB -Test: Encrypt -Comment: Set 3, vector 108 -Key: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Plaintext: 6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C -Ciphertext: 2AC246E2E384ECCC4BC69CE82EDB51C05DD864642F1E9A572DA6043DD1D56DF0 -Test: Encrypt -Comment: Set 3, vector 109 -Key: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Plaintext: 6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D -Ciphertext: D1A06B820071CC4122F0B0797A294F31922E26703CDEF15A6D8F511CDBD8BD3F -Test: Encrypt -Comment: Set 3, vector 110 -Key: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Plaintext: 6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E -Ciphertext: C8D23274A1FF6AEBDF0BA70FBA7A895277B1CC8040F8FB2814195E3A7E85BD01 -Test: Encrypt -Comment: Set 3, vector 111 -Key: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Plaintext: 6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F -Ciphertext: E0133DC7960953BABC7BFBA52E88DCF86EBD979D6D63EB19466EEADEDEDEEBB3 -Test: Encrypt -Comment: Set 3, vector 112 -Key: 70707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070 -Plaintext: 7070707070707070707070707070707070707070707070707070707070707070 -Ciphertext: A1A9527766EE54D566D97E7A0763A5AECE86F2816411AC2066439D6BDF02FEA7 -Test: Encrypt -Comment: Set 3, vector 113 -Key: 71717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171 -Plaintext: 7171717171717171717171717171717171717171717171717171717171717171 -Ciphertext: E1833EF5C2BA2EF192642164F0F2C02A7334EF5AEA37E9DD56D17AE6CB031004 -Test: Encrypt -Comment: Set 3, vector 114 -Key: 72727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272 -Plaintext: 7272727272727272727272727272727272727272727272727272727272727272 -Ciphertext: DD2CC0EECAA7E5364376FA73E12C64A0C42FB9FC7E94EFF0B22A051D6EDFE905 -Test: Encrypt -Comment: Set 3, vector 115 -Key: 73737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373 -Plaintext: 7373737373737373737373737373737373737373737373737373737373737373 -Ciphertext: 9A72F15B911E6A50A32EEEDF83B62B628E37ED403085180571DEBEA2F37CF49F -Test: Encrypt -Comment: Set 3, vector 116 -Key: 74747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474 -Plaintext: 7474747474747474747474747474747474747474747474747474747474747474 -Ciphertext: CD83CE7861EE8259A9C29BC3870EA1BF629ECD31F2E18F0BC12221F239207457 -Test: Encrypt -Comment: Set 3, vector 117 -Key: 75757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575 -Plaintext: 7575757575757575757575757575757575757575757575757575757575757575 -Ciphertext: 7B4218C5AEA4EEFE17E2AB110D8B63A947F21D5210162F6283EDDF00900CEE27 -Test: Encrypt -Comment: Set 3, vector 118 -Key: 76767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676 -Plaintext: 7676767676767676767676767676767676767676767676767676767676767676 -Ciphertext: 935DE2010B112937A233E7CB1023FB9D3C46D7C688A478A94F86AD3919FD2728 -Test: Encrypt -Comment: Set 3, vector 119 -Key: 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 -Plaintext: 7777777777777777777777777777777777777777777777777777777777777777 -Ciphertext: 416A91A68A520732E672ACB5A36599D9A99901F013CC460D9C2FB16AAB45996E -Test: Encrypt -Comment: Set 3, vector 120 -Key: 78787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878 -Plaintext: 7878787878787878787878787878787878787878787878787878787878787878 -Ciphertext: FD066F9C65CD3D61B43F5DA44F7B94C85541DC5E09D52B044DA963699C39FDA0 -Test: Encrypt -Comment: Set 3, vector 121 -Key: 79797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979 -Plaintext: 7979797979797979797979797979797979797979797979797979797979797979 -Ciphertext: 63937A7953E453B6E48539FACBD1BC489E03D209DB188837C5A09BA458FFFB92 -Test: Encrypt -Comment: Set 3, vector 122 -Key: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Plaintext: 7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A -Ciphertext: 68F9EA0F87112633611052A45BBF32B7069079EDB16A928CD2AA16BE464178E3 -Test: Encrypt -Comment: Set 3, vector 123 -Key: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Plaintext: 7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B -Ciphertext: 874D5ED6C8052C3B4AB830626A195F508DDA15388BA75B3D957B26BC134C9B30 -Test: Encrypt -Comment: Set 3, vector 124 -Key: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Plaintext: 7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C -Ciphertext: EC3EA8DC433E39B85E4C4D68AC6A854A1B943D99EB2E9A018EA27DC1874CA867 -Test: Encrypt -Comment: Set 3, vector 125 -Key: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Plaintext: 7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D -Ciphertext: 9CE2298362F1F234A73BECA011EC31B4BC7E143D87B4F118CDADE6AB8D1ED783 -Test: Encrypt -Comment: Set 3, vector 126 -Key: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Plaintext: 7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E -Ciphertext: 27973D9B510ED9C612CC770FC1AE25EE21B1A9616CB64617EDA477939BE98D04 -Test: Encrypt -Comment: Set 3, vector 127 -Key: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Plaintext: 7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F -Ciphertext: 82A0EB8C058E727EBD6032F0F77EE693342C97BD44E9538032652B1CA10403DE -Test: Encrypt -Comment: Set 3, vector 128 -Key: 80808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080 -Plaintext: 8080808080808080808080808080808080808080808080808080808080808080 -Ciphertext: C3C1CD5F3060B3EC4E6ABC0818B68449E1750FB482368C8F3305270E16F98735 -Test: Encrypt -Comment: Set 3, vector 129 -Key: 81818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181 -Plaintext: 8181818181818181818181818181818181818181818181818181818181818181 -Ciphertext: 26381852C68B646D80E53C958855293BDC6FAAA85C5F9CAAACABE7B8077E4F7A -Test: Encrypt -Comment: Set 3, vector 130 -Key: 82828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282 -Plaintext: 8282828282828282828282828282828282828282828282828282828282828282 -Ciphertext: E2EA924898ED40FBD8C633706AD7D698392DF1EF33A10FDFCBE51B58C3AE0668 -Test: Encrypt -Comment: Set 3, vector 131 -Key: 83838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383 -Plaintext: 8383838383838383838383838383838383838383838383838383838383838383 -Ciphertext: 15CBDDA36707819D0C7694AAD46B2345BDEFC9D4F26F03A4BF860CE46F7BB53A -Test: Encrypt -Comment: Set 3, vector 132 -Key: 84848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484 -Plaintext: 8484848484848484848484848484848484848484848484848484848484848484 -Ciphertext: F96318A42737AB884FAA82BBB7025063E9A25C5957F52A7342E0C03A1A64273C -Test: Encrypt -Comment: Set 3, vector 133 -Key: 85858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585 -Plaintext: 8585858585858585858585858585858585858585858585858585858585858585 -Ciphertext: 7813FEB148D103075C80ACDFC95E2437A560D9B2E6C910E3A59805338E498907 -Test: Encrypt -Comment: Set 3, vector 134 -Key: 86868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686 -Plaintext: 8686868686868686868686868686868686868686868686868686868686868686 -Ciphertext: C7E9D5FE3BA11096AB77E715DFF0D2EB67E9136F0393CD004A7E994B3F994FA4 -Test: Encrypt -Comment: Set 3, vector 135 -Key: 87878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787 -Plaintext: 8787878787878787878787878787878787878787878787878787878787878787 -Ciphertext: F7D2DD8DF86A0E985CF6E83AA5922A548C83856D88C2C9D49EA962C9E6497949 -Test: Encrypt -Comment: Set 3, vector 136 -Key: 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888 -Plaintext: 8888888888888888888888888888888888888888888888888888888888888888 -Ciphertext: C64887C6573E3D7F286C0353188FC93F05321C0C949ACDCB0237725576BCF77B -Test: Encrypt -Comment: Set 3, vector 137 -Key: 89898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989 -Plaintext: 8989898989898989898989898989898989898989898989898989898989898989 -Ciphertext: 77FB97C9C953BE6BD58044FB1E095BB5E3F4B3A51DAFE6F2F7ADED0FB707921F -Test: Encrypt -Comment: Set 3, vector 138 -Key: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Plaintext: 8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A -Ciphertext: 22DE5F20955357BA1BF70E4D6DA436CCDE28C228031E4A413882C918EF8082D1 -Test: Encrypt -Comment: Set 3, vector 139 -Key: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Plaintext: 8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B -Ciphertext: 146FF5907A3C58593C3FD3EB7498C4426CCE04DD0DA9138954BB97AAC821D87F -Test: Encrypt -Comment: Set 3, vector 140 -Key: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Plaintext: 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C -Ciphertext: 474ADC5855C87504A7C859409E25154D94B05A925F1D9989AE653B5511710BD7 -Test: Encrypt -Comment: Set 3, vector 141 -Key: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Plaintext: 8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D -Ciphertext: 959B1090C1FF59998C100814E95E40EF94C6F2B7ED0425C78391192CFFFFA465 -Test: Encrypt -Comment: Set 3, vector 142 -Key: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Plaintext: 8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E -Ciphertext: 9DA473108FFCECB228F8809860CDA316F4E1FAC5ADC39BB0373F01DCEBCBF271 -Test: Encrypt -Comment: Set 3, vector 143 -Key: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Plaintext: 8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F -Ciphertext: 905FD0302F9F3C4296E15F94EDD72A8F9F4E9E4068F068099CAAE7247235847E -Test: Encrypt -Comment: Set 3, vector 144 -Key: 90909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090 -Plaintext: 9090909090909090909090909090909090909090909090909090909090909090 -Ciphertext: B63B82FB4B4961E4800FD13CAF145BEBF3625822AF7F5D3ACF2A4506471C636D -Test: Encrypt -Comment: Set 3, vector 145 -Key: 91919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191 -Plaintext: 9191919191919191919191919191919191919191919191919191919191919191 -Ciphertext: 63AA9822C7A5A6777D03F901E3BAF91FD566553C88835EF06DB9A983212288BF -Test: Encrypt -Comment: Set 3, vector 146 -Key: 92929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292 -Plaintext: 9292929292929292929292929292929292929292929292929292929292929292 -Ciphertext: 5417F10E4028BDE0F741114632E2090A1E6C83ACB1D03EA98D18D003838B4F0A -Test: Encrypt -Comment: Set 3, vector 147 -Key: 93939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393 -Plaintext: 9393939393939393939393939393939393939393939393939393939393939393 -Ciphertext: FD2C478FB17EE8520149E8A242BB07E0B32929536B191AC6DBCE05891C5E4BFC -Test: Encrypt -Comment: Set 3, vector 148 -Key: 94949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494 -Plaintext: 9494949494949494949494949494949494949494949494949494949494949494 -Ciphertext: 6A36A092BC0F029B60D40440F141EF0DC21A241547359FB618E9243C39AE3D7C -Test: Encrypt -Comment: Set 3, vector 149 -Key: 95959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595 -Plaintext: 9595959595959595959595959595959595959595959595959595959595959595 -Ciphertext: 605BC400A0FEE12092D369142E4D20C3A4F3D7623254BF9E242766946FC47ED1 -Test: Encrypt -Comment: Set 3, vector 150 -Key: 96969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696 -Plaintext: 9696969696969696969696969696969696969696969696969696969696969696 -Ciphertext: 6A5FA33652F946D7C93A56D15B5D3807401C667A9757495341F78526D58659D2 -Test: Encrypt -Comment: Set 3, vector 151 -Key: 97979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797 -Plaintext: 9797979797979797979797979797979797979797979797979797979797979797 -Ciphertext: 5C6AC175B74B9F7F7D6371A90B1F35E1276628DF6A82B0ECE38590C88B7B8DCA -Test: Encrypt -Comment: Set 3, vector 152 -Key: 98989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898 -Plaintext: 9898989898989898989898989898989898989898989898989898989898989898 -Ciphertext: 67BB4E7818FBE6CFAB113C1B2EC797E3164432BFF708450312422D5AEC70A8A8 -Test: Encrypt -Comment: Set 3, vector 153 -Key: 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 -Plaintext: 9999999999999999999999999999999999999999999999999999999999999999 -Ciphertext: BFDA13CA82E73FBF62B6F1BB7181916CE7FD7DC7608EB958A8246346DFBB04E9 -Test: Encrypt -Comment: Set 3, vector 154 -Key: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Plaintext: 9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A -Ciphertext: C30F3EF137BF7718F76C7E4D2366A48E7C3CE53735BBF8B56CD51609A23AC06C -Test: Encrypt -Comment: Set 3, vector 155 -Key: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Plaintext: 9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B -Ciphertext: D73795A681B4FBE858703C15D60299682F64C800E691D223C4BE51012DA4D3DA -Test: Encrypt -Comment: Set 3, vector 156 -Key: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Plaintext: 9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C -Ciphertext: 885A096C820E01E48E1A5F75DB0A007C2A96B66FCAB38AE80CF92DD8B6A35F6F -Test: Encrypt -Comment: Set 3, vector 157 -Key: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Plaintext: 9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D -Ciphertext: 8FBDD4939C31026305C575F1FDCED3DBAE320C56CF064E9F19B44A43898BFD5C -Test: Encrypt -Comment: Set 3, vector 158 -Key: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Plaintext: 9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E -Ciphertext: 2D9EC00B081BC1512EC11A0B8B898639415AEEA3270C4B49E4B47C601AB85875 -Test: Encrypt -Comment: Set 3, vector 159 -Key: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Plaintext: 9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F -Ciphertext: 59565FB9888519C77E9C4E86D72AD86205AB55488D5ED0B9A388FB2D301C4400 -Test: Encrypt -Comment: Set 3, vector 160 -Key: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Plaintext: A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0 -Ciphertext: 32D6CAA3D5E0A5D3CCD0FD8F2105CFF662FC4052FE348C2DFD0BC3EEFF3AB700 -Test: Encrypt -Comment: Set 3, vector 161 -Key: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Plaintext: A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1 -Ciphertext: 7C3276EA6BB6FDDDEC8B901C45978B7D4D34AACE9F2D02F7D7F5826A89809DE9 -Test: Encrypt -Comment: Set 3, vector 162 -Key: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Plaintext: A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2 -Ciphertext: C5ABC33559D828DD1464264F94D46A8519B4CE47EAA0EC9BF0504C876AC85451 -Test: Encrypt -Comment: Set 3, vector 163 -Key: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Plaintext: A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3 -Ciphertext: E63050ADB9F2789F91A192E089883D7346DD42DE4C654E1D4B72C77D6C09FDB0 -Test: Encrypt -Comment: Set 3, vector 164 -Key: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Plaintext: A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4 -Ciphertext: E7C58AF118E1DFD2A279DE640EDEF02FB4F3C78D778D145ECC6B2C4CCD065229 -Test: Encrypt -Comment: Set 3, vector 165 -Key: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Plaintext: A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5 -Ciphertext: 278D8C11ACFDB851131432B3E19C409F940F93E0F6CB49D076C62E70B9C27095 -Test: Encrypt -Comment: Set 3, vector 166 -Key: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Plaintext: A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6 -Ciphertext: D4839B5679FCA83189BB8C3681E83BAC871A02F297578855034E915F4EF04C12 -Test: Encrypt -Comment: Set 3, vector 167 -Key: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Plaintext: A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7 -Ciphertext: 91AFF6474168F1D113E3DC66E620CF2F7283CE84F5FDDECC7E79CC005859C1BA -Test: Encrypt -Comment: Set 3, vector 168 -Key: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Plaintext: A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8 -Ciphertext: 1374026DD442B1C1E0BA34570240F6A9E99781C8307A1544A9D3C91857C7E6E1 -Test: Encrypt -Comment: Set 3, vector 169 -Key: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Plaintext: A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9 -Ciphertext: C95E8163D47755E25E8A4BA1FDFF46E016F080F13A794FD21251CE238F28C52E -Test: Encrypt -Comment: Set 3, vector 170 -Key: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -Ciphertext: 5DA751854BEEDB19D767A09E2BD9C12D15E51A4409A1F70574496D0A0DA767F9 -Test: Encrypt -Comment: Set 3, vector 171 -Key: ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB -Plaintext: ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB -Ciphertext: C1A0ADDB98DA358D8F40CDB8FA427770D6BD5705D81A804A9BA27FFAE8790BD1 -Test: Encrypt -Comment: Set 3, vector 172 -Key: ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC -Plaintext: ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC -Ciphertext: 604830D513CB29E0E89A36EAB97FFDFC0855AE212F9DDAB62ABE7572CBCEBFC5 -Test: Encrypt -Comment: Set 3, vector 173 -Key: ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD -Plaintext: ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD -Ciphertext: 0DB5075E0B9727D439ED88030D31B532B61556D206220CAE70A7B42EE4C5F72E -Test: Encrypt -Comment: Set 3, vector 174 -Key: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Plaintext: AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE -Ciphertext: A5167DC20ED3B1894B10C6AA754FDCF9FC1418439D9CA80C40974E9CB7630A12 -Test: Encrypt -Comment: Set 3, vector 175 -Key: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Plaintext: AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF -Ciphertext: 1A90CCEA061A2FB58E4D1F363B6CEEC26BFB55F4F140A18991C8EF50E8DFB306 -Test: Encrypt -Comment: Set 3, vector 176 -Key: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Plaintext: B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0 -Ciphertext: 5CED17D75543C21AA1E020D4B084DB86A77BC445C7E77DA54DC6D786A0976A09 -Test: Encrypt -Comment: Set 3, vector 177 -Key: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Plaintext: B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1 -Ciphertext: BB28F1F9496ED578276F99F3A2D4657566DC2CDDDCF00AE44555DA614C64E54E -Test: Encrypt -Comment: Set 3, vector 178 -Key: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Plaintext: B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2 -Ciphertext: 30C28BF86BEAEBB25F4A667FB2B9C183B85B456527EB49B44AA4EA825A44E026 -Test: Encrypt -Comment: Set 3, vector 179 -Key: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Plaintext: B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3 -Ciphertext: C2B0DEB4BC6C28869675FB75D2C2081396601B1FA823185D2D9EDE0730BBEAEA -Test: Encrypt -Comment: Set 3, vector 180 -Key: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Plaintext: B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4 -Ciphertext: B3EDC667C3FD03CE50D05877C8A78C330F809DF5F8F7FB11968A3664C77CA78B -Test: Encrypt -Comment: Set 3, vector 181 -Key: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Plaintext: B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5 -Ciphertext: BC2FCF90C52B883CAC3F0A673FA093EEB48952F4DE50A9288464B84A920A1316 -Test: Encrypt -Comment: Set 3, vector 182 -Key: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Plaintext: B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6 -Ciphertext: 30BCF4063A59823CE94B14B6B65F1B4DBEED8FB30832765B5186F4B834DBEA89 -Test: Encrypt -Comment: Set 3, vector 183 -Key: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Plaintext: B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7 -Ciphertext: 51B4C7E8F697FACC24294A2CEB404C4BEC0CA41C76A6B50A824800EA4464C796 -Test: Encrypt -Comment: Set 3, vector 184 -Key: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Plaintext: B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8 -Ciphertext: 2CCFF61604C0881CCC6A69B885878D6D07CEA7DAB31719D89DC4ECB0063DF5D2 -Test: Encrypt -Comment: Set 3, vector 185 -Key: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Plaintext: B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9 -Ciphertext: 87998D9F16DC018B5DBD42A2E0C26D3774C2A41986E2D0A1504CE37B6EE71688 -Test: Encrypt -Comment: Set 3, vector 186 -Key: BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA -Plaintext: BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA -Ciphertext: D774451BB82A62A4C7708D0194F6C129C483CEFD182BAADF5A35EB77892F317A -Test: Encrypt -Comment: Set 3, vector 187 -Key: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Plaintext: BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -Ciphertext: B88CE3DF52572A1A1C8253E05D789BBF204E2CFC7A00389429F4C6B428EF8CD6 -Test: Encrypt -Comment: Set 3, vector 188 -Key: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Plaintext: BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC -Ciphertext: B854E538E6674A1831F635AA6650A0A4D0730A9A4B12511509EFD49E34D57D62 -Test: Encrypt -Comment: Set 3, vector 189 -Key: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Plaintext: BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD -Ciphertext: A69EF2348FEEF1EA09A2B29A6D977092ECD522A62EE906FA47624C92A872EB17 -Test: Encrypt -Comment: Set 3, vector 190 -Key: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Plaintext: BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE -Ciphertext: A1AE0CBC3B5200F1D8AE165EE42D45F6CE8C4FF448F8127B6D9AB4936FC76CA8 -Test: Encrypt -Comment: Set 3, vector 191 -Key: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Plaintext: BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF -Ciphertext: 91948E36B83E21FF8A5EEDAA48E50E3A292A3B68D20657FA7E11F50BC7A12205 -Test: Encrypt -Comment: Set 3, vector 192 -Key: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Plaintext: C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 -Ciphertext: 56CD17219224C3103E3E3E5CABAB6C1E78DEA9AD27613E8D62901FFA31500BFF -Test: Encrypt -Comment: Set 3, vector 193 -Key: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Plaintext: C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1 -Ciphertext: 2E8FE5CAB2448B194387B160E9141E7D1B879BA1580B3D393B55436608EA2735 -Test: Encrypt -Comment: Set 3, vector 194 -Key: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Plaintext: C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2 -Ciphertext: 5DD74E1155DD90840C702145DF6912754FB74B47625EA4C5382326681DB3390E -Test: Encrypt -Comment: Set 3, vector 195 -Key: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Plaintext: C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3 -Ciphertext: 3A9F5962554037DCB1FA2AD04BFC0BF79699941500D5F9841320C6D8601310A2 -Test: Encrypt -Comment: Set 3, vector 196 -Key: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Plaintext: C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4 -Ciphertext: BB0F5B68087BBA51DBB700BA1860CC3D0A587E54D57F4014DE4E48E58E529F87 -Test: Encrypt -Comment: Set 3, vector 197 -Key: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Plaintext: C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5 -Ciphertext: 8384025D801AB8EC4D4416F5B7E862B6D9AC9E4AEE334C35FD0296B1402E4975 -Test: Encrypt -Comment: Set 3, vector 198 -Key: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Plaintext: C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6 -Ciphertext: BE3057511C5D0E51315D89671BB4E57E7B590EC3ECE8A14D728248ED8F5107BB -Test: Encrypt -Comment: Set 3, vector 199 -Key: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Plaintext: C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7 -Ciphertext: 18882618837D15B0B6BD77E1F37470EC58155A2788BDD9D91AEBD16B29A92A1B -Test: Encrypt -Comment: Set 3, vector 200 -Key: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Plaintext: C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8 -Ciphertext: 8FAFDDC7E04C1AF3BBE8428222DCA59D2EF8C9E0213430492ECAB7B414987FEF -Test: Encrypt -Comment: Set 3, vector 201 -Key: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Plaintext: C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9 -Ciphertext: 4D687992D4F9F515FE451AC967CBF75F906D637C3C261758E263A0DA0DEF69C2 -Test: Encrypt -Comment: Set 3, vector 202 -Key: CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA -Plaintext: CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA -Ciphertext: 9DDC94BFF87FDBAFDB0AB9DC17D3649231300E5E6270600856722324DC9CA39A -Test: Encrypt -Comment: Set 3, vector 203 -Key: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Plaintext: CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB -Ciphertext: 86E9CCD90D7B902D23D82C085B1F886402DBD2D19C5A81A32F318C98C6E2A98A -Test: Encrypt -Comment: Set 3, vector 204 -Key: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Plaintext: CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -Ciphertext: 164FCD7D1FFE12FF1FDEE6384145EF546A5CD98C22817A5205FF2C2E18339779 -Test: Encrypt -Comment: Set 3, vector 205 -Key: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Plaintext: CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD -Ciphertext: 4579935A483BAC6B4CCD8C25BCC9E6DEAF46EA8B53F8B5E37CC436EAB85A1330 -Test: Encrypt -Comment: Set 3, vector 206 -Key: CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE -Plaintext: CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE -Ciphertext: E5F810DF5B215F559E76EF925F2B795915A7B03A6F7019FAC8E9127A7CE93F09 -Test: Encrypt -Comment: Set 3, vector 207 -Key: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Plaintext: CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF -Ciphertext: 2EA0892E2B2F29A63526B37DECD18E31DC970A60E60A4D8414A5BD0D2D5491EF -Test: Encrypt -Comment: Set 3, vector 208 -Key: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Plaintext: D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0 -Ciphertext: 900F155E80A716199EB062827CDDDC4DA857550BA1C265A46D47BE4024706F40 -Test: Encrypt -Comment: Set 3, vector 209 -Key: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Plaintext: D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1 -Ciphertext: 5B495546838A97D8DF4B9CA95EF8350210A3ECAB81469678EBDE1E5846C1F42D -Test: Encrypt -Comment: Set 3, vector 210 -Key: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Plaintext: D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2 -Ciphertext: 60E7E367347BC3F4091CE34CCA288C8AFC6375ED8F4394D904FD8489280D50F1 -Test: Encrypt -Comment: Set 3, vector 211 -Key: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Plaintext: D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3 -Ciphertext: F215EED91D35B7BA649F05C3D1E2B254CB1215588AB78DF54F3CA221AB4A3F1B -Test: Encrypt -Comment: Set 3, vector 212 -Key: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Plaintext: D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4 -Ciphertext: 6441A445D808842C6185B81ACBC5AF86386C54C79026BFC21C1DB5111362AA15 -Test: Encrypt -Comment: Set 3, vector 213 -Key: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Plaintext: D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 -Ciphertext: 4EE459EDAC1FE0CB08E80C8C13FCE8C44CBFECF7A7F9F14C15B5A92BB7F34E71 -Test: Encrypt -Comment: Set 3, vector 214 -Key: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Plaintext: D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6 -Ciphertext: 78826499B0F2F402E6DA3CACA36EA35492B7BD2A4D84575D0432E16368E78808 -Test: Encrypt -Comment: Set 3, vector 215 -Key: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Plaintext: D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7 -Ciphertext: BDFBCAE2761BEF6A411156AE01A63F9321EE969C56043F2A44C5D3D4BB017BC0 -Test: Encrypt -Comment: Set 3, vector 216 -Key: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Plaintext: D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8 -Ciphertext: 926F2CD84035F9070C3506E6D7245FEA9A845F2D355785BB17E1D3C34FA81228 -Test: Encrypt -Comment: Set 3, vector 217 -Key: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Plaintext: D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9 -Ciphertext: 6C5F6B1C746967142D55FA3769A9417D5A44875D364DB4412B4F9EB254D9BB89 -Test: Encrypt -Comment: Set 3, vector 218 -Key: DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA -Plaintext: DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA -Ciphertext: 8329A1E54D9F45DB4E8CE6F1B481C3EE00D5511B52B3CDADCBD562A9F1B35770 -Test: Encrypt -Comment: Set 3, vector 219 -Key: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Plaintext: DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB -Ciphertext: 7A7FEEDEF1950F1A60529743163406CAF167097358377E0650CF0BB35CD783F6 -Test: Encrypt -Comment: Set 3, vector 220 -Key: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Plaintext: DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC -Ciphertext: C52CFB15D2F53156701AE4951AA46BCFC872252447BB14E1CE19CAC074926984 -Test: Encrypt -Comment: Set 3, vector 221 -Key: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Plaintext: DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD -Ciphertext: 79DFF8DC12ABCEC71E7FAE55ABC8C374135ECE2D52834BC77B860252B756D54A -Test: Encrypt -Comment: Set 3, vector 222 -Key: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Plaintext: DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE -Ciphertext: 62963B66E680BD5602EC86DB7267E15CB1FF6EA698B54EBA661D125400C7F2DD -Test: Encrypt -Comment: Set 3, vector 223 -Key: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Plaintext: DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF -Ciphertext: 0C2E76743ACC9CC0525D6E2C519D12C369CFA9E27F13068F98D2F32FAD7220CB -Test: Encrypt -Comment: Set 3, vector 224 -Key: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Plaintext: E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 -Ciphertext: B464640E72C30DF092A5BB00F34568A7C04B8620265EDA53F19F3A06164AF980 -Test: Encrypt -Comment: Set 3, vector 225 -Key: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Plaintext: E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1 -Ciphertext: 3725215E79F1FE3DC64B4316449FF98EB52D03330BFC848CD83A407475AADA3A -Test: Encrypt -Comment: Set 3, vector 226 -Key: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Plaintext: E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2 -Ciphertext: BA273F544C5076D523CC75F90E315A39E465D2B25434E6577FE629F27061BBA4 -Test: Encrypt -Comment: Set 3, vector 227 -Key: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Plaintext: E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3 -Ciphertext: 472161A0F42E64BD0FE6D448996C370E2C3A56BDE16B378EAA31740551121B4E -Test: Encrypt -Comment: Set 3, vector 228 -Key: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Plaintext: E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4 -Ciphertext: EA089A10A597504D057E1F03064C9465C1A707C9472A7C0DBAD6978F5BB83A46 -Test: Encrypt -Comment: Set 3, vector 229 -Key: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Plaintext: E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5 -Ciphertext: E91B3433426F88FA31A05E17906E55EA1D803ADFE080C51FBD98290CBF427BEF -Test: Encrypt -Comment: Set 3, vector 230 -Key: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Plaintext: E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6 -Ciphertext: 747C4999D0256384349A5FB132DE1AAD4D7FC48507FEC206B80ED429AF7FDBDB -Test: Encrypt -Comment: Set 3, vector 231 -Key: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Plaintext: E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7 -Ciphertext: 3F8058A1A9B7B0A9C31B4670EEAA6988BF2D41E9B3417EF899EF12CBBC9C77DE -Test: Encrypt -Comment: Set 3, vector 232 -Key: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Plaintext: E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8 -Ciphertext: 9DA431EC0DADDEC4A76B3830B20AA03D346AD09691FB98FC0E9A8987F7B70EDF -Test: Encrypt -Comment: Set 3, vector 233 -Key: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Plaintext: E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9 -Ciphertext: 63BF528E184A43EF807DC9169BDB9CD7B63EE144478A4735EC2EE3A5A7EE460A -Test: Encrypt -Comment: Set 3, vector 234 -Key: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Plaintext: EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA -Ciphertext: 73DC5F8AFA9493AD7767D15A36E7741044EFC225136B4972DC5294E80071A64D -Test: Encrypt -Comment: Set 3, vector 235 -Key: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Plaintext: EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB -Ciphertext: 7EEE75D690458A604D20CD21ED64B228F0C3563DB8FB925341FC02845B6E06BA -Test: Encrypt -Comment: Set 3, vector 236 -Key: ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC -Plaintext: ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC -Ciphertext: AA4D9E1A0157AC347DC7A1997718944427BD579DC18B94F181390E8C36A1305C -Test: Encrypt -Comment: Set 3, vector 237 -Key: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Plaintext: EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED -Ciphertext: 1695BC5C3D63F4B0E0BC3225F00BB0B8E8D29F3DC09584353E11510002E2BE53 -Test: Encrypt -Comment: Set 3, vector 238 -Key: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Plaintext: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE -Ciphertext: C68C7A2FBDA419A515AE816480490BFB2A72A4B6534A19A8D8C6C85FAA949567 -Test: Encrypt -Comment: Set 3, vector 239 -Key: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Plaintext: EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF -Ciphertext: 5F45E7F72A64C66269F83714A88A0701561C3E7AF33BB48887D4439F5DE4A82D -Test: Encrypt -Comment: Set 3, vector 240 -Key: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Plaintext: F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 -Ciphertext: AD49A5C8EB06256147F02301FB47710E915B5A8FC3219C0D56A19382977119FC -Test: Encrypt -Comment: Set 3, vector 241 -Key: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Plaintext: F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1 -Ciphertext: 2387AF70EE04E7F25277E81081B044EA24090D503CE8F64997BB610C762D8F6F -Test: Encrypt -Comment: Set 3, vector 242 -Key: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Plaintext: F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2 -Ciphertext: B5D496DD36BA0B47832C170A53760CE5E47B1FF5C28848F5F7A1827E94BC73CB -Test: Encrypt -Comment: Set 3, vector 243 -Key: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Plaintext: F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3 -Ciphertext: 77978F2EAB7E8B6B32C9293B83F51419785A0CD276276CB417ACA806A456A6AE -Test: Encrypt -Comment: Set 3, vector 244 -Key: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Plaintext: F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4 -Ciphertext: E3CBD41F80B27C9A684D7C7C27BBCA9FD59E5E81E93B7BC5BFDF66722EF68EEE -Test: Encrypt -Comment: Set 3, vector 245 -Key: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Plaintext: F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5 -Ciphertext: 4482F0C362CB423104CAA26E1415B0B7519E1189624D313E65D324C6DC95F516 -Test: Encrypt -Comment: Set 3, vector 246 -Key: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Plaintext: F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6 -Ciphertext: CD72EE9A6919348595286348C7E488DB3648458688F72BAD994B26FE6999E676 -Test: Encrypt -Comment: Set 3, vector 247 -Key: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Plaintext: F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7 -Ciphertext: 03EF38F91710AE8BCC8B9193F6A55A7C90C66300D20EDCF5B4946F3B38BEF6C5 -Test: Encrypt -Comment: Set 3, vector 248 -Key: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Plaintext: F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 -Ciphertext: B67638D30578AB2319FE275D0B833B50D7ABF01E8760F566D0D441D8EAFDF8AA -Test: Encrypt -Comment: Set 3, vector 249 -Key: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Plaintext: F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9 -Ciphertext: 98B05FF6042436505C7163415E187E09F10C3B1A86FA4B458CE1EF31022F5D16 -Test: Encrypt -Comment: Set 3, vector 250 -Key: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Plaintext: FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA -Ciphertext: B670A350A2CF0478412307EF00F97F8B30175CDB7593FF4686BD614B41444342 -Test: Encrypt -Comment: Set 3, vector 251 -Key: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Plaintext: FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB -Ciphertext: D7FD492E6302265C24FAB910AA1335C29D53406147E853F7604F4AF1A9407E83 -Test: Encrypt -Comment: Set 3, vector 252 -Key: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Plaintext: FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC -Ciphertext: 28926789363A4306E2C75FD1D8FDF0FE6B62FDB2AFAEDDA6F47A565C2781968B -Test: Encrypt -Comment: Set 3, vector 253 -Key: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Plaintext: FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD -Ciphertext: 813C816CD4B18F20BD06E2E93CFAA717EBB6554B556CC33D67530608A9BF100F -Test: Encrypt -Comment: Set 3, vector 254 -Key: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Plaintext: FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE -Ciphertext: 5DC15C83E7C4F5AAF8D8482ED1E443271B28B59288783DBCDDEC3544E3368A6E -Test: Encrypt -Comment: Set 3, vector 255 -Key: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Plaintext: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -Ciphertext: 0598127BAF11706F77402000D730C54A0B84C868A98C6CA4D7F3C0FA06A78B7A -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sosemanuk.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sosemanuk.txt deleted file mode 100644 index 435d89be..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/sosemanuk.txt +++ /dev/null @@ -1,25 +0,0 @@ -AlgorithmType: SymmetricCipher -Source: Sosemanuk reference implementation, compiled with -DSOSEMANUK_VECTOR -Key: A7C083FEB7 -IV: 00112233445566778899AABBCCDDEEFF -Name: Sosemanuk -Plaintext: r160 00 -Ciphertext: \ - FE 81 D2 16 2C 9A 10 0D 04 89 5C 45 4A 77 51 5B\ - BE 6A 43 1A 93 5C B9 0E 22 21 EB B7 EF 50 23 28\ - 94 35 39 49 2E FF 63 10 C8 71 05 4C 28 89 CC 72\ - 8F 82 E8 6B 1A FF F4 33 4B 61 27 A1 3A 15 5C 75\ - 15 16 30 BD 48 2E B6 73 FF 5D B4 77 FA 6C 53 EB\ - E1 A4 EC 38 C2 3C 54 00 C3 15 45 5D 93 A2 AC ED\ - 95 98 60 47 27 FA 34 0D 5F 2A 8B D7 57 B7 78 33\ - F7 4B D2 BC 04 93 13 C8 06 16 B4 A0 62 68 AE 35\ - 0D B9 2E EC 4F A5 6C 17 13 74 A6 7A 80 C0 06 D0\ - EA D0 48 CE 7B 64 0F 17 D3 D5 A6 2D 1F 25 1C 21 -Test: Encrypt -Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/sosemanuk/unverified.test-vectors?rev=189&view=auto -Comment: Set 6, vector# 3 -Key: 0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C -IV: 288FF65DC42B92F960C72E95FC63CA31 -Plaintext: r131072 00 -CiphertextXorDigest: CC09FB7405DD54BBF09407B1D2033FBBAC53F388DD387A46F2B8FCFF692A7838353523A621A55D08DA0CA5348AE96D8B0D6A028F309982EF6628054D01B9A368 -Test: EncryptXorDigest diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/tea.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/tea.txt deleted file mode 100644 index dc46d3fc..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/tea.txt +++ /dev/null @@ -1,711 +0,0 @@ -AlgorithmType: SymmetricCipher -Name: TEA/ECB -Source: http://www.cix.co.uk/~klockstone/teavect.htm -Comment: test 1 -Plaintext: 00000000 00000000 -Key: 00000000 00000000 00000000 00000000 -Ciphertext: 41ea3a0a 94baa940 -Test: Encrypt -Comment: test 2 -Plaintext: 94baa940 00000000 -Key: 00000000 00000000 00000000 41ea3a0a -Ciphertext: 4e8e7829 7d8236d8 -Test: Encrypt -Comment: test 3 -Plaintext: 7d8236d8 00000000 -Key: 00000000 00000000 41ea3a0a 4e8e7829 -Ciphertext: c88ba95e e7edac02 -Test: Encrypt -Comment: test 4 -Plaintext: e7edac02 00000000 -Key: 00000000 41ea3a0a 4e8e7829 c88ba95e -Ciphertext: b84e28af b6b62088 -Test: Encrypt -Comment: test 5 -Plaintext: b6b62088 00000000 -Key: 41ea3a0a 4e8e7829 c88ba95e b84e28af -Ciphertext: a0a47295 8fadf3b3 -Test: Encrypt -Comment: test 6 -Plaintext: 8fadf3b3 41ea3a0a -Key: 4e8e7829 c88ba95e b84e28af a0a47295 -Ciphertext: ed650698 cf9f2b79 -Test: Encrypt -Comment: test 7 -Plaintext: cf9f2b79 4e8e7829 -Key: c88ba95e b84e28af a0a47295 ed650698 -Ciphertext: 1024eea0 6220ae1c -Test: Encrypt -Comment: test 8 -Plaintext: 6220ae1c c88ba95e -Key: b84e28af a0a47295 ed650698 1024eea0 -Ciphertext: 5ddf75d9 7a4ce68f -Test: Encrypt -Comment: test 9 -Plaintext: 7a4ce68f b84e28af -Key: a0a47295 ed650698 1024eea0 5ddf75d9 -Ciphertext: f1be9d1e 8dd4a984 -Test: Encrypt -Comment: test 10 -Plaintext: 8dd4a984 a0a47295 -Key: ed650698 1024eea0 5ddf75d9 f1be9d1e -Ciphertext: d32c758c 092dabad -Test: Encrypt -Comment: test 11 -Plaintext: 092dabad ed650698 -Key: 1024eea0 5ddf75d9 f1be9d1e d32c758c -Ciphertext: bdb43728 f7183fc0 -Test: Encrypt -Comment: test 12 -Plaintext: f7183fc0 1024eea0 -Key: 5ddf75d9 f1be9d1e d32c758c bdb43728 -Ciphertext: a9c3801a d9dcfb4e -Test: Encrypt -Comment: test 13 -Plaintext: d9dcfb4e 5ddf75d9 -Key: f1be9d1e d32c758c bdb43728 a9c3801a -Ciphertext: 32a1e654 a9df917c -Test: Encrypt -Comment: test 14 -Plaintext: a9df917c f1be9d1e -Key: d32c758c bdb43728 a9c3801a 32a1e654 -Ciphertext: 08b63bb9 b20bd3e8 -Test: Encrypt -Comment: test 15 -Plaintext: b20bd3e8 d32c758c -Key: bdb43728 a9c3801a 32a1e654 08b63bb9 -Ciphertext: 21410574 cc4264c6 -Test: Encrypt -Comment: test 16 -Plaintext: cc4264c6 bdb43728 -Key: a9c3801a 32a1e654 08b63bb9 21410574 -Ciphertext: 4ec5d2e2 5ada1d89 -Test: Encrypt -Comment: test 17 -Plaintext: 5ada1d89 a9c3801a -Key: 32a1e654 08b63bb9 21410574 4ec5d2e2 -Ciphertext: dd46249e 28aa0b4b -Test: Encrypt -Comment: test 18 -Plaintext: 28aa0b4b 32a1e654 -Key: 08b63bb9 21410574 4ec5d2e2 dd46249e -Ciphertext: 2486dcba a713df03 -Test: Encrypt -Comment: test 19 -Plaintext: a713df03 08b63bb9 -Key: 21410574 4ec5d2e2 dd46249e 2486dcba -Ciphertext: b7c7af9d 1acb6cab -Test: Encrypt -Comment: test 20 -Plaintext: 1acb6cab 21410574 -Key: 4ec5d2e2 dd46249e 2486dcba b7c7af9d -Ciphertext: 8cc0400a 9aa49fbb -Test: Encrypt -Comment: test 21 -Plaintext: 9aa49fbb 4ec5d2e2 -Key: dd46249e 2486dcba b7c7af9d 8cc0400a -Ciphertext: 9c241876 6cbc8c66 -Test: Encrypt -Comment: test 22 -Plaintext: 6cbc8c66 dd46249e -Key: 2486dcba b7c7af9d 8cc0400a 9c241876 -Ciphertext: b59c5d45 a90066f9 -Test: Encrypt -Comment: test 23 -Plaintext: a90066f9 2486dcba -Key: b7c7af9d 8cc0400a 9c241876 b59c5d45 -Ciphertext: b765a1b3 64b37eb0 -Test: Encrypt -Comment: test 24 -Plaintext: 64b37eb0 b7c7af9d -Key: 8cc0400a 9c241876 b59c5d45 b765a1b3 -Ciphertext: 7b172fac f5ab4933 -Test: Encrypt -Comment: test 25 -Plaintext: f5ab4933 8cc0400a -Key: 9c241876 b59c5d45 b765a1b3 7b172fac -Ciphertext: fe48f4fb ada404b1 -Test: Encrypt -Comment: test 26 -Plaintext: ada404b1 9c241876 -Key: b59c5d45 b765a1b3 7b172fac fe48f4fb -Ciphertext: c5294093 c1d53e3d -Test: Encrypt -Comment: test 27 -Plaintext: c1d53e3d b59c5d45 -Key: b765a1b3 7b172fac fe48f4fb c5294093 -Ciphertext: 759ca8e2 77a96649 -Test: Encrypt -Comment: test 28 -Plaintext: 77a96649 b765a1b3 -Key: 7b172fac fe48f4fb c5294093 759ca8e2 -Ciphertext: 69c53e0f 3e979807 -Test: Encrypt -Comment: test 29 -Plaintext: 3e979807 7b172fac -Key: fe48f4fb c5294093 759ca8e2 69c53e0f -Ciphertext: 60388ada a21fa8e8 -Test: Encrypt -Comment: test 30 -Plaintext: a21fa8e8 fe48f4fb -Key: c5294093 759ca8e2 69c53e0f 60388ada -Ciphertext: df70a1f5 ac4aa407 -Test: Encrypt -Comment: test 31 -Plaintext: ac4aa407 c5294093 -Key: 759ca8e2 69c53e0f 60388ada df70a1f5 -Ciphertext: d9cb4e09 92636233 -Test: Encrypt -Comment: test 32 -Plaintext: 92636233 759ca8e2 -Key: 69c53e0f 60388ada df70a1f5 d9cb4e09 -Ciphertext: 7d2c6c57 7a6adb4d -Test: Encrypt -Comment: test 33 -Plaintext: 7a6adb4d 69c53e0f -Key: 60388ada df70a1f5 d9cb4e09 7d2c6c57 -Ciphertext: 44b71215 cf25368a -Test: Encrypt -Comment: test 34 -Plaintext: cf25368a 60388ada -Key: df70a1f5 d9cb4e09 7d2c6c57 44b71215 -Ciphertext: c10105a1 ef781a18 -Test: Encrypt -Comment: test 35 -Plaintext: ef781a18 df70a1f5 -Key: d9cb4e09 7d2c6c57 44b71215 c10105a1 -Ciphertext: bfdb29fa 9ece39b6 -Test: Encrypt -Comment: test 36 -Plaintext: 9ece39b6 d9cb4e09 -Key: 7d2c6c57 44b71215 c10105a1 bfdb29fa -Ciphertext: 9b0b256d dc04574c -Test: Encrypt -Comment: test 37 -Plaintext: dc04574c 7d2c6c57 -Key: 44b71215 c10105a1 bfdb29fa 9b0b256d -Ciphertext: f8295142 8c022711 -Test: Encrypt -Comment: test 38 -Plaintext: 8c022711 44b71215 -Key: c10105a1 bfdb29fa 9b0b256d f8295142 -Ciphertext: 61341d1c 3a85f2f0 -Test: Encrypt -Comment: test 39 -Plaintext: 3a85f2f0 c10105a1 -Key: bfdb29fa 9b0b256d f8295142 61341d1c -Ciphertext: f6a0d30c ad230209 -Test: Encrypt -Comment: test 40 -Plaintext: ad230209 bfdb29fa -Key: 9b0b256d f8295142 61341d1c f6a0d30c -Ciphertext: 3de21a3f aa0cf5c9 -Test: Encrypt -Comment: test 41 -Plaintext: aa0cf5c9 9b0b256d -Key: f8295142 61341d1c f6a0d30c 3de21a3f -Ciphertext: a7e307c6 bd52d939 -Test: Encrypt -Comment: test 42 -Plaintext: bd52d939 f8295142 -Key: 61341d1c f6a0d30c 3de21a3f a7e307c6 -Ciphertext: 017bc3a7 66fd8c77 -Test: Encrypt -Comment: test 43 -Plaintext: 66fd8c77 61341d1c -Key: f6a0d30c 3de21a3f a7e307c6 017bc3a7 -Ciphertext: d8f8fc86 d01b5761 -Test: Encrypt -Comment: test 44 -Plaintext: d01b5761 f6a0d30c -Key: 3de21a3f a7e307c6 017bc3a7 d8f8fc86 -Ciphertext: e186c41a 5e6e5a4d -Test: Encrypt -Comment: test 45 -Plaintext: 5e6e5a4d 3de21a3f -Key: a7e307c6 017bc3a7 d8f8fc86 e186c41a -Ciphertext: 4368d224 dbb4e677 -Test: Encrypt -Comment: test 46 -Plaintext: dbb4e677 a7e307c6 -Key: 017bc3a7 d8f8fc86 e186c41a 4368d224 -Ciphertext: 9bd0321e 84096523 -Test: Encrypt -Comment: test 47 -Plaintext: 84096523 017bc3a7 -Key: d8f8fc86 e186c41a 4368d224 9bd0321e -Ciphertext: b7c56d5b 97c65866 -Test: Encrypt -Comment: test 48 -Plaintext: 97c65866 d8f8fc86 -Key: e186c41a 4368d224 9bd0321e b7c56d5b -Ciphertext: 63a1bfac 5a5d7ca2 -Test: Encrypt -Comment: test 49 -Plaintext: 5a5d7ca2 e186c41a -Key: 4368d224 9bd0321e b7c56d5b 63a1bfac -Ciphertext: 91f56dff 7281794f -Test: Encrypt -Comment: test 50 -Plaintext: 7281794f 4368d224 -Key: 9bd0321e b7c56d5b 63a1bfac 91f56dff -Ciphertext: e4c63780 019aedf7 -Test: Encrypt -Comment: test 51 -Plaintext: 019aedf7 9bd0321e -Key: b7c56d5b 63a1bfac 91f56dff e4c63780 -Ciphertext: a9fb56e7 35f4aeca -Test: Encrypt -Comment: test 52 -Plaintext: 35f4aeca b7c56d5b -Key: 63a1bfac 91f56dff e4c63780 a9fb56e7 -Ciphertext: a6537187 f0f1ba93 -Test: Encrypt -Comment: test 53 -Plaintext: f0f1ba93 63a1bfac -Key: 91f56dff e4c63780 a9fb56e7 a6537187 -Ciphertext: cc960eda e44c6b8f -Test: Encrypt -Comment: test 54 -Plaintext: e44c6b8f 91f56dff -Key: e4c63780 a9fb56e7 a6537187 cc960eda -Ciphertext: e12f106d 4f1152d0 -Test: Encrypt -Comment: test 55 -Plaintext: 4f1152d0 e4c63780 -Key: a9fb56e7 a6537187 cc960eda e12f106d -Ciphertext: 556ad853 f79992fd -Test: Encrypt -Comment: test 56 -Plaintext: f79992fd a9fb56e7 -Key: a6537187 cc960eda e12f106d 556ad853 -Ciphertext: 78e8e265 128df6ad -Test: Encrypt -Comment: test 57 -Plaintext: 128df6ad a6537187 -Key: cc960eda e12f106d 556ad853 78e8e265 -Ciphertext: f23892aa 288cb926 -Test: Encrypt -Comment: test 58 -Plaintext: 288cb926 cc960eda -Key: e12f106d 556ad853 78e8e265 f23892aa -Ciphertext: 1d115839 6a117fca -Test: Encrypt -Comment: test 59 -Plaintext: 6a117fca e12f106d -Key: 556ad853 78e8e265 f23892aa 1d115839 -Ciphertext: cf899635 5b087e34 -Test: Encrypt -Comment: test 60 -Plaintext: 5b087e34 556ad853 -Key: 78e8e265 f23892aa 1d115839 cf899635 -Ciphertext: 5c60bff2 e68d88c2 -Test: Encrypt -Comment: test 61 -Plaintext: e68d88c2 78e8e265 -Key: f23892aa 1d115839 cf899635 5c60bff2 -Ciphertext: 7072d01c bffeb50a -Test: Encrypt -Comment: test 62 -Plaintext: bffeb50a f23892aa -Key: 1d115839 cf899635 5c60bff2 7072d01c -Ciphertext: 4513c5eb 9c99ae9e -Test: Encrypt -Comment: test 63 -Plaintext: 9c99ae9e 1d115839 -Key: cf899635 5c60bff2 7072d01c 4513c5eb -Ciphertext: 8f3a38ab 80d9c4ad -Test: Encrypt -Comment: test 64 -Plaintext: 80d9c4ad cf899635 -Key: 5c60bff2 7072d01c 4513c5eb 8f3a38ab -Ciphertext: 2bb0f1b3 c023ed11 -Test: Encrypt - -AlgorithmType: SymmetricCipher -Name: XTEA/ECB -Source: http://www.cix.co.uk/~klockstone/teavect.htm -Comment: test 1 -Plaintext: 00000000 00000000 -Key: 00000000 00000000 00000000 00000000 -Rounds: 1 -Ciphertext: 00000000 9e3779b9 -Test: Encrypt -Comment: test 2 -Plaintext: 9e3779b9 00000000 -Key: 00000000 00000000 00000000 00000000 -Rounds: 2 -Ciphertext: ec01a1de aaa0256d -Test: Encrypt -Comment: test 3 -Plaintext: aaa0256d 00000000 -Key: 00000000 00000000 00000000 ec01a1de -Rounds: 3 -Ciphertext: 114f6d74 a39e590c -Test: Encrypt -Comment: test 4 -Plaintext: a39e590c 00000000 -Key: 00000000 00000000 ec01a1de 114f6d74 -Rounds: 4 -Ciphertext: bc3a7de2 4e238eb9 -Test: Encrypt -Comment: test 5 -Plaintext: 4e238eb9 00000000 -Key: 00000000 ec01a1de 114f6d74 bc3a7de2 -Rounds: 5 -Ciphertext: 845846cf 2f36d07f -Test: Encrypt -Comment: test 6 -Plaintext: 2f36d07f 00000000 -Key: ec01a1de 114f6d74 bc3a7de2 845846cf -Rounds: 6 -Ciphertext: 2794a127 4f3e4b6a -Test: Encrypt -Comment: test 7 -Plaintext: 4f3e4b6a ec01a1de -Key: 114f6d74 bc3a7de2 845846cf 2794a127 -Rounds: 7 -Ciphertext: 6b8ea8b8 d99e66c3 -Test: Encrypt -Comment: test 8 -Plaintext: d99e66c3 114f6d74 -Key: bc3a7de2 845846cf 2794a127 6b8ea8b8 -Rounds: 8 -Ciphertext: 31c5fa6c 241756d6 -Test: Encrypt -Comment: test 9 -Plaintext: 241756d6 bc3a7de2 -Key: 845846cf 2794a127 6b8ea8b8 31c5fa6c -Rounds: 9 -Ciphertext: 4a581696 1fd58a6b -Test: Encrypt -Comment: test 10 -Plaintext: 1fd58a6b 845846cf -Key: 2794a127 6b8ea8b8 31c5fa6c 4a581696 -Rounds: 10 -Ciphertext: dfcd0451 df8822cd -Test: Encrypt -Comment: test 11 -Plaintext: df8822cd 2794a127 -Key: 6b8ea8b8 31c5fa6c 4a581696 dfcd0451 -Rounds: 11 -Ciphertext: 3ad1ff17 f465776c -Test: Encrypt -Comment: test 12 -Plaintext: f465776c 6b8ea8b8 -Key: 31c5fa6c 4a581696 dfcd0451 3ad1ff17 -Rounds: 12 -Ciphertext: 6a1d78c8 4d30bdb9 -Test: Encrypt -Comment: test 13 -Plaintext: 4d30bdb9 31c5fa6c -Key: 4a581696 dfcd0451 3ad1ff17 6a1d78c8 -Rounds: 13 -Ciphertext: 08c86d67 f6ef939b -Test: Encrypt -Comment: test 14 -Plaintext: f6ef939b 4a581696 -Key: dfcd0451 3ad1ff17 6a1d78c8 08c86d67 -Rounds: 14 -Ciphertext: 2a65bfbe f733428c -Test: Encrypt -Comment: test 15 -Plaintext: f733428c dfcd0451 -Key: 3ad1ff17 6a1d78c8 08c86d67 2a65bfbe -Rounds: 15 -Ciphertext: b4bd6e46 40672bcc -Test: Encrypt -Comment: test 16 -Plaintext: 40672bcc 3ad1ff17 -Key: 6a1d78c8 08c86d67 2a65bfbe b4bd6e46 -Rounds: 16 -Ciphertext: 1d8e6992 9a478905 -Test: Encrypt -Comment: test 17 -Plaintext: 9a478905 6a1d78c8 -Key: 08c86d67 2a65bfbe b4bd6e46 1d8e6992 -Rounds: 17 -Ciphertext: f8994ada 80dee76a -Test: Encrypt -Comment: test 18 -Plaintext: 80dee76a 08c86d67 -Key: 2a65bfbe b4bd6e46 1d8e6992 f8994ada -Rounds: 18 -Ciphertext: 0997e6ed cdfef370 -Test: Encrypt -Comment: test 19 -Plaintext: cdfef370 2a65bfbe -Key: b4bd6e46 1d8e6992 f8994ada 0997e6ed -Rounds: 19 -Ciphertext: ece50553 10b76c66 -Test: Encrypt -Comment: test 20 -Plaintext: 10b76c66 b4bd6e46 -Key: 1d8e6992 f8994ada 0997e6ed ece50553 -Rounds: 20 -Ciphertext: a6d39c7b dce1a473 -Test: Encrypt -Comment: test 21 -Plaintext: dce1a473 1d8e6992 -Key: f8994ada 0997e6ed ece50553 a6d39c7b -Rounds: 21 -Ciphertext: 21d06fb7 fbb98544 -Test: Encrypt -Comment: test 22 -Plaintext: fbb98544 f8994ada -Key: 0997e6ed ece50553 a6d39c7b 21d06fb7 -Rounds: 22 -Ciphertext: 72cdd36c e1115fb6 -Test: Encrypt -Comment: test 23 -Plaintext: e1115fb6 0997e6ed -Key: ece50553 a6d39c7b 21d06fb7 72cdd36c -Rounds: 23 -Ciphertext: 25bc6eb3 e4c28ab7 -Test: Encrypt -Comment: test 24 -Plaintext: e4c28ab7 ece50553 -Key: a6d39c7b 21d06fb7 72cdd36c 25bc6eb3 -Rounds: 24 -Ciphertext: 4932a288 78020b9e -Test: Encrypt -Comment: test 25 -Plaintext: 78020b9e a6d39c7b -Key: 21d06fb7 72cdd36c 25bc6eb3 4932a288 -Rounds: 25 -Ciphertext: 25285da1 b66c4459 -Test: Encrypt -Comment: test 26 -Plaintext: b66c4459 21d06fb7 -Key: 72cdd36c 25bc6eb3 4932a288 25285da1 -Rounds: 26 -Ciphertext: 39b0155c f227ab20 -Test: Encrypt -Comment: test 27 -Plaintext: f227ab20 72cdd36c -Key: 25bc6eb3 4932a288 25285da1 39b0155c -Rounds: 27 -Ciphertext: 547571aa f38f1e39 -Test: Encrypt -Comment: test 28 -Plaintext: f38f1e39 25bc6eb3 -Key: 4932a288 25285da1 39b0155c 547571aa -Rounds: 28 -Ciphertext: 27f917b1 e5796aee -Test: Encrypt -Comment: test 29 -Plaintext: e5796aee 4932a288 -Key: 25285da1 39b0155c 547571aa 27f917b1 -Rounds: 29 -Ciphertext: c1da8993 670f9fd2 -Test: Encrypt -Comment: test 30 -Plaintext: 670f9fd2 25285da1 -Key: 39b0155c 547571aa 27f917b1 c1da8993 -Rounds: 30 -Ciphertext: 60e2acaa d0a60db4 -Test: Encrypt -Comment: test 31 -Plaintext: d0a60db4 39b0155c -Key: 547571aa 27f917b1 c1da8993 60e2acaa -Rounds: 31 -Ciphertext: a6eb923d af20a390 -Test: Encrypt -Comment: test 32 -Plaintext: af20a390 547571aa -Key: 27f917b1 c1da8993 60e2acaa a6eb923d -Rounds: 32 -Ciphertext: d26428af 0a202283 -Test: Encrypt -Comment: test 33 -Plaintext: 0a202283 27f917b1 -Key: c1da8993 60e2acaa a6eb923d d26428af -Rounds: 33 -Ciphertext: 1c03ceb9 96e9f2d3 -Test: Encrypt -Comment: test 34 -Plaintext: 96e9f2d3 c1da8993 -Key: 60e2acaa a6eb923d d26428af 1c03ceb9 -Rounds: 34 -Ciphertext: e260b3c1 bbd7dff0 -Test: Encrypt -Comment: test 35 -Plaintext: bbd7dff0 60e2acaa -Key: a6eb923d d26428af 1c03ceb9 e260b3c1 -Rounds: 35 -Ciphertext: d33073f9 12841b97 -Test: Encrypt -Comment: test 36 -Plaintext: 12841b97 a6eb923d -Key: d26428af 1c03ceb9 e260b3c1 d33073f9 -Rounds: 36 -Ciphertext: 17b7ea05 1d723f18 -Test: Encrypt -Comment: test 37 -Plaintext: 1d723f18 d26428af -Key: 1c03ceb9 e260b3c1 d33073f9 17b7ea05 -Rounds: 37 -Ciphertext: 9f571045 31e849b9 -Test: Encrypt -Comment: test 38 -Plaintext: 31e849b9 1c03ceb9 -Key: e260b3c1 d33073f9 17b7ea05 9f571045 -Rounds: 38 -Ciphertext: 288351d2 bd0a0054 -Test: Encrypt -Comment: test 39 -Plaintext: bd0a0054 e260b3c1 -Key: d33073f9 17b7ea05 9f571045 288351d2 -Rounds: 39 -Ciphertext: 9236883a 2bd13143 -Test: Encrypt -Comment: test 40 -Plaintext: 2bd13143 d33073f9 -Key: 17b7ea05 9f571045 288351d2 9236883a -Rounds: 40 -Ciphertext: e91dcf23 7c3fd716 -Test: Encrypt -Comment: test 41 -Plaintext: 7c3fd716 17b7ea05 -Key: 9f571045 288351d2 9236883a e91dcf23 -Rounds: 41 -Ciphertext: 5c8ff51e c3abe43d -Test: Encrypt -Comment: test 42 -Plaintext: c3abe43d 9f571045 -Key: 288351d2 9236883a e91dcf23 5c8ff51e -Rounds: 42 -Ciphertext: 446e9f7c ecb0eb4d -Test: Encrypt -Comment: test 43 -Plaintext: ecb0eb4d 288351d2 -Key: 9236883a e91dcf23 5c8ff51e 446e9f7c -Rounds: 43 -Ciphertext: 86455f77 ffc74050 -Test: Encrypt -Comment: test 44 -Plaintext: ffc74050 9236883a -Key: e91dcf23 5c8ff51e 446e9f7c 86455f77 -Rounds: 44 -Ciphertext: ae85d873 e21ef8d3 -Test: Encrypt -Comment: test 45 -Plaintext: e21ef8d3 e91dcf23 -Key: 5c8ff51e 446e9f7c 86455f77 ae85d873 -Rounds: 45 -Ciphertext: cf411a68 18dce768 -Test: Encrypt -Comment: test 46 -Plaintext: 18dce768 5c8ff51e -Key: 446e9f7c 86455f77 ae85d873 cf411a68 -Rounds: 46 -Ciphertext: 4ef68794 07d2b1b3 -Test: Encrypt -Comment: test 47 -Plaintext: 07d2b1b3 446e9f7c -Key: 86455f77 ae85d873 cf411a68 4ef68794 -Rounds: 47 -Ciphertext: d75a1925 07476976 -Test: Encrypt -Comment: test 48 -Plaintext: 07476976 86455f77 -Key: ae85d873 cf411a68 4ef68794 d75a1925 -Rounds: 48 -Ciphertext: 909d29cb 16b37e1b -Test: Encrypt -Comment: test 49 -Plaintext: 16b37e1b ae85d873 -Key: cf411a68 4ef68794 d75a1925 909d29cb -Rounds: 49 -Ciphertext: e05578cd bd40cd0c -Test: Encrypt -Comment: test 50 -Plaintext: bd40cd0c cf411a68 -Key: 4ef68794 d75a1925 909d29cb e05578cd -Rounds: 50 -Ciphertext: 988b50e5 adf1b74c -Test: Encrypt -Comment: test 51 -Plaintext: adf1b74c 4ef68794 -Key: d75a1925 909d29cb e05578cd 988b50e5 -Rounds: 51 -Ciphertext: 90699d3d d2333c19 -Test: Encrypt -Comment: test 52 -Plaintext: d2333c19 d75a1925 -Key: 909d29cb e05578cd 988b50e5 90699d3d -Rounds: 52 -Ciphertext: a119eb2e 3488c65b -Test: Encrypt -Comment: test 53 -Plaintext: 3488c65b 909d29cb -Key: e05578cd 988b50e5 90699d3d a119eb2e -Rounds: 53 -Ciphertext: e4c43e62 e9c4894b -Test: Encrypt -Comment: test 54 -Plaintext: e9c4894b e05578cd -Key: 988b50e5 90699d3d a119eb2e e4c43e62 -Rounds: 54 -Ciphertext: e1aec3f2 1976c384 -Test: Encrypt -Comment: test 55 -Plaintext: 1976c384 988b50e5 -Key: 90699d3d a119eb2e e4c43e62 e1aec3f2 -Rounds: 55 -Ciphertext: 1b7b0e2b 0b392b46 -Test: Encrypt -Comment: test 56 -Plaintext: 0b392b46 90699d3d -Key: a119eb2e e4c43e62 e1aec3f2 1b7b0e2b -Rounds: 56 -Ciphertext: 1a6ffc0c 600f2ee0 -Test: Encrypt -Comment: test 57 -Plaintext: 600f2ee0 a119eb2e -Key: e4c43e62 e1aec3f2 1b7b0e2b 1a6ffc0c -Rounds: 57 -Ciphertext: 82ccc9d3 94ba3d77 -Test: Encrypt -Comment: test 58 -Plaintext: 94ba3d77 e4c43e62 -Key: e1aec3f2 1b7b0e2b 1a6ffc0c 82ccc9d3 -Rounds: 58 -Ciphertext: 38b5ebd1 c56af77e -Test: Encrypt -Comment: test 59 -Plaintext: c56af77e e1aec3f2 -Key: 1b7b0e2b 1a6ffc0c 82ccc9d3 38b5ebd1 -Rounds: 59 -Ciphertext: f5571f9d fe136a04 -Test: Encrypt -Comment: test 60 -Plaintext: fe136a04 1b7b0e2b -Key: 1a6ffc0c 82ccc9d3 38b5ebd1 f5571f9d -Rounds: 60 -Ciphertext: 62ee209f 08550367 -Test: Encrypt -Comment: test 61 -Plaintext: 08550367 1a6ffc0c -Key: 82ccc9d3 38b5ebd1 f5571f9d 62ee209f -Rounds: 61 -Ciphertext: 069b7afc b0fcde91 -Test: Encrypt -Comment: test 62 -Plaintext: b0fcde91 82ccc9d3 -Key: 38b5ebd1 f5571f9d 62ee209f 069b7afc -Rounds: 62 -Ciphertext: 376a8936 11b9c087 -Test: Encrypt -Comment: test 63 -Plaintext: 11b9c087 38b5ebd1 -Key: f5571f9d 62ee209f 069b7afc 376a8936 -Rounds: 63 -Ciphertext: cdc9e923 2e6c1fe7 -Test: Encrypt -Comment: test 64 -Plaintext: 2e6c1fe7 f5571f9d -Key: 62ee209f 069b7afc 376a8936 cdc9e923 -Rounds: 64 -Ciphertext: 7a01cbc9 b03d6068 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ttmac.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ttmac.txt deleted file mode 100644 index ec2e683f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/ttmac.txt +++ /dev/null @@ -1,40 +0,0 @@ -AlgorithmType: MAC -Name: Two-Track-MAC -Source: NESSIE submission -Comment: Key for all test cases -Key: 00112233445566778899aabbccddeeff01234567 -Comment: Test Case 1 -Message: "" -MAC: 2dec8ed4a0fd712ed9fbf2ab466ec2df21215e4a -Test: Verify -Comment: Test Case 2 -Message: "a" -MAC: 5893e3e6e306704dd77ad6e6ed432cde321a7756 -Test: Verify -Comment: Test Case 3 -Message: "abc" -MAC: 70bfd1029797a5c16da5b557a1f0b2779b78497e -Test: Verify -Comment: Test Case 4 -Message: "message digest" -MAC: 8289f4f19ffe4f2af737de4bd71c829d93a972fa -Test: Verify -Comment: Test Case 5 -Message: "abcdefghijklmnopqrstuvwxyz" -MAC: 2186ca09c5533198b7371f245273504ca92bae60 -Test: Verify -Comment: Test Case 6 -Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" -MAC: 8a7bf77aef62a2578497a27c0d6518a429e7c14d -Test: Verify -Comment: Test Case 7 -Message: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" -MAC: 54bac392a886806d169556fcbb6789b54fb364fb -Test: Verify -Comment: Test Case 8 -Message: r8 "1234567890" -MAC: 0ced2c9f8f0d9d03981ab5c8184bac43dd54c484 -Test: Verify -Comment: Test Case 9 -Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -MAC: 27b3aedb5df8b629f0142194daa3846e1895f3d2 diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/vmac.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/vmac.txt deleted file mode 100644 index 1d983cd9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/vmac.txt +++ /dev/null @@ -1,77 +0,0 @@ -AlgorithmType: MAC -Name: VMAC(AES)-64 -Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt -Key: "abcdefghijklmnop" -IV: "bcdefghi" -Message: "" -MAC: 2576BE1C56D8B81B -Test: Verify -Message: "abc" -MAC: 2D376CF5B1813CE5 -Test: Verify -Message: r16 "abc" -MAC: E8421F61D573D298 -Test: Verify -Message: r100 "abc" -MAC: 4492DF6C5CAC1BBE -Test: Verify -Message: r1000000 "abc" -MAC: 09BA597DD7601113 -Test: Verify -Message: r42 "abc" "ab" -MAC: D638B73921F184DE -Test: Verify -Message: r170 "abc" "ab" -MAC: 9DA310281E6FD0A0 -Test: Verify -Message: r65 "a" -MAC: 90 ea 57 cb 51 bc 92 a3 -Test: Verify -Message: r129 "a" -MAC: 86 34 83 87 d1 3d 82 33 -Test: Verify -Message: r65 "abc" -MAC: E86A86EC77A8BF61 -Test: Verify -Message: "abc" -MAC: 2D376CF5B1813CE0 -Test: NotVerify - -AlgorithmType: MAC -Name: VMAC(AES)-128 -Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt -Key: "abcdefghijklmnop" -IV: "bcdefghi" -Message: "" -MAC: 472766C70F74ED23481D6D7DE4E80DAC -Test: Verify -Message: "abc" -MAC: 4EE815A06A1D71EDD36FC75D51188A42 -Test: Verify -Message: r16 "abc" -MAC: 09F2C80C8E1007A0C12FAE19FE4504AE -Test: Verify -Message: r100 "abc" -MAC: 66438817154850C61D8A412164803BCB -Test: Verify -Message: r1000000 "abc" -MAC: 2B6B02288FFC461B75485DE893C629DC -Test: Verify -Message: r42 "abc" "ab" -MAC: F7E95FE3DA8DB9E6BB973E65D0B4CEA5 -Test: Verify -Message: r170 "abc" "ab" -MAC: BF53B8D2D70C05A85880C2E21CAF1299 -Test: Verify -Message: r65 "a" -MAC: b2 9b 00 76 0a 58 c7 ab 92 d6 60 24 d6 9c 1b 92 -Test: Verify -Message: r129 "a" -MAC: a7 e5 2c 32 89 d9 b7 3b 53 57 6f 05 95 85 ee 79 -Test: Verify -Message: r65 "abc" -MAC: 0A1B2F973044F469F405917E45010334 -Test: Verify -Message: "abc" -MAC: 4EE815A06A1D71EDD36FC75D51188A40 -Test: NotVerify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/wake.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/wake.txt deleted file mode 100644 index 2dd80a2a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/wake.txt +++ /dev/null @@ -1,10 +0,0 @@ -AlgorithmType: SymmetricCipher -Source: Generated by Crypto++ 5.6.1 -Key: r2 00112233445566778899AABBCCDDEEFF -Plaintext: r80 00 r80 01 -Name: WAKE-OFB-LE -Ciphertext: FFEEDDCCDF42B9D4939C351568AB4888BD9264CA66CF7F7885141F6934F3F390F1987B8609B733919DC5F73F7BED93ECDCD4F35FF32828553B8AFAD113DDA6565932553D9143AA886AE859167327F3C260434E6C90A0895FD33E6B6412526521FA0B12F4ECEE3E8F4F96DCF70907AAFB5E29C40FC10EB70A4970736E98DF98C615AC844A46FB8E4AEBBBF599DF7B73930B94776C6C8757BE51B34E71E9B514AE -Test: Encrypt -Name: WAKE-OFB-BE -Ciphertext: CCDDEEFFD4B942DF15359C938848AB68CA6492BD787FCF66691F148590F3F334867B98F19133B7093FF7C59DEC93ED7B5FF3D4DC552828F3D1FA8A3B56A6DD133D55325988AA43911659E86AC2F327736C4E43605F89A090646B3ED321655212F4120BFA8F3EEEECF7DC964FFBAA07090FC4295E0AB70EC16E737049C698DF984A84AC154A8EFB4699F5BBEB93737BDF6C77940BBE57876C714EB351AE14B5E9 -Test: Encrypt diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/whrlpool.txt b/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/whrlpool.txt deleted file mode 100644 index 9a4df8bb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/TestVectors/whrlpool.txt +++ /dev/null @@ -1,39 +0,0 @@ -AlgorithmType: MessageDigest -Name: Whirlpool -Source: ISO test vectors in http://planeta.terra.com.br/informatica/paulobarreto/whirlpool.zip -Message: "" -Digest: 19FA61D75522A466 9B44E39C1D2E1726 C530232130D407F8 9AFEE0964997F7A7\ - 3E83BE698B288FEB CF88E3E03C4F0757 EA8964E59B63D937 08B138CC42A66EB3 -Test: Verify -Message: "a" -Digest: 8ACA2602792AEC6F 11A67206531FB7D7 F0DFF59413145E69 73C45001D0087B42\ - D11BC645413AEFF6 3A42391A39145A59 1A92200D560195E5 3B478584FDAE231A -Test: Verify -Message: "abc" -Digest: 4E2448A4C6F486BB 16B6562C73B4020B F3043E3A731BCE72 1AE1B303D97E6D4C\ - 7181EEBDB6C57E27 7D0E34957114CBD6 C797FC9D95D8B582 D225292076D4EEF5 -Test: Verify -Message: "message digest" -Digest: 378C84A4126E2DC6 E56DCC7458377AAC 838D00032230F53C E1F5700C0FFB4D3B\ - 8421557659EF55C1 06B4B52AC5A4AAA6 92ED920052838F33 62E86DBD37A8903E -Test: Verify -Message: "abcdefghijklmnopqrstuvwxyz" -Digest: F1D754662636FFE9 2C82EBB9212A484A 8D38631EAD4238F5 442EE13B8054E41B\ - 08BF2A9251C30B6A 0B8AAE86177AB4A6 F68F673E7207865D 5D9819A3DBA4EB3B -Test: Verify -Message: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" -Digest: DC37E008CF9EE69B F11F00ED9ABA2690 1DD7C28CDEC066CC 6AF42E40F82F3A1E\ - 08EBA26629129D8F B7CB57211B9281A6 5517CC879D7B9621 42C65F5A7AF01467 -Test: Verify -Message: r8 "1234567890" -Digest: 466EF18BABB0154D 25B9D38A6414F5C0 8784372BCCB204D6 549C4AFADB601429\ - 4D5BD8DF2A6C44E5 38CD047B2681A51A 2C60481E88C5A20B 2C2A80CF3A9A083B -Test: Verify -Message: "abcdbcdecdefdefgefghfghighijhijk" -Digest: 2A987EA40F917061 F5D6F0A0E4644F48 8A7A5A52DEEE6562 07C562F988E95C69\ - 16BDC8031BC5BE1B 7B947639FE050B56 939BAAA0ADFF9AE6 745B7B181C3BE3FD -Test: Verify -Message: r1000000 "a" -Digest: 0C99005BEB57EFF5 0A7CF005560DDF5D 29057FD86B20BFD6 2DECA0F1CCEA4AF5\ - 1FC15490EDDC47AF 32BB2B66C34FF9AD 8C6008AD677F7712 6953B226E4ED8B01 -Test: Verify diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/a.out b/src/3rd_party/cryptopp/cryptopp-5.6.1/a.out deleted file mode 100644 index 48735683..00000000 Binary files a/src/3rd_party/cryptopp/cryptopp-5.6.1/a.out and /dev/null differ diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp deleted file mode 100644 index df09f118..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "filters.h" -#include "files.h" -#include "base64.h" -#include "hex.h" -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -extern int (*AdhocTest)(int argc, char *argv[]); - -int MyAdhocTest(int argc, char *argv[]) -{ - return 0; -} - -static int s_i = (AdhocTest = &MyAdhocTest, 0); diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp.proto b/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp.proto deleted file mode 100644 index df09f118..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/adhoc.cpp.proto +++ /dev/null @@ -1,17 +0,0 @@ -#include "filters.h" -#include "files.h" -#include "base64.h" -#include "hex.h" -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -extern int (*AdhocTest)(int argc, char *argv[]); - -int MyAdhocTest(int argc, char *argv[]) -{ - return 0; -} - -static int s_i = (AdhocTest = &MyAdhocTest, 0); diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.cpp deleted file mode 100644 index 0d52c083..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// adler32.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "adler32.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Adler32::Update(const byte *input, size_t length) -{ - const unsigned long BASE = 65521; - - unsigned long s1 = m_s1; - unsigned long s2 = m_s2; - - if (length % 8 != 0) - { - do - { - s1 += *input++; - s2 += s1; - length--; - } while (length % 8 != 0); - - if (s1 >= BASE) - s1 -= BASE; - s2 %= BASE; - } - - while (length > 0) - { - s1 += input[0]; s2 += s1; - s1 += input[1]; s2 += s1; - s1 += input[2]; s2 += s1; - s1 += input[3]; s2 += s1; - s1 += input[4]; s2 += s1; - s1 += input[5]; s2 += s1; - s1 += input[6]; s2 += s1; - s1 += input[7]; s2 += s1; - - length -= 8; - input += 8; - - if (s1 >= BASE) - s1 -= BASE; - if (length % 0x8000 == 0) - s2 %= BASE; - } - - assert(s1 < BASE); - assert(s2 < BASE); - - m_s1 = (word16)s1; - m_s2 = (word16)s2; -} - -void Adler32::TruncatedFinal(byte *hash, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - switch (size) - { - default: - hash[3] = byte(m_s1); - case 3: - hash[2] = byte(m_s1 >> 8); - case 2: - hash[1] = byte(m_s2); - case 1: - hash[0] = byte(m_s2 >> 8); - case 0: - ; - } - - Reset(); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.h deleted file mode 100644 index 0ed803da..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/adler32.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef CRYPTOPP_ADLER32_H -#define CRYPTOPP_ADLER32_H - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! ADLER-32 checksum calculations -class Adler32 : public HashTransformation -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE = 4) - Adler32() {Reset();} - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *hash, size_t size); - unsigned int DigestSize() const {return DIGESTSIZE;} - static const char * StaticAlgorithmName() {return "Adler32";} - std::string AlgorithmName() const {return StaticAlgorithmName();} - -private: - void Reset() {m_s1 = 1; m_s2 = 0;} - - word16 m_s1, m_s2; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/aes.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/aes.h deleted file mode 100644 index 00875425..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/aes.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef CRYPTOPP_AES_H -#define CRYPTOPP_AES_H - -#include "rijndael.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! AES winner, announced on 10/2/2000 -DOCUMENTED_TYPEDEF(Rijndael, AES); - -typedef RijndaelEncryption AESEncryption; -typedef RijndaelDecryption AESDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.cpp deleted file mode 100644 index 78c3947b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.cpp +++ /dev/null @@ -1,340 +0,0 @@ -// algebra.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_ALGEBRA_CPP // SunCC workaround: compiler could cause this file to be included twice -#define CRYPTOPP_ALGEBRA_CPP - -#include "algebra.h" -#include "integer.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -template const T& AbstractGroup::Double(const Element &a) const -{ - return Add(a, a); -} - -template const T& AbstractGroup::Subtract(const Element &a, const Element &b) const -{ - // make copy of a in case Inverse() overwrites it - Element a1(a); - return Add(a1, Inverse(b)); -} - -template T& AbstractGroup::Accumulate(Element &a, const Element &b) const -{ - return a = Add(a, b); -} - -template T& AbstractGroup::Reduce(Element &a, const Element &b) const -{ - return a = Subtract(a, b); -} - -template const T& AbstractRing::Square(const Element &a) const -{ - return Multiply(a, a); -} - -template const T& AbstractRing::Divide(const Element &a, const Element &b) const -{ - // make copy of a in case MultiplicativeInverse() overwrites it - Element a1(a); - return Multiply(a1, MultiplicativeInverse(b)); -} - -template const T& AbstractEuclideanDomain::Mod(const Element &a, const Element &b) const -{ - Element q; - DivisionAlgorithm(result, q, a, b); - return result; -} - -template const T& AbstractEuclideanDomain::Gcd(const Element &a, const Element &b) const -{ - Element g[3]={b, a}; - unsigned int i0=0, i1=1, i2=2; - - while (!Equal(g[i1], this->Identity())) - { - g[i2] = Mod(g[i0], g[i1]); - unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; - } - - return result = g[i0]; -} - -template const typename QuotientRing::Element& QuotientRing::MultiplicativeInverse(const Element &a) const -{ - Element g[3]={m_modulus, a}; - Element v[3]={m_domain.Identity(), m_domain.MultiplicativeIdentity()}; - Element y; - unsigned int i0=0, i1=1, i2=2; - - while (!Equal(g[i1], Identity())) - { - // y = g[i0] / g[i1]; - // g[i2] = g[i0] % g[i1]; - m_domain.DivisionAlgorithm(g[i2], y, g[i0], g[i1]); - // v[i2] = v[i0] - (v[i1] * y); - v[i2] = m_domain.Subtract(v[i0], m_domain.Multiply(v[i1], y)); - unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; - } - - return m_domain.IsUnit(g[i0]) ? m_domain.Divide(v[i0], g[i0]) : m_domain.Identity(); -} - -template T AbstractGroup::ScalarMultiply(const Element &base, const Integer &exponent) const -{ - Element result; - SimultaneousMultiply(&result, base, &exponent, 1); - return result; -} - -template T AbstractGroup::CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const -{ - const unsigned expLen = STDMAX(e1.BitCount(), e2.BitCount()); - if (expLen==0) - return Identity(); - - const unsigned w = (expLen <= 46 ? 1 : (expLen <= 260 ? 2 : 3)); - const unsigned tableSize = 1< powerTable(tableSize << w); - - powerTable[1] = x; - powerTable[tableSize] = y; - if (w==1) - powerTable[3] = Add(x,y); - else - { - powerTable[2] = Double(x); - powerTable[2*tableSize] = Double(y); - - unsigned i, j; - - for (i=3; i=0; i--) - { - power1 = 2*power1 + e1.GetBit(i); - power2 = 2*power2 + e2.GetBit(i); - - if (i==0 || 2*power1 >= tableSize || 2*power2 >= tableSize) - { - unsigned squaresBefore = prevPosition-i; - unsigned squaresAfter = 0; - prevPosition = i; - while ((power1 || power2) && power1%2 == 0 && power2%2==0) - { - power1 /= 2; - power2 /= 2; - squaresBefore--; - squaresAfter++; - } - if (firstTime) - { - result = powerTable[(power2< Element GeneralCascadeMultiplication(const AbstractGroup &group, Iterator begin, Iterator end) -{ - if (end-begin == 1) - return group.ScalarMultiply(begin->base, begin->exponent); - else if (end-begin == 2) - return group.CascadeScalarMultiply(begin->base, begin->exponent, (begin+1)->base, (begin+1)->exponent); - else - { - Integer q, t; - Iterator last = end; - --last; - - std::make_heap(begin, end); - std::pop_heap(begin, end); - - while (!!begin->exponent) - { - // last->exponent is largest exponent, begin->exponent is next largest - t = last->exponent; - Integer::Divide(last->exponent, q, t, begin->exponent); - - if (q == Integer::One()) - group.Accumulate(begin->base, last->base); // avoid overhead of ScalarMultiply() - else - group.Accumulate(begin->base, group.ScalarMultiply(last->base, q)); - - std::push_heap(begin, end); - std::pop_heap(begin, end); - } - - return group.ScalarMultiply(last->base, last->exponent); - } -} - -struct WindowSlider -{ - WindowSlider(const Integer &expIn, bool fastNegate, unsigned int windowSizeIn=0) - : exp(expIn), windowModulus(Integer::One()), windowSize(windowSizeIn), windowBegin(0), fastNegate(fastNegate), firstTime(true), finished(false) - { - if (windowSize == 0) - { - unsigned int expLen = exp.BitCount(); - windowSize = expLen <= 17 ? 1 : (expLen <= 24 ? 2 : (expLen <= 70 ? 3 : (expLen <= 197 ? 4 : (expLen <= 539 ? 5 : (expLen <= 1434 ? 6 : 7))))); - } - windowModulus <<= windowSize; - } - - void FindNextWindow() - { - unsigned int expLen = exp.WordCount() * WORD_BITS; - unsigned int skipCount = firstTime ? 0 : windowSize; - firstTime = false; - while (!exp.GetBit(skipCount)) - { - if (skipCount >= expLen) - { - finished = true; - return; - } - skipCount++; - } - - exp >>= skipCount; - windowBegin += skipCount; - expWindow = word32(exp % (word(1) << windowSize)); - - if (fastNegate && exp.GetBit(windowSize)) - { - negateNext = true; - expWindow = (word32(1) << windowSize) - expWindow; - exp += windowModulus; - } - else - negateNext = false; - } - - Integer exp, windowModulus; - unsigned int windowSize, windowBegin; - word32 expWindow; - bool fastNegate, negateNext, firstTime, finished; -}; - -template -void AbstractGroup::SimultaneousMultiply(T *results, const T &base, const Integer *expBegin, unsigned int expCount) const -{ - std::vector > buckets(expCount); - std::vector exponents; - exponents.reserve(expCount); - unsigned int i; - - for (i=0; iNotNegative()); - exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 0)); - exponents[i].FindNextWindow(); - buckets[i].resize(1<<(exponents[i].windowSize-1), Identity()); - } - - unsigned int expBitPosition = 0; - Element g = base; - bool notDone = true; - - while (notDone) - { - notDone = false; - for (i=0; i 1) - { - for (int j = (int)buckets[i].size()-2; j >= 1; j--) - { - Accumulate(buckets[i][j], buckets[i][j+1]); - Accumulate(r, buckets[i][j]); - } - Accumulate(buckets[i][0], buckets[i][1]); - r = Add(Double(r), buckets[i][0]); - } - } -} - -template T AbstractRing::Exponentiate(const Element &base, const Integer &exponent) const -{ - Element result; - SimultaneousExponentiate(&result, base, &exponent, 1); - return result; -} - -template T AbstractRing::CascadeExponentiate(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const -{ - return MultiplicativeGroup().AbstractGroup::CascadeScalarMultiply(x, e1, y, e2); -} - -template Element GeneralCascadeExponentiation(const AbstractRing &ring, Iterator begin, Iterator end) -{ - return GeneralCascadeMultiplication(ring.MultiplicativeGroup(), begin, end); -} - -template -void AbstractRing::SimultaneousExponentiate(T *results, const T &base, const Integer *exponents, unsigned int expCount) const -{ - MultiplicativeGroup().AbstractGroup::SimultaneousMultiply(results, base, exponents, expCount); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.h deleted file mode 100644 index 13038bd8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/algebra.h +++ /dev/null @@ -1,285 +0,0 @@ -#ifndef CRYPTOPP_ALGEBRA_H -#define CRYPTOPP_ALGEBRA_H - -#include "config.h" - -NAMESPACE_BEGIN(CryptoPP) - -class Integer; - -// "const Element&" returned by member functions are references -// to internal data members. Since each object may have only -// one such data member for holding results, the following code -// will produce incorrect results: -// abcd = group.Add(group.Add(a,b), group.Add(c,d)); -// But this should be fine: -// abcd = group.Add(a, group.Add(b, group.Add(c,d)); - -//! Abstract Group -template class CRYPTOPP_NO_VTABLE AbstractGroup -{ -public: - typedef T Element; - - virtual ~AbstractGroup() {} - - virtual bool Equal(const Element &a, const Element &b) const =0; - virtual const Element& Identity() const =0; - virtual const Element& Add(const Element &a, const Element &b) const =0; - virtual const Element& Inverse(const Element &a) const =0; - virtual bool InversionIsFast() const {return false;} - - virtual const Element& Double(const Element &a) const; - virtual const Element& Subtract(const Element &a, const Element &b) const; - virtual Element& Accumulate(Element &a, const Element &b) const; - virtual Element& Reduce(Element &a, const Element &b) const; - - virtual Element ScalarMultiply(const Element &a, const Integer &e) const; - virtual Element CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const; - - virtual void SimultaneousMultiply(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; -}; - -//! Abstract Ring -template class CRYPTOPP_NO_VTABLE AbstractRing : public AbstractGroup -{ -public: - typedef T Element; - - AbstractRing() {m_mg.m_pRing = this;} - AbstractRing(const AbstractRing &source) {m_mg.m_pRing = this;} - AbstractRing& operator=(const AbstractRing &source) {return *this;} - - virtual bool IsUnit(const Element &a) const =0; - virtual const Element& MultiplicativeIdentity() const =0; - virtual const Element& Multiply(const Element &a, const Element &b) const =0; - virtual const Element& MultiplicativeInverse(const Element &a) const =0; - - virtual const Element& Square(const Element &a) const; - virtual const Element& Divide(const Element &a, const Element &b) const; - - virtual Element Exponentiate(const Element &a, const Integer &e) const; - virtual Element CascadeExponentiate(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const; - - virtual void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; - - virtual const AbstractGroup& MultiplicativeGroup() const - {return m_mg;} - -private: - class MultiplicativeGroupT : public AbstractGroup - { - public: - const AbstractRing& GetRing() const - {return *m_pRing;} - - bool Equal(const Element &a, const Element &b) const - {return GetRing().Equal(a, b);} - - const Element& Identity() const - {return GetRing().MultiplicativeIdentity();} - - const Element& Add(const Element &a, const Element &b) const - {return GetRing().Multiply(a, b);} - - Element& Accumulate(Element &a, const Element &b) const - {return a = GetRing().Multiply(a, b);} - - const Element& Inverse(const Element &a) const - {return GetRing().MultiplicativeInverse(a);} - - const Element& Subtract(const Element &a, const Element &b) const - {return GetRing().Divide(a, b);} - - Element& Reduce(Element &a, const Element &b) const - {return a = GetRing().Divide(a, b);} - - const Element& Double(const Element &a) const - {return GetRing().Square(a);} - - Element ScalarMultiply(const Element &a, const Integer &e) const - {return GetRing().Exponentiate(a, e);} - - Element CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const - {return GetRing().CascadeExponentiate(x, e1, y, e2);} - - void SimultaneousMultiply(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const - {GetRing().SimultaneousExponentiate(results, base, exponents, exponentsCount);} - - const AbstractRing *m_pRing; - }; - - MultiplicativeGroupT m_mg; -}; - -// ******************************************************** - -//! Base and Exponent -template -struct BaseAndExponent -{ -public: - BaseAndExponent() {} - BaseAndExponent(const T &base, const E &exponent) : base(base), exponent(exponent) {} - bool operator<(const BaseAndExponent &rhs) const {return exponent < rhs.exponent;} - T base; - E exponent; -}; - -// VC60 workaround: incomplete member template support -template - Element GeneralCascadeMultiplication(const AbstractGroup &group, Iterator begin, Iterator end); -template - Element GeneralCascadeExponentiation(const AbstractRing &ring, Iterator begin, Iterator end); - -// ******************************************************** - -//! Abstract Euclidean Domain -template class CRYPTOPP_NO_VTABLE AbstractEuclideanDomain : public AbstractRing -{ -public: - typedef T Element; - - virtual void DivisionAlgorithm(Element &r, Element &q, const Element &a, const Element &d) const =0; - - virtual const Element& Mod(const Element &a, const Element &b) const =0; - virtual const Element& Gcd(const Element &a, const Element &b) const; - -protected: - mutable Element result; -}; - -// ******************************************************** - -//! EuclideanDomainOf -template class EuclideanDomainOf : public AbstractEuclideanDomain -{ -public: - typedef T Element; - - EuclideanDomainOf() {} - - bool Equal(const Element &a, const Element &b) const - {return a==b;} - - const Element& Identity() const - {return Element::Zero();} - - const Element& Add(const Element &a, const Element &b) const - {return result = a+b;} - - Element& Accumulate(Element &a, const Element &b) const - {return a+=b;} - - const Element& Inverse(const Element &a) const - {return result = -a;} - - const Element& Subtract(const Element &a, const Element &b) const - {return result = a-b;} - - Element& Reduce(Element &a, const Element &b) const - {return a-=b;} - - const Element& Double(const Element &a) const - {return result = a.Doubled();} - - const Element& MultiplicativeIdentity() const - {return Element::One();} - - const Element& Multiply(const Element &a, const Element &b) const - {return result = a*b;} - - const Element& Square(const Element &a) const - {return result = a.Squared();} - - bool IsUnit(const Element &a) const - {return a.IsUnit();} - - const Element& MultiplicativeInverse(const Element &a) const - {return result = a.MultiplicativeInverse();} - - const Element& Divide(const Element &a, const Element &b) const - {return result = a/b;} - - const Element& Mod(const Element &a, const Element &b) const - {return result = a%b;} - - void DivisionAlgorithm(Element &r, Element &q, const Element &a, const Element &d) const - {Element::Divide(r, q, a, d);} - - bool operator==(const EuclideanDomainOf &rhs) const - {return true;} - -private: - mutable Element result; -}; - -//! Quotient Ring -template class QuotientRing : public AbstractRing -{ -public: - typedef T EuclideanDomain; - typedef typename T::Element Element; - - QuotientRing(const EuclideanDomain &domain, const Element &modulus) - : m_domain(domain), m_modulus(modulus) {} - - const EuclideanDomain & GetDomain() const - {return m_domain;} - - const Element& GetModulus() const - {return m_modulus;} - - bool Equal(const Element &a, const Element &b) const - {return m_domain.Equal(m_domain.Mod(m_domain.Subtract(a, b), m_modulus), m_domain.Identity());} - - const Element& Identity() const - {return m_domain.Identity();} - - const Element& Add(const Element &a, const Element &b) const - {return m_domain.Add(a, b);} - - Element& Accumulate(Element &a, const Element &b) const - {return m_domain.Accumulate(a, b);} - - const Element& Inverse(const Element &a) const - {return m_domain.Inverse(a);} - - const Element& Subtract(const Element &a, const Element &b) const - {return m_domain.Subtract(a, b);} - - Element& Reduce(Element &a, const Element &b) const - {return m_domain.Reduce(a, b);} - - const Element& Double(const Element &a) const - {return m_domain.Double(a);} - - bool IsUnit(const Element &a) const - {return m_domain.IsUnit(m_domain.Gcd(a, m_modulus));} - - const Element& MultiplicativeIdentity() const - {return m_domain.MultiplicativeIdentity();} - - const Element& Multiply(const Element &a, const Element &b) const - {return m_domain.Mod(m_domain.Multiply(a, b), m_modulus);} - - const Element& Square(const Element &a) const - {return m_domain.Mod(m_domain.Square(a), m_modulus);} - - const Element& MultiplicativeInverse(const Element &a) const; - - bool operator==(const QuotientRing &rhs) const - {return m_domain == rhs.m_domain && m_modulus == rhs.m_modulus;} - -protected: - EuclideanDomain m_domain; - Element m_modulus; -}; - -NAMESPACE_END - -#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#include "algebra.cpp" -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.cpp deleted file mode 100644 index a70d5dd9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// algparam.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -PAssignIntToInteger g_pAssignIntToInteger = NULL; - -bool CombinedNameValuePairs::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - if (strcmp(name, "ValueNames") == 0) - return m_pairs1.GetVoidValue(name, valueType, pValue) && m_pairs2.GetVoidValue(name, valueType, pValue); - else - return m_pairs1.GetVoidValue(name, valueType, pValue) || m_pairs2.GetVoidValue(name, valueType, pValue); -} - -void AlgorithmParametersBase::operator=(const AlgorithmParametersBase& rhs) -{ - assert(false); -} - -bool AlgorithmParametersBase::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - if (strcmp(name, "ValueNames") == 0) - { - NameValuePairs::ThrowIfTypeMismatch(name, typeid(std::string), valueType); - if (m_next.get()) - m_next->GetVoidValue(name, valueType, pValue); - (*reinterpret_cast(pValue) += m_name) += ";"; - return true; - } - else if (strcmp(name, m_name) == 0) - { - AssignValue(name, valueType, pValue); - m_used = true; - return true; - } - else if (m_next.get()) - return m_next->GetVoidValue(name, valueType, pValue); - else - return false; -} - -AlgorithmParameters::AlgorithmParameters() - : m_defaultThrowIfNotUsed(true) -{ -} - -AlgorithmParameters::AlgorithmParameters(const AlgorithmParameters &x) - : m_defaultThrowIfNotUsed(x.m_defaultThrowIfNotUsed) -{ - m_next.reset(const_cast(x).m_next.release()); -} - -AlgorithmParameters & AlgorithmParameters::operator=(const AlgorithmParameters &x) -{ - m_next.reset(const_cast(x).m_next.release()); - return *this; -} - -bool AlgorithmParameters::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - if (m_next.get()) - return m_next->GetVoidValue(name, valueType, pValue); - else - return false; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.h deleted file mode 100644 index ea5129c2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/algparam.h +++ /dev/null @@ -1,398 +0,0 @@ -#ifndef CRYPTOPP_ALGPARAM_H -#define CRYPTOPP_ALGPARAM_H - -#include "cryptlib.h" -#include "smartptr.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! used to pass byte array input as part of a NameValuePairs object -/*! the deepCopy option is used when the NameValuePairs object can't - keep a copy of the data available */ -class ConstByteArrayParameter -{ -public: - ConstByteArrayParameter(const char *data = NULL, bool deepCopy = false) - { - Assign((const byte *)data, data ? strlen(data) : 0, deepCopy); - } - ConstByteArrayParameter(const byte *data, size_t size, bool deepCopy = false) - { - Assign(data, size, deepCopy); - } - template ConstByteArrayParameter(const T &string, bool deepCopy = false) - { - CRYPTOPP_COMPILE_ASSERT(sizeof(CPP_TYPENAME T::value_type) == 1); - Assign((const byte *)string.data(), string.size(), deepCopy); - } - - void Assign(const byte *data, size_t size, bool deepCopy) - { - if (deepCopy) - m_block.Assign(data, size); - else - { - m_data = data; - m_size = size; - } - m_deepCopy = deepCopy; - } - - const byte *begin() const {return m_deepCopy ? m_block.begin() : m_data;} - const byte *end() const {return m_deepCopy ? m_block.end() : m_data + m_size;} - size_t size() const {return m_deepCopy ? m_block.size() : m_size;} - -private: - bool m_deepCopy; - const byte *m_data; - size_t m_size; - SecByteBlock m_block; -}; - -class ByteArrayParameter -{ -public: - ByteArrayParameter(byte *data = NULL, unsigned int size = 0) - : m_data(data), m_size(size) {} - ByteArrayParameter(SecByteBlock &block) - : m_data(block.begin()), m_size(block.size()) {} - - byte *begin() const {return m_data;} - byte *end() const {return m_data + m_size;} - size_t size() const {return m_size;} - -private: - byte *m_data; - size_t m_size; -}; - -class CRYPTOPP_DLL CombinedNameValuePairs : public NameValuePairs -{ -public: - CombinedNameValuePairs(const NameValuePairs &pairs1, const NameValuePairs &pairs2) - : m_pairs1(pairs1), m_pairs2(pairs2) {} - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - -private: - const NameValuePairs &m_pairs1, &m_pairs2; -}; - -template -class GetValueHelperClass -{ -public: - GetValueHelperClass(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst) - : m_pObject(pObject), m_name(name), m_valueType(&valueType), m_pValue(pValue), m_found(false), m_getValueNames(false) - { - if (strcmp(m_name, "ValueNames") == 0) - { - m_found = m_getValueNames = true; - NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(std::string), *m_valueType); - if (searchFirst) - searchFirst->GetVoidValue(m_name, valueType, pValue); - if (typeid(T) != typeid(BASE)) - pObject->BASE::GetVoidValue(m_name, valueType, pValue); - ((*reinterpret_cast(m_pValue) += "ThisPointer:") += typeid(T).name()) += ';'; - } - - if (!m_found && strncmp(m_name, "ThisPointer:", 12) == 0 && strcmp(m_name+12, typeid(T).name()) == 0) - { - NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(T *), *m_valueType); - *reinterpret_cast(pValue) = pObject; - m_found = true; - return; - } - - if (!m_found && searchFirst) - m_found = searchFirst->GetVoidValue(m_name, valueType, pValue); - - if (!m_found && typeid(T) != typeid(BASE)) - m_found = pObject->BASE::GetVoidValue(m_name, valueType, pValue); - } - - operator bool() const {return m_found;} - - template - GetValueHelperClass & operator()(const char *name, const R & (T::*pm)() const) - { - if (m_getValueNames) - (*reinterpret_cast(m_pValue) += name) += ";"; - if (!m_found && strcmp(name, m_name) == 0) - { - NameValuePairs::ThrowIfTypeMismatch(name, typeid(R), *m_valueType); - *reinterpret_cast(m_pValue) = (m_pObject->*pm)(); - m_found = true; - } - return *this; - } - - GetValueHelperClass &Assignable() - { -#ifndef __INTEL_COMPILER // ICL 9.1 workaround: Intel compiler copies the vTable pointer for some reason - if (m_getValueNames) - ((*reinterpret_cast(m_pValue) += "ThisObject:") += typeid(T).name()) += ';'; - if (!m_found && strncmp(m_name, "ThisObject:", 11) == 0 && strcmp(m_name+11, typeid(T).name()) == 0) - { - NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(T), *m_valueType); - *reinterpret_cast(m_pValue) = *m_pObject; - m_found = true; - } -#endif - return *this; - } - -private: - const T *m_pObject; - const char *m_name; - const std::type_info *m_valueType; - void *m_pValue; - bool m_found, m_getValueNames; -}; - -template -GetValueHelperClass GetValueHelper(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst=NULL, BASE *dummy=NULL) -{ - return GetValueHelperClass(pObject, name, valueType, pValue, searchFirst); -} - -template -GetValueHelperClass GetValueHelper(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst=NULL) -{ - return GetValueHelperClass(pObject, name, valueType, pValue, searchFirst); -} - -// ******************************************************** - -template -R Hack_DefaultValueFromConstReferenceType(const R &) -{ - return R(); -} - -template -bool Hack_GetValueIntoConstReference(const NameValuePairs &source, const char *name, const R &value) -{ - return source.GetValue(name, const_cast(value)); -} - -template -class AssignFromHelperClass -{ -public: - AssignFromHelperClass(T *pObject, const NameValuePairs &source) - : m_pObject(pObject), m_source(source), m_done(false) - { - if (source.GetThisObject(*pObject)) - m_done = true; - else if (typeid(BASE) != typeid(T)) - pObject->BASE::AssignFrom(source); - } - - template - AssignFromHelperClass & operator()(const char *name, void (T::*pm)(R)) // VC60 workaround: "const R &" here causes compiler error - { - if (!m_done) - { - R value = Hack_DefaultValueFromConstReferenceType(reinterpret_cast(*(int *)NULL)); - if (!Hack_GetValueIntoConstReference(m_source, name, value)) - throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name + "'"); - (m_pObject->*pm)(value); - } - return *this; - } - - template - AssignFromHelperClass & operator()(const char *name1, const char *name2, void (T::*pm)(R, S)) // VC60 workaround: "const R &" here causes compiler error - { - if (!m_done) - { - R value1 = Hack_DefaultValueFromConstReferenceType(reinterpret_cast(*(int *)NULL)); - if (!Hack_GetValueIntoConstReference(m_source, name1, value1)) - throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name1 + "'"); - S value2 = Hack_DefaultValueFromConstReferenceType(reinterpret_cast(*(int *)NULL)); - if (!Hack_GetValueIntoConstReference(m_source, name2, value2)) - throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name2 + "'"); - (m_pObject->*pm)(value1, value2); - } - return *this; - } - -private: - T *m_pObject; - const NameValuePairs &m_source; - bool m_done; -}; - -template -AssignFromHelperClass AssignFromHelper(T *pObject, const NameValuePairs &source, BASE *dummy=NULL) -{ - return AssignFromHelperClass(pObject, source); -} - -template -AssignFromHelperClass AssignFromHelper(T *pObject, const NameValuePairs &source) -{ - return AssignFromHelperClass(pObject, source); -} - -// ******************************************************** - -// to allow the linker to discard Integer code if not needed. -typedef bool (CRYPTOPP_API * PAssignIntToInteger)(const std::type_info &valueType, void *pInteger, const void *pInt); -CRYPTOPP_DLL extern PAssignIntToInteger g_pAssignIntToInteger; - -CRYPTOPP_DLL const std::type_info & CRYPTOPP_API IntegerTypeId(); - -class CRYPTOPP_DLL AlgorithmParametersBase -{ -public: - class ParameterNotUsed : public Exception - { - public: - ParameterNotUsed(const char *name) : Exception(OTHER_ERROR, std::string("AlgorithmParametersBase: parameter \"") + name + "\" not used") {} - }; - - // this is actually a move, not a copy - AlgorithmParametersBase(const AlgorithmParametersBase &x) - : m_name(x.m_name), m_throwIfNotUsed(x.m_throwIfNotUsed), m_used(x.m_used) - { - m_next.reset(const_cast(x).m_next.release()); - x.m_used = true; - } - - AlgorithmParametersBase(const char *name, bool throwIfNotUsed) - : m_name(name), m_throwIfNotUsed(throwIfNotUsed), m_used(false) {} - - virtual ~AlgorithmParametersBase() - { -#ifdef CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE - if (!std::uncaught_exception()) -#else - try -#endif - { - if (m_throwIfNotUsed && !m_used) - throw ParameterNotUsed(m_name); - } -#ifndef CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE - catch(...) - { - } -#endif - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - -protected: - friend class AlgorithmParameters; - void operator=(const AlgorithmParametersBase& rhs); // assignment not allowed, declare this for VC60 - - virtual void AssignValue(const char *name, const std::type_info &valueType, void *pValue) const =0; - virtual void MoveInto(void *p) const =0; // not really const - - const char *m_name; - bool m_throwIfNotUsed; - mutable bool m_used; - member_ptr m_next; -}; - -template -class AlgorithmParametersTemplate : public AlgorithmParametersBase -{ -public: - AlgorithmParametersTemplate(const char *name, const T &value, bool throwIfNotUsed) - : AlgorithmParametersBase(name, throwIfNotUsed), m_value(value) - { - } - - void AssignValue(const char *name, const std::type_info &valueType, void *pValue) const - { - // special case for retrieving an Integer parameter when an int was passed in - if (!(g_pAssignIntToInteger != NULL && typeid(T) == typeid(int) && g_pAssignIntToInteger(valueType, pValue, &m_value))) - { - NameValuePairs::ThrowIfTypeMismatch(name, typeid(T), valueType); - *reinterpret_cast(pValue) = m_value; - } - } - - void MoveInto(void *buffer) const - { - AlgorithmParametersTemplate* p = new(buffer) AlgorithmParametersTemplate(*this); - } - -protected: - T m_value; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate; -CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate; -CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate; - -class CRYPTOPP_DLL AlgorithmParameters : public NameValuePairs -{ -public: - AlgorithmParameters(); - -#ifdef __BORLANDC__ - template - AlgorithmParameters(const char *name, const T &value, bool throwIfNotUsed=true) - : m_next(new AlgorithmParametersTemplate(name, value, throwIfNotUsed)) - , m_defaultThrowIfNotUsed(throwIfNotUsed) - { - } -#endif - - AlgorithmParameters(const AlgorithmParameters &x); - - AlgorithmParameters & operator=(const AlgorithmParameters &x); - - template - AlgorithmParameters & operator()(const char *name, const T &value, bool throwIfNotUsed) - { - member_ptr p(new AlgorithmParametersTemplate(name, value, throwIfNotUsed)); - p->m_next.reset(m_next.release()); - m_next.reset(p.release()); - m_defaultThrowIfNotUsed = throwIfNotUsed; - return *this; - } - - template - AlgorithmParameters & operator()(const char *name, const T &value) - { - return operator()(name, value, m_defaultThrowIfNotUsed); - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - -protected: - member_ptr m_next; - bool m_defaultThrowIfNotUsed; -}; - -//! Create an object that implements NameValuePairs for passing parameters -/*! \param throwIfNotUsed if true, the object will throw an exception if the value is not accessed - \note throwIfNotUsed is ignored if using a compiler that does not support std::uncaught_exception(), - such as MSVC 7.0 and earlier. - \note A NameValuePairs object containing an arbitrary number of name value pairs may be constructed by - repeatedly using operator() on the object returned by MakeParameters, for example: - AlgorithmParameters parameters = MakeParameters(name1, value1)(name2, value2)(name3, value3); -*/ -#ifdef __BORLANDC__ -typedef AlgorithmParameters MakeParameters; -#else -template -AlgorithmParameters MakeParameters(const char *name, const T &value, bool throwIfNotUsed = true) -{ - return AlgorithmParameters()(name, value, throwIfNotUsed); -} -#endif - -#define CRYPTOPP_GET_FUNCTION_ENTRY(name) (Name::name(), &ThisClass::Get##name) -#define CRYPTOPP_SET_FUNCTION_ENTRY(name) (Name::name(), &ThisClass::Set##name) -#define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2) (Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2) - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.cpp deleted file mode 100644 index b5c27309..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// arc4.cpp - written and placed in the public domain by Wei Dai - -// The ARC4 algorithm was first revealed in an anonymous email to the -// cypherpunks mailing list. This file originally contained some -// code copied from this email. The code has since been rewritten in order -// to clarify the copyright status of this file. It should now be -// completely in the public domain. - -#include "pch.h" -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "arc4.h" - -NAMESPACE_BEGIN(CryptoPP) -namespace Weak1 { - -void ARC4_TestInstantiations() -{ - ARC4 x; -} - -ARC4_Base::~ARC4_Base() -{ - m_x = m_y = 0; -} - -void ARC4_Base::UncheckedSetKey(const byte *key, unsigned int keyLen, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(keyLen); - - m_x = 1; - m_y = 0; - - unsigned int i; - for (i=0; i<256; i++) - m_state[i] = i; - - unsigned int keyIndex = 0, stateIndex = 0; - for (i=0; i<256; i++) - { - unsigned int a = m_state[i]; - stateIndex += key[keyIndex] + a; - stateIndex &= 0xff; - m_state[i] = m_state[stateIndex]; - m_state[stateIndex] = a; - if (++keyIndex >= keyLen) - keyIndex = 0; - } - - int discardBytes = params.GetIntValueWithDefault("DiscardBytes", GetDefaultDiscardBytes()); - DiscardBytes(discardBytes); -} - -template -static inline unsigned int MakeByte(T &x, T &y, byte *s) -{ - unsigned int a = s[x]; - y = (y+a) & 0xff; - unsigned int b = s[y]; - s[x] = b; - s[y] = a; - x = (x+1) & 0xff; - return s[(a+b) & 0xff]; -} - -void ARC4_Base::GenerateBlock(byte *output, size_t size) -{ - while (size--) - *output++ = MakeByte(m_x, m_y, m_state); -} - -void ARC4_Base::ProcessData(byte *outString, const byte *inString, size_t length) -{ - if (length == 0) - return; - - byte *const s = m_state; - unsigned int x = m_x; - unsigned int y = m_y; - - if (inString == outString) - { - do - { - *outString++ ^= MakeByte(x, y, s); - } while (--length); - } - else - { - do - { - *outString++ = *inString++ ^ MakeByte(x, y, s); - } - while(--length); - } - - m_x = x; - m_y = y; -} - -void ARC4_Base::DiscardBytes(size_t length) -{ - if (length == 0) - return; - - byte *const s = m_state; - unsigned int x = m_x; - unsigned int y = m_y; - - do - { - MakeByte(x, y, s); - } - while(--length); - - m_x = x; - m_y = y; -} - -} -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.h deleted file mode 100644 index 9dcc92ef..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/arc4.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef CRYPTOPP_ARC4_H -#define CRYPTOPP_ARC4_H - -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -namespace Weak1 { - -//! _ -class CRYPTOPP_NO_VTABLE ARC4_Base : public VariableKeyLength<16, 1, 256>, public RandomNumberGenerator, public SymmetricCipher, public SymmetricCipherDocumentation -{ -public: - ~ARC4_Base(); - - static const char *StaticAlgorithmName() {return "ARC4";} - - void GenerateBlock(byte *output, size_t size); - void DiscardBytes(size_t n); - - void ProcessData(byte *outString, const byte *inString, size_t length); - - bool IsRandomAccess() const {return false;} - bool IsSelfInverting() const {return true;} - bool IsForwardTransformation() const {return true;} - - typedef SymmetricCipherFinal Encryption; - typedef SymmetricCipherFinal Decryption; - -protected: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - virtual unsigned int GetDefaultDiscardBytes() const {return 0;} - - FixedSizeSecBlock m_state; - byte m_x, m_y; -}; - -//! Alleged RC4 -DOCUMENTED_TYPEDEF(SymmetricCipherFinal, ARC4) - -//! _ -class CRYPTOPP_NO_VTABLE MARC4_Base : public ARC4_Base -{ -public: - static const char *StaticAlgorithmName() {return "MARC4";} - - typedef SymmetricCipherFinal Encryption; - typedef SymmetricCipherFinal Decryption; - -protected: - unsigned int GetDefaultDiscardBytes() const {return 256;} -}; - -//! Modified ARC4: it discards the first 256 bytes of keystream which may be weaker than the rest -DOCUMENTED_TYPEDEF(SymmetricCipherFinal, MARC4) - -} -#if CRYPTOPP_ENABLE_NAMESPACE_WEAK >= 1 -namespace Weak {using namespace Weak1;} // import Weak1 into CryptoPP::Weak -#else -using namespace Weak1; // import Weak1 into CryptoPP with warning -#ifdef __GNUC__ -#warning "You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning." -#else -#pragma message("You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning.") -#endif -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/argnames.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/argnames.h deleted file mode 100644 index e9617252..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/argnames.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef CRYPTOPP_ARGNAMES_H -#define CRYPTOPP_ARGNAMES_H - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -DOCUMENTED_NAMESPACE_BEGIN(Name) - -#define CRYPTOPP_DEFINE_NAME_STRING(name) inline const char *name() {return #name;} - -CRYPTOPP_DEFINE_NAME_STRING(ValueNames) //!< string, a list of value names with a semicolon (';') after each name -CRYPTOPP_DEFINE_NAME_STRING(Version) //!< int -CRYPTOPP_DEFINE_NAME_STRING(Seed) //!< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(Key) //!< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(IV) //!< ConstByteArrayParameter, also accepts const byte * for backwards compatibility -CRYPTOPP_DEFINE_NAME_STRING(StolenIV) //!< byte * -CRYPTOPP_DEFINE_NAME_STRING(Rounds) //!< int -CRYPTOPP_DEFINE_NAME_STRING(FeedbackSize) //!< int -CRYPTOPP_DEFINE_NAME_STRING(WordSize) //!< int, in bytes -CRYPTOPP_DEFINE_NAME_STRING(BlockSize) //!< int, in bytes -CRYPTOPP_DEFINE_NAME_STRING(EffectiveKeyLength) //!< int, in bits -CRYPTOPP_DEFINE_NAME_STRING(KeySize) //!< int, in bits -CRYPTOPP_DEFINE_NAME_STRING(ModulusSize) //!< int, in bits -CRYPTOPP_DEFINE_NAME_STRING(SubgroupOrderSize) //!< int, in bits -CRYPTOPP_DEFINE_NAME_STRING(PrivateExponentSize)//!< int, in bits -CRYPTOPP_DEFINE_NAME_STRING(Modulus) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(PublicExponent) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(PrivateExponent) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(PublicElement) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(SubgroupOrder) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(Cofactor) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(SubgroupGenerator) //!< Integer, ECP::Point, or EC2N::Point -CRYPTOPP_DEFINE_NAME_STRING(Curve) //!< ECP or EC2N -CRYPTOPP_DEFINE_NAME_STRING(GroupOID) //!< OID -CRYPTOPP_DEFINE_NAME_STRING(PointerToPrimeSelector) //!< const PrimeSelector * -CRYPTOPP_DEFINE_NAME_STRING(Prime1) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(Prime2) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(ModPrime1PrivateExponent) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(ModPrime2PrivateExponent) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(MultiplicativeInverseOfPrime2ModPrime1) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(QuadraticResidueModPrime1) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(QuadraticResidueModPrime2) //!< Integer -CRYPTOPP_DEFINE_NAME_STRING(PutMessage) //!< bool -CRYPTOPP_DEFINE_NAME_STRING(TruncatedDigestSize) //!< int -CRYPTOPP_DEFINE_NAME_STRING(BlockPaddingScheme) //!< StreamTransformationFilter::BlockPaddingScheme -CRYPTOPP_DEFINE_NAME_STRING(HashVerificationFilterFlags) //!< word32 -CRYPTOPP_DEFINE_NAME_STRING(AuthenticatedDecryptionFilterFlags) //!< word32 -CRYPTOPP_DEFINE_NAME_STRING(SignatureVerificationFilterFlags) //!< word32 -CRYPTOPP_DEFINE_NAME_STRING(InputBuffer) //!< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(OutputBuffer) //!< ByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(InputFileName) //!< const char * -CRYPTOPP_DEFINE_NAME_STRING(InputFileNameWide) //!< const wchar_t * -CRYPTOPP_DEFINE_NAME_STRING(InputStreamPointer) //!< std::istream * -CRYPTOPP_DEFINE_NAME_STRING(InputBinaryMode) //!< bool -CRYPTOPP_DEFINE_NAME_STRING(OutputFileName) //!< const char * -CRYPTOPP_DEFINE_NAME_STRING(OutputFileNameWide) //!< const wchar_t * -CRYPTOPP_DEFINE_NAME_STRING(OutputStreamPointer) //!< std::ostream * -CRYPTOPP_DEFINE_NAME_STRING(OutputBinaryMode) //!< bool -CRYPTOPP_DEFINE_NAME_STRING(EncodingParameters) //!< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(KeyDerivationParameters) //!< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(Separator) //< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(Terminator) //< ConstByteArrayParameter -CRYPTOPP_DEFINE_NAME_STRING(Uppercase) //< bool -CRYPTOPP_DEFINE_NAME_STRING(GroupSize) //< int -CRYPTOPP_DEFINE_NAME_STRING(Pad) //< bool -CRYPTOPP_DEFINE_NAME_STRING(PaddingByte) //< byte -CRYPTOPP_DEFINE_NAME_STRING(Log2Base) //< int -CRYPTOPP_DEFINE_NAME_STRING(EncodingLookupArray) //< const byte * -CRYPTOPP_DEFINE_NAME_STRING(DecodingLookupArray) //< const byte * -CRYPTOPP_DEFINE_NAME_STRING(InsertLineBreaks) //< bool -CRYPTOPP_DEFINE_NAME_STRING(MaxLineLength) //< int -CRYPTOPP_DEFINE_NAME_STRING(DigestSize) //!< int, in bytes -CRYPTOPP_DEFINE_NAME_STRING(L1KeyLength) //!< int, in bytes -CRYPTOPP_DEFINE_NAME_STRING(TableSize) //!< int, in bytes - -DOCUMENTED_NAMESPACE_END - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.cpp deleted file mode 100644 index 8ae1ad65..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.cpp +++ /dev/null @@ -1,597 +0,0 @@ -// asn.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "asn.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) -USING_NAMESPACE(std) - -/// DER Length -size_t DERLengthEncode(BufferedTransformation &bt, lword length) -{ - size_t i=0; - if (length <= 0x7f) - { - bt.Put(byte(length)); - i++; - } - else - { - bt.Put(byte(BytePrecision(length) | 0x80)); - i++; - for (int j=BytePrecision(length); j; --j) - { - bt.Put(byte(length >> (j-1)*8)); - i++; - } - } - return i; -} - -bool BERLengthDecode(BufferedTransformation &bt, lword &length, bool &definiteLength) -{ - byte b; - - if (!bt.Get(b)) - return false; - - if (!(b & 0x80)) - { - definiteLength = true; - length = b; - } - else - { - unsigned int lengthBytes = b & 0x7f; - - if (lengthBytes == 0) - { - definiteLength = false; - return true; - } - - definiteLength = true; - length = 0; - while (lengthBytes--) - { - if (length >> (8*(sizeof(length)-1))) - BERDecodeError(); // length about to overflow - - if (!bt.Get(b)) - return false; - - length = (length << 8) | b; - } - } - return true; -} - -bool BERLengthDecode(BufferedTransformation &bt, size_t &length) -{ - lword lw; - bool definiteLength; - if (!BERLengthDecode(bt, lw, definiteLength)) - BERDecodeError(); - if (!SafeConvert(lw, length)) - BERDecodeError(); - return definiteLength; -} - -void DEREncodeNull(BufferedTransformation &out) -{ - out.Put(TAG_NULL); - out.Put(0); -} - -void BERDecodeNull(BufferedTransformation &in) -{ - byte b; - if (!in.Get(b) || b != TAG_NULL) - BERDecodeError(); - size_t length; - if (!BERLengthDecode(in, length) || length != 0) - BERDecodeError(); -} - -/// ASN Strings -size_t DEREncodeOctetString(BufferedTransformation &bt, const byte *str, size_t strLen) -{ - bt.Put(OCTET_STRING); - size_t lengthBytes = DERLengthEncode(bt, strLen); - bt.Put(str, strLen); - return 1+lengthBytes+strLen; -} - -size_t DEREncodeOctetString(BufferedTransformation &bt, const SecByteBlock &str) -{ - return DEREncodeOctetString(bt, str.begin(), str.size()); -} - -size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) -{ - byte b; - if (!bt.Get(b) || b != OCTET_STRING) - BERDecodeError(); - - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); - - str.resize(bc); - if (bc != bt.Get(str, bc)) - BERDecodeError(); - return bc; -} - -size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation &str) -{ - byte b; - if (!bt.Get(b) || b != OCTET_STRING) - BERDecodeError(); - - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); - - bt.TransferTo(str, bc); - return bc; -} - -size_t DEREncodeTextString(BufferedTransformation &bt, const std::string &str, byte asnTag) -{ - bt.Put(asnTag); - size_t lengthBytes = DERLengthEncode(bt, str.size()); - bt.Put((const byte *)str.data(), str.size()); - return 1+lengthBytes+str.size(); -} - -size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte asnTag) -{ - byte b; - if (!bt.Get(b) || b != asnTag) - BERDecodeError(); - - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); - - SecByteBlock temp(bc); - if (bc != bt.Get(temp, bc)) - BERDecodeError(); - str.assign((char *)temp.begin(), bc); - return bc; -} - -/// ASN BitString -size_t DEREncodeBitString(BufferedTransformation &bt, const byte *str, size_t strLen, unsigned int unusedBits) -{ - bt.Put(BIT_STRING); - size_t lengthBytes = DERLengthEncode(bt, strLen+1); - bt.Put((byte)unusedBits); - bt.Put(str, strLen); - return 2+lengthBytes+strLen; -} - -size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigned int &unusedBits) -{ - byte b; - if (!bt.Get(b) || b != BIT_STRING) - BERDecodeError(); - - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); - - byte unused; - if (!bt.Get(unused)) - BERDecodeError(); - unusedBits = unused; - str.resize(bc-1); - if ((bc-1) != bt.Get(str, bc-1)) - BERDecodeError(); - return bc-1; -} - -void DERReencode(BufferedTransformation &source, BufferedTransformation &dest) -{ - byte tag; - source.Peek(tag); - BERGeneralDecoder decoder(source, tag); - DERGeneralEncoder encoder(dest, tag); - if (decoder.IsDefiniteLength()) - decoder.TransferTo(encoder, decoder.RemainingLength()); - else - { - while (!decoder.EndReached()) - DERReencode(decoder, encoder); - } - decoder.MessageEnd(); - encoder.MessageEnd(); -} - -void OID::EncodeValue(BufferedTransformation &bt, word32 v) -{ - for (unsigned int i=RoundUpToMultipleOf(STDMAX(7U,BitPrecision(v)), 7U)-7; i != 0; i-=7) - bt.Put((byte)(0x80 | ((v >> i) & 0x7f))); - bt.Put((byte)(v & 0x7f)); -} - -size_t OID::DecodeValue(BufferedTransformation &bt, word32 &v) -{ - byte b; - size_t i=0; - v = 0; - while (true) - { - if (!bt.Get(b)) - BERDecodeError(); - i++; - if (v >> (8*sizeof(v)-7)) // v about to overflow - BERDecodeError(); - v <<= 7; - v += b & 0x7f; - if (!(b & 0x80)) - return i; - } -} - -void OID::DEREncode(BufferedTransformation &bt) const -{ - assert(m_values.size() >= 2); - ByteQueue temp; - temp.Put(byte(m_values[0] * 40 + m_values[1])); - for (size_t i=2; i 0) - { - word32 v; - size_t valueLen = DecodeValue(bt, v); - if (valueLen > length) - BERDecodeError(); - m_values.push_back(v); - length -= valueLen; - } -} - -void OID::BERDecodeAndCheck(BufferedTransformation &bt) const -{ - OID oid(bt); - if (*this != oid) - BERDecodeError(); -} - -inline BufferedTransformation & EncodedObjectFilter::CurrentTarget() -{ - if (m_flags & PUT_OBJECTS) - return *AttachedTransformation(); - else - return TheBitBucket(); -} - -void EncodedObjectFilter::Put(const byte *inString, size_t length) -{ - if (m_nCurrentObject == m_nObjects) - { - AttachedTransformation()->Put(inString, length); - return; - } - - LazyPutter lazyPutter(m_queue, inString, length); - - while (m_queue.AnyRetrievable()) - { - switch (m_state) - { - case IDENTIFIER: - if (!m_queue.Get(m_id)) - return; - m_queue.TransferTo(CurrentTarget(), 1); - m_state = LENGTH; // fall through - case LENGTH: - { - byte b; - if (m_level > 0 && m_id == 0 && m_queue.Peek(b) && b == 0) - { - m_queue.TransferTo(CurrentTarget(), 1); - m_level--; - m_state = IDENTIFIER; - break; - } - ByteQueue::Walker walker(m_queue); - bool definiteLength; - if (!BERLengthDecode(walker, m_lengthRemaining, definiteLength)) - return; - m_queue.TransferTo(CurrentTarget(), walker.GetCurrentPosition()); - if (!((m_id & CONSTRUCTED) || definiteLength)) - BERDecodeError(); - if (!definiteLength) - { - if (!(m_id & CONSTRUCTED)) - BERDecodeError(); - m_level++; - m_state = IDENTIFIER; - break; - } - m_state = BODY; // fall through - } - case BODY: - m_lengthRemaining -= m_queue.TransferTo(CurrentTarget(), m_lengthRemaining); - - if (m_lengthRemaining == 0) - m_state = IDENTIFIER; - } - - if (m_state == IDENTIFIER && m_level == 0) - { - // just finished processing a level 0 object - ++m_nCurrentObject; - - if (m_flags & PUT_MESSANGE_END_AFTER_EACH_OBJECT) - AttachedTransformation()->MessageEnd(); - - if (m_nCurrentObject == m_nObjects) - { - if (m_flags & PUT_MESSANGE_END_AFTER_ALL_OBJECTS) - AttachedTransformation()->MessageEnd(); - - if (m_flags & PUT_MESSANGE_SERIES_END_AFTER_ALL_OBJECTS) - AttachedTransformation()->MessageSeriesEnd(); - - m_queue.TransferAllTo(*AttachedTransformation()); - return; - } - } - } -} - -BERGeneralDecoder::BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTag) - : m_inQueue(inQueue), m_finished(false) -{ - Init(asnTag); -} - -BERGeneralDecoder::BERGeneralDecoder(BERGeneralDecoder &inQueue, byte asnTag) - : m_inQueue(inQueue), m_finished(false) -{ - Init(asnTag); -} - -void BERGeneralDecoder::Init(byte asnTag) -{ - byte b; - if (!m_inQueue.Get(b) || b != asnTag) - BERDecodeError(); - - if (!BERLengthDecode(m_inQueue, m_length, m_definiteLength)) - BERDecodeError(); - - if (!m_definiteLength && !(asnTag & CONSTRUCTED)) - BERDecodeError(); // cannot be primitive and have indefinite length -} - -BERGeneralDecoder::~BERGeneralDecoder() -{ - try // avoid throwing in constructor - { - if (!m_finished) - MessageEnd(); - } - catch (...) - { - } -} - -bool BERGeneralDecoder::EndReached() const -{ - if (m_definiteLength) - return m_length == 0; - else - { // check end-of-content octets - word16 i; - return (m_inQueue.PeekWord16(i)==2 && i==0); - } -} - -byte BERGeneralDecoder::PeekByte() const -{ - byte b; - if (!Peek(b)) - BERDecodeError(); - return b; -} - -void BERGeneralDecoder::CheckByte(byte check) -{ - byte b; - if (!Get(b) || b != check) - BERDecodeError(); -} - -void BERGeneralDecoder::MessageEnd() -{ - m_finished = true; - if (m_definiteLength) - { - if (m_length != 0) - BERDecodeError(); - } - else - { // remove end-of-content octets - word16 i; - if (m_inQueue.GetWord16(i) != 2 || i != 0) - BERDecodeError(); - } -} - -size_t BERGeneralDecoder::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - if (m_definiteLength && transferBytes > m_length) - transferBytes = m_length; - size_t blockedBytes = m_inQueue.TransferTo2(target, transferBytes, channel, blocking); - ReduceLength(transferBytes); - return blockedBytes; -} - -size_t BERGeneralDecoder::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - if (m_definiteLength) - end = STDMIN(m_length, end); - return m_inQueue.CopyRangeTo2(target, begin, end, channel, blocking); -} - -lword BERGeneralDecoder::ReduceLength(lword delta) -{ - if (m_definiteLength) - { - if (m_length < delta) - BERDecodeError(); - m_length -= delta; - } - return delta; -} - -DERGeneralEncoder::DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag) - : m_outQueue(outQueue), m_finished(false), m_asnTag(asnTag) -{ -} - -DERGeneralEncoder::DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag) - : m_outQueue(outQueue), m_finished(false), m_asnTag(asnTag) -{ -} - -DERGeneralEncoder::~DERGeneralEncoder() -{ - try // avoid throwing in constructor - { - if (!m_finished) - MessageEnd(); - } - catch (...) - { - } -} - -void DERGeneralEncoder::MessageEnd() -{ - m_finished = true; - lword length = CurrentSize(); - m_outQueue.Put(m_asnTag); - DERLengthEncode(m_outQueue, length); - TransferTo(m_outQueue); -} - -// ************************************************************* - -void X509PublicKey::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder subjectPublicKeyInfo(bt); - BERSequenceDecoder algorithm(subjectPublicKeyInfo); - GetAlgorithmID().BERDecodeAndCheck(algorithm); - bool parametersPresent = algorithm.EndReached() ? false : BERDecodeAlgorithmParameters(algorithm); - algorithm.MessageEnd(); - - BERGeneralDecoder subjectPublicKey(subjectPublicKeyInfo, BIT_STRING); - subjectPublicKey.CheckByte(0); // unused bits - BERDecodePublicKey(subjectPublicKey, parametersPresent, (size_t)subjectPublicKey.RemainingLength()); - subjectPublicKey.MessageEnd(); - subjectPublicKeyInfo.MessageEnd(); -} - -void X509PublicKey::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder subjectPublicKeyInfo(bt); - - DERSequenceEncoder algorithm(subjectPublicKeyInfo); - GetAlgorithmID().DEREncode(algorithm); - DEREncodeAlgorithmParameters(algorithm); - algorithm.MessageEnd(); - - DERGeneralEncoder subjectPublicKey(subjectPublicKeyInfo, BIT_STRING); - subjectPublicKey.Put(0); // unused bits - DEREncodePublicKey(subjectPublicKey); - subjectPublicKey.MessageEnd(); - - subjectPublicKeyInfo.MessageEnd(); -} - -void PKCS8PrivateKey::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder privateKeyInfo(bt); - word32 version; - BERDecodeUnsigned(privateKeyInfo, version, INTEGER, 0, 0); // check version - - BERSequenceDecoder algorithm(privateKeyInfo); - GetAlgorithmID().BERDecodeAndCheck(algorithm); - bool parametersPresent = algorithm.EndReached() ? false : BERDecodeAlgorithmParameters(algorithm); - algorithm.MessageEnd(); - - BERGeneralDecoder octetString(privateKeyInfo, OCTET_STRING); - BERDecodePrivateKey(octetString, parametersPresent, (size_t)privateKeyInfo.RemainingLength()); - octetString.MessageEnd(); - - if (!privateKeyInfo.EndReached()) - BERDecodeOptionalAttributes(privateKeyInfo); - privateKeyInfo.MessageEnd(); -} - -void PKCS8PrivateKey::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder privateKeyInfo(bt); - DEREncodeUnsigned(privateKeyInfo, 0); // version - - DERSequenceEncoder algorithm(privateKeyInfo); - GetAlgorithmID().DEREncode(algorithm); - DEREncodeAlgorithmParameters(algorithm); - algorithm.MessageEnd(); - - DERGeneralEncoder octetString(privateKeyInfo, OCTET_STRING); - DEREncodePrivateKey(octetString); - octetString.MessageEnd(); - - DEREncodeOptionalAttributes(privateKeyInfo); - privateKeyInfo.MessageEnd(); -} - -void PKCS8PrivateKey::BERDecodeOptionalAttributes(BufferedTransformation &bt) -{ - DERReencode(bt, m_optionalAttributes); -} - -void PKCS8PrivateKey::DEREncodeOptionalAttributes(BufferedTransformation &bt) const -{ - m_optionalAttributes.CopyTo(bt); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.h deleted file mode 100644 index c35126bc..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/asn.h +++ /dev/null @@ -1,369 +0,0 @@ -#ifndef CRYPTOPP_ASN_H -#define CRYPTOPP_ASN_H - -#include "filters.h" -#include "queue.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -// these tags and flags are not complete -enum ASNTag -{ - BOOLEAN = 0x01, - INTEGER = 0x02, - BIT_STRING = 0x03, - OCTET_STRING = 0x04, - TAG_NULL = 0x05, - OBJECT_IDENTIFIER = 0x06, - OBJECT_DESCRIPTOR = 0x07, - EXTERNAL = 0x08, - REAL = 0x09, - ENUMERATED = 0x0a, - UTF8_STRING = 0x0c, - SEQUENCE = 0x10, - SET = 0x11, - NUMERIC_STRING = 0x12, - PRINTABLE_STRING = 0x13, - T61_STRING = 0x14, - VIDEOTEXT_STRING = 0x15, - IA5_STRING = 0x16, - UTC_TIME = 0x17, - GENERALIZED_TIME = 0x18, - GRAPHIC_STRING = 0x19, - VISIBLE_STRING = 0x1a, - GENERAL_STRING = 0x1b -}; - -enum ASNIdFlag -{ - UNIVERSAL = 0x00, -// DATA = 0x01, -// HEADER = 0x02, - CONSTRUCTED = 0x20, - APPLICATION = 0x40, - CONTEXT_SPECIFIC = 0x80, - PRIVATE = 0xc0 -}; - -inline void BERDecodeError() {throw BERDecodeErr();} - -class CRYPTOPP_DLL UnknownOID : public BERDecodeErr -{ -public: - UnknownOID() : BERDecodeErr("BER decode error: unknown object identifier") {} - UnknownOID(const char *err) : BERDecodeErr(err) {} -}; - -// unsigned int DERLengthEncode(unsigned int length, byte *output=0); -CRYPTOPP_DLL size_t CRYPTOPP_API DERLengthEncode(BufferedTransformation &out, lword length); -// returns false if indefinite length -CRYPTOPP_DLL bool CRYPTOPP_API BERLengthDecode(BufferedTransformation &in, size_t &length); - -CRYPTOPP_DLL void CRYPTOPP_API DEREncodeNull(BufferedTransformation &out); -CRYPTOPP_DLL void CRYPTOPP_API BERDecodeNull(BufferedTransformation &in); - -CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeOctetString(BufferedTransformation &out, const byte *str, size_t strLen); -CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeOctetString(BufferedTransformation &out, const SecByteBlock &str); -CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeOctetString(BufferedTransformation &in, SecByteBlock &str); -CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeOctetString(BufferedTransformation &in, BufferedTransformation &str); - -// for UTF8_STRING, PRINTABLE_STRING, and IA5_STRING -CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeTextString(BufferedTransformation &out, const std::string &str, byte asnTag); -CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeTextString(BufferedTransformation &in, std::string &str, byte asnTag); - -CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeBitString(BufferedTransformation &out, const byte *str, size_t strLen, unsigned int unusedBits=0); -CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeBitString(BufferedTransformation &in, SecByteBlock &str, unsigned int &unusedBits); - -// BER decode from source and DER reencode into dest -CRYPTOPP_DLL void CRYPTOPP_API DERReencode(BufferedTransformation &source, BufferedTransformation &dest); - -//! Object Identifier -class CRYPTOPP_DLL OID -{ -public: - OID() {} - OID(word32 v) : m_values(1, v) {} - OID(BufferedTransformation &bt) {BERDecode(bt);} - - inline OID & operator+=(word32 rhs) {m_values.push_back(rhs); return *this;} - - void DEREncode(BufferedTransformation &bt) const; - void BERDecode(BufferedTransformation &bt); - - // throw BERDecodeErr() if decoded value doesn't equal this OID - void BERDecodeAndCheck(BufferedTransformation &bt) const; - - std::vector m_values; - -private: - static void EncodeValue(BufferedTransformation &bt, word32 v); - static size_t DecodeValue(BufferedTransformation &bt, word32 &v); -}; - -class EncodedObjectFilter : public Filter -{ -public: - enum Flag {PUT_OBJECTS=1, PUT_MESSANGE_END_AFTER_EACH_OBJECT=2, PUT_MESSANGE_END_AFTER_ALL_OBJECTS=4, PUT_MESSANGE_SERIES_END_AFTER_ALL_OBJECTS=8}; - EncodedObjectFilter(BufferedTransformation *attachment = NULL, unsigned int nObjects = 1, word32 flags = 0); - - void Put(const byte *inString, size_t length); - - unsigned int GetNumberOfCompletedObjects() const {return m_nCurrentObject;} - unsigned long GetPositionOfObject(unsigned int i) const {return m_positions[i];} - -private: - BufferedTransformation & CurrentTarget(); - - word32 m_flags; - unsigned int m_nObjects, m_nCurrentObject, m_level; - std::vector m_positions; - ByteQueue m_queue; - enum State {IDENTIFIER, LENGTH, BODY, TAIL, ALL_DONE} m_state; - byte m_id; - lword m_lengthRemaining; -}; - -//! BER General Decoder -class CRYPTOPP_DLL BERGeneralDecoder : public Store -{ -public: - explicit BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTag); - explicit BERGeneralDecoder(BERGeneralDecoder &inQueue, byte asnTag); - ~BERGeneralDecoder(); - - bool IsDefiniteLength() const {return m_definiteLength;} - lword RemainingLength() const {assert(m_definiteLength); return m_length;} - bool EndReached() const; - byte PeekByte() const; - void CheckByte(byte b); - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - - // call this to denote end of sequence - void MessageEnd(); - -protected: - BufferedTransformation &m_inQueue; - bool m_finished, m_definiteLength; - lword m_length; - -private: - void Init(byte asnTag); - void StoreInitialize(const NameValuePairs ¶meters) {assert(false);} - lword ReduceLength(lword delta); -}; - -//! DER General Encoder -class CRYPTOPP_DLL DERGeneralEncoder : public ByteQueue -{ -public: - explicit DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED); - explicit DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED); - ~DERGeneralEncoder(); - - // call this to denote end of sequence - void MessageEnd(); - -private: - BufferedTransformation &m_outQueue; - bool m_finished; - - byte m_asnTag; -}; - -//! BER Sequence Decoder -class CRYPTOPP_DLL BERSequenceDecoder : public BERGeneralDecoder -{ -public: - explicit BERSequenceDecoder(BufferedTransformation &inQueue, byte asnTag = SEQUENCE | CONSTRUCTED) - : BERGeneralDecoder(inQueue, asnTag) {} - explicit BERSequenceDecoder(BERSequenceDecoder &inQueue, byte asnTag = SEQUENCE | CONSTRUCTED) - : BERGeneralDecoder(inQueue, asnTag) {} -}; - -//! DER Sequence Encoder -class CRYPTOPP_DLL DERSequenceEncoder : public DERGeneralEncoder -{ -public: - explicit DERSequenceEncoder(BufferedTransformation &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED) - : DERGeneralEncoder(outQueue, asnTag) {} - explicit DERSequenceEncoder(DERSequenceEncoder &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED) - : DERGeneralEncoder(outQueue, asnTag) {} -}; - -//! BER Set Decoder -class CRYPTOPP_DLL BERSetDecoder : public BERGeneralDecoder -{ -public: - explicit BERSetDecoder(BufferedTransformation &inQueue, byte asnTag = SET | CONSTRUCTED) - : BERGeneralDecoder(inQueue, asnTag) {} - explicit BERSetDecoder(BERSetDecoder &inQueue, byte asnTag = SET | CONSTRUCTED) - : BERGeneralDecoder(inQueue, asnTag) {} -}; - -//! DER Set Encoder -class CRYPTOPP_DLL DERSetEncoder : public DERGeneralEncoder -{ -public: - explicit DERSetEncoder(BufferedTransformation &outQueue, byte asnTag = SET | CONSTRUCTED) - : DERGeneralEncoder(outQueue, asnTag) {} - explicit DERSetEncoder(DERSetEncoder &outQueue, byte asnTag = SET | CONSTRUCTED) - : DERGeneralEncoder(outQueue, asnTag) {} -}; - -template -class ASNOptional : public member_ptr -{ -public: - void BERDecode(BERSequenceDecoder &seqDecoder, byte tag, byte mask = ~CONSTRUCTED) - { - byte b; - if (seqDecoder.Peek(b) && (b & mask) == tag) - reset(new T(seqDecoder)); - } - void DEREncode(BufferedTransformation &out) - { - if (this->get() != NULL) - this->get()->DEREncode(out); - } -}; - -//! _ -template -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ASN1CryptoMaterial : public ASN1Object, public BASE -{ -public: - void Save(BufferedTransformation &bt) const - {BEREncode(bt);} - void Load(BufferedTransformation &bt) - {BERDecode(bt);} -}; - -//! encodes/decodes subjectPublicKeyInfo -class CRYPTOPP_DLL X509PublicKey : public ASN1CryptoMaterial -{ -public: - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - virtual OID GetAlgorithmID() const =0; - virtual bool BERDecodeAlgorithmParameters(BufferedTransformation &bt) - {BERDecodeNull(bt); return false;} - virtual bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const - {DEREncodeNull(bt); return false;} // see RFC 2459, section 7.3.1 - - //! decode subjectPublicKey part of subjectPublicKeyInfo, without the BIT STRING header - virtual void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size) =0; - //! encode subjectPublicKey part of subjectPublicKeyInfo, without the BIT STRING header - virtual void DEREncodePublicKey(BufferedTransformation &bt) const =0; -}; - -//! encodes/decodes privateKeyInfo -class CRYPTOPP_DLL PKCS8PrivateKey : public ASN1CryptoMaterial -{ -public: - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - virtual OID GetAlgorithmID() const =0; - virtual bool BERDecodeAlgorithmParameters(BufferedTransformation &bt) - {BERDecodeNull(bt); return false;} - virtual bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const - {DEREncodeNull(bt); return false;} // see RFC 2459, section 7.3.1 - - //! decode privateKey part of privateKeyInfo, without the OCTET STRING header - virtual void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size) =0; - //! encode privateKey part of privateKeyInfo, without the OCTET STRING header - virtual void DEREncodePrivateKey(BufferedTransformation &bt) const =0; - - //! decode optional attributes including context-specific tag - /*! /note default implementation stores attributes to be output in DEREncodeOptionalAttributes */ - virtual void BERDecodeOptionalAttributes(BufferedTransformation &bt); - //! encode optional attributes including context-specific tag - virtual void DEREncodeOptionalAttributes(BufferedTransformation &bt) const; - -protected: - ByteQueue m_optionalAttributes; -}; - -// ******************************************************** - -//! DER Encode Unsigned -/*! for INTEGER, BOOLEAN, and ENUM */ -template -size_t DEREncodeUnsigned(BufferedTransformation &out, T w, byte asnTag = INTEGER) -{ - byte buf[sizeof(w)+1]; - unsigned int bc; - if (asnTag == BOOLEAN) - { - buf[sizeof(w)] = w ? 0xff : 0; - bc = 1; - } - else - { - buf[0] = 0; - for (unsigned int i=0; i> (sizeof(w)-1-i)*8); - bc = sizeof(w); - while (bc > 1 && buf[sizeof(w)+1-bc] == 0) - --bc; - if (buf[sizeof(w)+1-bc] & 0x80) - ++bc; - } - out.Put(asnTag); - size_t lengthBytes = DERLengthEncode(out, bc); - out.Put(buf+sizeof(w)+1-bc, bc); - return 1+lengthBytes+bc; -} - -//! BER Decode Unsigned -// VC60 workaround: std::numeric_limits::max conflicts with MFC max macro -// CW41 workaround: std::numeric_limits::max causes a template error -template -void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, - T minValue = 0, T maxValue = 0xffffffff) -{ - byte b; - if (!in.Get(b) || b != asnTag) - BERDecodeError(); - - size_t bc; - BERLengthDecode(in, bc); - - SecByteBlock buf(bc); - - if (bc != in.Get(buf, bc)) - BERDecodeError(); - - const byte *ptr = buf; - while (bc > sizeof(w) && *ptr == 0) - { - bc--; - ptr++; - } - if (bc > sizeof(w)) - BERDecodeError(); - - w = 0; - for (unsigned int i=0; i maxValue) - BERDecodeError(); -} - -inline bool operator==(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs) - {return lhs.m_values == rhs.m_values;} -inline bool operator!=(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs) - {return lhs.m_values != rhs.m_values;} -inline bool operator<(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs) - {return std::lexicographical_compare(lhs.m_values.begin(), lhs.m_values.end(), rhs.m_values.begin(), rhs.m_values.end());} -inline ::CryptoPP::OID operator+(const ::CryptoPP::OID &lhs, unsigned long rhs) - {return ::CryptoPP::OID(lhs)+=rhs;} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.cpp deleted file mode 100644 index 0ca5da60..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.cpp +++ /dev/null @@ -1,180 +0,0 @@ -// authenc.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "authenc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void AuthenticatedSymmetricCipherBase::AuthenticateData(const byte *input, size_t len) -{ - unsigned int blockSize = AuthenticationBlockSize(); - unsigned int &num = m_bufferedDataLength; - byte* data = m_buffer.begin(); - - if (num != 0) // process left over data - { - if (num+len >= blockSize) - { - memcpy(data+num, input, blockSize-num); - AuthenticateBlocks(data, blockSize); - input += (blockSize-num); - len -= (blockSize-num); - num = 0; - // drop through and do the rest - } - else - { - memcpy(data+num, input, len); - num += (unsigned int)len; - return; - } - } - - // now process the input data in blocks of blockSize bytes and save the leftovers to m_data - if (len >= blockSize) - { - size_t leftOver = AuthenticateBlocks(input, len); - input += (len - leftOver); - len = leftOver; - } - - memcpy(data, input, len); - num = (unsigned int)len; -} - -void AuthenticatedSymmetricCipherBase::SetKey(const byte *userKey, size_t keylength, const NameValuePairs ¶ms) -{ - m_bufferedDataLength = 0; - m_state = State_Start; - - SetKeyWithoutResync(userKey, keylength, params); - m_state = State_KeySet; - - size_t length; - const byte *iv = GetIVAndThrowIfInvalid(params, length); - if (iv) - Resynchronize(iv, (int)length); -} - -void AuthenticatedSymmetricCipherBase::Resynchronize(const byte *iv, int length) -{ - if (m_state < State_KeySet) - throw BadState(AlgorithmName(), "Resynchronize", "key is set"); - - m_bufferedDataLength = 0; - m_totalHeaderLength = m_totalMessageLength = m_totalFooterLength = 0; - m_state = State_KeySet; - - Resync(iv, this->ThrowIfInvalidIVLength(length)); - m_state = State_IVSet; -} - -void AuthenticatedSymmetricCipherBase::Update(const byte *input, size_t length) -{ - if (length == 0) - return; - - switch (m_state) - { - case State_Start: - case State_KeySet: - throw BadState(AlgorithmName(), "Update", "setting key and IV"); - case State_IVSet: - AuthenticateData(input, length); - m_totalHeaderLength += length; - break; - case State_AuthUntransformed: - case State_AuthTransformed: - AuthenticateLastConfidentialBlock(); - m_bufferedDataLength = 0; - m_state = State_AuthFooter; - // fall through - case State_AuthFooter: - AuthenticateData(input, length); - m_totalFooterLength += length; - break; - default: - assert(false); - } -} - -void AuthenticatedSymmetricCipherBase::ProcessData(byte *outString, const byte *inString, size_t length) -{ - m_totalMessageLength += length; - if (m_state >= State_IVSet && m_totalMessageLength > MaxMessageLength()) - throw InvalidArgument(AlgorithmName() + ": message length exceeds maximum"); - -reswitch: - switch (m_state) - { - case State_Start: - case State_KeySet: - throw BadState(AlgorithmName(), "ProcessData", "setting key and IV"); - case State_AuthFooter: - throw BadState(AlgorithmName(), "ProcessData was called after footer input has started"); - case State_IVSet: - AuthenticateLastHeaderBlock(); - m_bufferedDataLength = 0; - m_state = AuthenticationIsOnPlaintext()==IsForwardTransformation() ? State_AuthUntransformed : State_AuthTransformed; - goto reswitch; - case State_AuthUntransformed: - AuthenticateData(inString, length); - AccessSymmetricCipher().ProcessData(outString, inString, length); - break; - case State_AuthTransformed: - AccessSymmetricCipher().ProcessData(outString, inString, length); - AuthenticateData(outString, length); - break; - default: - assert(false); - } -} - -void AuthenticatedSymmetricCipherBase::TruncatedFinal(byte *mac, size_t macSize) -{ - if (m_totalHeaderLength > MaxHeaderLength()) - throw InvalidArgument(AlgorithmName() + ": header length of " + IntToString(m_totalHeaderLength) + " exceeds the maximum of " + IntToString(MaxHeaderLength())); - - if (m_totalFooterLength > MaxFooterLength()) - { - if (MaxFooterLength() == 0) - throw InvalidArgument(AlgorithmName() + ": additional authenticated data (AAD) cannot be input after data to be encrypted or decrypted"); - else - throw InvalidArgument(AlgorithmName() + ": footer length of " + IntToString(m_totalFooterLength) + " exceeds the maximum of " + IntToString(MaxFooterLength())); - } - - switch (m_state) - { - case State_Start: - case State_KeySet: - throw BadState(AlgorithmName(), "TruncatedFinal", "setting key and IV"); - - case State_IVSet: - AuthenticateLastHeaderBlock(); - m_bufferedDataLength = 0; - // fall through - - case State_AuthUntransformed: - case State_AuthTransformed: - AuthenticateLastConfidentialBlock(); - m_bufferedDataLength = 0; - // fall through - - case State_AuthFooter: - AuthenticateLastFooterBlock(mac, macSize); - m_bufferedDataLength = 0; - break; - - default: - assert(false); - } - - m_state = State_KeySet; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.h deleted file mode 100644 index f726716e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/authenc.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef CRYPTOPP_AUTHENC_H -#define CRYPTOPP_AUTHENC_H - -#include "cryptlib.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! . -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedSymmetricCipherBase : public AuthenticatedSymmetricCipher -{ -public: - AuthenticatedSymmetricCipherBase() : m_state(State_Start) {} - - bool IsRandomAccess() const {return false;} - bool IsSelfInverting() const {return true;} - void UncheckedSetKey(const byte *,unsigned int,const CryptoPP::NameValuePairs &) {assert(false);} - - void SetKey(const byte *userKey, size_t keylength, const NameValuePairs ¶ms); - void Restart() {if (m_state > State_KeySet) m_state = State_KeySet;} - void Resynchronize(const byte *iv, int length=-1); - void Update(const byte *input, size_t length); - void ProcessData(byte *outString, const byte *inString, size_t length); - void TruncatedFinal(byte *mac, size_t macSize); - -protected: - void AuthenticateData(const byte *data, size_t len); - const SymmetricCipher & GetSymmetricCipher() const {return const_cast(this)->AccessSymmetricCipher();}; - - virtual SymmetricCipher & AccessSymmetricCipher() =0; - virtual bool AuthenticationIsOnPlaintext() const =0; - virtual unsigned int AuthenticationBlockSize() const =0; - virtual void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms) =0; - virtual void Resync(const byte *iv, size_t len) =0; - virtual size_t AuthenticateBlocks(const byte *data, size_t len) =0; - virtual void AuthenticateLastHeaderBlock() =0; - virtual void AuthenticateLastConfidentialBlock() {} - virtual void AuthenticateLastFooterBlock(byte *mac, size_t macSize) =0; - - enum State {State_Start, State_KeySet, State_IVSet, State_AuthUntransformed, State_AuthTransformed, State_AuthFooter}; - State m_state; - unsigned int m_bufferedDataLength; - lword m_totalHeaderLength, m_totalMessageLength, m_totalFooterLength; - AlignedSecByteBlock m_buffer; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.cpp deleted file mode 100644 index 0568f072..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// base32.cpp - written and placed in the public domain by Frank Palazzolo, based on hex.cpp by Wei Dai - -#include "pch.h" -#include "base32.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const byte s_vecUpper[] = "ABCDEFGHIJKMNPQRSTUVWXYZ23456789"; -static const byte s_vecLower[] = "abcdefghijkmnpqrstuvwxyz23456789"; - -void Base32Encoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - bool uppercase = parameters.GetValueWithDefault(Name::Uppercase(), true); - m_filter->Initialize(CombinedNameValuePairs( - parameters, - MakeParameters(Name::EncodingLookupArray(), uppercase ? &s_vecUpper[0] : &s_vecLower[0], false)(Name::Log2Base(), 5, true))); -} - -void Base32Decoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - BaseN_Decoder::Initialize(CombinedNameValuePairs( - parameters, - MakeParameters(Name::DecodingLookupArray(), GetDefaultDecodingLookupArray(), false)(Name::Log2Base(), 5, true))); -} - -const int *Base32Decoder::GetDefaultDecodingLookupArray() -{ - static volatile bool s_initialized = false; - static int s_array[256]; - - if (!s_initialized) - { - InitializeDecodingLookupArray(s_array, s_vecUpper, 32, true); - s_initialized = true; - } - return s_array; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.h deleted file mode 100644 index cb1e1af8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/base32.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef CRYPTOPP_BASE32_H -#define CRYPTOPP_BASE32_H - -#include "basecode.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Converts given data to base 32, the default code is based on draft-ietf-idn-dude-02.txt -/*! To specify alternative code, call Initialize() with EncodingLookupArray parameter. */ -class Base32Encoder : public SimpleProxyFilter -{ -public: - Base32Encoder(BufferedTransformation *attachment = NULL, bool uppercase = true, int outputGroupSize = 0, const std::string &separator = ":", const std::string &terminator = "") - : SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment) - { - IsolatedInitialize(MakeParameters(Name::Uppercase(), uppercase)(Name::GroupSize(), outputGroupSize)(Name::Separator(), ConstByteArrayParameter(separator))); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); -}; - -//! Decode base 32 data back to bytes, the default code is based on draft-ietf-idn-dude-02.txt -/*! To specify alternative code, call Initialize() with DecodingLookupArray parameter. */ -class Base32Decoder : public BaseN_Decoder -{ -public: - Base32Decoder(BufferedTransformation *attachment = NULL) - : BaseN_Decoder(GetDefaultDecodingLookupArray(), 5, attachment) {} - - void IsolatedInitialize(const NameValuePairs ¶meters); - -private: - static const int * CRYPTOPP_API GetDefaultDecodingLookupArray(); -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.cpp deleted file mode 100644 index 7571f2b8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// base64.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "base64.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const byte s_vec[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const byte s_padding = '='; - -void Base64Encoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - bool insertLineBreaks = parameters.GetValueWithDefault(Name::InsertLineBreaks(), true); - int maxLineLength = parameters.GetIntValueWithDefault(Name::MaxLineLength(), 72); - - const char *lineBreak = insertLineBreaks ? "\n" : ""; - - m_filter->Initialize(CombinedNameValuePairs( - parameters, - MakeParameters(Name::EncodingLookupArray(), &s_vec[0], false) - (Name::PaddingByte(), s_padding) - (Name::GroupSize(), insertLineBreaks ? maxLineLength : 0) - (Name::Separator(), ConstByteArrayParameter(lineBreak)) - (Name::Terminator(), ConstByteArrayParameter(lineBreak)) - (Name::Log2Base(), 6, true))); -} - -const int *Base64Decoder::GetDecodingLookupArray() -{ - static volatile bool s_initialized = false; - static int s_array[256]; - - if (!s_initialized) - { - InitializeDecodingLookupArray(s_array, s_vec, 64, false); - s_initialized = true; - } - return s_array; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.h deleted file mode 100644 index 5a9e184b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/base64.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef CRYPTOPP_BASE64_H -#define CRYPTOPP_BASE64_H - -#include "basecode.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Base64 Encoder Class -class Base64Encoder : public SimpleProxyFilter -{ -public: - Base64Encoder(BufferedTransformation *attachment = NULL, bool insertLineBreaks = true, int maxLineLength = 72) - : SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment) - { - IsolatedInitialize(MakeParameters(Name::InsertLineBreaks(), insertLineBreaks)(Name::MaxLineLength(), maxLineLength)); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); -}; - -//! Base64 Decoder Class -class Base64Decoder : public BaseN_Decoder -{ -public: - Base64Decoder(BufferedTransformation *attachment = NULL) - : BaseN_Decoder(GetDecodingLookupArray(), 6, attachment) {} - - void IsolatedInitialize(const NameValuePairs ¶meters) {} - -private: - static const int * CRYPTOPP_API GetDecodingLookupArray(); -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/basecode.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/basecode.cpp deleted file mode 100644 index 0c98b227..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/basecode.cpp +++ /dev/null @@ -1,238 +0,0 @@ -// basecode.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "basecode.h" -#include "fltrimpl.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -void BaseN_Encoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - parameters.GetRequiredParameter("BaseN_Encoder", Name::EncodingLookupArray(), m_alphabet); - - parameters.GetRequiredIntParameter("BaseN_Encoder", Name::Log2Base(), m_bitsPerChar); - if (m_bitsPerChar <= 0 || m_bitsPerChar >= 8) - throw InvalidArgument("BaseN_Encoder: Log2Base must be between 1 and 7 inclusive"); - - byte padding; - bool pad; - if (parameters.GetValue(Name::PaddingByte(), padding)) - pad = parameters.GetValueWithDefault(Name::Pad(), true); - else - pad = false; - m_padding = pad ? padding : -1; - - m_bytePos = m_bitPos = 0; - - int i = 8; - while (i%m_bitsPerChar != 0) - i += 8; - m_outputBlockSize = i/m_bitsPerChar; - - m_outBuf.New(m_outputBlockSize); -} - -size_t BaseN_Encoder::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - FILTER_BEGIN; - while (m_inputPosition < length) - { - if (m_bytePos == 0) - memset(m_outBuf, 0, m_outputBlockSize); - - { - unsigned int b = begin[m_inputPosition++], bitsLeftInSource = 8; - while (true) - { - assert(m_bitPos < m_bitsPerChar); - unsigned int bitsLeftInTarget = m_bitsPerChar-m_bitPos; - m_outBuf[m_bytePos] |= b >> (8-bitsLeftInTarget); - if (bitsLeftInSource >= bitsLeftInTarget) - { - m_bitPos = 0; - ++m_bytePos; - bitsLeftInSource -= bitsLeftInTarget; - if (bitsLeftInSource == 0) - break; - b <<= bitsLeftInTarget; - b &= 0xff; - } - else - { - m_bitPos += bitsLeftInSource; - break; - } - } - } - - assert(m_bytePos <= m_outputBlockSize); - if (m_bytePos == m_outputBlockSize) - { - int i; - for (i=0; i 0) - ++m_bytePos; - - int i; - for (i=0; i 0) - { - memset(m_outBuf+m_bytePos, m_padding, m_outputBlockSize-m_bytePos); - m_bytePos = m_outputBlockSize; - } - FILTER_OUTPUT(2, m_outBuf, m_bytePos, messageEnd); - m_bytePos = m_bitPos = 0; - } - FILTER_END_NO_MESSAGE_END; -} - -void BaseN_Decoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - parameters.GetRequiredParameter("BaseN_Decoder", Name::DecodingLookupArray(), m_lookup); - - parameters.GetRequiredIntParameter("BaseN_Decoder", Name::Log2Base(), m_bitsPerChar); - if (m_bitsPerChar <= 0 || m_bitsPerChar >= 8) - throw InvalidArgument("BaseN_Decoder: Log2Base must be between 1 and 7 inclusive"); - - m_bytePos = m_bitPos = 0; - - int i = m_bitsPerChar; - while (i%8 != 0) - i += m_bitsPerChar; - m_outputBlockSize = i/8; - - m_outBuf.New(m_outputBlockSize); -} - -size_t BaseN_Decoder::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - FILTER_BEGIN; - while (m_inputPosition < length) - { - unsigned int value; - value = m_lookup[begin[m_inputPosition++]]; - if (value >= 256) - continue; - - if (m_bytePos == 0 && m_bitPos == 0) - memset(m_outBuf, 0, m_outputBlockSize); - - { - int newBitPos = m_bitPos + m_bitsPerChar; - if (newBitPos <= 8) - m_outBuf[m_bytePos] |= value << (8-newBitPos); - else - { - m_outBuf[m_bytePos] |= value >> (newBitPos-8); - m_outBuf[m_bytePos+1] |= value << (16-newBitPos); - } - - m_bitPos = newBitPos; - while (m_bitPos >= 8) - { - m_bitPos -= 8; - ++m_bytePos; - } - } - - if (m_bytePos == m_outputBlockSize) - { - FILTER_OUTPUT(1, m_outBuf, m_outputBlockSize, 0); - m_bytePos = m_bitPos = 0; - } - } - if (messageEnd) - { - FILTER_OUTPUT(2, m_outBuf, m_bytePos, messageEnd); - m_bytePos = m_bitPos = 0; - } - FILTER_END_NO_MESSAGE_END; -} - -void BaseN_Decoder::InitializeDecodingLookupArray(int *lookup, const byte *alphabet, unsigned int base, bool caseInsensitive) -{ - std::fill(lookup, lookup+256, -1); - - for (unsigned int i=0; i -{ -public: - BaseN_Encoder(BufferedTransformation *attachment=NULL) - {Detach(attachment);} - - BaseN_Encoder(const byte *alphabet, int log2base, BufferedTransformation *attachment=NULL, int padding=-1) - { - Detach(attachment); - IsolatedInitialize(MakeParameters(Name::EncodingLookupArray(), alphabet) - (Name::Log2Base(), log2base) - (Name::Pad(), padding != -1) - (Name::PaddingByte(), byte(padding))); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - -private: - const byte *m_alphabet; - int m_padding, m_bitsPerChar, m_outputBlockSize; - int m_bytePos, m_bitPos; - SecByteBlock m_outBuf; -}; - -//! base n decoder, where n is a power of 2 -class CRYPTOPP_DLL BaseN_Decoder : public Unflushable -{ -public: - BaseN_Decoder(BufferedTransformation *attachment=NULL) - {Detach(attachment);} - - BaseN_Decoder(const int *lookup, int log2base, BufferedTransformation *attachment=NULL) - { - Detach(attachment); - IsolatedInitialize(MakeParameters(Name::DecodingLookupArray(), lookup)(Name::Log2Base(), log2base)); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - - static void CRYPTOPP_API InitializeDecodingLookupArray(int *lookup, const byte *alphabet, unsigned int base, bool caseInsensitive); - -private: - const int *m_lookup; - int m_padding, m_bitsPerChar, m_outputBlockSize; - int m_bytePos, m_bitPos; - SecByteBlock m_outBuf; -}; - -//! filter that breaks input stream into groups of fixed size -class CRYPTOPP_DLL Grouper : public Bufferless -{ -public: - Grouper(BufferedTransformation *attachment=NULL) - {Detach(attachment);} - - Grouper(int groupSize, const std::string &separator, const std::string &terminator, BufferedTransformation *attachment=NULL) - { - Detach(attachment); - IsolatedInitialize(MakeParameters(Name::GroupSize(), groupSize) - (Name::Separator(), ConstByteArrayParameter(separator)) - (Name::Terminator(), ConstByteArrayParameter(terminator))); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - -private: - SecByteBlock m_separator, m_terminator; - size_t m_groupSize, m_counter; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.cpp deleted file mode 100644 index b39386d6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.cpp +++ /dev/null @@ -1,339 +0,0 @@ -// bench.cpp - written and placed in the public domain by Wei Dai - -#define _CRT_SECURE_NO_DEPRECATE - -#include "bench.h" -#include "validate.h" -#include "aes.h" -#include "blumshub.h" -#include "files.h" -#include "hex.h" -#include "modes.h" -#include "factory.h" -#include "cpu.h" - -#include -#include -#include -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -#ifdef CLOCKS_PER_SEC -const double CLOCK_TICKS_PER_SECOND = (double)CLOCKS_PER_SEC; -#elif defined(CLK_TCK) -const double CLOCK_TICKS_PER_SECOND = (double)CLK_TCK; -#else -const double CLOCK_TICKS_PER_SECOND = 1000000.0; -#endif - -double logtotal = 0, g_allocatedTime, g_hertz; -unsigned int logcount = 0; - -static const byte *const key=(byte *)"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; - -void OutputResultBytes(const char *name, double length, double timeTaken) -{ - double mbs = length / timeTaken / (1024*1024); - cout << "\n" << name; -// cout << "" << setprecision(3) << length / (1024*1024); - cout << setiosflags(ios::fixed); -// cout << "" << setprecision(3) << timeTaken; - cout << "" << setprecision(0) << setiosflags(ios::fixed) << mbs; - if (g_hertz) - cout << "" << setprecision(1) << setiosflags(ios::fixed) << timeTaken * g_hertz / length; - cout << resetiosflags(ios::fixed); - logtotal += log(mbs); - logcount++; -} - -void OutputResultKeying(double iterations, double timeTaken) -{ - cout << "" << setprecision(3) << setiosflags(ios::fixed) << (1000*1000*timeTaken/iterations); - if (g_hertz) - cout << "" << setprecision(0) << setiosflags(ios::fixed) << timeTaken * g_hertz / iterations; -} - -void OutputResultOperations(const char *name, const char *operation, bool pc, unsigned long iterations, double timeTaken) -{ - cout << "\n" << name << " " << operation << (pc ? " with precomputation" : ""); -// cout << "" << iterations; -// cout << setiosflags(ios::fixed); -// cout << "" << setprecision(3) << timeTaken; - cout << "" << setprecision(2) << setiosflags(ios::fixed) << (1000*timeTaken/iterations); - if (g_hertz) - cout << "" << setprecision(2) << setiosflags(ios::fixed) << timeTaken * g_hertz / iterations / 1000000; - cout << resetiosflags(ios::fixed); - - logtotal += log(iterations/timeTaken); - logcount++; -} - -/* -void BenchMark(const char *name, BlockTransformation &cipher, double timeTotal) -{ - const int BUF_SIZE = RoundUpToMultipleOf(2048U, cipher.OptimalNumberOfParallelBlocks() * cipher.BlockSize()); - AlignedSecByteBlock buf(BUF_SIZE); - const int nBlocks = BUF_SIZE / cipher.BlockSize(); - clock_t start = clock(); - - unsigned long i=0, blocks=1; - double timeTaken; - do - { - blocks *= 2; - for (; i(cipher), timeTotal); -} - -void BenchMark(const char *name, HashTransformation &ht, double timeTotal) -{ - const int BUF_SIZE=2048U; - AlignedSecByteBlock buf(BUF_SIZE); - GlobalRNG().GenerateBlock(buf, BUF_SIZE); - clock_t start = clock(); - - unsigned long i=0, blocks=1; - double timeTaken; - do - { - blocks *= 2; - for (; i -void BenchMarkByName2(const char *factoryName, size_t keyLength = 0, const char *displayName=NULL, const NameValuePairs ¶ms = g_nullNameValuePairs, T_FactoryOutput *x=NULL, T_Interface *y=NULL) -{ - std::string name = factoryName; - if (displayName) - name = displayName; - else if (keyLength) - name += " (" + IntToString(keyLength * 8) + "-bit key)"; - - std::auto_ptr obj(ObjectFactoryRegistry::Registry().CreateObject(factoryName)); - if (!keyLength) - keyLength = obj->DefaultKeyLength(); - obj->SetKey(key, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(key, obj->IVSize()), false))); - BenchMark(name.c_str(), *static_cast(obj.get()), g_allocatedTime); - BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(key, obj->IVSize()), false))); -} - -//VC60 workaround: compiler bug triggered without the extra dummy parameters -template -void BenchMarkByName(const char *factoryName, size_t keyLength = 0, const char *displayName=NULL, const NameValuePairs ¶ms = g_nullNameValuePairs, T_FactoryOutput *x=NULL) -{ - BenchMarkByName2(factoryName, keyLength, displayName, params, x, x); -} - -template -void BenchMarkByNameKeyLess(const char *factoryName, const char *displayName=NULL, const NameValuePairs ¶ms = g_nullNameValuePairs, T *x=NULL) -{ - std::string name = factoryName; - if (displayName) - name = displayName; - - std::auto_ptr obj(ObjectFactoryRegistry::Registry().CreateObject(factoryName)); - BenchMark(name.c_str(), *obj, g_allocatedTime); -} - -void BenchmarkAll(double t, double hertz) -{ -#if 1 - logtotal = 0; - logcount = 0; - g_allocatedTime = t; - g_hertz = hertz; - - const char *cpb, *cpk; - if (g_hertz) - { - cpb = "Cycles Per Byte"; - cpk = "Cycles to
Setup Key and IV"; - cout << "CPU frequency of the test platform is " << g_hertz << " Hz.\n"; - } - else - { - cpb = cpk = ""; - cout << "CPU frequency of the test platform was not provided.\n"; - } - - cout << "" << endl; - cout << ""; -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasCLMUL()) - BenchMarkByName2("AES/GCM", 0, "AES/GCM"); - else -#endif - { - BenchMarkByName2("AES/GCM", 0, "AES/GCM (2K tables)", MakeParameters(Name::TableSize(), 2048)); - BenchMarkByName2("AES/GCM", 0, "AES/GCM (64K tables)", MakeParameters(Name::TableSize(), 64*1024)); - } - BenchMarkByName2("AES/CCM"); - BenchMarkByName2("AES/EAX"); - - cout << "\n"; -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasCLMUL()) - BenchMarkByName2("AES/GCM", 0, "GMAC(AES)"); - else -#endif - { - BenchMarkByName2("AES/GCM", 0, "GMAC(AES) (2K tables)", MakeParameters(Name::TableSize(), 2048)); - BenchMarkByName2("AES/GCM", 0, "GMAC(AES) (64K tables)", MakeParameters(Name::TableSize(), 64*1024)); - } - BenchMarkByName("VMAC(AES)-64"); - BenchMarkByName("VMAC(AES)-128"); - BenchMarkByName("HMAC(SHA-1)"); - BenchMarkByName("Two-Track-MAC"); - BenchMarkByName("CMAC(AES)"); - BenchMarkByName("DMAC(AES)"); - - cout << "\n"; - BenchMarkByNameKeyLess("CRC32"); - BenchMarkByNameKeyLess("Adler32"); - BenchMarkByNameKeyLess("MD5"); - BenchMarkByNameKeyLess("SHA-1"); - BenchMarkByNameKeyLess("SHA-256"); - BenchMarkByNameKeyLess("SHA-512"); - BenchMarkByNameKeyLess("Tiger"); - BenchMarkByNameKeyLess("Whirlpool"); - BenchMarkByNameKeyLess("RIPEMD-160"); - BenchMarkByNameKeyLess("RIPEMD-320"); - BenchMarkByNameKeyLess("RIPEMD-128"); - BenchMarkByNameKeyLess("RIPEMD-256"); - - cout << "\n"; - BenchMarkByName("Panama-LE"); - BenchMarkByName("Panama-BE"); - BenchMarkByName("Salsa20"); - BenchMarkByName("Salsa20", 0, "Salsa20/12", MakeParameters(Name::Rounds(), 12)); - BenchMarkByName("Salsa20", 0, "Salsa20/8", MakeParameters(Name::Rounds(), 8)); - BenchMarkByName("Sosemanuk"); - BenchMarkByName("MARC4"); - BenchMarkByName("SEAL-3.0-LE"); - BenchMarkByName("WAKE-OFB-LE"); - - cout << "\n"; - BenchMarkByName("AES/CTR", 16); - BenchMarkByName("AES/CTR", 24); - BenchMarkByName("AES/CTR", 32); - BenchMarkByName("AES/CBC", 16); - BenchMarkByName("AES/CBC", 24); - BenchMarkByName("AES/CBC", 32); - BenchMarkByName("AES/OFB", 16); - BenchMarkByName("AES/CFB", 16); - BenchMarkByName("AES/ECB", 16); - BenchMarkByName("Camellia/CTR", 16); - BenchMarkByName("Camellia/CTR", 32); - BenchMarkByName("Twofish/CTR"); - BenchMarkByName("Serpent/CTR"); - BenchMarkByName("CAST-256/CTR"); - BenchMarkByName("RC6/CTR"); - BenchMarkByName("MARS/CTR"); - BenchMarkByName("SHACAL-2/CTR", 16); - BenchMarkByName("SHACAL-2/CTR", 64); - BenchMarkByName("DES/CTR"); - BenchMarkByName("DES-XEX3/CTR"); - BenchMarkByName("DES-EDE3/CTR"); - BenchMarkByName("IDEA/CTR"); - BenchMarkByName("RC5/CTR", 0, "RC5 (r=16)"); - BenchMarkByName("Blowfish/CTR"); - BenchMarkByName("TEA/CTR"); - BenchMarkByName("XTEA/CTR"); - BenchMarkByName("CAST-128/CTR"); - BenchMarkByName("SKIPJACK/CTR"); - BenchMarkByName("SEED/CTR", 0, "SEED/CTR (1/2 K table)"); - cout << "
AlgorithmMiB/Second" << cpb << "Microseconds to
Setup Key and IV" << cpk << endl; - - cout << "\n
" << endl; - - BenchmarkAll2(t, hertz); - - cout << "Throughput Geometric Average: " << setiosflags(ios::fixed) << exp(logtotal/logcount) << endl; - - time_t endTime = time(NULL); - cout << "\nTest ended at " << asctime(localtime(&endTime)); -#endif -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.h deleted file mode 100644 index 8bb6ab96..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef CRYPTOPP_BENCH_H -#define CRYPTOPP_BENCH_H - -#include "cryptlib.h" - -extern const double CLOCK_TICKS_PER_SECOND; - -void BenchmarkAll(double t, double hertz); -void BenchmarkAll2(double t, double hertz); - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/bench2.cpp deleted file mode 100644 index 26c0f1f9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/bench2.cpp +++ /dev/null @@ -1,317 +0,0 @@ -// bench2.cpp - written and placed in the public domain by Wei Dai - -#include "bench.h" -#include "validate.h" -#include "files.h" -#include "hex.h" - -#include "rsa.h" -#include "nr.h" -#include "dsa.h" -#include "luc.h" -#include "rw.h" -#include "eccrypto.h" -#include "ecp.h" -#include "ec2n.h" -#include "asn.h" -#include "dh.h" -#include "mqv.h" -#include "xtrcrypt.h" -#include "esign.h" -#include "pssr.h" -#include "oids.h" -#include "randpool.h" - -#include -#include -#include -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -void OutputResultOperations(const char *name, const char *operation, bool pc, unsigned long iterations, double timeTaken); - -void BenchMarkEncryption(const char *name, PK_Encryptor &key, double timeTotal, bool pc=false) -{ - unsigned int len = 16; - SecByteBlock plaintext(len), ciphertext(key.CiphertextLength(len)); - GlobalRNG().GenerateBlock(plaintext, len); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - key.Encrypt(GlobalRNG(), plaintext, len, ciphertext); - - OutputResultOperations(name, "Encryption", pc, i, timeTaken); - - if (!pc && key.GetMaterial().SupportsPrecomputation()) - { - key.AccessMaterial().Precompute(16); - BenchMarkEncryption(name, key, timeTotal, true); - } -} - -void BenchMarkDecryption(const char *name, PK_Decryptor &priv, PK_Encryptor &pub, double timeTotal) -{ - unsigned int len = 16; - SecByteBlock ciphertext(pub.CiphertextLength(len)); - SecByteBlock plaintext(pub.MaxPlaintextLength(ciphertext.size())); - GlobalRNG().GenerateBlock(plaintext, len); - pub.Encrypt(GlobalRNG(), plaintext, len, ciphertext); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - priv.Decrypt(GlobalRNG(), ciphertext, ciphertext.size(), plaintext); - - OutputResultOperations(name, "Decryption", false, i, timeTaken); -} - -void BenchMarkSigning(const char *name, PK_Signer &key, double timeTotal, bool pc=false) -{ - unsigned int len = 16; - AlignedSecByteBlock message(len), signature(key.SignatureLength()); - GlobalRNG().GenerateBlock(message, len); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - key.SignMessage(GlobalRNG(), message, len, signature); - - OutputResultOperations(name, "Signature", pc, i, timeTaken); - - if (!pc && key.GetMaterial().SupportsPrecomputation()) - { - key.AccessMaterial().Precompute(16); - BenchMarkSigning(name, key, timeTotal, true); - } -} - -void BenchMarkVerification(const char *name, const PK_Signer &priv, PK_Verifier &pub, double timeTotal, bool pc=false) -{ - unsigned int len = 16; - AlignedSecByteBlock message(len), signature(pub.SignatureLength()); - GlobalRNG().GenerateBlock(message, len); - priv.SignMessage(GlobalRNG(), message, len, signature); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - pub.VerifyMessage(message, len, signature, signature.size()); - - OutputResultOperations(name, "Verification", pc, i, timeTaken); - - if (!pc && pub.GetMaterial().SupportsPrecomputation()) - { - pub.AccessMaterial().Precompute(16); - BenchMarkVerification(name, priv, pub, timeTotal, true); - } -} - -void BenchMarkKeyGen(const char *name, SimpleKeyAgreementDomain &d, double timeTotal, bool pc=false) -{ - SecByteBlock priv(d.PrivateKeyLength()), pub(d.PublicKeyLength()); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - d.GenerateKeyPair(GlobalRNG(), priv, pub); - - OutputResultOperations(name, "Key-Pair Generation", pc, i, timeTaken); - - if (!pc && d.GetMaterial().SupportsPrecomputation()) - { - d.AccessMaterial().Precompute(16); - BenchMarkKeyGen(name, d, timeTotal, true); - } -} - -void BenchMarkKeyGen(const char *name, AuthenticatedKeyAgreementDomain &d, double timeTotal, bool pc=false) -{ - SecByteBlock priv(d.EphemeralPrivateKeyLength()), pub(d.EphemeralPublicKeyLength()); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++) - d.GenerateEphemeralKeyPair(GlobalRNG(), priv, pub); - - OutputResultOperations(name, "Key-Pair Generation", pc, i, timeTaken); - - if (!pc && d.GetMaterial().SupportsPrecomputation()) - { - d.AccessMaterial().Precompute(16); - BenchMarkKeyGen(name, d, timeTotal, true); - } -} - -void BenchMarkAgreement(const char *name, SimpleKeyAgreementDomain &d, double timeTotal, bool pc=false) -{ - SecByteBlock priv1(d.PrivateKeyLength()), priv2(d.PrivateKeyLength()); - SecByteBlock pub1(d.PublicKeyLength()), pub2(d.PublicKeyLength()); - d.GenerateKeyPair(GlobalRNG(), priv1, pub1); - d.GenerateKeyPair(GlobalRNG(), priv2, pub2); - SecByteBlock val(d.AgreedValueLength()); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i+=2) - { - d.Agree(val, priv1, pub2); - d.Agree(val, priv2, pub1); - } - - OutputResultOperations(name, "Key Agreement", pc, i, timeTaken); -} - -void BenchMarkAgreement(const char *name, AuthenticatedKeyAgreementDomain &d, double timeTotal, bool pc=false) -{ - SecByteBlock spriv1(d.StaticPrivateKeyLength()), spriv2(d.StaticPrivateKeyLength()); - SecByteBlock epriv1(d.EphemeralPrivateKeyLength()), epriv2(d.EphemeralPrivateKeyLength()); - SecByteBlock spub1(d.StaticPublicKeyLength()), spub2(d.StaticPublicKeyLength()); - SecByteBlock epub1(d.EphemeralPublicKeyLength()), epub2(d.EphemeralPublicKeyLength()); - d.GenerateStaticKeyPair(GlobalRNG(), spriv1, spub1); - d.GenerateStaticKeyPair(GlobalRNG(), spriv2, spub2); - d.GenerateEphemeralKeyPair(GlobalRNG(), epriv1, epub1); - d.GenerateEphemeralKeyPair(GlobalRNG(), epriv2, epub2); - SecByteBlock val(d.AgreedValueLength()); - - clock_t start = clock(); - unsigned int i; - double timeTaken; - for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i+=2) - { - d.Agree(val, spriv1, epriv1, spub2, epub2); - d.Agree(val, spriv2, epriv2, spub1, epub1); - } - - OutputResultOperations(name, "Key Agreement", pc, i, timeTaken); -} - -//VC60 workaround: compiler bug triggered without the extra dummy parameters -template -void BenchMarkCrypto(const char *filename, const char *name, double timeTotal, SCHEME *x=NULL) -{ - FileSource f(filename, true, new HexDecoder()); - typename SCHEME::Decryptor priv(f); - typename SCHEME::Encryptor pub(priv); - BenchMarkEncryption(name, pub, timeTotal); - BenchMarkDecryption(name, priv, pub, timeTotal); -} - -//VC60 workaround: compiler bug triggered without the extra dummy parameters -template -void BenchMarkSignature(const char *filename, const char *name, double timeTotal, SCHEME *x=NULL) -{ - FileSource f(filename, true, new HexDecoder()); - typename SCHEME::Signer priv(f); - typename SCHEME::Verifier pub(priv); - BenchMarkSigning(name, priv, timeTotal); - BenchMarkVerification(name, priv, pub, timeTotal); -} - -//VC60 workaround: compiler bug triggered without the extra dummy parameters -template -void BenchMarkKeyAgreement(const char *filename, const char *name, double timeTotal, D *x=NULL) -{ - FileSource f(filename, true, new HexDecoder()); - D d(f); - BenchMarkKeyGen(name, d, timeTotal); - BenchMarkAgreement(name, d, timeTotal); -} - -extern double g_hertz; - -void BenchmarkAll2(double t, double hertz) -{ - g_hertz = hertz; -#if 0 - cout << "" << endl; - cout << ""; - BenchMarkCrypto > >("TestData/rsa1024.dat", "RSA 1024", t); - BenchMarkCrypto > >("TestData/luc1024.dat", "LUC 1024", t); - BenchMarkCrypto >("TestData/dlie1024.dat", "DLIES 1024", t); - BenchMarkCrypto >("TestData/lucc512.dat", "LUCELG 512", t); - - cout << "\n"; - BenchMarkCrypto > >("TestData/rsa2048.dat", "RSA 2048", t); - BenchMarkCrypto > >("TestData/luc2048.dat", "LUC 2048", t); - BenchMarkCrypto >("TestData/dlie2048.dat", "DLIES 2048", t); - BenchMarkCrypto >("TestData/lucc1024.dat", "LUCELG 1024", t); - - cout << "\n"; - BenchMarkSignature >("TestData/rsa1024.dat", "RSA 1024", t); - BenchMarkSignature >("TestData/rw1024.dat", "RW 1024", t); - BenchMarkSignature >("TestData/luc1024.dat", "LUC 1024", t); - BenchMarkSignature >("TestData/nr1024.dat", "NR 1024", t); - BenchMarkSignature("TestData/dsa1024.dat", "DSA 1024", t); - BenchMarkSignature >("TestData/lucs512.dat", "LUC-HMP 512", t); - BenchMarkSignature >("TestData/esig1023.dat", "ESIGN 1023", t); - BenchMarkSignature >("TestData/esig1536.dat", "ESIGN 1536", t); - - cout << "\n"; - BenchMarkSignature >("TestData/rsa2048.dat", "RSA 2048", t); - BenchMarkSignature >("TestData/rw2048.dat", "RW 2048", t); - BenchMarkSignature >("TestData/luc2048.dat", "LUC 2048", t); - BenchMarkSignature >("TestData/nr2048.dat", "NR 2048", t); - BenchMarkSignature >("TestData/lucs1024.dat", "LUC-HMP 1024", t); - BenchMarkSignature >("TestData/esig2046.dat", "ESIGN 2046", t); - - cout << "\n"; - BenchMarkKeyAgreement("TestData/xtrdh171.dat", "XTR-DH 171", t); - BenchMarkKeyAgreement("TestData/xtrdh342.dat", "XTR-DH 342", t); - BenchMarkKeyAgreement("TestData/dh1024.dat", "DH 1024", t); - BenchMarkKeyAgreement("TestData/dh2048.dat", "DH 2048", t); - BenchMarkKeyAgreement("TestData/lucd512.dat", "LUCDIF 512", t); - BenchMarkKeyAgreement("TestData/lucd1024.dat", "LUCDIF 1024", t); - BenchMarkKeyAgreement("TestData/mqv1024.dat", "MQV 1024", t); - BenchMarkKeyAgreement("TestData/mqv2048.dat", "MQV 2048", t); -#endif - cout << "\n"; - { - ECIES::Decryptor cpriv(GlobalRNG(), ASN1::secp256k1()); - ECIES::Encryptor cpub(cpriv); - ECDSA::Signer spriv(cpriv); - ECDSA::Verifier spub(spriv); - ECDH::Domain ecdhc(ASN1::secp256k1()); - ECMQV::Domain ecmqvc(ASN1::secp256k1()); - - BenchMarkEncryption("ECIES over GF(p) 256", cpub, t); - BenchMarkDecryption("ECIES over GF(p) 256", cpriv, cpub, t); - BenchMarkSigning("ECDSA over GF(p) 256", spriv, t); - BenchMarkVerification("ECDSA over GF(p) 256", spriv, spub, t); - BenchMarkKeyGen("ECDHC over GF(p) 256", ecdhc, t); - BenchMarkAgreement("ECDHC over GF(p) 256", ecdhc, t); - BenchMarkKeyGen("ECMQVC over GF(p) 256", ecmqvc, t); - BenchMarkAgreement("ECMQVC over GF(p) 256", ecmqvc, t); - } - - cout << "" << endl; - { - ECIES::Decryptor cpriv(GlobalRNG(), ASN1::sect233r1()); - ECIES::Encryptor cpub(cpriv); - ECDSA::Signer spriv(cpriv); - ECDSA::Verifier spub(spriv); - ECDH::Domain ecdhc(ASN1::sect233r1()); - ECMQV::Domain ecmqvc(ASN1::sect233r1()); - - BenchMarkEncryption("ECIES over GF(2^n) 233", cpub, t); - BenchMarkDecryption("ECIES over GF(2^n) 233", cpriv, cpub, t); - BenchMarkSigning("ECDSA over GF(2^n) 233", spriv, t); - BenchMarkVerification("ECDSA over GF(2^n) 233", spriv, spub, t); - BenchMarkKeyGen("ECDHC over GF(2^n) 233", ecdhc, t); - BenchMarkAgreement("ECDHC over GF(2^n) 233", ecdhc, t); - BenchMarkKeyGen("ECMQVC over GF(2^n) 233", ecmqvc, t); - BenchMarkAgreement("ECMQVC over GF(2^n) 233", ecmqvc, t); - } - cout << "
OperationMilliseconds/Operation" << (g_hertz ? "Megacycles/Operation" : "") << endl; - - cout << "\n
" << endl; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/bfinit.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/bfinit.cpp deleted file mode 100644 index 714570aa..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/bfinit.cpp +++ /dev/null @@ -1,277 +0,0 @@ -#include "pch.h" -#include "blowfish.h" - -NAMESPACE_BEGIN(CryptoPP) - -const word32 Blowfish::Base::p_init[Blowfish::ROUNDS+2] = -{ - 608135816U, 2242054355U, 320440878U, 57701188U, - 2752067618U, 698298832U, 137296536U, 3964562569U, - 1160258022U, 953160567U, 3193202383U, 887688300U, - 3232508343U, 3380367581U, 1065670069U, 3041331479U, - 2450970073U, 2306472731U -} ; - -const word32 Blowfish::Base::s_init[4*256] = { - 3509652390U, 2564797868U, 805139163U, 3491422135U, - 3101798381U, 1780907670U, 3128725573U, 4046225305U, - 614570311U, 3012652279U, 134345442U, 2240740374U, - 1667834072U, 1901547113U, 2757295779U, 4103290238U, - 227898511U, 1921955416U, 1904987480U, 2182433518U, - 2069144605U, 3260701109U, 2620446009U, 720527379U, - 3318853667U, 677414384U, 3393288472U, 3101374703U, - 2390351024U, 1614419982U, 1822297739U, 2954791486U, - 3608508353U, 3174124327U, 2024746970U, 1432378464U, - 3864339955U, 2857741204U, 1464375394U, 1676153920U, - 1439316330U, 715854006U, 3033291828U, 289532110U, - 2706671279U, 2087905683U, 3018724369U, 1668267050U, - 732546397U, 1947742710U, 3462151702U, 2609353502U, - 2950085171U, 1814351708U, 2050118529U, 680887927U, - 999245976U, 1800124847U, 3300911131U, 1713906067U, - 1641548236U, 4213287313U, 1216130144U, 1575780402U, - 4018429277U, 3917837745U, 3693486850U, 3949271944U, - 596196993U, 3549867205U, 258830323U, 2213823033U, - 772490370U, 2760122372U, 1774776394U, 2652871518U, - 566650946U, 4142492826U, 1728879713U, 2882767088U, - 1783734482U, 3629395816U, 2517608232U, 2874225571U, - 1861159788U, 326777828U, 3124490320U, 2130389656U, - 2716951837U, 967770486U, 1724537150U, 2185432712U, - 2364442137U, 1164943284U, 2105845187U, 998989502U, - 3765401048U, 2244026483U, 1075463327U, 1455516326U, - 1322494562U, 910128902U, 469688178U, 1117454909U, - 936433444U, 3490320968U, 3675253459U, 1240580251U, - 122909385U, 2157517691U, 634681816U, 4142456567U, - 3825094682U, 3061402683U, 2540495037U, 79693498U, - 3249098678U, 1084186820U, 1583128258U, 426386531U, - 1761308591U, 1047286709U, 322548459U, 995290223U, - 1845252383U, 2603652396U, 3431023940U, 2942221577U, - 3202600964U, 3727903485U, 1712269319U, 422464435U, - 3234572375U, 1170764815U, 3523960633U, 3117677531U, - 1434042557U, 442511882U, 3600875718U, 1076654713U, - 1738483198U, 4213154764U, 2393238008U, 3677496056U, - 1014306527U, 4251020053U, 793779912U, 2902807211U, - 842905082U, 4246964064U, 1395751752U, 1040244610U, - 2656851899U, 3396308128U, 445077038U, 3742853595U, - 3577915638U, 679411651U, 2892444358U, 2354009459U, - 1767581616U, 3150600392U, 3791627101U, 3102740896U, - 284835224U, 4246832056U, 1258075500U, 768725851U, - 2589189241U, 3069724005U, 3532540348U, 1274779536U, - 3789419226U, 2764799539U, 1660621633U, 3471099624U, - 4011903706U, 913787905U, 3497959166U, 737222580U, - 2514213453U, 2928710040U, 3937242737U, 1804850592U, - 3499020752U, 2949064160U, 2386320175U, 2390070455U, - 2415321851U, 4061277028U, 2290661394U, 2416832540U, - 1336762016U, 1754252060U, 3520065937U, 3014181293U, - 791618072U, 3188594551U, 3933548030U, 2332172193U, - 3852520463U, 3043980520U, 413987798U, 3465142937U, - 3030929376U, 4245938359U, 2093235073U, 3534596313U, - 375366246U, 2157278981U, 2479649556U, 555357303U, - 3870105701U, 2008414854U, 3344188149U, 4221384143U, - 3956125452U, 2067696032U, 3594591187U, 2921233993U, - 2428461U, 544322398U, 577241275U, 1471733935U, - 610547355U, 4027169054U, 1432588573U, 1507829418U, - 2025931657U, 3646575487U, 545086370U, 48609733U, - 2200306550U, 1653985193U, 298326376U, 1316178497U, - 3007786442U, 2064951626U, 458293330U, 2589141269U, - 3591329599U, 3164325604U, 727753846U, 2179363840U, - 146436021U, 1461446943U, 4069977195U, 705550613U, - 3059967265U, 3887724982U, 4281599278U, 3313849956U, - 1404054877U, 2845806497U, 146425753U, 1854211946U, - - 1266315497U, 3048417604U, 3681880366U, 3289982499U, - 2909710000U, 1235738493U, 2632868024U, 2414719590U, - 3970600049U, 1771706367U, 1449415276U, 3266420449U, - 422970021U, 1963543593U, 2690192192U, 3826793022U, - 1062508698U, 1531092325U, 1804592342U, 2583117782U, - 2714934279U, 4024971509U, 1294809318U, 4028980673U, - 1289560198U, 2221992742U, 1669523910U, 35572830U, - 157838143U, 1052438473U, 1016535060U, 1802137761U, - 1753167236U, 1386275462U, 3080475397U, 2857371447U, - 1040679964U, 2145300060U, 2390574316U, 1461121720U, - 2956646967U, 4031777805U, 4028374788U, 33600511U, - 2920084762U, 1018524850U, 629373528U, 3691585981U, - 3515945977U, 2091462646U, 2486323059U, 586499841U, - 988145025U, 935516892U, 3367335476U, 2599673255U, - 2839830854U, 265290510U, 3972581182U, 2759138881U, - 3795373465U, 1005194799U, 847297441U, 406762289U, - 1314163512U, 1332590856U, 1866599683U, 4127851711U, - 750260880U, 613907577U, 1450815602U, 3165620655U, - 3734664991U, 3650291728U, 3012275730U, 3704569646U, - 1427272223U, 778793252U, 1343938022U, 2676280711U, - 2052605720U, 1946737175U, 3164576444U, 3914038668U, - 3967478842U, 3682934266U, 1661551462U, 3294938066U, - 4011595847U, 840292616U, 3712170807U, 616741398U, - 312560963U, 711312465U, 1351876610U, 322626781U, - 1910503582U, 271666773U, 2175563734U, 1594956187U, - 70604529U, 3617834859U, 1007753275U, 1495573769U, - 4069517037U, 2549218298U, 2663038764U, 504708206U, - 2263041392U, 3941167025U, 2249088522U, 1514023603U, - 1998579484U, 1312622330U, 694541497U, 2582060303U, - 2151582166U, 1382467621U, 776784248U, 2618340202U, - 3323268794U, 2497899128U, 2784771155U, 503983604U, - 4076293799U, 907881277U, 423175695U, 432175456U, - 1378068232U, 4145222326U, 3954048622U, 3938656102U, - 3820766613U, 2793130115U, 2977904593U, 26017576U, - 3274890735U, 3194772133U, 1700274565U, 1756076034U, - 4006520079U, 3677328699U, 720338349U, 1533947780U, - 354530856U, 688349552U, 3973924725U, 1637815568U, - 332179504U, 3949051286U, 53804574U, 2852348879U, - 3044236432U, 1282449977U, 3583942155U, 3416972820U, - 4006381244U, 1617046695U, 2628476075U, 3002303598U, - 1686838959U, 431878346U, 2686675385U, 1700445008U, - 1080580658U, 1009431731U, 832498133U, 3223435511U, - 2605976345U, 2271191193U, 2516031870U, 1648197032U, - 4164389018U, 2548247927U, 300782431U, 375919233U, - 238389289U, 3353747414U, 2531188641U, 2019080857U, - 1475708069U, 455242339U, 2609103871U, 448939670U, - 3451063019U, 1395535956U, 2413381860U, 1841049896U, - 1491858159U, 885456874U, 4264095073U, 4001119347U, - 1565136089U, 3898914787U, 1108368660U, 540939232U, - 1173283510U, 2745871338U, 3681308437U, 4207628240U, - 3343053890U, 4016749493U, 1699691293U, 1103962373U, - 3625875870U, 2256883143U, 3830138730U, 1031889488U, - 3479347698U, 1535977030U, 4236805024U, 3251091107U, - 2132092099U, 1774941330U, 1199868427U, 1452454533U, - 157007616U, 2904115357U, 342012276U, 595725824U, - 1480756522U, 206960106U, 497939518U, 591360097U, - 863170706U, 2375253569U, 3596610801U, 1814182875U, - 2094937945U, 3421402208U, 1082520231U, 3463918190U, - 2785509508U, 435703966U, 3908032597U, 1641649973U, - 2842273706U, 3305899714U, 1510255612U, 2148256476U, - 2655287854U, 3276092548U, 4258621189U, 236887753U, - 3681803219U, 274041037U, 1734335097U, 3815195456U, - 3317970021U, 1899903192U, 1026095262U, 4050517792U, - 356393447U, 2410691914U, 3873677099U, 3682840055U, - - 3913112168U, 2491498743U, 4132185628U, 2489919796U, - 1091903735U, 1979897079U, 3170134830U, 3567386728U, - 3557303409U, 857797738U, 1136121015U, 1342202287U, - 507115054U, 2535736646U, 337727348U, 3213592640U, - 1301675037U, 2528481711U, 1895095763U, 1721773893U, - 3216771564U, 62756741U, 2142006736U, 835421444U, - 2531993523U, 1442658625U, 3659876326U, 2882144922U, - 676362277U, 1392781812U, 170690266U, 3921047035U, - 1759253602U, 3611846912U, 1745797284U, 664899054U, - 1329594018U, 3901205900U, 3045908486U, 2062866102U, - 2865634940U, 3543621612U, 3464012697U, 1080764994U, - 553557557U, 3656615353U, 3996768171U, 991055499U, - 499776247U, 1265440854U, 648242737U, 3940784050U, - 980351604U, 3713745714U, 1749149687U, 3396870395U, - 4211799374U, 3640570775U, 1161844396U, 3125318951U, - 1431517754U, 545492359U, 4268468663U, 3499529547U, - 1437099964U, 2702547544U, 3433638243U, 2581715763U, - 2787789398U, 1060185593U, 1593081372U, 2418618748U, - 4260947970U, 69676912U, 2159744348U, 86519011U, - 2512459080U, 3838209314U, 1220612927U, 3339683548U, - 133810670U, 1090789135U, 1078426020U, 1569222167U, - 845107691U, 3583754449U, 4072456591U, 1091646820U, - 628848692U, 1613405280U, 3757631651U, 526609435U, - 236106946U, 48312990U, 2942717905U, 3402727701U, - 1797494240U, 859738849U, 992217954U, 4005476642U, - 2243076622U, 3870952857U, 3732016268U, 765654824U, - 3490871365U, 2511836413U, 1685915746U, 3888969200U, - 1414112111U, 2273134842U, 3281911079U, 4080962846U, - 172450625U, 2569994100U, 980381355U, 4109958455U, - 2819808352U, 2716589560U, 2568741196U, 3681446669U, - 3329971472U, 1835478071U, 660984891U, 3704678404U, - 4045999559U, 3422617507U, 3040415634U, 1762651403U, - 1719377915U, 3470491036U, 2693910283U, 3642056355U, - 3138596744U, 1364962596U, 2073328063U, 1983633131U, - 926494387U, 3423689081U, 2150032023U, 4096667949U, - 1749200295U, 3328846651U, 309677260U, 2016342300U, - 1779581495U, 3079819751U, 111262694U, 1274766160U, - 443224088U, 298511866U, 1025883608U, 3806446537U, - 1145181785U, 168956806U, 3641502830U, 3584813610U, - 1689216846U, 3666258015U, 3200248200U, 1692713982U, - 2646376535U, 4042768518U, 1618508792U, 1610833997U, - 3523052358U, 4130873264U, 2001055236U, 3610705100U, - 2202168115U, 4028541809U, 2961195399U, 1006657119U, - 2006996926U, 3186142756U, 1430667929U, 3210227297U, - 1314452623U, 4074634658U, 4101304120U, 2273951170U, - 1399257539U, 3367210612U, 3027628629U, 1190975929U, - 2062231137U, 2333990788U, 2221543033U, 2438960610U, - 1181637006U, 548689776U, 2362791313U, 3372408396U, - 3104550113U, 3145860560U, 296247880U, 1970579870U, - 3078560182U, 3769228297U, 1714227617U, 3291629107U, - 3898220290U, 166772364U, 1251581989U, 493813264U, - 448347421U, 195405023U, 2709975567U, 677966185U, - 3703036547U, 1463355134U, 2715995803U, 1338867538U, - 1343315457U, 2802222074U, 2684532164U, 233230375U, - 2599980071U, 2000651841U, 3277868038U, 1638401717U, - 4028070440U, 3237316320U, 6314154U, 819756386U, - 300326615U, 590932579U, 1405279636U, 3267499572U, - 3150704214U, 2428286686U, 3959192993U, 3461946742U, - 1862657033U, 1266418056U, 963775037U, 2089974820U, - 2263052895U, 1917689273U, 448879540U, 3550394620U, - 3981727096U, 150775221U, 3627908307U, 1303187396U, - 508620638U, 2975983352U, 2726630617U, 1817252668U, - 1876281319U, 1457606340U, 908771278U, 3720792119U, - 3617206836U, 2455994898U, 1729034894U, 1080033504U, - - 976866871U, 3556439503U, 2881648439U, 1522871579U, - 1555064734U, 1336096578U, 3548522304U, 2579274686U, - 3574697629U, 3205460757U, 3593280638U, 3338716283U, - 3079412587U, 564236357U, 2993598910U, 1781952180U, - 1464380207U, 3163844217U, 3332601554U, 1699332808U, - 1393555694U, 1183702653U, 3581086237U, 1288719814U, - 691649499U, 2847557200U, 2895455976U, 3193889540U, - 2717570544U, 1781354906U, 1676643554U, 2592534050U, - 3230253752U, 1126444790U, 2770207658U, 2633158820U, - 2210423226U, 2615765581U, 2414155088U, 3127139286U, - 673620729U, 2805611233U, 1269405062U, 4015350505U, - 3341807571U, 4149409754U, 1057255273U, 2012875353U, - 2162469141U, 2276492801U, 2601117357U, 993977747U, - 3918593370U, 2654263191U, 753973209U, 36408145U, - 2530585658U, 25011837U, 3520020182U, 2088578344U, - 530523599U, 2918365339U, 1524020338U, 1518925132U, - 3760827505U, 3759777254U, 1202760957U, 3985898139U, - 3906192525U, 674977740U, 4174734889U, 2031300136U, - 2019492241U, 3983892565U, 4153806404U, 3822280332U, - 352677332U, 2297720250U, 60907813U, 90501309U, - 3286998549U, 1016092578U, 2535922412U, 2839152426U, - 457141659U, 509813237U, 4120667899U, 652014361U, - 1966332200U, 2975202805U, 55981186U, 2327461051U, - 676427537U, 3255491064U, 2882294119U, 3433927263U, - 1307055953U, 942726286U, 933058658U, 2468411793U, - 3933900994U, 4215176142U, 1361170020U, 2001714738U, - 2830558078U, 3274259782U, 1222529897U, 1679025792U, - 2729314320U, 3714953764U, 1770335741U, 151462246U, - 3013232138U, 1682292957U, 1483529935U, 471910574U, - 1539241949U, 458788160U, 3436315007U, 1807016891U, - 3718408830U, 978976581U, 1043663428U, 3165965781U, - 1927990952U, 4200891579U, 2372276910U, 3208408903U, - 3533431907U, 1412390302U, 2931980059U, 4132332400U, - 1947078029U, 3881505623U, 4168226417U, 2941484381U, - 1077988104U, 1320477388U, 886195818U, 18198404U, - 3786409000U, 2509781533U, 112762804U, 3463356488U, - 1866414978U, 891333506U, 18488651U, 661792760U, - 1628790961U, 3885187036U, 3141171499U, 876946877U, - 2693282273U, 1372485963U, 791857591U, 2686433993U, - 3759982718U, 3167212022U, 3472953795U, 2716379847U, - 445679433U, 3561995674U, 3504004811U, 3574258232U, - 54117162U, 3331405415U, 2381918588U, 3769707343U, - 4154350007U, 1140177722U, 4074052095U, 668550556U, - 3214352940U, 367459370U, 261225585U, 2610173221U, - 4209349473U, 3468074219U, 3265815641U, 314222801U, - 3066103646U, 3808782860U, 282218597U, 3406013506U, - 3773591054U, 379116347U, 1285071038U, 846784868U, - 2669647154U, 3771962079U, 3550491691U, 2305946142U, - 453669953U, 1268987020U, 3317592352U, 3279303384U, - 3744833421U, 2610507566U, 3859509063U, 266596637U, - 3847019092U, 517658769U, 3462560207U, 3443424879U, - 370717030U, 4247526661U, 2224018117U, 4143653529U, - 4112773975U, 2788324899U, 2477274417U, 1456262402U, - 2901442914U, 1517677493U, 1846949527U, 2295493580U, - 3734397586U, 2176403920U, 1280348187U, 1908823572U, - 3871786941U, 846861322U, 1172426758U, 3287448474U, - 3383383037U, 1655181056U, 3139813346U, 901632758U, - 1897031941U, 2986607138U, 3066810236U, 3447102507U, - 1393639104U, 373351379U, 950779232U, 625454576U, - 3124240540U, 4148612726U, 2007998917U, 544563296U, - 2244738638U, 2330496472U, 2058025392U, 1291430526U, - 424198748U, 50039436U, 29584100U, 3605783033U, - 2429876329U, 2791104160U, 1057563949U, 3255363231U, - 3075367218U, 3463963227U, 1469046755U, 985887462U -}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/blowfish.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/blowfish.cpp deleted file mode 100644 index aaa637cc..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/blowfish.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// blowfish.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "blowfish.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Blowfish::Base::UncheckedSetKey(const byte *key_string, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - unsigned i, j=0, k; - word32 data, dspace[2] = {0, 0}; - - memcpy(pbox, p_init, sizeof(p_init)); - memcpy(sbox, s_init, sizeof(s_init)); - - // Xor key string into encryption key vector - for (i=0 ; i Block; - - word32 left, right; - Block::Get(inBlock)(left)(right); - - const word32 *const s=sbox; - const word32 *p=pbox; - - left ^= p[0]; - - for (unsigned i=0; i, public VariableKeyLength<16, 1, 56>, public FixedRounds<16> -{ - static const char *StaticAlgorithmName() {return "Blowfish";} -}; - -//! Blowfish -class Blowfish : public Blowfish_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - void UncheckedSetKey(const byte *key_string, unsigned int keylength, const NameValuePairs ¶ms); - - private: - void crypt_block(const word32 in[2], word32 out[2]) const; - - static const word32 p_init[ROUNDS+2]; - static const word32 s_init[4*256]; - - FixedSizeSecBlock pbox; - FixedSizeSecBlock sbox; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Blowfish::Encryption BlowfishEncryption; -typedef Blowfish::Decryption BlowfishDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.cpp deleted file mode 100644 index be9b7582..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// blumshub.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "blumshub.h" - -NAMESPACE_BEGIN(CryptoPP) - -PublicBlumBlumShub::PublicBlumBlumShub(const Integer &n, const Integer &seed) - : modn(n), - maxBits(BitPrecision(n.BitCount())-1) -{ - current = modn.Square(modn.Square(seed)); - bitsLeft = maxBits; -} - -unsigned int PublicBlumBlumShub::GenerateBit() -{ - if (bitsLeft==0) - { - current = modn.Square(current); - bitsLeft = maxBits; - } - - return current.GetBit(--bitsLeft); -} - -byte PublicBlumBlumShub::GenerateByte() -{ - byte b=0; - for (int i=0; i<8; i++) - b = (b << 1) | PublicBlumBlumShub::GenerateBit(); - return b; -} - -void PublicBlumBlumShub::GenerateBlock(byte *output, size_t size) -{ - while (size--) - *output++ = PublicBlumBlumShub::GenerateByte(); -} - -void PublicBlumBlumShub::ProcessData(byte *outString, const byte *inString, size_t length) -{ - while (length--) - *outString++ = *inString++ ^ PublicBlumBlumShub::GenerateByte(); -} - -BlumBlumShub::BlumBlumShub(const Integer &p, const Integer &q, const Integer &seed) - : PublicBlumBlumShub(p*q, seed), - p(p), q(q), - x0(modn.Square(seed)) -{ -} - -void BlumBlumShub::Seek(lword index) -{ - Integer i(Integer::POSITIVE, index); - i *= 8; - Integer e = a_exp_b_mod_c (2, i / maxBits + 1, (p-1)*(q-1)); - current = modn.Exponentiate(x0, e); - bitsLeft = maxBits - i % maxBits; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.h deleted file mode 100644 index 5e507478..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/blumshub.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef CRYPTOPP_BLUMSHUB_H -#define CRYPTOPP_BLUMSHUB_H - -#include "modarith.h" - -NAMESPACE_BEGIN(CryptoPP) - -class BlumGoldwasserPublicKey; -class BlumGoldwasserPrivateKey; - -//! BlumBlumShub without factorization of the modulus -class PublicBlumBlumShub : public RandomNumberGenerator, - public StreamTransformation -{ -public: - PublicBlumBlumShub(const Integer &n, const Integer &seed); - - unsigned int GenerateBit(); - byte GenerateByte(); - void GenerateBlock(byte *output, size_t size); - void ProcessData(byte *outString, const byte *inString, size_t length); - - bool IsSelfInverting() const {return true;} - bool IsForwardTransformation() const {return true;} - -protected: - ModularArithmetic modn; - word maxBits, bitsLeft; - Integer current; - - friend class BlumGoldwasserPublicKey; - friend class BlumGoldwasserPrivateKey; -}; - -//! BlumBlumShub with factorization of the modulus -class BlumBlumShub : public PublicBlumBlumShub -{ -public: - // Make sure p and q are both primes congruent to 3 mod 4 and at least 512 bits long, - // seed is the secret key and should be about as big as p*q - BlumBlumShub(const Integer &p, const Integer &q, const Integer &seed); - - bool IsRandomAccess() const {return true;} - void Seek(lword index); - -protected: - const Integer p, q; - const Integer x0; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.cpp deleted file mode 100644 index 80b3e280..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.cpp +++ /dev/null @@ -1,524 +0,0 @@ -// camellia.cpp - by Kevin Springle, 2003 -// This code is hereby placed in the public domain. - -/* -Optimisations and defense against timing attacks added in Jan 2007 by Wei Dai. - -The first 2 rounds and the last round seem especially vulnerable to timing -attacks. The protection is similar to what was implemented for Rijndael. -See comments at top of rijndael.cpp for more details. -*/ - -#include "pch.h" - -#include "camellia.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -// round implementation that uses a small table for protection against timing attacks -#define SLOW_ROUND(lh, ll, rh, rl, kh, kl) { \ - word32 zr = ll ^ kl; \ - word32 zl = lh ^ kh; \ - zr= rotlFixed(s1[GETBYTE(zr, 3)], 1) | \ - (rotrFixed(s1[GETBYTE(zr, 2)], 1) << 24) | \ - (s1[rotlFixed(CRYPTOPP_GET_BYTE_AS_BYTE(zr, 1),1)] << 16) | \ - (s1[GETBYTE(zr, 0)] << 8); \ - zl= (s1[GETBYTE(zl, 3)] << 24) | \ - (rotlFixed(s1[GETBYTE(zl, 2)], 1) << 16) | \ - (rotrFixed(s1[GETBYTE(zl, 1)], 1) << 8) | \ - s1[rotlFixed(CRYPTOPP_GET_BYTE_AS_BYTE(zl, 0), 1)]; \ - zl ^= zr; \ - zr = zl ^ rotlFixed(zr, 8); \ - zl = zr ^ rotrFixed(zl, 8); \ - rh ^= rotlFixed(zr, 16); \ - rh ^= zl; \ - rl ^= rotlFixed(zl, 8); \ - } - -// normal round - same output as above but using larger tables for faster speed -#define ROUND(lh, ll, rh, rl, kh, kl) { \ - word32 th = lh ^ kh; \ - word32 tl = ll ^ kl; \ - word32 d = SP[0][GETBYTE(tl,0)] ^ SP[1][GETBYTE(tl,3)] ^ SP[2][GETBYTE(tl,2)] ^ SP[3][GETBYTE(tl,1)]; \ - word32 u = SP[0][GETBYTE(th,3)] ^ SP[1][GETBYTE(th,2)] ^ SP[2][GETBYTE(th,1)] ^ SP[3][GETBYTE(th,0)]; \ - d ^= u; \ - rh ^= d; \ - rl ^= d; \ - rl ^= rotrFixed(u, 8);} - -#define DOUBLE_ROUND(lh, ll, rh, rl, k0, k1, k2, k3) \ - ROUND(lh, ll, rh, rl, k0, k1) \ - ROUND(rh, rl, lh, ll, k2, k3) - -#ifdef IS_LITTLE_ENDIAN -#define EFI(i) (1-(i)) -#else -#define EFI(i) (i) -#endif - -void Camellia::Base::UncheckedSetKey(const byte *key, unsigned int keylen, const NameValuePairs &) -{ - m_rounds = (keylen >= 24) ? 4 : 3; - unsigned int kslen = (8 * m_rounds + 2); - m_key.New(kslen*2); - word32 *ks32 = m_key.data(); - int m=0, a=0; - if (!IsForwardTransformation()) - m = -1, a = kslen-1; - - word32 kl0, kl1, kl2, kl3; - GetBlock getBlock(key); - getBlock(kl0)(kl1)(kl2)(kl3); - word32 k0=kl0, k1=kl1, k2=kl2, k3=kl3; - -#define CALC_ADDR2(base, i, j) ((byte *)(base)+8*(i)+4*(j)+((-16*(i))&m)) -#define CALC_ADDR(base, i) CALC_ADDR2(base, i, 0) - -#if 1 - word64 kwl, kwr; - ks32 += 2*a; -#define PREPARE_KS_ROUNDS \ - kwl = (word64(k0) << 32) | k1; \ - kwr = (word64(k2) << 32) | k3 -#define KS_ROUND_0(i) \ - *(word64*)CALC_ADDR(ks32, i+EFI(0)) = kwl; \ - *(word64*)CALC_ADDR(ks32, i+EFI(1)) = kwr -#define KS_ROUND(i, r, which) \ - if (which & (1<> (64 - (r%64))); \ - if (which & (1<64))) *(word64*)CALC_ADDR(ks32, i+EFI(r>64)) = (kwl << (r%64)) | (kwr >> (64 - (r%64))) -#else - // SSE2 version is 30% faster on Intel Core 2. Doesn't seem worth the hassle of maintenance, but left here - // #if'd out in case someone needs it. - __m128i kw, kw2; - __m128i *ks128 = (__m128i *)ks32+a/2; - ks32 += 2*a; -#define PREPARE_KS_ROUNDS \ - kw = _mm_set_epi32(k0, k1, k2, k3); \ - if (m) kw2 = kw, kw = _mm_shuffle_epi32(kw, _MM_SHUFFLE(1, 0, 3, 2)); \ - else kw2 = _mm_shuffle_epi32(kw, _MM_SHUFFLE(1, 0, 3, 2)) -#define KS_ROUND_0(i) \ - _mm_store_si128((__m128i *)CALC_ADDR(ks128, i), kw) -#define KS_ROUND(i, r, which) { \ - __m128i temp; \ - if (r<64 && (which!=1 || m)) temp = _mm_or_si128(_mm_slli_epi64(kw, r%64), _mm_srli_epi64(kw2, 64-r%64)); \ - else temp = _mm_or_si128(_mm_slli_epi64(kw2, r%64), _mm_srli_epi64(kw, 64-r%64)); \ - if (which & 2) _mm_store_si128((__m128i *)CALC_ADDR(ks128, i), temp); \ - else _mm_storel_epi64((__m128i*)CALC_ADDR(ks32, i+EFI(0)), temp); \ - } -#endif - - if (keylen == 16) - { - // KL - PREPARE_KS_ROUNDS; - KS_ROUND_0(0); - KS_ROUND(4, 15, 3); - KS_ROUND(10, 45, 3); - KS_ROUND(12, 60, 2); - KS_ROUND(16, 77, 3); - KS_ROUND(18, 94, 3); - KS_ROUND(22, 111, 3); - - // KA - k0=kl0, k1=kl1, k2=kl2, k3=kl3; - DOUBLE_ROUND(k0, k1, k2, k3, 0xA09E667Ful, 0x3BCC908Bul, 0xB67AE858ul, 0x4CAA73B2ul); - k0^=kl0, k1^=kl1, k2^=kl2, k3^=kl3; - DOUBLE_ROUND(k0, k1, k2, k3, 0xC6EF372Ful, 0xE94F82BEul, 0x54FF53A5ul, 0xF1D36F1Cul); - - PREPARE_KS_ROUNDS; - KS_ROUND_0(2); - KS_ROUND(6, 15, 3); - KS_ROUND(8, 30, 3); - KS_ROUND(12, 45, 1); - KS_ROUND(14, 60, 3); - KS_ROUND(20, 94, 3); - KS_ROUND(24, 47, 3); - } - else - { - // KL - PREPARE_KS_ROUNDS; - KS_ROUND_0(0); - KS_ROUND(12, 45, 3); - KS_ROUND(16, 60, 3); - KS_ROUND(22, 77, 3); - KS_ROUND(30, 111, 3); - - // KR - word32 kr0, kr1, kr2, kr3; - GetBlock(key+16)(kr0)(kr1); - if (keylen == 24) - kr2 = ~kr0, kr3 = ~kr1; - else - GetBlock(key+24)(kr2)(kr3); - k0=kr0, k1=kr1, k2=kr2, k3=kr3; - - PREPARE_KS_ROUNDS; - KS_ROUND(4, 15, 3); - KS_ROUND(8, 30, 3); - KS_ROUND(18, 60, 3); - KS_ROUND(26, 94, 3); - - // KA - k0^=kl0, k1^=kl1, k2^=kl2, k3^=kl3; - DOUBLE_ROUND(k0, k1, k2, k3, 0xA09E667Ful, 0x3BCC908Bul, 0xB67AE858ul, 0x4CAA73B2ul); - k0^=kl0, k1^=kl1, k2^=kl2, k3^=kl3; - DOUBLE_ROUND(k0, k1, k2, k3, 0xC6EF372Ful, 0xE94F82BEul, 0x54FF53A5ul, 0xF1D36F1Cul); - - PREPARE_KS_ROUNDS; - KS_ROUND(6, 15, 3); - KS_ROUND(14, 45, 3); - KS_ROUND(24, 77, 3); - KS_ROUND(28, 94, 3); - - // KB - k0^=kr0, k1^=kr1, k2^=kr2, k3^=kr3; - DOUBLE_ROUND(k0, k1, k2, k3, 0x10E527FAul, 0xDE682D1Dul, 0xB05688C2ul, 0xB3E6C1FDul); - - PREPARE_KS_ROUNDS; - KS_ROUND_0(2); - KS_ROUND(10, 30, 3); - KS_ROUND(20, 60, 3); - KS_ROUND(32, 47, 3); - } -} - -void Camellia::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ -#define KS(i, j) ks[i*4 + EFI(j/2)*2 + EFI(j%2)] - -#define FL(klh, kll, krh, krl) \ - ll ^= rotlFixed(lh & klh, 1); \ - lh ^= (ll | kll); \ - rh ^= (rl | krl); \ - rl ^= rotlFixed(rh & krh, 1); - - word32 lh, ll, rh, rl; - typedef BlockGetAndPut Block; - Block::Get(inBlock)(lh)(ll)(rh)(rl); - const word32 *ks = m_key.data(); - lh ^= KS(0,0); - ll ^= KS(0,1); - rh ^= KS(0,2); - rl ^= KS(0,3); - - // timing attack countermeasure. see comments at top for more details - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; - word32 u = 0; - for (i=0; i<256; i+=cacheLineSize) - u &= *(const word32 *)(s1+i); - u &= *(const word32 *)(s1+252); - lh |= u; ll |= u; - - SLOW_ROUND(lh, ll, rh, rl, KS(1,0), KS(1,1)) - SLOW_ROUND(rh, rl, lh, ll, KS(1,2), KS(1,3)) - for (i = m_rounds-1; i > 0; --i) - { - DOUBLE_ROUND(lh, ll, rh, rl, KS(2,0), KS(2,1), KS(2,2), KS(2,3)) - DOUBLE_ROUND(lh, ll, rh, rl, KS(3,0), KS(3,1), KS(3,2), KS(3,3)) - FL(KS(4,0), KS(4,1), KS(4,2), KS(4,3)); - DOUBLE_ROUND(lh, ll, rh, rl, KS(5,0), KS(5,1), KS(5,2), KS(5,3)) - ks += 16; - } - DOUBLE_ROUND(lh, ll, rh, rl, KS(2,0), KS(2,1), KS(2,2), KS(2,3)) - ROUND(lh, ll, rh, rl, KS(3,0), KS(3,1)) - SLOW_ROUND(rh, rl, lh, ll, KS(3,2), KS(3,3)) - lh ^= KS(4,0); - ll ^= KS(4,1); - rh ^= KS(4,2); - rl ^= KS(4,3); - Block::Put(xorBlock, outBlock)(rh)(rl)(lh)(ll); -} - -// The Camellia s-boxes - -const byte Camellia::Base::s1[256] = -{ - 112,130,44,236,179,39,192,229,228,133,87,53,234,12,174,65, - 35,239,107,147,69,25,165,33,237,14,79,78,29,101,146,189, - 134,184,175,143,124,235,31,206,62,48,220,95,94,197,11,26, - 166,225,57,202,213,71,93,61,217,1,90,214,81,86,108,77, - 139,13,154,102,251,204,176,45,116,18,43,32,240,177,132,153, - 223,76,203,194,52,126,118,5,109,183,169,49,209,23,4,215, - 20,88,58,97,222,27,17,28,50,15,156,22,83,24,242,34, - 254,68,207,178,195,181,122,145,36,8,232,168,96,252,105,80, - 170,208,160,125,161,137,98,151,84,91,30,149,224,255,100,210, - 16,196,0,72,163,247,117,219,138,3,230,218,9,63,221,148, - 135,92,131,2,205,74,144,51,115,103,246,243,157,127,191,226, - 82,155,216,38,200,55,198,59,129,150,111,75,19,190,99,46, - 233,121,167,140,159,110,188,142,41,245,249,182,47,253,180,89, - 120,152,6,106,231,70,113,186,212,37,171,66,136,162,141,250, - 114,7,185,85,248,238,172,10,54,73,42,104,60,56,241,164, - 64,40,211,123,187,201,67,193,21,227,173,244,119,199,128,158 -}; - -const word32 Camellia::Base::SP[4][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 - }, - { - 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 - }, - { - 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 - }, - { - 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 - }}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.h deleted file mode 100644 index d8700cb8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/camellia.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef CRYPTOPP_CAMELLIA_H -#define CRYPTOPP_CAMELLIA_H - -#include "config.h" - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct Camellia_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8> -{ - static const char *StaticAlgorithmName() {return "Camellia";} -}; - -/// Camellia -class Camellia : public Camellia_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *key, unsigned int keylen, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - static const byte s1[256]; - static const word32 SP[4][256]; - - unsigned int m_rounds; - SecBlock m_key; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Camellia::Encryption CamelliaEncryption; -typedef Camellia::Decryption CamelliaDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cast.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cast.cpp deleted file mode 100644 index ef0a5efd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cast.cpp +++ /dev/null @@ -1,296 +0,0 @@ -// cast.cpp - written and placed in the public domain by Wei Dai and Leonard Janke -// based on Steve Reid's public domain cast.c - -#include "pch.h" -#include "cast.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -/* Macros to access 8-bit bytes out of a 32-bit word */ -#define U8a(x) GETBYTE(x,3) -#define U8b(x) GETBYTE(x,2) -#define U8c(x) GETBYTE(x,1) -#define U8d(x) GETBYTE(x,0) - -/* CAST uses three different round functions */ -#define f1(l, r, km, kr) \ - t = rotlVariable(km + r, kr); \ - l ^= ((S[0][U8a(t)] ^ S[1][U8b(t)]) - \ - S[2][U8c(t)]) + S[3][U8d(t)]; -#define f2(l, r, km, kr) \ - t = rotlVariable(km ^ r, kr); \ - l ^= ((S[0][U8a(t)] - S[1][U8b(t)]) + \ - S[2][U8c(t)]) ^ S[3][U8d(t)]; -#define f3(l, r, km, kr) \ - t = rotlVariable(km - r, kr); \ - l ^= ((S[0][U8a(t)] + S[1][U8b(t)]) ^ \ - S[2][U8c(t)]) - S[3][U8d(t)]; - -#define F1(l, r, i, j) f1(l, r, K[i], K[i+j]) -#define F2(l, r, i, j) f2(l, r, K[i], K[i+j]) -#define F3(l, r, i, j) f3(l, r, K[i], K[i+j]) - -typedef BlockGetAndPut Block; - -void CAST128::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 t, l, r; - - /* Get inblock into l,r */ - Block::Get(inBlock)(l)(r); - /* Do the work */ - F1(l, r, 0, 16); - F2(r, l, 1, 16); - F3(l, r, 2, 16); - F1(r, l, 3, 16); - F2(l, r, 4, 16); - F3(r, l, 5, 16); - F1(l, r, 6, 16); - F2(r, l, 7, 16); - F3(l, r, 8, 16); - F1(r, l, 9, 16); - F2(l, r, 10, 16); - F3(r, l, 11, 16); - /* Only do full 16 rounds if key length > 80 bits */ - if (!reduced) { - F1(l, r, 12, 16); - F2(r, l, 13, 16); - F3(l, r, 14, 16); - F1(r, l, 15, 16); - } - /* Put l,r into outblock */ - Block::Put(xorBlock, outBlock)(r)(l); -} - -void CAST128::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 t, l, r; - - /* Get inblock into l,r */ - Block::Get(inBlock)(r)(l); - /* Only do full 16 rounds if key length > 80 bits */ - if (!reduced) { - F1(r, l, 15, 16); - F3(l, r, 14, 16); - F2(r, l, 13, 16); - F1(l, r, 12, 16); - } - F3(r, l, 11, 16); - F2(l, r, 10, 16); - F1(r, l, 9, 16); - F3(l, r, 8, 16); - F2(r, l, 7, 16); - F1(l, r, 6, 16); - F3(r, l, 5, 16); - F2(l, r, 4, 16); - F1(r, l, 3, 16); - F3(l, r, 2, 16); - F2(r, l, 1, 16); - F1(l, r, 0, 16); - /* Put l,r into outblock */ - Block::Put(xorBlock, outBlock)(l)(r); - /* Wipe clean */ - t = l = r = 0; -} - -void CAST128::Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - reduced = (keylength <= 10); - - word32 X[4], Z[4]; - GetUserKey(BIG_ENDIAN_ORDER, X, 4, userKey, keylength); - -#define x(i) GETBYTE(X[i/4], 3-i%4) -#define z(i) GETBYTE(Z[i/4], 3-i%4) - - unsigned int i; - for (i=0; i<=16; i+=16) - { - // this part is copied directly from RFC 2144 (with some search and replace) by Wei Dai - Z[0] = X[0] ^ S[4][x(0xD)] ^ S[5][x(0xF)] ^ S[6][x(0xC)] ^ S[7][x(0xE)] ^ S[6][x(0x8)]; - Z[1] = X[2] ^ S[4][z(0x0)] ^ S[5][z(0x2)] ^ S[6][z(0x1)] ^ S[7][z(0x3)] ^ S[7][x(0xA)]; - Z[2] = X[3] ^ S[4][z(0x7)] ^ S[5][z(0x6)] ^ S[6][z(0x5)] ^ S[7][z(0x4)] ^ S[4][x(0x9)]; - Z[3] = X[1] ^ S[4][z(0xA)] ^ S[5][z(0x9)] ^ S[6][z(0xB)] ^ S[7][z(0x8)] ^ S[5][x(0xB)]; - K[i+0] = S[4][z(0x8)] ^ S[5][z(0x9)] ^ S[6][z(0x7)] ^ S[7][z(0x6)] ^ S[4][z(0x2)]; - K[i+1] = S[4][z(0xA)] ^ S[5][z(0xB)] ^ S[6][z(0x5)] ^ S[7][z(0x4)] ^ S[5][z(0x6)]; - K[i+2] = S[4][z(0xC)] ^ S[5][z(0xD)] ^ S[6][z(0x3)] ^ S[7][z(0x2)] ^ S[6][z(0x9)]; - K[i+3] = S[4][z(0xE)] ^ S[5][z(0xF)] ^ S[6][z(0x1)] ^ S[7][z(0x0)] ^ S[7][z(0xC)]; - X[0] = Z[2] ^ S[4][z(0x5)] ^ S[5][z(0x7)] ^ S[6][z(0x4)] ^ S[7][z(0x6)] ^ S[6][z(0x0)]; - X[1] = Z[0] ^ S[4][x(0x0)] ^ S[5][x(0x2)] ^ S[6][x(0x1)] ^ S[7][x(0x3)] ^ S[7][z(0x2)]; - X[2] = Z[1] ^ S[4][x(0x7)] ^ S[5][x(0x6)] ^ S[6][x(0x5)] ^ S[7][x(0x4)] ^ S[4][z(0x1)]; - X[3] = Z[3] ^ S[4][x(0xA)] ^ S[5][x(0x9)] ^ S[6][x(0xB)] ^ S[7][x(0x8)] ^ S[5][z(0x3)]; - K[i+4] = S[4][x(0x3)] ^ S[5][x(0x2)] ^ S[6][x(0xC)] ^ S[7][x(0xD)] ^ S[4][x(0x8)]; - K[i+5] = S[4][x(0x1)] ^ S[5][x(0x0)] ^ S[6][x(0xE)] ^ S[7][x(0xF)] ^ S[5][x(0xD)]; - K[i+6] = S[4][x(0x7)] ^ S[5][x(0x6)] ^ S[6][x(0x8)] ^ S[7][x(0x9)] ^ S[6][x(0x3)]; - K[i+7] = S[4][x(0x5)] ^ S[5][x(0x4)] ^ S[6][x(0xA)] ^ S[7][x(0xB)] ^ S[7][x(0x7)]; - Z[0] = X[0] ^ S[4][x(0xD)] ^ S[5][x(0xF)] ^ S[6][x(0xC)] ^ S[7][x(0xE)] ^ S[6][x(0x8)]; - Z[1] = X[2] ^ S[4][z(0x0)] ^ S[5][z(0x2)] ^ S[6][z(0x1)] ^ S[7][z(0x3)] ^ S[7][x(0xA)]; - Z[2] = X[3] ^ S[4][z(0x7)] ^ S[5][z(0x6)] ^ S[6][z(0x5)] ^ S[7][z(0x4)] ^ S[4][x(0x9)]; - Z[3] = X[1] ^ S[4][z(0xA)] ^ S[5][z(0x9)] ^ S[6][z(0xB)] ^ S[7][z(0x8)] ^ S[5][x(0xB)]; - K[i+8] = S[4][z(0x3)] ^ S[5][z(0x2)] ^ S[6][z(0xC)] ^ S[7][z(0xD)] ^ S[4][z(0x9)]; - K[i+9] = S[4][z(0x1)] ^ S[5][z(0x0)] ^ S[6][z(0xE)] ^ S[7][z(0xF)] ^ S[5][z(0xC)]; - K[i+10] = S[4][z(0x7)] ^ S[5][z(0x6)] ^ S[6][z(0x8)] ^ S[7][z(0x9)] ^ S[6][z(0x2)]; - K[i+11] = S[4][z(0x5)] ^ S[5][z(0x4)] ^ S[6][z(0xA)] ^ S[7][z(0xB)] ^ S[7][z(0x6)]; - X[0] = Z[2] ^ S[4][z(0x5)] ^ S[5][z(0x7)] ^ S[6][z(0x4)] ^ S[7][z(0x6)] ^ S[6][z(0x0)]; - X[1] = Z[0] ^ S[4][x(0x0)] ^ S[5][x(0x2)] ^ S[6][x(0x1)] ^ S[7][x(0x3)] ^ S[7][z(0x2)]; - X[2] = Z[1] ^ S[4][x(0x7)] ^ S[5][x(0x6)] ^ S[6][x(0x5)] ^ S[7][x(0x4)] ^ S[4][z(0x1)]; - X[3] = Z[3] ^ S[4][x(0xA)] ^ S[5][x(0x9)] ^ S[6][x(0xB)] ^ S[7][x(0x8)] ^ S[5][z(0x3)]; - K[i+12] = S[4][x(0x8)] ^ S[5][x(0x9)] ^ S[6][x(0x7)] ^ S[7][x(0x6)] ^ S[4][x(0x3)]; - K[i+13] = S[4][x(0xA)] ^ S[5][x(0xB)] ^ S[6][x(0x5)] ^ S[7][x(0x4)] ^ S[5][x(0x7)]; - K[i+14] = S[4][x(0xC)] ^ S[5][x(0xD)] ^ S[6][x(0x3)] ^ S[7][x(0x2)] ^ S[6][x(0x8)]; - K[i+15] = S[4][x(0xE)] ^ S[5][x(0xF)] ^ S[6][x(0x1)] ^ S[7][x(0x0)] ^ S[7][x(0xD)]; - } - - for (i=16; i<32; i++) - K[i] &= 0x1f; -} - -// The following CAST-256 implementation was contributed by Leonard Janke - -const word32 CAST256::Base::t_m[8][24]={ -{ 0x5a827999, 0xd151d6a1, 0x482133a9, 0xbef090b1, 0x35bfedb9, 0xac8f4ac1, - 0x235ea7c9, 0x9a2e04d1, 0x10fd61d9, 0x87ccbee1, 0xfe9c1be9, 0x756b78f1, - 0xec3ad5f9, 0x630a3301, 0xd9d99009, 0x50a8ed11, 0xc7784a19, 0x3e47a721, - 0xb5170429, 0x2be66131, 0xa2b5be39, 0x19851b41, 0x90547849, 0x0723d551}, -{ 0xc95c653a, 0x402bc242, 0xb6fb1f4a, 0x2dca7c52, 0xa499d95a, 0x1b693662, - 0x9238936a, 0x0907f072, 0x7fd74d7a, 0xf6a6aa82, 0x6d76078a, 0xe4456492, - 0x5b14c19a, 0xd1e41ea2, 0x48b37baa, 0xbf82d8b2, 0x365235ba, 0xad2192c2, - 0x23f0efca, 0x9ac04cd2, 0x118fa9da, 0x885f06e2, 0xff2e63ea, 0x75fdc0f2}, -{ 0x383650db, 0xaf05ade3, 0x25d50aeb, 0x9ca467f3, 0x1373c4fb, 0x8a432203, - 0x01127f0b, 0x77e1dc13, 0xeeb1391b, 0x65809623, 0xdc4ff32b, 0x531f5033, - 0xc9eead3b, 0x40be0a43, 0xb78d674b, 0x2e5cc453, 0xa52c215b, 0x1bfb7e63, - 0x92cadb6b, 0x099a3873, 0x8069957b, 0xf738f283, 0x6e084f8b, 0xe4d7ac93}, -{ 0xa7103c7c, 0x1ddf9984, 0x94aef68c, 0x0b7e5394, 0x824db09c, 0xf91d0da4, - 0x6fec6aac, 0xe6bbc7b4, 0x5d8b24bc, 0xd45a81c4, 0x4b29decc, 0xc1f93bd4, - 0x38c898dc, 0xaf97f5e4, 0x266752ec, 0x9d36aff4, 0x14060cfc, 0x8ad56a04, - 0x01a4c70c, 0x78742414, 0xef43811c, 0x6612de24, 0xdce23b2c, 0x53b19834}, -{ 0x15ea281d, 0x8cb98525, 0x0388e22d, 0x7a583f35, 0xf1279c3d, 0x67f6f945, - 0xdec6564d, 0x5595b355, 0xcc65105d, 0x43346d65, 0xba03ca6d, 0x30d32775, - 0xa7a2847d, 0x1e71e185, 0x95413e8d, 0x0c109b95, 0x82dff89d, 0xf9af55a5, - 0x707eb2ad, 0xe74e0fb5, 0x5e1d6cbd, 0xd4ecc9c5, 0x4bbc26cd, 0xc28b83d5}, -{ 0x84c413be, 0xfb9370c6, 0x7262cdce, 0xe9322ad6, 0x600187de, 0xd6d0e4e6, - 0x4da041ee, 0xc46f9ef6, 0x3b3efbfe, 0xb20e5906, 0x28ddb60e, 0x9fad1316, - 0x167c701e, 0x8d4bcd26, 0x041b2a2e, 0x7aea8736, 0xf1b9e43e, 0x68894146, - 0xdf589e4e, 0x5627fb56, 0xccf7585e, 0x43c6b566, 0xba96126e, 0x31656f76}, -{ 0xf39dff5f, 0x6a6d5c67, 0xe13cb96f, 0x580c1677, 0xcedb737f, 0x45aad087, - 0xbc7a2d8f, 0x33498a97, 0xaa18e79f, 0x20e844a7, 0x97b7a1af, 0x0e86feb7, - 0x85565bbf, 0xfc25b8c7, 0x72f515cf, 0xe9c472d7, 0x6093cfdf, 0xd7632ce7, - 0x4e3289ef, 0xc501e6f7, 0x3bd143ff, 0xb2a0a107, 0x296ffe0f, 0xa03f5b17}, -{ 0x6277eb00, 0xd9474808, 0x5016a510, 0xc6e60218, 0x3db55f20, 0xb484bc28, - 0x2b541930, 0xa2237638, 0x18f2d340, 0x8fc23048, 0x06918d50, 0x7d60ea58, - 0xf4304760, 0x6affa468, 0xe1cf0170, 0x589e5e78, 0xcf6dbb80, 0x463d1888, - 0xbd0c7590, 0x33dbd298, 0xaaab2fa0, 0x217a8ca8, 0x9849e9b0, 0x0f1946b8} -}; - -const unsigned int CAST256::Base::t_r[8][24]={ - {19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11, 19, 27, 3, 11}, - {4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28, 4, 12, 20, 28}, - {21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13, 21, 29, 5, 13}, - {6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30, 6, 14, 22, 30}, - {23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15, 23, 31, 7, 15}, - {8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0, 8, 16, 24, 0}, - {25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17, 25, 1, 9, 17}, - {10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2, 10, 18, 26, 2} -}; - -#define Q(i) \ - F1(block[2],block[3],8*i+4,-4); \ - F2(block[1],block[2],8*i+5,-4); \ - F3(block[0],block[1],8*i+6,-4); \ - F1(block[3],block[0],8*i+7,-4); - -#define QBar(i) \ - F1(block[3],block[0],8*i+7,-4); \ - F3(block[0],block[1],8*i+6,-4); \ - F2(block[1],block[2],8*i+5,-4); \ - F1(block[2],block[3],8*i+4,-4); - -/* CAST256's encrypt/decrypt functions are identical except for the order that -the keys are used */ - -void CAST256::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 t, block[4]; - Block::Get(inBlock)(block[0])(block[1])(block[2])(block[3]); - - // Perform 6 forward quad rounds - Q(0); - Q(1); - Q(2); - Q(3); - Q(4); - Q(5); - - // Perform 6 reverse quad rounds - QBar(6); - QBar(7); - QBar(8); - QBar(9); - QBar(10); - QBar(11); - - Block::Put(xorBlock, outBlock)(block[0])(block[1])(block[2])(block[3]); -} - -/* Set up a CAST-256 key */ - -void CAST256::Base::Omega(int i, word32 kappa[8]) -{ - word32 t; - - f1(kappa[6],kappa[7],t_m[0][i],t_r[0][i]); - f2(kappa[5],kappa[6],t_m[1][i],t_r[1][i]); - f3(kappa[4],kappa[5],t_m[2][i],t_r[2][i]); - f1(kappa[3],kappa[4],t_m[3][i],t_r[3][i]); - f2(kappa[2],kappa[3],t_m[4][i],t_r[4][i]); - f3(kappa[1],kappa[2],t_m[5][i],t_r[5][i]); - f1(kappa[0],kappa[1],t_m[6][i],t_r[6][i]); - f2(kappa[7],kappa[0],t_m[7][i],t_r[7][i]); -} - -void CAST256::Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - word32 kappa[8]; - GetUserKey(BIG_ENDIAN_ORDER, kappa, 8, userKey, keylength); - - for(int i=0; i<12; ++i) - { - Omega(2*i,kappa); - Omega(2*i+1,kappa); - - K[8*i]=kappa[0] & 31; - K[8*i+1]=kappa[2] & 31; - K[8*i+2]=kappa[4] & 31; - K[8*i+3]=kappa[6] & 31; - K[8*i+4]=kappa[7]; - K[8*i+5]=kappa[5]; - K[8*i+6]=kappa[3]; - K[8*i+7]=kappa[1]; - } - - if (!IsForwardTransformation()) - { - for(int j=0; j<6; ++j) - { - for(int i=0; i<4; ++i) - { - int i1=8*j+i; - int i2=8*(11-j)+i; - - assert(i1, public VariableKeyLength<16, 5, 16> -{ - static const char *StaticAlgorithmName() {return "CAST-128";} -}; - -/// CAST-128 -class CAST128 : public CAST128_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - bool reduced; - FixedSizeSecBlock K; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -//! algorithm info -struct CAST256_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32> -{ - static const char *StaticAlgorithmName() {return "CAST-256";} -}; - -//! CAST-256 -class CAST256 : public CAST256_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - static const word32 t_m[8][24]; - static const unsigned int t_r[8][24]; - - static void Omega(int i, word32 kappa[8]); - - FixedSizeSecBlock K; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef CAST128::Encryption CAST128Encryption; -typedef CAST128::Decryption CAST128Decryption; - -typedef CAST256::Encryption CAST256Encryption; -typedef CAST256::Decryption CAST256Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/casts.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/casts.cpp deleted file mode 100644 index 16fa2b13..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/casts.cpp +++ /dev/null @@ -1,545 +0,0 @@ -#include "pch.h" -#include "cast.h" - -NAMESPACE_BEGIN(CryptoPP) - -// CAST S-boxes - -const word32 CAST::S[8][256] = { -{ - 0x30FB40D4UL, 0x9FA0FF0BUL, 0x6BECCD2FUL, 0x3F258C7AUL, - 0x1E213F2FUL, 0x9C004DD3UL, 0x6003E540UL, 0xCF9FC949UL, - 0xBFD4AF27UL, 0x88BBBDB5UL, 0xE2034090UL, 0x98D09675UL, - 0x6E63A0E0UL, 0x15C361D2UL, 0xC2E7661DUL, 0x22D4FF8EUL, - 0x28683B6FUL, 0xC07FD059UL, 0xFF2379C8UL, 0x775F50E2UL, - 0x43C340D3UL, 0xDF2F8656UL, 0x887CA41AUL, 0xA2D2BD2DUL, - 0xA1C9E0D6UL, 0x346C4819UL, 0x61B76D87UL, 0x22540F2FUL, - 0x2ABE32E1UL, 0xAA54166BUL, 0x22568E3AUL, 0xA2D341D0UL, - 0x66DB40C8UL, 0xA784392FUL, 0x004DFF2FUL, 0x2DB9D2DEUL, - 0x97943FACUL, 0x4A97C1D8UL, 0x527644B7UL, 0xB5F437A7UL, - 0xB82CBAEFUL, 0xD751D159UL, 0x6FF7F0EDUL, 0x5A097A1FUL, - 0x827B68D0UL, 0x90ECF52EUL, 0x22B0C054UL, 0xBC8E5935UL, - 0x4B6D2F7FUL, 0x50BB64A2UL, 0xD2664910UL, 0xBEE5812DUL, - 0xB7332290UL, 0xE93B159FUL, 0xB48EE411UL, 0x4BFF345DUL, - 0xFD45C240UL, 0xAD31973FUL, 0xC4F6D02EUL, 0x55FC8165UL, - 0xD5B1CAADUL, 0xA1AC2DAEUL, 0xA2D4B76DUL, 0xC19B0C50UL, - 0x882240F2UL, 0x0C6E4F38UL, 0xA4E4BFD7UL, 0x4F5BA272UL, - 0x564C1D2FUL, 0xC59C5319UL, 0xB949E354UL, 0xB04669FEUL, - 0xB1B6AB8AUL, 0xC71358DDUL, 0x6385C545UL, 0x110F935DUL, - 0x57538AD5UL, 0x6A390493UL, 0xE63D37E0UL, 0x2A54F6B3UL, - 0x3A787D5FUL, 0x6276A0B5UL, 0x19A6FCDFUL, 0x7A42206AUL, - 0x29F9D4D5UL, 0xF61B1891UL, 0xBB72275EUL, 0xAA508167UL, - 0x38901091UL, 0xC6B505EBUL, 0x84C7CB8CUL, 0x2AD75A0FUL, - 0x874A1427UL, 0xA2D1936BUL, 0x2AD286AFUL, 0xAA56D291UL, - 0xD7894360UL, 0x425C750DUL, 0x93B39E26UL, 0x187184C9UL, - 0x6C00B32DUL, 0x73E2BB14UL, 0xA0BEBC3CUL, 0x54623779UL, - 0x64459EABUL, 0x3F328B82UL, 0x7718CF82UL, 0x59A2CEA6UL, - 0x04EE002EUL, 0x89FE78E6UL, 0x3FAB0950UL, 0x325FF6C2UL, - 0x81383F05UL, 0x6963C5C8UL, 0x76CB5AD6UL, 0xD49974C9UL, - 0xCA180DCFUL, 0x380782D5UL, 0xC7FA5CF6UL, 0x8AC31511UL, - 0x35E79E13UL, 0x47DA91D0UL, 0xF40F9086UL, 0xA7E2419EUL, - 0x31366241UL, 0x051EF495UL, 0xAA573B04UL, 0x4A805D8DUL, - 0x548300D0UL, 0x00322A3CUL, 0xBF64CDDFUL, 0xBA57A68EUL, - 0x75C6372BUL, 0x50AFD341UL, 0xA7C13275UL, 0x915A0BF5UL, - 0x6B54BFABUL, 0x2B0B1426UL, 0xAB4CC9D7UL, 0x449CCD82UL, - 0xF7FBF265UL, 0xAB85C5F3UL, 0x1B55DB94UL, 0xAAD4E324UL, - 0xCFA4BD3FUL, 0x2DEAA3E2UL, 0x9E204D02UL, 0xC8BD25ACUL, - 0xEADF55B3UL, 0xD5BD9E98UL, 0xE31231B2UL, 0x2AD5AD6CUL, - 0x954329DEUL, 0xADBE4528UL, 0xD8710F69UL, 0xAA51C90FUL, - 0xAA786BF6UL, 0x22513F1EUL, 0xAA51A79BUL, 0x2AD344CCUL, - 0x7B5A41F0UL, 0xD37CFBADUL, 0x1B069505UL, 0x41ECE491UL, - 0xB4C332E6UL, 0x032268D4UL, 0xC9600ACCUL, 0xCE387E6DUL, - 0xBF6BB16CUL, 0x6A70FB78UL, 0x0D03D9C9UL, 0xD4DF39DEUL, - 0xE01063DAUL, 0x4736F464UL, 0x5AD328D8UL, 0xB347CC96UL, - 0x75BB0FC3UL, 0x98511BFBUL, 0x4FFBCC35UL, 0xB58BCF6AUL, - 0xE11F0ABCUL, 0xBFC5FE4AUL, 0xA70AEC10UL, 0xAC39570AUL, - 0x3F04442FUL, 0x6188B153UL, 0xE0397A2EUL, 0x5727CB79UL, - 0x9CEB418FUL, 0x1CACD68DUL, 0x2AD37C96UL, 0x0175CB9DUL, - 0xC69DFF09UL, 0xC75B65F0UL, 0xD9DB40D8UL, 0xEC0E7779UL, - 0x4744EAD4UL, 0xB11C3274UL, 0xDD24CB9EUL, 0x7E1C54BDUL, - 0xF01144F9UL, 0xD2240EB1UL, 0x9675B3FDUL, 0xA3AC3755UL, - 0xD47C27AFUL, 0x51C85F4DUL, 0x56907596UL, 0xA5BB15E6UL, - 0x580304F0UL, 0xCA042CF1UL, 0x011A37EAUL, 0x8DBFAADBUL, - 0x35BA3E4AUL, 0x3526FFA0UL, 0xC37B4D09UL, 0xBC306ED9UL, - 0x98A52666UL, 0x5648F725UL, 0xFF5E569DUL, 0x0CED63D0UL, - 0x7C63B2CFUL, 0x700B45E1UL, 0xD5EA50F1UL, 0x85A92872UL, - 0xAF1FBDA7UL, 0xD4234870UL, 0xA7870BF3UL, 0x2D3B4D79UL, - 0x42E04198UL, 0x0CD0EDE7UL, 0x26470DB8UL, 0xF881814CUL, - 0x474D6AD7UL, 0x7C0C5E5CUL, 0xD1231959UL, 0x381B7298UL, - 0xF5D2F4DBUL, 0xAB838653UL, 0x6E2F1E23UL, 0x83719C9EUL, - 0xBD91E046UL, 0x9A56456EUL, 0xDC39200CUL, 0x20C8C571UL, - 0x962BDA1CUL, 0xE1E696FFUL, 0xB141AB08UL, 0x7CCA89B9UL, - 0x1A69E783UL, 0x02CC4843UL, 0xA2F7C579UL, 0x429EF47DUL, - 0x427B169CUL, 0x5AC9F049UL, 0xDD8F0F00UL, 0x5C8165BFUL -}, - -{ - 0x1F201094UL, 0xEF0BA75BUL, 0x69E3CF7EUL, 0x393F4380UL, - 0xFE61CF7AUL, 0xEEC5207AUL, 0x55889C94UL, 0x72FC0651UL, - 0xADA7EF79UL, 0x4E1D7235UL, 0xD55A63CEUL, 0xDE0436BAUL, - 0x99C430EFUL, 0x5F0C0794UL, 0x18DCDB7DUL, 0xA1D6EFF3UL, - 0xA0B52F7BUL, 0x59E83605UL, 0xEE15B094UL, 0xE9FFD909UL, - 0xDC440086UL, 0xEF944459UL, 0xBA83CCB3UL, 0xE0C3CDFBUL, - 0xD1DA4181UL, 0x3B092AB1UL, 0xF997F1C1UL, 0xA5E6CF7BUL, - 0x01420DDBUL, 0xE4E7EF5BUL, 0x25A1FF41UL, 0xE180F806UL, - 0x1FC41080UL, 0x179BEE7AUL, 0xD37AC6A9UL, 0xFE5830A4UL, - 0x98DE8B7FUL, 0x77E83F4EUL, 0x79929269UL, 0x24FA9F7BUL, - 0xE113C85BUL, 0xACC40083UL, 0xD7503525UL, 0xF7EA615FUL, - 0x62143154UL, 0x0D554B63UL, 0x5D681121UL, 0xC866C359UL, - 0x3D63CF73UL, 0xCEE234C0UL, 0xD4D87E87UL, 0x5C672B21UL, - 0x071F6181UL, 0x39F7627FUL, 0x361E3084UL, 0xE4EB573BUL, - 0x602F64A4UL, 0xD63ACD9CUL, 0x1BBC4635UL, 0x9E81032DUL, - 0x2701F50CUL, 0x99847AB4UL, 0xA0E3DF79UL, 0xBA6CF38CUL, - 0x10843094UL, 0x2537A95EUL, 0xF46F6FFEUL, 0xA1FF3B1FUL, - 0x208CFB6AUL, 0x8F458C74UL, 0xD9E0A227UL, 0x4EC73A34UL, - 0xFC884F69UL, 0x3E4DE8DFUL, 0xEF0E0088UL, 0x3559648DUL, - 0x8A45388CUL, 0x1D804366UL, 0x721D9BFDUL, 0xA58684BBUL, - 0xE8256333UL, 0x844E8212UL, 0x128D8098UL, 0xFED33FB4UL, - 0xCE280AE1UL, 0x27E19BA5UL, 0xD5A6C252UL, 0xE49754BDUL, - 0xC5D655DDUL, 0xEB667064UL, 0x77840B4DUL, 0xA1B6A801UL, - 0x84DB26A9UL, 0xE0B56714UL, 0x21F043B7UL, 0xE5D05860UL, - 0x54F03084UL, 0x066FF472UL, 0xA31AA153UL, 0xDADC4755UL, - 0xB5625DBFUL, 0x68561BE6UL, 0x83CA6B94UL, 0x2D6ED23BUL, - 0xECCF01DBUL, 0xA6D3D0BAUL, 0xB6803D5CUL, 0xAF77A709UL, - 0x33B4A34CUL, 0x397BC8D6UL, 0x5EE22B95UL, 0x5F0E5304UL, - 0x81ED6F61UL, 0x20E74364UL, 0xB45E1378UL, 0xDE18639BUL, - 0x881CA122UL, 0xB96726D1UL, 0x8049A7E8UL, 0x22B7DA7BUL, - 0x5E552D25UL, 0x5272D237UL, 0x79D2951CUL, 0xC60D894CUL, - 0x488CB402UL, 0x1BA4FE5BUL, 0xA4B09F6BUL, 0x1CA815CFUL, - 0xA20C3005UL, 0x8871DF63UL, 0xB9DE2FCBUL, 0x0CC6C9E9UL, - 0x0BEEFF53UL, 0xE3214517UL, 0xB4542835UL, 0x9F63293CUL, - 0xEE41E729UL, 0x6E1D2D7CUL, 0x50045286UL, 0x1E6685F3UL, - 0xF33401C6UL, 0x30A22C95UL, 0x31A70850UL, 0x60930F13UL, - 0x73F98417UL, 0xA1269859UL, 0xEC645C44UL, 0x52C877A9UL, - 0xCDFF33A6UL, 0xA02B1741UL, 0x7CBAD9A2UL, 0x2180036FUL, - 0x50D99C08UL, 0xCB3F4861UL, 0xC26BD765UL, 0x64A3F6ABUL, - 0x80342676UL, 0x25A75E7BUL, 0xE4E6D1FCUL, 0x20C710E6UL, - 0xCDF0B680UL, 0x17844D3BUL, 0x31EEF84DUL, 0x7E0824E4UL, - 0x2CCB49EBUL, 0x846A3BAEUL, 0x8FF77888UL, 0xEE5D60F6UL, - 0x7AF75673UL, 0x2FDD5CDBUL, 0xA11631C1UL, 0x30F66F43UL, - 0xB3FAEC54UL, 0x157FD7FAUL, 0xEF8579CCUL, 0xD152DE58UL, - 0xDB2FFD5EUL, 0x8F32CE19UL, 0x306AF97AUL, 0x02F03EF8UL, - 0x99319AD5UL, 0xC242FA0FUL, 0xA7E3EBB0UL, 0xC68E4906UL, - 0xB8DA230CUL, 0x80823028UL, 0xDCDEF3C8UL, 0xD35FB171UL, - 0x088A1BC8UL, 0xBEC0C560UL, 0x61A3C9E8UL, 0xBCA8F54DUL, - 0xC72FEFFAUL, 0x22822E99UL, 0x82C570B4UL, 0xD8D94E89UL, - 0x8B1C34BCUL, 0x301E16E6UL, 0x273BE979UL, 0xB0FFEAA6UL, - 0x61D9B8C6UL, 0x00B24869UL, 0xB7FFCE3FUL, 0x08DC283BUL, - 0x43DAF65AUL, 0xF7E19798UL, 0x7619B72FUL, 0x8F1C9BA4UL, - 0xDC8637A0UL, 0x16A7D3B1UL, 0x9FC393B7UL, 0xA7136EEBUL, - 0xC6BCC63EUL, 0x1A513742UL, 0xEF6828BCUL, 0x520365D6UL, - 0x2D6A77ABUL, 0x3527ED4BUL, 0x821FD216UL, 0x095C6E2EUL, - 0xDB92F2FBUL, 0x5EEA29CBUL, 0x145892F5UL, 0x91584F7FUL, - 0x5483697BUL, 0x2667A8CCUL, 0x85196048UL, 0x8C4BACEAUL, - 0x833860D4UL, 0x0D23E0F9UL, 0x6C387E8AUL, 0x0AE6D249UL, - 0xB284600CUL, 0xD835731DUL, 0xDCB1C647UL, 0xAC4C56EAUL, - 0x3EBD81B3UL, 0x230EABB0UL, 0x6438BC87UL, 0xF0B5B1FAUL, - 0x8F5EA2B3UL, 0xFC184642UL, 0x0A036B7AUL, 0x4FB089BDUL, - 0x649DA589UL, 0xA345415EUL, 0x5C038323UL, 0x3E5D3BB9UL, - 0x43D79572UL, 0x7E6DD07CUL, 0x06DFDF1EUL, 0x6C6CC4EFUL, - 0x7160A539UL, 0x73BFBE70UL, 0x83877605UL, 0x4523ECF1UL -}, - -{ - 0x8DEFC240UL, 0x25FA5D9FUL, 0xEB903DBFUL, 0xE810C907UL, - 0x47607FFFUL, 0x369FE44BUL, 0x8C1FC644UL, 0xAECECA90UL, - 0xBEB1F9BFUL, 0xEEFBCAEAUL, 0xE8CF1950UL, 0x51DF07AEUL, - 0x920E8806UL, 0xF0AD0548UL, 0xE13C8D83UL, 0x927010D5UL, - 0x11107D9FUL, 0x07647DB9UL, 0xB2E3E4D4UL, 0x3D4F285EUL, - 0xB9AFA820UL, 0xFADE82E0UL, 0xA067268BUL, 0x8272792EUL, - 0x553FB2C0UL, 0x489AE22BUL, 0xD4EF9794UL, 0x125E3FBCUL, - 0x21FFFCEEUL, 0x825B1BFDUL, 0x9255C5EDUL, 0x1257A240UL, - 0x4E1A8302UL, 0xBAE07FFFUL, 0x528246E7UL, 0x8E57140EUL, - 0x3373F7BFUL, 0x8C9F8188UL, 0xA6FC4EE8UL, 0xC982B5A5UL, - 0xA8C01DB7UL, 0x579FC264UL, 0x67094F31UL, 0xF2BD3F5FUL, - 0x40FFF7C1UL, 0x1FB78DFCUL, 0x8E6BD2C1UL, 0x437BE59BUL, - 0x99B03DBFUL, 0xB5DBC64BUL, 0x638DC0E6UL, 0x55819D99UL, - 0xA197C81CUL, 0x4A012D6EUL, 0xC5884A28UL, 0xCCC36F71UL, - 0xB843C213UL, 0x6C0743F1UL, 0x8309893CUL, 0x0FEDDD5FUL, - 0x2F7FE850UL, 0xD7C07F7EUL, 0x02507FBFUL, 0x5AFB9A04UL, - 0xA747D2D0UL, 0x1651192EUL, 0xAF70BF3EUL, 0x58C31380UL, - 0x5F98302EUL, 0x727CC3C4UL, 0x0A0FB402UL, 0x0F7FEF82UL, - 0x8C96FDADUL, 0x5D2C2AAEUL, 0x8EE99A49UL, 0x50DA88B8UL, - 0x8427F4A0UL, 0x1EAC5790UL, 0x796FB449UL, 0x8252DC15UL, - 0xEFBD7D9BUL, 0xA672597DUL, 0xADA840D8UL, 0x45F54504UL, - 0xFA5D7403UL, 0xE83EC305UL, 0x4F91751AUL, 0x925669C2UL, - 0x23EFE941UL, 0xA903F12EUL, 0x60270DF2UL, 0x0276E4B6UL, - 0x94FD6574UL, 0x927985B2UL, 0x8276DBCBUL, 0x02778176UL, - 0xF8AF918DUL, 0x4E48F79EUL, 0x8F616DDFUL, 0xE29D840EUL, - 0x842F7D83UL, 0x340CE5C8UL, 0x96BBB682UL, 0x93B4B148UL, - 0xEF303CABUL, 0x984FAF28UL, 0x779FAF9BUL, 0x92DC560DUL, - 0x224D1E20UL, 0x8437AA88UL, 0x7D29DC96UL, 0x2756D3DCUL, - 0x8B907CEEUL, 0xB51FD240UL, 0xE7C07CE3UL, 0xE566B4A1UL, - 0xC3E9615EUL, 0x3CF8209DUL, 0x6094D1E3UL, 0xCD9CA341UL, - 0x5C76460EUL, 0x00EA983BUL, 0xD4D67881UL, 0xFD47572CUL, - 0xF76CEDD9UL, 0xBDA8229CUL, 0x127DADAAUL, 0x438A074EUL, - 0x1F97C090UL, 0x081BDB8AUL, 0x93A07EBEUL, 0xB938CA15UL, - 0x97B03CFFUL, 0x3DC2C0F8UL, 0x8D1AB2ECUL, 0x64380E51UL, - 0x68CC7BFBUL, 0xD90F2788UL, 0x12490181UL, 0x5DE5FFD4UL, - 0xDD7EF86AUL, 0x76A2E214UL, 0xB9A40368UL, 0x925D958FUL, - 0x4B39FFFAUL, 0xBA39AEE9UL, 0xA4FFD30BUL, 0xFAF7933BUL, - 0x6D498623UL, 0x193CBCFAUL, 0x27627545UL, 0x825CF47AUL, - 0x61BD8BA0UL, 0xD11E42D1UL, 0xCEAD04F4UL, 0x127EA392UL, - 0x10428DB7UL, 0x8272A972UL, 0x9270C4A8UL, 0x127DE50BUL, - 0x285BA1C8UL, 0x3C62F44FUL, 0x35C0EAA5UL, 0xE805D231UL, - 0x428929FBUL, 0xB4FCDF82UL, 0x4FB66A53UL, 0x0E7DC15BUL, - 0x1F081FABUL, 0x108618AEUL, 0xFCFD086DUL, 0xF9FF2889UL, - 0x694BCC11UL, 0x236A5CAEUL, 0x12DECA4DUL, 0x2C3F8CC5UL, - 0xD2D02DFEUL, 0xF8EF5896UL, 0xE4CF52DAUL, 0x95155B67UL, - 0x494A488CUL, 0xB9B6A80CUL, 0x5C8F82BCUL, 0x89D36B45UL, - 0x3A609437UL, 0xEC00C9A9UL, 0x44715253UL, 0x0A874B49UL, - 0xD773BC40UL, 0x7C34671CUL, 0x02717EF6UL, 0x4FEB5536UL, - 0xA2D02FFFUL, 0xD2BF60C4UL, 0xD43F03C0UL, 0x50B4EF6DUL, - 0x07478CD1UL, 0x006E1888UL, 0xA2E53F55UL, 0xB9E6D4BCUL, - 0xA2048016UL, 0x97573833UL, 0xD7207D67UL, 0xDE0F8F3DUL, - 0x72F87B33UL, 0xABCC4F33UL, 0x7688C55DUL, 0x7B00A6B0UL, - 0x947B0001UL, 0x570075D2UL, 0xF9BB88F8UL, 0x8942019EUL, - 0x4264A5FFUL, 0x856302E0UL, 0x72DBD92BUL, 0xEE971B69UL, - 0x6EA22FDEUL, 0x5F08AE2BUL, 0xAF7A616DUL, 0xE5C98767UL, - 0xCF1FEBD2UL, 0x61EFC8C2UL, 0xF1AC2571UL, 0xCC8239C2UL, - 0x67214CB8UL, 0xB1E583D1UL, 0xB7DC3E62UL, 0x7F10BDCEUL, - 0xF90A5C38UL, 0x0FF0443DUL, 0x606E6DC6UL, 0x60543A49UL, - 0x5727C148UL, 0x2BE98A1DUL, 0x8AB41738UL, 0x20E1BE24UL, - 0xAF96DA0FUL, 0x68458425UL, 0x99833BE5UL, 0x600D457DUL, - 0x282F9350UL, 0x8334B362UL, 0xD91D1120UL, 0x2B6D8DA0UL, - 0x642B1E31UL, 0x9C305A00UL, 0x52BCE688UL, 0x1B03588AUL, - 0xF7BAEFD5UL, 0x4142ED9CUL, 0xA4315C11UL, 0x83323EC5UL, - 0xDFEF4636UL, 0xA133C501UL, 0xE9D3531CUL, 0xEE353783UL -}, - -{ - 0x9DB30420UL, 0x1FB6E9DEUL, 0xA7BE7BEFUL, 0xD273A298UL, - 0x4A4F7BDBUL, 0x64AD8C57UL, 0x85510443UL, 0xFA020ED1UL, - 0x7E287AFFUL, 0xE60FB663UL, 0x095F35A1UL, 0x79EBF120UL, - 0xFD059D43UL, 0x6497B7B1UL, 0xF3641F63UL, 0x241E4ADFUL, - 0x28147F5FUL, 0x4FA2B8CDUL, 0xC9430040UL, 0x0CC32220UL, - 0xFDD30B30UL, 0xC0A5374FUL, 0x1D2D00D9UL, 0x24147B15UL, - 0xEE4D111AUL, 0x0FCA5167UL, 0x71FF904CUL, 0x2D195FFEUL, - 0x1A05645FUL, 0x0C13FEFEUL, 0x081B08CAUL, 0x05170121UL, - 0x80530100UL, 0xE83E5EFEUL, 0xAC9AF4F8UL, 0x7FE72701UL, - 0xD2B8EE5FUL, 0x06DF4261UL, 0xBB9E9B8AUL, 0x7293EA25UL, - 0xCE84FFDFUL, 0xF5718801UL, 0x3DD64B04UL, 0xA26F263BUL, - 0x7ED48400UL, 0x547EEBE6UL, 0x446D4CA0UL, 0x6CF3D6F5UL, - 0x2649ABDFUL, 0xAEA0C7F5UL, 0x36338CC1UL, 0x503F7E93UL, - 0xD3772061UL, 0x11B638E1UL, 0x72500E03UL, 0xF80EB2BBUL, - 0xABE0502EUL, 0xEC8D77DEUL, 0x57971E81UL, 0xE14F6746UL, - 0xC9335400UL, 0x6920318FUL, 0x081DBB99UL, 0xFFC304A5UL, - 0x4D351805UL, 0x7F3D5CE3UL, 0xA6C866C6UL, 0x5D5BCCA9UL, - 0xDAEC6FEAUL, 0x9F926F91UL, 0x9F46222FUL, 0x3991467DUL, - 0xA5BF6D8EUL, 0x1143C44FUL, 0x43958302UL, 0xD0214EEBUL, - 0x022083B8UL, 0x3FB6180CUL, 0x18F8931EUL, 0x281658E6UL, - 0x26486E3EUL, 0x8BD78A70UL, 0x7477E4C1UL, 0xB506E07CUL, - 0xF32D0A25UL, 0x79098B02UL, 0xE4EABB81UL, 0x28123B23UL, - 0x69DEAD38UL, 0x1574CA16UL, 0xDF871B62UL, 0x211C40B7UL, - 0xA51A9EF9UL, 0x0014377BUL, 0x041E8AC8UL, 0x09114003UL, - 0xBD59E4D2UL, 0xE3D156D5UL, 0x4FE876D5UL, 0x2F91A340UL, - 0x557BE8DEUL, 0x00EAE4A7UL, 0x0CE5C2ECUL, 0x4DB4BBA6UL, - 0xE756BDFFUL, 0xDD3369ACUL, 0xEC17B035UL, 0x06572327UL, - 0x99AFC8B0UL, 0x56C8C391UL, 0x6B65811CUL, 0x5E146119UL, - 0x6E85CB75UL, 0xBE07C002UL, 0xC2325577UL, 0x893FF4ECUL, - 0x5BBFC92DUL, 0xD0EC3B25UL, 0xB7801AB7UL, 0x8D6D3B24UL, - 0x20C763EFUL, 0xC366A5FCUL, 0x9C382880UL, 0x0ACE3205UL, - 0xAAC9548AUL, 0xECA1D7C7UL, 0x041AFA32UL, 0x1D16625AUL, - 0x6701902CUL, 0x9B757A54UL, 0x31D477F7UL, 0x9126B031UL, - 0x36CC6FDBUL, 0xC70B8B46UL, 0xD9E66A48UL, 0x56E55A79UL, - 0x026A4CEBUL, 0x52437EFFUL, 0x2F8F76B4UL, 0x0DF980A5UL, - 0x8674CDE3UL, 0xEDDA04EBUL, 0x17A9BE04UL, 0x2C18F4DFUL, - 0xB7747F9DUL, 0xAB2AF7B4UL, 0xEFC34D20UL, 0x2E096B7CUL, - 0x1741A254UL, 0xE5B6A035UL, 0x213D42F6UL, 0x2C1C7C26UL, - 0x61C2F50FUL, 0x6552DAF9UL, 0xD2C231F8UL, 0x25130F69UL, - 0xD8167FA2UL, 0x0418F2C8UL, 0x001A96A6UL, 0x0D1526ABUL, - 0x63315C21UL, 0x5E0A72ECUL, 0x49BAFEFDUL, 0x187908D9UL, - 0x8D0DBD86UL, 0x311170A7UL, 0x3E9B640CUL, 0xCC3E10D7UL, - 0xD5CAD3B6UL, 0x0CAEC388UL, 0xF73001E1UL, 0x6C728AFFUL, - 0x71EAE2A1UL, 0x1F9AF36EUL, 0xCFCBD12FUL, 0xC1DE8417UL, - 0xAC07BE6BUL, 0xCB44A1D8UL, 0x8B9B0F56UL, 0x013988C3UL, - 0xB1C52FCAUL, 0xB4BE31CDUL, 0xD8782806UL, 0x12A3A4E2UL, - 0x6F7DE532UL, 0x58FD7EB6UL, 0xD01EE900UL, 0x24ADFFC2UL, - 0xF4990FC5UL, 0x9711AAC5UL, 0x001D7B95UL, 0x82E5E7D2UL, - 0x109873F6UL, 0x00613096UL, 0xC32D9521UL, 0xADA121FFUL, - 0x29908415UL, 0x7FBB977FUL, 0xAF9EB3DBUL, 0x29C9ED2AUL, - 0x5CE2A465UL, 0xA730F32CUL, 0xD0AA3FE8UL, 0x8A5CC091UL, - 0xD49E2CE7UL, 0x0CE454A9UL, 0xD60ACD86UL, 0x015F1919UL, - 0x77079103UL, 0xDEA03AF6UL, 0x78A8565EUL, 0xDEE356DFUL, - 0x21F05CBEUL, 0x8B75E387UL, 0xB3C50651UL, 0xB8A5C3EFUL, - 0xD8EEB6D2UL, 0xE523BE77UL, 0xC2154529UL, 0x2F69EFDFUL, - 0xAFE67AFBUL, 0xF470C4B2UL, 0xF3E0EB5BUL, 0xD6CC9876UL, - 0x39E4460CUL, 0x1FDA8538UL, 0x1987832FUL, 0xCA007367UL, - 0xA99144F8UL, 0x296B299EUL, 0x492FC295UL, 0x9266BEABUL, - 0xB5676E69UL, 0x9BD3DDDAUL, 0xDF7E052FUL, 0xDB25701CUL, - 0x1B5E51EEUL, 0xF65324E6UL, 0x6AFCE36CUL, 0x0316CC04UL, - 0x8644213EUL, 0xB7DC59D0UL, 0x7965291FUL, 0xCCD6FD43UL, - 0x41823979UL, 0x932BCDF6UL, 0xB657C34DUL, 0x4EDFD282UL, - 0x7AE5290CUL, 0x3CB9536BUL, 0x851E20FEUL, 0x9833557EUL, - 0x13ECF0B0UL, 0xD3FFB372UL, 0x3F85C5C1UL, 0x0AEF7ED2UL -}, - -{ - 0x7EC90C04UL, 0x2C6E74B9UL, 0x9B0E66DFUL, 0xA6337911UL, - 0xB86A7FFFUL, 0x1DD358F5UL, 0x44DD9D44UL, 0x1731167FUL, - 0x08FBF1FAUL, 0xE7F511CCUL, 0xD2051B00UL, 0x735ABA00UL, - 0x2AB722D8UL, 0x386381CBUL, 0xACF6243AUL, 0x69BEFD7AUL, - 0xE6A2E77FUL, 0xF0C720CDUL, 0xC4494816UL, 0xCCF5C180UL, - 0x38851640UL, 0x15B0A848UL, 0xE68B18CBUL, 0x4CAADEFFUL, - 0x5F480A01UL, 0x0412B2AAUL, 0x259814FCUL, 0x41D0EFE2UL, - 0x4E40B48DUL, 0x248EB6FBUL, 0x8DBA1CFEUL, 0x41A99B02UL, - 0x1A550A04UL, 0xBA8F65CBUL, 0x7251F4E7UL, 0x95A51725UL, - 0xC106ECD7UL, 0x97A5980AUL, 0xC539B9AAUL, 0x4D79FE6AUL, - 0xF2F3F763UL, 0x68AF8040UL, 0xED0C9E56UL, 0x11B4958BUL, - 0xE1EB5A88UL, 0x8709E6B0UL, 0xD7E07156UL, 0x4E29FEA7UL, - 0x6366E52DUL, 0x02D1C000UL, 0xC4AC8E05UL, 0x9377F571UL, - 0x0C05372AUL, 0x578535F2UL, 0x2261BE02UL, 0xD642A0C9UL, - 0xDF13A280UL, 0x74B55BD2UL, 0x682199C0UL, 0xD421E5ECUL, - 0x53FB3CE8UL, 0xC8ADEDB3UL, 0x28A87FC9UL, 0x3D959981UL, - 0x5C1FF900UL, 0xFE38D399UL, 0x0C4EFF0BUL, 0x062407EAUL, - 0xAA2F4FB1UL, 0x4FB96976UL, 0x90C79505UL, 0xB0A8A774UL, - 0xEF55A1FFUL, 0xE59CA2C2UL, 0xA6B62D27UL, 0xE66A4263UL, - 0xDF65001FUL, 0x0EC50966UL, 0xDFDD55BCUL, 0x29DE0655UL, - 0x911E739AUL, 0x17AF8975UL, 0x32C7911CUL, 0x89F89468UL, - 0x0D01E980UL, 0x524755F4UL, 0x03B63CC9UL, 0x0CC844B2UL, - 0xBCF3F0AAUL, 0x87AC36E9UL, 0xE53A7426UL, 0x01B3D82BUL, - 0x1A9E7449UL, 0x64EE2D7EUL, 0xCDDBB1DAUL, 0x01C94910UL, - 0xB868BF80UL, 0x0D26F3FDUL, 0x9342EDE7UL, 0x04A5C284UL, - 0x636737B6UL, 0x50F5B616UL, 0xF24766E3UL, 0x8ECA36C1UL, - 0x136E05DBUL, 0xFEF18391UL, 0xFB887A37UL, 0xD6E7F7D4UL, - 0xC7FB7DC9UL, 0x3063FCDFUL, 0xB6F589DEUL, 0xEC2941DAUL, - 0x26E46695UL, 0xB7566419UL, 0xF654EFC5UL, 0xD08D58B7UL, - 0x48925401UL, 0xC1BACB7FUL, 0xE5FF550FUL, 0xB6083049UL, - 0x5BB5D0E8UL, 0x87D72E5AUL, 0xAB6A6EE1UL, 0x223A66CEUL, - 0xC62BF3CDUL, 0x9E0885F9UL, 0x68CB3E47UL, 0x086C010FUL, - 0xA21DE820UL, 0xD18B69DEUL, 0xF3F65777UL, 0xFA02C3F6UL, - 0x407EDAC3UL, 0xCBB3D550UL, 0x1793084DUL, 0xB0D70EBAUL, - 0x0AB378D5UL, 0xD951FB0CUL, 0xDED7DA56UL, 0x4124BBE4UL, - 0x94CA0B56UL, 0x0F5755D1UL, 0xE0E1E56EUL, 0x6184B5BEUL, - 0x580A249FUL, 0x94F74BC0UL, 0xE327888EUL, 0x9F7B5561UL, - 0xC3DC0280UL, 0x05687715UL, 0x646C6BD7UL, 0x44904DB3UL, - 0x66B4F0A3UL, 0xC0F1648AUL, 0x697ED5AFUL, 0x49E92FF6UL, - 0x309E374FUL, 0x2CB6356AUL, 0x85808573UL, 0x4991F840UL, - 0x76F0AE02UL, 0x083BE84DUL, 0x28421C9AUL, 0x44489406UL, - 0x736E4CB8UL, 0xC1092910UL, 0x8BC95FC6UL, 0x7D869CF4UL, - 0x134F616FUL, 0x2E77118DUL, 0xB31B2BE1UL, 0xAA90B472UL, - 0x3CA5D717UL, 0x7D161BBAUL, 0x9CAD9010UL, 0xAF462BA2UL, - 0x9FE459D2UL, 0x45D34559UL, 0xD9F2DA13UL, 0xDBC65487UL, - 0xF3E4F94EUL, 0x176D486FUL, 0x097C13EAUL, 0x631DA5C7UL, - 0x445F7382UL, 0x175683F4UL, 0xCDC66A97UL, 0x70BE0288UL, - 0xB3CDCF72UL, 0x6E5DD2F3UL, 0x20936079UL, 0x459B80A5UL, - 0xBE60E2DBUL, 0xA9C23101UL, 0xEBA5315CUL, 0x224E42F2UL, - 0x1C5C1572UL, 0xF6721B2CUL, 0x1AD2FFF3UL, 0x8C25404EUL, - 0x324ED72FUL, 0x4067B7FDUL, 0x0523138EUL, 0x5CA3BC78UL, - 0xDC0FD66EUL, 0x75922283UL, 0x784D6B17UL, 0x58EBB16EUL, - 0x44094F85UL, 0x3F481D87UL, 0xFCFEAE7BUL, 0x77B5FF76UL, - 0x8C2302BFUL, 0xAAF47556UL, 0x5F46B02AUL, 0x2B092801UL, - 0x3D38F5F7UL, 0x0CA81F36UL, 0x52AF4A8AUL, 0x66D5E7C0UL, - 0xDF3B0874UL, 0x95055110UL, 0x1B5AD7A8UL, 0xF61ED5ADUL, - 0x6CF6E479UL, 0x20758184UL, 0xD0CEFA65UL, 0x88F7BE58UL, - 0x4A046826UL, 0x0FF6F8F3UL, 0xA09C7F70UL, 0x5346ABA0UL, - 0x5CE96C28UL, 0xE176EDA3UL, 0x6BAC307FUL, 0x376829D2UL, - 0x85360FA9UL, 0x17E3FE2AUL, 0x24B79767UL, 0xF5A96B20UL, - 0xD6CD2595UL, 0x68FF1EBFUL, 0x7555442CUL, 0xF19F06BEUL, - 0xF9E0659AUL, 0xEEB9491DUL, 0x34010718UL, 0xBB30CAB8UL, - 0xE822FE15UL, 0x88570983UL, 0x750E6249UL, 0xDA627E55UL, - 0x5E76FFA8UL, 0xB1534546UL, 0x6D47DE08UL, 0xEFE9E7D4UL -}, - -{ - 0xF6FA8F9DUL, 0x2CAC6CE1UL, 0x4CA34867UL, 0xE2337F7CUL, - 0x95DB08E7UL, 0x016843B4UL, 0xECED5CBCUL, 0x325553ACUL, - 0xBF9F0960UL, 0xDFA1E2EDUL, 0x83F0579DUL, 0x63ED86B9UL, - 0x1AB6A6B8UL, 0xDE5EBE39UL, 0xF38FF732UL, 0x8989B138UL, - 0x33F14961UL, 0xC01937BDUL, 0xF506C6DAUL, 0xE4625E7EUL, - 0xA308EA99UL, 0x4E23E33CUL, 0x79CBD7CCUL, 0x48A14367UL, - 0xA3149619UL, 0xFEC94BD5UL, 0xA114174AUL, 0xEAA01866UL, - 0xA084DB2DUL, 0x09A8486FUL, 0xA888614AUL, 0x2900AF98UL, - 0x01665991UL, 0xE1992863UL, 0xC8F30C60UL, 0x2E78EF3CUL, - 0xD0D51932UL, 0xCF0FEC14UL, 0xF7CA07D2UL, 0xD0A82072UL, - 0xFD41197EUL, 0x9305A6B0UL, 0xE86BE3DAUL, 0x74BED3CDUL, - 0x372DA53CUL, 0x4C7F4448UL, 0xDAB5D440UL, 0x6DBA0EC3UL, - 0x083919A7UL, 0x9FBAEED9UL, 0x49DBCFB0UL, 0x4E670C53UL, - 0x5C3D9C01UL, 0x64BDB941UL, 0x2C0E636AUL, 0xBA7DD9CDUL, - 0xEA6F7388UL, 0xE70BC762UL, 0x35F29ADBUL, 0x5C4CDD8DUL, - 0xF0D48D8CUL, 0xB88153E2UL, 0x08A19866UL, 0x1AE2EAC8UL, - 0x284CAF89UL, 0xAA928223UL, 0x9334BE53UL, 0x3B3A21BFUL, - 0x16434BE3UL, 0x9AEA3906UL, 0xEFE8C36EUL, 0xF890CDD9UL, - 0x80226DAEUL, 0xC340A4A3UL, 0xDF7E9C09UL, 0xA694A807UL, - 0x5B7C5ECCUL, 0x221DB3A6UL, 0x9A69A02FUL, 0x68818A54UL, - 0xCEB2296FUL, 0x53C0843AUL, 0xFE893655UL, 0x25BFE68AUL, - 0xB4628ABCUL, 0xCF222EBFUL, 0x25AC6F48UL, 0xA9A99387UL, - 0x53BDDB65UL, 0xE76FFBE7UL, 0xE967FD78UL, 0x0BA93563UL, - 0x8E342BC1UL, 0xE8A11BE9UL, 0x4980740DUL, 0xC8087DFCUL, - 0x8DE4BF99UL, 0xA11101A0UL, 0x7FD37975UL, 0xDA5A26C0UL, - 0xE81F994FUL, 0x9528CD89UL, 0xFD339FEDUL, 0xB87834BFUL, - 0x5F04456DUL, 0x22258698UL, 0xC9C4C83BUL, 0x2DC156BEUL, - 0x4F628DAAUL, 0x57F55EC5UL, 0xE2220ABEUL, 0xD2916EBFUL, - 0x4EC75B95UL, 0x24F2C3C0UL, 0x42D15D99UL, 0xCD0D7FA0UL, - 0x7B6E27FFUL, 0xA8DC8AF0UL, 0x7345C106UL, 0xF41E232FUL, - 0x35162386UL, 0xE6EA8926UL, 0x3333B094UL, 0x157EC6F2UL, - 0x372B74AFUL, 0x692573E4UL, 0xE9A9D848UL, 0xF3160289UL, - 0x3A62EF1DUL, 0xA787E238UL, 0xF3A5F676UL, 0x74364853UL, - 0x20951063UL, 0x4576698DUL, 0xB6FAD407UL, 0x592AF950UL, - 0x36F73523UL, 0x4CFB6E87UL, 0x7DA4CEC0UL, 0x6C152DAAUL, - 0xCB0396A8UL, 0xC50DFE5DUL, 0xFCD707ABUL, 0x0921C42FUL, - 0x89DFF0BBUL, 0x5FE2BE78UL, 0x448F4F33UL, 0x754613C9UL, - 0x2B05D08DUL, 0x48B9D585UL, 0xDC049441UL, 0xC8098F9BUL, - 0x7DEDE786UL, 0xC39A3373UL, 0x42410005UL, 0x6A091751UL, - 0x0EF3C8A6UL, 0x890072D6UL, 0x28207682UL, 0xA9A9F7BEUL, - 0xBF32679DUL, 0xD45B5B75UL, 0xB353FD00UL, 0xCBB0E358UL, - 0x830F220AUL, 0x1F8FB214UL, 0xD372CF08UL, 0xCC3C4A13UL, - 0x8CF63166UL, 0x061C87BEUL, 0x88C98F88UL, 0x6062E397UL, - 0x47CF8E7AUL, 0xB6C85283UL, 0x3CC2ACFBUL, 0x3FC06976UL, - 0x4E8F0252UL, 0x64D8314DUL, 0xDA3870E3UL, 0x1E665459UL, - 0xC10908F0UL, 0x513021A5UL, 0x6C5B68B7UL, 0x822F8AA0UL, - 0x3007CD3EUL, 0x74719EEFUL, 0xDC872681UL, 0x073340D4UL, - 0x7E432FD9UL, 0x0C5EC241UL, 0x8809286CUL, 0xF592D891UL, - 0x08A930F6UL, 0x957EF305UL, 0xB7FBFFBDUL, 0xC266E96FUL, - 0x6FE4AC98UL, 0xB173ECC0UL, 0xBC60B42AUL, 0x953498DAUL, - 0xFBA1AE12UL, 0x2D4BD736UL, 0x0F25FAABUL, 0xA4F3FCEBUL, - 0xE2969123UL, 0x257F0C3DUL, 0x9348AF49UL, 0x361400BCUL, - 0xE8816F4AUL, 0x3814F200UL, 0xA3F94043UL, 0x9C7A54C2UL, - 0xBC704F57UL, 0xDA41E7F9UL, 0xC25AD33AUL, 0x54F4A084UL, - 0xB17F5505UL, 0x59357CBEUL, 0xEDBD15C8UL, 0x7F97C5ABUL, - 0xBA5AC7B5UL, 0xB6F6DEAFUL, 0x3A479C3AUL, 0x5302DA25UL, - 0x653D7E6AUL, 0x54268D49UL, 0x51A477EAUL, 0x5017D55BUL, - 0xD7D25D88UL, 0x44136C76UL, 0x0404A8C8UL, 0xB8E5A121UL, - 0xB81A928AUL, 0x60ED5869UL, 0x97C55B96UL, 0xEAEC991BUL, - 0x29935913UL, 0x01FDB7F1UL, 0x088E8DFAUL, 0x9AB6F6F5UL, - 0x3B4CBF9FUL, 0x4A5DE3ABUL, 0xE6051D35UL, 0xA0E1D855UL, - 0xD36B4CF1UL, 0xF544EDEBUL, 0xB0E93524UL, 0xBEBB8FBDUL, - 0xA2D762CFUL, 0x49C92F54UL, 0x38B5F331UL, 0x7128A454UL, - 0x48392905UL, 0xA65B1DB8UL, 0x851C97BDUL, 0xD675CF2FUL -}, - -{ - 0x85E04019UL, 0x332BF567UL, 0x662DBFFFUL, 0xCFC65693UL, - 0x2A8D7F6FUL, 0xAB9BC912UL, 0xDE6008A1UL, 0x2028DA1FUL, - 0x0227BCE7UL, 0x4D642916UL, 0x18FAC300UL, 0x50F18B82UL, - 0x2CB2CB11UL, 0xB232E75CUL, 0x4B3695F2UL, 0xB28707DEUL, - 0xA05FBCF6UL, 0xCD4181E9UL, 0xE150210CUL, 0xE24EF1BDUL, - 0xB168C381UL, 0xFDE4E789UL, 0x5C79B0D8UL, 0x1E8BFD43UL, - 0x4D495001UL, 0x38BE4341UL, 0x913CEE1DUL, 0x92A79C3FUL, - 0x089766BEUL, 0xBAEEADF4UL, 0x1286BECFUL, 0xB6EACB19UL, - 0x2660C200UL, 0x7565BDE4UL, 0x64241F7AUL, 0x8248DCA9UL, - 0xC3B3AD66UL, 0x28136086UL, 0x0BD8DFA8UL, 0x356D1CF2UL, - 0x107789BEUL, 0xB3B2E9CEUL, 0x0502AA8FUL, 0x0BC0351EUL, - 0x166BF52AUL, 0xEB12FF82UL, 0xE3486911UL, 0xD34D7516UL, - 0x4E7B3AFFUL, 0x5F43671BUL, 0x9CF6E037UL, 0x4981AC83UL, - 0x334266CEUL, 0x8C9341B7UL, 0xD0D854C0UL, 0xCB3A6C88UL, - 0x47BC2829UL, 0x4725BA37UL, 0xA66AD22BUL, 0x7AD61F1EUL, - 0x0C5CBAFAUL, 0x4437F107UL, 0xB6E79962UL, 0x42D2D816UL, - 0x0A961288UL, 0xE1A5C06EUL, 0x13749E67UL, 0x72FC081AUL, - 0xB1D139F7UL, 0xF9583745UL, 0xCF19DF58UL, 0xBEC3F756UL, - 0xC06EBA30UL, 0x07211B24UL, 0x45C28829UL, 0xC95E317FUL, - 0xBC8EC511UL, 0x38BC46E9UL, 0xC6E6FA14UL, 0xBAE8584AUL, - 0xAD4EBC46UL, 0x468F508BUL, 0x7829435FUL, 0xF124183BUL, - 0x821DBA9FUL, 0xAFF60FF4UL, 0xEA2C4E6DUL, 0x16E39264UL, - 0x92544A8BUL, 0x009B4FC3UL, 0xABA68CEDUL, 0x9AC96F78UL, - 0x06A5B79AUL, 0xB2856E6EUL, 0x1AEC3CA9UL, 0xBE838688UL, - 0x0E0804E9UL, 0x55F1BE56UL, 0xE7E5363BUL, 0xB3A1F25DUL, - 0xF7DEBB85UL, 0x61FE033CUL, 0x16746233UL, 0x3C034C28UL, - 0xDA6D0C74UL, 0x79AAC56CUL, 0x3CE4E1ADUL, 0x51F0C802UL, - 0x98F8F35AUL, 0x1626A49FUL, 0xEED82B29UL, 0x1D382FE3UL, - 0x0C4FB99AUL, 0xBB325778UL, 0x3EC6D97BUL, 0x6E77A6A9UL, - 0xCB658B5CUL, 0xD45230C7UL, 0x2BD1408BUL, 0x60C03EB7UL, - 0xB9068D78UL, 0xA33754F4UL, 0xF430C87DUL, 0xC8A71302UL, - 0xB96D8C32UL, 0xEBD4E7BEUL, 0xBE8B9D2DUL, 0x7979FB06UL, - 0xE7225308UL, 0x8B75CF77UL, 0x11EF8DA4UL, 0xE083C858UL, - 0x8D6B786FUL, 0x5A6317A6UL, 0xFA5CF7A0UL, 0x5DDA0033UL, - 0xF28EBFB0UL, 0xF5B9C310UL, 0xA0EAC280UL, 0x08B9767AUL, - 0xA3D9D2B0UL, 0x79D34217UL, 0x021A718DUL, 0x9AC6336AUL, - 0x2711FD60UL, 0x438050E3UL, 0x069908A8UL, 0x3D7FEDC4UL, - 0x826D2BEFUL, 0x4EEB8476UL, 0x488DCF25UL, 0x36C9D566UL, - 0x28E74E41UL, 0xC2610ACAUL, 0x3D49A9CFUL, 0xBAE3B9DFUL, - 0xB65F8DE6UL, 0x92AEAF64UL, 0x3AC7D5E6UL, 0x9EA80509UL, - 0xF22B017DUL, 0xA4173F70UL, 0xDD1E16C3UL, 0x15E0D7F9UL, - 0x50B1B887UL, 0x2B9F4FD5UL, 0x625ABA82UL, 0x6A017962UL, - 0x2EC01B9CUL, 0x15488AA9UL, 0xD716E740UL, 0x40055A2CUL, - 0x93D29A22UL, 0xE32DBF9AUL, 0x058745B9UL, 0x3453DC1EUL, - 0xD699296EUL, 0x496CFF6FUL, 0x1C9F4986UL, 0xDFE2ED07UL, - 0xB87242D1UL, 0x19DE7EAEUL, 0x053E561AUL, 0x15AD6F8CUL, - 0x66626C1CUL, 0x7154C24CUL, 0xEA082B2AUL, 0x93EB2939UL, - 0x17DCB0F0UL, 0x58D4F2AEUL, 0x9EA294FBUL, 0x52CF564CUL, - 0x9883FE66UL, 0x2EC40581UL, 0x763953C3UL, 0x01D6692EUL, - 0xD3A0C108UL, 0xA1E7160EUL, 0xE4F2DFA6UL, 0x693ED285UL, - 0x74904698UL, 0x4C2B0EDDUL, 0x4F757656UL, 0x5D393378UL, - 0xA132234FUL, 0x3D321C5DUL, 0xC3F5E194UL, 0x4B269301UL, - 0xC79F022FUL, 0x3C997E7EUL, 0x5E4F9504UL, 0x3FFAFBBDUL, - 0x76F7AD0EUL, 0x296693F4UL, 0x3D1FCE6FUL, 0xC61E45BEUL, - 0xD3B5AB34UL, 0xF72BF9B7UL, 0x1B0434C0UL, 0x4E72B567UL, - 0x5592A33DUL, 0xB5229301UL, 0xCFD2A87FUL, 0x60AEB767UL, - 0x1814386BUL, 0x30BCC33DUL, 0x38A0C07DUL, 0xFD1606F2UL, - 0xC363519BUL, 0x589DD390UL, 0x5479F8E6UL, 0x1CB8D647UL, - 0x97FD61A9UL, 0xEA7759F4UL, 0x2D57539DUL, 0x569A58CFUL, - 0xE84E63ADUL, 0x462E1B78UL, 0x6580F87EUL, 0xF3817914UL, - 0x91DA55F4UL, 0x40A230F3UL, 0xD1988F35UL, 0xB6E318D2UL, - 0x3FFA50BCUL, 0x3D40F021UL, 0xC3C0BDAEUL, 0x4958C24CUL, - 0x518F36B2UL, 0x84B1D370UL, 0x0FEDCE83UL, 0x878DDADAUL, - 0xF2A279C7UL, 0x94E01BE8UL, 0x90716F4BUL, 0x954B8AA3UL -}, - -{ - 0xE216300DUL, 0xBBDDFFFCUL, 0xA7EBDABDUL, 0x35648095UL, - 0x7789F8B7UL, 0xE6C1121BUL, 0x0E241600UL, 0x052CE8B5UL, - 0x11A9CFB0UL, 0xE5952F11UL, 0xECE7990AUL, 0x9386D174UL, - 0x2A42931CUL, 0x76E38111UL, 0xB12DEF3AUL, 0x37DDDDFCUL, - 0xDE9ADEB1UL, 0x0A0CC32CUL, 0xBE197029UL, 0x84A00940UL, - 0xBB243A0FUL, 0xB4D137CFUL, 0xB44E79F0UL, 0x049EEDFDUL, - 0x0B15A15DUL, 0x480D3168UL, 0x8BBBDE5AUL, 0x669DED42UL, - 0xC7ECE831UL, 0x3F8F95E7UL, 0x72DF191BUL, 0x7580330DUL, - 0x94074251UL, 0x5C7DCDFAUL, 0xABBE6D63UL, 0xAA402164UL, - 0xB301D40AUL, 0x02E7D1CAUL, 0x53571DAEUL, 0x7A3182A2UL, - 0x12A8DDECUL, 0xFDAA335DUL, 0x176F43E8UL, 0x71FB46D4UL, - 0x38129022UL, 0xCE949AD4UL, 0xB84769ADUL, 0x965BD862UL, - 0x82F3D055UL, 0x66FB9767UL, 0x15B80B4EUL, 0x1D5B47A0UL, - 0x4CFDE06FUL, 0xC28EC4B8UL, 0x57E8726EUL, 0x647A78FCUL, - 0x99865D44UL, 0x608BD593UL, 0x6C200E03UL, 0x39DC5FF6UL, - 0x5D0B00A3UL, 0xAE63AFF2UL, 0x7E8BD632UL, 0x70108C0CUL, - 0xBBD35049UL, 0x2998DF04UL, 0x980CF42AUL, 0x9B6DF491UL, - 0x9E7EDD53UL, 0x06918548UL, 0x58CB7E07UL, 0x3B74EF2EUL, - 0x522FFFB1UL, 0xD24708CCUL, 0x1C7E27CDUL, 0xA4EB215BUL, - 0x3CF1D2E2UL, 0x19B47A38UL, 0x424F7618UL, 0x35856039UL, - 0x9D17DEE7UL, 0x27EB35E6UL, 0xC9AFF67BUL, 0x36BAF5B8UL, - 0x09C467CDUL, 0xC18910B1UL, 0xE11DBF7BUL, 0x06CD1AF8UL, - 0x7170C608UL, 0x2D5E3354UL, 0xD4DE495AUL, 0x64C6D006UL, - 0xBCC0C62CUL, 0x3DD00DB3UL, 0x708F8F34UL, 0x77D51B42UL, - 0x264F620FUL, 0x24B8D2BFUL, 0x15C1B79EUL, 0x46A52564UL, - 0xF8D7E54EUL, 0x3E378160UL, 0x7895CDA5UL, 0x859C15A5UL, - 0xE6459788UL, 0xC37BC75FUL, 0xDB07BA0CUL, 0x0676A3ABUL, - 0x7F229B1EUL, 0x31842E7BUL, 0x24259FD7UL, 0xF8BEF472UL, - 0x835FFCB8UL, 0x6DF4C1F2UL, 0x96F5B195UL, 0xFD0AF0FCUL, - 0xB0FE134CUL, 0xE2506D3DUL, 0x4F9B12EAUL, 0xF215F225UL, - 0xA223736FUL, 0x9FB4C428UL, 0x25D04979UL, 0x34C713F8UL, - 0xC4618187UL, 0xEA7A6E98UL, 0x7CD16EFCUL, 0x1436876CUL, - 0xF1544107UL, 0xBEDEEE14UL, 0x56E9AF27UL, 0xA04AA441UL, - 0x3CF7C899UL, 0x92ECBAE6UL, 0xDD67016DUL, 0x151682EBUL, - 0xA842EEDFUL, 0xFDBA60B4UL, 0xF1907B75UL, 0x20E3030FUL, - 0x24D8C29EUL, 0xE139673BUL, 0xEFA63FB8UL, 0x71873054UL, - 0xB6F2CF3BUL, 0x9F326442UL, 0xCB15A4CCUL, 0xB01A4504UL, - 0xF1E47D8DUL, 0x844A1BE5UL, 0xBAE7DFDCUL, 0x42CBDA70UL, - 0xCD7DAE0AUL, 0x57E85B7AUL, 0xD53F5AF6UL, 0x20CF4D8CUL, - 0xCEA4D428UL, 0x79D130A4UL, 0x3486EBFBUL, 0x33D3CDDCUL, - 0x77853B53UL, 0x37EFFCB5UL, 0xC5068778UL, 0xE580B3E6UL, - 0x4E68B8F4UL, 0xC5C8B37EUL, 0x0D809EA2UL, 0x398FEB7CUL, - 0x132A4F94UL, 0x43B7950EUL, 0x2FEE7D1CUL, 0x223613BDUL, - 0xDD06CAA2UL, 0x37DF932BUL, 0xC4248289UL, 0xACF3EBC3UL, - 0x5715F6B7UL, 0xEF3478DDUL, 0xF267616FUL, 0xC148CBE4UL, - 0x9052815EUL, 0x5E410FABUL, 0xB48A2465UL, 0x2EDA7FA4UL, - 0xE87B40E4UL, 0xE98EA084UL, 0x5889E9E1UL, 0xEFD390FCUL, - 0xDD07D35BUL, 0xDB485694UL, 0x38D7E5B2UL, 0x57720101UL, - 0x730EDEBCUL, 0x5B643113UL, 0x94917E4FUL, 0x503C2FBAUL, - 0x646F1282UL, 0x7523D24AUL, 0xE0779695UL, 0xF9C17A8FUL, - 0x7A5B2121UL, 0xD187B896UL, 0x29263A4DUL, 0xBA510CDFUL, - 0x81F47C9FUL, 0xAD1163EDUL, 0xEA7B5965UL, 0x1A00726EUL, - 0x11403092UL, 0x00DA6D77UL, 0x4A0CDD61UL, 0xAD1F4603UL, - 0x605BDFB0UL, 0x9EEDC364UL, 0x22EBE6A8UL, 0xCEE7D28AUL, - 0xA0E736A0UL, 0x5564A6B9UL, 0x10853209UL, 0xC7EB8F37UL, - 0x2DE705CAUL, 0x8951570FUL, 0xDF09822BUL, 0xBD691A6CUL, - 0xAA12E4F2UL, 0x87451C0FUL, 0xE0F6A27AUL, 0x3ADA4819UL, - 0x4CF1764FUL, 0x0D771C2BUL, 0x67CDB156UL, 0x350D8384UL, - 0x5938FA0FUL, 0x42399EF3UL, 0x36997B07UL, 0x0E84093DUL, - 0x4AA93E61UL, 0x8360D87BUL, 0x1FA98B0CUL, 0x1149382CUL, - 0xE97625A5UL, 0x0614D1B7UL, 0x0E25244BUL, 0x0C768347UL, - 0x589E8D82UL, 0x0D2059D1UL, 0xA466BB1EUL, 0xF8DA0A82UL, - 0x04F19130UL, 0xBA6E4EC0UL, 0x99265164UL, 0x1EE7230DUL, - 0x50B2AD80UL, 0xEAEE6801UL, 0x8DB2A283UL, 0xEA8BF59EUL -}}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.cpp deleted file mode 100644 index 6b0e8858..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "cbcmac.h" - -NAMESPACE_BEGIN(CryptoPP) - -void CBC_MAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - AccessCipher().SetKey(key, length, params); - m_reg.CleanNew(AccessCipher().BlockSize()); - m_counter = 0; -} - -void CBC_MAC_Base::Update(const byte *input, size_t length) -{ - unsigned int blockSize = AccessCipher().BlockSize(); - - while (m_counter && length) - { - m_reg[m_counter++] ^= *input++; - if (m_counter == blockSize) - ProcessBuf(); - length--; - } - - if (length >= blockSize) - { - size_t leftOver = AccessCipher().AdvancedProcessBlocks(m_reg, input, m_reg, length, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput); - input += (length - leftOver); - length = leftOver; - } - - while (length--) - { - m_reg[m_counter++] ^= *input++; - if (m_counter == blockSize) - ProcessBuf(); - } -} - -void CBC_MAC_Base::TruncatedFinal(byte *mac, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - if (m_counter) - ProcessBuf(); - - memcpy(mac, m_reg, size); - memset(m_reg, 0, AccessCipher().BlockSize()); -} - -void CBC_MAC_Base::ProcessBuf() -{ - AccessCipher().ProcessBlock(m_reg); - m_counter = 0; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.h deleted file mode 100644 index 4675dcb3..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cbcmac.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef CRYPTOPP_CBCMAC_H -#define CRYPTOPP_CBCMAC_H - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_MAC_Base : public MessageAuthenticationCode -{ -public: - CBC_MAC_Base() {} - - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *mac, size_t size); - unsigned int DigestSize() const {return const_cast(this)->AccessCipher().BlockSize();} - -protected: - virtual BlockCipher & AccessCipher() =0; - -private: - void ProcessBuf(); - SecByteBlock m_reg; - unsigned int m_counter; -}; - -//! CBC-MAC -/*! Compatible with FIPS 113. T should be a class derived from BlockCipherDocumentation. - Secure only for fixed length messages. For variable length messages use CMAC or DMAC. -*/ -template -class CBC_MAC : public MessageAuthenticationCodeImpl >, public SameKeyLengthAs -{ -public: - CBC_MAC() {} - CBC_MAC(const byte *key, size_t length=SameKeyLengthAs::DEFAULT_KEYLENGTH) - {this->SetKey(key, length);} - - static std::string StaticAlgorithmName() {return std::string("CBC-MAC(") + T::StaticAlgorithmName() + ")";} - -private: - BlockCipher & AccessCipher() {return m_cipher;} - typename T::Encryption m_cipher; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.cpp deleted file mode 100644 index 03687871..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// ccm.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "ccm.h" - -NAMESPACE_BEGIN(CryptoPP) - -void CCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms) -{ - BlockCipher &blockCipher = AccessBlockCipher(); - - blockCipher.SetKey(userKey, keylength, params); - - if (blockCipher.BlockSize() != REQUIRED_BLOCKSIZE) - throw InvalidArgument(AlgorithmName() + ": block size of underlying block cipher is not 16"); - - m_digestSize = params.GetIntValueWithDefault(Name::DigestSize(), DefaultDigestSize()); - if (m_digestSize % 2 > 0 || m_digestSize < 4 || m_digestSize > 16) - throw InvalidArgument(AlgorithmName() + ": DigestSize must be 4, 6, 8, 10, 12, 14, or 16"); - - m_buffer.Grow(2*REQUIRED_BLOCKSIZE); - m_L = 8; -} - -void CCM_Base::Resync(const byte *iv, size_t len) -{ - BlockCipher &cipher = AccessBlockCipher(); - - m_L = REQUIRED_BLOCKSIZE-1-(int)len; - assert(m_L >= 2); - if (m_L > 8) - m_L = 8; - - m_buffer[0] = byte(m_L-1); // flag - memcpy(m_buffer+1, iv, len); - memset(m_buffer+1+len, 0, REQUIRED_BLOCKSIZE-1-len); - - if (m_state >= State_IVSet) - m_ctr.Resynchronize(m_buffer, REQUIRED_BLOCKSIZE); - else - m_ctr.SetCipherWithIV(cipher, m_buffer); - - m_ctr.Seek(REQUIRED_BLOCKSIZE); - m_aadLength = 0; - m_messageLength = 0; -} - -void CCM_Base::UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength) -{ - if (m_state != State_IVSet) - throw BadState(AlgorithmName(), "SpecifyDataLengths", "or after State_IVSet"); - - m_aadLength = headerLength; - m_messageLength = messageLength; - - byte *cbcBuffer = CBC_Buffer(); - const BlockCipher &cipher = GetBlockCipher(); - - cbcBuffer[0] = byte(64*(headerLength>0) + 8*((m_digestSize-2)/2) + (m_L-1)); // flag - PutWord(true, BIG_ENDIAN_ORDER, cbcBuffer+REQUIRED_BLOCKSIZE-8, m_messageLength); - memcpy(cbcBuffer+1, m_buffer+1, REQUIRED_BLOCKSIZE-1-m_L); - cipher.ProcessBlock(cbcBuffer); - - if (headerLength>0) - { - assert(m_bufferedDataLength == 0); - - if (headerLength < ((1<<16) - (1<<8))) - { - PutWord(true, BIG_ENDIAN_ORDER, m_buffer, (word16)headerLength); - m_bufferedDataLength = 2; - } - else if (headerLength < (W64LIT(1)<<32)) - { - m_buffer[0] = 0xff; - m_buffer[1] = 0xfe; - PutWord(false, BIG_ENDIAN_ORDER, m_buffer+2, (word32)headerLength); - m_bufferedDataLength = 6; - } - else - { - m_buffer[0] = 0xff; - m_buffer[1] = 0xff; - PutWord(false, BIG_ENDIAN_ORDER, m_buffer+2, headerLength); - m_bufferedDataLength = 10; - } - } -} - -size_t CCM_Base::AuthenticateBlocks(const byte *data, size_t len) -{ - byte *cbcBuffer = CBC_Buffer(); - const BlockCipher &cipher = GetBlockCipher(); - return cipher.AdvancedProcessBlocks(cbcBuffer, data, cbcBuffer, len, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput); -} - -void CCM_Base::AuthenticateLastHeaderBlock() -{ - byte *cbcBuffer = CBC_Buffer(); - const BlockCipher &cipher = GetBlockCipher(); - - if (m_aadLength != m_totalHeaderLength) - throw InvalidArgument(AlgorithmName() + ": header length doesn't match that given in SpecifyDataLengths"); - - if (m_bufferedDataLength > 0) - { - xorbuf(cbcBuffer, m_buffer, m_bufferedDataLength); - cipher.ProcessBlock(cbcBuffer); - m_bufferedDataLength = 0; - } -} - -void CCM_Base::AuthenticateLastConfidentialBlock() -{ - byte *cbcBuffer = CBC_Buffer(); - const BlockCipher &cipher = GetBlockCipher(); - - if (m_messageLength != m_totalMessageLength) - throw InvalidArgument(AlgorithmName() + ": message length doesn't match that given in SpecifyDataLengths"); - - if (m_bufferedDataLength > 0) - { - xorbuf(cbcBuffer, m_buffer, m_bufferedDataLength); - cipher.ProcessBlock(cbcBuffer); - m_bufferedDataLength = 0; - } -} - -void CCM_Base::AuthenticateLastFooterBlock(byte *mac, size_t macSize) -{ - m_ctr.Seek(0); - m_ctr.ProcessData(mac, CBC_Buffer(), macSize); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.h deleted file mode 100644 index 2f3c56b4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ccm.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef CRYPTOPP_CCM_H -#define CRYPTOPP_CCM_H - -#include "authenc.h" -#include "modes.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! . -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CCM_Base : public AuthenticatedSymmetricCipherBase -{ -public: - CCM_Base() - : m_digestSize(0), m_L(0) {} - - // AuthenticatedSymmetricCipher - std::string AlgorithmName() const - {return GetBlockCipher().AlgorithmName() + std::string("/CCM");} - size_t MinKeyLength() const - {return GetBlockCipher().MinKeyLength();} - size_t MaxKeyLength() const - {return GetBlockCipher().MaxKeyLength();} - size_t DefaultKeyLength() const - {return GetBlockCipher().DefaultKeyLength();} - size_t GetValidKeyLength(size_t n) const - {return GetBlockCipher().GetValidKeyLength(n);} - bool IsValidKeyLength(size_t n) const - {return GetBlockCipher().IsValidKeyLength(n);} - unsigned int OptimalDataAlignment() const - {return GetBlockCipher().OptimalDataAlignment();} - IV_Requirement IVRequirement() const - {return UNIQUE_IV;} - unsigned int IVSize() const - {return 8;} - unsigned int MinIVLength() const - {return 7;} - unsigned int MaxIVLength() const - {return 13;} - unsigned int DigestSize() const - {return m_digestSize;} - lword MaxHeaderLength() const - {return W64LIT(0)-1;} - lword MaxMessageLength() const - {return m_L<8 ? (W64LIT(1)<<(8*m_L))-1 : W64LIT(0)-1;} - bool NeedsPrespecifiedDataLengths() const - {return true;} - void UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength); - -protected: - // AuthenticatedSymmetricCipherBase - bool AuthenticationIsOnPlaintext() const - {return true;} - unsigned int AuthenticationBlockSize() const - {return GetBlockCipher().BlockSize();} - void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms); - void Resync(const byte *iv, size_t len); - size_t AuthenticateBlocks(const byte *data, size_t len); - void AuthenticateLastHeaderBlock(); - void AuthenticateLastConfidentialBlock(); - void AuthenticateLastFooterBlock(byte *mac, size_t macSize); - SymmetricCipher & AccessSymmetricCipher() {return m_ctr;} - - virtual BlockCipher & AccessBlockCipher() =0; - virtual int DefaultDigestSize() const =0; - - const BlockCipher & GetBlockCipher() const {return const_cast(this)->AccessBlockCipher();}; - byte *CBC_Buffer() {return m_buffer+REQUIRED_BLOCKSIZE;} - - enum {REQUIRED_BLOCKSIZE = 16}; - int m_digestSize, m_L; - word64 m_messageLength, m_aadLength; - CTR_Mode_ExternalCipher::Encryption m_ctr; -}; - -//! . -template -class CCM_Final : public CCM_Base -{ -public: - static std::string StaticAlgorithmName() - {return T_BlockCipher::StaticAlgorithmName() + std::string("/CCM");} - bool IsForwardTransformation() const - {return T_IsEncryption;} - -private: - BlockCipher & AccessBlockCipher() {return m_cipher;} - int DefaultDigestSize() const {return T_DefaultDigestSize;} - typename T_BlockCipher::Encryption m_cipher; -}; - -/// CCM -template -struct CCM : public AuthenticatedSymmetricCipherDocumentation -{ - typedef CCM_Final Encryption; - typedef CCM_Final Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.cpp deleted file mode 100644 index 7359f54f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.cpp +++ /dev/null @@ -1,309 +0,0 @@ -// channels.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "channels.h" - -NAMESPACE_BEGIN(CryptoPP) -USING_NAMESPACE(std) - -#if 0 -void MessageSwitch::AddDefaultRoute(BufferedTransformation &destination, const std::string &channel) -{ - m_defaultRoutes.push_back(Route(&destination, channel)); -} - -void MessageSwitch::AddRoute(unsigned int begin, unsigned int end, BufferedTransformation &destination, const std::string &channel) -{ - RangeRoute route(begin, end, Route(&destination, channel)); - RouteList::iterator it = upper_bound(m_routes.begin(), m_routes.end(), route); - m_routes.insert(it, route); -} - -/* -class MessageRouteIterator -{ -public: - typedef MessageSwitch::RouteList::const_iterator RouteIterator; - typedef MessageSwitch::DefaultRouteList::const_iterator DefaultIterator; - - bool m_useDefault; - RouteIterator m_itRouteCurrent, m_itRouteEnd; - DefaultIterator m_itDefaultCurrent, m_itDefaultEnd; - - MessageRouteIterator(MessageSwitch &ms, const std::string &channel) - : m_channel(channel) - { - pair range = cs.m_routeMap.equal_range(channel); - if (range.first == range.second) - { - m_useDefault = true; - m_itListCurrent = cs.m_defaultRoutes.begin(); - m_itListEnd = cs.m_defaultRoutes.end(); - } - else - { - m_useDefault = false; - m_itMapCurrent = range.first; - m_itMapEnd = range.second; - } - } - - bool End() const - { - return m_useDefault ? m_itListCurrent == m_itListEnd : m_itMapCurrent == m_itMapEnd; - } - - void Next() - { - if (m_useDefault) - ++m_itListCurrent; - else - ++m_itMapCurrent; - } - - BufferedTransformation & Destination() - { - return m_useDefault ? *m_itListCurrent->first : *m_itMapCurrent->second.first; - } - - const std::string & Message() - { - if (m_useDefault) - return m_itListCurrent->second.get() ? *m_itListCurrent->second.get() : m_channel; - else - return m_itMapCurrent->second.second; - } -}; - -void MessageSwitch::Put(byte inByte); -void MessageSwitch::Put(const byte *inString, unsigned int length); - -void MessageSwitch::Flush(bool completeFlush, int propagation=-1); -void MessageSwitch::MessageEnd(int propagation=-1); -void MessageSwitch::PutMessageEnd(const byte *inString, unsigned int length, int propagation=-1); -void MessageSwitch::MessageSeriesEnd(int propagation=-1); -*/ -#endif - - -// -// ChannelRouteIterator -////////////////////////// - -void ChannelRouteIterator::Reset(const std::string &channel) -{ - m_channel = channel; - pair range = m_cs.m_routeMap.equal_range(channel); - if (range.first == range.second) - { - m_useDefault = true; - m_itListCurrent = m_cs.m_defaultRoutes.begin(); - m_itListEnd = m_cs.m_defaultRoutes.end(); - } - else - { - m_useDefault = false; - m_itMapCurrent = range.first; - m_itMapEnd = range.second; - } -} - -bool ChannelRouteIterator::End() const -{ - return m_useDefault ? m_itListCurrent == m_itListEnd : m_itMapCurrent == m_itMapEnd; -} - -void ChannelRouteIterator::Next() -{ - if (m_useDefault) - ++m_itListCurrent; - else - ++m_itMapCurrent; -} - -BufferedTransformation & ChannelRouteIterator::Destination() -{ - return m_useDefault ? *m_itListCurrent->first : *m_itMapCurrent->second.first; -} - -const std::string & ChannelRouteIterator::Channel() -{ - if (m_useDefault) - return m_itListCurrent->second.get() ? *m_itListCurrent->second.get() : m_channel; - else - return m_itMapCurrent->second.second; -} - - -// -// ChannelSwitch -/////////////////// - -size_t ChannelSwitch::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (m_blocked) - { - m_blocked = false; - goto WasBlocked; - } - - m_it.Reset(channel); - - while (!m_it.End()) - { -WasBlocked: - if (m_it.Destination().ChannelPut2(m_it.Channel(), begin, length, messageEnd, blocking)) - { - m_blocked = true; - return 1; - } - - m_it.Next(); - } - - return 0; -} - -void ChannelSwitch::IsolatedInitialize(const NameValuePairs ¶meters/* =g_nullNameValuePairs */) -{ - m_routeMap.clear(); - m_defaultRoutes.clear(); - m_blocked = false; -} - -bool ChannelSwitch::ChannelFlush(const std::string &channel, bool completeFlush, int propagation, bool blocking) -{ - if (m_blocked) - { - m_blocked = false; - goto WasBlocked; - } - - m_it.Reset(channel); - - while (!m_it.End()) - { - WasBlocked: - if (m_it.Destination().ChannelFlush(m_it.Channel(), completeFlush, propagation, blocking)) - { - m_blocked = true; - return true; - } - - m_it.Next(); - } - - return false; -} - -bool ChannelSwitch::ChannelMessageSeriesEnd(const std::string &channel, int propagation, bool blocking) -{ - if (m_blocked) - { - m_blocked = false; - goto WasBlocked; - } - - m_it.Reset(channel); - - while (!m_it.End()) - { - WasBlocked: - if (m_it.Destination().ChannelMessageSeriesEnd(m_it.Channel(), propagation)) - { - m_blocked = true; - return true; - } - - m_it.Next(); - } - - return false; -} - -byte * ChannelSwitch::ChannelCreatePutSpace(const std::string &channel, size_t &size) -{ - m_it.Reset(channel); - if (!m_it.End()) - { - BufferedTransformation &target = m_it.Destination(); - const std::string &channel = m_it.Channel(); - m_it.Next(); - if (m_it.End()) // there is only one target channel - return target.ChannelCreatePutSpace(channel, size); - } - size = 0; - return NULL; -} - -size_t ChannelSwitch::ChannelPutModifiable2(const std::string &channel, byte *inString, size_t length, int messageEnd, bool blocking) -{ - ChannelRouteIterator it(*this); - it.Reset(channel); - - if (!it.End()) - { - BufferedTransformation &target = it.Destination(); - const std::string &targetChannel = it.Channel(); - it.Next(); - if (it.End()) // there is only one target channel - return target.ChannelPutModifiable2(targetChannel, inString, length, messageEnd, blocking); - } - - return ChannelPut2(channel, inString, length, messageEnd, blocking); -} - -void ChannelSwitch::AddDefaultRoute(BufferedTransformation &destination) -{ - m_defaultRoutes.push_back(DefaultRoute(&destination, value_ptr(NULL))); -} - -void ChannelSwitch::RemoveDefaultRoute(BufferedTransformation &destination) -{ - for (DefaultRouteList::iterator it = m_defaultRoutes.begin(); it != m_defaultRoutes.end(); ++it) - if (it->first == &destination && !it->second.get()) - { - m_defaultRoutes.erase(it); - break; - } -} - -void ChannelSwitch::AddDefaultRoute(BufferedTransformation &destination, const std::string &outChannel) -{ - m_defaultRoutes.push_back(DefaultRoute(&destination, outChannel)); -} - -void ChannelSwitch::RemoveDefaultRoute(BufferedTransformation &destination, const std::string &outChannel) -{ - for (DefaultRouteList::iterator it = m_defaultRoutes.begin(); it != m_defaultRoutes.end(); ++it) - if (it->first == &destination && (it->second.get() && *it->second == outChannel)) - { - m_defaultRoutes.erase(it); - break; - } -} - -void ChannelSwitch::AddRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel) -{ - m_routeMap.insert(RouteMap::value_type(inChannel, Route(&destination, outChannel))); -} - -void ChannelSwitch::RemoveRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel) -{ - typedef ChannelSwitch::RouteMap::iterator MapIterator; - pair range = m_routeMap.equal_range(inChannel); - - for (MapIterator it = range.first; it != range.second; ++it) - if (it->second.first == &destination && it->second.second == outChannel) - { - m_routeMap.erase(it); - break; - } -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.h deleted file mode 100644 index 83741561..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/channels.h +++ /dev/null @@ -1,123 +0,0 @@ -#ifndef CRYPTOPP_CHANNELS_H -#define CRYPTOPP_CHANNELS_H - -#include "simple.h" -#include "smartptr.h" -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -#if 0 -//! Route input on default channel to different and/or multiple channels based on message sequence number -class MessageSwitch : public Sink -{ -public: - void AddDefaultRoute(BufferedTransformation &destination, const std::string &channel); - void AddRoute(unsigned int begin, unsigned int end, BufferedTransformation &destination, const std::string &channel); - - void Put(byte inByte); - void Put(const byte *inString, unsigned int length); - - void Flush(bool completeFlush, int propagation=-1); - void MessageEnd(int propagation=-1); - void PutMessageEnd(const byte *inString, unsigned int length, int propagation=-1); - void MessageSeriesEnd(int propagation=-1); - -private: - typedef std::pair Route; - struct RangeRoute - { - RangeRoute(unsigned int begin, unsigned int end, const Route &route) - : begin(begin), end(end), route(route) {} - bool operator<(const RangeRoute &rhs) const {return begin < rhs.begin;} - unsigned int begin, end; - Route route; - }; - - typedef std::list RouteList; - typedef std::list DefaultRouteList; - - RouteList m_routes; - DefaultRouteList m_defaultRoutes; - unsigned int m_nCurrentMessage; -}; -#endif - -class ChannelSwitchTypedefs -{ -public: - typedef std::pair Route; - typedef std::multimap RouteMap; - - typedef std::pair > DefaultRoute; - typedef std::list DefaultRouteList; - - // SunCC workaround: can't use const_iterator here - typedef RouteMap::iterator MapIterator; - typedef DefaultRouteList::iterator ListIterator; -}; - -class ChannelSwitch; - -class ChannelRouteIterator : public ChannelSwitchTypedefs -{ -public: - ChannelSwitch& m_cs; - std::string m_channel; - bool m_useDefault; - MapIterator m_itMapCurrent, m_itMapEnd; - ListIterator m_itListCurrent, m_itListEnd; - - ChannelRouteIterator(ChannelSwitch &cs) : m_cs(cs) {} - void Reset(const std::string &channel); - bool End() const; - void Next(); - BufferedTransformation & Destination(); - const std::string & Channel(); -}; - -//! Route input to different and/or multiple channels based on channel ID -class CRYPTOPP_DLL ChannelSwitch : public Multichannel, public ChannelSwitchTypedefs -{ -public: - ChannelSwitch() : m_it(*this), m_blocked(false) {} - ChannelSwitch(BufferedTransformation &destination) : m_it(*this), m_blocked(false) - { - AddDefaultRoute(destination); - } - ChannelSwitch(BufferedTransformation &destination, const std::string &outChannel) : m_it(*this), m_blocked(false) - { - AddDefaultRoute(destination, outChannel); - } - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking); - - bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true); - bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true); - - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size); - - void AddDefaultRoute(BufferedTransformation &destination); - void RemoveDefaultRoute(BufferedTransformation &destination); - void AddDefaultRoute(BufferedTransformation &destination, const std::string &outChannel); - void RemoveDefaultRoute(BufferedTransformation &destination, const std::string &outChannel); - void AddRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel); - void RemoveRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel); - -private: - RouteMap m_routeMap; - DefaultRouteList m_defaultRoutes; - - ChannelRouteIterator m_it; - bool m_blocked; - - friend class ChannelRouteIterator; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.cpp deleted file mode 100644 index e8fa6fea..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// cmac.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "cmac.h" - -NAMESPACE_BEGIN(CryptoPP) - -static void MulU(byte *k, unsigned int length) -{ - byte carry = 0; - - for (int i=length-1; i>=1; i-=2) - { - byte carry2 = k[i] >> 7; - k[i] += k[i] + carry; - carry = k[i-1] >> 7; - k[i-1] += k[i-1] + carry2; - } - - if (carry) - { - switch (length) - { - case 8: - k[7] ^= 0x1b; - break; - case 16: - k[15] ^= 0x87; - break; - case 32: - k[30] ^= 4; - k[31] ^= 0x23; - break; - default: - throw InvalidArgument("CMAC: " + IntToString(length) + " is not a supported cipher block size"); - } - } -} - -void CMAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - BlockCipher &cipher = AccessCipher(); - unsigned int blockSize = cipher.BlockSize(); - - cipher.SetKey(key, length, params); - m_reg.CleanNew(3*blockSize); - m_counter = 0; - - cipher.ProcessBlock(m_reg, m_reg+blockSize); - MulU(m_reg+blockSize, blockSize); - memcpy(m_reg+2*blockSize, m_reg+blockSize, blockSize); - MulU(m_reg+2*blockSize, blockSize); -} - -void CMAC_Base::Update(const byte *input, size_t length) -{ - if (!length) - return; - - BlockCipher &cipher = AccessCipher(); - unsigned int blockSize = cipher.BlockSize(); - - if (m_counter > 0) - { - unsigned int len = UnsignedMin(blockSize - m_counter, length); - xorbuf(m_reg+m_counter, input, len); - length -= len; - input += len; - m_counter += len; - - if (m_counter == blockSize && length > 0) - { - cipher.ProcessBlock(m_reg); - m_counter = 0; - } - } - - if (length > blockSize) - { - assert(m_counter == 0); - size_t leftOver = 1 + cipher.AdvancedProcessBlocks(m_reg, input, m_reg, length-1, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput); - input += (length - leftOver); - length = leftOver; - } - - if (length > 0) - { - assert(m_counter + length <= blockSize); - xorbuf(m_reg+m_counter, input, length); - m_counter += (unsigned int)length; - } - - assert(m_counter > 0); -} - -void CMAC_Base::TruncatedFinal(byte *mac, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - BlockCipher &cipher = AccessCipher(); - unsigned int blockSize = cipher.BlockSize(); - - if (m_counter < blockSize) - { - m_reg[m_counter] ^= 0x80; - cipher.AdvancedProcessBlocks(m_reg, m_reg+2*blockSize, m_reg, blockSize, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput); - } - else - cipher.AdvancedProcessBlocks(m_reg, m_reg+blockSize, m_reg, blockSize, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput); - - memcpy(mac, m_reg, size); - - m_counter = 0; - memset(m_reg, 0, blockSize); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.h deleted file mode 100644 index ab3ecf8c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cmac.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef CRYPTOPP_CMAC_H -#define CRYPTOPP_CMAC_H - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CMAC_Base : public MessageAuthenticationCode -{ -public: - CMAC_Base() {} - - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *mac, size_t size); - unsigned int DigestSize() const {return GetCipher().BlockSize();} - unsigned int OptimalBlockSize() const {return GetCipher().BlockSize();} - unsigned int OptimalDataAlignment() const {return GetCipher().OptimalDataAlignment();} - -protected: - friend class EAX_Base; - - const BlockCipher & GetCipher() const {return const_cast(this)->AccessCipher();} - virtual BlockCipher & AccessCipher() =0; - - void ProcessBuf(); - SecByteBlock m_reg; - unsigned int m_counter; -}; - -/// CMAC -/*! Template parameter T should be a class derived from BlockCipherDocumentation, for example AES, with a block size of 8, 16, or 32 */ -template -class CMAC : public MessageAuthenticationCodeImpl >, public SameKeyLengthAs -{ -public: - CMAC() {} - CMAC(const byte *key, size_t length=SameKeyLengthAs::DEFAULT_KEYLENGTH) - {this->SetKey(key, length);} - - static std::string StaticAlgorithmName() {return std::string("CMAC(") + T::StaticAlgorithmName() + ")";} - -private: - BlockCipher & AccessCipher() {return m_cipher;} - typename T::Encryption m_cipher; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/config.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/config.h deleted file mode 100644 index ac887069..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/config.h +++ /dev/null @@ -1,462 +0,0 @@ -#ifndef CRYPTOPP_CONFIG_H -#define CRYPTOPP_CONFIG_H - -// ***************** Important Settings ******************** - -// define this if running on a big-endian CPU -#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__))) -# define IS_BIG_ENDIAN -#endif - -// define this if running on a little-endian CPU -// big endian will be assumed if IS_LITTLE_ENDIAN is not defined -#ifndef IS_BIG_ENDIAN -# define IS_LITTLE_ENDIAN -#endif - -// define this if you want to disable all OS-dependent features, -// such as sockets and OS-provided random number generators -// #define NO_OS_DEPENDENCE - -// Define this to use features provided by Microsoft's CryptoAPI. -// Currently the only feature used is random number generation. -// This macro will be ignored if NO_OS_DEPENDENCE is defined. -#define USE_MS_CRYPTOAPI - -// Define this to 1 to enforce the requirement in FIPS 186-2 Change Notice 1 that only 1024 bit moduli be used -#ifndef DSA_1024_BIT_MODULUS_ONLY -# define DSA_1024_BIT_MODULUS_ONLY 1 -#endif - -// ***************** Less Important Settings *************** - -// define this to retain (as much as possible) old deprecated function and class names -// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - -#define GZIP_OS_CODE 0 - -// Try this if your CPU has 256K internal cache or a slow multiply instruction -// and you want a (possibly) faster IDEA implementation using log tables -// #define IDEA_LARGECACHE - -// Define this if, for the linear congruential RNG, you want to use -// the original constants as specified in S.K. Park and K.W. Miller's -// CACM paper. -// #define LCRNG_ORIGINAL_NUMBERS - -// choose which style of sockets to wrap (mostly useful for cygwin which has both) -#define PREFER_BERKELEY_STYLE_SOCKETS -// #define PREFER_WINDOWS_STYLE_SOCKETS - -// set the name of Rijndael cipher, was "Rijndael" before version 5.3 -#define CRYPTOPP_RIJNDAEL_NAME "AES" - -// ***************** Important Settings Again ******************** -// But the defaults should be ok. - -// namespace support is now required -#ifdef NO_NAMESPACE -# error namespace support is now required -#endif - -// Define this to workaround a Microsoft CryptoAPI bug where -// each call to CryptAcquireContext causes a 100 KB memory leak. -// Defining this will cause Crypto++ to make only one call to CryptAcquireContext. -#define WORKAROUND_MS_BUG_Q258000 - -#ifdef CRYPTOPP_DOXYGEN_PROCESSING -// Avoid putting "CryptoPP::" in front of everything in Doxygen output -# define CryptoPP -# define NAMESPACE_BEGIN(x) -# define NAMESPACE_END -// Get Doxygen to generate better documentation for these typedefs -# define DOCUMENTED_TYPEDEF(x, y) class y : public x {}; -#else -# define NAMESPACE_BEGIN(x) namespace x { -# define NAMESPACE_END } -# define DOCUMENTED_TYPEDEF(x, y) typedef x y; -#endif -#define ANONYMOUS_NAMESPACE_BEGIN namespace { -#define USING_NAMESPACE(x) using namespace x; -#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x { -#define DOCUMENTED_NAMESPACE_END } - -// What is the type of the third parameter to bind? -// For Unix, the new standard is ::socklen_t (typically unsigned int), and the old standard is int. -// Unfortunately there is no way to tell whether or not socklen_t is defined. -// To work around this, TYPE_OF_SOCKLEN_T is a macro so that you can change it from the makefile. -#ifndef TYPE_OF_SOCKLEN_T -# if defined(_WIN32) || defined(__CYGWIN__) -# define TYPE_OF_SOCKLEN_T int -# else -# define TYPE_OF_SOCKLEN_T ::socklen_t -# endif -#endif - -#if defined(__CYGWIN__) && defined(PREFER_WINDOWS_STYLE_SOCKETS) -# define __USE_W32_SOCKETS -#endif - -typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs - -NAMESPACE_BEGIN(CryptoPP) - -typedef unsigned short word16; -typedef unsigned int word32; - -#if defined(_MSC_VER) || defined(__BORLANDC__) - typedef unsigned __int64 word64; - #define W64LIT(x) x##ui64 -#else - typedef unsigned long long word64; - #define W64LIT(x) x##ULL -#endif - -// define large word type, used for file offsets and such -typedef word64 lword; -const lword LWORD_MAX = W64LIT(0xffffffffffffffff); - -#ifdef __GNUC__ - #define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -#endif - -// define hword, word, and dword. these are used for multiprecision integer arithmetic -// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx -#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__)) - typedef word32 hword; - typedef word64 word; -#else - #define CRYPTOPP_NATIVE_DWORD_AVAILABLE - #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) - #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 - // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 - // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 - typedef word32 hword; - typedef word64 word; - typedef __uint128_t dword; - typedef __uint128_t word128; - #define CRYPTOPP_WORD128_AVAILABLE - #else - // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results - typedef word16 hword; - typedef word32 word; - typedef word64 dword; - #endif - #else - // being here means the native register size is probably 32 bits or less - #define CRYPTOPP_BOOL_SLOW_WORD64 1 - typedef word16 hword; - typedef word32 word; - typedef word64 dword; - #endif -#endif -#ifndef CRYPTOPP_BOOL_SLOW_WORD64 - #define CRYPTOPP_BOOL_SLOW_WORD64 0 -#endif - -const unsigned int WORD_SIZE = sizeof(word); -const unsigned int WORD_BITS = WORD_SIZE * 8; - -NAMESPACE_END - -#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE - // This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks. - #if defined(_M_X64) || defined(__x86_64__) - #define CRYPTOPP_L1_CACHE_LINE_SIZE 64 - #else - // L1 cache line size is 32 on Pentium III and earlier - #define CRYPTOPP_L1_CACHE_LINE_SIZE 32 - #endif -#endif - -#if defined(_MSC_VER) - #if _MSC_VER == 1200 - #include - #endif - #if _MSC_VER > 1200 || defined(_mm_free) - #define CRYPTOPP_MSVC6PP_OR_LATER // VC 6 processor pack or later - #else - #define CRYPTOPP_MSVC6_NO_PP // VC 6 without processor pack - #endif -#endif - -#ifndef CRYPTOPP_ALIGN_DATA - #if defined(CRYPTOPP_MSVC6PP_OR_LATER) - #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x)) - #elif defined(__GNUC__) - #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x))) - #else - #define CRYPTOPP_ALIGN_DATA(x) - #endif -#endif - -#ifndef CRYPTOPP_SECTION_ALIGN16 - #if defined(__GNUC__) && !defined(__APPLE__) - // the alignment attribute doesn't seem to work without this section attribute when -fdata-sections is turned on - #define CRYPTOPP_SECTION_ALIGN16 __attribute__((section ("CryptoPP_Align16"))) - #else - #define CRYPTOPP_SECTION_ALIGN16 - #endif -#endif - -#if defined(_MSC_VER) || defined(__fastcall) - #define CRYPTOPP_FASTCALL __fastcall -#else - #define CRYPTOPP_FASTCALL -#endif - -// VC60 workaround: it doesn't allow typename in some places -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#define CPP_TYPENAME -#else -#define CPP_TYPENAME typename -#endif - -// VC60 workaround: can't cast unsigned __int64 to float or double -#if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER) -#define CRYPTOPP_VC6_INT64 (__int64) -#else -#define CRYPTOPP_VC6_INT64 -#endif - -#ifdef _MSC_VER -#define CRYPTOPP_NO_VTABLE __declspec(novtable) -#else -#define CRYPTOPP_NO_VTABLE -#endif - -#ifdef _MSC_VER - // 4231: nonstandard extension used : 'extern' before template explicit instantiation - // 4250: dominance - // 4251: member needs to have dll-interface - // 4275: base needs to have dll-interface - // 4660: explicitly instantiating a class that's already implicitly instantiated - // 4661: no suitable definition provided for explicit template instantiation request - // 4786: identifer was truncated in debug information - // 4355: 'this' : used in base member initializer list - // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation -# pragma warning(disable: 4231 4250 4251 4275 4660 4661 4786 4355 4910) -#endif - -#ifdef __BORLANDC__ -// 8037: non-const function called for const object. needed to work around BCB2006 bug -# pragma warn -8037 -#endif - -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) -#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION -#endif - -#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION -#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE -#endif - -#ifdef CRYPTOPP_DISABLE_X86ASM // for backwards compatibility: this macro had both meanings -#define CRYPTOPP_DISABLE_ASM -#define CRYPTOPP_DISABLE_SSE2 -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) - // C++Builder 2010 does not allow "call label" where label is defined within inline assembly - #define CRYPTOPP_X86_ASM_AVAILABLE - - #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300) - #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 - #else - #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0 - #endif - - // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed. - // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version. - #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102) - #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1 - #else - #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0 - #endif -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64) - #define CRYPTOPP_X64_MASM_AVAILABLE -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__) - #define CRYPTOPP_X64_ASM_AVAILABLE -#endif - -#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) - #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1 -#else - #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0 -#endif - -#if !defined(CRYPTOPP_DISABLE_SSSE3) && !defined(CRYPTOPP_DISABLE_AESNI) && CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && (CRYPTOPP_GCC_VERSION >= 40400 || _MSC_FULL_VER >= 150030729 || __INTEL_COMPILER >= 1110) - #define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 1 -#else - #define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0 -#endif - -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 -#else - #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 -#endif - -// how to allocate 16-byte aligned memory (for SSE2) -#if defined(CRYPTOPP_MSVC6PP_OR_LATER) - #define CRYPTOPP_MM_MALLOC_AVAILABLE -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16 -#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__) - #define CRYPTOPP_MEMALIGN_AVAILABLE -#else - #define CRYPTOPP_NO_ALIGNED_ALLOC -#endif - -// how to disable inlining -#if defined(_MSC_VER) && _MSC_VER >= 1300 -# define CRYPTOPP_NOINLINE_DOTDOTDOT -# define CRYPTOPP_NOINLINE __declspec(noinline) -#elif defined(__GNUC__) -# define CRYPTOPP_NOINLINE_DOTDOTDOT -# define CRYPTOPP_NOINLINE __attribute__((noinline)) -#else -# define CRYPTOPP_NOINLINE_DOTDOTDOT ... -# define CRYPTOPP_NOINLINE -#endif - -// how to declare class constants -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) -# define CRYPTOPP_CONSTANT(x) enum {x}; -#else -# define CRYPTOPP_CONSTANT(x) static const int x; -#endif - -#if defined(_M_X64) || defined(__x86_64__) - #define CRYPTOPP_BOOL_X64 1 -#else - #define CRYPTOPP_BOOL_X64 0 -#endif - -// see http://predef.sourceforge.net/prearch.html -#if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) - #define CRYPTOPP_BOOL_X86 1 -#else - #define CRYPTOPP_BOOL_X86 0 -#endif - -#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__) - #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS -#endif - -#define CRYPTOPP_VERSION 561 - -// ***************** determine availability of OS features ******************** - -#ifndef NO_OS_DEPENDENCE - -#if defined(_WIN32) || defined(__CYGWIN__) -#define CRYPTOPP_WIN32_AVAILABLE -#endif - -#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) -#define CRYPTOPP_UNIX_AVAILABLE -#endif - -#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) -# define HIGHRES_TIMER_AVAILABLE -#endif - -#ifdef CRYPTOPP_UNIX_AVAILABLE -# define HAS_BERKELEY_STYLE_SOCKETS -#endif - -#ifdef CRYPTOPP_WIN32_AVAILABLE -# define HAS_WINDOWS_STYLE_SOCKETS -#endif - -#if defined(HIGHRES_TIMER_AVAILABLE) && (defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(HAS_WINDOWS_STYLE_SOCKETS)) -# define SOCKETS_AVAILABLE -#endif - -#if defined(HAS_WINDOWS_STYLE_SOCKETS) && (!defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(PREFER_WINDOWS_STYLE_SOCKETS)) -# define USE_WINDOWS_STYLE_SOCKETS -#else -# define USE_BERKELEY_STYLE_SOCKETS -#endif - -#if defined(HIGHRES_TIMER_AVAILABLE) && defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_BERKELEY_STYLE_SOCKETS) -# define WINDOWS_PIPES_AVAILABLE -#endif - -#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI) -# define NONBLOCKING_RNG_AVAILABLE -# define OS_RNG_AVAILABLE -#endif - -#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) -# define NONBLOCKING_RNG_AVAILABLE -# define BLOCKING_RNG_AVAILABLE -# define OS_RNG_AVAILABLE -# define HAS_PTHREADS -# define THREADS_AVAILABLE -#endif - -#ifdef CRYPTOPP_WIN32_AVAILABLE -# define HAS_WINTHREADS -# define THREADS_AVAILABLE -#endif - -#endif // NO_OS_DEPENDENCE - -// ***************** DLL related ******************** - -#if defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(CRYPTOPP_DOXYGEN_PROCESSING) - -#ifdef CRYPTOPP_EXPORTS -#define CRYPTOPP_IS_DLL -#define CRYPTOPP_DLL __declspec(dllexport) -#elif defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_IS_DLL -#define CRYPTOPP_DLL __declspec(dllimport) -#else -#define CRYPTOPP_DLL -#endif - -#define CRYPTOPP_API __cdecl - -#else // CRYPTOPP_WIN32_AVAILABLE - -#define CRYPTOPP_DLL -#define CRYPTOPP_API - -#endif // CRYPTOPP_WIN32_AVAILABLE - -#if defined(__MWERKS__) -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL -#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL -#else -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL -#endif - -#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL -#else -#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS -#endif - -#if defined(__MWERKS__) -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class -#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class -#else -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class -#endif - -#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS) -#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class -#else -#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.cpp deleted file mode 100644 index 3610a7c8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// cpu.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "cpu.h" -#include "misc.h" -#include - -#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY -#include -#include -#endif - -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef CRYPTOPP_CPUID_AVAILABLE - -#if _MSC_VER >= 1400 && CRYPTOPP_BOOL_X64 - -bool CpuId(word32 input, word32 *output) -{ - __cpuid((int *)output, input); - return true; -} - -#else - -#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY -extern "C" { -typedef void (*SigHandler)(int); - -static jmp_buf s_jmpNoCPUID; -static void SigIllHandlerCPUID(int) -{ - longjmp(s_jmpNoCPUID, 1); -} - -static jmp_buf s_jmpNoSSE2; -static void SigIllHandlerSSE2(int) -{ - longjmp(s_jmpNoSSE2, 1); -} -} -#endif - -bool CpuId(word32 input, word32 *output) -{ -#ifdef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY - __try - { - __asm - { - mov eax, input - cpuid - mov edi, output - mov [edi], eax - mov [edi+4], ebx - mov [edi+8], ecx - mov [edi+12], edx - } - } - __except (1) - { - return false; - } - return true; -#else - SigHandler oldHandler = signal(SIGILL, SigIllHandlerCPUID); - if (oldHandler == SIG_ERR) - return false; - - bool result = true; - if (setjmp(s_jmpNoCPUID)) - result = false; - else - { - asm - ( - // save ebx in case -fPIC is being used -#if CRYPTOPP_BOOL_X86 - "push %%ebx; cpuid; mov %%ebx, %%edi; pop %%ebx" -#else - "pushq %%rbx; cpuid; mov %%ebx, %%edi; popq %%rbx" -#endif - : "=a" (output[0]), "=D" (output[1]), "=c" (output[2]), "=d" (output[3]) - : "a" (input) - ); - } - - signal(SIGILL, oldHandler); - return result; -#endif -} - -#endif - -static bool TrySSE2() -{ -#if CRYPTOPP_BOOL_X64 - return true; -#elif defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY) - __try - { -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - AS2(por xmm0, xmm0) // executing SSE2 instruction -#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE - __m128i x = _mm_setzero_si128(); - return _mm_cvtsi128_si32(x) == 0; -#endif - } - __except (1) - { - return false; - } - return true; -#else - SigHandler oldHandler = signal(SIGILL, SigIllHandlerSSE2); - if (oldHandler == SIG_ERR) - return false; - - bool result = true; - if (setjmp(s_jmpNoSSE2)) - result = false; - else - { -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - __asm __volatile ("por %xmm0, %xmm0"); -#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE - __m128i x = _mm_setzero_si128(); - result = _mm_cvtsi128_si32(x) == 0; -#endif - } - - signal(SIGILL, oldHandler); - return result; -#endif -} - -bool g_x86DetectionDone = false; -bool g_hasISSE = false, g_hasSSE2 = false, g_hasSSSE3 = false, g_hasMMX = false, g_hasAESNI = false, g_hasCLMUL = false, g_isP4 = false; -word32 g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE; - -void DetectX86Features() -{ - word32 cpuid[4], cpuid1[4]; - if (!CpuId(0, cpuid)) - return; - if (!CpuId(1, cpuid1)) - return; - - g_hasMMX = (cpuid1[3] & (1 << 23)) != 0; - if ((cpuid1[3] & (1 << 26)) != 0) - g_hasSSE2 = TrySSE2(); - g_hasSSSE3 = g_hasSSE2 && (cpuid1[2] & (1<<9)); - g_hasAESNI = g_hasSSE2 && (cpuid1[2] & (1<<25)); - g_hasCLMUL = g_hasSSE2 && (cpuid1[2] & (1<<1)); - - if ((cpuid1[3] & (1 << 25)) != 0) - g_hasISSE = true; - else - { - word32 cpuid2[4]; - CpuId(0x080000000, cpuid2); - if (cpuid2[0] >= 0x080000001) - { - CpuId(0x080000001, cpuid2); - g_hasISSE = (cpuid2[3] & (1 << 22)) != 0; - } - } - - std::swap(cpuid[2], cpuid[3]); - if (memcmp(cpuid+1, "GenuineIntel", 12) == 0) - { - g_isP4 = ((cpuid1[0] >> 8) & 0xf) == 0xf; - g_cacheLineSize = 8 * GETBYTE(cpuid1[1], 1); - } - else if (memcmp(cpuid+1, "AuthenticAMD", 12) == 0) - { - CpuId(0x80000005, cpuid); - g_cacheLineSize = GETBYTE(cpuid[2], 0); - } - - if (!g_cacheLineSize) - g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE; - - g_x86DetectionDone = true; -} - -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.h deleted file mode 100644 index 65029d33..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cpu.h +++ /dev/null @@ -1,345 +0,0 @@ -#ifndef CRYPTOPP_CPU_H -#define CRYPTOPP_CPU_H - -#ifdef CRYPTOPP_GENERATE_X64_MASM - -#define CRYPTOPP_X86_ASM_AVAILABLE -#define CRYPTOPP_BOOL_X64 1 -#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 -#define NAMESPACE_END - -#else - -#include "config.h" - -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE -#include -#endif - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE -#if !defined(__GNUC__) || defined(__SSSE3__) || defined(__INTEL_COMPILER) -#include -#else -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_shuffle_epi8 (__m128i a, __m128i b) -{ - asm ("pshufb %1, %0" : "+x"(a) : "xm"(b)); - return a; -} -#endif -#if !defined(__GNUC__) || defined(__SSE4_1__) || defined(__INTEL_COMPILER) -#include -#else -__inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_extract_epi32 (__m128i a, const int i) -{ - int r; - asm ("pextrd %2, %1, %0" : "=rm"(r) : "x"(a), "i"(i)); - return r; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_insert_epi32 (__m128i a, int b, const int i) -{ - asm ("pinsrd %2, %1, %0" : "+x"(a) : "rm"(b), "i"(i)); - return a; -} -#endif -#if !defined(__GNUC__) || (defined(__AES__) && defined(__PCLMUL__)) || defined(__INTEL_COMPILER) -#include -#else -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_clmulepi64_si128 (__m128i a, __m128i b, const int i) -{ - asm ("pclmulqdq %2, %1, %0" : "+x"(a) : "xm"(b), "i"(i)); - return a; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aeskeygenassist_si128 (__m128i a, const int i) -{ - __m128i r; - asm ("aeskeygenassist %2, %1, %0" : "=x"(r) : "xm"(a), "i"(i)); - return r; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aesimc_si128 (__m128i a) -{ - __m128i r; - asm ("aesimc %1, %0" : "=x"(r) : "xm"(a)); - return r; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aesenc_si128 (__m128i a, __m128i b) -{ - asm ("aesenc %1, %0" : "+x"(a) : "xm"(b)); - return a; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aesenclast_si128 (__m128i a, __m128i b) -{ - asm ("aesenclast %1, %0" : "+x"(a) : "xm"(b)); - return a; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aesdec_si128 (__m128i a, __m128i b) -{ - asm ("aesdec %1, %0" : "+x"(a) : "xm"(b)); - return a; -} -__inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -_mm_aesdeclast_si128 (__m128i a, __m128i b) -{ - asm ("aesdeclast %1, %0" : "+x"(a) : "xm"(b)); - return a; -} -#endif -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 - -#define CRYPTOPP_CPUID_AVAILABLE - -// these should not be used directly -extern CRYPTOPP_DLL bool g_x86DetectionDone; -extern CRYPTOPP_DLL bool g_hasSSSE3; -extern CRYPTOPP_DLL bool g_hasAESNI; -extern CRYPTOPP_DLL bool g_hasCLMUL; -extern CRYPTOPP_DLL bool g_isP4; -extern CRYPTOPP_DLL word32 g_cacheLineSize; -CRYPTOPP_DLL void CRYPTOPP_API DetectX86Features(); -CRYPTOPP_DLL bool CRYPTOPP_API CpuId(word32 input, word32 *output); - -#if CRYPTOPP_BOOL_X64 -inline bool HasSSE2() {return true;} -inline bool HasISSE() {return true;} -inline bool HasMMX() {return true;} -#else - -extern CRYPTOPP_DLL bool g_hasSSE2; -extern CRYPTOPP_DLL bool g_hasISSE; -extern CRYPTOPP_DLL bool g_hasMMX; - -inline bool HasSSE2() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasSSE2; -} - -inline bool HasISSE() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasISSE; -} - -inline bool HasMMX() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasMMX; -} - -#endif - -inline bool HasSSSE3() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasSSSE3; -} - -inline bool HasAESNI() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasAESNI; -} - -inline bool HasCLMUL() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasCLMUL; -} - -inline bool IsP4() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_isP4; -} - -inline int GetCacheLineSize() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_cacheLineSize; -} - -#else - -inline int GetCacheLineSize() -{ - return CRYPTOPP_L1_CACHE_LINE_SIZE; -} - -#endif - -#endif - -#ifdef CRYPTOPP_GENERATE_X64_MASM - #define AS1(x) x*newline* - #define AS2(x, y) x, y*newline* - #define AS3(x, y, z) x, y, z*newline* - #define ASS(x, y, a, b, c, d) x, y, a*64+b*16+c*4+d*newline* - #define ASL(x) label##x:*newline* - #define ASJ(x, y, z) x label##y*newline* - #define ASC(x, y) x label##y*newline* - #define AS_HEX(y) 0##y##h -#elif defined(_MSC_VER) || defined(__BORLANDC__) - #define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY - #define AS1(x) __asm {x} - #define AS2(x, y) __asm {x, y} - #define AS3(x, y, z) __asm {x, y, z} - #define ASS(x, y, a, b, c, d) __asm {x, y, (a)*64+(b)*16+(c)*4+(d)} - #define ASL(x) __asm {label##x:} - #define ASJ(x, y, z) __asm {x label##y} - #define ASC(x, y) __asm {x label##y} - #define CRYPTOPP_NAKED __declspec(naked) - #define AS_HEX(y) 0x##y -#else - #define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY - // define these in two steps to allow arguments to be expanded - #define GNU_AS1(x) #x ";" - #define GNU_AS2(x, y) #x ", " #y ";" - #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" - #define GNU_ASL(x) "\n" #x ":" - #define GNU_ASJ(x, y, z) #x " " #y #z ";" - #define AS1(x) GNU_AS1(x) - #define AS2(x, y) GNU_AS2(x, y) - #define AS3(x, y, z) GNU_AS3(x, y, z) - #define ASS(x, y, a, b, c, d) #x ", " #y ", " #a "*64+" #b "*16+" #c "*4+" #d ";" - #define ASL(x) GNU_ASL(x) - #define ASJ(x, y, z) GNU_ASJ(x, y, z) - #define ASC(x, y) #x " " #y ";" - #define CRYPTOPP_NAKED - #define AS_HEX(y) 0x##y -#endif - -#define IF0(y) -#define IF1(y) y - -#ifdef CRYPTOPP_GENERATE_X64_MASM -#define ASM_MOD(x, y) ((x) MOD (y)) -#define XMMWORD_PTR XMMWORD PTR -#else -// GNU assembler doesn't seem to have mod operator -#define ASM_MOD(x, y) ((x)-((x)/(y))*(y)) -// GAS 2.15 doesn't support XMMWORD PTR. it seems necessary only for MASM -#define XMMWORD_PTR -#endif - -#if CRYPTOPP_BOOL_X86 - #define AS_REG_1 ecx - #define AS_REG_2 edx - #define AS_REG_3 esi - #define AS_REG_4 edi - #define AS_REG_5 eax - #define AS_REG_6 ebx - #define AS_REG_7 ebp - #define AS_REG_1d ecx - #define AS_REG_2d edx - #define AS_REG_3d esi - #define AS_REG_4d edi - #define AS_REG_5d eax - #define AS_REG_6d ebx - #define AS_REG_7d ebp - #define WORD_SZ 4 - #define WORD_REG(x) e##x - #define WORD_PTR DWORD PTR - #define AS_PUSH_IF86(x) AS1(push e##x) - #define AS_POP_IF86(x) AS1(pop e##x) - #define AS_JCXZ jecxz -#elif CRYPTOPP_BOOL_X64 - #ifdef CRYPTOPP_GENERATE_X64_MASM - #define AS_REG_1 rcx - #define AS_REG_2 rdx - #define AS_REG_3 r8 - #define AS_REG_4 r9 - #define AS_REG_5 rax - #define AS_REG_6 r10 - #define AS_REG_7 r11 - #define AS_REG_1d ecx - #define AS_REG_2d edx - #define AS_REG_3d r8d - #define AS_REG_4d r9d - #define AS_REG_5d eax - #define AS_REG_6d r10d - #define AS_REG_7d r11d - #else - #define AS_REG_1 rdi - #define AS_REG_2 rsi - #define AS_REG_3 rdx - #define AS_REG_4 rcx - #define AS_REG_5 r8 - #define AS_REG_6 r9 - #define AS_REG_7 r10 - #define AS_REG_1d edi - #define AS_REG_2d esi - #define AS_REG_3d edx - #define AS_REG_4d ecx - #define AS_REG_5d r8d - #define AS_REG_6d r9d - #define AS_REG_7d r10d - #endif - #define WORD_SZ 8 - #define WORD_REG(x) r##x - #define WORD_PTR QWORD PTR - #define AS_PUSH_IF86(x) - #define AS_POP_IF86(x) - #define AS_JCXZ jrcxz -#endif - -// helper macro for stream cipher output -#define AS_XMM_OUTPUT4(labelPrefix, inputPtr, outputPtr, x0, x1, x2, x3, t, p0, p1, p2, p3, increment)\ - AS2( test inputPtr, inputPtr)\ - ASC( jz, labelPrefix##3)\ - AS2( test inputPtr, 15)\ - ASC( jnz, labelPrefix##7)\ - AS2( pxor xmm##x0, [inputPtr+p0*16])\ - AS2( pxor xmm##x1, [inputPtr+p1*16])\ - AS2( pxor xmm##x2, [inputPtr+p2*16])\ - AS2( pxor xmm##x3, [inputPtr+p3*16])\ - AS2( add inputPtr, increment*16)\ - ASC( jmp, labelPrefix##3)\ - ASL(labelPrefix##7)\ - AS2( movdqu xmm##t, [inputPtr+p0*16])\ - AS2( pxor xmm##x0, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p1*16])\ - AS2( pxor xmm##x1, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p2*16])\ - AS2( pxor xmm##x2, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p3*16])\ - AS2( pxor xmm##x3, xmm##t)\ - AS2( add inputPtr, increment*16)\ - ASL(labelPrefix##3)\ - AS2( test outputPtr, 15)\ - ASC( jnz, labelPrefix##8)\ - AS2( movdqa [outputPtr+p0*16], xmm##x0)\ - AS2( movdqa [outputPtr+p1*16], xmm##x1)\ - AS2( movdqa [outputPtr+p2*16], xmm##x2)\ - AS2( movdqa [outputPtr+p3*16], xmm##x3)\ - ASC( jmp, labelPrefix##9)\ - ASL(labelPrefix##8)\ - AS2( movdqu [outputPtr+p0*16], xmm##x0)\ - AS2( movdqu [outputPtr+p1*16], xmm##x1)\ - AS2( movdqu [outputPtr+p2*16], xmm##x2)\ - AS2( movdqu [outputPtr+p3*16], xmm##x3)\ - ASL(labelPrefix##9)\ - AS2( add outputPtr, increment*16) - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/crc.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/crc.cpp deleted file mode 100644 index 10c25c25..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/crc.cpp +++ /dev/null @@ -1,160 +0,0 @@ -// crc.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "crc.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -/* Table of CRC-32's of all single byte values (made by makecrc.c) */ -const word32 CRC32::m_tab[] = { -#ifdef IS_LITTLE_ENDIAN - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL -#else - 0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L, - 0x8ff46a70L, 0x35a563e9L, 0xa395649eL, 0x3288db0eL, 0xa4b8dc79L, - 0x1ee9d5e0L, 0x88d9d297L, 0x2b4cb609L, 0xbd7cb17eL, 0x072db8e7L, - 0x911dbf90L, 0x6410b71dL, 0xf220b06aL, 0x4871b9f3L, 0xde41be84L, - 0x7dd4da1aL, 0xebe4dd6dL, 0x51b5d4f4L, 0xc785d383L, 0x56986c13L, - 0xc0a86b64L, 0x7af962fdL, 0xecc9658aL, 0x4f5c0114L, 0xd96c0663L, - 0x633d0ffaL, 0xf50d088dL, 0xc8206e3bL, 0x5e10694cL, 0xe44160d5L, - 0x727167a2L, 0xd1e4033cL, 0x47d4044bL, 0xfd850dd2L, 0x6bb50aa5L, - 0xfaa8b535L, 0x6c98b242L, 0xd6c9bbdbL, 0x40f9bcacL, 0xe36cd832L, - 0x755cdf45L, 0xcf0dd6dcL, 0x593dd1abL, 0xac30d926L, 0x3a00de51L, - 0x8051d7c8L, 0x1661d0bfL, 0xb5f4b421L, 0x23c4b356L, 0x9995bacfL, - 0x0fa5bdb8L, 0x9eb80228L, 0x0888055fL, 0xb2d90cc6L, 0x24e90bb1L, - 0x877c6f2fL, 0x114c6858L, 0xab1d61c1L, 0x3d2d66b6L, 0x9041dc76L, - 0x0671db01L, 0xbc20d298L, 0x2a10d5efL, 0x8985b171L, 0x1fb5b606L, - 0xa5e4bf9fL, 0x33d4b8e8L, 0xa2c90778L, 0x34f9000fL, 0x8ea80996L, - 0x18980ee1L, 0xbb0d6a7fL, 0x2d3d6d08L, 0x976c6491L, 0x015c63e6L, - 0xf4516b6bL, 0x62616c1cL, 0xd8306585L, 0x4e0062f2L, 0xed95066cL, - 0x7ba5011bL, 0xc1f40882L, 0x57c40ff5L, 0xc6d9b065L, 0x50e9b712L, - 0xeab8be8bL, 0x7c88b9fcL, 0xdf1ddd62L, 0x492dda15L, 0xf37cd38cL, - 0x654cd4fbL, 0x5861b24dL, 0xce51b53aL, 0x7400bca3L, 0xe230bbd4L, - 0x41a5df4aL, 0xd795d83dL, 0x6dc4d1a4L, 0xfbf4d6d3L, 0x6ae96943L, - 0xfcd96e34L, 0x468867adL, 0xd0b860daL, 0x732d0444L, 0xe51d0333L, - 0x5f4c0aaaL, 0xc97c0dddL, 0x3c710550L, 0xaa410227L, 0x10100bbeL, - 0x86200cc9L, 0x25b56857L, 0xb3856f20L, 0x09d466b9L, 0x9fe461ceL, - 0x0ef9de5eL, 0x98c9d929L, 0x2298d0b0L, 0xb4a8d7c7L, 0x173db359L, - 0x810db42eL, 0x3b5cbdb7L, 0xad6cbac0L, 0x2083b8edL, 0xb6b3bf9aL, - 0x0ce2b603L, 0x9ad2b174L, 0x3947d5eaL, 0xaf77d29dL, 0x1526db04L, - 0x8316dc73L, 0x120b63e3L, 0x843b6494L, 0x3e6a6d0dL, 0xa85a6a7aL, - 0x0bcf0ee4L, 0x9dff0993L, 0x27ae000aL, 0xb19e077dL, 0x44930ff0L, - 0xd2a30887L, 0x68f2011eL, 0xfec20669L, 0x5d5762f7L, 0xcb676580L, - 0x71366c19L, 0xe7066b6eL, 0x761bd4feL, 0xe02bd389L, 0x5a7ada10L, - 0xcc4add67L, 0x6fdfb9f9L, 0xf9efbe8eL, 0x43beb717L, 0xd58eb060L, - 0xe8a3d6d6L, 0x7e93d1a1L, 0xc4c2d838L, 0x52f2df4fL, 0xf167bbd1L, - 0x6757bca6L, 0xdd06b53fL, 0x4b36b248L, 0xda2b0dd8L, 0x4c1b0aafL, - 0xf64a0336L, 0x607a0441L, 0xc3ef60dfL, 0x55df67a8L, 0xef8e6e31L, - 0x79be6946L, 0x8cb361cbL, 0x1a8366bcL, 0xa0d26f25L, 0x36e26852L, - 0x95770cccL, 0x03470bbbL, 0xb9160222L, 0x2f260555L, 0xbe3bbac5L, - 0x280bbdb2L, 0x925ab42bL, 0x046ab35cL, 0xa7ffd7c2L, 0x31cfd0b5L, - 0x8b9ed92cL, 0x1daede5bL, 0xb0c2649bL, 0x26f263ecL, 0x9ca36a75L, - 0x0a936d02L, 0xa906099cL, 0x3f360eebL, 0x85670772L, 0x13570005L, - 0x824abf95L, 0x147ab8e2L, 0xae2bb17bL, 0x381bb60cL, 0x9b8ed292L, - 0x0dbed5e5L, 0xb7efdc7cL, 0x21dfdb0bL, 0xd4d2d386L, 0x42e2d4f1L, - 0xf8b3dd68L, 0x6e83da1fL, 0xcd16be81L, 0x5b26b9f6L, 0xe177b06fL, - 0x7747b718L, 0xe65a0888L, 0x706a0fffL, 0xca3b0666L, 0x5c0b0111L, - 0xff9e658fL, 0x69ae62f8L, 0xd3ff6b61L, 0x45cf6c16L, 0x78e20aa0L, - 0xeed20dd7L, 0x5483044eL, 0xc2b30339L, 0x612667a7L, 0xf71660d0L, - 0x4d476949L, 0xdb776e3eL, 0x4a6ad1aeL, 0xdc5ad6d9L, 0x660bdf40L, - 0xf03bd837L, 0x53aebca9L, 0xc59ebbdeL, 0x7fcfb247L, 0xe9ffb530L, - 0x1cf2bdbdL, 0x8ac2bacaL, 0x3093b353L, 0xa6a3b424L, 0x0536d0baL, - 0x9306d7cdL, 0x2957de54L, 0xbf67d923L, 0x2e7a66b3L, 0xb84a61c4L, - 0x021b685dL, 0x942b6f2aL, 0x37be0bb4L, 0xa18e0cc3L, 0x1bdf055aL, - 0x8def022dL -#endif -}; - -CRC32::CRC32() -{ - Reset(); -} - -void CRC32::Update(const byte *s, size_t n) -{ - word32 crc = m_crc; - - for(; !IsAligned(s) && n > 0; n--) - crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc); - - while (n >= 4) - { - crc ^= *(const word32 *)s; - crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc); - crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc); - crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc); - crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc); - n -= 4; - s += 4; - } - - while (n--) - crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc); - - m_crc = crc; -} - -void CRC32::TruncatedFinal(byte *hash, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - m_crc ^= CRC32_NEGL; - for (size_t i=0; i> 8) -#else -#define CRC32_INDEX(c) (c >> 24) -#define CRC32_SHIFTED(c) (c << 8) -#endif - -//! CRC Checksum Calculation -class CRC32 : public HashTransformation -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE = 4) - CRC32(); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *hash, size_t size); - unsigned int DigestSize() const {return DIGESTSIZE;} - static const char * StaticAlgorithmName() {return "CRC32";} - std::string AlgorithmName() const {return StaticAlgorithmName();} - - void UpdateByte(byte b) {m_crc = m_tab[CRC32_INDEX(m_crc) ^ b] ^ CRC32_SHIFTED(m_crc);} - byte GetCrcByte(size_t i) const {return ((byte *)&(m_crc))[i];} - -private: - void Reset() {m_crc = CRC32_NEGL;} - - static const word32 m_tab[256]; - word32 m_crc; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.dsp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.dsp deleted file mode 100644 index aad342ea..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.dsp +++ /dev/null @@ -1,594 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cryptdll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=cryptdll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cryptdll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cryptdll.mak" CFG="cryptdll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cryptdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cryptdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cryptdll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cryptdll___Win32_Release" -# PROP BASE Intermediate_Dir "cryptdll___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "DLL_Release" -# PROP Intermediate_Dir "DLL_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /G5 /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOPP_EXPORTS" /D CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1 /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /Zm200 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 advapi32.lib /nologo /base:"0x42900000" /dll /map /debug /machine:I386 /out:"DLL_Release/cryptopp.dll" /opt:ref -# SUBTRACT LINK32 /pdb:none -# Begin Custom Build -OutDir=.\DLL_Release -TargetPath=.\DLL_Release\cryptopp.dll -InputPath=.\DLL_Release\cryptopp.dll -SOURCE="$(InputPath)" - -"$(OutDir)\cryptopp.mac.done" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - CTRelease\cryptest mac_dll $(TargetPath) - echo mac done > $(OutDir)\cryptopp.mac.done - -# End Custom Build - -!ELSEIF "$(CFG)" == "cryptdll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cryptdll___Win32_Debug" -# PROP BASE Intermediate_Dir "cryptdll___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DLL_Debug" -# PROP Intermediate_Dir "DLL_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MTd /W3 /Gm /GR /GX /Zi /Oi /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOPP_EXPORTS" /D CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1 /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /GZ /Zm200 /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 advapi32.lib /nologo /base:"0x42900000" /dll /incremental:no /debug /machine:I386 /out:"DLL_Debug/cryptopp.dll" /opt:ref -# SUBTRACT LINK32 /pdb:none -# Begin Custom Build -OutDir=.\DLL_Debug -TargetPath=.\DLL_Debug\cryptopp.dll -InputPath=.\DLL_Debug\cryptopp.dll -SOURCE="$(InputPath)" - -"$(OutDir)\cryptopp.mac.done" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - CTDebug\cryptest mac_dll $(TargetPath) - echo mac done > $(OutDir)\cryptopp.mac.done - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "cryptdll - Win32 Release" -# Name "cryptdll - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\algebra.cpp -# End Source File -# Begin Source File - -SOURCE=.\algparam.cpp -# End Source File -# Begin Source File - -SOURCE=.\asn.cpp -# End Source File -# Begin Source File - -SOURCE=.\authenc.cpp -# End Source File -# Begin Source File - -SOURCE=.\basecode.cpp -# End Source File -# Begin Source File - -SOURCE=.\cbcmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\ccm.cpp -# End Source File -# Begin Source File - -SOURCE=.\channels.cpp -# End Source File -# Begin Source File - -SOURCE=.\cmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\cpu.cpp -# End Source File -# Begin Source File - -SOURCE=.\cryptlib.cpp -# End Source File -# Begin Source File - -SOURCE=.\des.cpp -# End Source File -# Begin Source File - -SOURCE=.\dessp.cpp -# End Source File -# Begin Source File - -SOURCE=.\dh.cpp -# End Source File -# Begin Source File - -SOURCE=.\dll.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\dsa.cpp -# End Source File -# Begin Source File - -SOURCE=.\ec2n.cpp -# End Source File -# Begin Source File - -SOURCE=.\eccrypto.cpp -# End Source File -# Begin Source File - -SOURCE=.\ecp.cpp -# End Source File -# Begin Source File - -SOURCE=.\emsa2.cpp -# End Source File -# Begin Source File - -SOURCE=.\eprecomp.cpp -# End Source File -# Begin Source File - -SOURCE=.\files.cpp -# End Source File -# Begin Source File - -SOURCE=.\filters.cpp -# End Source File -# Begin Source File - -SOURCE=.\fips140.cpp -# End Source File -# Begin Source File - -SOURCE=.\fipstest.cpp -# End Source File -# Begin Source File - -SOURCE=.\gcm.cpp -# End Source File -# Begin Source File - -SOURCE=.\gf2n.cpp -# End Source File -# Begin Source File - -SOURCE=.\gfpcrypt.cpp -# End Source File -# Begin Source File - -SOURCE=.\hex.cpp -# End Source File -# Begin Source File - -SOURCE=.\hmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\hrtimer.cpp -# End Source File -# Begin Source File - -SOURCE=.\integer.cpp -# End Source File -# Begin Source File - -SOURCE=.\iterhash.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\misc.cpp -# End Source File -# Begin Source File - -SOURCE=.\modes.cpp -# End Source File -# Begin Source File - -SOURCE=.\mqueue.cpp -# End Source File -# Begin Source File - -SOURCE=.\nbtheory.cpp -# End Source File -# Begin Source File - -SOURCE=.\oaep.cpp -# End Source File -# Begin Source File - -SOURCE=.\osrng.cpp -# End Source File -# Begin Source File - -SOURCE=.\pch.cpp -# ADD CPP /Yc"pch.h" -# End Source File -# Begin Source File - -SOURCE=.\pkcspad.cpp -# End Source File -# Begin Source File - -SOURCE=.\pssr.cpp -# End Source File -# Begin Source File - -SOURCE=.\pubkey.cpp -# End Source File -# Begin Source File - -SOURCE=.\queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\randpool.cpp -# End Source File -# Begin Source File - -SOURCE=.\rdtables.cpp -# End Source File -# Begin Source File - -SOURCE=.\rijndael.cpp -# End Source File -# Begin Source File - -SOURCE=.\rng.cpp -# End Source File -# Begin Source File - -SOURCE=.\rsa.cpp -# End Source File -# Begin Source File - -SOURCE=.\rw.cpp -# End Source File -# Begin Source File - -SOURCE=.\sha.cpp -# End Source File -# Begin Source File - -SOURCE=.\simple.cpp -# End Source File -# Begin Source File - -SOURCE=.\skipjack.cpp -# End Source File -# Begin Source File - -SOURCE=.\strciphr.cpp -# End Source File -# Begin Source File - -SOURCE=.\trdlocal.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=.\aes.h -# End Source File -# Begin Source File - -SOURCE=.\algebra.h -# End Source File -# Begin Source File - -SOURCE=.\algparam.h -# End Source File -# Begin Source File - -SOURCE=.\argnames.h -# End Source File -# Begin Source File - -SOURCE=.\asn.h -# End Source File -# Begin Source File - -SOURCE=.\authenc.h -# End Source File -# Begin Source File - -SOURCE=.\basecode.h -# End Source File -# Begin Source File - -SOURCE=.\cbcmac.h -# End Source File -# Begin Source File - -SOURCE=.\ccm.h -# End Source File -# Begin Source File - -SOURCE=.\channels.h -# End Source File -# Begin Source File - -SOURCE=.\cmac.h -# End Source File -# Begin Source File - -SOURCE=.\config.h -# End Source File -# Begin Source File - -SOURCE=.\cryptlib.h -# End Source File -# Begin Source File - -SOURCE=.\des.h -# End Source File -# Begin Source File - -SOURCE=.\dh.h -# End Source File -# Begin Source File - -SOURCE=.\dll.h -# End Source File -# Begin Source File - -SOURCE=.\dsa.h -# End Source File -# Begin Source File - -SOURCE=.\ec2n.h -# End Source File -# Begin Source File - -SOURCE=.\eccrypto.h -# End Source File -# Begin Source File - -SOURCE=.\ecp.h -# End Source File -# Begin Source File - -SOURCE=.\eprecomp.h -# End Source File -# Begin Source File - -SOURCE=.\files.h -# End Source File -# Begin Source File - -SOURCE=.\filters.h -# End Source File -# Begin Source File - -SOURCE=.\fips140.h -# End Source File -# Begin Source File - -SOURCE=.\fltrimpl.h -# End Source File -# Begin Source File - -SOURCE=.\gcm.h -# End Source File -# Begin Source File - -SOURCE=.\gf2n.h -# End Source File -# Begin Source File - -SOURCE=.\gfpcrypt.h -# End Source File -# Begin Source File - -SOURCE=.\hex.h -# End Source File -# Begin Source File - -SOURCE=.\hmac.h -# End Source File -# Begin Source File - -SOURCE=.\integer.h -# End Source File -# Begin Source File - -SOURCE=.\iterhash.h -# End Source File -# Begin Source File - -SOURCE=.\mdc.h -# End Source File -# Begin Source File - -SOURCE=.\misc.h -# End Source File -# Begin Source File - -SOURCE=.\modarith.h -# End Source File -# Begin Source File - -SOURCE=.\modes.h -# End Source File -# Begin Source File - -SOURCE=.\modexppc.h -# End Source File -# Begin Source File - -SOURCE=.\mqueue.h -# End Source File -# Begin Source File - -SOURCE=.\mqv.h -# End Source File -# Begin Source File - -SOURCE=.\nbtheory.h -# End Source File -# Begin Source File - -SOURCE=.\oaep.h -# End Source File -# Begin Source File - -SOURCE=.\oids.h -# End Source File -# Begin Source File - -SOURCE=.\osrng.h -# End Source File -# Begin Source File - -SOURCE=.\pch.h -# End Source File -# Begin Source File - -SOURCE=.\pkcspad.h -# End Source File -# Begin Source File - -SOURCE=.\pubkey.h -# End Source File -# Begin Source File - -SOURCE=.\queue.h -# End Source File -# Begin Source File - -SOURCE=.\randpool.h -# End Source File -# Begin Source File - -SOURCE=.\rijndael.h -# End Source File -# Begin Source File - -SOURCE=.\rng.h -# End Source File -# Begin Source File - -SOURCE=.\rsa.h -# End Source File -# Begin Source File - -SOURCE=.\secblock.h -# End Source File -# Begin Source File - -SOURCE=.\seckey.h -# End Source File -# Begin Source File - -SOURCE=.\sha.h -# End Source File -# Begin Source File - -SOURCE=.\simple.h -# End Source File -# Begin Source File - -SOURCE=.\skipjack.h -# End Source File -# Begin Source File - -SOURCE=.\smartptr.h -# End Source File -# Begin Source File - -SOURCE=.\stdcpp.h -# End Source File -# Begin Source File - -SOURCE=.\strciphr.h -# End Source File -# Begin Source File - -SOURCE=.\trdlocal.h -# End Source File -# Begin Source File - -SOURCE=.\words.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\cryptopp.rc -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.vcproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.vcproj deleted file mode 100644 index 293fe0c6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptdll.vcproj +++ /dev/null @@ -1,2674 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsp deleted file mode 100644 index a9816421..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsp +++ /dev/null @@ -1,207 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cryptest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=cryptest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cryptest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cryptest.mak" CFG="cryptest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cryptest - Win32 DLL-Import Release" (based on "Win32 (x86) Console Application") -!MESSAGE "cryptest - Win32 DLL-Import Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "cryptest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "cryptest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cryptest - Win32 DLL-Import Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cryptest___Win32_FIPS_140_Release" -# PROP BASE Intermediate_Dir "cryptest___Win32_FIPS_140_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "CT_DLL_Import_Release" -# PROP Intermediate_Dir "CT_DLL_Import_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /G5 /Gz /MT /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c -# ADD CPP /nologo /G5 /Gz /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "CRYPTOPP_IMPORTS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm400 /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /OPT:NOWIN98 -# ADD LINK32 Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Release/cryptest.exe" /libpath:"DLL_Release" /OPT:NOWIN98 /OPT:REF /OPT:ICF -# SUBTRACT LINK32 /pdb:none /incremental:yes -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Cmds=echo This configuration requires cryptopp.dll. echo You can build it yourself using the cryptdll project, or echo obtain a pre-built, FIPS 140-2 validated DLL. If you build it yourself echo the resulting DLL will not be considered FIPS validated echo unless it undergoes FIPS validation. -# End Special Build Tool - -!ELSEIF "$(CFG)" == "cryptest - Win32 DLL-Import Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cryptest___Win32_FIPS_140_Debug" -# PROP BASE Intermediate_Dir "cryptest___Win32_FIPS_140_Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "CT_DLL_Import_Debug" -# PROP Intermediate_Dir "CT_DLL_Import_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c -# ADD CPP /nologo /G5 /Gz /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "CRYPTOPP_IMPORTS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm400 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /OPT:NOWIN98 -# ADD LINK32 Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Debug/cryptest.exe" /pdbtype:sept /libpath:"DLL_Debug" /OPT:NOWIN98 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Cmds=echo This configuration requires cryptopp.dll. echo You can build it yourself using the cryptdll project, or echo obtain a pre-built, FIPS 140-2 validated DLL. If you build it yourself echo the resulting DLL will not be considered FIPS validated echo unless it undergoes FIPS validation. -# End Special Build Tool - -!ELSEIF "$(CFG)" == "cryptest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cryptes0" -# PROP BASE Intermediate_Dir "cryptes0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "CTRelease" -# PROP Intermediate_Dir "CTRelease" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /YX /FD /Zm400 /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 advapi32.lib Ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386 /OPT:NOWIN98 /OPT:REF /OPT:ICF -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cryptest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cryptes1" -# PROP BASE Intermediate_Dir "cryptes1" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "CTDebug" -# PROP Intermediate_Dir "CTDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /YX /FD /Zm400 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 advapi32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /OPT:NOWIN98 -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "cryptest - Win32 DLL-Import Release" -# Name "cryptest - Win32 DLL-Import Debug" -# Name "cryptest - Win32 Release" -# Name "cryptest - Win32 Debug" -# Begin Group "Source Code" - -# PROP Default_Filter ".cpp;.h" -# Begin Source File - -SOURCE=.\adhoc.cpp -# End Source File -# Begin Source File - -SOURCE=.\bench.cpp -# End Source File -# Begin Source File - -SOURCE=.\bench.h -# End Source File -# Begin Source File - -SOURCE=.\bench2.cpp -# End Source File -# Begin Source File - -SOURCE=.\datatest.cpp -# End Source File -# Begin Source File - -SOURCE=.\dlltest.cpp -# End Source File -# Begin Source File - -SOURCE=.\fipsalgt.cpp -# End Source File -# Begin Source File - -SOURCE=.\regtest.cpp -# End Source File -# Begin Source File - -SOURCE=.\test.cpp -# End Source File -# Begin Source File - -SOURCE=.\validat1.cpp -# End Source File -# Begin Source File - -SOURCE=.\validat2.cpp -# End Source File -# Begin Source File - -SOURCE=.\validat3.cpp -# End Source File -# Begin Source File - -SOURCE=.\validate.h -# End Source File -# End Group -# End Target -# End Project diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsw b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsw deleted file mode 100644 index a2f14118..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "cryptdll"=.\cryptdll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cryptest - End Project Dependency -}}} - -############################################################################### - -Project: "cryptest"=.\cryptest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cryptlib - End Project Dependency -}}} - -############################################################################### - -Project: "cryptlib"=.\cryptlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "dlltest"=.\dlltest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cryptdll - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.sln b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.sln deleted file mode 100644 index dea1776a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.sln +++ /dev/null @@ -1,100 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptdll", "cryptdll.vcproj", "{EBD86293-69A9-456B-B814-916E12AA9BBF}" - ProjectSection(ProjectDependencies) = postProject - {9EAFA456-89B4-4879-AD4F-C2C341184CF5} = {9EAFA456-89B4-4879-AD4F-C2C341184CF5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptest", "cryptest.vcproj", "{9EAFA456-89B4-4879-AD4F-C2C341184CF5}" - ProjectSection(ProjectDependencies) = postProject - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest.vcproj", "{A7483CE8-2784-46CE-8CB8-8C0C1D27E232}" - ProjectSection(ProjectDependencies) = postProject - {EBD86293-69A9-456B-B814-916E12AA9BBF} = {EBD86293-69A9-456B-B814-916E12AA9BBF} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DLL-Import Debug|Win32 = DLL-Import Debug|Win32 - DLL-Import Debug|x64 = DLL-Import Debug|x64 - DLL-Import Release|Win32 = DLL-Import Release|Win32 - DLL-Import Release|x64 = DLL-Import Release|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|Win32.ActiveCfg = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|Win32.Build.0 = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|x64.ActiveCfg = Debug|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|x64.Build.0 = Debug|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|x64.Build.0 = Release|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|Win32.ActiveCfg = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|Win32.Build.0 = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|x64.ActiveCfg = Release|x64 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|x64.Build.0 = Release|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|Win32.Build.0 = Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|x64.ActiveCfg = Debug|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|x64.Build.0 = Debug|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|Win32.ActiveCfg = Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|Win32.Build.0 = Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|x64.ActiveCfg = Release|x64 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|x64.Build.0 = Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|Win32.ActiveCfg = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|Win32.Build.0 = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|x64.ActiveCfg = Debug|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|x64.Build.0 = Debug|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|x64.Build.0 = Release|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|Win32.ActiveCfg = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|Win32.Build.0 = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|x64.ActiveCfg = Release|x64 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.vcproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.vcproj deleted file mode 100644 index 03a5b885..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest.vcproj +++ /dev/null @@ -1,1811 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsgroup b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsgroup deleted file mode 100644 index bbb081ac..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsgroup +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - cryptest_bds.bdsproj - cryptlib_bds.bdsproj - cryptest_bds.exe cryptlib_bds.lib - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsproj deleted file mode 100644 index 9086d308..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bdsproj +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - cryptest_bds.bpf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - - v - - True - . - D:\cvs\c5\Debug_Build\cryptest_bds.exe - - - - - False - - False - - True - False - - - Delphi 1.0 Compatibility Components - Borland C++Builder Internet Explorer 5 Components Package - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bpf b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bpf deleted file mode 100644 index c30200be..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptest_bds.bpf +++ /dev/null @@ -1,5 +0,0 @@ -This file is used by the project manager only and should be treated like the project file - -To add a file to this project use the Project menu 'Add to Project' - -main \ No newline at end of file diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.cpp deleted file mode 100644 index df138ddb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.cpp +++ /dev/null @@ -1,828 +0,0 @@ -// cryptlib.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "cryptlib.h" -#include "misc.h" -#include "filters.h" -#include "algparam.h" -#include "fips140.h" -#include "argnames.h" -#include "fltrimpl.h" -#include "trdlocal.h" -#include "osrng.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1); -CRYPTOPP_COMPILE_ASSERT(sizeof(word16) == 2); -CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4); -CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8); -#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE -CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word)); -#endif - -const std::string DEFAULT_CHANNEL; -const std::string AAD_CHANNEL = "AAD"; -const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL; - -class NullNameValuePairs : public NameValuePairs -{ -public: - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;} -}; - -simple_ptr s_pNullNameValuePairs(new NullNameValuePairs); -const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p; - -BufferedTransformation & TheBitBucket() -{ - static BitBucket bitBucket; - return bitBucket; -} - -Algorithm::Algorithm(bool checkSelfTestStatus) -{ - if (checkSelfTestStatus && FIPS_140_2_ComplianceEnabled()) - { - if (GetPowerUpSelfTestStatus() == POWER_UP_SELF_TEST_NOT_DONE && !PowerUpSelfTestInProgressOnThisThread()) - throw SelfTestFailure("Cryptographic algorithms are disabled before the power-up self tests are performed."); - - if (GetPowerUpSelfTestStatus() == POWER_UP_SELF_TEST_FAILED) - throw SelfTestFailure("Cryptographic algorithms are disabled after a power-up self test failed."); - } -} - -void SimpleKeyingInterface::SetKey(const byte *key, size_t length, const NameValuePairs ¶ms) -{ - this->ThrowIfInvalidKeyLength(length); - this->UncheckedSetKey(key, (unsigned int)length, params); -} - -void SimpleKeyingInterface::SetKeyWithRounds(const byte *key, size_t length, int rounds) -{ - SetKey(key, length, MakeParameters(Name::Rounds(), rounds)); -} - -void SimpleKeyingInterface::SetKeyWithIV(const byte *key, size_t length, const byte *iv, size_t ivLength) -{ - SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, ivLength))); -} - -void SimpleKeyingInterface::ThrowIfInvalidKeyLength(size_t length) -{ - if (!IsValidKeyLength(length)) - throw InvalidKeyLength(GetAlgorithm().AlgorithmName(), length); -} - -void SimpleKeyingInterface::ThrowIfResynchronizable() -{ - if (IsResynchronizable()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object requires an IV"); -} - -void SimpleKeyingInterface::ThrowIfInvalidIV(const byte *iv) -{ - if (!iv && IVRequirement() == UNPREDICTABLE_RANDOM_IV) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object cannot use a null IV"); -} - -size_t SimpleKeyingInterface::ThrowIfInvalidIVLength(int size) -{ - if (size < 0) - return IVSize(); - else if ((size_t)size < MinIVLength()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": IV length " + IntToString(size) + " is less than the minimum of " + IntToString(MinIVLength())); - else if ((size_t)size > MaxIVLength()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": IV length " + IntToString(size) + " exceeds the maximum of " + IntToString(MaxIVLength())); - else - return size; -} - -const byte * SimpleKeyingInterface::GetIVAndThrowIfInvalid(const NameValuePairs ¶ms, size_t &size) -{ - ConstByteArrayParameter ivWithLength; - const byte *iv; - bool found = false; - - try {found = params.GetValue(Name::IV(), ivWithLength);} - catch (const NameValuePairs::ValueTypeMismatch &) {} - - if (found) - { - iv = ivWithLength.begin(); - ThrowIfInvalidIV(iv); - size = ThrowIfInvalidIVLength((int)ivWithLength.size()); - return iv; - } - else if (params.GetValue(Name::IV(), iv)) - { - ThrowIfInvalidIV(iv); - size = IVSize(); - return iv; - } - else - { - ThrowIfResynchronizable(); - size = 0; - return NULL; - } -} - -void SimpleKeyingInterface::GetNextIV(RandomNumberGenerator &rng, byte *IV) -{ - rng.GenerateBlock(IV, IVSize()); -} - -size_t BlockTransformation::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const -{ - size_t blockSize = BlockSize(); - size_t inIncrement = (flags & (BT_InBlockIsCounter|BT_DontIncrementInOutPointers)) ? 0 : blockSize; - size_t xorIncrement = xorBlocks ? blockSize : 0; - size_t outIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : blockSize; - - if (flags & BT_ReverseDirection) - { - assert(length % blockSize == 0); - inBlocks += length - blockSize; - xorBlocks += length - blockSize; - outBlocks += length - blockSize; - inIncrement = 0-inIncrement; - xorIncrement = 0-xorIncrement; - outIncrement = 0-outIncrement; - } - - while (length >= blockSize) - { - if (flags & BT_XorInput) - { - xorbuf(outBlocks, xorBlocks, inBlocks, blockSize); - ProcessBlock(outBlocks); - } - else - ProcessAndXorBlock(inBlocks, xorBlocks, outBlocks); - if (flags & BT_InBlockIsCounter) - const_cast(inBlocks)[blockSize-1]++; - inBlocks += inIncrement; - outBlocks += outIncrement; - xorBlocks += xorIncrement; - length -= blockSize; - } - - return length; -} - -unsigned int BlockTransformation::OptimalDataAlignment() const -{ - return GetAlignmentOf(); -} - -unsigned int StreamTransformation::OptimalDataAlignment() const -{ - return GetAlignmentOf(); -} - -unsigned int HashTransformation::OptimalDataAlignment() const -{ - return GetAlignmentOf(); -} - -void StreamTransformation::ProcessLastBlock(byte *outString, const byte *inString, size_t length) -{ - assert(MinLastBlockSize() == 0); // this function should be overriden otherwise - - if (length == MandatoryBlockSize()) - ProcessData(outString, inString, length); - else if (length != 0) - throw NotImplemented(AlgorithmName() + ": this object does't support a special last block"); -} - -void AuthenticatedSymmetricCipher::SpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength) -{ - if (headerLength > MaxHeaderLength()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": header length " + IntToString(headerLength) + " exceeds the maximum of " + IntToString(MaxHeaderLength())); - - if (messageLength > MaxMessageLength()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": message length " + IntToString(messageLength) + " exceeds the maximum of " + IntToString(MaxMessageLength())); - - if (footerLength > MaxFooterLength()) - throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": footer length " + IntToString(footerLength) + " exceeds the maximum of " + IntToString(MaxFooterLength())); - - UncheckedSpecifyDataLengths(headerLength, messageLength, footerLength); -} - -void AuthenticatedSymmetricCipher::EncryptAndAuthenticate(byte *ciphertext, byte *mac, size_t macSize, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *message, size_t messageLength) -{ - Resynchronize(iv, ivLength); - SpecifyDataLengths(headerLength, messageLength); - Update(header, headerLength); - ProcessString(ciphertext, message, messageLength); - TruncatedFinal(mac, macSize); -} - -bool AuthenticatedSymmetricCipher::DecryptAndVerify(byte *message, const byte *mac, size_t macLength, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *ciphertext, size_t ciphertextLength) -{ - Resynchronize(iv, ivLength); - SpecifyDataLengths(headerLength, ciphertextLength); - Update(header, headerLength); - ProcessString(message, ciphertext, ciphertextLength); - return TruncatedVerify(mac, macLength); -} - -unsigned int RandomNumberGenerator::GenerateBit() -{ - return GenerateByte() & 1; -} - -byte RandomNumberGenerator::GenerateByte() -{ - byte b; - GenerateBlock(&b, 1); - return b; -} - -word32 RandomNumberGenerator::GenerateWord32(word32 min, word32 max) -{ - word32 range = max-min; - const int maxBits = BitPrecision(range); - - word32 value; - - do - { - GenerateBlock((byte *)&value, sizeof(value)); - value = Crop(value, maxBits); - } while (value > range); - - return value+min; -} - -void RandomNumberGenerator::GenerateBlock(byte *output, size_t size) -{ - ArraySink s(output, size); - GenerateIntoBufferedTransformation(s, DEFAULT_CHANNEL, size); -} - -void RandomNumberGenerator::DiscardBytes(size_t n) -{ - GenerateIntoBufferedTransformation(TheBitBucket(), DEFAULT_CHANNEL, n); -} - -void RandomNumberGenerator::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length) -{ - FixedSizeSecBlock buffer; - while (length) - { - size_t len = UnsignedMin(buffer.size(), length); - GenerateBlock(buffer, len); - target.ChannelPut(channel, buffer, len); - length -= len; - } -} - -//! see NullRNG() -class ClassNullRNG : public RandomNumberGenerator -{ -public: - std::string AlgorithmName() const {return "NullRNG";} - void GenerateBlock(byte *output, size_t size) {throw NotImplemented("NullRNG: NullRNG should only be passed to functions that don't need to generate random bytes");} -}; - -RandomNumberGenerator & NullRNG() -{ - static ClassNullRNG s_nullRNG; - return s_nullRNG; -} - -bool HashTransformation::TruncatedVerify(const byte *digestIn, size_t digestLength) -{ - ThrowIfInvalidTruncatedSize(digestLength); - SecByteBlock digest(digestLength); - TruncatedFinal(digest, digestLength); - return VerifyBufsEqual(digest, digestIn, digestLength); -} - -void HashTransformation::ThrowIfInvalidTruncatedSize(size_t size) const -{ - if (size > DigestSize()) - throw InvalidArgument("HashTransformation: can't truncate a " + IntToString(DigestSize()) + " byte digest to " + IntToString(size) + " bytes"); -} - -unsigned int BufferedTransformation::GetMaxWaitObjectCount() const -{ - const BufferedTransformation *t = AttachedTransformation(); - return t ? t->GetMaxWaitObjectCount() : 0; -} - -void BufferedTransformation::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - BufferedTransformation *t = AttachedTransformation(); - if (t) - t->GetWaitObjects(container, callStack); // reduce clutter by not adding to stack here -} - -void BufferedTransformation::Initialize(const NameValuePairs ¶meters, int propagation) -{ - assert(!AttachedTransformation()); - IsolatedInitialize(parameters); -} - -bool BufferedTransformation::Flush(bool hardFlush, int propagation, bool blocking) -{ - assert(!AttachedTransformation()); - return IsolatedFlush(hardFlush, blocking); -} - -bool BufferedTransformation::MessageSeriesEnd(int propagation, bool blocking) -{ - assert(!AttachedTransformation()); - return IsolatedMessageSeriesEnd(blocking); -} - -byte * BufferedTransformation::ChannelCreatePutSpace(const std::string &channel, size_t &size) -{ - if (channel.empty()) - return CreatePutSpace(size); - else - throw NoChannelSupport(AlgorithmName()); -} - -size_t BufferedTransformation::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (channel.empty()) - return Put2(begin, length, messageEnd, blocking); - else - throw NoChannelSupport(AlgorithmName()); -} - -size_t BufferedTransformation::ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (channel.empty()) - return PutModifiable2(begin, length, messageEnd, blocking); - else - return ChannelPut2(channel, begin, length, messageEnd, blocking); -} - -bool BufferedTransformation::ChannelFlush(const std::string &channel, bool completeFlush, int propagation, bool blocking) -{ - if (channel.empty()) - return Flush(completeFlush, propagation, blocking); - else - throw NoChannelSupport(AlgorithmName()); -} - -bool BufferedTransformation::ChannelMessageSeriesEnd(const std::string &channel, int propagation, bool blocking) -{ - if (channel.empty()) - return MessageSeriesEnd(propagation, blocking); - else - throw NoChannelSupport(AlgorithmName()); -} - -lword BufferedTransformation::MaxRetrievable() const -{ - if (AttachedTransformation()) - return AttachedTransformation()->MaxRetrievable(); - else - return CopyTo(TheBitBucket()); -} - -bool BufferedTransformation::AnyRetrievable() const -{ - if (AttachedTransformation()) - return AttachedTransformation()->AnyRetrievable(); - else - { - byte b; - return Peek(b) != 0; - } -} - -size_t BufferedTransformation::Get(byte &outByte) -{ - if (AttachedTransformation()) - return AttachedTransformation()->Get(outByte); - else - return Get(&outByte, 1); -} - -size_t BufferedTransformation::Get(byte *outString, size_t getMax) -{ - if (AttachedTransformation()) - return AttachedTransformation()->Get(outString, getMax); - else - { - ArraySink arraySink(outString, getMax); - return (size_t)TransferTo(arraySink, getMax); - } -} - -size_t BufferedTransformation::Peek(byte &outByte) const -{ - if (AttachedTransformation()) - return AttachedTransformation()->Peek(outByte); - else - return Peek(&outByte, 1); -} - -size_t BufferedTransformation::Peek(byte *outString, size_t peekMax) const -{ - if (AttachedTransformation()) - return AttachedTransformation()->Peek(outString, peekMax); - else - { - ArraySink arraySink(outString, peekMax); - return (size_t)CopyTo(arraySink, peekMax); - } -} - -lword BufferedTransformation::Skip(lword skipMax) -{ - if (AttachedTransformation()) - return AttachedTransformation()->Skip(skipMax); - else - return TransferTo(TheBitBucket(), skipMax); -} - -lword BufferedTransformation::TotalBytesRetrievable() const -{ - if (AttachedTransformation()) - return AttachedTransformation()->TotalBytesRetrievable(); - else - return MaxRetrievable(); -} - -unsigned int BufferedTransformation::NumberOfMessages() const -{ - if (AttachedTransformation()) - return AttachedTransformation()->NumberOfMessages(); - else - return CopyMessagesTo(TheBitBucket()); -} - -bool BufferedTransformation::AnyMessages() const -{ - if (AttachedTransformation()) - return AttachedTransformation()->AnyMessages(); - else - return NumberOfMessages() != 0; -} - -bool BufferedTransformation::GetNextMessage() -{ - if (AttachedTransformation()) - return AttachedTransformation()->GetNextMessage(); - else - { - assert(!AnyMessages()); - return false; - } -} - -unsigned int BufferedTransformation::SkipMessages(unsigned int count) -{ - if (AttachedTransformation()) - return AttachedTransformation()->SkipMessages(count); - else - return TransferMessagesTo(TheBitBucket(), count); -} - -size_t BufferedTransformation::TransferMessagesTo2(BufferedTransformation &target, unsigned int &messageCount, const std::string &channel, bool blocking) -{ - if (AttachedTransformation()) - return AttachedTransformation()->TransferMessagesTo2(target, messageCount, channel, blocking); - else - { - unsigned int maxMessages = messageCount; - for (messageCount=0; messageCount < maxMessages && AnyMessages(); messageCount++) - { - size_t blockedBytes; - lword transferredBytes; - - while (AnyRetrievable()) - { - transferredBytes = LWORD_MAX; - blockedBytes = TransferTo2(target, transferredBytes, channel, blocking); - if (blockedBytes > 0) - return blockedBytes; - } - - if (target.ChannelMessageEnd(channel, GetAutoSignalPropagation(), blocking)) - return 1; - - bool result = GetNextMessage(); - assert(result); - } - return 0; - } -} - -unsigned int BufferedTransformation::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const -{ - if (AttachedTransformation()) - return AttachedTransformation()->CopyMessagesTo(target, count, channel); - else - return 0; -} - -void BufferedTransformation::SkipAll() -{ - if (AttachedTransformation()) - AttachedTransformation()->SkipAll(); - else - { - while (SkipMessages()) {} - while (Skip()) {} - } -} - -size_t BufferedTransformation::TransferAllTo2(BufferedTransformation &target, const std::string &channel, bool blocking) -{ - if (AttachedTransformation()) - return AttachedTransformation()->TransferAllTo2(target, channel, blocking); - else - { - assert(!NumberOfMessageSeries()); - - unsigned int messageCount; - do - { - messageCount = UINT_MAX; - size_t blockedBytes = TransferMessagesTo2(target, messageCount, channel, blocking); - if (blockedBytes) - return blockedBytes; - } - while (messageCount != 0); - - lword byteCount; - do - { - byteCount = ULONG_MAX; - size_t blockedBytes = TransferTo2(target, byteCount, channel, blocking); - if (blockedBytes) - return blockedBytes; - } - while (byteCount != 0); - - return 0; - } -} - -void BufferedTransformation::CopyAllTo(BufferedTransformation &target, const std::string &channel) const -{ - if (AttachedTransformation()) - AttachedTransformation()->CopyAllTo(target, channel); - else - { - assert(!NumberOfMessageSeries()); - while (CopyMessagesTo(target, UINT_MAX, channel)) {} - } -} - -void BufferedTransformation::SetRetrievalChannel(const std::string &channel) -{ - if (AttachedTransformation()) - AttachedTransformation()->SetRetrievalChannel(channel); -} - -size_t BufferedTransformation::ChannelPutWord16(const std::string &channel, word16 value, ByteOrder order, bool blocking) -{ - PutWord(false, order, m_buf, value); - return ChannelPut(channel, m_buf, 2, blocking); -} - -size_t BufferedTransformation::ChannelPutWord32(const std::string &channel, word32 value, ByteOrder order, bool blocking) -{ - PutWord(false, order, m_buf, value); - return ChannelPut(channel, m_buf, 4, blocking); -} - -size_t BufferedTransformation::PutWord16(word16 value, ByteOrder order, bool blocking) -{ - return ChannelPutWord16(DEFAULT_CHANNEL, value, order, blocking); -} - -size_t BufferedTransformation::PutWord32(word32 value, ByteOrder order, bool blocking) -{ - return ChannelPutWord32(DEFAULT_CHANNEL, value, order, blocking); -} - -size_t BufferedTransformation::PeekWord16(word16 &value, ByteOrder order) const -{ - byte buf[2] = {0, 0}; - size_t len = Peek(buf, 2); - - if (order) - value = (buf[0] << 8) | buf[1]; - else - value = (buf[1] << 8) | buf[0]; - - return len; -} - -size_t BufferedTransformation::PeekWord32(word32 &value, ByteOrder order) const -{ - byte buf[4] = {0, 0, 0, 0}; - size_t len = Peek(buf, 4); - - if (order) - value = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf [3]; - else - value = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf [0]; - - return len; -} - -size_t BufferedTransformation::GetWord16(word16 &value, ByteOrder order) -{ - return (size_t)Skip(PeekWord16(value, order)); -} - -size_t BufferedTransformation::GetWord32(word32 &value, ByteOrder order) -{ - return (size_t)Skip(PeekWord32(value, order)); -} - -void BufferedTransformation::Attach(BufferedTransformation *newOut) -{ - if (AttachedTransformation() && AttachedTransformation()->Attachable()) - AttachedTransformation()->Attach(newOut); - else - Detach(newOut); -} - -void GeneratableCryptoMaterial::GenerateRandomWithKeySize(RandomNumberGenerator &rng, unsigned int keySize) -{ - GenerateRandom(rng, MakeParameters("KeySize", (int)keySize)); -} - -class PK_DefaultEncryptionFilter : public Unflushable -{ -public: - PK_DefaultEncryptionFilter(RandomNumberGenerator &rng, const PK_Encryptor &encryptor, BufferedTransformation *attachment, const NameValuePairs ¶meters) - : m_rng(rng), m_encryptor(encryptor), m_parameters(parameters) - { - Detach(attachment); - } - - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) - { - FILTER_BEGIN; - m_plaintextQueue.Put(inString, length); - - if (messageEnd) - { - { - size_t plaintextLength; - if (!SafeConvert(m_plaintextQueue.CurrentSize(), plaintextLength)) - throw InvalidArgument("PK_DefaultEncryptionFilter: plaintext too long"); - size_t ciphertextLength = m_encryptor.CiphertextLength(plaintextLength); - - SecByteBlock plaintext(plaintextLength); - m_plaintextQueue.Get(plaintext, plaintextLength); - m_ciphertext.resize(ciphertextLength); - m_encryptor.Encrypt(m_rng, plaintext, plaintextLength, m_ciphertext, m_parameters); - } - - FILTER_OUTPUT(1, m_ciphertext, m_ciphertext.size(), messageEnd); - } - FILTER_END_NO_MESSAGE_END; - } - - RandomNumberGenerator &m_rng; - const PK_Encryptor &m_encryptor; - const NameValuePairs &m_parameters; - ByteQueue m_plaintextQueue; - SecByteBlock m_ciphertext; -}; - -BufferedTransformation * PK_Encryptor::CreateEncryptionFilter(RandomNumberGenerator &rng, BufferedTransformation *attachment, const NameValuePairs ¶meters) const -{ - return new PK_DefaultEncryptionFilter(rng, *this, attachment, parameters); -} - -class PK_DefaultDecryptionFilter : public Unflushable -{ -public: - PK_DefaultDecryptionFilter(RandomNumberGenerator &rng, const PK_Decryptor &decryptor, BufferedTransformation *attachment, const NameValuePairs ¶meters) - : m_rng(rng), m_decryptor(decryptor), m_parameters(parameters) - { - Detach(attachment); - } - - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) - { - FILTER_BEGIN; - m_ciphertextQueue.Put(inString, length); - - if (messageEnd) - { - { - size_t ciphertextLength; - if (!SafeConvert(m_ciphertextQueue.CurrentSize(), ciphertextLength)) - throw InvalidArgument("PK_DefaultDecryptionFilter: ciphertext too long"); - size_t maxPlaintextLength = m_decryptor.MaxPlaintextLength(ciphertextLength); - - SecByteBlock ciphertext(ciphertextLength); - m_ciphertextQueue.Get(ciphertext, ciphertextLength); - m_plaintext.resize(maxPlaintextLength); - m_result = m_decryptor.Decrypt(m_rng, ciphertext, ciphertextLength, m_plaintext, m_parameters); - if (!m_result.isValidCoding) - throw InvalidCiphertext(m_decryptor.AlgorithmName() + ": invalid ciphertext"); - } - - FILTER_OUTPUT(1, m_plaintext, m_result.messageLength, messageEnd); - } - FILTER_END_NO_MESSAGE_END; - } - - RandomNumberGenerator &m_rng; - const PK_Decryptor &m_decryptor; - const NameValuePairs &m_parameters; - ByteQueue m_ciphertextQueue; - SecByteBlock m_plaintext; - DecodingResult m_result; -}; - -BufferedTransformation * PK_Decryptor::CreateDecryptionFilter(RandomNumberGenerator &rng, BufferedTransformation *attachment, const NameValuePairs ¶meters) const -{ - return new PK_DefaultDecryptionFilter(rng, *this, attachment, parameters); -} - -size_t PK_Signer::Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const -{ - std::auto_ptr m(messageAccumulator); - return SignAndRestart(rng, *m, signature, false); -} - -size_t PK_Signer::SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const -{ - std::auto_ptr m(NewSignatureAccumulator(rng)); - m->Update(message, messageLen); - return SignAndRestart(rng, *m, signature, false); -} - -size_t PK_Signer::SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const -{ - std::auto_ptr m(NewSignatureAccumulator(rng)); - InputRecoverableMessage(*m, recoverableMessage, recoverableMessageLength); - m->Update(nonrecoverableMessage, nonrecoverableMessageLength); - return SignAndRestart(rng, *m, signature, false); -} - -bool PK_Verifier::Verify(PK_MessageAccumulator *messageAccumulator) const -{ - std::auto_ptr m(messageAccumulator); - return VerifyAndRestart(*m); -} - -bool PK_Verifier::VerifyMessage(const byte *message, size_t messageLen, const byte *signature, size_t signatureLength) const -{ - std::auto_ptr m(NewVerificationAccumulator()); - InputSignature(*m, signature, signatureLength); - m->Update(message, messageLen); - return VerifyAndRestart(*m); -} - -DecodingResult PK_Verifier::Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const -{ - std::auto_ptr m(messageAccumulator); - return RecoverAndRestart(recoveredMessage, *m); -} - -DecodingResult PK_Verifier::RecoverMessage(byte *recoveredMessage, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, - const byte *signature, size_t signatureLength) const -{ - std::auto_ptr m(NewVerificationAccumulator()); - InputSignature(*m, signature, signatureLength); - m->Update(nonrecoverableMessage, nonrecoverableMessageLength); - return RecoverAndRestart(recoveredMessage, *m); -} - -void SimpleKeyAgreementDomain::GenerateKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const -{ - GeneratePrivateKey(rng, privateKey); - GeneratePublicKey(rng, privateKey, publicKey); -} - -void AuthenticatedKeyAgreementDomain::GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const -{ - GenerateStaticPrivateKey(rng, privateKey); - GenerateStaticPublicKey(rng, privateKey, publicKey); -} - -void AuthenticatedKeyAgreementDomain::GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const -{ - GenerateEphemeralPrivateKey(rng, privateKey); - GenerateEphemeralPublicKey(rng, privateKey, publicKey); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.dsp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.dsp deleted file mode 100644 index 8bbb6ea9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.dsp +++ /dev/null @@ -1,1204 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cryptlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=cryptlib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cryptlib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cryptlib.mak" CFG="cryptlib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cryptlib - Win32 DLL-Import Release" (based on "Win32 (x86) Static Library") -!MESSAGE "cryptlib - Win32 DLL-Import Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "cryptlib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "cryptlib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cryptlib - Win32 DLL-Import Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cryptlib___Win32_FIPS_140_Release" -# PROP BASE Intermediate_Dir "cryptlib___Win32_FIPS_140_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "DLL_Import_Release" -# PROP Intermediate_Dir "DLL_Import_Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /G5 /Gz /MT /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /c -# ADD CPP /nologo /G5 /Gz /MT /W3 /GR /GX /Zi /O2 /Ob2 /D "NDEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /D "CRYPTOPP_IMPORTS" /Yu"pch.h" /FD /Zm400 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "cryptlib - Win32 DLL-Import Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cryptlib___Win32_FIPS_140_Debug" -# PROP BASE Intermediate_Dir "cryptlib___Win32_FIPS_140_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DLL_Import_Debug" -# PROP Intermediate_Dir "DLL_Import_Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /c -# ADD CPP /nologo /G5 /Gz /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /D "CRYPTOPP_IMPORTS" /Yu"pch.h" /FD /Zm400 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "cryptlib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cryptlib" -# PROP BASE Intermediate_Dir "cryptlib" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /Zi /O2 /Ob2 /D "NDEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /Yu"pch.h" /FD /Zm400 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "cryptlib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cryptli0" -# PROP BASE Intermediate_Dir "cryptli0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /Yu"pch.h" /FD /Zm400 /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "cryptlib - Win32 DLL-Import Release" -# Name "cryptlib - Win32 DLL-Import Debug" -# Name "cryptlib - Win32 Release" -# Name "cryptlib - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter ".cpp" -# Begin Source File - -SOURCE=.\3way.cpp -# End Source File -# Begin Source File - -SOURCE=.\adhoc.cpp.proto - -!IF "$(CFG)" == "cryptlib - Win32 DLL-Import Release" - -# Begin Custom Build -InputPath=.\adhoc.cpp.proto - -"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp - echo: >> adhoc.cpp.copied - -# End Custom Build - -!ELSEIF "$(CFG)" == "cryptlib - Win32 DLL-Import Debug" - -# Begin Custom Build -InputPath=.\adhoc.cpp.proto - -"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp - echo: >> adhoc.cpp.copied - -# End Custom Build - -!ELSEIF "$(CFG)" == "cryptlib - Win32 Release" - -# Begin Custom Build -InputPath=.\adhoc.cpp.proto - -"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp - echo: >> adhoc.cpp.copied - -# End Custom Build - -!ELSEIF "$(CFG)" == "cryptlib - Win32 Debug" - -# Begin Custom Build -InputPath=.\adhoc.cpp.proto - -"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp - echo: >> adhoc.cpp.copied - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\adler32.cpp -# End Source File -# Begin Source File - -SOURCE=.\algebra.cpp -# End Source File -# Begin Source File - -SOURCE=.\algparam.cpp -# End Source File -# Begin Source File - -SOURCE=.\arc4.cpp -# End Source File -# Begin Source File - -SOURCE=.\asn.cpp -# End Source File -# Begin Source File - -SOURCE=.\authenc.cpp -# End Source File -# Begin Source File - -SOURCE=.\base32.cpp -# End Source File -# Begin Source File - -SOURCE=.\base64.cpp -# End Source File -# Begin Source File - -SOURCE=.\basecode.cpp -# End Source File -# Begin Source File - -SOURCE=.\bfinit.cpp -# End Source File -# Begin Source File - -SOURCE=.\blowfish.cpp -# End Source File -# Begin Source File - -SOURCE=.\blumshub.cpp -# End Source File -# Begin Source File - -SOURCE=.\camellia.cpp -# End Source File -# Begin Source File - -SOURCE=.\cast.cpp -# End Source File -# Begin Source File - -SOURCE=.\casts.cpp -# End Source File -# Begin Source File - -SOURCE=.\cbcmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\ccm.cpp -# End Source File -# Begin Source File - -SOURCE=.\channels.cpp -# End Source File -# Begin Source File - -SOURCE=.\cmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\cpu.cpp -# End Source File -# Begin Source File - -SOURCE=.\crc.cpp -# End Source File -# Begin Source File - -SOURCE=.\cryptlib.cpp -# End Source File -# Begin Source File - -SOURCE=.\default.cpp -# End Source File -# Begin Source File - -SOURCE=.\des.cpp -# End Source File -# Begin Source File - -SOURCE=.\dessp.cpp -# End Source File -# Begin Source File - -SOURCE=.\dh.cpp -# End Source File -# Begin Source File - -SOURCE=.\dh2.cpp -# End Source File -# Begin Source File - -SOURCE=.\dll.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\dsa.cpp -# End Source File -# Begin Source File - -SOURCE=.\eax.cpp -# End Source File -# Begin Source File - -SOURCE=.\ec2n.cpp -# End Source File -# Begin Source File - -SOURCE=.\eccrypto.cpp -# End Source File -# Begin Source File - -SOURCE=.\ecp.cpp -# End Source File -# Begin Source File - -SOURCE=.\elgamal.cpp -# End Source File -# Begin Source File - -SOURCE=.\emsa2.cpp -# End Source File -# Begin Source File - -SOURCE=.\eprecomp.cpp -# End Source File -# Begin Source File - -SOURCE=.\esign.cpp -# End Source File -# Begin Source File - -SOURCE=.\files.cpp -# End Source File -# Begin Source File - -SOURCE=.\filters.cpp -# End Source File -# Begin Source File - -SOURCE=.\fips140.cpp -# End Source File -# Begin Source File - -SOURCE=.\fipstest.cpp -# End Source File -# Begin Source File - -SOURCE=.\gcm.cpp -# End Source File -# Begin Source File - -SOURCE=.\gf256.cpp -# End Source File -# Begin Source File - -SOURCE=.\gf2_32.cpp -# End Source File -# Begin Source File - -SOURCE=.\gf2n.cpp -# End Source File -# Begin Source File - -SOURCE=.\gfpcrypt.cpp -# End Source File -# Begin Source File - -SOURCE=.\gost.cpp -# End Source File -# Begin Source File - -SOURCE=.\gzip.cpp -# End Source File -# Begin Source File - -SOURCE=.\hex.cpp -# End Source File -# Begin Source File - -SOURCE=.\hmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\hrtimer.cpp -# End Source File -# Begin Source File - -SOURCE=.\ida.cpp -# End Source File -# Begin Source File - -SOURCE=.\idea.cpp -# End Source File -# Begin Source File - -SOURCE=.\integer.cpp -# End Source File -# Begin Source File - -SOURCE=.\iterhash.cpp -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\luc.cpp -# End Source File -# Begin Source File - -SOURCE=.\mars.cpp -# End Source File -# Begin Source File - -SOURCE=.\marss.cpp -# End Source File -# Begin Source File - -SOURCE=.\md2.cpp -# End Source File -# Begin Source File - -SOURCE=.\md4.cpp -# End Source File -# Begin Source File - -SOURCE=.\md5.cpp -# End Source File -# Begin Source File - -SOURCE=.\misc.cpp -# End Source File -# Begin Source File - -SOURCE=.\modes.cpp -# End Source File -# Begin Source File - -SOURCE=.\mqueue.cpp -# End Source File -# Begin Source File - -SOURCE=.\mqv.cpp -# End Source File -# Begin Source File - -SOURCE=.\nbtheory.cpp -# End Source File -# Begin Source File - -SOURCE=.\network.cpp -# End Source File -# Begin Source File - -SOURCE=.\oaep.cpp -# End Source File -# Begin Source File - -SOURCE=.\osrng.cpp -# End Source File -# Begin Source File - -SOURCE=.\panama.cpp -# End Source File -# Begin Source File - -SOURCE=.\pch.cpp -# ADD CPP /Yc"pch.h" -# End Source File -# Begin Source File - -SOURCE=.\pkcspad.cpp -# End Source File -# Begin Source File - -SOURCE=.\polynomi.cpp -# End Source File -# Begin Source File - -SOURCE=.\pssr.cpp -# End Source File -# Begin Source File - -SOURCE=.\pubkey.cpp -# End Source File -# Begin Source File - -SOURCE=.\queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\rabin.cpp -# End Source File -# Begin Source File - -SOURCE=.\randpool.cpp -# End Source File -# Begin Source File - -SOURCE=.\rc2.cpp -# End Source File -# Begin Source File - -SOURCE=.\rc5.cpp -# End Source File -# Begin Source File - -SOURCE=.\rc6.cpp -# End Source File -# Begin Source File - -SOURCE=.\rdtables.cpp -# End Source File -# Begin Source File - -SOURCE=.\rijndael.cpp -# End Source File -# Begin Source File - -SOURCE=.\ripemd.cpp -# End Source File -# Begin Source File - -SOURCE=.\rng.cpp -# End Source File -# Begin Source File - -SOURCE=.\rsa.cpp -# End Source File -# Begin Source File - -SOURCE=.\rw.cpp -# End Source File -# Begin Source File - -SOURCE=.\safer.cpp -# End Source File -# Begin Source File - -SOURCE=.\salsa.cpp -# End Source File -# Begin Source File - -SOURCE=.\seal.cpp -# End Source File -# Begin Source File - -SOURCE=.\seed.cpp -# End Source File -# Begin Source File - -SOURCE=.\serpent.cpp -# End Source File -# Begin Source File - -SOURCE=.\sha.cpp -# End Source File -# Begin Source File - -SOURCE=.\shacal2.cpp -# End Source File -# Begin Source File - -SOURCE=.\shark.cpp -# End Source File -# Begin Source File - -SOURCE=.\sharkbox.cpp -# End Source File -# Begin Source File - -SOURCE=.\simple.cpp -# End Source File -# Begin Source File - -SOURCE=.\skipjack.cpp -# End Source File -# Begin Source File - -SOURCE=.\socketft.cpp -# End Source File -# Begin Source File - -SOURCE=.\sosemanuk.cpp -# End Source File -# Begin Source File - -SOURCE=.\square.cpp -# End Source File -# Begin Source File - -SOURCE=.\squaretb.cpp -# End Source File -# Begin Source File - -SOURCE=.\strciphr.cpp -# End Source File -# Begin Source File - -SOURCE=.\tea.cpp -# End Source File -# Begin Source File - -SOURCE=.\tftables.cpp -# End Source File -# Begin Source File - -SOURCE=.\tiger.cpp -# End Source File -# Begin Source File - -SOURCE=.\tigertab.cpp -# End Source File -# Begin Source File - -SOURCE=.\trdlocal.cpp -# End Source File -# Begin Source File - -SOURCE=.\ttmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\twofish.cpp -# End Source File -# Begin Source File - -SOURCE=.\vmac.cpp -# End Source File -# Begin Source File - -SOURCE=.\wait.cpp -# End Source File -# Begin Source File - -SOURCE=.\wake.cpp -# End Source File -# Begin Source File - -SOURCE=.\whrlpool.cpp -# End Source File -# Begin Source File - -SOURCE=.\winpipes.cpp -# End Source File -# Begin Source File - -SOURCE=.\xtr.cpp -# End Source File -# Begin Source File - -SOURCE=.\xtrcrypt.cpp -# End Source File -# Begin Source File - -SOURCE=.\zdeflate.cpp -# End Source File -# Begin Source File - -SOURCE=.\zinflate.cpp -# End Source File -# Begin Source File - -SOURCE=.\zlib.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter ".;.h" -# Begin Source File - -SOURCE=.\3way.h -# End Source File -# Begin Source File - -SOURCE=.\adler32.h -# End Source File -# Begin Source File - -SOURCE=.\aes.h -# End Source File -# Begin Source File - -SOURCE=.\algebra.h -# End Source File -# Begin Source File - -SOURCE=.\algparam.h -# End Source File -# Begin Source File - -SOURCE=.\arc4.h -# End Source File -# Begin Source File - -SOURCE=.\argnames.h -# End Source File -# Begin Source File - -SOURCE=.\asn.h -# End Source File -# Begin Source File - -SOURCE=.\authenc.h -# End Source File -# Begin Source File - -SOURCE=.\base32.h -# End Source File -# Begin Source File - -SOURCE=.\base64.h -# End Source File -# Begin Source File - -SOURCE=.\basecode.h -# End Source File -# Begin Source File - -SOURCE=.\blowfish.h -# End Source File -# Begin Source File - -SOURCE=.\blumshub.h -# End Source File -# Begin Source File - -SOURCE=.\camellia.h -# End Source File -# Begin Source File - -SOURCE=.\cast.h -# End Source File -# Begin Source File - -SOURCE=.\cbcmac.h -# End Source File -# Begin Source File - -SOURCE=.\ccm.h -# End Source File -# Begin Source File - -SOURCE=.\channels.h -# End Source File -# Begin Source File - -SOURCE=.\cmac.h -# End Source File -# Begin Source File - -SOURCE=.\config.h -# End Source File -# Begin Source File - -SOURCE=.\crc.h -# End Source File -# Begin Source File - -SOURCE=.\cryptlib.h -# End Source File -# Begin Source File - -SOURCE=.\default.h -# End Source File -# Begin Source File - -SOURCE=.\des.h -# End Source File -# Begin Source File - -SOURCE=.\dh.h -# End Source File -# Begin Source File - -SOURCE=.\dh2.h -# End Source File -# Begin Source File - -SOURCE=.\dmac.h -# End Source File -# Begin Source File - -SOURCE=.\dsa.h -# End Source File -# Begin Source File - -SOURCE=.\dword.h -# End Source File -# Begin Source File - -SOURCE=.\eax.h -# End Source File -# Begin Source File - -SOURCE=.\ec2n.h -# End Source File -# Begin Source File - -SOURCE=.\eccrypto.h -# End Source File -# Begin Source File - -SOURCE=.\ecp.h -# End Source File -# Begin Source File - -SOURCE=.\elgamal.h -# End Source File -# Begin Source File - -SOURCE=.\emsa2.h -# End Source File -# Begin Source File - -SOURCE=.\eprecomp.h -# End Source File -# Begin Source File - -SOURCE=.\esign.h -# End Source File -# Begin Source File - -SOURCE=.\factory.h -# End Source File -# Begin Source File - -SOURCE=.\files.h -# End Source File -# Begin Source File - -SOURCE=.\filters.h -# End Source File -# Begin Source File - -SOURCE=.\fips140.h -# End Source File -# Begin Source File - -SOURCE=.\fltrimpl.h -# End Source File -# Begin Source File - -SOURCE=.\gcm.h -# End Source File -# Begin Source File - -SOURCE=.\gf256.h -# End Source File -# Begin Source File - -SOURCE=.\gf2_32.h -# End Source File -# Begin Source File - -SOURCE=.\gf2n.h -# End Source File -# Begin Source File - -SOURCE=.\gfpcrypt.h -# End Source File -# Begin Source File - -SOURCE=.\gost.h -# End Source File -# Begin Source File - -SOURCE=.\gzip.h -# End Source File -# Begin Source File - -SOURCE=.\hex.h -# End Source File -# Begin Source File - -SOURCE=.\hmac.h -# End Source File -# Begin Source File - -SOURCE=.\hrtimer.h -# End Source File -# Begin Source File - -SOURCE=.\ida.h -# End Source File -# Begin Source File - -SOURCE=.\idea.h -# End Source File -# Begin Source File - -SOURCE=.\integer.h -# End Source File -# Begin Source File - -SOURCE=.\iterhash.h -# End Source File -# Begin Source File - -SOURCE=.\lubyrack.h -# End Source File -# Begin Source File - -SOURCE=.\luc.h -# End Source File -# Begin Source File - -SOURCE=.\mars.h -# End Source File -# Begin Source File - -SOURCE=.\md2.h -# End Source File -# Begin Source File - -SOURCE=.\md4.h -# End Source File -# Begin Source File - -SOURCE=.\md5.h -# End Source File -# Begin Source File - -SOURCE=.\mdc.h -# End Source File -# Begin Source File - -SOURCE=.\misc.h -# End Source File -# Begin Source File - -SOURCE=.\modarith.h -# End Source File -# Begin Source File - -SOURCE=.\modes.h -# End Source File -# Begin Source File - -SOURCE=.\modexppc.h -# End Source File -# Begin Source File - -SOURCE=.\mqueue.h -# End Source File -# Begin Source File - -SOURCE=.\mqv.h -# End Source File -# Begin Source File - -SOURCE=.\nbtheory.h -# End Source File -# Begin Source File - -SOURCE=.\network.h -# End Source File -# Begin Source File - -SOURCE=.\nr.h -# End Source File -# Begin Source File - -SOURCE=.\oaep.h -# End Source File -# Begin Source File - -SOURCE=.\oids.h -# End Source File -# Begin Source File - -SOURCE=.\osrng.h -# End Source File -# Begin Source File - -SOURCE=.\panama.h -# End Source File -# Begin Source File - -SOURCE=.\pch.h -# End Source File -# Begin Source File - -SOURCE=.\pkcspad.h -# End Source File -# Begin Source File - -SOURCE=.\polynomi.h -# End Source File -# Begin Source File - -SOURCE=.\pssr.h -# End Source File -# Begin Source File - -SOURCE=.\pubkey.h -# End Source File -# Begin Source File - -SOURCE=.\pwdbased.h -# End Source File -# Begin Source File - -SOURCE=.\queue.h -# End Source File -# Begin Source File - -SOURCE=.\rabin.h -# End Source File -# Begin Source File - -SOURCE=.\randpool.h -# End Source File -# Begin Source File - -SOURCE=.\rc2.h -# End Source File -# Begin Source File - -SOURCE=.\rc5.h -# End Source File -# Begin Source File - -SOURCE=.\rc6.h -# End Source File -# Begin Source File - -SOURCE=.\rijndael.h -# End Source File -# Begin Source File - -SOURCE=.\ripemd.h -# End Source File -# Begin Source File - -SOURCE=.\rng.h -# End Source File -# Begin Source File - -SOURCE=.\rsa.h -# End Source File -# Begin Source File - -SOURCE=.\rw.h -# End Source File -# Begin Source File - -SOURCE=.\safer.h -# End Source File -# Begin Source File - -SOURCE=.\salsa.h -# End Source File -# Begin Source File - -SOURCE=.\seal.h -# End Source File -# Begin Source File - -SOURCE=.\secblock.h -# End Source File -# Begin Source File - -SOURCE=.\seckey.h -# End Source File -# Begin Source File - -SOURCE=.\seed.h -# End Source File -# Begin Source File - -SOURCE=.\serpent.h -# End Source File -# Begin Source File - -SOURCE=.\sha.h -# End Source File -# Begin Source File - -SOURCE=.\shacal2.h -# End Source File -# Begin Source File - -SOURCE=.\shark.h -# End Source File -# Begin Source File - -SOURCE=.\simple.h -# End Source File -# Begin Source File - -SOURCE=.\skipjack.h -# End Source File -# Begin Source File - -SOURCE=.\smartptr.h -# End Source File -# Begin Source File - -SOURCE=.\socketft.h -# End Source File -# Begin Source File - -SOURCE=.\square.h -# End Source File -# Begin Source File - -SOURCE=.\strciphr.h -# End Source File -# Begin Source File - -SOURCE=.\tea.h -# End Source File -# Begin Source File - -SOURCE=.\tiger.h -# End Source File -# Begin Source File - -SOURCE=.\trdlocal.h -# End Source File -# Begin Source File - -SOURCE=.\trunhash.h -# End Source File -# Begin Source File - -SOURCE=.\ttmac.h -# End Source File -# Begin Source File - -SOURCE=.\twofish.h -# End Source File -# Begin Source File - -SOURCE=.\wait.h -# End Source File -# Begin Source File - -SOURCE=.\wake.h -# End Source File -# Begin Source File - -SOURCE=.\whrlpool.h -# End Source File -# Begin Source File - -SOURCE=.\winpipes.h -# End Source File -# Begin Source File - -SOURCE=.\words.h -# End Source File -# Begin Source File - -SOURCE=.\xtr.h -# End Source File -# Begin Source File - -SOURCE=.\xtrcrypt.h -# End Source File -# Begin Source File - -SOURCE=.\zdeflate.h -# End Source File -# Begin Source File - -SOURCE=.\zinflate.h -# End Source File -# Begin Source File - -SOURCE=.\zlib.h -# End Source File -# End Group -# Begin Group "Miscellaneous" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Doxyfile -# End Source File -# Begin Source File - -SOURCE=.\GNUmakefile -# End Source File -# Begin Source File - -SOURCE=.\license.txt -# End Source File -# Begin Source File - -SOURCE=.\readme.txt -# End Source File -# End Group -# End Target -# End Project diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.h deleted file mode 100644 index 0ad18de8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.h +++ /dev/null @@ -1,1655 +0,0 @@ -// cryptlib.h - written and placed in the public domain by Wei Dai -/*! \file - This file contains the declarations for the abstract base - classes that provide a uniform interface to this library. -*/ - -/*! \mainpage Crypto++ Library 5.6.1 API Reference -
-
Abstract Base Classes
- cryptlib.h -
Authenticated Encryption
- AuthenticatedSymmetricCipherDocumentation -
Symmetric Ciphers
- SymmetricCipherDocumentation -
Hash Functions
- SHA1, SHA224, SHA256, SHA384, SHA512, Tiger, Whirlpool, RIPEMD160, RIPEMD320, RIPEMD128, RIPEMD256, Weak1::MD2, Weak1::MD4, Weak1::MD5 -
Non-Cryptographic Checksums
- CRC32, Adler32 -
Message Authentication Codes
- VMAC, HMAC, CBC_MAC, CMAC, DMAC, TTMAC, GCM (GMAC) -
Random Number Generators
- NullRNG(), LC_RNG, RandomPool, BlockingRng, NonblockingRng, AutoSeededRandomPool, AutoSeededX917RNG, #DefaultAutoSeededRNG -
Password-based Cryptography
- PasswordBasedKeyDerivationFunction -
Public Key Cryptosystems
- DLIES, ECIES, LUCES, RSAES, RabinES, LUC_IES -
Public Key Signature Schemes
- DSA, GDSA, ECDSA, NR, ECNR, LUCSS, RSASS, RSASS_ISO, RabinSS, RWSS, ESIGN -
Key Agreement
- #DH, DH2, #MQV, ECDH, ECMQV, XTR_DH -
Algebraic Structures
- Integer, PolynomialMod2, PolynomialOver, RingOfPolynomialsOver, - ModularArithmetic, MontgomeryRepresentation, GFP2_ONB, - GF2NP, GF256, GF2_32, EC2N, ECP -
Secret Sharing and Information Dispersal
- SecretSharing, SecretRecovery, InformationDispersal, InformationRecovery -
Compression
- Deflator, Inflator, Gzip, Gunzip, ZlibCompressor, ZlibDecompressor -
Input Source Classes
- StringSource, #ArraySource, FileSource, SocketSource, WindowsPipeSource, RandomNumberSource -
Output Sink Classes
- StringSinkTemplate, ArraySink, FileSink, SocketSink, WindowsPipeSink, RandomNumberSink -
Filter Wrappers
- StreamTransformationFilter, HashFilter, HashVerificationFilter, SignerFilter, SignatureVerificationFilter -
Binary to Text Encoders and Decoders
- HexEncoder, HexDecoder, Base64Encoder, Base64Decoder, Base32Encoder, Base32Decoder -
Wrappers for OS features
- Timer, Socket, WindowsHandle, ThreadLocalStorage, ThreadUserTimer -
FIPS 140 related
- fips140.h -
- -In the DLL version of Crypto++, only the following implementation class are available. -
-
Block Ciphers
- AES, DES_EDE2, DES_EDE3, SKIPJACK -
Cipher Modes (replace template parameter BC with one of the block ciphers above)
- ECB_Mode\, CTR_Mode\, CBC_Mode\, CFB_FIPS_Mode\, OFB_Mode\, GCM\ -
Hash Functions
- SHA1, SHA224, SHA256, SHA384, SHA512 -
Public Key Signature Schemes (replace template parameter H with one of the hash functions above)
- RSASS\, RSASS\, RSASS_ISO\, RWSS\, DSA, ECDSA\, ECDSA\ -
Message Authentication Codes (replace template parameter H with one of the hash functions above)
- HMAC\, CBC_MAC\, CBC_MAC\, GCM\ -
Random Number Generators
- #DefaultAutoSeededRNG (AutoSeededX917RNG\) -
Key Agreement
- #DH -
Public Key Cryptosystems
- RSAES\ \> -
- -

This reference manual is a work in progress. Some classes are still lacking detailed descriptions. -

Click here to download a zip archive containing this manual. -

Thanks to Ryan Phillips for providing the Doxygen configuration file -and getting me started with this manual. -*/ - -#ifndef CRYPTOPP_CRYPTLIB_H -#define CRYPTOPP_CRYPTLIB_H - -#include "config.h" -#include "stdcpp.h" - -NAMESPACE_BEGIN(CryptoPP) - -// forward declarations -class Integer; -class RandomNumberGenerator; -class BufferedTransformation; - -//! used to specify a direction for a cipher to operate in (encrypt or decrypt) -enum CipherDir {ENCRYPTION, DECRYPTION}; - -//! used to represent infinite time -const unsigned long INFINITE_TIME = ULONG_MAX; - -// VC60 workaround: using enums as template parameters causes problems -template -struct EnumToType -{ - static ENUM_TYPE ToEnum() {return (ENUM_TYPE)VALUE;} -}; - -enum ByteOrder {LITTLE_ENDIAN_ORDER = 0, BIG_ENDIAN_ORDER = 1}; -typedef EnumToType LittleEndian; -typedef EnumToType BigEndian; - -//! base class for all exceptions thrown by Crypto++ -class CRYPTOPP_DLL Exception : public std::exception -{ -public: - //! error types - enum ErrorType { - //! a method is not implemented - NOT_IMPLEMENTED, - //! invalid function argument - INVALID_ARGUMENT, - //! BufferedTransformation received a Flush(true) signal but can't flush buffers - CANNOT_FLUSH, - //! data integerity check (such as CRC or MAC) failed - DATA_INTEGRITY_CHECK_FAILED, - //! received input data that doesn't conform to expected format - INVALID_DATA_FORMAT, - //! error reading from input device or writing to output device - IO_ERROR, - //! some error not belong to any of the above categories - OTHER_ERROR - }; - - explicit Exception(ErrorType errorType, const std::string &s) : m_errorType(errorType), m_what(s) {} - virtual ~Exception() throw() {} - const char *what() const throw() {return (m_what.c_str());} - const std::string &GetWhat() const {return m_what;} - void SetWhat(const std::string &s) {m_what = s;} - ErrorType GetErrorType() const {return m_errorType;} - void SetErrorType(ErrorType errorType) {m_errorType = errorType;} - -private: - ErrorType m_errorType; - std::string m_what; -}; - -//! exception thrown when an invalid argument is detected -class CRYPTOPP_DLL InvalidArgument : public Exception -{ -public: - explicit InvalidArgument(const std::string &s) : Exception(INVALID_ARGUMENT, s) {} -}; - -//! exception thrown when input data is received that doesn't conform to expected format -class CRYPTOPP_DLL InvalidDataFormat : public Exception -{ -public: - explicit InvalidDataFormat(const std::string &s) : Exception(INVALID_DATA_FORMAT, s) {} -}; - -//! exception thrown by decryption filters when trying to decrypt an invalid ciphertext -class CRYPTOPP_DLL InvalidCiphertext : public InvalidDataFormat -{ -public: - explicit InvalidCiphertext(const std::string &s) : InvalidDataFormat(s) {} -}; - -//! exception thrown by a class if a non-implemented method is called -class CRYPTOPP_DLL NotImplemented : public Exception -{ -public: - explicit NotImplemented(const std::string &s) : Exception(NOT_IMPLEMENTED, s) {} -}; - -//! exception thrown by a class when Flush(true) is called but it can't completely flush its buffers -class CRYPTOPP_DLL CannotFlush : public Exception -{ -public: - explicit CannotFlush(const std::string &s) : Exception(CANNOT_FLUSH, s) {} -}; - -//! error reported by the operating system -class CRYPTOPP_DLL OS_Error : public Exception -{ -public: - OS_Error(ErrorType errorType, const std::string &s, const std::string& operation, int errorCode) - : Exception(errorType, s), m_operation(operation), m_errorCode(errorCode) {} - ~OS_Error() throw() {} - - // the operating system API that reported the error - const std::string & GetOperation() const {return m_operation;} - // the error code return by the operating system - int GetErrorCode() const {return m_errorCode;} - -protected: - std::string m_operation; - int m_errorCode; -}; - -//! used to return decoding results -struct CRYPTOPP_DLL DecodingResult -{ - explicit DecodingResult() : isValidCoding(false), messageLength(0) {} - explicit DecodingResult(size_t len) : isValidCoding(true), messageLength(len) {} - - bool operator==(const DecodingResult &rhs) const {return isValidCoding == rhs.isValidCoding && messageLength == rhs.messageLength;} - bool operator!=(const DecodingResult &rhs) const {return !operator==(rhs);} - - bool isValidCoding; - size_t messageLength; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - operator size_t() const {return isValidCoding ? messageLength : 0;} -#endif -}; - -//! interface for retrieving values given their names -/*! \note This class is used to safely pass a variable number of arbitrarily typed arguments to functions - and to read values from keys and crypto parameters. - \note To obtain an object that implements NameValuePairs for the purpose of parameter - passing, use the MakeParameters() function. - \note To get a value from NameValuePairs, you need to know the name and the type of the value. - Call GetValueNames() on a NameValuePairs object to obtain a list of value names that it supports. - Then look at the Name namespace documentation to see what the type of each value is, or - alternatively, call GetIntValue() with the value name, and if the type is not int, a - ValueTypeMismatch exception will be thrown and you can get the actual type from the exception object. -*/ -class CRYPTOPP_NO_VTABLE NameValuePairs -{ -public: - virtual ~NameValuePairs() {} - - //! exception thrown when trying to retrieve a value using a different type than expected - class CRYPTOPP_DLL ValueTypeMismatch : public InvalidArgument - { - public: - ValueTypeMismatch(const std::string &name, const std::type_info &stored, const std::type_info &retrieving) - : InvalidArgument("NameValuePairs: type mismatch for '" + name + "', stored '" + stored.name() + "', trying to retrieve '" + retrieving.name() + "'") - , m_stored(stored), m_retrieving(retrieving) {} - - const std::type_info & GetStoredTypeInfo() const {return m_stored;} - const std::type_info & GetRetrievingTypeInfo() const {return m_retrieving;} - - private: - const std::type_info &m_stored; - const std::type_info &m_retrieving; - }; - - //! get a copy of this object or a subobject of it - template - bool GetThisObject(T &object) const - { - return GetValue((std::string("ThisObject:")+typeid(T).name()).c_str(), object); - } - - //! get a pointer to this object, as a pointer to T - template - bool GetThisPointer(T *&p) const - { - return GetValue((std::string("ThisPointer:")+typeid(T).name()).c_str(), p); - } - - //! get a named value, returns true if the name exists - template - bool GetValue(const char *name, T &value) const - { - return GetVoidValue(name, typeid(T), &value); - } - - //! get a named value, returns the default if the name doesn't exist - template - T GetValueWithDefault(const char *name, T defaultValue) const - { - GetValue(name, defaultValue); - return defaultValue; - } - - //! get a list of value names that can be retrieved - CRYPTOPP_DLL std::string GetValueNames() const - {std::string result; GetValue("ValueNames", result); return result;} - - //! get a named value with type int - /*! used to ensure we don't accidentally try to get an unsigned int - or some other type when we mean int (which is the most common case) */ - CRYPTOPP_DLL bool GetIntValue(const char *name, int &value) const - {return GetValue(name, value);} - - //! get a named value with type int, with default - CRYPTOPP_DLL int GetIntValueWithDefault(const char *name, int defaultValue) const - {return GetValueWithDefault(name, defaultValue);} - - //! used by derived classes to check for type mismatch - CRYPTOPP_DLL static void CRYPTOPP_API ThrowIfTypeMismatch(const char *name, const std::type_info &stored, const std::type_info &retrieving) - {if (stored != retrieving) throw ValueTypeMismatch(name, stored, retrieving);} - - template - void GetRequiredParameter(const char *className, const char *name, T &value) const - { - if (!GetValue(name, value)) - throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'"); - } - - CRYPTOPP_DLL void GetRequiredIntParameter(const char *className, const char *name, int &value) const - { - if (!GetIntValue(name, value)) - throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'"); - } - - //! to be implemented by derived classes, users should use one of the above functions instead - CRYPTOPP_DLL virtual bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const =0; -}; - -//! namespace containing value name definitions -/*! value names, types and semantics: - - ThisObject:ClassName (ClassName, copy of this object or a subobject) - ThisPointer:ClassName (const ClassName *, pointer to this object or a subobject) -*/ -DOCUMENTED_NAMESPACE_BEGIN(Name) -// more names defined in argnames.h -DOCUMENTED_NAMESPACE_END - -//! empty set of name-value pairs -extern CRYPTOPP_DLL const NameValuePairs &g_nullNameValuePairs; - -// ******************************************************** - -//! interface for cloning objects, this is not implemented by most classes yet -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Clonable -{ -public: - virtual ~Clonable() {} - //! this is not implemented by most classes yet - virtual Clonable* Clone() const {throw NotImplemented("Clone() is not implemented yet.");} // TODO: make this =0 -}; - -//! interface for all crypto algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Algorithm : public Clonable -{ -public: - /*! When FIPS 140-2 compliance is enabled and checkSelfTestStatus == true, - this constructor throws SelfTestFailure if the self test hasn't been run or fails. */ - Algorithm(bool checkSelfTestStatus = true); - //! returns name of this algorithm, not universally implemented yet - virtual std::string AlgorithmName() const {return "unknown";} -}; - -//! keying interface for crypto algorithms that take byte strings as keys -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyingInterface -{ -public: - virtual ~SimpleKeyingInterface() {} - - //! returns smallest valid key length in bytes */ - virtual size_t MinKeyLength() const =0; - //! returns largest valid key length in bytes */ - virtual size_t MaxKeyLength() const =0; - //! returns default (recommended) key length in bytes */ - virtual size_t DefaultKeyLength() const =0; - - //! returns the smallest valid key length in bytes that is >= min(n, GetMaxKeyLength()) - virtual size_t GetValidKeyLength(size_t n) const =0; - - //! returns whether n is a valid key length - virtual bool IsValidKeyLength(size_t n) const - {return n == GetValidKeyLength(n);} - - //! set or reset the key of this object - /*! \param params is used to specify Rounds, BlockSize, etc. */ - virtual void SetKey(const byte *key, size_t length, const NameValuePairs ¶ms = g_nullNameValuePairs); - - //! calls SetKey() with an NameValuePairs object that just specifies "Rounds" - void SetKeyWithRounds(const byte *key, size_t length, int rounds); - - //! calls SetKey() with an NameValuePairs object that just specifies "IV" - void SetKeyWithIV(const byte *key, size_t length, const byte *iv, size_t ivLength); - - //! calls SetKey() with an NameValuePairs object that just specifies "IV" - void SetKeyWithIV(const byte *key, size_t length, const byte *iv) - {SetKeyWithIV(key, length, iv, IVSize());} - - enum IV_Requirement {UNIQUE_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, INTERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE}; - //! returns the minimal requirement for secure IVs - virtual IV_Requirement IVRequirement() const =0; - - //! returns whether this object can be resynchronized (i.e. supports initialization vectors) - /*! If this function returns true, and no IV is passed to SetKey() and CanUseStructuredIVs()==true, an IV of all 0's will be assumed. */ - bool IsResynchronizable() const {return IVRequirement() < NOT_RESYNCHRONIZABLE;} - //! returns whether this object can use random IVs (in addition to ones returned by GetNextIV) - bool CanUseRandomIVs() const {return IVRequirement() <= UNPREDICTABLE_RANDOM_IV;} - //! returns whether this object can use random but possibly predictable IVs (in addition to ones returned by GetNextIV) - bool CanUsePredictableIVs() const {return IVRequirement() <= RANDOM_IV;} - //! returns whether this object can use structured IVs, for example a counter (in addition to ones returned by GetNextIV) - bool CanUseStructuredIVs() const {return IVRequirement() <= UNIQUE_IV;} - - virtual unsigned int IVSize() const {throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");} - //! returns default length of IVs accepted by this object - unsigned int DefaultIVLength() const {return IVSize();} - //! returns minimal length of IVs accepted by this object - virtual unsigned int MinIVLength() const {return IVSize();} - //! returns maximal length of IVs accepted by this object - virtual unsigned int MaxIVLength() const {return IVSize();} - //! resynchronize with an IV. ivLength=-1 means use IVSize() - virtual void Resynchronize(const byte *iv, int ivLength=-1) {throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");} - //! get a secure IV for the next message - /*! This method should be called after you finish encrypting one message and are ready to start the next one. - After calling it, you must call SetKey() or Resynchronize() before using this object again. - This method is not implemented on decryption objects. */ - virtual void GetNextIV(RandomNumberGenerator &rng, byte *IV); - -protected: - virtual const Algorithm & GetAlgorithm() const =0; - virtual void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) =0; - - void ThrowIfInvalidKeyLength(size_t length); - void ThrowIfResynchronizable(); // to be called when no IV is passed - void ThrowIfInvalidIV(const byte *iv); // check for NULL IV if it can't be used - size_t ThrowIfInvalidIVLength(int size); - const byte * GetIVAndThrowIfInvalid(const NameValuePairs ¶ms, size_t &size); - inline void AssertValidKeyLength(size_t length) const - {assert(IsValidKeyLength(length));} -}; - -//! interface for the data processing part of block ciphers - -/*! Classes derived from BlockTransformation are block ciphers - in ECB mode (for example the DES::Encryption class), which are stateless. - These classes should not be used directly, but only in combination with - a mode class (see CipherModeDocumentation in modes.h). -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockTransformation : public Algorithm -{ -public: - //! encrypt or decrypt inBlock, xor with xorBlock, and write to outBlock - virtual void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const =0; - - //! encrypt or decrypt one block - /*! \pre size of inBlock and outBlock == BlockSize() */ - void ProcessBlock(const byte *inBlock, byte *outBlock) const - {ProcessAndXorBlock(inBlock, NULL, outBlock);} - - //! encrypt or decrypt one block in place - void ProcessBlock(byte *inoutBlock) const - {ProcessAndXorBlock(inoutBlock, NULL, inoutBlock);} - - //! block size of the cipher in bytes - virtual unsigned int BlockSize() const =0; - - //! returns how inputs and outputs should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! returns true if this is a permutation (i.e. there is an inverse transformation) - virtual bool IsPermutation() const {return true;} - - //! returns true if this is an encryption object - virtual bool IsForwardTransformation() const =0; - - //! return number of blocks that can be processed in parallel, for bit-slicing implementations - virtual unsigned int OptimalNumberOfParallelBlocks() const {return 1;} - - enum {BT_InBlockIsCounter=1, BT_DontIncrementInOutPointers=2, BT_XorInput=4, BT_ReverseDirection=8, BT_AllowParallel=16} FlagsForAdvancedProcessBlocks; - - //! encrypt and xor blocks according to flags (see FlagsForAdvancedProcessBlocks) - /*! /note If BT_InBlockIsCounter is set, last byte of inBlocks may be modified. */ - virtual size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const; - - inline CipherDir GetCipherDirection() const {return IsForwardTransformation() ? ENCRYPTION : DECRYPTION;} -}; - -//! interface for the data processing part of stream ciphers - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE StreamTransformation : public Algorithm -{ -public: - //! return a reference to this object, useful for passing a temporary object to a function that takes a non-const reference - StreamTransformation& Ref() {return *this;} - - //! returns block size, if input must be processed in blocks, otherwise 1 - virtual unsigned int MandatoryBlockSize() const {return 1;} - - //! returns the input block size that is most efficient for this cipher - /*! \note optimal input length is n * OptimalBlockSize() - GetOptimalBlockSizeUsed() for any n > 0 */ - virtual unsigned int OptimalBlockSize() const {return MandatoryBlockSize();} - //! returns how much of the current block is used up - virtual unsigned int GetOptimalBlockSizeUsed() const {return 0;} - - //! returns how input should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! encrypt or decrypt an array of bytes of specified length - /*! \note either inString == outString, or they don't overlap */ - virtual void ProcessData(byte *outString, const byte *inString, size_t length) =0; - - //! for ciphers where the last block of data is special, encrypt or decrypt the last block of data - /*! For now the only use of this function is for CBC-CTS mode. */ - virtual void ProcessLastBlock(byte *outString, const byte *inString, size_t length); - //! returns the minimum size of the last block, 0 indicating the last block is not special - virtual unsigned int MinLastBlockSize() const {return 0;} - - //! same as ProcessData(inoutString, inoutString, length) - inline void ProcessString(byte *inoutString, size_t length) - {ProcessData(inoutString, inoutString, length);} - //! same as ProcessData(outString, inString, length) - inline void ProcessString(byte *outString, const byte *inString, size_t length) - {ProcessData(outString, inString, length);} - //! implemented as {ProcessData(&input, &input, 1); return input;} - inline byte ProcessByte(byte input) - {ProcessData(&input, &input, 1); return input;} - - //! returns whether this cipher supports random access - virtual bool IsRandomAccess() const =0; - //! for random access ciphers, seek to an absolute position - virtual void Seek(lword n) - { - assert(!IsRandomAccess()); - throw NotImplemented("StreamTransformation: this object doesn't support random access"); - } - - //! returns whether this transformation is self-inverting (e.g. xor with a keystream) - virtual bool IsSelfInverting() const =0; - //! returns whether this is an encryption object - virtual bool IsForwardTransformation() const =0; -}; - -//! interface for hash functions and data processing part of MACs - -/*! HashTransformation objects are stateful. They are created in an initial state, - change state as Update() is called, and return to the initial - state when Final() is called. This interface allows a large message to - be hashed in pieces by calling Update() on each piece followed by - calling Final(). -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HashTransformation : public Algorithm -{ -public: - //! return a reference to this object, useful for passing a temporary object to a function that takes a non-const reference - HashTransformation& Ref() {return *this;} - - //! process more input - virtual void Update(const byte *input, size_t length) =0; - - //! request space to write input into - virtual byte * CreateUpdateSpace(size_t &size) {size=0; return NULL;} - - //! compute hash for current message, then restart for a new message - /*! \pre size of digest == DigestSize(). */ - virtual void Final(byte *digest) - {TruncatedFinal(digest, DigestSize());} - - //! discard the current state, and restart with a new message - virtual void Restart() - {TruncatedFinal(NULL, 0);} - - //! size of the hash/digest/MAC returned by Final() - virtual unsigned int DigestSize() const =0; - - //! same as DigestSize() - unsigned int TagSize() const {return DigestSize();} - - - //! block size of underlying compression function, or 0 if not block based - virtual unsigned int BlockSize() const {return 0;} - - //! input to Update() should have length a multiple of this for optimal speed - virtual unsigned int OptimalBlockSize() const {return 1;} - - //! returns how input should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! use this if your input is in one piece and you don't want to call Update() and Final() separately - virtual void CalculateDigest(byte *digest, const byte *input, size_t length) - {Update(input, length); Final(digest);} - - //! verify that digest is a valid digest for the current message, then reinitialize the object - /*! Default implementation is to call Final() and do a bitwise comparison - between its output and digest. */ - virtual bool Verify(const byte *digest) - {return TruncatedVerify(digest, DigestSize());} - - //! use this if your input is in one piece and you don't want to call Update() and Verify() separately - virtual bool VerifyDigest(const byte *digest, const byte *input, size_t length) - {Update(input, length); return Verify(digest);} - - //! truncated version of Final() - virtual void TruncatedFinal(byte *digest, size_t digestSize) =0; - - //! truncated version of CalculateDigest() - virtual void CalculateTruncatedDigest(byte *digest, size_t digestSize, const byte *input, size_t length) - {Update(input, length); TruncatedFinal(digest, digestSize);} - - //! truncated version of Verify() - virtual bool TruncatedVerify(const byte *digest, size_t digestLength); - - //! truncated version of VerifyDigest() - virtual bool VerifyTruncatedDigest(const byte *digest, size_t digestLength, const byte *input, size_t length) - {Update(input, length); return TruncatedVerify(digest, digestLength);} - -protected: - void ThrowIfInvalidTruncatedSize(size_t size) const; -}; - -typedef HashTransformation HashFunction; - -//! interface for one direction (encryption or decryption) of a block cipher -/*! \note These objects usually should not be used directly. See BlockTransformation for more details. */ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockCipher : public SimpleKeyingInterface, public BlockTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for one direction (encryption or decryption) of a stream cipher or cipher mode -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SymmetricCipher : public SimpleKeyingInterface, public StreamTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for message authentication codes -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE MessageAuthenticationCode : public SimpleKeyingInterface, public HashTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for for one direction (encryption or decryption) of a stream cipher or block cipher mode with authentication -/*! The StreamTransformation part of this interface is used to encrypt/decrypt the data, and the MessageAuthenticationCode part of this - interface is used to input additional authenticated data (AAD, which is MAC'ed but not encrypted), and to generate/verify the MAC. */ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedSymmetricCipher : public MessageAuthenticationCode, public StreamTransformation -{ -public: - //! this indicates that a member function was called in the wrong state, for example trying to encrypt a message before having set the key or IV - class BadState : public Exception - { - public: - explicit BadState(const std::string &name, const char *message) : Exception(OTHER_ERROR, name + ": " + message) {} - explicit BadState(const std::string &name, const char *function, const char *state) : Exception(OTHER_ERROR, name + ": " + function + " was called before " + state) {} - }; - - //! the maximum length of AAD that can be input before the encrypted data - virtual lword MaxHeaderLength() const =0; - //! the maximum length of encrypted data - virtual lword MaxMessageLength() const =0; - //! the maximum length of AAD that can be input after the encrypted data - virtual lword MaxFooterLength() const {return 0;} - //! if this function returns true, SpecifyDataLengths() must be called before attempting to input data - /*! This is the case for some schemes, such as CCM. */ - virtual bool NeedsPrespecifiedDataLengths() const {return false;} - //! this function only needs to be called if NeedsPrespecifiedDataLengths() returns true - void SpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength=0); - //! encrypt and generate MAC in one call. will truncate MAC if macSize < TagSize() - virtual void EncryptAndAuthenticate(byte *ciphertext, byte *mac, size_t macSize, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *message, size_t messageLength); - //! decrypt and verify MAC in one call, returning true iff MAC is valid. will assume MAC is truncated if macLength < TagSize() - virtual bool DecryptAndVerify(byte *message, const byte *mac, size_t macLength, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *ciphertext, size_t ciphertextLength); - - // redeclare this to avoid compiler ambiguity errors - virtual std::string AlgorithmName() const =0; - -protected: - const Algorithm & GetAlgorithm() const {return *static_cast(this);} - virtual void UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength) {} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef SymmetricCipher StreamCipher; -#endif - -//! interface for random number generators -/*! All return values are uniformly distributed over the range specified. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomNumberGenerator : public Algorithm -{ -public: - //! update RNG state with additional unpredictable values - virtual void IncorporateEntropy(const byte *input, size_t length) {throw NotImplemented("RandomNumberGenerator: IncorporateEntropy not implemented");} - - //! returns true if IncorporateEntropy is implemented - virtual bool CanIncorporateEntropy() const {return false;} - - //! generate new random byte and return it - virtual byte GenerateByte(); - - //! generate new random bit and return it - /*! Default implementation is to call GenerateByte() and return its lowest bit. */ - virtual unsigned int GenerateBit(); - - //! generate a random 32 bit word in the range min to max, inclusive - virtual word32 GenerateWord32(word32 a=0, word32 b=0xffffffffL); - - //! generate random array of bytes - virtual void GenerateBlock(byte *output, size_t size); - - //! generate and discard n bytes - virtual void DiscardBytes(size_t n); - - //! generate random bytes as input to a BufferedTransformation - virtual void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length); - - //! randomly shuffle the specified array, resulting permutation is uniformly distributed - template void Shuffle(IT begin, IT end) - { - for (; begin != end; ++begin) - std::iter_swap(begin, begin + GenerateWord32(0, end-begin-1)); - } - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - byte GetByte() {return GenerateByte();} - unsigned int GetBit() {return GenerateBit();} - word32 GetLong(word32 a=0, word32 b=0xffffffffL) {return GenerateWord32(a, b);} - word16 GetShort(word16 a=0, word16 b=0xffff) {return (word16)GenerateWord32(a, b);} - void GetBlock(byte *output, size_t size) {GenerateBlock(output, size);} -#endif -}; - -//! returns a reference that can be passed to functions that ask for a RNG but doesn't actually use it -CRYPTOPP_DLL RandomNumberGenerator & CRYPTOPP_API NullRNG(); - -class WaitObjectContainer; -class CallStack; - -//! interface for objects that you can wait for - -class CRYPTOPP_NO_VTABLE Waitable -{ -public: - virtual ~Waitable() {} - - //! maximum number of wait objects that this object can return - virtual unsigned int GetMaxWaitObjectCount() const =0; - //! put wait objects into container - /*! \param callStack is used for tracing no wait loops, example: - something.GetWaitObjects(c, CallStack("my func after X", 0)); - - or in an outer GetWaitObjects() method that itself takes a callStack parameter: - innerThing.GetWaitObjects(c, CallStack("MyClass::GetWaitObjects at X", &callStack)); */ - virtual void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) =0; - //! wait on this object - /*! same as creating an empty container, calling GetWaitObjects(), and calling Wait() on the container */ - bool Wait(unsigned long milliseconds, CallStack const& callStack); -}; - -//! the default channel for BufferedTransformation, equal to the empty string -extern CRYPTOPP_DLL const std::string DEFAULT_CHANNEL; - -//! channel for additional authenticated data, equal to "AAD" -extern CRYPTOPP_DLL const std::string AAD_CHANNEL; - -//! interface for buffered transformations - -/*! BufferedTransformation is a generalization of BlockTransformation, - StreamTransformation, and HashTransformation. - - A buffered transformation is an object that takes a stream of bytes - as input (this may be done in stages), does some computation on them, and - then places the result into an internal buffer for later retrieval. Any - partial result already in the output buffer is not modified by further - input. - - If a method takes a "blocking" parameter, and you - pass "false" for it, the method will return before all input has been processed if - the input cannot be processed without waiting (for network buffers to become available, for example). - In this case the method will return true - or a non-zero integer value. When this happens you must continue to call the method with the same - parameters until it returns false or zero, before calling any other method on it or - attached BufferedTransformation. The integer return value in this case is approximately - the number of bytes left to be processed, and can be used to implement a progress bar. - - For functions that take a "propagation" parameter, propagation != 0 means pass on the signal to attached - BufferedTransformation objects, with propagation decremented at each step until it reaches 0. - -1 means unlimited propagation. - - \nosubgrouping -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm, public Waitable -{ -public: - // placed up here for CW8 - static const std::string &NULL_CHANNEL; // same as DEFAULT_CHANNEL, for backwards compatibility - - BufferedTransformation() : Algorithm(false) {} - - //! return a reference to this object, useful for passing a temporary object to a function that takes a non-const reference - BufferedTransformation& Ref() {return *this;} - - //! \name INPUT - //@{ - //! input a byte for processing - size_t Put(byte inByte, bool blocking=true) - {return Put(&inByte, 1, blocking);} - //! input multiple bytes - size_t Put(const byte *inString, size_t length, bool blocking=true) - {return Put2(inString, length, 0, blocking);} - - //! input a 16-bit word - size_t PutWord16(word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - //! input a 32-bit word - size_t PutWord32(word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - - //! request space which can be written into by the caller, and then used as input to Put() - /*! \param size is requested size (as a hint) for input, and size of the returned space for output */ - /*! \note The purpose of this method is to help avoid doing extra memory allocations. */ - virtual byte * CreatePutSpace(size_t &size) {size=0; return NULL;} - - virtual bool CanModifyInput() const {return false;} - - //! input multiple bytes that may be modified by callee - size_t PutModifiable(byte *inString, size_t length, bool blocking=true) - {return PutModifiable2(inString, length, 0, blocking);} - - bool MessageEnd(int propagation=-1, bool blocking=true) - {return !!Put2(NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);} - size_t PutMessageEnd(const byte *inString, size_t length, int propagation=-1, bool blocking=true) - {return Put2(inString, length, propagation < 0 ? -1 : propagation+1, blocking);} - - //! input multiple bytes for blocking or non-blocking processing - /*! \param messageEnd means how many filters to signal MessageEnd to, including this one */ - virtual size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) =0; - //! input multiple bytes that may be modified by callee for blocking or non-blocking processing - /*! \param messageEnd means how many filters to signal MessageEnd to, including this one */ - virtual size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking) - {return Put2(inString, length, messageEnd, blocking);} - - //! thrown by objects that have not implemented nonblocking input processing - struct BlockingInputOnly : public NotImplemented - {BlockingInputOnly(const std::string &s) : NotImplemented(s + ": Nonblocking input is not implemented by this object.") {}}; - //@} - - //! \name WAITING - //@{ - unsigned int GetMaxWaitObjectCount() const; - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - //@} - - //! \name SIGNALS - //@{ - virtual void IsolatedInitialize(const NameValuePairs ¶meters) {throw NotImplemented("BufferedTransformation: this object can't be reinitialized");} - virtual bool IsolatedFlush(bool hardFlush, bool blocking) =0; - virtual bool IsolatedMessageSeriesEnd(bool blocking) {return false;} - - //! initialize or reinitialize this object - virtual void Initialize(const NameValuePairs ¶meters=g_nullNameValuePairs, int propagation=-1); - //! flush buffered input and/or output - /*! \param hardFlush is used to indicate whether all data should be flushed - \note Hard flushes must be used with care. It means try to process and output everything, even if - there may not be enough data to complete the action. For example, hard flushing a HexDecoder would - cause an error if you do it after inputing an odd number of hex encoded characters. - For some types of filters, for example ZlibDecompressor, hard flushes can only - be done at "synchronization points". These synchronization points are positions in the data - stream that are created by hard flushes on the corresponding reverse filters, in this - example ZlibCompressor. This is useful when zlib compressed data is moved across a - network in packets and compression state is preserved across packets, as in the ssh2 protocol. - */ - virtual bool Flush(bool hardFlush, int propagation=-1, bool blocking=true); - //! mark end of a series of messages - /*! There should be a MessageEnd immediately before MessageSeriesEnd. */ - virtual bool MessageSeriesEnd(int propagation=-1, bool blocking=true); - - //! set propagation of automatically generated and transferred signals - /*! propagation == 0 means do not automaticly generate signals */ - virtual void SetAutoSignalPropagation(int propagation) {} - - //! - virtual int GetAutoSignalPropagation() const {return 0;} -public: - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - void Close() {MessageEnd();} -#endif - //@} - - //! \name RETRIEVAL OF ONE MESSAGE - //@{ - //! returns number of bytes that is currently ready for retrieval - /*! All retrieval functions return the actual number of bytes - retrieved, which is the lesser of the request number and - MaxRetrievable(). */ - virtual lword MaxRetrievable() const; - - //! returns whether any bytes are currently ready for retrieval - virtual bool AnyRetrievable() const; - - //! try to retrieve a single byte - virtual size_t Get(byte &outByte); - //! try to retrieve multiple bytes - virtual size_t Get(byte *outString, size_t getMax); - - //! peek at the next byte without removing it from the output buffer - virtual size_t Peek(byte &outByte) const; - //! peek at multiple bytes without removing them from the output buffer - virtual size_t Peek(byte *outString, size_t peekMax) const; - - //! try to retrieve a 16-bit word - size_t GetWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER); - //! try to retrieve a 32-bit word - size_t GetWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER); - - //! try to peek at a 16-bit word - size_t PeekWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER) const; - //! try to peek at a 32-bit word - size_t PeekWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER) const; - - //! move transferMax bytes of the buffered output to target as input - lword TransferTo(BufferedTransformation &target, lword transferMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) - {TransferTo2(target, transferMax, channel); return transferMax;} - - //! discard skipMax bytes from the output buffer - virtual lword Skip(lword skipMax=LWORD_MAX); - - //! copy copyMax bytes of the buffered output to target as input - lword CopyTo(BufferedTransformation &target, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const - {return CopyRangeTo(target, 0, copyMax, channel);} - - //! copy copyMax bytes of the buffered output, starting at position (relative to current position), to target as input - lword CopyRangeTo(BufferedTransformation &target, lword position, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const - {lword i = position; CopyRangeTo2(target, i, i+copyMax, channel); return i-position;} - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - unsigned long MaxRetrieveable() const {return MaxRetrievable();} -#endif - //@} - - //! \name RETRIEVAL OF MULTIPLE MESSAGES - //@{ - //! - virtual lword TotalBytesRetrievable() const; - //! number of times MessageEnd() has been received minus messages retrieved or skipped - virtual unsigned int NumberOfMessages() const; - //! returns true if NumberOfMessages() > 0 - virtual bool AnyMessages() const; - //! start retrieving the next message - /*! - Returns false if no more messages exist or this message - is not completely retrieved. - */ - virtual bool GetNextMessage(); - //! skip count number of messages - virtual unsigned int SkipMessages(unsigned int count=UINT_MAX); - //! - unsigned int TransferMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) - {TransferMessagesTo2(target, count, channel); return count;} - //! - unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const; - - //! - virtual void SkipAll(); - //! - void TransferAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) - {TransferAllTo2(target, channel);} - //! - void CopyAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) const; - - virtual bool GetNextMessageSeries() {return false;} - virtual unsigned int NumberOfMessagesInThisSeries() const {return NumberOfMessages();} - virtual unsigned int NumberOfMessageSeries() const {return 0;} - //@} - - //! \name NON-BLOCKING TRANSFER OF OUTPUT - //@{ - //! upon return, byteCount contains number of bytes that have finished being transfered, and returns the number of bytes left in the current transfer block - virtual size_t TransferTo2(BufferedTransformation &target, lword &byteCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) =0; - //! upon return, begin contains the start position of data yet to be finished copying, and returns the number of bytes left in the current transfer block - virtual size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const =0; - //! upon return, messageCount contains number of messages that have finished being transfered, and returns the number of bytes left in the current transfer block - size_t TransferMessagesTo2(BufferedTransformation &target, unsigned int &messageCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - //! returns the number of bytes left in the current transfer block - size_t TransferAllTo2(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - //@} - - //! \name CHANNELS - //@{ - struct NoChannelSupport : public NotImplemented - {NoChannelSupport(const std::string &name) : NotImplemented(name + ": this object doesn't support multiple channels") {}}; - struct InvalidChannelName : public InvalidArgument - {InvalidChannelName(const std::string &name, const std::string &channel) : InvalidArgument(name + ": unexpected channel name \"" + channel + "\"") {}}; - - size_t ChannelPut(const std::string &channel, byte inByte, bool blocking=true) - {return ChannelPut(channel, &inByte, 1, blocking);} - size_t ChannelPut(const std::string &channel, const byte *inString, size_t length, bool blocking=true) - {return ChannelPut2(channel, inString, length, 0, blocking);} - - size_t ChannelPutModifiable(const std::string &channel, byte *inString, size_t length, bool blocking=true) - {return ChannelPutModifiable2(channel, inString, length, 0, blocking);} - - size_t ChannelPutWord16(const std::string &channel, word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - size_t ChannelPutWord32(const std::string &channel, word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - - bool ChannelMessageEnd(const std::string &channel, int propagation=-1, bool blocking=true) - {return !!ChannelPut2(channel, NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);} - size_t ChannelPutMessageEnd(const std::string &channel, const byte *inString, size_t length, int propagation=-1, bool blocking=true) - {return ChannelPut2(channel, inString, length, propagation < 0 ? -1 : propagation+1, blocking);} - - virtual byte * ChannelCreatePutSpace(const std::string &channel, size_t &size); - - virtual size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - virtual size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking); - - virtual bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true); - virtual bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true); - - virtual void SetRetrievalChannel(const std::string &channel); - //@} - - //! \name ATTACHMENT - /*! Some BufferedTransformation objects (e.g. Filter objects) - allow other BufferedTransformation objects to be attached. When - this is done, the first object instead of buffering its output, - sents that output to the attached object as input. The entire - attachment chain is deleted when the anchor object is destructed. - */ - //@{ - //! returns whether this object allows attachment - virtual bool Attachable() {return false;} - //! returns the object immediately attached to this object or NULL for no attachment - virtual BufferedTransformation *AttachedTransformation() {assert(!Attachable()); return 0;} - //! - virtual const BufferedTransformation *AttachedTransformation() const - {return const_cast(this)->AttachedTransformation();} - //! delete the current attachment chain and replace it with newAttachment - virtual void Detach(BufferedTransformation *newAttachment = 0) - {assert(!Attachable()); throw NotImplemented("BufferedTransformation: this object is not attachable");} - //! add newAttachment to the end of attachment chain - virtual void Attach(BufferedTransformation *newAttachment); - //@} - -protected: - static int DecrementPropagation(int propagation) - {return propagation != 0 ? propagation - 1 : 0;} - -private: - byte m_buf[4]; // for ChannelPutWord16 and ChannelPutWord32, to ensure buffer isn't deallocated before non-blocking operation completes -}; - -//! returns a reference to a BufferedTransformation object that discards all input -BufferedTransformation & TheBitBucket(); - -//! interface for crypto material, such as public and private keys, and crypto parameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoMaterial : public NameValuePairs -{ -public: - //! exception thrown when invalid crypto material is detected - class CRYPTOPP_DLL InvalidMaterial : public InvalidDataFormat - { - public: - explicit InvalidMaterial(const std::string &s) : InvalidDataFormat(s) {} - }; - - //! assign values from source to this object - /*! \note This function can be used to create a public key from a private key. */ - virtual void AssignFrom(const NameValuePairs &source) =0; - - //! check this object for errors - /*! \param level denotes the level of thoroughness: - 0 - using this object won't cause a crash or exception (rng is ignored) - 1 - this object will probably function (encrypt, sign, etc.) correctly (but may not check for weak keys and such) - 2 - make sure this object will function correctly, and do reasonable security checks - 3 - do checks that may take a long time - \return true if the tests pass */ - virtual bool Validate(RandomNumberGenerator &rng, unsigned int level) const =0; - - //! throws InvalidMaterial if this object fails Validate() test - virtual void ThrowIfInvalid(RandomNumberGenerator &rng, unsigned int level) const - {if (!Validate(rng, level)) throw InvalidMaterial("CryptoMaterial: this object contains invalid values");} - -// virtual std::vector GetSupportedFormats(bool includeSaveOnly=false, bool includeLoadOnly=false); - - //! save key into a BufferedTransformation - virtual void Save(BufferedTransformation &bt) const - {throw NotImplemented("CryptoMaterial: this object does not support saving");} - - //! load key from a BufferedTransformation - /*! \throws KeyingErr if decode fails - \note Generally does not check that the key is valid. - Call ValidateKey() or ThrowIfInvalidKey() to check that. */ - virtual void Load(BufferedTransformation &bt) - {throw NotImplemented("CryptoMaterial: this object does not support loading");} - - //! \return whether this object supports precomputation - virtual bool SupportsPrecomputation() const {return false;} - //! do precomputation - /*! The exact semantics of Precompute() is varies, but - typically it means calculate a table of n objects - that can be used later to speed up computation. */ - virtual void Precompute(unsigned int n) - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - //! retrieve previously saved precomputation - virtual void LoadPrecomputation(BufferedTransformation &storedPrecomputation) - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - //! save precomputation for later use - virtual void SavePrecomputation(BufferedTransformation &storedPrecomputation) const - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - - // for internal library use - void DoQuickSanityCheck() const {ThrowIfInvalid(NullRNG(), 0);} - -#if (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) - // Sun Studio 11/CC 5.8 workaround: it generates incorrect code when casting to an empty virtual base class - char m_sunCCworkaround; -#endif -}; - -//! interface for generatable crypto material, such as private keys and crypto parameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE GeneratableCryptoMaterial : virtual public CryptoMaterial -{ -public: - //! generate a random key or crypto parameters - /*! \throws KeyingErr if algorithm parameters are invalid, or if a key can't be generated - (e.g., if this is a public key object) */ - virtual void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶ms = g_nullNameValuePairs) - {throw NotImplemented("GeneratableCryptoMaterial: this object does not support key/parameter generation");} - - //! calls the above function with a NameValuePairs object that just specifies "KeySize" - void GenerateRandomWithKeySize(RandomNumberGenerator &rng, unsigned int keySize); -}; - -//! interface for public keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKey : virtual public CryptoMaterial -{ -}; - -//! interface for private keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKey : public GeneratableCryptoMaterial -{ -}; - -//! interface for crypto prameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoParameters : public GeneratableCryptoMaterial -{ -}; - -//! interface for asymmetric algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AsymmetricAlgorithm : public Algorithm -{ -public: - //! returns a reference to the crypto material used by this object - virtual CryptoMaterial & AccessMaterial() =0; - //! returns a const reference to the crypto material used by this object - virtual const CryptoMaterial & GetMaterial() const =0; - - //! for backwards compatibility, calls AccessMaterial().Load(bt) - void BERDecode(BufferedTransformation &bt) - {AccessMaterial().Load(bt);} - //! for backwards compatibility, calls GetMaterial().Save(bt) - void DEREncode(BufferedTransformation &bt) const - {GetMaterial().Save(bt);} -}; - -//! interface for asymmetric algorithms using public keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKeyAlgorithm : public AsymmetricAlgorithm -{ -public: - // VC60 workaround: no co-variant return type - CryptoMaterial & AccessMaterial() {return AccessPublicKey();} - const CryptoMaterial & GetMaterial() const {return GetPublicKey();} - - virtual PublicKey & AccessPublicKey() =0; - virtual const PublicKey & GetPublicKey() const {return const_cast(this)->AccessPublicKey();} -}; - -//! interface for asymmetric algorithms using private keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKeyAlgorithm : public AsymmetricAlgorithm -{ -public: - CryptoMaterial & AccessMaterial() {return AccessPrivateKey();} - const CryptoMaterial & GetMaterial() const {return GetPrivateKey();} - - virtual PrivateKey & AccessPrivateKey() =0; - virtual const PrivateKey & GetPrivateKey() const {return const_cast(this)->AccessPrivateKey();} -}; - -//! interface for key agreement algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE KeyAgreementAlgorithm : public AsymmetricAlgorithm -{ -public: - CryptoMaterial & AccessMaterial() {return AccessCryptoParameters();} - const CryptoMaterial & GetMaterial() const {return GetCryptoParameters();} - - virtual CryptoParameters & AccessCryptoParameters() =0; - virtual const CryptoParameters & GetCryptoParameters() const {return const_cast(this)->AccessCryptoParameters();} -}; - -//! interface for public-key encryptors and decryptors - -/*! This class provides an interface common to encryptors and decryptors - for querying their plaintext and ciphertext lengths. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_CryptoSystem -{ -public: - virtual ~PK_CryptoSystem() {} - - //! maximum length of plaintext for a given ciphertext length - /*! \note This function returns 0 if ciphertextLength is not valid (too long or too short). */ - virtual size_t MaxPlaintextLength(size_t ciphertextLength) const =0; - - //! calculate length of ciphertext given length of plaintext - /*! \note This function returns 0 if plaintextLength is not valid (too long). */ - virtual size_t CiphertextLength(size_t plaintextLength) const =0; - - //! this object supports the use of the parameter with the given name - /*! some possible parameter names: EncodingParameters, KeyDerivationParameters */ - virtual bool ParameterSupported(const char *name) const =0; - - //! return fixed ciphertext length, if one exists, otherwise return 0 - /*! \note "Fixed" here means length of ciphertext does not depend on length of plaintext. - It usually does depend on the key length. */ - virtual size_t FixedCiphertextLength() const {return 0;} - - //! return maximum plaintext length given the fixed ciphertext length, if one exists, otherwise return 0 - virtual size_t FixedMaxPlaintextLength() const {return 0;} - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - size_t MaxPlainTextLength(size_t cipherTextLength) const {return MaxPlaintextLength(cipherTextLength);} - size_t CipherTextLength(size_t plainTextLength) const {return CiphertextLength(plainTextLength);} -#endif -}; - -//! interface for public-key encryptors -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Encryptor : public PK_CryptoSystem, public PublicKeyAlgorithm -{ -public: - //! exception thrown when trying to encrypt plaintext of invalid length - class CRYPTOPP_DLL InvalidPlaintextLength : public Exception - { - public: - InvalidPlaintextLength() : Exception(OTHER_ERROR, "PK_Encryptor: invalid plaintext length") {} - }; - - //! encrypt a byte string - /*! \pre CiphertextLength(plaintextLength) != 0 (i.e., plaintext isn't too long) - \pre size of ciphertext == CiphertextLength(plaintextLength) - */ - virtual void Encrypt(RandomNumberGenerator &rng, - const byte *plaintext, size_t plaintextLength, - byte *ciphertext, const NameValuePairs ¶meters = g_nullNameValuePairs) const =0; - - //! create a new encryption filter - /*! \note The caller is responsible for deleting the returned pointer. - \note Encoding parameters should be passed in the "EP" channel. - */ - virtual BufferedTransformation * CreateEncryptionFilter(RandomNumberGenerator &rng, - BufferedTransformation *attachment=NULL, const NameValuePairs ¶meters = g_nullNameValuePairs) const; -}; - -//! interface for public-key decryptors - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Decryptor : public PK_CryptoSystem, public PrivateKeyAlgorithm -{ -public: - //! decrypt a byte string, and return the length of plaintext - /*! \pre size of plaintext == MaxPlaintextLength(ciphertextLength) bytes. - \return the actual length of the plaintext, indication that decryption failed. - */ - virtual DecodingResult Decrypt(RandomNumberGenerator &rng, - const byte *ciphertext, size_t ciphertextLength, - byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const =0; - - //! create a new decryption filter - /*! \note caller is responsible for deleting the returned pointer - */ - virtual BufferedTransformation * CreateDecryptionFilter(RandomNumberGenerator &rng, - BufferedTransformation *attachment=NULL, const NameValuePairs ¶meters = g_nullNameValuePairs) const; - - //! decrypt a fixed size ciphertext - DecodingResult FixedLengthDecrypt(RandomNumberGenerator &rng, const byte *ciphertext, byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const - {return Decrypt(rng, ciphertext, FixedCiphertextLength(), plaintext, parameters);} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef PK_CryptoSystem PK_FixedLengthCryptoSystem; -typedef PK_Encryptor PK_FixedLengthEncryptor; -typedef PK_Decryptor PK_FixedLengthDecryptor; -#endif - -//! interface for public-key signers and verifiers - -/*! This class provides an interface common to signers and verifiers - for querying scheme properties. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_SignatureScheme -{ -public: - //! invalid key exception, may be thrown by any function in this class if the private or public key has a length that can't be used - class CRYPTOPP_DLL InvalidKeyLength : public Exception - { - public: - InvalidKeyLength(const std::string &message) : Exception(OTHER_ERROR, message) {} - }; - - //! key too short exception, may be thrown by any function in this class if the private or public key is too short to sign or verify anything - class CRYPTOPP_DLL KeyTooShort : public InvalidKeyLength - { - public: - KeyTooShort() : InvalidKeyLength("PK_Signer: key too short for this signature scheme") {} - }; - - virtual ~PK_SignatureScheme() {} - - //! signature length if it only depends on the key, otherwise 0 - virtual size_t SignatureLength() const =0; - - //! maximum signature length produced for a given length of recoverable message part - virtual size_t MaxSignatureLength(size_t recoverablePartLength = 0) const {return SignatureLength();} - - //! length of longest message that can be recovered, or 0 if this signature scheme does not support message recovery - virtual size_t MaxRecoverableLength() const =0; - - //! length of longest message that can be recovered from a signature of given length, or 0 if this signature scheme does not support message recovery - virtual size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const =0; - - //! requires a random number generator to sign - /*! if this returns false, NullRNG() can be passed to functions that take RandomNumberGenerator & */ - virtual bool IsProbabilistic() const =0; - - //! whether or not a non-recoverable message part can be signed - virtual bool AllowNonrecoverablePart() const =0; - - //! if this function returns true, during verification you must input the signature before the message, otherwise you can input it at anytime */ - virtual bool SignatureUpfront() const {return false;} - - //! whether you must input the recoverable part before the non-recoverable part during signing - virtual bool RecoverablePartFirst() const =0; -}; - -//! interface for accumulating messages to be signed or verified -/*! Only Update() should be called - on this class. No other functions inherited from HashTransformation should be called. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_MessageAccumulator : public HashTransformation -{ -public: - //! should not be called on PK_MessageAccumulator - unsigned int DigestSize() const - {throw NotImplemented("PK_MessageAccumulator: DigestSize() should not be called");} - //! should not be called on PK_MessageAccumulator - void TruncatedFinal(byte *digest, size_t digestSize) - {throw NotImplemented("PK_MessageAccumulator: TruncatedFinal() should not be called");} -}; - -//! interface for public-key signers - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Signer : public PK_SignatureScheme, public PrivateKeyAlgorithm -{ -public: - //! create a new HashTransformation to accumulate the message to be signed - virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const =0; - - virtual void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const =0; - - //! sign and delete messageAccumulator (even in case of exception thrown) - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const; - - //! sign and restart messageAccumulator - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart=true) const =0; - - //! sign a message - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const; - - //! sign a recoverable message - /*! \pre size of signature == MaxSignatureLength(recoverableMessageLength) - \return actual signature length - */ - virtual size_t SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const; -}; - -//! interface for public-key signature verifiers -/*! The Recover* functions throw NotImplemented if the signature scheme does not support - message recovery. - The Verify* functions throw InvalidDataFormat if the scheme does support message - recovery and the signature contains a non-empty recoverable message part. The - Recovery* functions should be used in that case. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Verifier : public PK_SignatureScheme, public PublicKeyAlgorithm -{ -public: - //! create a new HashTransformation to accumulate the message to be verified - virtual PK_MessageAccumulator * NewVerificationAccumulator() const =0; - - //! input signature into a message accumulator - virtual void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const =0; - - //! check whether messageAccumulator contains a valid signature and message, and delete messageAccumulator (even in case of exception thrown) - virtual bool Verify(PK_MessageAccumulator *messageAccumulator) const; - - //! check whether messageAccumulator contains a valid signature and message, and restart messageAccumulator - virtual bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const =0; - - //! check whether input signature is a valid signature for input message - virtual bool VerifyMessage(const byte *message, size_t messageLen, - const byte *signature, size_t signatureLength) const; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const =0; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult RecoverMessage(byte *recoveredMessage, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, - const byte *signature, size_t signatureLength) const; -}; - -//! interface for domains of simple key agreement protocols - -/*! A key agreement domain is a set of parameters that must be shared - by two parties in a key agreement protocol, along with the algorithms - for generating key pairs and deriving agreed values. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return length of agreed value produced - virtual unsigned int AgreedValueLength() const =0; - //! return length of private keys in this domain - virtual unsigned int PrivateKeyLength() const =0; - //! return length of public keys in this domain - virtual unsigned int PublicKeyLength() const =0; - //! generate private key - /*! \pre size of privateKey == PrivateKeyLength() */ - virtual void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate public key - /*! \pre size of publicKey == PublicKeyLength() */ - virtual void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GeneratePrivateKey() and then GeneratePublicKey() */ - virtual void GenerateKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - //! derive agreed value from your private key and couterparty's public key, return false in case of failure - /*! \note If you have previously validated the public key, use validateOtherPublicKey=false to save time. - \pre size of agreedValue == AgreedValueLength() - \pre length of privateKey == PrivateKeyLength() - \pre length of otherPublicKey == PublicKeyLength() - */ - virtual bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const =0; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} -#endif -}; - -//! interface for domains of authenticated key agreement protocols - -/*! In an authenticated key agreement protocol, each party has two - key pairs. The long-lived key pair is called the static key pair, - and the short-lived key pair is called the ephemeral key pair. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return length of agreed value produced - virtual unsigned int AgreedValueLength() const =0; - - //! return length of static private keys in this domain - virtual unsigned int StaticPrivateKeyLength() const =0; - //! return length of static public keys in this domain - virtual unsigned int StaticPublicKeyLength() const =0; - //! generate static private key - /*! \pre size of privateKey == PrivateStaticKeyLength() */ - virtual void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate static public key - /*! \pre size of publicKey == PublicStaticKeyLength() */ - virtual void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GenerateStaticPrivateKey() and then GenerateStaticPublicKey() */ - virtual void GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - - //! return length of ephemeral private keys in this domain - virtual unsigned int EphemeralPrivateKeyLength() const =0; - //! return length of ephemeral public keys in this domain - virtual unsigned int EphemeralPublicKeyLength() const =0; - //! generate ephemeral private key - /*! \pre size of privateKey == PrivateEphemeralKeyLength() */ - virtual void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate ephemeral public key - /*! \pre size of publicKey == PublicEphemeralKeyLength() */ - virtual void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GenerateEphemeralPrivateKey() and then GenerateEphemeralPublicKey() */ - virtual void GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - - //! derive agreed value from your private keys and couterparty's public keys, return false in case of failure - /*! \note The ephemeral public key will always be validated. - If you have previously validated the static public key, use validateStaticOtherPublicKey=false to save time. - \pre size of agreedValue == AgreedValueLength() - \pre length of staticPrivateKey == StaticPrivateKeyLength() - \pre length of ephemeralPrivateKey == EphemeralPrivateKeyLength() - \pre length of staticOtherPublicKey == StaticPublicKeyLength() - \pre length of ephemeralOtherPublicKey == EphemeralPublicKeyLength() - */ - virtual bool Agree(byte *agreedValue, - const byte *staticPrivateKey, const byte *ephemeralPrivateKey, - const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey, - bool validateStaticOtherPublicKey=true) const =0; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} -#endif -}; - -// interface for password authenticated key agreement protocols, not implemented yet -#if 0 -//! interface for protocol sessions -/*! The methods should be called in the following order: - - InitializeSession(rng, parameters); // or call initialize method in derived class - while (true) - { - if (OutgoingMessageAvailable()) - { - length = GetOutgoingMessageLength(); - GetOutgoingMessage(message); - ; // send outgoing message - } - - if (LastMessageProcessed()) - break; - - ; // receive incoming message - ProcessIncomingMessage(message); - } - ; // call methods in derived class to obtain result of protocol session -*/ -class ProtocolSession -{ -public: - //! exception thrown when an invalid protocol message is processed - class ProtocolError : public Exception - { - public: - ProtocolError(ErrorType errorType, const std::string &s) : Exception(errorType, s) {} - }; - - //! exception thrown when a function is called unexpectedly - /*! for example calling ProcessIncomingMessage() when ProcessedLastMessage() == true */ - class UnexpectedMethodCall : public Exception - { - public: - UnexpectedMethodCall(const std::string &s) : Exception(OTHER_ERROR, s) {} - }; - - ProtocolSession() : m_rng(NULL), m_throwOnProtocolError(true), m_validState(false) {} - virtual ~ProtocolSession() {} - - virtual void InitializeSession(RandomNumberGenerator &rng, const NameValuePairs ¶meters) =0; - - bool GetThrowOnProtocolError() const {return m_throwOnProtocolError;} - void SetThrowOnProtocolError(bool throwOnProtocolError) {m_throwOnProtocolError = throwOnProtocolError;} - - bool HasValidState() const {return m_validState;} - - virtual bool OutgoingMessageAvailable() const =0; - virtual unsigned int GetOutgoingMessageLength() const =0; - virtual void GetOutgoingMessage(byte *message) =0; - - virtual bool LastMessageProcessed() const =0; - virtual void ProcessIncomingMessage(const byte *message, unsigned int messageLength) =0; - -protected: - void HandleProtocolError(Exception::ErrorType errorType, const std::string &s) const; - void CheckAndHandleInvalidState() const; - void SetValidState(bool valid) {m_validState = valid;} - - RandomNumberGenerator *m_rng; - -private: - bool m_throwOnProtocolError, m_validState; -}; - -class KeyAgreementSession : public ProtocolSession -{ -public: - virtual unsigned int GetAgreedValueLength() const =0; - virtual void GetAgreedValue(byte *agreedValue) const =0; -}; - -class PasswordAuthenticatedKeyAgreementSession : public KeyAgreementSession -{ -public: - void InitializePasswordAuthenticatedKeyAgreementSession(RandomNumberGenerator &rng, - const byte *myId, unsigned int myIdLength, - const byte *counterPartyId, unsigned int counterPartyIdLength, - const byte *passwordOrVerifier, unsigned int passwordOrVerifierLength); -}; - -class PasswordAuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return whether the domain parameters stored in this object are valid - virtual bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} - - virtual unsigned int GetPasswordVerifierLength(const byte *password, unsigned int passwordLength) const =0; - virtual void GeneratePasswordVerifier(RandomNumberGenerator &rng, const byte *userId, unsigned int userIdLength, const byte *password, unsigned int passwordLength, byte *verifier) const =0; - - enum RoleFlags {CLIENT=1, SERVER=2, INITIATOR=4, RESPONDER=8}; - - virtual bool IsValidRole(unsigned int role) =0; - virtual PasswordAuthenticatedKeyAgreementSession * CreateProtocolSession(unsigned int role) const =0; -}; -#endif - -//! BER Decode Exception Class, may be thrown during an ASN1 BER decode operation -class CRYPTOPP_DLL BERDecodeErr : public InvalidArgument -{ -public: - BERDecodeErr() : InvalidArgument("BER decode error") {} - BERDecodeErr(const std::string &s) : InvalidArgument(s) {} -}; - -//! interface for encoding and decoding ASN1 objects -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ASN1Object -{ -public: - virtual ~ASN1Object() {} - //! decode this object from a BufferedTransformation, using BER (Basic Encoding Rules) - virtual void BERDecode(BufferedTransformation &bt) =0; - //! encode this object into a BufferedTransformation, using DER (Distinguished Encoding Rules) - virtual void DEREncode(BufferedTransformation &bt) const =0; - //! encode this object into a BufferedTransformation, using BER - /*! this may be useful if DEREncode() would be too inefficient */ - virtual void BEREncode(BufferedTransformation &bt) const {DEREncode(bt);} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef PK_SignatureScheme PK_SignatureSystem; -typedef SimpleKeyAgreementDomain PK_SimpleKeyAgreementDomain; -typedef AuthenticatedKeyAgreementDomain PK_AuthenticatedKeyAgreementDomain; -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.vcproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.vcproj deleted file mode 100644 index 0a118b11..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib.vcproj +++ /dev/null @@ -1,9556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.bdsproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.bdsproj deleted file mode 100644 index 9b9c7b24..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.bdsproj +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - cryptlib_bds.cpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - - - - False - - - - - - - False - - False - - True - False - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.cpp deleted file mode 100644 index 7724a9f1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptlib_bds.cpp +++ /dev/null @@ -1,10 +0,0 @@ -//--------------------------------------------------------------------------- - -/* -#include -#pragma hdrstop -*/ -#define Library - -// To add a file to the library use the Project menu 'Add to Project'. - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptopp.rc b/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptopp.rc deleted file mode 100644 index 7c37dc62..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/cryptopp.rc +++ /dev/null @@ -1,104 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,6,1,0 - PRODUCTVERSION 5,6,1,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "free crypto library, more information available at www.cryptopp.com" - VALUE "CompanyName", "Wei Dai" - VALUE "FileDescription", "Crypto++® Library DLL" - VALUE "FileVersion", "5, 6, 1, 0" - VALUE "InternalName", "cryptopp" - VALUE "LegalCopyright", "Copyright © 1995-2010 by Wei Dai" - VALUE "LegalTrademarks", "Crypto++®" - VALUE "OriginalFilename", "cryptopp.dll" - VALUE "ProductName", "Crypto++® Library" - VALUE "ProductVersion", "5, 6, 1, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/datatest.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/datatest.cpp deleted file mode 100644 index 93968162..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/datatest.cpp +++ /dev/null @@ -1,752 +0,0 @@ -#include "factory.h" -#include "integer.h" -#include "filters.h" -#include "hex.h" -#include "randpool.h" -#include "files.h" -#include "trunhash.h" -#include "queue.h" -#include "validate.h" -#include -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -typedef std::map TestData; - -class TestFailure : public Exception -{ -public: - TestFailure() : Exception(OTHER_ERROR, "Validation test failed") {} -}; - -static const TestData *s_currentTestData = NULL; - -static void OutputTestData(const TestData &v) -{ - for (TestData::const_iterator i = v.begin(); i != v.end(); ++i) - { - cerr << i->first << ": " << i->second << endl; - } -} - -static void SignalTestFailure() -{ - OutputTestData(*s_currentTestData); - throw TestFailure(); -} - -static void SignalTestError() -{ - OutputTestData(*s_currentTestData); - throw Exception(Exception::OTHER_ERROR, "Unexpected error during validation test"); -} - -bool DataExists(const TestData &data, const char *name) -{ - TestData::const_iterator i = data.find(name); - return (i != data.end()); -} - -const std::string & GetRequiredDatum(const TestData &data, const char *name) -{ - TestData::const_iterator i = data.find(name); - if (i == data.end()) - SignalTestError(); - return i->second; -} - -void RandomizedTransfer(BufferedTransformation &source, BufferedTransformation &target, bool finish, const std::string &channel=DEFAULT_CHANNEL) -{ - while (source.MaxRetrievable() > (finish ? 0 : 4096)) - { - byte buf[4096+64]; - size_t start = GlobalRNG().GenerateWord32(0, 63); - size_t len = GlobalRNG().GenerateWord32(1, UnsignedMin(4096U, 3*source.MaxRetrievable()/2)); - len = source.Get(buf+start, len); - target.ChannelPut(channel, buf+start, len); - } -} - -void PutDecodedDatumInto(const TestData &data, const char *name, BufferedTransformation &target) -{ - std::string s1 = GetRequiredDatum(data, name), s2; - ByteQueue q; - - while (!s1.empty()) - { - while (s1[0] == ' ') - { - s1 = s1.substr(1); - if (s1.empty()) - goto end; // avoid invalid read if s1 is empty - } - - int repeat = 1; - if (s1[0] == 'r') - { - repeat = atoi(s1.c_str()+1); - s1 = s1.substr(s1.find(' ')+1); - } - - s2 = ""; // MSVC 6 doesn't have clear(); - - if (s1[0] == '\"') - { - s2 = s1.substr(1, s1.find('\"', 1)-1); - s1 = s1.substr(s2.length() + 2); - } - else if (s1.substr(0, 2) == "0x") - { - StringSource(s1.substr(2, s1.find(' ')), true, new HexDecoder(new StringSink(s2))); - s1 = s1.substr(STDMIN(s1.find(' '), s1.length())); - } - else - { - StringSource(s1.substr(0, s1.find(' ')), true, new HexDecoder(new StringSink(s2))); - s1 = s1.substr(STDMIN(s1.find(' '), s1.length())); - } - - while (repeat--) - { - q.Put((const byte *)s2.data(), s2.size()); - RandomizedTransfer(q, target, false); - } - } - -end: - RandomizedTransfer(q, target, true); -} - -std::string GetDecodedDatum(const TestData &data, const char *name) -{ - std::string s; - PutDecodedDatumInto(data, name, StringSink(s).Ref()); - return s; -} - -std::string GetOptionalDecodedDatum(const TestData &data, const char *name) -{ - std::string s; - if (DataExists(data, name)) - PutDecodedDatumInto(data, name, StringSink(s).Ref()); - return s; -} - -class TestDataNameValuePairs : public NameValuePairs -{ -public: - TestDataNameValuePairs(const TestData &data) : m_data(data) {} - - virtual bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - TestData::const_iterator i = m_data.find(name); - if (i == m_data.end()) - { - if (std::string(name) == Name::DigestSize() && valueType == typeid(int)) - { - i = m_data.find("MAC"); - if (i == m_data.end()) - i = m_data.find("Digest"); - if (i == m_data.end()) - return false; - - m_temp.resize(0); - PutDecodedDatumInto(m_data, i->first.c_str(), StringSink(m_temp).Ref()); - *reinterpret_cast(pValue) = (int)m_temp.size(); - return true; - } - else - return false; - } - - const std::string &value = i->second; - - if (valueType == typeid(int)) - *reinterpret_cast(pValue) = atoi(value.c_str()); - else if (valueType == typeid(Integer)) - *reinterpret_cast(pValue) = Integer((std::string(value) + "h").c_str()); - else if (valueType == typeid(ConstByteArrayParameter)) - { - m_temp.resize(0); - PutDecodedDatumInto(m_data, name, StringSink(m_temp).Ref()); - reinterpret_cast(pValue)->Assign((const byte *)m_temp.data(), m_temp.size(), false); - } - else - throw ValueTypeMismatch(name, typeid(std::string), valueType); - - return true; - } - -private: - const TestData &m_data; - mutable std::string m_temp; -}; - -void TestKeyPairValidAndConsistent(CryptoMaterial &pub, const CryptoMaterial &priv) -{ - if (!pub.Validate(GlobalRNG(), 3)) - SignalTestFailure(); - if (!priv.Validate(GlobalRNG(), 3)) - SignalTestFailure(); - -/* EqualityComparisonFilter comparison; - pub.Save(ChannelSwitch(comparison, "0")); - pub.AssignFrom(priv); - pub.Save(ChannelSwitch(comparison, "1")); - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); -*/ -} - -void TestSignatureScheme(TestData &v) -{ - std::string name = GetRequiredDatum(v, "Name"); - std::string test = GetRequiredDatum(v, "Test"); - - std::auto_ptr signer(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - std::auto_ptr verifier(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - - TestDataNameValuePairs pairs(v); - std::string keyFormat = GetRequiredDatum(v, "KeyFormat"); - - if (keyFormat == "DER") - verifier->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PublicKey")).Ref()); - else if (keyFormat == "Component") - verifier->AccessMaterial().AssignFrom(pairs); - - if (test == "Verify" || test == "NotVerify") - { - VerifierFilter verifierFilter(*verifier, NULL, VerifierFilter::SIGNATURE_AT_BEGIN); - PutDecodedDatumInto(v, "Signature", verifierFilter); - PutDecodedDatumInto(v, "Message", verifierFilter); - verifierFilter.MessageEnd(); - if (verifierFilter.GetLastResult() == (test == "NotVerify")) - SignalTestFailure(); - } - else if (test == "PublicKeyValid") - { - if (!verifier->GetMaterial().Validate(GlobalRNG(), 3)) - SignalTestFailure(); - } - else - goto privateKeyTests; - - return; - -privateKeyTests: - if (keyFormat == "DER") - signer->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PrivateKey")).Ref()); - else if (keyFormat == "Component") - signer->AccessMaterial().AssignFrom(pairs); - - if (test == "KeyPairValidAndConsistent") - { - TestKeyPairValidAndConsistent(verifier->AccessMaterial(), signer->GetMaterial()); - } - else if (test == "Sign") - { - SignerFilter f(GlobalRNG(), *signer, new HexEncoder(new FileSink(cout))); - StringSource ss(GetDecodedDatum(v, "Message"), true, new Redirector(f)); - SignalTestFailure(); - } - else if (test == "DeterministicSign") - { - SignalTestError(); - assert(false); // TODO: implement - } - else if (test == "RandomSign") - { - SignalTestError(); - assert(false); // TODO: implement - } - else if (test == "GenerateKey") - { - SignalTestError(); - assert(false); - } - else - { - SignalTestError(); - assert(false); - } -} - -void TestAsymmetricCipher(TestData &v) -{ - std::string name = GetRequiredDatum(v, "Name"); - std::string test = GetRequiredDatum(v, "Test"); - - std::auto_ptr encryptor(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - std::auto_ptr decryptor(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - - std::string keyFormat = GetRequiredDatum(v, "KeyFormat"); - - if (keyFormat == "DER") - { - decryptor->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PrivateKey")).Ref()); - encryptor->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PublicKey")).Ref()); - } - else if (keyFormat == "Component") - { - TestDataNameValuePairs pairs(v); - decryptor->AccessMaterial().AssignFrom(pairs); - encryptor->AccessMaterial().AssignFrom(pairs); - } - - if (test == "DecryptMatch") - { - std::string decrypted, expected = GetDecodedDatum(v, "Plaintext"); - StringSource ss(GetDecodedDatum(v, "Ciphertext"), true, new PK_DecryptorFilter(GlobalRNG(), *decryptor, new StringSink(decrypted))); - if (decrypted != expected) - SignalTestFailure(); - } - else if (test == "KeyPairValidAndConsistent") - { - TestKeyPairValidAndConsistent(encryptor->AccessMaterial(), decryptor->GetMaterial()); - } - else - { - SignalTestError(); - assert(false); - } -} - -void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters) -{ - std::string name = GetRequiredDatum(v, "Name"); - std::string test = GetRequiredDatum(v, "Test"); - - std::string key = GetDecodedDatum(v, "Key"); - std::string plaintext = GetDecodedDatum(v, "Plaintext"); - - TestDataNameValuePairs testDataPairs(v); - CombinedNameValuePairs pairs(overrideParameters, testDataPairs); - - if (test == "Encrypt" || test == "EncryptXorDigest" || test == "Resync" || test == "EncryptionMCT" || test == "DecryptionMCT") - { - static member_ptr encryptor, decryptor; - static std::string lastName; - - if (name != lastName) - { - encryptor.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - decryptor.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - lastName = name; - } - - ConstByteArrayParameter iv; - if (pairs.GetValue(Name::IV(), iv) && iv.size() != encryptor->IVSize()) - SignalTestFailure(); - - if (test == "Resync") - { - encryptor->Resynchronize(iv.begin(), (int)iv.size()); - decryptor->Resynchronize(iv.begin(), (int)iv.size()); - } - else - { - encryptor->SetKey((const byte *)key.data(), key.size(), pairs); - decryptor->SetKey((const byte *)key.data(), key.size(), pairs); - } - - int seek = pairs.GetIntValueWithDefault("Seek", 0); - if (seek) - { - encryptor->Seek(seek); - decryptor->Seek(seek); - } - - std::string encrypted, xorDigest, ciphertext, ciphertextXorDigest; - if (test == "EncryptionMCT" || test == "DecryptionMCT") - { - SymmetricCipher *cipher = encryptor.get(); - SecByteBlock buf((byte *)plaintext.data(), plaintext.size()), keybuf((byte *)key.data(), key.size()); - - if (test == "DecryptionMCT") - { - cipher = decryptor.get(); - ciphertext = GetDecodedDatum(v, "Ciphertext"); - buf.Assign((byte *)ciphertext.data(), ciphertext.size()); - } - - for (int i=0; i<400; i++) - { - encrypted.reserve(10000 * plaintext.size()); - for (int j=0; j<10000; j++) - { - cipher->ProcessString(buf.begin(), buf.size()); - encrypted.append((char *)buf.begin(), buf.size()); - } - - encrypted.erase(0, encrypted.size() - keybuf.size()); - xorbuf(keybuf.begin(), (const byte *)encrypted.data(), keybuf.size()); - cipher->SetKey(keybuf, keybuf.size()); - } - encrypted.assign((char *)buf.begin(), buf.size()); - ciphertext = GetDecodedDatum(v, test == "EncryptionMCT" ? "Ciphertext" : "Plaintext"); - if (encrypted != ciphertext) - { - std::cout << "incorrectly encrypted: "; - StringSource xx(encrypted, false, new HexEncoder(new FileSink(std::cout))); - xx.Pump(256); xx.Flush(false); - std::cout << "\n"; - SignalTestFailure(); - } - return; - } - - StreamTransformationFilter encFilter(*encryptor, new StringSink(encrypted), StreamTransformationFilter::NO_PADDING); - RandomizedTransfer(StringStore(plaintext).Ref(), encFilter, true); - encFilter.MessageEnd(); - /*{ - std::string z; - encryptor->Seek(seek); - StringSource ss(plaintext, false, new StreamTransformationFilter(*encryptor, new StringSink(z), StreamTransformationFilter::NO_PADDING)); - while (ss.Pump(64)) {} - ss.PumpAll(); - for (int i=0; i asc1, asc2; - asc1.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - asc2.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - asc1->SetKey((const byte *)key.data(), key.size(), pairs); - asc2->SetKey((const byte *)key.data(), key.size(), pairs); - - std::string encrypted, decrypted; - AuthenticatedEncryptionFilter ef(*asc1, new StringSink(encrypted)); - bool macAtBegin = !mac.empty() && !GlobalRNG().GenerateBit(); // test both ways randomly - AuthenticatedDecryptionFilter df(*asc2, new StringSink(decrypted), macAtBegin ? AuthenticatedDecryptionFilter::MAC_AT_BEGIN : 0); - - if (asc1->NeedsPrespecifiedDataLengths()) - { - asc1->SpecifyDataLengths(header.size(), plaintext.size(), footer.size()); - asc2->SpecifyDataLengths(header.size(), plaintext.size(), footer.size()); - } - - StringStore sh(header), sp(plaintext), sc(ciphertext), sf(footer), sm(mac); - - if (macAtBegin) - RandomizedTransfer(sm, df, true); - sh.CopyTo(df, LWORD_MAX, AAD_CHANNEL); - RandomizedTransfer(sc, df, true); - sf.CopyTo(df, LWORD_MAX, AAD_CHANNEL); - if (!macAtBegin) - RandomizedTransfer(sm, df, true); - df.MessageEnd(); - - RandomizedTransfer(sh, ef, true, AAD_CHANNEL); - RandomizedTransfer(sp, ef, true); - RandomizedTransfer(sf, ef, true, AAD_CHANNEL); - ef.MessageEnd(); - - if (test == "Encrypt" && encrypted != ciphertext+mac) - { - std::cout << "incorrectly encrypted: "; - StringSource xx(encrypted, false, new HexEncoder(new FileSink(std::cout))); - xx.Pump(2048); xx.Flush(false); - std::cout << "\n"; - SignalTestFailure(); - } - if (test == "Encrypt" && decrypted != plaintext) - { - std::cout << "incorrectly decrypted: "; - StringSource xx(decrypted, false, new HexEncoder(new FileSink(std::cout))); - xx.Pump(256); xx.Flush(false); - std::cout << "\n"; - SignalTestFailure(); - } - - if (ciphertext.size()+mac.size()-plaintext.size() != asc1->DigestSize()) - { - std::cout << "bad MAC size\n"; - SignalTestFailure(); - } - if (df.GetLastResult() != (test == "Encrypt")) - { - std::cout << "MAC incorrectly verified\n"; - SignalTestFailure(); - } - } - else - { - std::cout << "unexpected test name\n"; - SignalTestError(); - } -} - -void TestDigestOrMAC(TestData &v, bool testDigest) -{ - std::string name = GetRequiredDatum(v, "Name"); - std::string test = GetRequiredDatum(v, "Test"); - const char *digestName = testDigest ? "Digest" : "MAC"; - - member_ptr mac; - member_ptr hash; - HashTransformation *pHash = NULL; - - TestDataNameValuePairs pairs(v); - - if (testDigest) - { - hash.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - pHash = hash.get(); - } - else - { - mac.reset(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - pHash = mac.get(); - std::string key = GetDecodedDatum(v, "Key"); - mac->SetKey((const byte *)key.c_str(), key.size(), pairs); - } - - if (test == "Verify" || test == "VerifyTruncated" || test == "NotVerify") - { - int digestSize = -1; - if (test == "VerifyTruncated") - pairs.GetIntValue(Name::DigestSize(), digestSize); - HashVerificationFilter verifierFilter(*pHash, NULL, HashVerificationFilter::HASH_AT_BEGIN, digestSize); - PutDecodedDatumInto(v, digestName, verifierFilter); - PutDecodedDatumInto(v, "Message", verifierFilter); - verifierFilter.MessageEnd(); - if (verifierFilter.GetLastResult() == (test == "NotVerify")) - SignalTestFailure(); - } - else - { - SignalTestError(); - assert(false); - } -} - -bool GetField(std::istream &is, std::string &name, std::string &value) -{ - name.resize(0); // GCC workaround: 2.95.3 doesn't have clear() - is >> name; - if (name.empty()) - return false; - - if (name[name.size()-1] != ':') - { - char c; - is >> skipws >> c; - if (c != ':') - SignalTestError(); - } - else - name.erase(name.size()-1); - - while (is.peek() == ' ') - is.ignore(1); - - // VC60 workaround: getline bug - char buffer[128]; - value.resize(0); // GCC workaround: 2.95.3 doesn't have clear() - bool continueLine; - - do - { - do - { - is.get(buffer, sizeof(buffer)); - value += buffer; - } - while (buffer[0] != 0); - is.clear(); - is.ignore(); - - if (!value.empty() && value[value.size()-1] == '\r') - value.resize(value.size()-1); - - if (!value.empty() && value[value.size()-1] == '\\') - { - value.resize(value.size()-1); - continueLine = true; - } - else - continueLine = false; - - std::string::size_type i = value.find('#'); - if (i != std::string::npos) - value.erase(i); - } - while (continueLine); - - return true; -} - -void OutputPair(const NameValuePairs &v, const char *name) -{ - Integer x; - bool b = v.GetValue(name, x); - assert(b); - cout << name << ": \\\n "; - x.Encode(HexEncoder(new FileSink(cout), false, 64, "\\\n ").Ref(), x.MinEncodedSize()); - cout << endl; -} - -void OutputNameValuePairs(const NameValuePairs &v) -{ - std::string names = v.GetValueNames(); - string::size_type i = 0; - while (i < names.size()) - { - string::size_type j = names.find_first_of (';', i); - - if (j == string::npos) - return; - else - { - std::string name = names.substr(i, j-i); - if (name.find(':') == string::npos) - OutputPair(v, name.c_str()); - } - - i = j + 1; - } -} - -void TestDataFile(const std::string &filename, const NameValuePairs &overrideParameters, unsigned int &totalTests, unsigned int &failedTests) -{ - std::ifstream file(filename.c_str()); - if (!file.good()) - throw Exception(Exception::OTHER_ERROR, "Can not open file " + filename + " for reading"); - TestData v; - s_currentTestData = &v; - std::string name, value, lastAlgName; - - while (file) - { - while (file.peek() == '#') - file.ignore(INT_MAX, '\n'); - - if (file.peek() == '\n' || file.peek() == '\r') - v.clear(); - - if (!GetField(file, name, value)) - break; - v[name] = value; - - if (name == "Test") - { - bool failed = true; - std::string algType = GetRequiredDatum(v, "AlgorithmType"); - - if (lastAlgName != GetRequiredDatum(v, "Name")) - { - lastAlgName = GetRequiredDatum(v, "Name"); - cout << "\nTesting " << algType.c_str() << " algorithm " << lastAlgName.c_str() << ".\n"; - } - - try - { - if (algType == "Signature") - TestSignatureScheme(v); - else if (algType == "SymmetricCipher") - TestSymmetricCipher(v, overrideParameters); - else if (algType == "AuthenticatedSymmetricCipher") - TestAuthenticatedSymmetricCipher(v, overrideParameters); - else if (algType == "AsymmetricCipher") - TestAsymmetricCipher(v); - else if (algType == "MessageDigest") - TestDigestOrMAC(v, true); - else if (algType == "MAC") - TestDigestOrMAC(v, false); - else if (algType == "FileList") - TestDataFile(GetRequiredDatum(v, "Test"), g_nullNameValuePairs, totalTests, failedTests); - else - SignalTestError(); - failed = false; - } - catch (TestFailure &) - { - cout << "\nTest failed.\n"; - } - catch (CryptoPP::Exception &e) - { - cout << "\nCryptoPP::Exception caught: " << e.what() << endl; - } - catch (std::exception &e) - { - cout << "\nstd::exception caught: " << e.what() << endl; - } - - if (failed) - { - cout << "Skipping to next test.\n"; - failedTests++; - } - else - cout << "." << flush; - - totalTests++; - } - } -} - -bool RunTestDataFile(const char *filename, const NameValuePairs &overrideParameters) -{ - unsigned int totalTests = 0, failedTests = 0; - TestDataFile(filename, overrideParameters, totalTests, failedTests); - cout << dec << "\nTests complete. Total tests = " << totalTests << ". Failed tests = " << failedTests << ".\n"; - if (failedTests != 0) - cout << "SOME TESTS FAILED!\n"; - return failedTests == 0; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/default.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/default.cpp deleted file mode 100644 index 72940784..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/default.cpp +++ /dev/null @@ -1,258 +0,0 @@ -// default.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "default.h" -#include "queue.h" -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -static const unsigned int MASH_ITERATIONS = 200; -static const unsigned int SALTLENGTH = 8; -static const unsigned int BLOCKSIZE = Default_BlockCipher::Encryption::BLOCKSIZE; -static const unsigned int KEYLENGTH = Default_BlockCipher::Encryption::DEFAULT_KEYLENGTH; - -// The purpose of this function Mash() is to take an arbitrary length input -// string and *deterministicly* produce an arbitrary length output string such -// that (1) it looks random, (2) no information about the input is -// deducible from it, and (3) it contains as much entropy as it can hold, or -// the amount of entropy in the input string, whichever is smaller. - -static void Mash(const byte *in, size_t inLen, byte *out, size_t outLen, int iterations) -{ - if (BytePrecision(outLen) > 2) - throw InvalidArgument("Mash: output legnth too large"); - - size_t bufSize = RoundUpToMultipleOf(outLen, (size_t)DefaultHashModule::DIGESTSIZE); - byte b[2]; - SecByteBlock buf(bufSize); - SecByteBlock outBuf(bufSize); - DefaultHashModule hash; - - unsigned int i; - for(i=0; i> 8); - b[1] = (byte) i; - hash.Update(b, 2); - hash.Update(in, inLen); - hash.Final(outBuf+i); - } - - while (iterations-- > 1) - { - memcpy(buf, outBuf, bufSize); - for (i=0; i> 8); - b[1] = (byte) i; - hash.Update(b, 2); - hash.Update(buf, bufSize); - hash.Final(outBuf+i); - } - } - - memcpy(out, outBuf, outLen); -} - -static void GenerateKeyIV(const byte *passphrase, size_t passphraseLength, const byte *salt, size_t saltLength, byte *key, byte *IV) -{ - SecByteBlock temp(passphraseLength+saltLength); - memcpy(temp, passphrase, passphraseLength); - memcpy(temp+passphraseLength, salt, saltLength); - SecByteBlock keyIV(KEYLENGTH+BLOCKSIZE); - Mash(temp, passphraseLength + saltLength, keyIV, KEYLENGTH+BLOCKSIZE, MASH_ITERATIONS); - memcpy(key, keyIV, KEYLENGTH); - memcpy(IV, keyIV+KEYLENGTH, BLOCKSIZE); -} - -// ******************************************************** - -DefaultEncryptor::DefaultEncryptor(const char *passphrase, BufferedTransformation *attachment) - : ProxyFilter(NULL, 0, 0, attachment), m_passphrase((const byte *)passphrase, strlen(passphrase)) -{ -} - -DefaultEncryptor::DefaultEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment) - : ProxyFilter(NULL, 0, 0, attachment), m_passphrase(passphrase, passphraseLength) -{ -} - - -void DefaultEncryptor::FirstPut(const byte *) -{ - // VC60 workaround: __LINE__ expansion bug - CRYPTOPP_COMPILE_ASSERT_INSTANCE(SALTLENGTH <= DefaultHashModule::DIGESTSIZE, 1); - CRYPTOPP_COMPILE_ASSERT_INSTANCE(BLOCKSIZE <= DefaultHashModule::DIGESTSIZE, 2); - - SecByteBlock salt(DefaultHashModule::DIGESTSIZE), keyCheck(DefaultHashModule::DIGESTSIZE); - DefaultHashModule hash; - - // use hash(passphrase | time | clock) as salt - hash.Update(m_passphrase, m_passphrase.size()); - time_t t=time(0); - hash.Update((byte *)&t, sizeof(t)); - clock_t c=clock(); - hash.Update((byte *)&c, sizeof(c)); - hash.Final(salt); - - // use hash(passphrase | salt) as key check - hash.Update(m_passphrase, m_passphrase.size()); - hash.Update(salt, SALTLENGTH); - hash.Final(keyCheck); - - AttachedTransformation()->Put(salt, SALTLENGTH); - - // mash passphrase and salt together into key and IV - SecByteBlock key(KEYLENGTH); - SecByteBlock IV(BLOCKSIZE); - GenerateKeyIV(m_passphrase, m_passphrase.size(), salt, SALTLENGTH, key, IV); - - m_cipher.SetKeyWithIV(key, key.size(), IV); - SetFilter(new StreamTransformationFilter(m_cipher)); - - m_filter->Put(keyCheck, BLOCKSIZE); -} - -void DefaultEncryptor::LastPut(const byte *inString, size_t length) -{ - m_filter->MessageEnd(); -} - -// ******************************************************** - -DefaultDecryptor::DefaultDecryptor(const char *p, BufferedTransformation *attachment, bool throwException) - : ProxyFilter(NULL, SALTLENGTH+BLOCKSIZE, 0, attachment) - , m_state(WAITING_FOR_KEYCHECK) - , m_passphrase((const byte *)p, strlen(p)) - , m_throwException(throwException) -{ -} - -DefaultDecryptor::DefaultDecryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment, bool throwException) - : ProxyFilter(NULL, SALTLENGTH+BLOCKSIZE, 0, attachment) - , m_state(WAITING_FOR_KEYCHECK) - , m_passphrase(passphrase, passphraseLength) - , m_throwException(throwException) -{ -} - -void DefaultDecryptor::FirstPut(const byte *inString) -{ - CheckKey(inString, inString+SALTLENGTH); -} - -void DefaultDecryptor::LastPut(const byte *inString, size_t length) -{ - if (m_filter.get() == NULL) - { - m_state = KEY_BAD; - if (m_throwException) - throw KeyBadErr(); - } - else - { - m_filter->MessageEnd(); - m_state = WAITING_FOR_KEYCHECK; - } -} - -void DefaultDecryptor::CheckKey(const byte *salt, const byte *keyCheck) -{ - SecByteBlock check(STDMAX((unsigned int)2*BLOCKSIZE, (unsigned int)DefaultHashModule::DIGESTSIZE)); - - DefaultHashModule hash; - hash.Update(m_passphrase, m_passphrase.size()); - hash.Update(salt, SALTLENGTH); - hash.Final(check); - - SecByteBlock key(KEYLENGTH); - SecByteBlock IV(BLOCKSIZE); - GenerateKeyIV(m_passphrase, m_passphrase.size(), salt, SALTLENGTH, key, IV); - - m_cipher.SetKeyWithIV(key, key.size(), IV); - std::auto_ptr decryptor(new StreamTransformationFilter(m_cipher)); - - decryptor->Put(keyCheck, BLOCKSIZE); - decryptor->ForceNextPut(); - decryptor->Get(check+BLOCKSIZE, BLOCKSIZE); - - SetFilter(decryptor.release()); - - if (!VerifyBufsEqual(check, check+BLOCKSIZE, BLOCKSIZE)) - { - m_state = KEY_BAD; - if (m_throwException) - throw KeyBadErr(); - } - else - m_state = KEY_GOOD; -} - -// ******************************************************** - -static DefaultMAC * NewDefaultEncryptorMAC(const byte *passphrase, size_t passphraseLength) -{ - size_t macKeyLength = DefaultMAC::StaticGetValidKeyLength(16); - SecByteBlock macKey(macKeyLength); - // since the MAC is encrypted there is no reason to mash the passphrase for many iterations - Mash(passphrase, passphraseLength, macKey, macKeyLength, 1); - return new DefaultMAC(macKey, macKeyLength); -} - -DefaultEncryptorWithMAC::DefaultEncryptorWithMAC(const char *passphrase, BufferedTransformation *attachment) - : ProxyFilter(NULL, 0, 0, attachment) - , m_mac(NewDefaultEncryptorMAC((const byte *)passphrase, strlen(passphrase))) -{ - SetFilter(new HashFilter(*m_mac, new DefaultEncryptor(passphrase), true)); -} - -DefaultEncryptorWithMAC::DefaultEncryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment) - : ProxyFilter(NULL, 0, 0, attachment) - , m_mac(NewDefaultEncryptorMAC(passphrase, passphraseLength)) -{ - SetFilter(new HashFilter(*m_mac, new DefaultEncryptor(passphrase, passphraseLength), true)); -} - -void DefaultEncryptorWithMAC::LastPut(const byte *inString, size_t length) -{ - m_filter->MessageEnd(); -} - -// ******************************************************** - -DefaultDecryptorWithMAC::DefaultDecryptorWithMAC(const char *passphrase, BufferedTransformation *attachment, bool throwException) - : ProxyFilter(NULL, 0, 0, attachment) - , m_mac(NewDefaultEncryptorMAC((const byte *)passphrase, strlen(passphrase))) - , m_throwException(throwException) -{ - SetFilter(new DefaultDecryptor(passphrase, m_hashVerifier=new HashVerifier(*m_mac, NULL, HashVerifier::PUT_MESSAGE), throwException)); -} - -DefaultDecryptorWithMAC::DefaultDecryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment, bool throwException) - : ProxyFilter(NULL, 0, 0, attachment) - , m_mac(NewDefaultEncryptorMAC(passphrase, passphraseLength)) - , m_throwException(throwException) -{ - SetFilter(new DefaultDecryptor(passphrase, passphraseLength, m_hashVerifier=new HashVerifier(*m_mac, NULL, HashVerifier::PUT_MESSAGE), throwException)); -} - -DefaultDecryptor::State DefaultDecryptorWithMAC::CurrentState() const -{ - return static_cast(m_filter.get())->CurrentState(); -} - -bool DefaultDecryptorWithMAC::CheckLastMAC() const -{ - return m_hashVerifier->GetLastResult(); -} - -void DefaultDecryptorWithMAC::LastPut(const byte *inString, size_t length) -{ - m_filter->MessageEnd(); - if (m_throwException && !CheckLastMAC()) - throw MACBadErr(); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/default.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/default.h deleted file mode 100644 index fb536415..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/default.h +++ /dev/null @@ -1,104 +0,0 @@ -#ifndef CRYPTOPP_DEFAULT_H -#define CRYPTOPP_DEFAULT_H - -#include "sha.h" -#include "hmac.h" -#include "des.h" -#include "filters.h" -#include "modes.h" - -NAMESPACE_BEGIN(CryptoPP) - -typedef DES_EDE2 Default_BlockCipher; -typedef SHA DefaultHashModule; -typedef HMAC DefaultMAC; - -//! Password-Based Encryptor using DES-EDE2 -class DefaultEncryptor : public ProxyFilter -{ -public: - DefaultEncryptor(const char *passphrase, BufferedTransformation *attachment = NULL); - DefaultEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL); - -protected: - void FirstPut(const byte *); - void LastPut(const byte *inString, size_t length); - -private: - SecByteBlock m_passphrase; - CBC_Mode::Encryption m_cipher; -}; - -//! Password-Based Decryptor using DES-EDE2 -class DefaultDecryptor : public ProxyFilter -{ -public: - DefaultDecryptor(const char *passphrase, BufferedTransformation *attachment = NULL, bool throwException=true); - DefaultDecryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL, bool throwException=true); - - class Err : public Exception - { - public: - Err(const std::string &s) - : Exception(DATA_INTEGRITY_CHECK_FAILED, s) {} - }; - class KeyBadErr : public Err {public: KeyBadErr() : Err("DefaultDecryptor: cannot decrypt message with this passphrase") {}}; - - enum State {WAITING_FOR_KEYCHECK, KEY_GOOD, KEY_BAD}; - State CurrentState() const {return m_state;} - -protected: - void FirstPut(const byte *inString); - void LastPut(const byte *inString, size_t length); - - State m_state; - -private: - void CheckKey(const byte *salt, const byte *keyCheck); - - SecByteBlock m_passphrase; - CBC_Mode::Decryption m_cipher; - member_ptr m_decryptor; - bool m_throwException; -}; - -//! Password-Based Encryptor using DES-EDE2 and HMAC/SHA-1 -class DefaultEncryptorWithMAC : public ProxyFilter -{ -public: - DefaultEncryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULL); - DefaultEncryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL); - -protected: - void FirstPut(const byte *inString) {} - void LastPut(const byte *inString, size_t length); - -private: - member_ptr m_mac; -}; - -//! Password-Based Decryptor using DES-EDE2 and HMAC/SHA-1 -class DefaultDecryptorWithMAC : public ProxyFilter -{ -public: - class MACBadErr : public DefaultDecryptor::Err {public: MACBadErr() : DefaultDecryptor::Err("DefaultDecryptorWithMAC: MAC check failed") {}}; - - DefaultDecryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULL, bool throwException=true); - DefaultDecryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL, bool throwException=true); - - DefaultDecryptor::State CurrentState() const; - bool CheckLastMAC() const; - -protected: - void FirstPut(const byte *inString) {} - void LastPut(const byte *inString, size_t length); - -private: - member_ptr m_mac; - HashVerifier *m_hashVerifier; - bool m_throwException; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/des.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/des.cpp deleted file mode 100644 index a6e0c514..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/des.cpp +++ /dev/null @@ -1,449 +0,0 @@ -// des.cpp - modified by Wei Dai from Phil Karn's des.c -// The original code and all modifications are in the public domain. - -/* - * This is a major rewrite of my old public domain DES code written - * circa 1987, which in turn borrowed heavily from Jim Gillogly's 1977 - * public domain code. I pretty much kept my key scheduling code, but - * the actual encrypt/decrypt routines are taken from from Richard - * Outerbridge's DES code as printed in Schneier's "Applied Cryptography." - * - * This code is in the public domain. I would appreciate bug reports and - * enhancements. - * - * Phil Karn KA9Q, karn@unix.ka9q.ampr.org, August 1994. - */ - -#include "pch.h" -#include "misc.h" -#include "des.h" - -NAMESPACE_BEGIN(CryptoPP) - -typedef BlockGetAndPut Block; - -// Richard Outerbridge's initial permutation algorithm -/* -inline void IPERM(word32 &left, word32 &right) -{ - word32 work; - - work = ((left >> 4) ^ right) & 0x0f0f0f0f; - right ^= work; - left ^= work << 4; - work = ((left >> 16) ^ right) & 0xffff; - right ^= work; - left ^= work << 16; - work = ((right >> 2) ^ left) & 0x33333333; - left ^= work; - right ^= (work << 2); - work = ((right >> 8) ^ left) & 0xff00ff; - left ^= work; - right ^= (work << 8); - right = rotl(right, 1); - work = (left ^ right) & 0xaaaaaaaa; - left ^= work; - right ^= work; - left = rotl(left, 1); -} -inline void FPERM(word32 &left, word32 &right) -{ - word32 work; - - right = rotr(right, 1); - work = (left ^ right) & 0xaaaaaaaa; - left ^= work; - right ^= work; - left = rotr(left, 1); - work = ((left >> 8) ^ right) & 0xff00ff; - right ^= work; - left ^= work << 8; - work = ((left >> 2) ^ right) & 0x33333333; - right ^= work; - left ^= work << 2; - work = ((right >> 16) ^ left) & 0xffff; - left ^= work; - right ^= work << 16; - work = ((right >> 4) ^ left) & 0x0f0f0f0f; - left ^= work; - right ^= work << 4; -} -*/ - -// Wei Dai's modification to Richard Outerbridge's initial permutation -// algorithm, this one is faster if you have access to rotate instructions -// (like in MSVC) -static inline void IPERM(word32 &left, word32 &right) -{ - word32 work; - - right = rotlFixed(right, 4U); - work = (left ^ right) & 0xf0f0f0f0; - left ^= work; - right = rotrFixed(right^work, 20U); - work = (left ^ right) & 0xffff0000; - left ^= work; - right = rotrFixed(right^work, 18U); - work = (left ^ right) & 0x33333333; - left ^= work; - right = rotrFixed(right^work, 6U); - work = (left ^ right) & 0x00ff00ff; - left ^= work; - right = rotlFixed(right^work, 9U); - work = (left ^ right) & 0xaaaaaaaa; - left = rotlFixed(left^work, 1U); - right ^= work; -} - -static inline void FPERM(word32 &left, word32 &right) -{ - word32 work; - - right = rotrFixed(right, 1U); - work = (left ^ right) & 0xaaaaaaaa; - right ^= work; - left = rotrFixed(left^work, 9U); - work = (left ^ right) & 0x00ff00ff; - right ^= work; - left = rotlFixed(left^work, 6U); - work = (left ^ right) & 0x33333333; - right ^= work; - left = rotlFixed(left^work, 18U); - work = (left ^ right) & 0xffff0000; - right ^= work; - left = rotlFixed(left^work, 20U); - work = (left ^ right) & 0xf0f0f0f0; - right ^= work; - left = rotrFixed(left^work, 4U); -} - -void DES::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - RawSetKey(GetCipherDirection(), userKey); -} - -#ifndef CRYPTOPP_IMPORTS - -/* Tables defined in the Data Encryption Standard documents - * Three of these tables, the initial permutation, the final - * permutation and the expansion operator, are regular enough that - * for speed, we hard-code them. They're here for reference only. - * Also, the S and P boxes are used by a separate program, gensp.c, - * to build the combined SP box, Spbox[]. They're also here just - * for reference. - */ -#ifdef notdef -/* initial permutation IP */ -static byte ip[] = { - 58, 50, 42, 34, 26, 18, 10, 2, - 60, 52, 44, 36, 28, 20, 12, 4, - 62, 54, 46, 38, 30, 22, 14, 6, - 64, 56, 48, 40, 32, 24, 16, 8, - 57, 49, 41, 33, 25, 17, 9, 1, - 59, 51, 43, 35, 27, 19, 11, 3, - 61, 53, 45, 37, 29, 21, 13, 5, - 63, 55, 47, 39, 31, 23, 15, 7 -}; - -/* final permutation IP^-1 */ -static byte fp[] = { - 40, 8, 48, 16, 56, 24, 64, 32, - 39, 7, 47, 15, 55, 23, 63, 31, - 38, 6, 46, 14, 54, 22, 62, 30, - 37, 5, 45, 13, 53, 21, 61, 29, - 36, 4, 44, 12, 52, 20, 60, 28, - 35, 3, 43, 11, 51, 19, 59, 27, - 34, 2, 42, 10, 50, 18, 58, 26, - 33, 1, 41, 9, 49, 17, 57, 25 -}; -/* expansion operation matrix */ -static byte ei[] = { - 32, 1, 2, 3, 4, 5, - 4, 5, 6, 7, 8, 9, - 8, 9, 10, 11, 12, 13, - 12, 13, 14, 15, 16, 17, - 16, 17, 18, 19, 20, 21, - 20, 21, 22, 23, 24, 25, - 24, 25, 26, 27, 28, 29, - 28, 29, 30, 31, 32, 1 -}; -/* The (in)famous S-boxes */ -static byte sbox[8][64] = { - /* S1 */ - 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, - 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, - 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, - 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13, - - /* S2 */ - 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, - 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, - 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, - 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9, - - /* S3 */ - 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, - 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, - 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12, - - /* S4 */ - 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, - 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, - 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, - 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14, - - /* S5 */ - 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, - 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, - 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, - 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3, - - /* S6 */ - 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, - 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, - 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, - 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13, - - /* S7 */ - 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, - 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, - 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, - 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12, - - /* S8 */ - 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, - 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, - 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, - 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 -}; - -/* 32-bit permutation function P used on the output of the S-boxes */ -static byte p32i[] = { - 16, 7, 20, 21, - 29, 12, 28, 17, - 1, 15, 23, 26, - 5, 18, 31, 10, - 2, 8, 24, 14, - 32, 27, 3, 9, - 19, 13, 30, 6, - 22, 11, 4, 25 -}; -#endif - -/* permuted choice table (key) */ -static const byte pc1[] = { - 57, 49, 41, 33, 25, 17, 9, - 1, 58, 50, 42, 34, 26, 18, - 10, 2, 59, 51, 43, 35, 27, - 19, 11, 3, 60, 52, 44, 36, - - 63, 55, 47, 39, 31, 23, 15, - 7, 62, 54, 46, 38, 30, 22, - 14, 6, 61, 53, 45, 37, 29, - 21, 13, 5, 28, 20, 12, 4 -}; - -/* number left rotations of pc1 */ -static const byte totrot[] = { - 1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 -}; - -/* permuted choice key (table) */ -static const byte pc2[] = { - 14, 17, 11, 24, 1, 5, - 3, 28, 15, 6, 21, 10, - 23, 19, 12, 4, 26, 8, - 16, 7, 27, 20, 13, 2, - 41, 52, 31, 37, 47, 55, - 30, 40, 51, 45, 33, 48, - 44, 49, 39, 56, 34, 53, - 46, 42, 50, 36, 29, 32 -}; - -/* End of DES-defined tables */ - -/* bit 0 is left-most in byte */ -static const int bytebit[] = { - 0200,0100,040,020,010,04,02,01 -}; - -/* Set key (initialize key schedule array) */ -void RawDES::RawSetKey(CipherDir dir, const byte *key) -{ - SecByteBlock buffer(56+56+8); - byte *const pc1m=buffer; /* place to modify pc1 into */ - byte *const pcr=pc1m+56; /* place to rotate pc1 into */ - byte *const ks=pcr+56; - register int i,j,l; - int m; - - for (j=0; j<56; j++) { /* convert pc1 to bits of key */ - l=pc1[j]-1; /* integer bit location */ - m = l & 07; /* find bit */ - pc1m[j]=(key[l>>3] & /* find which key byte l is in */ - bytebit[m]) /* and which bit of that byte */ - ? 1 : 0; /* and store 1-bit result */ - } - for (i=0; i<16; i++) { /* key chunk for each iteration */ - memset(ks,0,8); /* Clear key schedule */ - for (j=0; j<56; j++) /* rotate pc1 the right amount */ - pcr[j] = pc1m[(l=j+totrot[i])<(j<28? 28 : 56) ? l: l-28]; - /* rotate left and right halves independently */ - for (j=0; j<48; j++){ /* select bits individually */ - /* check bit that goes to ks[j] */ - if (pcr[pc2[j]-1]){ - /* mask it in if it's there */ - l= j % 6; - ks[j/6] |= bytebit[l] >> 2; - } - } - /* Now convert to odd/even interleaved form for use in F */ - k[2*i] = ((word32)ks[0] << 24) - | ((word32)ks[2] << 16) - | ((word32)ks[4] << 8) - | ((word32)ks[6]); - k[2*i+1] = ((word32)ks[1] << 24) - | ((word32)ks[3] << 16) - | ((word32)ks[5] << 8) - | ((word32)ks[7]); - } - - if (dir==DECRYPTION) // reverse key schedule order - for (i=0; i<16; i+=2) - { - std::swap(k[i], k[32-2-i]); - std::swap(k[i+1], k[32-1-i]); - } -} - -void RawDES::RawProcessBlock(word32 &l_, word32 &r_) const -{ - word32 l = l_, r = r_; - const word32 *kptr=k; - - for (unsigned i=0; i<8; i++) - { - word32 work = rotrFixed(r, 4U) ^ kptr[4*i+0]; - l ^= Spbox[6][(work) & 0x3f] - ^ Spbox[4][(work >> 8) & 0x3f] - ^ Spbox[2][(work >> 16) & 0x3f] - ^ Spbox[0][(work >> 24) & 0x3f]; - work = r ^ kptr[4*i+1]; - l ^= Spbox[7][(work) & 0x3f] - ^ Spbox[5][(work >> 8) & 0x3f] - ^ Spbox[3][(work >> 16) & 0x3f] - ^ Spbox[1][(work >> 24) & 0x3f]; - - work = rotrFixed(l, 4U) ^ kptr[4*i+2]; - r ^= Spbox[6][(work) & 0x3f] - ^ Spbox[4][(work >> 8) & 0x3f] - ^ Spbox[2][(work >> 16) & 0x3f] - ^ Spbox[0][(work >> 24) & 0x3f]; - work = l ^ kptr[4*i+3]; - r ^= Spbox[7][(work) & 0x3f] - ^ Spbox[5][(work >> 8) & 0x3f] - ^ Spbox[3][(work >> 16) & 0x3f] - ^ Spbox[1][(work >> 24) & 0x3f]; - } - - l_ = l; r_ = r; -} - -void DES_EDE2::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - m_des1.RawSetKey(GetCipherDirection(), userKey); - m_des2.RawSetKey(ReverseCipherDir(GetCipherDirection()), userKey+8); -} - -void DES_EDE2::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 l,r; - Block::Get(inBlock)(l)(r); - IPERM(l,r); - m_des1.RawProcessBlock(l, r); - m_des2.RawProcessBlock(r, l); - m_des1.RawProcessBlock(l, r); - FPERM(l,r); - Block::Put(xorBlock, outBlock)(r)(l); -} - -void DES_EDE3::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - m_des1.RawSetKey(GetCipherDirection(), userKey + (IsForwardTransformation() ? 0 : 16)); - m_des2.RawSetKey(ReverseCipherDir(GetCipherDirection()), userKey + 8); - m_des3.RawSetKey(GetCipherDirection(), userKey + (IsForwardTransformation() ? 16 : 0)); -} - -void DES_EDE3::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 l,r; - Block::Get(inBlock)(l)(r); - IPERM(l,r); - m_des1.RawProcessBlock(l, r); - m_des2.RawProcessBlock(r, l); - m_des3.RawProcessBlock(l, r); - FPERM(l,r); - Block::Put(xorBlock, outBlock)(r)(l); -} - -#endif // #ifndef CRYPTOPP_IMPORTS - -static inline bool CheckParity(byte b) -{ - unsigned int a = b ^ (b >> 4); - return ((a ^ (a>>1) ^ (a>>2) ^ (a>>3)) & 1) == 1; -} - -bool DES::CheckKeyParityBits(const byte *key) -{ - for (unsigned int i=0; i<8; i++) - if (!CheckParity(key[i])) - return false; - return true; -} - -void DES::CorrectKeyParityBits(byte *key) -{ - for (unsigned int i=0; i<8; i++) - if (!CheckParity(key[i])) - key[i] ^= 1; -} - -// Encrypt or decrypt a block of data in ECB mode -void DES::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 l,r; - Block::Get(inBlock)(l)(r); - IPERM(l,r); - RawProcessBlock(l, r); - FPERM(l,r); - Block::Put(xorBlock, outBlock)(r)(l); -} - -void DES_XEX3::Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - if (!m_des.get()) - m_des.reset(new DES::Encryption); - - memcpy(m_x1, key + (IsForwardTransformation() ? 0 : 16), BLOCKSIZE); - m_des->RawSetKey(GetCipherDirection(), key + 8); - memcpy(m_x3, key + (IsForwardTransformation() ? 16 : 0), BLOCKSIZE); -} - -void DES_XEX3::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - xorbuf(outBlock, inBlock, m_x1, BLOCKSIZE); - m_des->ProcessAndXorBlock(outBlock, xorBlock, outBlock); - xorbuf(outBlock, m_x3, BLOCKSIZE); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/des.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/des.h deleted file mode 100644 index 62f62882..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/des.h +++ /dev/null @@ -1,144 +0,0 @@ -#ifndef CRYPTOPP_DES_H -#define CRYPTOPP_DES_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -class CRYPTOPP_DLL RawDES -{ -public: - void RawSetKey(CipherDir direction, const byte *userKey); - void RawProcessBlock(word32 &l, word32 &r) const; - -protected: - static const word32 Spbox[8][64]; - - FixedSizeSecBlock k; -}; - -//! _ -struct DES_Info : public FixedBlockSize<8>, public FixedKeyLength<8> -{ - // disable DES in DLL version by not exporting this function - static const char * StaticAlgorithmName() {return "DES";} -}; - -/// DES -/*! The DES implementation in Crypto++ ignores the parity bits - (the least significant bits of each byte) in the key. However - you can use CheckKeyParityBits() and CorrectKeyParityBits() to - check or correct the parity bits if you wish. */ -class DES : public DES_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl, public RawDES - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - //! check DES key parity bits - static bool CheckKeyParityBits(const byte *key); - //! correct DES key parity bits - static void CorrectKeyParityBits(byte *key); - - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -//! _ -struct DES_EDE2_Info : public FixedBlockSize<8>, public FixedKeyLength<16> -{ - CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "DES-EDE2";} -}; - -/// DES-EDE2 -class DES_EDE2 : public DES_EDE2_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - RawDES m_des1, m_des2; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -//! _ -struct DES_EDE3_Info : public FixedBlockSize<8>, public FixedKeyLength<24> -{ - CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "DES-EDE3";} -}; - -/// DES-EDE3 -class DES_EDE3 : public DES_EDE3_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - RawDES m_des1, m_des2, m_des3; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -//! _ -struct DES_XEX3_Info : public FixedBlockSize<8>, public FixedKeyLength<24> -{ - static const char *StaticAlgorithmName() {return "DES-XEX3";} -}; - -/// DES-XEX3, AKA DESX -class DES_XEX3 : public DES_XEX3_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - FixedSizeSecBlock m_x1, m_x3; - // VS2005 workaround: calling modules compiled with /clr gets unresolved external symbol DES::Base::ProcessAndXorBlock - // if we use DES::Encryption here directly without value_ptr. - value_ptr m_des; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef DES::Encryption DESEncryption; -typedef DES::Decryption DESDecryption; - -typedef DES_EDE2::Encryption DES_EDE2_Encryption; -typedef DES_EDE2::Decryption DES_EDE2_Decryption; - -typedef DES_EDE3::Encryption DES_EDE3_Encryption; -typedef DES_EDE3::Decryption DES_EDE3_Decryption; - -typedef DES_XEX3::Encryption DES_XEX3_Encryption; -typedef DES_XEX3::Decryption DES_XEX3_Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dessp.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dessp.cpp deleted file mode 100644 index 49ed1d26..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dessp.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// This file is mostly generated by Phil Karn's gensp.c - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "des.h" - -NAMESPACE_BEGIN(CryptoPP) - -// VC60 workaround: gives a C4786 warning without this function -// when runtime lib is set to multithread debug DLL -// even though warning 4786 is disabled! -void DES_VC60Workaround() -{ -} - -const word32 RawDES::Spbox[8][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}, -{ -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}, -{ -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}, -{ -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}, -{ -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}, -{ -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}, -{ -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}, -{ -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} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.cpp deleted file mode 100644 index 22097a05..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// dh.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "dh.h" - -NAMESPACE_BEGIN(CryptoPP) - -void DH_TestInstantiations() -{ - DH dh1; - DH dh2(NullRNG(), 10); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.h deleted file mode 100644 index 10e8d142..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef CRYPTOPP_DH_H -#define CRYPTOPP_DH_H - -/** \file -*/ - -#include "gfpcrypt.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! , -template -class DH_Domain : public DL_SimpleKeyAgreementDomainBase -{ - typedef DL_SimpleKeyAgreementDomainBase Base; - -public: - typedef GROUP_PARAMETERS GroupParameters; - typedef typename GroupParameters::Element Element; - typedef DL_KeyAgreementAlgorithm_DH DH_Algorithm; - typedef DH_Domain Domain; - - DH_Domain() {} - - DH_Domain(const GroupParameters ¶ms) - : m_groupParameters(params) {} - - DH_Domain(BufferedTransformation &bt) - {m_groupParameters.BERDecode(bt);} - - template - DH_Domain(RandomNumberGenerator &v1, const T2 &v2) - {m_groupParameters.Initialize(v1, v2);} - - template - DH_Domain(RandomNumberGenerator &v1, const T2 &v2, const T3 &v3) - {m_groupParameters.Initialize(v1, v2, v3);} - - template - DH_Domain(RandomNumberGenerator &v1, const T2 &v2, const T3 &v3, const T4 &v4) - {m_groupParameters.Initialize(v1, v2, v3, v4);} - - template - DH_Domain(const T1 &v1, const T2 &v2) - {m_groupParameters.Initialize(v1, v2);} - - template - DH_Domain(const T1 &v1, const T2 &v2, const T3 &v3) - {m_groupParameters.Initialize(v1, v2, v3);} - - template - DH_Domain(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4) - {m_groupParameters.Initialize(v1, v2, v3, v4);} - - const GroupParameters & GetGroupParameters() const {return m_groupParameters;} - GroupParameters & AccessGroupParameters() {return m_groupParameters;} - - void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - { - Base::GeneratePublicKey(rng, privateKey, publicKey); - - if (FIPS_140_2_ComplianceEnabled()) - { - SecByteBlock privateKey2(this->PrivateKeyLength()); - this->GeneratePrivateKey(rng, privateKey2); - - SecByteBlock publicKey2(this->PublicKeyLength()); - Base::GeneratePublicKey(rng, privateKey2, publicKey2); - - SecByteBlock agreedValue(this->AgreedValueLength()), agreedValue2(this->AgreedValueLength()); - bool agreed1 = this->Agree(agreedValue, privateKey, publicKey2); - bool agreed2 = this->Agree(agreedValue2, privateKey2, publicKey); - - if (!agreed1 || !agreed2 || agreedValue != agreedValue2) - throw SelfTestFailure(this->AlgorithmName() + ": pairwise consistency test failed"); - } - } - - static std::string CRYPTOPP_API StaticAlgorithmName() - {return GroupParameters::StaticAlgorithmNamePrefix() + DH_Algorithm::StaticAlgorithmName();} - std::string AlgorithmName() const {return StaticAlgorithmName();} - -private: - const DL_KeyAgreementAlgorithm & GetKeyAgreementAlgorithm() const - {return Singleton().Ref();} - DL_GroupParameters & AccessAbstractGroupParameters() - {return m_groupParameters;} - - GroupParameters m_groupParameters; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DH_Domain; - -//! Diffie-Hellman in GF(p) with key validation -typedef DH_Domain DH; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.cpp deleted file mode 100644 index 98175ee2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// dh2.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "dh2.h" - -NAMESPACE_BEGIN(CryptoPP) - -void DH2_TestInstantiations() -{ - DH2 dh(*(SimpleKeyAgreementDomain*)NULL); -} - -bool DH2::Agree(byte *agreedValue, - const byte *staticSecretKey, const byte *ephemeralSecretKey, - const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey, - bool validateStaticOtherPublicKey) const -{ - return d1.Agree(agreedValue, staticSecretKey, staticOtherPublicKey, validateStaticOtherPublicKey) - && d2.Agree(agreedValue+d1.AgreedValueLength(), ephemeralSecretKey, ephemeralOtherPublicKey, true); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.h deleted file mode 100644 index af9d342d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dh2.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CRYPTOPP_DH2_H -#define CRYPTOPP_DH2_H - -/** \file -*/ - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// Unified Diffie-Hellman -class DH2 : public AuthenticatedKeyAgreementDomain -{ -public: - DH2(SimpleKeyAgreementDomain &domain) - : d1(domain), d2(domain) {} - DH2(SimpleKeyAgreementDomain &staticDomain, SimpleKeyAgreementDomain &ephemeralDomain) - : d1(staticDomain), d2(ephemeralDomain) {} - - CryptoParameters & AccessCryptoParameters() {return d1.AccessCryptoParameters();} - - unsigned int AgreedValueLength() const - {return d1.AgreedValueLength() + d2.AgreedValueLength();} - - unsigned int StaticPrivateKeyLength() const - {return d1.PrivateKeyLength();} - unsigned int StaticPublicKeyLength() const - {return d1.PublicKeyLength();} - void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const - {d1.GeneratePrivateKey(rng, privateKey);} - void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - {d1.GeneratePublicKey(rng, privateKey, publicKey);} - void GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const - {d1.GenerateKeyPair(rng, privateKey, publicKey);} - - unsigned int EphemeralPrivateKeyLength() const - {return d2.PrivateKeyLength();} - unsigned int EphemeralPublicKeyLength() const - {return d2.PublicKeyLength();} - void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const - {d2.GeneratePrivateKey(rng, privateKey);} - void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - {d2.GeneratePublicKey(rng, privateKey, publicKey);} - void GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const - {d2.GenerateKeyPair(rng, privateKey, publicKey);} - - bool Agree(byte *agreedValue, - const byte *staticPrivateKey, const byte *ephemeralPrivateKey, - const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey, - bool validateStaticOtherPublicKey=true) const; - -protected: - SimpleKeyAgreementDomain &d1, &d2; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.cpp deleted file mode 100644 index 2b4ef7ad..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.cpp +++ /dev/null @@ -1,146 +0,0 @@ -// dll.cpp - written and placed in the public domain by Wei Dai - -#define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#define CRYPTOPP_DEFAULT_NO_DLL - -#include "dll.h" -#pragma warning(default: 4660) - -#if defined(CRYPTOPP_EXPORTS) && defined(CRYPTOPP_WIN32_AVAILABLE) -#include -#endif - -#ifndef CRYPTOPP_IMPORTS - -NAMESPACE_BEGIN(CryptoPP) - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x2d,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,0x05,0x00,0x04,0x1c}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x31,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,0x05,0x00,0x04,0x20}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x41,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,0x05,0x00,0x04,0x30}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x51,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,0x05,0x00,0x04,0x40}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte EMSA2HashId::id = 0x33; -template<> const byte EMSA2HashId::id = 0x38; -template<> const byte EMSA2HashId::id = 0x34; -template<> const byte EMSA2HashId::id = 0x36; -template<> const byte EMSA2HashId::id = 0x35; - -NAMESPACE_END - -#endif - -#ifdef CRYPTOPP_EXPORTS - -USING_NAMESPACE(CryptoPP) - -#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) -using std::set_new_handler; -#endif - -static PNew s_pNew = NULL; -static PDelete s_pDelete = NULL; - -static void * New (size_t size) -{ - void *p; - while (!(p = malloc(size))) - CallNewHandler(); - - return p; -} - -static void SetNewAndDeleteFunctionPointers() -{ - void *p = NULL; - HMODULE hModule = NULL; - MEMORY_BASIC_INFORMATION mbi; - - while (true) - { - VirtualQuery(p, &mbi, sizeof(mbi)); - - if (p >= (char *)mbi.BaseAddress + mbi.RegionSize) - break; - - p = (char *)mbi.BaseAddress + mbi.RegionSize; - - if (!mbi.AllocationBase || mbi.AllocationBase == hModule) - continue; - - hModule = HMODULE(mbi.AllocationBase); - - PGetNewAndDelete pGetNewAndDelete = (PGetNewAndDelete)GetProcAddress(hModule, "GetNewAndDeleteForCryptoPP"); - if (pGetNewAndDelete) - { - pGetNewAndDelete(s_pNew, s_pDelete); - return; - } - - PSetNewAndDelete pSetNewAndDelete = (PSetNewAndDelete)GetProcAddress(hModule, "SetNewAndDeleteFromCryptoPP"); - if (pSetNewAndDelete) - { - s_pNew = &New; - s_pDelete = &free; - pSetNewAndDelete(s_pNew, s_pDelete, &set_new_handler); - return; - } - } - - // try getting these directly using mangled names of new and delete operators - - hModule = GetModuleHandle("msvcrtd"); - if (!hModule) - hModule = GetModuleHandle("msvcrt"); - if (hModule) - { - // 32-bit versions - s_pNew = (PNew)GetProcAddress(hModule, "??2@YAPAXI@Z"); - s_pDelete = (PDelete)GetProcAddress(hModule, "??3@YAXPAX@Z"); - if (s_pNew && s_pDelete) - return; - - // 64-bit versions - s_pNew = (PNew)GetProcAddress(hModule, "??2@YAPEAX_K@Z"); - s_pDelete = (PDelete)GetProcAddress(hModule, "??3@YAXPEAX@Z"); - if (s_pNew && s_pDelete) - return; - } - - OutputDebugString("Crypto++ was not able to obtain new and delete function pointers.\n"); - throw 0; -} - -void * operator new (size_t size) -{ - if (!s_pNew) - SetNewAndDeleteFunctionPointers(); - - return s_pNew(size); -} - -void operator delete (void * p) -{ - s_pDelete(p); -} - -void * operator new [] (size_t size) -{ - return operator new (size); -} - -void operator delete [] (void * p) -{ - operator delete (p); -} - -#endif // #ifdef CRYPTOPP_EXPORTS diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.h deleted file mode 100644 index 5e42d46f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dll.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef CRYPTOPP_DLL_H -#define CRYPTOPP_DLL_H - -#if !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS) && !defined(CRYPTOPP_DEFAULT_NO_DLL) -#ifdef CRYPTOPP_CONFIG_H -#error To use the DLL version of Crypto++, this file must be included before any other Crypto++ header files. -#endif -#define CRYPTOPP_IMPORTS -#endif - -#include "aes.h" -#include "cbcmac.h" -#include "ccm.h" -#include "cmac.h" -#include "channels.h" -#include "des.h" -#include "dh.h" -#include "dsa.h" -#include "ec2n.h" -#include "eccrypto.h" -#include "ecp.h" -#include "files.h" -#include "fips140.h" -#include "gcm.h" -#include "hex.h" -#include "hmac.h" -#include "modes.h" -#include "mqueue.h" -#include "nbtheory.h" -#include "osrng.h" -#include "pkcspad.h" -#include "pssr.h" -#include "randpool.h" -#include "rsa.h" -#include "rw.h" -#include "sha.h" -#include "skipjack.h" -#include "trdlocal.h" - -#ifdef CRYPTOPP_IMPORTS - -#ifdef _DLL -// cause CRT DLL to be initialized before Crypto++ so that we can use malloc and free during DllMain() -#ifdef NDEBUG -#pragma comment(lib, "msvcrt") -#else -#pragma comment(lib, "msvcrtd") -#endif -#endif - -#pragma comment(lib, "cryptopp") - -#endif // #ifdef CRYPTOPP_IMPORTS - -#include // for new_handler - -NAMESPACE_BEGIN(CryptoPP) - -#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) -using std::new_handler; -#endif - -typedef void * (CRYPTOPP_API * PNew)(size_t); -typedef void (CRYPTOPP_API * PDelete)(void *); -typedef void (CRYPTOPP_API * PGetNewAndDelete)(PNew &, PDelete &); -typedef new_handler (CRYPTOPP_API * PSetNewHandler)(new_handler); -typedef void (CRYPTOPP_API * PSetNewAndDelete)(PNew, PDelete, PSetNewHandler); - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.cpp deleted file mode 100644 index 4afd305b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#ifndef CRYPTOPP_DLL_ONLY -#define CRYPTOPP_DEFAULT_NO_DLL -#endif - -#include "dll.h" - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -void FIPS140_SampleApplication() -{ - if (!FIPS_140_2_ComplianceEnabled()) - { - cerr << "FIPS 140-2 compliance was turned off at compile time.\n"; - abort(); - } - - // check self test status - if (GetPowerUpSelfTestStatus() != POWER_UP_SELF_TEST_PASSED) - { - cerr << "Automatic power-up self test failed.\n"; - abort(); - } - cout << "0. Automatic power-up self test passed.\n"; - - // simulate a power-up self test error - SimulatePowerUpSelfTestFailure(); - try - { - // trying to use a crypto algorithm after power-up self test error will result in an exception - AES::Encryption aes; - - // should not be here - cerr << "Use of AES failed to cause an exception after power-up self test error.\n"; - abort(); - } - catch (SelfTestFailure &e) - { - cout << "1. Caught expected exception when simulating self test failure. Exception message follows: "; - cout << e.what() << endl; - } - - // clear the self test error state and redo power-up self test - DoDllPowerUpSelfTest(); - if (GetPowerUpSelfTestStatus() != POWER_UP_SELF_TEST_PASSED) - { - cerr << "Re-do power-up self test failed.\n"; - abort(); - } - cout << "2. Re-do power-up self test passed.\n"; - - // encrypt and decrypt - const byte key[] = {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; - const byte iv[] = {0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef}; - const byte plaintext[] = { // "Now is the time for all " without tailing 0 - 0x4e,0x6f,0x77,0x20,0x69,0x73,0x20,0x74, - 0x68,0x65,0x20,0x74,0x69,0x6d,0x65,0x20, - 0x66,0x6f,0x72,0x20,0x61,0x6c,0x6c,0x20}; - byte ciphertext[24]; - byte decrypted[24]; - - CFB_FIPS_Mode::Encryption encryption_DES_EDE3_CFB; - encryption_DES_EDE3_CFB.SetKeyWithIV(key, sizeof(key), iv); - encryption_DES_EDE3_CFB.ProcessString(ciphertext, plaintext, 24); - - CFB_FIPS_Mode::Decryption decryption_DES_EDE3_CFB; - decryption_DES_EDE3_CFB.SetKeyWithIV(key, sizeof(key), iv); - decryption_DES_EDE3_CFB.ProcessString(decrypted, ciphertext, 24); - - if (memcmp(plaintext, decrypted, 24) != 0) - { - cerr << "DES-EDE3-CFB Encryption/decryption failed.\n"; - abort(); - } - cout << "3. DES-EDE3-CFB Encryption/decryption succeeded.\n"; - - // hash - const byte message[] = {'a', 'b', 'c'}; - const byte expectedDigest[] = {0xA9,0x99,0x3E,0x36,0x47,0x06,0x81,0x6A,0xBA,0x3E,0x25,0x71,0x78,0x50,0xC2,0x6C,0x9C,0xD0,0xD8,0x9D}; - byte digest[20]; - - SHA1 sha; - sha.Update(message, 3); - sha.Final(digest); - - if (memcmp(digest, expectedDigest, 20) != 0) - { - cerr << "SHA-1 hash failed.\n"; - abort(); - } - cout << "4. SHA-1 hash succeeded.\n"; - - // create auto-seeded X9.17 RNG object, if available -#ifdef OS_RNG_AVAILABLE - AutoSeededX917RNG rng; -#else - // this is used to allow this function to compile on platforms that don't have auto-seeded RNGs - RandomNumberGenerator &rng(NullRNG()); -#endif - - // generate DSA key - DSA::PrivateKey dsaPrivateKey; - dsaPrivateKey.GenerateRandomWithKeySize(rng, 1024); - DSA::PublicKey dsaPublicKey; - dsaPublicKey.AssignFrom(dsaPrivateKey); - if (!dsaPrivateKey.Validate(rng, 3) || !dsaPublicKey.Validate(rng, 3)) - { - cerr << "DSA key generation failed.\n"; - abort(); - } - cout << "5. DSA key generation succeeded.\n"; - - // encode DSA key - std::string encodedDsaPublicKey, encodedDsaPrivateKey; - dsaPublicKey.DEREncode(StringSink(encodedDsaPublicKey).Ref()); - dsaPrivateKey.DEREncode(StringSink(encodedDsaPrivateKey).Ref()); - - // decode DSA key - DSA::PrivateKey decodedDsaPrivateKey; - decodedDsaPrivateKey.BERDecode(StringStore(encodedDsaPrivateKey).Ref()); - DSA::PublicKey decodedDsaPublicKey; - decodedDsaPublicKey.BERDecode(StringStore(encodedDsaPublicKey).Ref()); - - if (!decodedDsaPrivateKey.Validate(rng, 3) || !decodedDsaPublicKey.Validate(rng, 3)) - { - cerr << "DSA key encode/decode failed.\n"; - abort(); - } - cout << "6. DSA key encode/decode succeeded.\n"; - - // sign and verify - byte signature[40]; - DSA::Signer signer(dsaPrivateKey); - assert(signer.SignatureLength() == 40); - signer.SignMessage(rng, message, 3, signature); - - DSA::Verifier verifier(dsaPublicKey); - if (!verifier.VerifyMessage(message, 3, signature, sizeof(signature))) - { - cerr << "DSA signature and verification failed.\n"; - abort(); - } - cout << "7. DSA signature and verification succeeded.\n"; - - - // try to verify an invalid signature - signature[0] ^= 1; - if (verifier.VerifyMessage(message, 3, signature, sizeof(signature))) - { - cerr << "DSA signature verification failed to detect bad signature.\n"; - abort(); - } - cout << "8. DSA signature verification successfully detected bad signature.\n"; - - // try to use an invalid key length - try - { - ECB_Mode::Encryption encryption_DES_EDE3_ECB; - encryption_DES_EDE3_ECB.SetKey(key, 5); - - // should not be here - cerr << "DES-EDE3 implementation did not detect use of invalid key length.\n"; - abort(); - } - catch (InvalidArgument &e) - { - cout << "9. Caught expected exception when using invalid key length. Exception message follows: "; - cout << e.what() << endl; - } - - cout << "\nFIPS 140-2 Sample Application completed normally.\n"; -} - -#ifdef CRYPTOPP_IMPORTS - -static PNew s_pNew = NULL; -static PDelete s_pDelete = NULL; - -extern "C" __declspec(dllexport) void __cdecl SetNewAndDeleteFromCryptoPP(PNew pNew, PDelete pDelete, PSetNewHandler pSetNewHandler) -{ - s_pNew = pNew; - s_pDelete = pDelete; -} - -void * __cdecl operator new (size_t size) -{ - return s_pNew(size); -} - -void __cdecl operator delete (void * p) -{ - s_pDelete(p); -} - -#endif - -#ifdef CRYPTOPP_DLL_ONLY - -int __cdecl main() -{ - FIPS140_SampleApplication(); - return 0; -} - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.dsp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.dsp deleted file mode 100644 index b980b7f8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.dsp +++ /dev/null @@ -1,90 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dlltest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=dlltest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dlltest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dlltest.mak" CFG="dlltest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dlltest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "dlltest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dlltest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "dlltest___Win32_Release" -# PROP BASE Intermediate_Dir "dlltest___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "dlltest___Win32_Release" -# PROP Intermediate_Dir "dlltest___Win32_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CRYPTOPP_DLL_ONLY" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /map /debug /machine:I386 /out:"DLL_Release/dlltest.exe" /libpath:"DLL_Release" - -!ELSEIF "$(CFG)" == "dlltest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "dlltest___Win32_Debug" -# PROP BASE Intermediate_Dir "dlltest___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "dlltest___Win32_Debug" -# PROP Intermediate_Dir "dlltest___Win32_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MTd /W3 /Gm /GR /GX /Zi /Oi /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CRYPTOPP_DLL_ONLY" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Debug/dlltest.exe" /pdbtype:sept /libpath:"DLL_Debug" - -!ENDIF - -# Begin Target - -# Name "dlltest - Win32 Release" -# Name "dlltest - Win32 Debug" -# Begin Source File - -SOURCE=.\dlltest.cpp -# End Source File -# End Target -# End Project diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.vcproj b/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.vcproj deleted file mode 100644 index 1e697d10..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dlltest.vcproj +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dmac.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/dmac.h deleted file mode 100644 index 80b54ac2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dmac.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef CRYPTOPP_DMAC_H -#define CRYPTOPP_DMAC_H - -#include "cbcmac.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -class CRYPTOPP_NO_VTABLE DMAC_Base : public SameKeyLengthAs, public MessageAuthenticationCode -{ -public: - static std::string StaticAlgorithmName() {return std::string("DMAC(") + T::StaticAlgorithmName() + ")";} - - CRYPTOPP_CONSTANT(DIGESTSIZE=T::BLOCKSIZE) - - DMAC_Base() {} - - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *mac, size_t size); - unsigned int DigestSize() const {return DIGESTSIZE;} - -private: - byte *GenerateSubKeys(const byte *key, size_t keylength); - - size_t m_subkeylength; - SecByteBlock m_subkeys; - CBC_MAC m_mac1; - typename T::Encryption m_f2; - unsigned int m_counter; -}; - -//! DMAC -/*! Based on "CBC MAC for Real-Time Data Sources" by Erez Petrank - and Charles Rackoff. T should be a class derived from BlockCipherDocumentation. -*/ -template -class DMAC : public MessageAuthenticationCodeFinal > -{ -public: - DMAC() {} - DMAC(const byte *key, size_t length=DMAC_Base::DEFAULT_KEYLENGTH) - {this->SetKey(key, length);} -}; - -template -void DMAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - m_subkeylength = T::StaticGetValidKeyLength(T::BLOCKSIZE); - m_subkeys.resize(2*UnsignedMin((unsigned int)T::BLOCKSIZE, m_subkeylength)); - m_mac1.SetKey(GenerateSubKeys(key, length), m_subkeylength, params); - m_f2.SetKey(m_subkeys+m_subkeys.size()/2, m_subkeylength, params); - m_counter = 0; - m_subkeys.resize(0); -} - -template -void DMAC_Base::Update(const byte *input, size_t length) -{ - m_mac1.Update(input, length); - m_counter = (unsigned int)((m_counter + length) % T::BLOCKSIZE); -} - -template -void DMAC_Base::TruncatedFinal(byte *mac, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - byte pad[T::BLOCKSIZE]; - byte padByte = byte(T::BLOCKSIZE-m_counter); - memset(pad, padByte, padByte); - m_mac1.Update(pad, padByte); - m_mac1.TruncatedFinal(mac, size); - m_f2.ProcessBlock(mac); - - m_counter = 0; // reset for next message -} - -template -byte *DMAC_Base::GenerateSubKeys(const byte *key, size_t keylength) -{ - typename T::Encryption cipher(key, keylength); - memset(m_subkeys, 0, m_subkeys.size()); - cipher.ProcessBlock(m_subkeys); - m_subkeys[m_subkeys.size()/2 + T::BLOCKSIZE - 1] = 1; - cipher.ProcessBlock(m_subkeys+m_subkeys.size()/2); - return m_subkeys; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.cpp deleted file mode 100644 index ac9e1f8c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.cpp +++ /dev/null @@ -1,119 +0,0 @@ -// dsa.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "dsa.h" -#include "nbtheory.h" - -NAMESPACE_BEGIN(CryptoPP) - -size_t DSAConvertSignatureFormat(byte *buffer, size_t bufferSize, DSASignatureFormat toFormat, const byte *signature, size_t signatureLen, DSASignatureFormat fromFormat) -{ - Integer r, s; - StringStore store(signature, signatureLen); - ArraySink sink(buffer, bufferSize); - - switch (fromFormat) - { - case DSA_P1363: - r.Decode(store, signatureLen/2); - s.Decode(store, signatureLen/2); - break; - case DSA_DER: - { - BERSequenceDecoder seq(store); - r.BERDecode(seq); - s.BERDecode(seq); - seq.MessageEnd(); - break; - } - case DSA_OPENPGP: - r.OpenPGPDecode(store); - s.OpenPGPDecode(store); - break; - } - - switch (toFormat) - { - case DSA_P1363: - r.Encode(sink, bufferSize/2); - s.Encode(sink, bufferSize/2); - break; - case DSA_DER: - { - DERSequenceEncoder seq(sink); - r.DEREncode(seq); - s.DEREncode(seq); - seq.MessageEnd(); - break; - } - case DSA_OPENPGP: - r.OpenPGPEncode(sink); - s.OpenPGPEncode(sink); - break; - } - - return (size_t)sink.TotalPutLength(); -} - -bool DSA::GeneratePrimes(const byte *seedIn, unsigned int g, int &counter, - Integer &p, unsigned int L, Integer &q, bool useInputCounterValue) -{ - assert(g%8 == 0); - - SHA sha; - SecByteBlock seed(seedIn, g/8); - SecByteBlock U(SHA::DIGESTSIZE); - SecByteBlock temp(SHA::DIGESTSIZE); - SecByteBlock W(((L-1)/160+1) * SHA::DIGESTSIZE); - const int n = (L-1) / 160; - const int b = (L-1) % 160; - Integer X; - - sha.CalculateDigest(U, seed, g/8); - - for (int i=g/8-1, carry=true; i>=0 && carry; i--) - carry=!++seed[i]; - - sha.CalculateDigest(temp, seed, g/8); - xorbuf(U, temp, SHA::DIGESTSIZE); - - U[0] |= 0x80; - U[SHA::DIGESTSIZE-1] |= 1; - q.Decode(U, SHA::DIGESTSIZE); - - if (!IsPrime(q)) - return false; - - int counterEnd = useInputCounterValue ? counter+1 : 4096; - - for (int c = 0; c < counterEnd; c++) - { - for (int k=0; k<=n; k++) - { - for (int i=g/8-1, carry=true; i>=0 && carry; i--) - carry=!++seed[i]; - if (!useInputCounterValue || c == counter) - sha.CalculateDigest(W+(n-k)*SHA::DIGESTSIZE, seed, g/8); - } - if (!useInputCounterValue || c == counter) - { - W[SHA::DIGESTSIZE - 1 - b/8] |= 0x80; - X.Decode(W + SHA::DIGESTSIZE - 1 - b/8, L/8); - p = X-((X % (2*q))-1); - - if (p.GetBit(L-1) && IsPrime(p)) - { - counter = c; - return true; - } - } - } - return false; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.h deleted file mode 100644 index 6ae03877..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/dsa.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef CRYPTOPP_DSA_H -#define CRYPTOPP_DSA_H - -/** \file -*/ - -#include "gfpcrypt.h" - -NAMESPACE_BEGIN(CryptoPP) - -/*! The DSA signature format used by Crypto++ is as defined by IEEE P1363. - Java uses the DER format, and OpenPGP uses the OpenPGP format. */ -enum DSASignatureFormat {DSA_P1363, DSA_DER, DSA_OPENPGP}; -/** This function converts between these formats, and returns length of signature in the target format. - If toFormat == DSA_P1363, bufferSize must equal publicKey.SignatureLength() */ -size_t DSAConvertSignatureFormat(byte *buffer, size_t bufferSize, DSASignatureFormat toFormat, - const byte *signature, size_t signatureLen, DSASignatureFormat fromFormat); - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - -typedef DSA::Signer DSAPrivateKey; -typedef DSA::Verifier DSAPublicKey; - -const int MIN_DSA_PRIME_LENGTH = DSA::MIN_PRIME_LENGTH; -const int MAX_DSA_PRIME_LENGTH = DSA::MAX_PRIME_LENGTH; -const int DSA_PRIME_LENGTH_MULTIPLE = DSA::PRIME_LENGTH_MULTIPLE; - -inline bool GenerateDSAPrimes(const byte *seed, size_t seedLength, int &counter, Integer &p, unsigned int primeLength, Integer &q) - {return DSA::GeneratePrimes(seed, seedLength, counter, p, primeLength, q);} - -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.cpp deleted file mode 100644 index cf836632..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// eax.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "eax.h" - -NAMESPACE_BEGIN(CryptoPP) - -void EAX_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms) -{ - AccessMAC().SetKey(userKey, keylength, params); - m_buffer.New(2*AccessMAC().TagSize()); -} - -void EAX_Base::Resync(const byte *iv, size_t len) -{ - MessageAuthenticationCode &mac = AccessMAC(); - unsigned int blockSize = mac.TagSize(); - - memset(m_buffer, 0, blockSize); - mac.Update(m_buffer, blockSize); - mac.CalculateDigest(m_buffer+blockSize, iv, len); - - m_buffer[blockSize-1] = 1; - mac.Update(m_buffer, blockSize); - - m_ctr.SetCipherWithIV(AccessMAC().AccessCipher(), m_buffer+blockSize, blockSize); -} - -size_t EAX_Base::AuthenticateBlocks(const byte *data, size_t len) -{ - AccessMAC().Update(data, len); - return 0; -} - -void EAX_Base::AuthenticateLastHeaderBlock() -{ - assert(m_bufferedDataLength == 0); - MessageAuthenticationCode &mac = AccessMAC(); - unsigned int blockSize = mac.TagSize(); - - mac.Final(m_buffer); - xorbuf(m_buffer+blockSize, m_buffer, blockSize); - - memset(m_buffer, 0, blockSize); - m_buffer[blockSize-1] = 2; - mac.Update(m_buffer, blockSize); -} - -void EAX_Base::AuthenticateLastFooterBlock(byte *tag, size_t macSize) -{ - assert(m_bufferedDataLength == 0); - MessageAuthenticationCode &mac = AccessMAC(); - unsigned int blockSize = mac.TagSize(); - - mac.TruncatedFinal(m_buffer, macSize); - xorbuf(tag, m_buffer, m_buffer+blockSize, macSize); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.h deleted file mode 100644 index e48ee92b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eax.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef CRYPTOPP_EAX_H -#define CRYPTOPP_EAX_H - -#include "authenc.h" -#include "modes.h" -#include "cmac.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! . -class CRYPTOPP_NO_VTABLE EAX_Base : public AuthenticatedSymmetricCipherBase -{ -public: - // AuthenticatedSymmetricCipher - std::string AlgorithmName() const - {return GetMAC().GetCipher().AlgorithmName() + std::string("/EAX");} - size_t MinKeyLength() const - {return GetMAC().MinKeyLength();} - size_t MaxKeyLength() const - {return GetMAC().MaxKeyLength();} - size_t DefaultKeyLength() const - {return GetMAC().DefaultKeyLength();} - size_t GetValidKeyLength(size_t n) const - {return GetMAC().GetValidKeyLength(n);} - bool IsValidKeyLength(size_t n) const - {return GetMAC().IsValidKeyLength(n);} - unsigned int OptimalDataAlignment() const - {return GetMAC().OptimalDataAlignment();} - IV_Requirement IVRequirement() const - {return UNIQUE_IV;} - unsigned int IVSize() const - {return GetMAC().TagSize();} - unsigned int MinIVLength() const - {return 0;} - unsigned int MaxIVLength() const - {return UINT_MAX;} - unsigned int DigestSize() const - {return GetMAC().TagSize();} - lword MaxHeaderLength() const - {return LWORD_MAX;} - lword MaxMessageLength() const - {return LWORD_MAX;} - -protected: - // AuthenticatedSymmetricCipherBase - bool AuthenticationIsOnPlaintext() const - {return false;} - unsigned int AuthenticationBlockSize() const - {return 1;} - void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms); - void Resync(const byte *iv, size_t len); - size_t AuthenticateBlocks(const byte *data, size_t len); - void AuthenticateLastHeaderBlock(); - void AuthenticateLastFooterBlock(byte *mac, size_t macSize); - SymmetricCipher & AccessSymmetricCipher() {return m_ctr;} - const CMAC_Base & GetMAC() const {return const_cast(this)->AccessMAC();} - virtual CMAC_Base & AccessMAC() =0; - - CTR_Mode_ExternalCipher::Encryption m_ctr; -}; - -//! . -template -class EAX_Final : public EAX_Base -{ -public: - static std::string StaticAlgorithmName() - {return T_BlockCipher::StaticAlgorithmName() + std::string("/EAX");} - bool IsForwardTransformation() const - {return T_IsEncryption;} - -private: - CMAC_Base & AccessMAC() {return m_cmac;} - CMAC m_cmac; -}; - -#ifdef EAX // EAX is defined to 11 on GCC 3.4.3, OpenSolaris 8.11 -#undef EAX -#endif - -/// EAX -template -struct EAX : public AuthenticatedSymmetricCipherDocumentation -{ - typedef EAX_Final Encryption; - typedef EAX_Final Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.cpp deleted file mode 100644 index b513b2cb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.cpp +++ /dev/null @@ -1,292 +0,0 @@ -// ec2n.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "ec2n.h" -#include "asn.h" - -#include "algebra.cpp" -#include "eprecomp.cpp" - -NAMESPACE_BEGIN(CryptoPP) - -EC2N::EC2N(BufferedTransformation &bt) - : m_field(BERDecodeGF2NP(bt)) -{ - BERSequenceDecoder seq(bt); - m_field->BERDecodeElement(seq, m_a); - m_field->BERDecodeElement(seq, m_b); - // skip optional seed - if (!seq.EndReached()) - { - SecByteBlock seed; - unsigned int unused; - BERDecodeBitString(seq, seed, unused); - } - seq.MessageEnd(); -} - -void EC2N::DEREncode(BufferedTransformation &bt) const -{ - m_field->DEREncode(bt); - DERSequenceEncoder seq(bt); - m_field->DEREncodeElement(seq, m_a); - m_field->DEREncodeElement(seq, m_b); - seq.MessageEnd(); -} - -bool EC2N::DecodePoint(EC2N::Point &P, const byte *encodedPoint, size_t encodedPointLen) const -{ - StringStore store(encodedPoint, encodedPointLen); - return DecodePoint(P, store, encodedPointLen); -} - -bool EC2N::DecodePoint(EC2N::Point &P, BufferedTransformation &bt, size_t encodedPointLen) const -{ - byte type; - if (encodedPointLen < 1 || !bt.Get(type)) - return false; - - switch (type) - { - case 0: - P.identity = true; - return true; - case 2: - case 3: - { - if (encodedPointLen != EncodedPointSize(true)) - return false; - - P.identity = false; - P.x.Decode(bt, m_field->MaxElementByteLength()); - - if (P.x.IsZero()) - { - P.y = m_field->SquareRoot(m_b); - return true; - } - - FieldElement z = m_field->Square(P.x); - assert(P.x == m_field->SquareRoot(z)); - P.y = m_field->Divide(m_field->Add(m_field->Multiply(z, m_field->Add(P.x, m_a)), m_b), z); - assert(P.x == m_field->Subtract(m_field->Divide(m_field->Subtract(m_field->Multiply(P.y, z), m_b), z), m_a)); - z = m_field->SolveQuadraticEquation(P.y); - assert(m_field->Add(m_field->Square(z), z) == P.y); - z.SetCoefficient(0, type & 1); - - P.y = m_field->Multiply(z, P.x); - return true; - } - case 4: - { - if (encodedPointLen != EncodedPointSize(false)) - return false; - - unsigned int len = m_field->MaxElementByteLength(); - P.identity = false; - P.x.Decode(bt, len); - P.y.Decode(bt, len); - return true; - } - default: - return false; - } -} - -void EC2N::EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const -{ - if (P.identity) - NullStore().TransferTo(bt, EncodedPointSize(compressed)); - else if (compressed) - { - bt.Put(2 + (!P.x ? 0 : m_field->Divide(P.y, P.x).GetBit(0))); - P.x.Encode(bt, m_field->MaxElementByteLength()); - } - else - { - unsigned int len = m_field->MaxElementByteLength(); - bt.Put(4); // uncompressed - P.x.Encode(bt, len); - P.y.Encode(bt, len); - } -} - -void EC2N::EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const -{ - ArraySink sink(encodedPoint, EncodedPointSize(compressed)); - EncodePoint(sink, P, compressed); - assert(sink.TotalPutLength() == EncodedPointSize(compressed)); -} - -EC2N::Point EC2N::BERDecodePoint(BufferedTransformation &bt) const -{ - SecByteBlock str; - BERDecodeOctetString(bt, str); - Point P; - if (!DecodePoint(P, str, str.size())) - BERDecodeError(); - return P; -} - -void EC2N::DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const -{ - SecByteBlock str(EncodedPointSize(compressed)); - EncodePoint(str, P, compressed); - DEREncodeOctetString(bt, str); -} - -bool EC2N::ValidateParameters(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = !!m_b; - pass = pass && m_a.CoefficientCount() <= m_field->MaxElementBitLength(); - pass = pass && m_b.CoefficientCount() <= m_field->MaxElementBitLength(); - - if (level >= 1) - pass = pass && m_field->GetModulus().IsIrreducible(); - - return pass; -} - -bool EC2N::VerifyPoint(const Point &P) const -{ - const FieldElement &x = P.x, &y = P.y; - return P.identity || - (x.CoefficientCount() <= m_field->MaxElementBitLength() - && y.CoefficientCount() <= m_field->MaxElementBitLength() - && !(((x+m_a)*x*x+m_b-(x+y)*y)%m_field->GetModulus())); -} - -bool EC2N::Equal(const Point &P, const Point &Q) const -{ - if (P.identity && Q.identity) - return true; - - if (P.identity && !Q.identity) - return false; - - if (!P.identity && Q.identity) - return false; - - return (m_field->Equal(P.x,Q.x) && m_field->Equal(P.y,Q.y)); -} - -const EC2N::Point& EC2N::Identity() const -{ - return Singleton().Ref(); -} - -const EC2N::Point& EC2N::Inverse(const Point &P) const -{ - if (P.identity) - return P; - else - { - m_R.identity = false; - m_R.y = m_field->Add(P.x, P.y); - m_R.x = P.x; - return m_R; - } -} - -const EC2N::Point& EC2N::Add(const Point &P, const Point &Q) const -{ - if (P.identity) return Q; - if (Q.identity) return P; - if (Equal(P, Q)) return Double(P); - if (m_field->Equal(P.x, Q.x) && m_field->Equal(P.y, m_field->Add(Q.x, Q.y))) return Identity(); - - FieldElement t = m_field->Add(P.y, Q.y); - t = m_field->Divide(t, m_field->Add(P.x, Q.x)); - FieldElement x = m_field->Square(t); - m_field->Accumulate(x, t); - m_field->Accumulate(x, Q.x); - m_field->Accumulate(x, m_a); - m_R.y = m_field->Add(P.y, m_field->Multiply(t, x)); - m_field->Accumulate(x, P.x); - m_field->Accumulate(m_R.y, x); - - m_R.x.swap(x); - m_R.identity = false; - return m_R; -} - -const EC2N::Point& EC2N::Double(const Point &P) const -{ - if (P.identity) return P; - if (!m_field->IsUnit(P.x)) return Identity(); - - FieldElement t = m_field->Divide(P.y, P.x); - m_field->Accumulate(t, P.x); - m_R.y = m_field->Square(P.x); - m_R.x = m_field->Square(t); - m_field->Accumulate(m_R.x, t); - m_field->Accumulate(m_R.x, m_a); - m_field->Accumulate(m_R.y, m_field->Multiply(t, m_R.x)); - m_field->Accumulate(m_R.y, m_R.x); - - m_R.identity = false; - return m_R; -} - -// ******************************************************** - -/* -EcPrecomputation& EcPrecomputation::operator=(const EcPrecomputation &rhs) -{ - m_ec = rhs.m_ec; - m_ep = rhs.m_ep; - m_ep.m_group = m_ec.get(); - return *this; -} - -void EcPrecomputation::SetCurveAndBase(const EC2N &ec, const EC2N::Point &base) -{ - m_ec.reset(new EC2N(ec)); - m_ep.SetGroupAndBase(*m_ec, base); -} - -void EcPrecomputation::Precompute(unsigned int maxExpBits, unsigned int storage) -{ - m_ep.Precompute(maxExpBits, storage); -} - -void EcPrecomputation::Load(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - word32 version; - BERDecodeUnsigned(seq, version, INTEGER, 1, 1); - m_ep.m_exponentBase.BERDecode(seq); - m_ep.m_windowSize = m_ep.m_exponentBase.BitCount() - 1; - m_ep.m_bases.clear(); - while (!seq.EndReached()) - m_ep.m_bases.push_back(m_ec->BERDecodePoint(seq)); - seq.MessageEnd(); -} - -void EcPrecomputation::Save(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - DEREncodeUnsigned(seq, 1); // version - m_ep.m_exponentBase.DEREncode(seq); - for (unsigned i=0; iDEREncodePoint(seq, m_ep.m_bases[i]); - seq.MessageEnd(); -} - -EC2N::Point EcPrecomputation::Exponentiate(const Integer &exponent) const -{ - return m_ep.Exponentiate(exponent); -} - -EC2N::Point EcPrecomputation::CascadeExponentiate(const Integer &exponent, const DL_FixedBasePrecomputation &pc2, const Integer &exponent2) const -{ - return m_ep.CascadeExponentiate(exponent, static_cast &>(pc2).m_ep, exponent2); -} -*/ - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.h deleted file mode 100644 index ae4007cd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ec2n.h +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef CRYPTOPP_EC2N_H -#define CRYPTOPP_EC2N_H - -#include "gf2n.h" -#include "eprecomp.h" -#include "smartptr.h" -#include "pubkey.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Elliptic Curve Point -struct CRYPTOPP_DLL EC2NPoint -{ - EC2NPoint() : identity(true) {} - EC2NPoint(const PolynomialMod2 &x, const PolynomialMod2 &y) - : identity(false), x(x), y(y) {} - - bool operator==(const EC2NPoint &t) const - {return (identity && t.identity) || (!identity && !t.identity && x==t.x && y==t.y);} - bool operator< (const EC2NPoint &t) const - {return identity ? !t.identity : (!t.identity && (x; - -//! Elliptic Curve over GF(2^n) -class CRYPTOPP_DLL EC2N : public AbstractGroup -{ -public: - typedef GF2NP Field; - typedef Field::Element FieldElement; - typedef EC2NPoint Point; - - EC2N() {} - EC2N(const Field &field, const Field::Element &a, const Field::Element &b) - : m_field(field), m_a(a), m_b(b) {} - // construct from BER encoded parameters - // this constructor will decode and extract the the fields fieldID and curve of the sequence ECParameters - EC2N(BufferedTransformation &bt); - - // encode the fields fieldID and curve of the sequence ECParameters - void DEREncode(BufferedTransformation &bt) const; - - bool Equal(const Point &P, const Point &Q) const; - const Point& Identity() const; - const Point& Inverse(const Point &P) const; - bool InversionIsFast() const {return true;} - const Point& Add(const Point &P, const Point &Q) const; - const Point& Double(const Point &P) const; - - Point Multiply(const Integer &k, const Point &P) const - {return ScalarMultiply(P, k);} - Point CascadeMultiply(const Integer &k1, const Point &P, const Integer &k2, const Point &Q) const - {return CascadeScalarMultiply(P, k1, Q, k2);} - - bool ValidateParameters(RandomNumberGenerator &rng, unsigned int level=3) const; - bool VerifyPoint(const Point &P) const; - - unsigned int EncodedPointSize(bool compressed = false) const - {return 1 + (compressed?1:2)*m_field->MaxElementByteLength();} - // returns false if point is compressed and not valid (doesn't check if uncompressed) - bool DecodePoint(Point &P, BufferedTransformation &bt, size_t len) const; - bool DecodePoint(Point &P, const byte *encodedPoint, size_t len) const; - void EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const; - void EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const; - - Point BERDecodePoint(BufferedTransformation &bt) const; - void DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const; - - Integer FieldSize() const {return Integer::Power2(m_field->MaxElementBitLength());} - const Field & GetField() const {return *m_field;} - const FieldElement & GetA() const {return m_a;} - const FieldElement & GetB() const {return m_b;} - - bool operator==(const EC2N &rhs) const - {return GetField() == rhs.GetField() && m_a == rhs.m_a && m_b == rhs.m_b;} - -private: - clonable_ptr m_field; - FieldElement m_a, m_b; - mutable Point m_R; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupPrecomputation; - -template class EcPrecomputation; - -//! EC2N precomputation -template<> class EcPrecomputation : public DL_GroupPrecomputation -{ -public: - typedef EC2N EllipticCurve; - - // DL_GroupPrecomputation - const AbstractGroup & GetGroup() const {return m_ec;} - Element BERDecodeElement(BufferedTransformation &bt) const {return m_ec.BERDecodePoint(bt);} - void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {m_ec.DEREncodePoint(bt, v, false);} - - // non-inherited - void SetCurve(const EC2N &ec) {m_ec = ec;} - const EC2N & GetCurve() const {return m_ec;} - -private: - EC2N m_ec; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.cpp deleted file mode 100644 index fd8462fd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.cpp +++ /dev/null @@ -1,694 +0,0 @@ -// eccrypto.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "eccrypto.h" -#include "nbtheory.h" -#include "oids.h" -#include "hex.h" -#include "argnames.h" -#include "ec2n.h" - -NAMESPACE_BEGIN(CryptoPP) - -#if 0 -static void ECDSA_TestInstantiations() -{ - ECDSA::Signer t1; - ECDSA::Verifier t2(t1); - ECNR::Signer t3; - ECNR::Verifier t4(t3); - ECIES::Encryptor t5; - ECIES::Decryptor t6; - ECDH::Domain t7; - ECMQV::Domain t8; -} -#endif - -// VC60 workaround: complains when these functions are put into an anonymous namespace -static Integer ConvertToInteger(const PolynomialMod2 &x) -{ - unsigned int l = x.ByteCount(); - SecByteBlock temp(l); - x.Encode(temp, l); - return Integer(temp, l); -} - -static inline Integer ConvertToInteger(const Integer &x) -{ - return x; -} - -static bool CheckMOVCondition(const Integer &q, const Integer &r) -{ - // see "Updated standards for validating elliptic curves", http://eprint.iacr.org/2007/343 - Integer t = 1; - unsigned int n = q.IsEven() ? 1 : q.BitCount(), m = r.BitCount(); - - for (unsigned int i=n; DiscreteLogWorkFactor(i) struct EcRecommendedParameters; - -template<> struct EcRecommendedParameters -{ - EcRecommendedParameters(const OID &oid, unsigned int t2, unsigned int t3, unsigned int t4, const char *a, const char *b, const char *g, const char *n, unsigned int h) - : oid(oid), t0(0), t1(0), t2(t2), t3(t3), t4(t4), a(a), b(b), g(g), n(n), h(h) {} - EcRecommendedParameters(const OID &oid, unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4, const char *a, const char *b, const char *g, const char *n, unsigned int h) - : oid(oid), t0(t0), t1(t1), t2(t2), t3(t3), t4(t4), a(a), b(b), g(g), n(n), h(h) {} - EC2N *NewEC() const - { - StringSource ssA(a, true, new HexDecoder); - StringSource ssB(b, true, new HexDecoder); - if (t0 == 0) - return new EC2N(GF2NT(t2, t3, t4), EC2N::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), EC2N::FieldElement(ssB, (size_t)ssB.MaxRetrievable())); - else - return new EC2N(GF2NPP(t0, t1, t2, t3, t4), EC2N::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), EC2N::FieldElement(ssB, (size_t)ssB.MaxRetrievable())); - }; - - OID oid; - unsigned int t0, t1, t2, t3, t4; - const char *a, *b, *g, *n; - unsigned int h; -}; - -template<> struct EcRecommendedParameters -{ - EcRecommendedParameters(const OID &oid, const char *p, const char *a, const char *b, const char *g, const char *n, unsigned int h) - : oid(oid), p(p), a(a), b(b), g(g), n(n), h(h) {} - ECP *NewEC() const - { - StringSource ssP(p, true, new HexDecoder); - StringSource ssA(a, true, new HexDecoder); - StringSource ssB(b, true, new HexDecoder); - return new ECP(Integer(ssP, (size_t)ssP.MaxRetrievable()), ECP::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), ECP::FieldElement(ssB, (size_t)ssB.MaxRetrievable())); - }; - - OID oid; - const char *p; - const char *a, *b, *g, *n; - unsigned int h; -}; - -struct OIDLessThan -{ - template - inline bool operator()(const EcRecommendedParameters& a, const OID& b) {return a.oid < b;} - template - inline bool operator()(const OID& a, const EcRecommendedParameters& b) {return a < b.oid;} - template - inline bool operator()(const EcRecommendedParameters& a, const EcRecommendedParameters& b) {return a.oid < b.oid;} -}; - -static void GetRecommendedParameters(const EcRecommendedParameters *&begin, const EcRecommendedParameters *&end) -{ - // this array must be sorted by OID - static const EcRecommendedParameters rec[] = { - EcRecommendedParameters(ASN1::sect163k1(), - 163, 7, 6, 3, 0, - "000000000000000000000000000000000000000001", - "000000000000000000000000000000000000000001", - "0402FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE80289070FB05D38FF58321F2E800536D538CCDAA3D9", - "04000000000000000000020108A2E0CC0D99F8A5EF", - 2), - EcRecommendedParameters(ASN1::sect163r1(), - 163, 7, 6, 3, 0, - "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2", - "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9", - "040369979697AB43897789566789567F787A7876A65400435EDB42EFAFB2989D51FEFCE3C80988F41FF883", - "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", - 2), - EcRecommendedParameters(ASN1::sect239k1(), - 239, 158, 0, - "000000000000000000000000000000000000000000000000000000000000", - "000000000000000000000000000000000000000000000000000000000001", - "0429A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA", - "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", - 4), - EcRecommendedParameters(ASN1::sect113r1(), - 113, 9, 0, - "003088250CA6E7C7FE649CE85820F7", - "00E8BEE4D3E2260744188BE0E9C723", - "04009D73616F35F4AB1407D73562C10F00A52830277958EE84D1315ED31886", - "0100000000000000D9CCEC8A39E56F", - 2), - EcRecommendedParameters(ASN1::sect113r2(), - 113, 9, 0, - "00689918DBEC7E5A0DD6DFC0AA55C7", - "0095E9A9EC9B297BD4BF36E059184F", - "0401A57A6A7B26CA5EF52FCDB816479700B3ADC94ED1FE674C06E695BABA1D", - "010000000000000108789B2496AF93", - 2), - EcRecommendedParameters(ASN1::sect163r2(), - 163, 7, 6, 3, 0, - "000000000000000000000000000000000000000001", - "020A601907B8C953CA1481EB10512F78744A3205FD", - "0403F0EBA16286A2D57EA0991168D4994637E8343E3600D51FBC6C71A0094FA2CDD545B11C5C0C797324F1", - "040000000000000000000292FE77E70C12A4234C33", - 2), - EcRecommendedParameters(ASN1::sect283k1(), - 283, 12, 7, 5, 0, - "000000000000000000000000000000000000000000000000000000000000000000000000", - "000000000000000000000000000000000000000000000000000000000000000000000001", - "040503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC245849283601CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259", - "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", - 4), - EcRecommendedParameters(ASN1::sect283r1(), - 283, 12, 7, 5, 0, - "000000000000000000000000000000000000000000000000000000000000000000000001", - "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5", - "0405F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B1205303676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4", - "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", - 2), - EcRecommendedParameters(ASN1::sect131r1(), - 131, 8, 3, 2, 0, - "07A11B09A76B562144418FF3FF8C2570B8", - "0217C05610884B63B9C6C7291678F9D341", - "040081BAF91FDF9833C40F9C181343638399078C6E7EA38C001F73C8134B1B4EF9E150", - "0400000000000000023123953A9464B54D", - 2), - EcRecommendedParameters(ASN1::sect131r2(), - 131, 8, 3, 2, 0, - "03E5A88919D7CAFCBF415F07C2176573B2", - "04B8266A46C55657AC734CE38F018F2192", - "040356DCD8F2F95031AD652D23951BB366A80648F06D867940A5366D9E265DE9EB240F", - "0400000000000000016954A233049BA98F", - 2), - EcRecommendedParameters(ASN1::sect193r1(), - 193, 15, 0, - "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01", - "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814", - "0401F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E10025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05", - "01000000000000000000000000C7F34A778F443ACC920EBA49", - 2), - EcRecommendedParameters(ASN1::sect193r2(), - 193, 15, 0, - "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B", - "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE", - "0400D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C", - "010000000000000000000000015AAB561B005413CCD4EE99D5", - 2), - EcRecommendedParameters(ASN1::sect233k1(), - 233, 74, 0, - "000000000000000000000000000000000000000000000000000000000000", - "000000000000000000000000000000000000000000000000000000000001", - "04017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD612601DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3", - "8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", - 4), - EcRecommendedParameters(ASN1::sect233r1(), - 233, 74, 0, - "000000000000000000000000000000000000000000000000000000000001", - "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD", - "0400FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052", - "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", - 2), - EcRecommendedParameters(ASN1::sect409k1(), - 409, 87, 0, - "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", - "040060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE902374601E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B", - "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", - 4), - EcRecommendedParameters(ASN1::sect409r1(), - 409, 87, 0, - "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", - "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F", - "04015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A70061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706", - "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", - 2), - EcRecommendedParameters(ASN1::sect571k1(), - 571, 10, 5, 2, 0, - "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", - "04026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C89720349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3", - "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", - 4), - EcRecommendedParameters(ASN1::sect571r1(), - 571, 10, 5, 2, 0, - "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", - "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A", - "040303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B", - "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", - 2), - }; - begin = rec; - end = rec + sizeof(rec)/sizeof(rec[0]); -} - -static void GetRecommendedParameters(const EcRecommendedParameters *&begin, const EcRecommendedParameters *&end) -{ - // this array must be sorted by OID - static const EcRecommendedParameters rec[] = { - EcRecommendedParameters(ASN1::secp192r1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", - "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", - "04188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E794811", - "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", - 1), - EcRecommendedParameters(ASN1::secp256r1(), - "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", - "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", - "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B", - "046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5", - "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551", - 1), - EcRecommendedParameters(ASN1::brainpoolP160r1(), - "E95E4A5F737059DC60DFC7AD95B3D8139515620F", - "340E7BE2A280EB74E2BE61BADA745D97E8F7C300", - "1E589A8595423412134FAA2DBDEC95C8D8675E58", - "04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321", - "E95E4A5F737059DC60DF5991D45029409E60FC09", - 1), - EcRecommendedParameters(ASN1::brainpoolP192r1(), - "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297", - "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF", - "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9", - "04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F", - "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1", - 1), - EcRecommendedParameters(ASN1::brainpoolP224r1(), - "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF", - "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43", - "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B", - "040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD", - "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F", - 1), - EcRecommendedParameters(ASN1::brainpoolP256r1(), - "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377", - "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9", - "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6", - "048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997", - "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7", - 1), - EcRecommendedParameters(ASN1::brainpoolP320r1(), - "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27", - "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4", - "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6", - "0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1", - "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311", - 1), - EcRecommendedParameters(ASN1::brainpoolP384r1(), - "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53", - "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826", - "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11", - "041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315", - "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565", - 1), - EcRecommendedParameters(ASN1::brainpoolP512r1(), - "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3", - "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA", - "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723", - "0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892", - "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069", - 1), - EcRecommendedParameters(ASN1::secp112r1(), - "DB7C2ABF62E35E668076BEAD208B", - "DB7C2ABF62E35E668076BEAD2088", - "659EF8BA043916EEDE8911702B22", - "0409487239995A5EE76B55F9C2F098A89CE5AF8724C0A23E0E0FF77500", - "DB7C2ABF62E35E7628DFAC6561C5", - 1), - EcRecommendedParameters(ASN1::secp112r2(), - "DB7C2ABF62E35E668076BEAD208B", - "6127C24C05F38A0AAAF65C0EF02C", - "51DEF1815DB5ED74FCC34C85D709", - "044BA30AB5E892B4E1649DD0928643ADCD46F5882E3747DEF36E956E97", - "36DF0AAFD8B8D7597CA10520D04B", - 4), - EcRecommendedParameters(ASN1::secp160r1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC", - "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45", - "044A96B5688EF573284664698968C38BB913CBFC8223A628553168947D59DCC912042351377AC5FB32", - "0100000000000000000001F4C8F927AED3CA752257", - 1), - EcRecommendedParameters(ASN1::secp160k1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", - "0000000000000000000000000000000000000000", - "0000000000000000000000000000000000000007", - "043B4C382CE37AA192A4019E763036F4F5DD4D7EBB938CF935318FDCED6BC28286531733C3F03C4FEE", - "0100000000000000000001B8FA16DFAB9ACA16B6B3", - 1), - EcRecommendedParameters(ASN1::secp256k1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000007", - "0479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", - 1), - EcRecommendedParameters(ASN1::secp128r1(), - "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", - "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC", - "E87579C11079F43DD824993C2CEE5ED3", - "04161FF7528B899B2D0C28607CA52C5B86CF5AC8395BAFEB13C02DA292DDED7A83", - "FFFFFFFE0000000075A30D1B9038A115", - 1), - EcRecommendedParameters(ASN1::secp128r2(), - "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", - "D6031998D1B3BBFEBF59CC9BBFF9AEE1", - "5EEEFCA380D02919DC2C6558BB6D8A5D", - "047B6AA5D85E572983E6FB32A7CDEBC14027B6916A894D3AEE7106FE805FC34B44", - "3FFFFFFF7FFFFFFFBE0024720613B5A3", - 4), - EcRecommendedParameters(ASN1::secp160r2(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70", - "B4E134D3FB59EB8BAB57274904664D5AF50388BA", - "0452DCB034293A117E1F4FF11B30F7199D3144CE6DFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", - "0100000000000000000000351EE786A818F3A1A16B", - 1), - EcRecommendedParameters(ASN1::secp192k1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", - "000000000000000000000000000000000000000000000000", - "000000000000000000000000000000000000000000000003", - "04DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", - "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", - 1), - EcRecommendedParameters(ASN1::secp224k1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", - "00000000000000000000000000000000000000000000000000000000", - "00000000000000000000000000000000000000000000000000000005", - "04A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", - "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", - 1), - EcRecommendedParameters(ASN1::secp224r1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", - "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", - "04B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", - 1), - EcRecommendedParameters(ASN1::secp384r1(), - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC", - "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF", - "04AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB73617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973", - 1), - EcRecommendedParameters(ASN1::secp521r1(), - "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", - "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", - "0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", - "0400C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650", - "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", - 1), - }; - begin = rec; - end = rec + sizeof(rec)/sizeof(rec[0]); -} - -template OID DL_GroupParameters_EC::GetNextRecommendedParametersOID(const OID &oid) -{ - const EcRecommendedParameters *begin, *end; - GetRecommendedParameters(begin, end); - const EcRecommendedParameters *it = std::upper_bound(begin, end, oid, OIDLessThan()); - return (it == end ? OID() : it->oid); -} - -template void DL_GroupParameters_EC::Initialize(const OID &oid) -{ - const EcRecommendedParameters *begin, *end; - GetRecommendedParameters(begin, end); - const EcRecommendedParameters *it = std::lower_bound(begin, end, oid, OIDLessThan()); - if (it == end || it->oid != oid) - throw UnknownOID(); - - const EcRecommendedParameters ¶m = *it; - m_oid = oid; - std::auto_ptr ec(param.NewEC()); - this->m_groupPrecomputation.SetCurve(*ec); - - StringSource ssG(param.g, true, new HexDecoder); - Element G; - bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); - SetSubgroupGenerator(G); - assert(result); - - StringSource ssN(param.n, true, new HexDecoder); - m_n.Decode(ssN, (size_t)ssN.MaxRetrievable()); - m_k = param.h; -} - -template -bool DL_GroupParameters_EC::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - if (strcmp(name, Name::GroupOID()) == 0) - { - if (m_oid.m_values.empty()) - return false; - - this->ThrowIfTypeMismatch(name, typeid(OID), valueType); - *reinterpret_cast(pValue) = m_oid; - return true; - } - else - return GetValueHelper >(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Curve); -} - -template -void DL_GroupParameters_EC::AssignFrom(const NameValuePairs &source) -{ - OID oid; - if (source.GetValue(Name::GroupOID(), oid)) - Initialize(oid); - else - { - EllipticCurve ec; - Point G; - Integer n; - - source.GetRequiredParameter("DL_GroupParameters_EC", Name::Curve(), ec); - source.GetRequiredParameter("DL_GroupParameters_EC", Name::SubgroupGenerator(), G); - source.GetRequiredParameter("DL_GroupParameters_EC", Name::SubgroupOrder(), n); - Integer k = source.GetValueWithDefault(Name::Cofactor(), Integer::Zero()); - - Initialize(ec, G, n, k); - } -} - -template -void DL_GroupParameters_EC::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - try - { - AssignFrom(alg); - } - catch (InvalidArgument &) - { - throw NotImplemented("DL_GroupParameters_EC: curve generation is not implemented yet"); - } -} - -template -void DL_GroupParameters_EC::BERDecode(BufferedTransformation &bt) -{ - byte b; - if (!bt.Peek(b)) - BERDecodeError(); - if (b == OBJECT_IDENTIFIER) - Initialize(OID(bt)); - else - { - BERSequenceDecoder seq(bt); - word32 version; - BERDecodeUnsigned(seq, version, INTEGER, 1, 1); // check version - EllipticCurve ec(seq); - Point G = ec.BERDecodePoint(seq); - Integer n(seq); - Integer k; - bool cofactorPresent = !seq.EndReached(); - if (cofactorPresent) - k.BERDecode(seq); - else - k = Integer::Zero(); - seq.MessageEnd(); - - Initialize(ec, G, n, k); - } -} - -template -void DL_GroupParameters_EC::DEREncode(BufferedTransformation &bt) const -{ - if (m_encodeAsOID && !m_oid.m_values.empty()) - m_oid.DEREncode(bt); - else - { - DERSequenceEncoder seq(bt); - DEREncodeUnsigned(seq, 1); // version - GetCurve().DEREncode(seq); - GetCurve().DEREncodePoint(seq, this->GetSubgroupGenerator(), m_compress); - m_n.DEREncode(seq); - if (m_k.NotZero()) - m_k.DEREncode(seq); - seq.MessageEnd(); - } -} - -template -Integer DL_GroupParameters_EC::GetCofactor() const -{ - if (!m_k) - { - Integer q = GetCurve().FieldSize(); - Integer qSqrt = q.SquareRoot(); - m_k = (q+2*qSqrt+1)/m_n; - } - - return m_k; -} - -template -Integer DL_GroupParameters_EC::ConvertElementToInteger(const Element &element) const -{ - return ConvertToInteger(element.x); -}; - -template -bool DL_GroupParameters_EC::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = GetCurve().ValidateParameters(rng, level); - - Integer q = GetCurve().FieldSize(); - pass = pass && m_n!=q; - - if (level >= 2) - { - Integer qSqrt = q.SquareRoot(); - pass = pass && m_n>4*qSqrt; - pass = pass && VerifyPrime(rng, m_n, level-2); - pass = pass && (m_k.IsZero() || m_k == (q+2*qSqrt+1)/m_n); - pass = pass && CheckMOVCondition(q, m_n); - } - - return pass; -} - -template -bool DL_GroupParameters_EC::ValidateElement(unsigned int level, const Element &g, const DL_FixedBasePrecomputation *gpc) const -{ - bool pass = !IsIdentity(g) && GetCurve().VerifyPoint(g); - if (level >= 1) - { - if (gpc) - pass = pass && gpc->Exponentiate(this->GetGroupPrecomputation(), Integer::One()) == g; - } - if (level >= 2 && pass) - { - const Integer &q = GetSubgroupOrder(); - Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); - pass = pass && IsIdentity(gq); - } - return pass; -} - -template -void DL_GroupParameters_EC::SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const -{ - GetCurve().SimultaneousMultiply(results, base, exponents, exponentsCount); -} - -template -CPP_TYPENAME DL_GroupParameters_EC::Element DL_GroupParameters_EC::MultiplyElements(const Element &a, const Element &b) const -{ - return GetCurve().Add(a, b); -} - -template -CPP_TYPENAME DL_GroupParameters_EC::Element DL_GroupParameters_EC::CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const -{ - return GetCurve().CascadeMultiply(exponent1, element1, exponent2, element2); -} - -template -OID DL_GroupParameters_EC::GetAlgorithmID() const -{ - return ASN1::id_ecPublicKey(); -} - -// ****************************************************************** - -template -void DL_PublicKey_EC::BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size) -{ - typename EC::Point P; - if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) - BERDecodeError(); - SetPublicElement(P); -} - -template -void DL_PublicKey_EC::DEREncodePublicKey(BufferedTransformation &bt) const -{ - this->GetGroupParameters().GetCurve().EncodePoint(bt, this->GetPublicElement(), this->GetGroupParameters().GetPointCompression()); -} - -// ****************************************************************** - -template -void DL_PrivateKey_EC::BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size) -{ - BERSequenceDecoder seq(bt); - word32 version; - BERDecodeUnsigned(seq, version, INTEGER, 1, 1); // check version - - BERGeneralDecoder dec(seq, OCTET_STRING); - if (!dec.IsDefiniteLength()) - BERDecodeError(); - Integer x; - x.Decode(dec, (size_t)dec.RemainingLength()); - dec.MessageEnd(); - if (!parametersPresent && seq.PeekByte() != (CONTEXT_SPECIFIC | CONSTRUCTED | 0)) - BERDecodeError(); - if (!seq.EndReached() && seq.PeekByte() == (CONTEXT_SPECIFIC | CONSTRUCTED | 0)) - { - BERGeneralDecoder parameters(seq, CONTEXT_SPECIFIC | CONSTRUCTED | 0); - this->AccessGroupParameters().BERDecode(parameters); - parameters.MessageEnd(); - } - if (!seq.EndReached()) - { - // skip over the public element - SecByteBlock subjectPublicKey; - unsigned int unusedBits; - BERGeneralDecoder publicKey(seq, CONTEXT_SPECIFIC | CONSTRUCTED | 1); - BERDecodeBitString(publicKey, subjectPublicKey, unusedBits); - publicKey.MessageEnd(); - Element Q; - if (!(unusedBits == 0 && this->GetGroupParameters().GetCurve().DecodePoint(Q, subjectPublicKey, subjectPublicKey.size()))) - BERDecodeError(); - } - seq.MessageEnd(); - - this->SetPrivateExponent(x); -} - -template -void DL_PrivateKey_EC::DEREncodePrivateKey(BufferedTransformation &bt) const -{ - DERSequenceEncoder privateKey(bt); - DEREncodeUnsigned(privateKey, 1); // version - // SEC 1 ver 1.0 says privateKey (m_d) has the same length as order of the curve - // this will be changed to order of base point in a future version - this->GetPrivateExponent().DEREncodeAsOctetString(privateKey, this->GetGroupParameters().GetSubgroupOrder().ByteCount()); - privateKey.MessageEnd(); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.h deleted file mode 100644 index b359e033..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eccrypto.h +++ /dev/null @@ -1,280 +0,0 @@ -#ifndef CRYPTOPP_ECCRYPTO_H -#define CRYPTOPP_ECCRYPTO_H - -/*! \file -*/ - -#include "pubkey.h" -#include "integer.h" -#include "asn.h" -#include "hmac.h" -#include "sha.h" -#include "gfpcrypt.h" -#include "dh.h" -#include "mqv.h" -#include "ecp.h" -#include "ec2n.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Elliptic Curve Parameters -/*! This class corresponds to the ASN.1 sequence of the same name - in ANSI X9.62 (also SEC 1). -*/ -template -class DL_GroupParameters_EC : public DL_GroupParametersImpl > -{ - typedef DL_GroupParameters_EC ThisClass; - -public: - typedef EC EllipticCurve; - typedef typename EllipticCurve::Point Point; - typedef Point Element; - typedef IncompatibleCofactorMultiplication DefaultCofactorOption; - - DL_GroupParameters_EC() : m_compress(false), m_encodeAsOID(false) {} - DL_GroupParameters_EC(const OID &oid) - : m_compress(false), m_encodeAsOID(false) {Initialize(oid);} - DL_GroupParameters_EC(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) - : m_compress(false), m_encodeAsOID(false) {Initialize(ec, G, n, k);} - DL_GroupParameters_EC(BufferedTransformation &bt) - : m_compress(false), m_encodeAsOID(false) {BERDecode(bt);} - - void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) - { - this->m_groupPrecomputation.SetCurve(ec); - SetSubgroupGenerator(G); - m_n = n; - m_k = k; - } - void Initialize(const OID &oid); - - // NameValuePairs - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // GeneratibleCryptoMaterial interface - //! this implementation doesn't actually generate a curve, it just initializes the parameters with existing values - /*! parameters: (Curve, SubgroupGenerator, SubgroupOrder, Cofactor (optional)), or (GroupOID) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - - // DL_GroupParameters - const DL_FixedBasePrecomputation & GetBasePrecomputation() const {return this->m_gpc;} - DL_FixedBasePrecomputation & AccessBasePrecomputation() {return this->m_gpc;} - const Integer & GetSubgroupOrder() const {return m_n;} - Integer GetCofactor() const; - bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const; - bool ValidateElement(unsigned int level, const Element &element, const DL_FixedBasePrecomputation *precomp) const; - bool FastSubgroupCheckAvailable() const {return false;} - void EncodeElement(bool reversible, const Element &element, byte *encoded) const - { - if (reversible) - GetCurve().EncodePoint(encoded, element, m_compress); - else - element.x.Encode(encoded, GetEncodedElementSize(false)); - } - unsigned int GetEncodedElementSize(bool reversible) const - { - if (reversible) - return GetCurve().EncodedPointSize(m_compress); - else - return GetCurve().GetField().MaxElementByteLength(); - } - Element DecodeElement(const byte *encoded, bool checkForGroupMembership) const - { - Point result; - if (!GetCurve().DecodePoint(result, encoded, GetEncodedElementSize(true))) - throw DL_BadElement(); - if (checkForGroupMembership && !ValidateElement(1, result, NULL)) - throw DL_BadElement(); - return result; - } - Integer ConvertElementToInteger(const Element &element) const; - Integer GetMaxExponent() const {return GetSubgroupOrder()-1;} - bool IsIdentity(const Element &element) const {return element.identity;} - void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; - static std::string CRYPTOPP_API StaticAlgorithmNamePrefix() {return "EC";} - - // ASN1Key - OID GetAlgorithmID() const; - - // used by MQV - Element MultiplyElements(const Element &a, const Element &b) const; - Element CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const; - - // non-inherited - - // enumerate OIDs for recommended parameters, use OID() to get first one - static OID CRYPTOPP_API GetNextRecommendedParametersOID(const OID &oid); - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - void SetPointCompression(bool compress) {m_compress = compress;} - bool GetPointCompression() const {return m_compress;} - - void SetEncodeAsOID(bool encodeAsOID) {m_encodeAsOID = encodeAsOID;} - bool GetEncodeAsOID() const {return m_encodeAsOID;} - - const EllipticCurve& GetCurve() const {return this->m_groupPrecomputation.GetCurve();} - - bool operator==(const ThisClass &rhs) const - {return this->m_groupPrecomputation.GetCurve() == rhs.m_groupPrecomputation.GetCurve() && this->m_gpc.GetBase(this->m_groupPrecomputation) == rhs.m_gpc.GetBase(rhs.m_groupPrecomputation);} - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - const Point& GetBasePoint() const {return GetSubgroupGenerator();} - const Integer& GetBasePointOrder() const {return GetSubgroupOrder();} - void LoadRecommendedParameters(const OID &oid) {Initialize(oid);} -#endif - -protected: - unsigned int FieldElementLength() const {return GetCurve().GetField().MaxElementByteLength();} - unsigned int ExponentLength() const {return m_n.ByteCount();} - - OID m_oid; // set if parameters loaded from a recommended curve - Integer m_n; // order of base point - bool m_compress, m_encodeAsOID; - mutable Integer m_k; // cofactor -}; - -//! EC public key -template -class DL_PublicKey_EC : public DL_PublicKeyImpl > -{ -public: - typedef typename EC::Point Element; - - void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) - {this->AccessGroupParameters() = params; SetPublicElement(Q);} - void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) - {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} - - // X509PublicKey - void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); - void DEREncodePublicKey(BufferedTransformation &bt) const; -}; - -//! EC private key -template -class DL_PrivateKey_EC : public DL_PrivateKeyImpl > -{ -public: - typedef typename EC::Point Element; - - void Initialize(const DL_GroupParameters_EC ¶ms, const Integer &x) - {this->AccessGroupParameters() = params; this->SetPrivateExponent(x);} - void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) - {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} - void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) - {GenerateRandom(rng, params);} - void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) - {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} - - // PKCS8PrivateKey - void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); - void DEREncodePrivateKey(BufferedTransformation &bt) const; -}; - -//! Elliptic Curve Diffie-Hellman, AKA ECDH -template ::DefaultCofactorOption> -struct ECDH -{ - typedef DH_Domain, COFACTOR_OPTION> Domain; -}; - -/// Elliptic Curve Menezes-Qu-Vanstone, AKA ECMQV -template ::DefaultCofactorOption> -struct ECMQV -{ - typedef MQV_Domain, COFACTOR_OPTION> Domain; -}; - -//! EC keys -template -struct DL_Keys_EC -{ - typedef DL_PublicKey_EC PublicKey; - typedef DL_PrivateKey_EC PrivateKey; -}; - -template -struct ECDSA; - -//! ECDSA keys -template -struct DL_Keys_ECDSA -{ - typedef DL_PublicKey_EC PublicKey; - typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest, ECDSA > PrivateKey; -}; - -//! ECDSA algorithm -template -class DL_Algorithm_ECDSA : public DL_Algorithm_GDSA -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECDSA";} -}; - -//! ECNR algorithm -template -class DL_Algorithm_ECNR : public DL_Algorithm_NR -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECNR";} -}; - -//! ECDSA -template -struct ECDSA : public DL_SS, DL_Algorithm_ECDSA, DL_SignatureMessageEncodingMethod_DSA, H> -{ -}; - -//! ECNR -template -struct ECNR : public DL_SS, DL_Algorithm_ECNR, DL_SignatureMessageEncodingMethod_NR, H> -{ -}; - -//! Elliptic Curve Integrated Encryption Scheme, AKA ECIES -/*! Default to (NoCofactorMultiplication and DHAES_MODE = false) for compatibilty with SEC1 and Crypto++ 4.2. - The combination of (IncompatibleCofactorMultiplication and DHAES_MODE = true) is recommended for best - efficiency and security. */ -template -struct ECIES - : public DL_ES< - DL_Keys_EC, - DL_KeyAgreementAlgorithm_DH, - DL_KeyDerivationAlgorithm_P1363 >, - DL_EncryptionAlgorithm_Xor, DHAES_MODE>, - ECIES > -{ - static std::string CRYPTOPP_API StaticAlgorithmName() {return "ECIES";} // TODO: fix this after name is standardized -}; - -NAMESPACE_END - -#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#include "eccrypto.cpp" -#endif - -NAMESPACE_BEGIN(CryptoPP) - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKeyImpl >; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKeyImpl >; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKeyImpl >; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKeyImpl >; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_EC; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest, ECDSA >; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest, ECDSA >; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.cpp deleted file mode 100644 index 55a7cc15..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.cpp +++ /dev/null @@ -1,473 +0,0 @@ -// ecp.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "ecp.h" -#include "asn.h" -#include "nbtheory.h" - -#include "algebra.cpp" - -NAMESPACE_BEGIN(CryptoPP) - -ANONYMOUS_NAMESPACE_BEGIN -static inline ECP::Point ToMontgomery(const ModularArithmetic &mr, const ECP::Point &P) -{ - return P.identity ? P : ECP::Point(mr.ConvertIn(P.x), mr.ConvertIn(P.y)); -} - -static inline ECP::Point FromMontgomery(const ModularArithmetic &mr, const ECP::Point &P) -{ - return P.identity ? P : ECP::Point(mr.ConvertOut(P.x), mr.ConvertOut(P.y)); -} -NAMESPACE_END - -ECP::ECP(const ECP &ecp, bool convertToMontgomeryRepresentation) -{ - if (convertToMontgomeryRepresentation && !ecp.GetField().IsMontgomeryRepresentation()) - { - m_fieldPtr.reset(new MontgomeryRepresentation(ecp.GetField().GetModulus())); - m_a = GetField().ConvertIn(ecp.m_a); - m_b = GetField().ConvertIn(ecp.m_b); - } - else - operator=(ecp); -} - -ECP::ECP(BufferedTransformation &bt) - : m_fieldPtr(new Field(bt)) -{ - BERSequenceDecoder seq(bt); - GetField().BERDecodeElement(seq, m_a); - GetField().BERDecodeElement(seq, m_b); - // skip optional seed - if (!seq.EndReached()) - { - SecByteBlock seed; - unsigned int unused; - BERDecodeBitString(seq, seed, unused); - } - seq.MessageEnd(); -} - -void ECP::DEREncode(BufferedTransformation &bt) const -{ - GetField().DEREncode(bt); - DERSequenceEncoder seq(bt); - GetField().DEREncodeElement(seq, m_a); - GetField().DEREncodeElement(seq, m_b); - seq.MessageEnd(); -} - -bool ECP::DecodePoint(ECP::Point &P, const byte *encodedPoint, size_t encodedPointLen) const -{ - StringStore store(encodedPoint, encodedPointLen); - return DecodePoint(P, store, encodedPointLen); -} - -bool ECP::DecodePoint(ECP::Point &P, BufferedTransformation &bt, size_t encodedPointLen) const -{ - byte type; - if (encodedPointLen < 1 || !bt.Get(type)) - return false; - - switch (type) - { - case 0: - P.identity = true; - return true; - case 2: - case 3: - { - if (encodedPointLen != EncodedPointSize(true)) - return false; - - Integer p = FieldSize(); - - P.identity = false; - P.x.Decode(bt, GetField().MaxElementByteLength()); - P.y = ((P.x*P.x+m_a)*P.x+m_b) % p; - - if (Jacobi(P.y, p) !=1) - return false; - - P.y = ModularSquareRoot(P.y, p); - - if ((type & 1) != P.y.GetBit(0)) - P.y = p-P.y; - - return true; - } - case 4: - { - if (encodedPointLen != EncodedPointSize(false)) - return false; - - unsigned int len = GetField().MaxElementByteLength(); - P.identity = false; - P.x.Decode(bt, len); - P.y.Decode(bt, len); - return true; - } - default: - return false; - } -} - -void ECP::EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const -{ - if (P.identity) - NullStore().TransferTo(bt, EncodedPointSize(compressed)); - else if (compressed) - { - bt.Put(2 + P.y.GetBit(0)); - P.x.Encode(bt, GetField().MaxElementByteLength()); - } - else - { - unsigned int len = GetField().MaxElementByteLength(); - bt.Put(4); // uncompressed - P.x.Encode(bt, len); - P.y.Encode(bt, len); - } -} - -void ECP::EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const -{ - ArraySink sink(encodedPoint, EncodedPointSize(compressed)); - EncodePoint(sink, P, compressed); - assert(sink.TotalPutLength() == EncodedPointSize(compressed)); -} - -ECP::Point ECP::BERDecodePoint(BufferedTransformation &bt) const -{ - SecByteBlock str; - BERDecodeOctetString(bt, str); - Point P; - if (!DecodePoint(P, str, str.size())) - BERDecodeError(); - return P; -} - -void ECP::DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const -{ - SecByteBlock str(EncodedPointSize(compressed)); - EncodePoint(str, P, compressed); - DEREncodeOctetString(bt, str); -} - -bool ECP::ValidateParameters(RandomNumberGenerator &rng, unsigned int level) const -{ - Integer p = FieldSize(); - - bool pass = p.IsOdd(); - pass = pass && !m_a.IsNegative() && m_a

= 1) - pass = pass && ((4*m_a*m_a*m_a+27*m_b*m_b)%p).IsPositive(); - - if (level >= 2) - pass = pass && VerifyPrime(rng, p); - - return pass; -} - -bool ECP::VerifyPoint(const Point &P) const -{ - const FieldElement &x = P.x, &y = P.y; - Integer p = FieldSize(); - return P.identity || - (!x.IsNegative() && x

().Ref(); -} - -const ECP::Point& ECP::Inverse(const Point &P) const -{ - if (P.identity) - return P; - else - { - m_R.identity = false; - m_R.x = P.x; - m_R.y = GetField().Inverse(P.y); - return m_R; - } -} - -const ECP::Point& ECP::Add(const Point &P, const Point &Q) const -{ - if (P.identity) return Q; - if (Q.identity) return P; - if (GetField().Equal(P.x, Q.x)) - return GetField().Equal(P.y, Q.y) ? Double(P) : Identity(); - - FieldElement t = GetField().Subtract(Q.y, P.y); - t = GetField().Divide(t, GetField().Subtract(Q.x, P.x)); - FieldElement x = GetField().Subtract(GetField().Subtract(GetField().Square(t), P.x), Q.x); - m_R.y = GetField().Subtract(GetField().Multiply(t, GetField().Subtract(P.x, x)), P.y); - - m_R.x.swap(x); - m_R.identity = false; - return m_R; -} - -const ECP::Point& ECP::Double(const Point &P) const -{ - if (P.identity || P.y==GetField().Identity()) return Identity(); - - FieldElement t = GetField().Square(P.x); - t = GetField().Add(GetField().Add(GetField().Double(t), t), m_a); - t = GetField().Divide(t, GetField().Double(P.y)); - FieldElement x = GetField().Subtract(GetField().Subtract(GetField().Square(t), P.x), P.x); - m_R.y = GetField().Subtract(GetField().Multiply(t, GetField().Subtract(P.x, x)), P.y); - - m_R.x.swap(x); - m_R.identity = false; - return m_R; -} - -template void ParallelInvert(const AbstractRing &ring, Iterator begin, Iterator end) -{ - size_t n = end-begin; - if (n == 1) - *begin = ring.MultiplicativeInverse(*begin); - else if (n > 1) - { - std::vector vec((n+1)/2); - unsigned int i; - Iterator it; - - for (i=0, it=begin; i::iterator it) : it(it) {} - Integer& operator*() {return it->z;} - int operator-(ZIterator it2) {return int(it-it2.it);} - ZIterator operator+(int i) {return ZIterator(it+i);} - ZIterator& operator+=(int i) {it+=i; return *this;} - std::vector::iterator it; -}; - -ECP::Point ECP::ScalarMultiply(const Point &P, const Integer &k) const -{ - Element result; - if (k.BitCount() <= 5) - AbstractGroup::SimultaneousMultiply(&result, P, &k, 1); - else - ECP::SimultaneousMultiply(&result, P, &k, 1); - return result; -} - -void ECP::SimultaneousMultiply(ECP::Point *results, const ECP::Point &P, const Integer *expBegin, unsigned int expCount) const -{ - if (!GetField().IsMontgomeryRepresentation()) - { - ECP ecpmr(*this, true); - const ModularArithmetic &mr = ecpmr.GetField(); - ecpmr.SimultaneousMultiply(results, ToMontgomery(mr, P), expBegin, expCount); - for (unsigned int i=0; i bases; - std::vector exponents; - exponents.reserve(expCount); - std::vector > baseIndices(expCount); - std::vector > negateBase(expCount); - std::vector > exponentWindows(expCount); - unsigned int i; - - for (i=0; iNotNegative()); - exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 5)); - exponents[i].FindNextWindow(); - } - - unsigned int expBitPosition = 0; - bool notDone = true; - - while (notDone) - { - notDone = false; - bool baseAdded = false; - for (i=0; i > finalCascade; - for (i=0; i::CascadeScalarMultiply(P, k1, Q, k2); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.h deleted file mode 100644 index d946be63..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ecp.h +++ /dev/null @@ -1,126 +0,0 @@ -#ifndef CRYPTOPP_ECP_H -#define CRYPTOPP_ECP_H - -#include "modarith.h" -#include "eprecomp.h" -#include "smartptr.h" -#include "pubkey.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Elliptical Curve Point -struct CRYPTOPP_DLL ECPPoint -{ - ECPPoint() : identity(true) {} - ECPPoint(const Integer &x, const Integer &y) - : identity(false), x(x), y(y) {} - - bool operator==(const ECPPoint &t) const - {return (identity && t.identity) || (!identity && !t.identity && x==t.x && y==t.y);} - bool operator< (const ECPPoint &t) const - {return identity ? !t.identity : (!t.identity && (x; - -//! Elliptic Curve over GF(p), where p is prime -class CRYPTOPP_DLL ECP : public AbstractGroup -{ -public: - typedef ModularArithmetic Field; - typedef Integer FieldElement; - typedef ECPPoint Point; - - ECP() {} - ECP(const ECP &ecp, bool convertToMontgomeryRepresentation = false); - ECP(const Integer &modulus, const FieldElement &a, const FieldElement &b) - : m_fieldPtr(new Field(modulus)), m_a(a.IsNegative() ? modulus+a : a), m_b(b) {} - // construct from BER encoded parameters - // this constructor will decode and extract the the fields fieldID and curve of the sequence ECParameters - ECP(BufferedTransformation &bt); - - // encode the fields fieldID and curve of the sequence ECParameters - void DEREncode(BufferedTransformation &bt) const; - - bool Equal(const Point &P, const Point &Q) const; - const Point& Identity() const; - const Point& Inverse(const Point &P) const; - bool InversionIsFast() const {return true;} - const Point& Add(const Point &P, const Point &Q) const; - const Point& Double(const Point &P) const; - Point ScalarMultiply(const Point &P, const Integer &k) const; - Point CascadeScalarMultiply(const Point &P, const Integer &k1, const Point &Q, const Integer &k2) const; - void SimultaneousMultiply(Point *results, const Point &base, const Integer *exponents, unsigned int exponentsCount) const; - - Point Multiply(const Integer &k, const Point &P) const - {return ScalarMultiply(P, k);} - Point CascadeMultiply(const Integer &k1, const Point &P, const Integer &k2, const Point &Q) const - {return CascadeScalarMultiply(P, k1, Q, k2);} - - bool ValidateParameters(RandomNumberGenerator &rng, unsigned int level=3) const; - bool VerifyPoint(const Point &P) const; - - unsigned int EncodedPointSize(bool compressed = false) const - {return 1 + (compressed?1:2)*GetField().MaxElementByteLength();} - // returns false if point is compressed and not valid (doesn't check if uncompressed) - bool DecodePoint(Point &P, BufferedTransformation &bt, size_t len) const; - bool DecodePoint(Point &P, const byte *encodedPoint, size_t len) const; - void EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const; - void EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const; - - Point BERDecodePoint(BufferedTransformation &bt) const; - void DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const; - - Integer FieldSize() const {return GetField().GetModulus();} - const Field & GetField() const {return *m_fieldPtr;} - const FieldElement & GetA() const {return m_a;} - const FieldElement & GetB() const {return m_b;} - - bool operator==(const ECP &rhs) const - {return GetField() == rhs.GetField() && m_a == rhs.m_a && m_b == rhs.m_b;} - -private: - clonable_ptr m_fieldPtr; - FieldElement m_a, m_b; - mutable Point m_R; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupPrecomputation; - -template class EcPrecomputation; - -//! ECP precomputation -template<> class EcPrecomputation : public DL_GroupPrecomputation -{ -public: - typedef ECP EllipticCurve; - - // DL_GroupPrecomputation - bool NeedConversions() const {return true;} - Element ConvertIn(const Element &P) const - {return P.identity ? P : ECP::Point(m_ec->GetField().ConvertIn(P.x), m_ec->GetField().ConvertIn(P.y));}; - Element ConvertOut(const Element &P) const - {return P.identity ? P : ECP::Point(m_ec->GetField().ConvertOut(P.x), m_ec->GetField().ConvertOut(P.y));} - const AbstractGroup & GetGroup() const {return *m_ec;} - Element BERDecodeElement(BufferedTransformation &bt) const {return m_ec->BERDecodePoint(bt);} - void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {m_ec->DEREncodePoint(bt, v, false);} - - // non-inherited - void SetCurve(const ECP &ec) - { - m_ec.reset(new ECP(ec, true)); - m_ecOriginal = ec; - } - const ECP & GetCurve() const {return *m_ecOriginal;} - -private: - value_ptr m_ec, m_ecOriginal; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.cpp deleted file mode 100644 index b58fe7c0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// elgamal.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "elgamal.h" -#include "asn.h" -#include "nbtheory.h" - -NAMESPACE_BEGIN(CryptoPP) - -void ElGamal_TestInstantiations() -{ - ElGamalEncryptor test1(1, 1, 1); - ElGamalDecryptor test2(NullRNG(), 123); - ElGamalEncryptor test3(test2); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.h deleted file mode 100644 index 9afc30ee..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/elgamal.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef CRYPTOPP_ELGAMAL_H -#define CRYPTOPP_ELGAMAL_H - -#include "modexppc.h" -#include "dsa.h" - -NAMESPACE_BEGIN(CryptoPP) - -class CRYPTOPP_NO_VTABLE ElGamalBase : public DL_KeyAgreementAlgorithm_DH, - public DL_KeyDerivationAlgorithm, - public DL_SymmetricEncryptionAlgorithm -{ -public: - void Derive(const DL_GroupParameters &groupParams, byte *derivedKey, size_t derivedLength, const Integer &agreedElement, const Integer &ephemeralPublicKey, const NameValuePairs &derivationParams) const - { - agreedElement.Encode(derivedKey, derivedLength); - } - - size_t GetSymmetricKeyLength(size_t plainTextLength) const - { - return GetGroupParameters().GetModulus().ByteCount(); - } - - size_t GetSymmetricCiphertextLength(size_t plainTextLength) const - { - unsigned int len = GetGroupParameters().GetModulus().ByteCount(); - if (plainTextLength <= GetMaxSymmetricPlaintextLength(len)) - return len; - else - return 0; - } - - size_t GetMaxSymmetricPlaintextLength(size_t cipherTextLength) const - { - unsigned int len = GetGroupParameters().GetModulus().ByteCount(); - if (cipherTextLength == len) - return STDMIN(255U, len-3); - else - return 0; - } - - void SymmetricEncrypt(RandomNumberGenerator &rng, const byte *key, const byte *plainText, size_t plainTextLength, byte *cipherText, const NameValuePairs ¶meters) const - { - const Integer &p = GetGroupParameters().GetModulus(); - unsigned int modulusLen = p.ByteCount(); - - SecByteBlock block(modulusLen-1); - rng.GenerateBlock(block, modulusLen-2-plainTextLength); - memcpy(block+modulusLen-2-plainTextLength, plainText, plainTextLength); - block[modulusLen-2] = (byte)plainTextLength; - - a_times_b_mod_c(Integer(key, modulusLen), Integer(block, modulusLen-1), p).Encode(cipherText, modulusLen); - } - - DecodingResult SymmetricDecrypt(const byte *key, const byte *cipherText, size_t cipherTextLength, byte *plainText, const NameValuePairs ¶meters) const - { - const Integer &p = GetGroupParameters().GetModulus(); - unsigned int modulusLen = p.ByteCount(); - - if (cipherTextLength != modulusLen) - return DecodingResult(); - - Integer m = a_times_b_mod_c(Integer(cipherText, modulusLen), Integer(key, modulusLen).InverseMod(p), p); - - m.Encode(plainText, 1); - unsigned int plainTextLength = plainText[0]; - if (plainTextLength > GetMaxSymmetricPlaintextLength(modulusLen)) - return DecodingResult(); - m >>= 8; - m.Encode(plainText, plainTextLength); - return DecodingResult(plainTextLength); - } - - virtual const DL_GroupParameters_GFP & GetGroupParameters() const =0; -}; - -template -class ElGamalObjectImpl : public DL_ObjectImplBase, public ElGamalBase -{ -public: - size_t FixedMaxPlaintextLength() const {return this->MaxPlaintextLength(FixedCiphertextLength());} - size_t FixedCiphertextLength() const {return this->CiphertextLength(0);} - - const DL_GroupParameters_GFP & GetGroupParameters() const {return this->GetKey().GetGroupParameters();} - - DecodingResult FixedLengthDecrypt(RandomNumberGenerator &rng, const byte *cipherText, byte *plainText) const - {return Decrypt(rng, cipherText, FixedCiphertextLength(), plainText);} - -protected: - const DL_KeyAgreementAlgorithm & GetKeyAgreementAlgorithm() const {return *this;} - const DL_KeyDerivationAlgorithm & GetKeyDerivationAlgorithm() const {return *this;} - const DL_SymmetricEncryptionAlgorithm & GetSymmetricEncryptionAlgorithm() const {return *this;} -}; - -struct ElGamalKeys -{ - typedef DL_CryptoKeys_GFP::GroupParameters GroupParameters; - typedef DL_PrivateKey_GFP_OldFormat PrivateKey; - typedef DL_PublicKey_GFP_OldFormat PublicKey; -}; - -//! ElGamal encryption scheme with non-standard padding -struct ElGamal -{ - typedef DL_CryptoSchemeOptions SchemeOptions; - - static const char * StaticAlgorithmName() {return "ElgamalEnc/Crypto++Padding";} - - typedef SchemeOptions::GroupParameters GroupParameters; - //! implements PK_Encryptor interface - typedef PK_FinalTemplate, SchemeOptions, SchemeOptions::PublicKey> > Encryptor; - //! implements PK_Decryptor interface - typedef PK_FinalTemplate, SchemeOptions, SchemeOptions::PrivateKey> > Decryptor; -}; - -typedef ElGamal::Encryptor ElGamalEncryptor; -typedef ElGamal::Decryptor ElGamalDecryptor; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.cpp deleted file mode 100644 index 3dbb7e8c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// emsa2.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "emsa2.h" - -#ifndef CRYPTOPP_IMPORTS - -NAMESPACE_BEGIN(CryptoPP) - -void EMSA2Pad::ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - assert(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize())); - - if (representativeBitLength % 8 != 7) - throw PK_SignatureScheme::InvalidKeyLength("EMSA2: EMSA2 requires a key length that is a multiple of 8"); - - size_t digestSize = hash.DigestSize(); - size_t representativeByteLength = BitsToBytes(representativeBitLength); - - representative[0] = messageEmpty ? 0x4b : 0x6b; - memset(representative+1, 0xbb, representativeByteLength-digestSize-4); // pad with 0xbb - byte *afterP2 = representative+representativeByteLength-digestSize-3; - afterP2[0] = 0xba; - hash.Final(afterP2+1); - representative[representativeByteLength-2] = *hashIdentifier.first; - representative[representativeByteLength-1] = 0xcc; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.h deleted file mode 100644 index 49109e6d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/emsa2.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef CRYPTOPP_EMSA2_H -#define CRYPTOPP_EMSA2_H - -/** \file - This file contains various padding schemes for public key algorithms. -*/ - -#include "cryptlib.h" -#include "pubkey.h" - -#ifdef CRYPTOPP_IS_DLL -#include "sha.h" -#endif - -NAMESPACE_BEGIN(CryptoPP) - -template class EMSA2HashId -{ -public: - static const byte id; -}; - -template -class EMSA2HashIdLookup : public BASE -{ -public: - struct HashIdentifierLookup - { - template struct HashIdentifierLookup2 - { - static HashIdentifier Lookup() - { - return HashIdentifier(&EMSA2HashId::id, 1); - } - }; - }; -}; - -// EMSA2HashId can be instantiated with the following classes. -class SHA1; -class RIPEMD160; -class RIPEMD128; -class SHA256; -class SHA384; -class SHA512; -class Whirlpool; -class SHA224; -// end of list - -#ifdef CRYPTOPP_IS_DLL -CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId; -CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId; -CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId; -CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId; -CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId; -#endif - -//! _ -class CRYPTOPP_DLL EMSA2Pad : public EMSA2HashIdLookup -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "EMSA2";} - - size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const - {return 8*digestLength + 31;} - - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; -}; - -//! EMSA2, for use with RWSS and RSA_ISO -/*! Only the following hash functions are supported by this signature standard: - \dontinclude emsa2.h - \skip EMSA2HashId can be instantiated - \until end of list -*/ -struct P1363_EMSA2 : public SignatureStandard -{ - typedef EMSA2Pad SignatureMessageEncodingMethod; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.cpp deleted file mode 100644 index a061cf6c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// eprecomp.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "eprecomp.h" -#include "asn.h" - -NAMESPACE_BEGIN(CryptoPP) - -template void DL_FixedBasePrecomputationImpl::SetBase(const DL_GroupPrecomputation &group, const Element &i_base) -{ - m_base = group.NeedConversions() ? group.ConvertIn(i_base) : i_base; - - if (m_bases.empty() || !(m_base == m_bases[0])) - { - m_bases.resize(1); - m_bases[0] = m_base; - } - - if (group.NeedConversions()) - m_base = i_base; -} - -template void DL_FixedBasePrecomputationImpl::Precompute(const DL_GroupPrecomputation &group, unsigned int maxExpBits, unsigned int storage) -{ - assert(m_bases.size() > 0); - assert(storage <= maxExpBits); - - if (storage > 1) - { - m_windowSize = (maxExpBits+storage-1)/storage; - m_exponentBase = Integer::Power2(m_windowSize); - } - - m_bases.resize(storage); - for (unsigned i=1; i void DL_FixedBasePrecomputationImpl::Load(const DL_GroupPrecomputation &group, BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - word32 version; - BERDecodeUnsigned(seq, version, INTEGER, 1, 1); - m_exponentBase.BERDecode(seq); - m_windowSize = m_exponentBase.BitCount() - 1; - m_bases.clear(); - while (!seq.EndReached()) - m_bases.push_back(group.BERDecodeElement(seq)); - if (!m_bases.empty() && group.NeedConversions()) - m_base = group.ConvertOut(m_bases[0]); - seq.MessageEnd(); -} - -template void DL_FixedBasePrecomputationImpl::Save(const DL_GroupPrecomputation &group, BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - DEREncodeUnsigned(seq, 1); // version - m_exponentBase.DEREncode(seq); - for (unsigned i=0; i void DL_FixedBasePrecomputationImpl::PrepareCascade(const DL_GroupPrecomputation &i_group, std::vector > &eb, const Integer &exponent) const -{ - const AbstractGroup &group = i_group.GetGroup(); - - Integer r, q, e = exponent; - bool fastNegate = group.InversionIsFast() && m_windowSize > 1; - unsigned int i; - - for (i=0; i+1(group.Inverse(m_bases[i]), m_exponentBase - r)); - } - else - eb.push_back(BaseAndExponent(m_bases[i], r)); - } - eb.push_back(BaseAndExponent(m_bases[i], e)); -} - -template T DL_FixedBasePrecomputationImpl::Exponentiate(const DL_GroupPrecomputation &group, const Integer &exponent) const -{ - std::vector > eb; // array of segments of the exponent and precalculated bases - eb.reserve(m_bases.size()); - PrepareCascade(group, eb, exponent); - return group.ConvertOut(GeneralCascadeMultiplication(group.GetGroup(), eb.begin(), eb.end())); -} - -template T - DL_FixedBasePrecomputationImpl::CascadeExponentiate(const DL_GroupPrecomputation &group, const Integer &exponent, - const DL_FixedBasePrecomputation &i_pc2, const Integer &exponent2) const -{ - std::vector > eb; // array of segments of the exponent and precalculated bases - const DL_FixedBasePrecomputationImpl &pc2 = static_cast &>(i_pc2); - eb.reserve(m_bases.size() + pc2.m_bases.size()); - PrepareCascade(group, eb, exponent); - pc2.PrepareCascade(group, eb, exponent2); - return group.ConvertOut(GeneralCascadeMultiplication(group.GetGroup(), eb.begin(), eb.end())); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.h deleted file mode 100644 index 1f325676..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/eprecomp.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef CRYPTOPP_EPRECOMP_H -#define CRYPTOPP_EPRECOMP_H - -#include "integer.h" -#include "algebra.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -template -class DL_GroupPrecomputation -{ -public: - typedef T Element; - - virtual bool NeedConversions() const {return false;} - virtual Element ConvertIn(const Element &v) const {return v;} - virtual Element ConvertOut(const Element &v) const {return v;} - virtual const AbstractGroup & GetGroup() const =0; - virtual Element BERDecodeElement(BufferedTransformation &bt) const =0; - virtual void DEREncodeElement(BufferedTransformation &bt, const Element &P) const =0; -}; - -template -class DL_FixedBasePrecomputation -{ -public: - typedef T Element; - - virtual bool IsInitialized() const =0; - virtual void SetBase(const DL_GroupPrecomputation &group, const Element &base) =0; - virtual const Element & GetBase(const DL_GroupPrecomputation &group) const =0; - virtual void Precompute(const DL_GroupPrecomputation &group, unsigned int maxExpBits, unsigned int storage) =0; - virtual void Load(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation) =0; - virtual void Save(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation) const =0; - virtual Element Exponentiate(const DL_GroupPrecomputation &group, const Integer &exponent) const =0; - virtual Element CascadeExponentiate(const DL_GroupPrecomputation &group, const Integer &exponent, const DL_FixedBasePrecomputation &pc2, const Integer &exponent2) const =0; -}; - -template -class DL_FixedBasePrecomputationImpl : public DL_FixedBasePrecomputation -{ -public: - typedef T Element; - - DL_FixedBasePrecomputationImpl() : m_windowSize(0) {} - - // DL_FixedBasePrecomputation - bool IsInitialized() const - {return !m_bases.empty();} - void SetBase(const DL_GroupPrecomputation &group, const Element &base); - const Element & GetBase(const DL_GroupPrecomputation &group) const - {return group.NeedConversions() ? m_base : m_bases[0];} - void Precompute(const DL_GroupPrecomputation &group, unsigned int maxExpBits, unsigned int storage); - void Load(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation); - void Save(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation) const; - Element Exponentiate(const DL_GroupPrecomputation &group, const Integer &exponent) const; - Element CascadeExponentiate(const DL_GroupPrecomputation &group, const Integer &exponent, const DL_FixedBasePrecomputation &pc2, const Integer &exponent2) const; - -private: - void PrepareCascade(const DL_GroupPrecomputation &group, std::vector > &eb, const Integer &exponent) const; - - Element m_base; - unsigned int m_windowSize; - Integer m_exponentBase; // what base to represent the exponent in - std::vector m_bases; // precalculated bases -}; - -NAMESPACE_END - -#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#include "eprecomp.cpp" -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.cpp deleted file mode 100644 index 8b42c1fa..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.cpp +++ /dev/null @@ -1,210 +0,0 @@ -// esign.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "esign.h" -#include "asn.h" -#include "modarith.h" -#include "nbtheory.h" -#include "sha.h" -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -void ESIGN_TestInstantiations() -{ - ESIGN::Verifier x1(1, 1); - ESIGN::Signer x2(NullRNG(), 1); - ESIGN::Verifier x3(x2); - ESIGN::Verifier x4(x2.GetKey()); - ESIGN::Verifier x5(x3); - ESIGN::Signer x6 = x2; - - x6 = x2; - x3 = ESIGN::Verifier(x2); - x4 = x2.GetKey(); -} - -void ESIGNFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - m_e.BERDecode(seq); - seq.MessageEnd(); -} - -void ESIGNFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - m_e.DEREncode(seq); - seq.MessageEnd(); -} - -Integer ESIGNFunction::ApplyFunction(const Integer &x) const -{ - DoQuickSanityCheck(); - return STDMIN(a_exp_b_mod_c(x, m_e, m_n) >> (2*GetK()+2), MaxImage()); -} - -bool ESIGNFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = true; - pass = pass && m_n > Integer::One() && m_n.IsOdd(); - pass = pass && m_e >= 8 && m_e < m_n; - return pass; -} - -bool ESIGNFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_GET_FUNCTION_ENTRY(PublicExponent) - ; -} - -void ESIGNFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_SET_FUNCTION_ENTRY(PublicExponent) - ; -} - -// ***************************************************************************** - -void InvertibleESIGNFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶m) -{ - int modulusSize = 1023*2; - param.GetIntValue("ModulusSize", modulusSize) || param.GetIntValue("KeySize", modulusSize); - - if (modulusSize < 24) - throw InvalidArgument("InvertibleESIGNFunction: specified modulus size is too small"); - - if (modulusSize % 3 != 0) - throw InvalidArgument("InvertibleESIGNFunction: modulus size must be divisible by 3"); - - m_e = param.GetValueWithDefault("PublicExponent", Integer(32)); - - if (m_e < 8) - throw InvalidArgument("InvertibleESIGNFunction: public exponents less than 8 may not be secure"); - - // VC70 workaround: putting these after primeParam causes overlapped stack allocation - ConstByteArrayParameter seedParam; - SecByteBlock seed; - - const Integer minP = Integer(204) << (modulusSize/3-8); - const Integer maxP = Integer::Power2(modulusSize/3)-1; - AlgorithmParameters primeParam = MakeParameters("Min", minP)("Max", maxP)("RandomNumberType", Integer::PRIME); - - if (param.GetValue("Seed", seedParam)) - { - seed.resize(seedParam.size() + 4); - memcpy(seed + 4, seedParam.begin(), seedParam.size()); - - PutWord(false, BIG_ENDIAN_ORDER, seed, (word32)0); - m_p.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("Seed", ConstByteArrayParameter(seed)))); - PutWord(false, BIG_ENDIAN_ORDER, seed, (word32)1); - m_q.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("Seed", ConstByteArrayParameter(seed)))); - } - else - { - m_p.GenerateRandom(rng, primeParam); - m_q.GenerateRandom(rng, primeParam); - } - - m_n = m_p * m_p * m_q; - - assert(m_n.BitCount() == modulusSize); -} - -void InvertibleESIGNFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder privateKey(bt); - m_n.BERDecode(privateKey); - m_e.BERDecode(privateKey); - m_p.BERDecode(privateKey); - m_q.BERDecode(privateKey); - privateKey.MessageEnd(); -} - -void InvertibleESIGNFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder privateKey(bt); - m_n.DEREncode(privateKey); - m_e.DEREncode(privateKey); - m_p.DEREncode(privateKey); - m_q.DEREncode(privateKey); - privateKey.MessageEnd(); -} - -Integer InvertibleESIGNFunction::CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const -{ - DoQuickSanityCheck(); - - Integer pq = m_p * m_q; - Integer p2 = m_p * m_p; - Integer r, z, re, a, w0, w1; - - do - { - r.Randomize(rng, Integer::Zero(), pq); - z = x << (2*GetK()+2); - re = a_exp_b_mod_c(r, m_e, m_n); - a = (z - re) % m_n; - Integer::Divide(w1, w0, a, pq); - if (w1.NotZero()) - { - ++w0; - w1 = pq - w1; - } - } - while ((w1 >> 2*GetK()+1).IsPositive()); - - ModularArithmetic modp(m_p); - Integer t = modp.Divide(w0 * r % m_p, m_e * re % m_p); - Integer s = r + t*pq; - assert(s < m_n); -/* - using namespace std; - cout << "f = " << x << endl; - cout << "r = " << r << endl; - cout << "z = " << z << endl; - cout << "a = " << a << endl; - cout << "w0 = " << w0 << endl; - cout << "w1 = " << w1 << endl; - cout << "t = " << t << endl; - cout << "s = " << s << endl; -*/ - return s; -} - -bool InvertibleESIGNFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = ESIGNFunction::Validate(rng, level); - pass = pass && m_p > Integer::One() && m_p.IsOdd() && m_p < m_n; - pass = pass && m_q > Integer::One() && m_q.IsOdd() && m_q < m_n; - pass = pass && m_p.BitCount() == m_q.BitCount(); - if (level >= 1) - pass = pass && m_p * m_p * m_q == m_n; - if (level >= 2) - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - return pass; -} - -bool InvertibleESIGNFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_GET_FUNCTION_ENTRY(Prime2) - ; -} - -void InvertibleESIGNFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime2) - ; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.h deleted file mode 100644 index 8eecbc5a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/esign.h +++ /dev/null @@ -1,128 +0,0 @@ -#ifndef CRYPTOPP_ESIGN_H -#define CRYPTOPP_ESIGN_H - -/** \file - This file contains classes that implement the - ESIGN signature schemes as defined in IEEE P1363a. -*/ - -#include "pubkey.h" -#include "integer.h" -#include "asn.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class ESIGNFunction : public TrapdoorFunction, public ASN1CryptoMaterial -{ - typedef ESIGNFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &e) - {m_n = n; m_e = e;} - - // PublicKey - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - // CryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // TrapdoorFunction - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return m_n;} - Integer ImageBound() const {return Integer::Power2(GetK());} - - // non-derived - const Integer & GetModulus() const {return m_n;} - const Integer & GetPublicExponent() const {return m_e;} - - void SetModulus(const Integer &n) {m_n = n;} - void SetPublicExponent(const Integer &e) {m_e = e;} - -protected: - unsigned int GetK() const {return m_n.BitCount()/3-1;} - - Integer m_n, m_e; -}; - -//! _ -class InvertibleESIGNFunction : public ESIGNFunction, public RandomizedTrapdoorFunctionInverse, public PrivateKey -{ - typedef InvertibleESIGNFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &e, const Integer &p, const Integer &q) - {m_n = n; m_e = e; m_p = p; m_q = q;} - // generate a random private key - void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits) - {GenerateRandomWithKeySize(rng, modulusBits);} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const; - - // GeneratibleCryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - /*! parameters: (ModulusSize) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - - const Integer& GetPrime1() const {return m_p;} - const Integer& GetPrime2() const {return m_q;} - - void SetPrime1(const Integer &p) {m_p = p;} - void SetPrime2(const Integer &q) {m_q = q;} - -protected: - Integer m_p, m_q; -}; - -//! _ -template -class EMSA5Pad : public PK_DeterministicSignatureMessageEncodingMethod -{ -public: - static const char *StaticAlgorithmName() {return "EMSA5";} - - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const - { - SecByteBlock digest(hash.DigestSize()); - hash.Final(digest); - size_t representativeByteLength = BitsToBytes(representativeBitLength); - T mgf; - mgf.GenerateAndMask(hash, representative, representativeByteLength, digest, digest.size(), false); - if (representativeBitLength % 8 != 0) - representative[0] = (byte)Crop(representative[0], representativeBitLength % 8); - } -}; - -//! EMSA5, for use with ESIGN -struct P1363_EMSA5 : public SignatureStandard -{ - typedef EMSA5Pad SignatureMessageEncodingMethod; -}; - -struct ESIGN_Keys -{ - static std::string StaticAlgorithmName() {return "ESIGN";} - typedef ESIGNFunction PublicKey; - typedef InvertibleESIGNFunction PrivateKey; -}; - -//! ESIGN, as defined in IEEE P1363a -template -struct ESIGN : public TF_SS -{ -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/factory.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/factory.h deleted file mode 100644 index ef5a59e4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/factory.h +++ /dev/null @@ -1,135 +0,0 @@ -#ifndef CRYPTOPP_OBJFACT_H -#define CRYPTOPP_OBJFACT_H - -#include "cryptlib.h" -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -class ObjectFactory -{ -public: - virtual AbstractClass * CreateObject() const =0; -}; - -//! _ -template -class DefaultObjectFactory : public ObjectFactory -{ -public: - AbstractClass * CreateObject() const - { - return new ConcreteClass; - } - -}; - -//! _ -template -class ObjectFactoryRegistry -{ -public: - class FactoryNotFound : public Exception - { - public: - FactoryNotFound(const char *name) : Exception(OTHER_ERROR, std::string("ObjectFactoryRegistry: could not find factory for algorithm ") + name) {} - }; - - ~ObjectFactoryRegistry() - { - for (CPP_TYPENAME Map::iterator i = m_map.begin(); i != m_map.end(); ++i) - { - delete (ObjectFactory *)i->second; - i->second = NULL; - } - } - - void RegisterFactory(const std::string &name, ObjectFactory *factory) - { - m_map[name] = factory; - } - - const ObjectFactory * GetFactory(const char *name) const - { - CPP_TYPENAME Map::const_iterator i = m_map.find(name); - return i == m_map.end() ? NULL : (ObjectFactory *)i->second; - } - - AbstractClass *CreateObject(const char *name) const - { - const ObjectFactory *factory = GetFactory(name); - if (!factory) - throw FactoryNotFound(name); - return factory->CreateObject(); - } - - // Return a vector containing the factory names. This is easier than returning an iterator. - // from Andrew Pitonyak - std::vector GetFactoryNames() const - { - std::vector names; - CPP_TYPENAME Map::const_iterator iter; - for (iter = m_map.begin(); iter != m_map.end(); ++iter) - names.push_back(iter->first); - return names; - } - - CRYPTOPP_NOINLINE static ObjectFactoryRegistry & Registry(CRYPTOPP_NOINLINE_DOTDOTDOT); - -private: - // use void * instead of ObjectFactory * to save code size - typedef std::map Map; - Map m_map; -}; - -template -ObjectFactoryRegistry & ObjectFactoryRegistry::Registry(CRYPTOPP_NOINLINE_DOTDOTDOT) -{ - static ObjectFactoryRegistry s_registry; - return s_registry; -} - -template -struct RegisterDefaultFactoryFor { -RegisterDefaultFactoryFor(const char *name=NULL) -{ - // BCB2006 workaround - std::string n = name ? std::string(name) : std::string(ConcreteClass::StaticAlgorithmName()); - ObjectFactoryRegistry::Registry(). - RegisterFactory(n, new DefaultObjectFactory); -}}; - -template -void RegisterAsymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) -{ - RegisterDefaultFactoryFor((const char *)name); - RegisterDefaultFactoryFor((const char *)name); -} - -template -void RegisterSignatureSchemeDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) -{ - RegisterDefaultFactoryFor((const char *)name); - RegisterDefaultFactoryFor((const char *)name); -} - -template -void RegisterSymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) -{ - RegisterDefaultFactoryFor((const char *)name); - RegisterDefaultFactoryFor((const char *)name); -} - -template -void RegisterAuthenticatedSymmetricCipherDefaultFactories(const char *name=NULL, SchemeClass *dummy=NULL) -{ - RegisterDefaultFactoryFor((const char *)name); - RegisterDefaultFactoryFor((const char *)name); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/files.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/files.cpp deleted file mode 100644 index 453b5624..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/files.cpp +++ /dev/null @@ -1,259 +0,0 @@ -// files.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "files.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -using namespace std; - -#ifndef NDEBUG -void Files_TestInstantiations() -{ - FileStore f0; - FileSource f1; - FileSink f2; -} -#endif - -void FileStore::StoreInitialize(const NameValuePairs ¶meters) -{ - m_waiting = false; - m_stream = NULL; - m_file.release(); - - const char *fileName = NULL; -#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400 - const wchar_t *fileNameWide = NULL; - if (!parameters.GetValue(Name::InputFileNameWide(), fileNameWide)) -#endif - if (!parameters.GetValue(Name::InputFileName(), fileName)) - { - parameters.GetValue(Name::InputStreamPointer(), m_stream); - return; - } - - ios::openmode binary = parameters.GetValueWithDefault(Name::InputBinaryMode(), true) ? ios::binary : ios::openmode(0); - m_file.reset(new std::ifstream); -#ifdef CRYPTOPP_UNIX_AVAILABLE - std::string narrowed; - if (fileNameWide) - fileName = (narrowed = StringNarrow(fileNameWide)).c_str(); -#endif -#if _MSC_VER >= 1400 - if (fileNameWide) - { - m_file->open(fileNameWide, ios::in | binary); - if (!*m_file) - throw OpenErr(StringNarrow(fileNameWide, false)); - } -#endif - if (fileName) - { - m_file->open(fileName, ios::in | binary); - if (!*m_file) - throw OpenErr(fileName); - } - m_stream = m_file.get(); -} - -lword FileStore::MaxRetrievable() const -{ - if (!m_stream) - return 0; - - streampos current = m_stream->tellg(); - streampos end = m_stream->seekg(0, ios::end).tellg(); - m_stream->seekg(current); - return end-current; -} - -size_t FileStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - if (!m_stream) - { - transferBytes = 0; - return 0; - } - - lword size=transferBytes; - transferBytes = 0; - - if (m_waiting) - goto output; - - while (size && m_stream->good()) - { - { - size_t spaceSize = 1024; - m_space = HelpCreatePutSpace(target, channel, 1, UnsignedMin(size_t(0)-1, size), spaceSize); - - m_stream->read((char *)m_space, (unsigned int)STDMIN(size, (lword)spaceSize)); - } - m_len = (size_t)m_stream->gcount(); - size_t blockedBytes; -output: - blockedBytes = target.ChannelPutModifiable2(channel, m_space, m_len, 0, blocking); - m_waiting = blockedBytes > 0; - if (m_waiting) - return blockedBytes; - size -= m_len; - transferBytes += m_len; - } - - if (!m_stream->good() && !m_stream->eof()) - throw ReadErr(); - - return 0; -} - -size_t FileStore::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - if (!m_stream) - return 0; - - if (begin == 0 && end == 1) - { - int result = m_stream->peek(); - if (result == char_traits::eof()) - return 0; - else - { - size_t blockedBytes = target.ChannelPut(channel, byte(result), blocking); - begin += 1-blockedBytes; - return blockedBytes; - } - } - - // TODO: figure out what happens on cin - streampos current = m_stream->tellg(); - streampos endPosition = m_stream->seekg(0, ios::end).tellg(); - streampos newPosition = current + (streamoff)begin; - - if (newPosition >= endPosition) - { - m_stream->seekg(current); - return 0; // don't try to seek beyond the end of file - } - m_stream->seekg(newPosition); - try - { - assert(!m_waiting); - lword copyMax = end-begin; - size_t blockedBytes = const_cast(this)->TransferTo2(target, copyMax, channel, blocking); - begin += copyMax; - if (blockedBytes) - { - const_cast(this)->m_waiting = false; - return blockedBytes; - } - } - catch(...) - { - m_stream->clear(); - m_stream->seekg(current); - throw; - } - m_stream->clear(); - m_stream->seekg(current); - - return 0; -} - -lword FileStore::Skip(lword skipMax) -{ - if (!m_stream) - return 0; - - lword oldPos = m_stream->tellg(); - std::istream::off_type offset; - if (!SafeConvert(skipMax, offset)) - throw InvalidArgument("FileStore: maximum seek offset exceeded"); - m_stream->seekg(offset, ios::cur); - return (lword)m_stream->tellg() - oldPos; -} - -void FileSink::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_stream = NULL; - m_file.release(); - - const char *fileName = NULL; -#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400 - const wchar_t *fileNameWide = NULL; - if (!parameters.GetValue(Name::OutputFileNameWide(), fileNameWide)) -#endif - if (!parameters.GetValue(Name::OutputFileName(), fileName)) - { - parameters.GetValue(Name::OutputStreamPointer(), m_stream); - return; - } - - ios::openmode binary = parameters.GetValueWithDefault(Name::OutputBinaryMode(), true) ? ios::binary : ios::openmode(0); - m_file.reset(new std::ofstream); -#ifdef CRYPTOPP_UNIX_AVAILABLE - std::string narrowed; - if (fileNameWide) - fileName = (narrowed = StringNarrow(fileNameWide)).c_str(); -#endif -#if _MSC_VER >= 1400 - if (fileNameWide) - { - m_file->open(fileNameWide, ios::out | ios::trunc | binary); - if (!*m_file) - throw OpenErr(StringNarrow(fileNameWide, false)); - } -#endif - if (fileName) - { - m_file->open(fileName, ios::out | ios::trunc | binary); - if (!*m_file) - throw OpenErr(fileName); - } - m_stream = m_file.get(); -} - -bool FileSink::IsolatedFlush(bool hardFlush, bool blocking) -{ - if (!m_stream) - throw Err("FileSink: output stream not opened"); - - m_stream->flush(); - if (!m_stream->good()) - throw WriteErr(); - - return false; -} - -size_t FileSink::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - if (!m_stream) - throw Err("FileSink: output stream not opened"); - - while (length > 0) - { - std::streamsize size; - if (!SafeConvert(length, size)) - size = numeric_limits::max(); - m_stream->write((const char *)inString, size); - inString += size; - length -= (size_t)size; - } - - if (messageEnd) - m_stream->flush(); - - if (!m_stream->good()) - throw WriteErr(); - - return 0; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/files.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/files.h deleted file mode 100644 index a47e856b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/files.h +++ /dev/null @@ -1,112 +0,0 @@ -#ifndef CRYPTOPP_FILES_H -#define CRYPTOPP_FILES_H - -#include "cryptlib.h" -#include "filters.h" -#include "argnames.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! file-based implementation of Store interface -class CRYPTOPP_DLL FileStore : public Store, private FilterPutSpaceHelper, public NotCopyable -{ -public: - class Err : public Exception - { - public: - Err(const std::string &s) : Exception(IO_ERROR, s) {} - }; - class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileStore: error opening file for reading: " + filename) {}}; - class ReadErr : public Err {public: ReadErr() : Err("FileStore: error reading file") {}}; - - FileStore() : m_stream(NULL) {} - FileStore(std::istream &in) - {StoreInitialize(MakeParameters(Name::InputStreamPointer(), &in));} - FileStore(const char *filename) - {StoreInitialize(MakeParameters(Name::InputFileName(), filename));} -#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400 - //! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called. - FileStore(const wchar_t *filename) - {StoreInitialize(MakeParameters(Name::InputFileNameWide(), filename));} -#endif - - std::istream* GetStream() {return m_stream;} - - lword MaxRetrievable() const; - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - lword Skip(lword skipMax=ULONG_MAX); - -private: - void StoreInitialize(const NameValuePairs ¶meters); - - member_ptr m_file; - std::istream *m_stream; - byte *m_space; - size_t m_len; - bool m_waiting; -}; - -//! file-based implementation of Source interface -class CRYPTOPP_DLL FileSource : public SourceTemplate -{ -public: - typedef FileStore::Err Err; - typedef FileStore::OpenErr OpenErr; - typedef FileStore::ReadErr ReadErr; - - FileSource(BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {} - FileSource(std::istream &in, bool pumpAll, BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputStreamPointer(), &in));} - FileSource(const char *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputFileName(), filename)(Name::InputBinaryMode(), binary));} -#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400 - //! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called. - FileSource(const wchar_t *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputFileNameWide(), filename)(Name::InputBinaryMode(), binary));} -#endif - - std::istream* GetStream() {return m_store.GetStream();} -}; - -//! file-based implementation of Sink interface -class CRYPTOPP_DLL FileSink : public Sink, public NotCopyable -{ -public: - class Err : public Exception - { - public: - Err(const std::string &s) : Exception(IO_ERROR, s) {} - }; - class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileSink: error opening file for writing: " + filename) {}}; - class WriteErr : public Err {public: WriteErr() : Err("FileSink: error writing file") {}}; - - FileSink() : m_stream(NULL) {} - FileSink(std::ostream &out) - {IsolatedInitialize(MakeParameters(Name::OutputStreamPointer(), &out));} - FileSink(const char *filename, bool binary=true) - {IsolatedInitialize(MakeParameters(Name::OutputFileName(), filename)(Name::OutputBinaryMode(), binary));} -#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400 - //! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called. - FileSink(const wchar_t *filename, bool binary=true) - {IsolatedInitialize(MakeParameters(Name::OutputFileNameWide(), filename)(Name::OutputBinaryMode(), binary));} -#endif - - std::ostream* GetStream() {return m_stream;} - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - bool IsolatedFlush(bool hardFlush, bool blocking); - -private: - member_ptr m_file; - std::ostream *m_stream; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.cpp deleted file mode 100644 index 083dfd36..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.cpp +++ /dev/null @@ -1,1120 +0,0 @@ -// filters.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "filters.h" -#include "mqueue.h" -#include "fltrimpl.h" -#include "argnames.h" -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -Filter::Filter(BufferedTransformation *attachment) - : m_attachment(attachment), m_continueAt(0) -{ -} - -BufferedTransformation * Filter::NewDefaultAttachment() const -{ - return new MessageQueue; -} - -BufferedTransformation * Filter::AttachedTransformation() -{ - if (m_attachment.get() == NULL) - m_attachment.reset(NewDefaultAttachment()); - return m_attachment.get(); -} - -const BufferedTransformation *Filter::AttachedTransformation() const -{ - if (m_attachment.get() == NULL) - const_cast(this)->m_attachment.reset(NewDefaultAttachment()); - return m_attachment.get(); -} - -void Filter::Detach(BufferedTransformation *newOut) -{ - m_attachment.reset(newOut); -} - -void Filter::Insert(Filter *filter) -{ - filter->m_attachment.reset(m_attachment.release()); - m_attachment.reset(filter); -} - -size_t Filter::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - return AttachedTransformation()->CopyRangeTo2(target, begin, end, channel, blocking); -} - -size_t Filter::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - return AttachedTransformation()->TransferTo2(target, transferBytes, channel, blocking); -} - -void Filter::Initialize(const NameValuePairs ¶meters, int propagation) -{ - m_continueAt = 0; - IsolatedInitialize(parameters); - PropagateInitialize(parameters, propagation); -} - -bool Filter::Flush(bool hardFlush, int propagation, bool blocking) -{ - switch (m_continueAt) - { - case 0: - if (IsolatedFlush(hardFlush, blocking)) - return true; - case 1: - if (OutputFlush(1, hardFlush, propagation, blocking)) - return true; - } - return false; -} - -bool Filter::MessageSeriesEnd(int propagation, bool blocking) -{ - switch (m_continueAt) - { - case 0: - if (IsolatedMessageSeriesEnd(blocking)) - return true; - case 1: - if (ShouldPropagateMessageSeriesEnd() && OutputMessageSeriesEnd(1, propagation, blocking)) - return true; - } - return false; -} - -void Filter::PropagateInitialize(const NameValuePairs ¶meters, int propagation) -{ - if (propagation) - AttachedTransformation()->Initialize(parameters, propagation-1); -} - -size_t Filter::OutputModifiable(int outputSite, byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel) -{ - if (messageEnd) - messageEnd--; - size_t result = AttachedTransformation()->ChannelPutModifiable2(channel, inString, length, messageEnd, blocking); - m_continueAt = result ? outputSite : 0; - return result; -} - -size_t Filter::Output(int outputSite, const byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel) -{ - if (messageEnd) - messageEnd--; - size_t result = AttachedTransformation()->ChannelPut2(channel, inString, length, messageEnd, blocking); - m_continueAt = result ? outputSite : 0; - return result; -} - -bool Filter::OutputFlush(int outputSite, bool hardFlush, int propagation, bool blocking, const std::string &channel) -{ - if (propagation && AttachedTransformation()->ChannelFlush(channel, hardFlush, propagation-1, blocking)) - { - m_continueAt = outputSite; - return true; - } - m_continueAt = 0; - return false; -} - -bool Filter::OutputMessageSeriesEnd(int outputSite, int propagation, bool blocking, const std::string &channel) -{ - if (propagation && AttachedTransformation()->ChannelMessageSeriesEnd(channel, propagation-1, blocking)) - { - m_continueAt = outputSite; - return true; - } - m_continueAt = 0; - return false; -} - -// ************************************************************* - -void MeterFilter::ResetMeter() -{ - m_currentMessageBytes = m_totalBytes = m_currentSeriesMessages = m_totalMessages = m_totalMessageSeries = 0; - m_rangesToSkip.clear(); -} - -void MeterFilter::AddRangeToSkip(unsigned int message, lword position, lword size, bool sortNow) -{ - MessageRange r = {message, position, size}; - m_rangesToSkip.push_back(r); - if (sortNow) - std::sort(m_rangesToSkip.begin(), m_rangesToSkip.end()); -} - -size_t MeterFilter::PutMaybeModifiable(byte *begin, size_t length, int messageEnd, bool blocking, bool modifiable) -{ - if (!m_transparent) - return 0; - - size_t t; - FILTER_BEGIN; - - m_begin = begin; - m_length = length; - - while (m_length > 0 || messageEnd) - { - if (m_length > 0 && !m_rangesToSkip.empty() && m_rangesToSkip.front().message == m_totalMessages && m_currentMessageBytes + m_length > m_rangesToSkip.front().position) - { - FILTER_OUTPUT_MAYBE_MODIFIABLE(1, m_begin, t = (size_t)SaturatingSubtract(m_rangesToSkip.front().position, m_currentMessageBytes), false, modifiable); - - assert(t < m_length); - m_begin += t; - m_length -= t; - m_currentMessageBytes += t; - m_totalBytes += t; - - if (m_currentMessageBytes + m_length < m_rangesToSkip.front().position + m_rangesToSkip.front().size) - t = m_length; - else - { - t = (size_t)SaturatingSubtract(m_rangesToSkip.front().position + m_rangesToSkip.front().size, m_currentMessageBytes); - assert(t <= m_length); - m_rangesToSkip.pop_front(); - } - - m_begin += t; - m_length -= t; - m_currentMessageBytes += t; - m_totalBytes += t; - } - else - { - FILTER_OUTPUT_MAYBE_MODIFIABLE(2, m_begin, m_length, messageEnd, modifiable); - - m_currentMessageBytes += m_length; - m_totalBytes += m_length; - m_length = 0; - - if (messageEnd) - { - m_currentMessageBytes = 0; - m_currentSeriesMessages++; - m_totalMessages++; - messageEnd = false; - } - } - } - - FILTER_END_NO_MESSAGE_END; -} - -size_t MeterFilter::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - return PutMaybeModifiable(const_cast(begin), length, messageEnd, blocking, false); -} - -size_t MeterFilter::PutModifiable2(byte *begin, size_t length, int messageEnd, bool blocking) -{ - return PutMaybeModifiable(begin, length, messageEnd, blocking, true); -} - -bool MeterFilter::IsolatedMessageSeriesEnd(bool blocking) -{ - m_currentMessageBytes = 0; - m_currentSeriesMessages = 0; - m_totalMessageSeries++; - return false; -} - -// ************************************************************* - -void FilterWithBufferedInput::BlockQueue::ResetQueue(size_t blockSize, size_t maxBlocks) -{ - m_buffer.New(blockSize * maxBlocks); - m_blockSize = blockSize; - m_maxBlocks = maxBlocks; - m_size = 0; - m_begin = m_buffer; -} - -byte *FilterWithBufferedInput::BlockQueue::GetBlock() -{ - if (m_size >= m_blockSize) - { - byte *ptr = m_begin; - if ((m_begin+=m_blockSize) == m_buffer.end()) - m_begin = m_buffer; - m_size -= m_blockSize; - return ptr; - } - else - return NULL; -} - -byte *FilterWithBufferedInput::BlockQueue::GetContigousBlocks(size_t &numberOfBytes) -{ - numberOfBytes = STDMIN(numberOfBytes, STDMIN(size_t(m_buffer.end()-m_begin), m_size)); - byte *ptr = m_begin; - m_begin += numberOfBytes; - m_size -= numberOfBytes; - if (m_size == 0 || m_begin == m_buffer.end()) - m_begin = m_buffer; - return ptr; -} - -size_t FilterWithBufferedInput::BlockQueue::GetAll(byte *outString) -{ - size_t size = m_size; - size_t numberOfBytes = m_maxBlocks*m_blockSize; - const byte *ptr = GetContigousBlocks(numberOfBytes); - memcpy(outString, ptr, numberOfBytes); - memcpy(outString+numberOfBytes, m_begin, m_size); - m_size = 0; - return size; -} - -void FilterWithBufferedInput::BlockQueue::Put(const byte *inString, size_t length) -{ - assert(m_size + length <= m_buffer.size()); - byte *end = (m_size < size_t(m_buffer.end()-m_begin)) ? m_begin + m_size : m_begin + m_size - m_buffer.size(); - size_t len = STDMIN(length, size_t(m_buffer.end()-end)); - memcpy(end, inString, len); - if (len < length) - memcpy(m_buffer, inString+len, length-len); - m_size += length; -} - -FilterWithBufferedInput::FilterWithBufferedInput(BufferedTransformation *attachment) - : Filter(attachment) -{ -} - -FilterWithBufferedInput::FilterWithBufferedInput(size_t firstSize, size_t blockSize, size_t lastSize, BufferedTransformation *attachment) - : Filter(attachment), m_firstSize(firstSize), m_blockSize(blockSize), m_lastSize(lastSize) - , m_firstInputDone(false) -{ - if (m_firstSize < 0 || m_blockSize < 1 || m_lastSize < 0) - throw InvalidArgument("FilterWithBufferedInput: invalid buffer size"); - - m_queue.ResetQueue(1, m_firstSize); -} - -void FilterWithBufferedInput::IsolatedInitialize(const NameValuePairs ¶meters) -{ - InitializeDerivedAndReturnNewSizes(parameters, m_firstSize, m_blockSize, m_lastSize); - if (m_firstSize < 0 || m_blockSize < 1 || m_lastSize < 0) - throw InvalidArgument("FilterWithBufferedInput: invalid buffer size"); - m_queue.ResetQueue(1, m_firstSize); - m_firstInputDone = false; -} - -bool FilterWithBufferedInput::IsolatedFlush(bool hardFlush, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("FilterWithBufferedInput"); - - if (hardFlush) - ForceNextPut(); - FlushDerived(); - - return false; -} - -size_t FilterWithBufferedInput::PutMaybeModifiable(byte *inString, size_t length, int messageEnd, bool blocking, bool modifiable) -{ - if (!blocking) - throw BlockingInputOnly("FilterWithBufferedInput"); - - if (length != 0) - { - size_t newLength = m_queue.CurrentSize() + length; - - if (!m_firstInputDone && newLength >= m_firstSize) - { - size_t len = m_firstSize - m_queue.CurrentSize(); - m_queue.Put(inString, len); - FirstPut(m_queue.GetContigousBlocks(m_firstSize)); - assert(m_queue.CurrentSize() == 0); - m_queue.ResetQueue(m_blockSize, (2*m_blockSize+m_lastSize-2)/m_blockSize); - - inString += len; - newLength -= m_firstSize; - m_firstInputDone = true; - } - - if (m_firstInputDone) - { - if (m_blockSize == 1) - { - while (newLength > m_lastSize && m_queue.CurrentSize() > 0) - { - size_t len = newLength - m_lastSize; - byte *ptr = m_queue.GetContigousBlocks(len); - NextPutModifiable(ptr, len); - newLength -= len; - } - - if (newLength > m_lastSize) - { - size_t len = newLength - m_lastSize; - NextPutMaybeModifiable(inString, len, modifiable); - inString += len; - newLength -= len; - } - } - else - { - while (newLength >= m_blockSize + m_lastSize && m_queue.CurrentSize() >= m_blockSize) - { - NextPutModifiable(m_queue.GetBlock(), m_blockSize); - newLength -= m_blockSize; - } - - if (newLength >= m_blockSize + m_lastSize && m_queue.CurrentSize() > 0) - { - assert(m_queue.CurrentSize() < m_blockSize); - size_t len = m_blockSize - m_queue.CurrentSize(); - m_queue.Put(inString, len); - inString += len; - NextPutModifiable(m_queue.GetBlock(), m_blockSize); - newLength -= m_blockSize; - } - - if (newLength >= m_blockSize + m_lastSize) - { - size_t len = RoundDownToMultipleOf(newLength - m_lastSize, m_blockSize); - NextPutMaybeModifiable(inString, len, modifiable); - inString += len; - newLength -= len; - } - } - } - - m_queue.Put(inString, newLength - m_queue.CurrentSize()); - } - - if (messageEnd) - { - if (!m_firstInputDone && m_firstSize==0) - FirstPut(NULL); - - SecByteBlock temp(m_queue.CurrentSize()); - m_queue.GetAll(temp); - LastPut(temp, temp.size()); - - m_firstInputDone = false; - m_queue.ResetQueue(1, m_firstSize); - - Output(1, NULL, 0, messageEnd, blocking); - } - return 0; -} - -void FilterWithBufferedInput::ForceNextPut() -{ - if (!m_firstInputDone) - return; - - if (m_blockSize > 1) - { - while (m_queue.CurrentSize() >= m_blockSize) - NextPutModifiable(m_queue.GetBlock(), m_blockSize); - } - else - { - size_t len; - while ((len = m_queue.CurrentSize()) > 0) - NextPutModifiable(m_queue.GetContigousBlocks(len), len); - } -} - -void FilterWithBufferedInput::NextPutMultiple(const byte *inString, size_t length) -{ - assert(m_blockSize > 1); // m_blockSize = 1 should always override this function - while (length > 0) - { - assert(length >= m_blockSize); - NextPutSingle(inString); - inString += m_blockSize; - length -= m_blockSize; - } -} - -// ************************************************************* - -void Redirector::Initialize(const NameValuePairs ¶meters, int propagation) -{ - m_target = parameters.GetValueWithDefault("RedirectionTargetPointer", (BufferedTransformation*)NULL); - m_behavior = parameters.GetIntValueWithDefault("RedirectionBehavior", PASS_EVERYTHING); - - if (m_target && GetPassSignals()) - m_target->Initialize(parameters, propagation); -} - -// ************************************************************* - -ProxyFilter::ProxyFilter(BufferedTransformation *filter, size_t firstSize, size_t lastSize, BufferedTransformation *attachment) - : FilterWithBufferedInput(firstSize, 1, lastSize, attachment), m_filter(filter) -{ - if (m_filter.get()) - m_filter->Attach(new OutputProxy(*this, false)); -} - -bool ProxyFilter::IsolatedFlush(bool hardFlush, bool blocking) -{ - return m_filter.get() ? m_filter->Flush(hardFlush, -1, blocking) : false; -} - -void ProxyFilter::SetFilter(Filter *filter) -{ - m_filter.reset(filter); - if (filter) - { - OutputProxy *proxy; - std::auto_ptr temp(proxy = new OutputProxy(*this, false)); - m_filter->TransferAllTo(*proxy); - m_filter->Attach(temp.release()); - } -} - -void ProxyFilter::NextPutMultiple(const byte *s, size_t len) -{ - if (m_filter.get()) - m_filter->Put(s, len); -} - -void ProxyFilter::NextPutModifiable(byte *s, size_t len) -{ - if (m_filter.get()) - m_filter->PutModifiable(s, len); -} - -// ************************************************************* - -void RandomNumberSink::IsolatedInitialize(const NameValuePairs ¶meters) -{ - parameters.GetRequiredParameter("RandomNumberSink", "RandomNumberGeneratorPointer", m_rng); -} - -size_t RandomNumberSink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - m_rng->IncorporateEntropy(begin, length); - return 0; -} - -size_t ArraySink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (m_buf+m_total != begin) - memcpy(m_buf+m_total, begin, STDMIN(length, SaturatingSubtract(m_size, m_total))); - m_total += length; - return 0; -} - -byte * ArraySink::CreatePutSpace(size_t &size) -{ - size = SaturatingSubtract(m_size, m_total); - return m_buf + m_total; -} - -void ArraySink::IsolatedInitialize(const NameValuePairs ¶meters) -{ - ByteArrayParameter array; - if (!parameters.GetValue(Name::OutputBuffer(), array)) - throw InvalidArgument("ArraySink: missing OutputBuffer argument"); - m_buf = array.begin(); - m_size = array.size(); - m_total = 0; -} - -size_t ArrayXorSink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - xorbuf(m_buf+m_total, begin, STDMIN(length, SaturatingSubtract(m_size, m_total))); - m_total += length; - return 0; -} - -// ************************************************************* - -StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment, BlockPaddingScheme padding, bool allowAuthenticatedSymmetricCipher) - : FilterWithBufferedInput(attachment) - , m_cipher(c) -{ - assert(c.MinLastBlockSize() == 0 || c.MinLastBlockSize() > c.MandatoryBlockSize()); - - if (!allowAuthenticatedSymmetricCipher && dynamic_cast(&c) != 0) - throw InvalidArgument("StreamTransformationFilter: please use AuthenticatedEncryptionFilter and AuthenticatedDecryptionFilter for AuthenticatedSymmetricCipher"); - - IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)); -} - -size_t StreamTransformationFilter::LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding) -{ - if (c.MinLastBlockSize() > 0) - return c.MinLastBlockSize(); - else if (c.MandatoryBlockSize() > 1 && !c.IsForwardTransformation() && padding != NO_PADDING && padding != ZEROS_PADDING) - return c.MandatoryBlockSize(); - else - return 0; -} - -void StreamTransformationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize) -{ - BlockPaddingScheme padding = parameters.GetValueWithDefault(Name::BlockPaddingScheme(), DEFAULT_PADDING); - bool isBlockCipher = (m_cipher.MandatoryBlockSize() > 1 && m_cipher.MinLastBlockSize() == 0); - - if (padding == DEFAULT_PADDING) - m_padding = isBlockCipher ? PKCS_PADDING : NO_PADDING; - else - m_padding = padding; - - if (!isBlockCipher && (m_padding == PKCS_PADDING || m_padding == ONE_AND_ZEROS_PADDING)) - throw InvalidArgument("StreamTransformationFilter: PKCS_PADDING and ONE_AND_ZEROS_PADDING cannot be used with " + m_cipher.AlgorithmName()); - - firstSize = 0; - blockSize = m_cipher.MandatoryBlockSize(); - lastSize = LastBlockSize(m_cipher, m_padding); -} - -void StreamTransformationFilter::FirstPut(const byte *inString) -{ - m_optimalBufferSize = m_cipher.OptimalBlockSize(); - m_optimalBufferSize = (unsigned int)STDMAX(m_optimalBufferSize, RoundDownToMultipleOf(4096U, m_optimalBufferSize)); -} - -void StreamTransformationFilter::NextPutMultiple(const byte *inString, size_t length) -{ - if (!length) - return; - - size_t s = m_cipher.MandatoryBlockSize(); - - do - { - size_t len = m_optimalBufferSize; - byte *space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, s, length, len); - if (len < length) - { - if (len == m_optimalBufferSize) - len -= m_cipher.GetOptimalBlockSizeUsed(); - len = RoundDownToMultipleOf(len, s); - } - else - len = length; - m_cipher.ProcessString(space, inString, len); - AttachedTransformation()->PutModifiable(space, len); - inString += len; - length -= len; - } - while (length > 0); -} - -void StreamTransformationFilter::NextPutModifiable(byte *inString, size_t length) -{ - m_cipher.ProcessString(inString, length); - AttachedTransformation()->PutModifiable(inString, length); -} - -void StreamTransformationFilter::LastPut(const byte *inString, size_t length) -{ - byte *space = NULL; - - switch (m_padding) - { - case NO_PADDING: - case ZEROS_PADDING: - if (length > 0) - { - size_t minLastBlockSize = m_cipher.MinLastBlockSize(); - bool isForwardTransformation = m_cipher.IsForwardTransformation(); - - if (isForwardTransformation && m_padding == ZEROS_PADDING && (minLastBlockSize == 0 || length < minLastBlockSize)) - { - // do padding - size_t blockSize = STDMAX(minLastBlockSize, (size_t)m_cipher.MandatoryBlockSize()); - space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, blockSize); - memcpy(space, inString, length); - memset(space + length, 0, blockSize - length); - m_cipher.ProcessLastBlock(space, space, blockSize); - AttachedTransformation()->Put(space, blockSize); - } - else - { - if (minLastBlockSize == 0) - { - if (isForwardTransformation) - throw InvalidDataFormat("StreamTransformationFilter: plaintext length is not a multiple of block size and NO_PADDING is specified"); - else - throw InvalidCiphertext("StreamTransformationFilter: ciphertext length is not a multiple of block size"); - } - - space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, length, m_optimalBufferSize); - m_cipher.ProcessLastBlock(space, inString, length); - AttachedTransformation()->Put(space, length); - } - } - break; - - case PKCS_PADDING: - case ONE_AND_ZEROS_PADDING: - unsigned int s; - s = m_cipher.MandatoryBlockSize(); - assert(s > 1); - space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, s, m_optimalBufferSize); - if (m_cipher.IsForwardTransformation()) - { - assert(length < s); - memcpy(space, inString, length); - if (m_padding == PKCS_PADDING) - { - assert(s < 256); - byte pad = byte(s-length); - memset(space+length, pad, s-length); - } - else - { - space[length] = 0x80; - memset(space+length+1, 0, s-length-1); - } - m_cipher.ProcessData(space, space, s); - AttachedTransformation()->Put(space, s); - } - else - { - if (length != s) - throw InvalidCiphertext("StreamTransformationFilter: ciphertext length is not a multiple of block size"); - m_cipher.ProcessData(space, inString, s); - if (m_padding == PKCS_PADDING) - { - byte pad = space[s-1]; - if (pad < 1 || pad > s || std::find_if(space+s-pad, space+s, std::bind2nd(std::not_equal_to(), pad)) != space+s) - throw InvalidCiphertext("StreamTransformationFilter: invalid PKCS #7 block padding found"); - length = s-pad; - } - else - { - while (length > 1 && space[length-1] == 0) - --length; - if (space[--length] != 0x80) - throw InvalidCiphertext("StreamTransformationFilter: invalid ones-and-zeros padding found"); - } - AttachedTransformation()->Put(space, length); - } - break; - - default: - assert(false); - } -} - -// ************************************************************* - -HashFilter::HashFilter(HashTransformation &hm, BufferedTransformation *attachment, bool putMessage, int truncatedDigestSize, const std::string &messagePutChannel, const std::string &hashPutChannel) - : m_hashModule(hm), m_putMessage(putMessage), m_messagePutChannel(messagePutChannel), m_hashPutChannel(hashPutChannel) -{ - m_digestSize = truncatedDigestSize < 0 ? m_hashModule.DigestSize() : truncatedDigestSize; - Detach(attachment); -} - -void HashFilter::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_putMessage = parameters.GetValueWithDefault(Name::PutMessage(), false); - int s = parameters.GetIntValueWithDefault(Name::TruncatedDigestSize(), -1); - m_digestSize = s < 0 ? m_hashModule.DigestSize() : s; -} - -size_t HashFilter::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - FILTER_BEGIN; - if (m_putMessage) - FILTER_OUTPUT3(1, 0, inString, length, 0, m_messagePutChannel); - m_hashModule.Update(inString, length); - if (messageEnd) - { - { - size_t size; - m_space = HelpCreatePutSpace(*AttachedTransformation(), m_hashPutChannel, m_digestSize, m_digestSize, size = m_digestSize); - m_hashModule.TruncatedFinal(m_space, m_digestSize); - } - FILTER_OUTPUT3(2, 0, m_space, m_digestSize, messageEnd, m_hashPutChannel); - } - FILTER_END_NO_MESSAGE_END; -} - -// ************************************************************* - -HashVerificationFilter::HashVerificationFilter(HashTransformation &hm, BufferedTransformation *attachment, word32 flags, int truncatedDigestSize) - : FilterWithBufferedInput(attachment) - , m_hashModule(hm) -{ - IsolatedInitialize(MakeParameters(Name::HashVerificationFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize)); -} - -void HashVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize) -{ - m_flags = parameters.GetValueWithDefault(Name::HashVerificationFilterFlags(), (word32)DEFAULT_FLAGS); - int s = parameters.GetIntValueWithDefault(Name::TruncatedDigestSize(), -1); - m_digestSize = s < 0 ? m_hashModule.DigestSize() : s; - m_verified = false; - firstSize = m_flags & HASH_AT_BEGIN ? m_digestSize : 0; - blockSize = 1; - lastSize = m_flags & HASH_AT_BEGIN ? 0 : m_digestSize; -} - -void HashVerificationFilter::FirstPut(const byte *inString) -{ - if (m_flags & HASH_AT_BEGIN) - { - m_expectedHash.New(m_digestSize); - memcpy(m_expectedHash, inString, m_expectedHash.size()); - if (m_flags & PUT_HASH) - AttachedTransformation()->Put(inString, m_expectedHash.size()); - } -} - -void HashVerificationFilter::NextPutMultiple(const byte *inString, size_t length) -{ - m_hashModule.Update(inString, length); - if (m_flags & PUT_MESSAGE) - AttachedTransformation()->Put(inString, length); -} - -void HashVerificationFilter::LastPut(const byte *inString, size_t length) -{ - if (m_flags & HASH_AT_BEGIN) - { - assert(length == 0); - m_verified = m_hashModule.TruncatedVerify(m_expectedHash, m_digestSize); - } - else - { - m_verified = (length==m_digestSize && m_hashModule.TruncatedVerify(inString, length)); - if (m_flags & PUT_HASH) - AttachedTransformation()->Put(inString, length); - } - - if (m_flags & PUT_RESULT) - AttachedTransformation()->Put(m_verified); - - if ((m_flags & THROW_EXCEPTION) && !m_verified) - throw HashVerificationFailed(); -} - -// ************************************************************* - -AuthenticatedEncryptionFilter::AuthenticatedEncryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment, - bool putAAD, int truncatedDigestSize, const std::string &macChannel, BlockPaddingScheme padding) - : StreamTransformationFilter(c, attachment, padding, true) - , m_hf(c, new OutputProxy(*this, false), putAAD, truncatedDigestSize, AAD_CHANNEL, macChannel) -{ - assert(c.IsForwardTransformation()); -} - -void AuthenticatedEncryptionFilter::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_hf.IsolatedInitialize(parameters); - StreamTransformationFilter::IsolatedInitialize(parameters); -} - -byte * AuthenticatedEncryptionFilter::ChannelCreatePutSpace(const std::string &channel, size_t &size) -{ - if (channel.empty()) - return StreamTransformationFilter::CreatePutSpace(size); - - if (channel == AAD_CHANNEL) - return m_hf.CreatePutSpace(size); - - throw InvalidChannelName("AuthenticatedEncryptionFilter", channel); -} - -size_t AuthenticatedEncryptionFilter::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (channel.empty()) - return StreamTransformationFilter::Put2(begin, length, messageEnd, blocking); - - if (channel == AAD_CHANNEL) - return m_hf.Put2(begin, length, 0, blocking); - - throw InvalidChannelName("AuthenticatedEncryptionFilter", channel); -} - -void AuthenticatedEncryptionFilter::LastPut(const byte *inString, size_t length) -{ - StreamTransformationFilter::LastPut(inString, length); - m_hf.MessageEnd(); -} - -// ************************************************************* - -AuthenticatedDecryptionFilter::AuthenticatedDecryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment, word32 flags, int truncatedDigestSize, BlockPaddingScheme padding) - : FilterWithBufferedInput(attachment) - , m_hashVerifier(c, new OutputProxy(*this, false)) - , m_streamFilter(c, new OutputProxy(*this, false), padding, true) -{ - assert(!c.IsForwardTransformation() || c.IsSelfInverting()); - IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)(Name::AuthenticatedDecryptionFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize)); -} - -void AuthenticatedDecryptionFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize) -{ - word32 flags = parameters.GetValueWithDefault(Name::AuthenticatedDecryptionFilterFlags(), (word32)DEFAULT_FLAGS); - - m_hashVerifier.Initialize(CombinedNameValuePairs(parameters, MakeParameters(Name::HashVerificationFilterFlags(), flags))); - m_streamFilter.Initialize(parameters); - - firstSize = m_hashVerifier.m_firstSize; - blockSize = 1; - lastSize = m_hashVerifier.m_lastSize; -} - -byte * AuthenticatedDecryptionFilter::ChannelCreatePutSpace(const std::string &channel, size_t &size) -{ - if (channel.empty()) - return m_streamFilter.CreatePutSpace(size); - - if (channel == AAD_CHANNEL) - return m_hashVerifier.CreatePutSpace(size); - - throw InvalidChannelName("AuthenticatedDecryptionFilter", channel); -} - -size_t AuthenticatedDecryptionFilter::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (channel.empty()) - { - if (m_lastSize > 0) - m_hashVerifier.ForceNextPut(); - return FilterWithBufferedInput::Put2(begin, length, messageEnd, blocking); - } - - if (channel == AAD_CHANNEL) - return m_hashVerifier.Put2(begin, length, 0, blocking); - - throw InvalidChannelName("AuthenticatedDecryptionFilter", channel); -} - -void AuthenticatedDecryptionFilter::FirstPut(const byte *inString) -{ - m_hashVerifier.Put(inString, m_firstSize); -} - -void AuthenticatedDecryptionFilter::NextPutMultiple(const byte *inString, size_t length) -{ - m_streamFilter.Put(inString, length); -} - -void AuthenticatedDecryptionFilter::LastPut(const byte *inString, size_t length) -{ - m_streamFilter.MessageEnd(); - m_hashVerifier.PutMessageEnd(inString, length); -} - -// ************************************************************* - -void SignerFilter::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_putMessage = parameters.GetValueWithDefault(Name::PutMessage(), false); - m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng)); -} - -size_t SignerFilter::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - FILTER_BEGIN; - m_messageAccumulator->Update(inString, length); - if (m_putMessage) - FILTER_OUTPUT(1, inString, length, 0); - if (messageEnd) - { - m_buf.New(m_signer.SignatureLength()); - m_signer.Sign(m_rng, m_messageAccumulator.release(), m_buf); - FILTER_OUTPUT(2, m_buf, m_buf.size(), messageEnd); - m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng)); - } - FILTER_END_NO_MESSAGE_END; -} - -SignatureVerificationFilter::SignatureVerificationFilter(const PK_Verifier &verifier, BufferedTransformation *attachment, word32 flags) - : FilterWithBufferedInput(attachment) - , m_verifier(verifier) -{ - IsolatedInitialize(MakeParameters(Name::SignatureVerificationFilterFlags(), flags)); -} - -void SignatureVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize) -{ - m_flags = parameters.GetValueWithDefault(Name::SignatureVerificationFilterFlags(), (word32)DEFAULT_FLAGS); - m_messageAccumulator.reset(m_verifier.NewVerificationAccumulator()); - size_t size = m_verifier.SignatureLength(); - assert(size != 0); // TODO: handle recoverable signature scheme - m_verified = false; - firstSize = m_flags & SIGNATURE_AT_BEGIN ? size : 0; - blockSize = 1; - lastSize = m_flags & SIGNATURE_AT_BEGIN ? 0 : size; -} - -void SignatureVerificationFilter::FirstPut(const byte *inString) -{ - if (m_flags & SIGNATURE_AT_BEGIN) - { - if (m_verifier.SignatureUpfront()) - m_verifier.InputSignature(*m_messageAccumulator, inString, m_verifier.SignatureLength()); - else - { - m_signature.New(m_verifier.SignatureLength()); - memcpy(m_signature, inString, m_signature.size()); - } - - if (m_flags & PUT_SIGNATURE) - AttachedTransformation()->Put(inString, m_signature.size()); - } - else - { - assert(!m_verifier.SignatureUpfront()); - } -} - -void SignatureVerificationFilter::NextPutMultiple(const byte *inString, size_t length) -{ - m_messageAccumulator->Update(inString, length); - if (m_flags & PUT_MESSAGE) - AttachedTransformation()->Put(inString, length); -} - -void SignatureVerificationFilter::LastPut(const byte *inString, size_t length) -{ - if (m_flags & SIGNATURE_AT_BEGIN) - { - assert(length == 0); - m_verifier.InputSignature(*m_messageAccumulator, m_signature, m_signature.size()); - m_verified = m_verifier.VerifyAndRestart(*m_messageAccumulator); - } - else - { - m_verifier.InputSignature(*m_messageAccumulator, inString, length); - m_verified = m_verifier.VerifyAndRestart(*m_messageAccumulator); - if (m_flags & PUT_SIGNATURE) - AttachedTransformation()->Put(inString, length); - } - - if (m_flags & PUT_RESULT) - AttachedTransformation()->Put(m_verified); - - if ((m_flags & THROW_EXCEPTION) && !m_verified) - throw SignatureVerificationFailed(); -} - -// ************************************************************* - -size_t Source::PumpAll2(bool blocking) -{ - unsigned int messageCount = UINT_MAX; - do { - RETURN_IF_NONZERO(PumpMessages2(messageCount, blocking)); - } while(messageCount == UINT_MAX); - - return 0; -} - -bool Store::GetNextMessage() -{ - if (!m_messageEnd && !AnyRetrievable()) - { - m_messageEnd=true; - return true; - } - else - return false; -} - -unsigned int Store::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const -{ - if (m_messageEnd || count == 0) - return 0; - else - { - CopyTo(target, ULONG_MAX, channel); - if (GetAutoSignalPropagation()) - target.ChannelMessageEnd(channel, GetAutoSignalPropagation()-1); - return 1; - } -} - -void StringStore::StoreInitialize(const NameValuePairs ¶meters) -{ - ConstByteArrayParameter array; - if (!parameters.GetValue(Name::InputBuffer(), array)) - throw InvalidArgument("StringStore: missing InputBuffer argument"); - m_store = array.begin(); - m_length = array.size(); - m_count = 0; -} - -size_t StringStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - lword position = 0; - size_t blockedBytes = CopyRangeTo2(target, position, transferBytes, channel, blocking); - m_count += (size_t)position; - transferBytes = position; - return blockedBytes; -} - -size_t StringStore::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - size_t i = UnsignedMin(m_length, m_count+begin); - size_t len = UnsignedMin(m_length-i, end-begin); - size_t blockedBytes = target.ChannelPut2(channel, m_store+i, len, 0, blocking); - if (!blockedBytes) - begin += len; - return blockedBytes; -} - -void RandomNumberStore::StoreInitialize(const NameValuePairs ¶meters) -{ - parameters.GetRequiredParameter("RandomNumberStore", "RandomNumberGeneratorPointer", m_rng); - int length; - parameters.GetRequiredIntParameter("RandomNumberStore", "RandomNumberStoreSize", length); - m_length = length; -} - -size_t RandomNumberStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - if (!blocking) - throw NotImplemented("RandomNumberStore: nonblocking transfer is not implemented by this object"); - - transferBytes = UnsignedMin(transferBytes, m_length - m_count); - m_rng->GenerateIntoBufferedTransformation(target, channel, transferBytes); - m_count += transferBytes; - - return 0; -} - -size_t NullStore::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - static const byte nullBytes[128] = {0}; - while (begin < end) - { - size_t len = (size_t)STDMIN(end-begin, lword(128)); - size_t blockedBytes = target.ChannelPut2(channel, nullBytes, len, 0, blocking); - if (blockedBytes) - return blockedBytes; - begin += len; - } - return 0; -} - -size_t NullStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - lword begin = 0; - size_t blockedBytes = NullStore::CopyRangeTo2(target, begin, transferBytes, channel, blocking); - transferBytes = begin; - m_size -= begin; - return blockedBytes; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.h deleted file mode 100644 index c72a4ece..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/filters.h +++ /dev/null @@ -1,810 +0,0 @@ -#ifndef CRYPTOPP_FILTERS_H -#define CRYPTOPP_FILTERS_H - -//! \file - -#include "simple.h" -#include "secblock.h" -#include "misc.h" -#include "smartptr.h" -#include "queue.h" -#include "algparam.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -/// provides an implementation of BufferedTransformation's attachment interface -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Filter : public BufferedTransformation, public NotCopyable -{ -public: - Filter(BufferedTransformation *attachment = NULL); - - bool Attachable() {return true;} - BufferedTransformation *AttachedTransformation(); - const BufferedTransformation *AttachedTransformation() const; - void Detach(BufferedTransformation *newAttachment = NULL); - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - - void Initialize(const NameValuePairs ¶meters=g_nullNameValuePairs, int propagation=-1); - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true); - bool MessageSeriesEnd(int propagation=-1, bool blocking=true); - -protected: - virtual BufferedTransformation * NewDefaultAttachment() const; - void Insert(Filter *nextFilter); // insert filter after this one - - virtual bool ShouldPropagateMessageEnd() const {return true;} - virtual bool ShouldPropagateMessageSeriesEnd() const {return true;} - - void PropagateInitialize(const NameValuePairs ¶meters, int propagation); - - size_t Output(int outputSite, const byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel=DEFAULT_CHANNEL); - size_t OutputModifiable(int outputSite, byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel=DEFAULT_CHANNEL); - bool OutputMessageEnd(int outputSite, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL); - bool OutputFlush(int outputSite, bool hardFlush, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL); - bool OutputMessageSeriesEnd(int outputSite, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL); - -private: - member_ptr m_attachment; - -protected: - size_t m_inputPosition; - int m_continueAt; -}; - -struct CRYPTOPP_DLL FilterPutSpaceHelper -{ - // desiredSize is how much to ask target, bufferSize is how much to allocate in m_tempSpace - byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t desiredSize, size_t &bufferSize) - { - assert(desiredSize >= minSize && bufferSize >= minSize); - if (m_tempSpace.size() < minSize) - { - byte *result = target.ChannelCreatePutSpace(channel, desiredSize); - if (desiredSize >= minSize) - { - bufferSize = desiredSize; - return result; - } - m_tempSpace.New(bufferSize); - } - - bufferSize = m_tempSpace.size(); - return m_tempSpace.begin(); - } - byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize) - {return HelpCreatePutSpace(target, channel, minSize, minSize, minSize);} - byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t bufferSize) - {return HelpCreatePutSpace(target, channel, minSize, minSize, bufferSize);} - SecByteBlock m_tempSpace; -}; - -//! measure how many byte and messages pass through, also serves as valve -class CRYPTOPP_DLL MeterFilter : public Bufferless -{ -public: - MeterFilter(BufferedTransformation *attachment=NULL, bool transparent=true) - : m_transparent(transparent) {Detach(attachment); ResetMeter();} - - void SetTransparent(bool transparent) {m_transparent = transparent;} - void AddRangeToSkip(unsigned int message, lword position, lword size, bool sortNow = true); - void ResetMeter(); - void IsolatedInitialize(const NameValuePairs ¶meters) {ResetMeter();} - - lword GetCurrentMessageBytes() const {return m_currentMessageBytes;} - lword GetTotalBytes() {return m_totalBytes;} - unsigned int GetCurrentSeriesMessages() {return m_currentSeriesMessages;} - unsigned int GetTotalMessages() {return m_totalMessages;} - unsigned int GetTotalMessageSeries() {return m_totalMessageSeries;} - - byte * CreatePutSpace(size_t &size) - {return AttachedTransformation()->CreatePutSpace(size);} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking); - bool IsolatedMessageSeriesEnd(bool blocking); - -private: - size_t PutMaybeModifiable(byte *inString, size_t length, int messageEnd, bool blocking, bool modifiable); - bool ShouldPropagateMessageEnd() const {return m_transparent;} - bool ShouldPropagateMessageSeriesEnd() const {return m_transparent;} - - struct MessageRange - { - inline bool operator<(const MessageRange &b) const // BCB2006 workaround: this has to be a member function - {return message < b.message || (message == b.message && position < b.position);} - unsigned int message; lword position; lword size; - }; - - bool m_transparent; - lword m_currentMessageBytes, m_totalBytes; - unsigned int m_currentSeriesMessages, m_totalMessages, m_totalMessageSeries; - std::deque m_rangesToSkip; - byte *m_begin; - size_t m_length; -}; - -//! _ -class CRYPTOPP_DLL TransparentFilter : public MeterFilter -{ -public: - TransparentFilter(BufferedTransformation *attachment=NULL) : MeterFilter(attachment, true) {} -}; - -//! _ -class CRYPTOPP_DLL OpaqueFilter : public MeterFilter -{ -public: - OpaqueFilter(BufferedTransformation *attachment=NULL) : MeterFilter(attachment, false) {} -}; - -/*! FilterWithBufferedInput divides up the input stream into - a first block, a number of middle blocks, and a last block. - First and last blocks are optional, and middle blocks may - be a stream instead (i.e. blockSize == 1). -*/ -class CRYPTOPP_DLL FilterWithBufferedInput : public Filter -{ -public: - FilterWithBufferedInput(BufferedTransformation *attachment); - //! firstSize and lastSize may be 0, blockSize must be at least 1 - FilterWithBufferedInput(size_t firstSize, size_t blockSize, size_t lastSize, BufferedTransformation *attachment); - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) - { - return PutMaybeModifiable(const_cast(inString), length, messageEnd, blocking, false); - } - size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking) - { - return PutMaybeModifiable(inString, length, messageEnd, blocking, true); - } - /*! calls ForceNextPut() if hardFlush is true */ - bool IsolatedFlush(bool hardFlush, bool blocking); - - /*! The input buffer may contain more than blockSize bytes if lastSize != 0. - ForceNextPut() forces a call to NextPut() if this is the case. - */ - void ForceNextPut(); - -protected: - bool DidFirstPut() {return m_firstInputDone;} - - virtual void InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize) - {InitializeDerived(parameters);} - virtual void InitializeDerived(const NameValuePairs ¶meters) {} - // FirstPut() is called if (firstSize != 0 and totalLength >= firstSize) - // or (firstSize == 0 and (totalLength > 0 or a MessageEnd() is received)) - virtual void FirstPut(const byte *inString) =0; - // NextPut() is called if totalLength >= firstSize+blockSize+lastSize - virtual void NextPutSingle(const byte *inString) {assert(false);} - // Same as NextPut() except length can be a multiple of blockSize - // Either NextPut() or NextPutMultiple() must be overriden - virtual void NextPutMultiple(const byte *inString, size_t length); - // Same as NextPutMultiple(), but inString can be modified - virtual void NextPutModifiable(byte *inString, size_t length) - {NextPutMultiple(inString, length);} - // LastPut() is always called - // if totalLength < firstSize then length == totalLength - // else if totalLength <= firstSize+lastSize then length == totalLength-firstSize - // else lastSize <= length < lastSize+blockSize - virtual void LastPut(const byte *inString, size_t length) =0; - virtual void FlushDerived() {} - -protected: - size_t PutMaybeModifiable(byte *begin, size_t length, int messageEnd, bool blocking, bool modifiable); - void NextPutMaybeModifiable(byte *inString, size_t length, bool modifiable) - { - if (modifiable) NextPutModifiable(inString, length); - else NextPutMultiple(inString, length); - } - - // This function should no longer be used, put this here to cause a compiler error - // if someone tries to override NextPut(). - virtual int NextPut(const byte *inString, size_t length) {assert(false); return 0;} - - class BlockQueue - { - public: - void ResetQueue(size_t blockSize, size_t maxBlocks); - byte *GetBlock(); - byte *GetContigousBlocks(size_t &numberOfBytes); - size_t GetAll(byte *outString); - void Put(const byte *inString, size_t length); - size_t CurrentSize() const {return m_size;} - size_t MaxSize() const {return m_buffer.size();} - - private: - SecByteBlock m_buffer; - size_t m_blockSize, m_maxBlocks, m_size; - byte *m_begin; - }; - - size_t m_firstSize, m_blockSize, m_lastSize; - bool m_firstInputDone; - BlockQueue m_queue; -}; - -//! _ -class CRYPTOPP_DLL FilterWithInputQueue : public Filter -{ -public: - FilterWithInputQueue(BufferedTransformation *attachment=NULL) : Filter(attachment) {} - - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) - { - if (!blocking) - throw BlockingInputOnly("FilterWithInputQueue"); - - m_inQueue.Put(inString, length); - if (messageEnd) - { - IsolatedMessageEnd(blocking); - Output(0, NULL, 0, messageEnd, blocking); - } - return 0; - } - -protected: - virtual bool IsolatedMessageEnd(bool blocking) =0; - void IsolatedInitialize(const NameValuePairs ¶meters) {m_inQueue.Clear();} - - ByteQueue m_inQueue; -}; - -struct BlockPaddingSchemeDef -{ - enum BlockPaddingScheme {NO_PADDING, ZEROS_PADDING, PKCS_PADDING, ONE_AND_ZEROS_PADDING, DEFAULT_PADDING}; -}; - -//! Filter Wrapper for StreamTransformation, optionally handling padding/unpadding when needed -class CRYPTOPP_DLL StreamTransformationFilter : public FilterWithBufferedInput, public BlockPaddingSchemeDef, private FilterPutSpaceHelper -{ -public: - /*! DEFAULT_PADDING means PKCS_PADDING if c.MandatoryBlockSize() > 1 && c.MinLastBlockSize() == 0 (e.g. ECB or CBC mode), - otherwise NO_PADDING (OFB, CFB, CTR, CBC-CTS modes). - See http://www.weidai.com/scan-mirror/csp.html for details of the padding schemes. */ - StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment = NULL, BlockPaddingScheme padding = DEFAULT_PADDING, bool allowAuthenticatedSymmetricCipher = false); - - std::string AlgorithmName() const {return m_cipher.AlgorithmName();} - -protected: - void InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize); - void FirstPut(const byte *inString); - void NextPutMultiple(const byte *inString, size_t length); - void NextPutModifiable(byte *inString, size_t length); - void LastPut(const byte *inString, size_t length); - - static size_t LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding); - - StreamTransformation &m_cipher; - BlockPaddingScheme m_padding; - unsigned int m_optimalBufferSize; -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef StreamTransformationFilter StreamCipherFilter; -#endif - -//! Filter Wrapper for HashTransformation -class CRYPTOPP_DLL HashFilter : public Bufferless, private FilterPutSpaceHelper -{ -public: - HashFilter(HashTransformation &hm, BufferedTransformation *attachment = NULL, bool putMessage=false, int truncatedDigestSize=-1, const std::string &messagePutChannel=DEFAULT_CHANNEL, const std::string &hashPutChannel=DEFAULT_CHANNEL); - - std::string AlgorithmName() const {return m_hashModule.AlgorithmName();} - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - byte * CreatePutSpace(size_t &size) {return m_hashModule.CreateUpdateSpace(size);} - -private: - HashTransformation &m_hashModule; - bool m_putMessage; - unsigned int m_digestSize; - byte *m_space; - std::string m_messagePutChannel, m_hashPutChannel; -}; - -//! Filter Wrapper for HashTransformation -class CRYPTOPP_DLL HashVerificationFilter : public FilterWithBufferedInput -{ -public: - class HashVerificationFailed : public Exception - { - public: - HashVerificationFailed() - : Exception(DATA_INTEGRITY_CHECK_FAILED, "HashVerificationFilter: message hash or MAC not valid") {} - }; - - enum Flags {HASH_AT_END=0, HASH_AT_BEGIN=1, PUT_MESSAGE=2, PUT_HASH=4, PUT_RESULT=8, THROW_EXCEPTION=16, DEFAULT_FLAGS = HASH_AT_BEGIN | PUT_RESULT}; - HashVerificationFilter(HashTransformation &hm, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS, int truncatedDigestSize=-1); - - std::string AlgorithmName() const {return m_hashModule.AlgorithmName();} - bool GetLastResult() const {return m_verified;} - -protected: - void InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize); - void FirstPut(const byte *inString); - void NextPutMultiple(const byte *inString, size_t length); - void LastPut(const byte *inString, size_t length); - -private: - friend class AuthenticatedDecryptionFilter; - - HashTransformation &m_hashModule; - word32 m_flags; - unsigned int m_digestSize; - bool m_verified; - SecByteBlock m_expectedHash; -}; - -typedef HashVerificationFilter HashVerifier; // for backwards compatibility - -//! Filter wrapper for encrypting with AuthenticatedSymmetricCipher, optionally handling padding/unpadding when needed -/*! Additional authenticated data should be given in channel "AAD". If putAAD is true, AAD will be Put() to the attached BufferedTransformation in channel "AAD". */ -class CRYPTOPP_DLL AuthenticatedEncryptionFilter : public StreamTransformationFilter -{ -public: - /*! See StreamTransformationFilter for documentation on BlockPaddingScheme */ - AuthenticatedEncryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment = NULL, bool putAAD=false, int truncatedDigestSize=-1, const std::string &macChannel=DEFAULT_CHANNEL, BlockPaddingScheme padding = DEFAULT_PADDING); - - void IsolatedInitialize(const NameValuePairs ¶meters); - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size); - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - void LastPut(const byte *inString, size_t length); - -protected: - HashFilter m_hf; -}; - -//! Filter wrapper for decrypting with AuthenticatedSymmetricCipher, optionally handling padding/unpadding when needed -/*! Additional authenticated data should be given in channel "AAD". */ -class CRYPTOPP_DLL AuthenticatedDecryptionFilter : public FilterWithBufferedInput, public BlockPaddingSchemeDef -{ -public: - enum Flags {MAC_AT_END=0, MAC_AT_BEGIN=1, THROW_EXCEPTION=16, DEFAULT_FLAGS = THROW_EXCEPTION}; - - /*! See StreamTransformationFilter for documentation on BlockPaddingScheme */ - AuthenticatedDecryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS, int truncatedDigestSize=-1, BlockPaddingScheme padding = DEFAULT_PADDING); - - std::string AlgorithmName() const {return m_hashVerifier.AlgorithmName();} - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size); - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - bool GetLastResult() const {return m_hashVerifier.GetLastResult();} - -protected: - void InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize); - void FirstPut(const byte *inString); - void NextPutMultiple(const byte *inString, size_t length); - void LastPut(const byte *inString, size_t length); - - HashVerificationFilter m_hashVerifier; - StreamTransformationFilter m_streamFilter; -}; - -//! Filter Wrapper for PK_Signer -class CRYPTOPP_DLL SignerFilter : public Unflushable -{ -public: - SignerFilter(RandomNumberGenerator &rng, const PK_Signer &signer, BufferedTransformation *attachment = NULL, bool putMessage=false) - : m_rng(rng), m_signer(signer), m_messageAccumulator(signer.NewSignatureAccumulator(rng)), m_putMessage(putMessage) {Detach(attachment);} - - std::string AlgorithmName() const {return m_signer.AlgorithmName();} - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - -private: - RandomNumberGenerator &m_rng; - const PK_Signer &m_signer; - member_ptr m_messageAccumulator; - bool m_putMessage; - SecByteBlock m_buf; -}; - -//! Filter Wrapper for PK_Verifier -class CRYPTOPP_DLL SignatureVerificationFilter : public FilterWithBufferedInput -{ -public: - class SignatureVerificationFailed : public Exception - { - public: - SignatureVerificationFailed() - : Exception(DATA_INTEGRITY_CHECK_FAILED, "VerifierFilter: digital signature not valid") {} - }; - - enum Flags {SIGNATURE_AT_END=0, SIGNATURE_AT_BEGIN=1, PUT_MESSAGE=2, PUT_SIGNATURE=4, PUT_RESULT=8, THROW_EXCEPTION=16, DEFAULT_FLAGS = SIGNATURE_AT_BEGIN | PUT_RESULT}; - SignatureVerificationFilter(const PK_Verifier &verifier, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS); - - std::string AlgorithmName() const {return m_verifier.AlgorithmName();} - - bool GetLastResult() const {return m_verified;} - -protected: - void InitializeDerivedAndReturnNewSizes(const NameValuePairs ¶meters, size_t &firstSize, size_t &blockSize, size_t &lastSize); - void FirstPut(const byte *inString); - void NextPutMultiple(const byte *inString, size_t length); - void LastPut(const byte *inString, size_t length); - -private: - const PK_Verifier &m_verifier; - member_ptr m_messageAccumulator; - word32 m_flags; - SecByteBlock m_signature; - bool m_verified; -}; - -typedef SignatureVerificationFilter VerifierFilter; // for backwards compatibility - -//! Redirect input to another BufferedTransformation without owning it -class CRYPTOPP_DLL Redirector : public CustomSignalPropagation -{ -public: - enum Behavior - { - DATA_ONLY = 0x00, - PASS_SIGNALS = 0x01, - PASS_WAIT_OBJECTS = 0x02, - PASS_EVERYTHING = PASS_SIGNALS | PASS_WAIT_OBJECTS - }; - - Redirector() : m_target(NULL), m_behavior(PASS_EVERYTHING) {} - Redirector(BufferedTransformation &target, Behavior behavior=PASS_EVERYTHING) - : m_target(&target), m_behavior(behavior) {} - - void Redirect(BufferedTransformation &target) {m_target = ⌖} - void StopRedirection() {m_target = NULL;} - - Behavior GetBehavior() {return (Behavior) m_behavior;} - void SetBehavior(Behavior behavior) {m_behavior=behavior;} - bool GetPassSignals() const {return (m_behavior & PASS_SIGNALS) != 0;} - void SetPassSignals(bool pass) { if (pass) m_behavior |= PASS_SIGNALS; else m_behavior &= ~(word32) PASS_SIGNALS; } - bool GetPassWaitObjects() const {return (m_behavior & PASS_WAIT_OBJECTS) != 0;} - void SetPassWaitObjects(bool pass) { if (pass) m_behavior |= PASS_WAIT_OBJECTS; else m_behavior &= ~(word32) PASS_WAIT_OBJECTS; } - - bool CanModifyInput() const - {return m_target ? m_target->CanModifyInput() : false;} - - void Initialize(const NameValuePairs ¶meters, int propagation); - byte * CreatePutSpace(size_t &size) - {return m_target ? m_target->CreatePutSpace(size) : (byte *)(size=0, NULL);} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - {return m_target ? m_target->Put2(begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;} - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) - {return m_target && GetPassSignals() ? m_target->Flush(hardFlush, propagation, blocking) : false;} - bool MessageSeriesEnd(int propagation=-1, bool blocking=true) - {return m_target && GetPassSignals() ? m_target->MessageSeriesEnd(propagation, blocking) : false;} - - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size) - {return m_target ? m_target->ChannelCreatePutSpace(channel, size) : (byte *)(size=0, NULL);} - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) - {return m_target ? m_target->ChannelPut2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;} - size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking) - {return m_target ? m_target->ChannelPutModifiable2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;} - bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true) - {return m_target && GetPassSignals() ? m_target->ChannelFlush(channel, completeFlush, propagation, blocking) : false;} - bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true) - {return m_target && GetPassSignals() ? m_target->ChannelMessageSeriesEnd(channel, propagation, blocking) : false;} - - unsigned int GetMaxWaitObjectCount() const - { return m_target && GetPassWaitObjects() ? m_target->GetMaxWaitObjectCount() : 0; } - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) - { if (m_target && GetPassWaitObjects()) m_target->GetWaitObjects(container, callStack); } - -private: - BufferedTransformation *m_target; - word32 m_behavior; -}; - -// Used By ProxyFilter -class CRYPTOPP_DLL OutputProxy : public CustomSignalPropagation -{ -public: - OutputProxy(BufferedTransformation &owner, bool passSignal) : m_owner(owner), m_passSignal(passSignal) {} - - bool GetPassSignal() const {return m_passSignal;} - void SetPassSignal(bool passSignal) {m_passSignal = passSignal;} - - byte * CreatePutSpace(size_t &size) - {return m_owner.AttachedTransformation()->CreatePutSpace(size);} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - {return m_owner.AttachedTransformation()->Put2(begin, length, m_passSignal ? messageEnd : 0, blocking);} - size_t PutModifiable2(byte *begin, size_t length, int messageEnd, bool blocking) - {return m_owner.AttachedTransformation()->PutModifiable2(begin, length, m_passSignal ? messageEnd : 0, blocking);} - void Initialize(const NameValuePairs ¶meters=g_nullNameValuePairs, int propagation=-1) - {if (m_passSignal) m_owner.AttachedTransformation()->Initialize(parameters, propagation);} - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) - {return m_passSignal ? m_owner.AttachedTransformation()->Flush(hardFlush, propagation, blocking) : false;} - bool MessageSeriesEnd(int propagation=-1, bool blocking=true) - {return m_passSignal ? m_owner.AttachedTransformation()->MessageSeriesEnd(propagation, blocking) : false;} - - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size) - {return m_owner.AttachedTransformation()->ChannelCreatePutSpace(channel, size);} - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) - {return m_owner.AttachedTransformation()->ChannelPut2(channel, begin, length, m_passSignal ? messageEnd : 0, blocking);} - size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking) - {return m_owner.AttachedTransformation()->ChannelPutModifiable2(channel, begin, length, m_passSignal ? messageEnd : 0, blocking);} - bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true) - {return m_passSignal ? m_owner.AttachedTransformation()->ChannelFlush(channel, completeFlush, propagation, blocking) : false;} - bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true) - {return m_passSignal ? m_owner.AttachedTransformation()->ChannelMessageSeriesEnd(channel, propagation, blocking) : false;} - -private: - BufferedTransformation &m_owner; - bool m_passSignal; -}; - -//! Base class for Filter classes that are proxies for a chain of other filters. -class CRYPTOPP_DLL ProxyFilter : public FilterWithBufferedInput -{ -public: - ProxyFilter(BufferedTransformation *filter, size_t firstSize, size_t lastSize, BufferedTransformation *attachment); - - bool IsolatedFlush(bool hardFlush, bool blocking); - - void SetFilter(Filter *filter); - void NextPutMultiple(const byte *s, size_t len); - void NextPutModifiable(byte *inString, size_t length); - -protected: - member_ptr m_filter; -}; - -//! simple proxy filter that doesn't modify the underlying filter's input or output -class CRYPTOPP_DLL SimpleProxyFilter : public ProxyFilter -{ -public: - SimpleProxyFilter(BufferedTransformation *filter, BufferedTransformation *attachment) - : ProxyFilter(filter, 0, 0, attachment) {} - - void FirstPut(const byte *) {} - void LastPut(const byte *, size_t) {m_filter->MessageEnd();} -}; - -//! proxy for the filter created by PK_Encryptor::CreateEncryptionFilter -/*! This class is here just to provide symmetry with VerifierFilter. */ -class CRYPTOPP_DLL PK_EncryptorFilter : public SimpleProxyFilter -{ -public: - PK_EncryptorFilter(RandomNumberGenerator &rng, const PK_Encryptor &encryptor, BufferedTransformation *attachment = NULL) - : SimpleProxyFilter(encryptor.CreateEncryptionFilter(rng), attachment) {} -}; - -//! proxy for the filter created by PK_Decryptor::CreateDecryptionFilter -/*! This class is here just to provide symmetry with SignerFilter. */ -class CRYPTOPP_DLL PK_DecryptorFilter : public SimpleProxyFilter -{ -public: - PK_DecryptorFilter(RandomNumberGenerator &rng, const PK_Decryptor &decryptor, BufferedTransformation *attachment = NULL) - : SimpleProxyFilter(decryptor.CreateDecryptionFilter(rng), attachment) {} -}; - -//! Append input to a string object -template -class StringSinkTemplate : public Bufferless -{ -public: - // VC60 workaround: no T::char_type - typedef typename T::traits_type::char_type char_type; - - StringSinkTemplate(T &output) - : m_output(&output) {assert(sizeof(output[0])==1);} - - void IsolatedInitialize(const NameValuePairs ¶meters) - {if (!parameters.GetValue("OutputStringPointer", m_output)) throw InvalidArgument("StringSink: OutputStringPointer not specified");} - - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - { - if (length > 0) - { - typename T::size_type size = m_output->size(); - if (length < size && size + length > m_output->capacity()) - m_output->reserve(2*size); - m_output->append((const char_type *)begin, (const char_type *)begin+length); - } - return 0; - } - -private: - T *m_output; -}; - -//! Append input to an std::string -CRYPTOPP_DLL_TEMPLATE_CLASS StringSinkTemplate; -typedef StringSinkTemplate StringSink; - -//! incorporates input into RNG as additional entropy -class RandomNumberSink : public Bufferless -{ -public: - RandomNumberSink() - : m_rng(NULL) {} - - RandomNumberSink(RandomNumberGenerator &rng) - : m_rng(&rng) {} - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - -private: - RandomNumberGenerator *m_rng; -}; - -//! Copy input to a memory buffer -class CRYPTOPP_DLL ArraySink : public Bufferless -{ -public: - ArraySink(const NameValuePairs ¶meters = g_nullNameValuePairs) {IsolatedInitialize(parameters);} - ArraySink(byte *buf, size_t size) : m_buf(buf), m_size(size), m_total(0) {} - - size_t AvailableSize() {return SaturatingSubtract(m_size, m_total);} - lword TotalPutLength() {return m_total;} - - void IsolatedInitialize(const NameValuePairs ¶meters); - byte * CreatePutSpace(size_t &size); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - -protected: - byte *m_buf; - size_t m_size; - lword m_total; -}; - -//! Xor input to a memory buffer -class CRYPTOPP_DLL ArrayXorSink : public ArraySink -{ -public: - ArrayXorSink(byte *buf, size_t size) - : ArraySink(buf, size) {} - - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - byte * CreatePutSpace(size_t &size) {return BufferedTransformation::CreatePutSpace(size);} -}; - -//! string-based implementation of Store interface -class StringStore : public Store -{ -public: - StringStore(const char *string = NULL) - {StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string)));} - StringStore(const byte *string, size_t length) - {StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string, length)));} - template StringStore(const T &string) - {StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string)));} - - CRYPTOPP_DLL size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - CRYPTOPP_DLL size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - -private: - CRYPTOPP_DLL void StoreInitialize(const NameValuePairs ¶meters); - - const byte *m_store; - size_t m_length, m_count; -}; - -//! RNG-based implementation of Source interface -class CRYPTOPP_DLL RandomNumberStore : public Store -{ -public: - RandomNumberStore() - : m_rng(NULL), m_length(0), m_count(0) {} - - RandomNumberStore(RandomNumberGenerator &rng, lword length) - : m_rng(&rng), m_length(length), m_count(0) {} - - bool AnyRetrievable() const {return MaxRetrievable() != 0;} - lword MaxRetrievable() const {return m_length-m_count;} - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const - { - throw NotImplemented("RandomNumberStore: CopyRangeTo2() is not supported by this store"); - } - -private: - void StoreInitialize(const NameValuePairs ¶meters); - - RandomNumberGenerator *m_rng; - lword m_length, m_count; -}; - -//! empty store -class CRYPTOPP_DLL NullStore : public Store -{ -public: - NullStore(lword size = ULONG_MAX) : m_size(size) {} - void StoreInitialize(const NameValuePairs ¶meters) {} - lword MaxRetrievable() const {return m_size;} - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - -private: - lword m_size; -}; - -//! A Filter that pumps data into its attachment as input -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Source : public InputRejecting -{ -public: - Source(BufferedTransformation *attachment = NULL) - {Source::Detach(attachment);} - - lword Pump(lword pumpMax=size_t(0)-1) - {Pump2(pumpMax); return pumpMax;} - unsigned int PumpMessages(unsigned int count=UINT_MAX) - {PumpMessages2(count); return count;} - void PumpAll() - {PumpAll2();} - virtual size_t Pump2(lword &byteCount, bool blocking=true) =0; - virtual size_t PumpMessages2(unsigned int &messageCount, bool blocking=true) =0; - virtual size_t PumpAll2(bool blocking=true); - virtual bool SourceExhausted() const =0; - -protected: - void SourceInitialize(bool pumpAll, const NameValuePairs ¶meters) - { - IsolatedInitialize(parameters); - if (pumpAll) - PumpAll(); - } -}; - -//! Turn a Store into a Source -template -class SourceTemplate : public Source -{ -public: - SourceTemplate(BufferedTransformation *attachment) - : Source(attachment) {} - void IsolatedInitialize(const NameValuePairs ¶meters) - {m_store.IsolatedInitialize(parameters);} - size_t Pump2(lword &byteCount, bool blocking=true) - {return m_store.TransferTo2(*AttachedTransformation(), byteCount, DEFAULT_CHANNEL, blocking);} - size_t PumpMessages2(unsigned int &messageCount, bool blocking=true) - {return m_store.TransferMessagesTo2(*AttachedTransformation(), messageCount, DEFAULT_CHANNEL, blocking);} - size_t PumpAll2(bool blocking=true) - {return m_store.TransferAllTo2(*AttachedTransformation(), DEFAULT_CHANNEL, blocking);} - bool SourceExhausted() const - {return !m_store.AnyRetrievable() && !m_store.AnyMessages();} - void SetAutoSignalPropagation(int propagation) - {m_store.SetAutoSignalPropagation(propagation);} - int GetAutoSignalPropagation() const - {return m_store.GetAutoSignalPropagation();} - -protected: - T m_store; -}; - -//! string-based implementation of Source interface -class CRYPTOPP_DLL StringSource : public SourceTemplate -{ -public: - StringSource(BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {} - //! zero terminated string as source - StringSource(const char *string, bool pumpAll, BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string)));} - //! binary byte array as source - StringSource(const byte *string, size_t length, bool pumpAll, BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string, length)));} - //! std::string as source - StringSource(const std::string &string, bool pumpAll, BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string)));} -}; - -//! use the third constructor for an array source -typedef StringSource ArraySource; - -//! RNG-based implementation of Source interface -class CRYPTOPP_DLL RandomNumberSource : public SourceTemplate -{ -public: - RandomNumberSource(RandomNumberGenerator &rng, int length, bool pumpAll, BufferedTransformation *attachment = NULL) - : SourceTemplate(attachment) - {SourceInitialize(pumpAll, MakeParameters("RandomNumberGeneratorPointer", &rng)("RandomNumberStoreSize", length));} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.cpp deleted file mode 100644 index 1fcf5901..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// fips140.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "fips140.h" -#include "trdlocal.h" // needs to be included last for cygwin - -NAMESPACE_BEGIN(CryptoPP) - -// Define this to 1 to turn on FIPS 140-2 compliance features, including additional tests during -// startup, random number generation, and key generation. These tests may affect performance. -#ifndef CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 -#define CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 0 -#endif - -#if (CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 && !defined(THREADS_AVAILABLE)) -#error FIPS 140-2 compliance requires the availability of thread local storage. -#endif - -#if (CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 && !defined(OS_RNG_AVAILABLE)) -#error FIPS 140-2 compliance requires the availability of OS provided RNG. -#endif - -PowerUpSelfTestStatus g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_NOT_DONE; - -bool FIPS_140_2_ComplianceEnabled() -{ - return CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2; -} - -void SimulatePowerUpSelfTestFailure() -{ - g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_FAILED; -} - -PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus() -{ - return g_powerUpSelfTestStatus; -} - -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 -ThreadLocalStorage & AccessPowerUpSelfTestInProgress() -{ - static ThreadLocalStorage selfTestInProgress; - return selfTestInProgress; -} -#endif - -bool PowerUpSelfTestInProgressOnThisThread() -{ -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 - return AccessPowerUpSelfTestInProgress().GetValue() != NULL; -#else - assert(false); // should not be called - return false; -#endif -} - -void SetPowerUpSelfTestInProgressOnThisThread(bool inProgress) -{ -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 - AccessPowerUpSelfTestInProgress().SetValue((void *)inProgress); -#endif -} - -void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor) -{ -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 - EncryptionPairwiseConsistencyTest(encryptor, decryptor); -#endif -} - -void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier) -{ -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 - SignaturePairwiseConsistencyTest(signer, verifier); -#endif -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.h deleted file mode 100644 index a3e53861..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/fips140.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef CRYPTOPP_FIPS140_H -#define CRYPTOPP_FIPS140_H - -/*! \file - FIPS 140 related functions and classes. -*/ - -#include "cryptlib.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! exception thrown when a crypto algorithm is used after a self test fails -class CRYPTOPP_DLL SelfTestFailure : public Exception -{ -public: - explicit SelfTestFailure(const std::string &s) : Exception(OTHER_ERROR, s) {} -}; - -//! returns whether FIPS 140-2 compliance features were enabled at compile time -CRYPTOPP_DLL bool CRYPTOPP_API FIPS_140_2_ComplianceEnabled(); - -//! enum values representing status of the power-up self test -enum PowerUpSelfTestStatus {POWER_UP_SELF_TEST_NOT_DONE, POWER_UP_SELF_TEST_FAILED, POWER_UP_SELF_TEST_PASSED}; - -//! perform the power-up self test, and set the self test status -CRYPTOPP_DLL void CRYPTOPP_API DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac); - -//! perform the power-up self test using the filename of this DLL and the embedded module MAC -CRYPTOPP_DLL void CRYPTOPP_API DoDllPowerUpSelfTest(); - -//! set the power-up self test status to POWER_UP_SELF_TEST_FAILED -CRYPTOPP_DLL void CRYPTOPP_API SimulatePowerUpSelfTestFailure(); - -//! return the current power-up self test status -CRYPTOPP_DLL PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus(); - -typedef PowerUpSelfTestStatus (CRYPTOPP_API * PGetPowerUpSelfTestStatus)(); - -CRYPTOPP_DLL MessageAuthenticationCode * CRYPTOPP_API NewIntegrityCheckingMAC(); - -CRYPTOPP_DLL bool CRYPTOPP_API IntegrityCheckModule(const char *moduleFilename, const byte *expectedModuleMac, SecByteBlock *pActualMac = NULL, unsigned long *pMacFileLocation = NULL); - -// this is used by Algorithm constructor to allow Algorithm objects to be constructed for the self test -bool PowerUpSelfTestInProgressOnThisThread(); - -void SetPowerUpSelfTestInProgressOnThisThread(bool inProgress); - -void SignaturePairwiseConsistencyTest(const PK_Signer &signer, const PK_Verifier &verifier); -void EncryptionPairwiseConsistencyTest(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor); - -void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier); -void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor); - -#define CRYPTOPP_DUMMY_DLL_MAC "MAC_51f34b8db820ae8" - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/fipsalgt.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/fipsalgt.cpp deleted file mode 100644 index 92c254fd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/fipsalgt.cpp +++ /dev/null @@ -1,1290 +0,0 @@ -// fipsalgt.cpp - written and placed in the public domain by Wei Dai - -// This file implements the various algorithm tests needed to pass FIPS 140 validation. -// They're preserved here (commented out) in case Crypto++ needs to be revalidated. - -#if 0 -#ifndef CRYPTOPP_IMPORTS -#define CRYPTOPP_DEFAULT_NO_DLL -#endif -#include "dll.h" -#include "oids.h" - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -class LineBreakParser : public AutoSignaling > -{ -public: - LineBreakParser(BufferedTransformation *attachment=NULL, byte lineEnd='\n') - : m_lineEnd(lineEnd) {Detach(attachment);} - - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - { - if (!blocking) - throw BlockingInputOnly("LineBreakParser"); - - unsigned int i, last = 0; - for (i=0; iPut2(begin+last, i-last, GetAutoSignalPropagation(), blocking); - last = i+1; - } - } - if (last != i) - AttachedTransformation()->Put2(begin+last, i-last, 0, blocking); - - if (messageEnd && GetAutoSignalPropagation()) - { - AttachedTransformation()->MessageEnd(GetAutoSignalPropagation()-1, blocking); - AttachedTransformation()->MessageSeriesEnd(GetAutoSignalPropagation()-1, blocking); - } - - return 0; - } - -private: - byte m_lineEnd; -}; - -class TestDataParser : public Unflushable -{ -public: - enum DataType {OTHER, COUNT, KEY_T, IV, INPUT, OUTPUT}; - - TestDataParser(std::string algorithm, std::string test, std::string mode, unsigned int feedbackSize, bool encrypt, BufferedTransformation *attachment) - : m_algorithm(algorithm), m_test(test), m_mode(mode), m_feedbackSize(feedbackSize) - , m_firstLine(true), m_blankLineTransition(0) - { - Detach(attachment); - - m_typeToName[COUNT] = "COUNT"; - - m_nameToType["COUNT"] = COUNT; - m_nameToType["KEY"] = KEY_T; - m_nameToType["KEYs"] = KEY_T; - m_nameToType["key"] = KEY_T; - m_nameToType["Key"] = KEY_T; - m_nameToType["IV"] = IV; - m_nameToType["IV1"] = IV; - m_nameToType["CV"] = IV; - m_nameToType["CV1"] = IV; - m_nameToType["IB"] = IV; - m_nameToType["TEXT"] = INPUT; - m_nameToType["RESULT"] = OUTPUT; - m_nameToType["Msg"] = INPUT; - m_nameToType["Seed"] = INPUT; - m_nameToType["V"] = INPUT; - m_nameToType["DT"] = IV; - SetEncrypt(encrypt); - - if (m_algorithm == "DSA" || m_algorithm == "ECDSA") - { - if (m_test == "PKV") - m_trigger = "Qy"; - else if (m_test == "KeyPair") - m_trigger = "N"; - else if (m_test == "SigGen") - m_trigger = "Msg"; - else if (m_test == "SigVer") - m_trigger = "S"; - else if (m_test == "PQGGen") - m_trigger = "N"; - else if (m_test == "PQGVer") - m_trigger = "H"; - } - else if (m_algorithm == "HMAC") - m_trigger = "Msg"; - else if (m_algorithm == "SHA") - m_trigger = (m_test == "MONTE") ? "Seed" : "Msg"; - else if (m_algorithm == "RNG") - m_trigger = "V"; - else if (m_algorithm == "RSA") - m_trigger = (m_test == "Ver") ? "S" : "Msg"; - } - - void SetEncrypt(bool encrypt) - { - m_encrypt = encrypt; - if (encrypt) - { - m_nameToType["PLAINTEXT"] = INPUT; - m_nameToType["CIPHERTEXT"] = OUTPUT; - m_nameToType["PT"] = INPUT; - m_nameToType["CT"] = OUTPUT; - } - else - { - m_nameToType["PLAINTEXT"] = OUTPUT; - m_nameToType["CIPHERTEXT"] = INPUT; - m_nameToType["PT"] = OUTPUT; - m_nameToType["CT"] = INPUT; - } - - if (m_algorithm == "AES" || m_algorithm == "TDES") - { - if (encrypt) - { - m_trigger = "PLAINTEXT"; - m_typeToName[OUTPUT] = "CIPHERTEXT"; - } - else - { - m_trigger = "CIPHERTEXT"; - m_typeToName[OUTPUT] = "PLAINTEXT"; - } - m_count = 0; - } - } - -protected: - void OutputData(std::string &output, const std::string &key, const std::string &data) - { - output += key; - output += "= "; - output += data; - output += "\n"; - } - - void OutputData(std::string &output, const std::string &key, int data) - { - OutputData(output, key, IntToString(data)); - } - - void OutputData(std::string &output, const std::string &key, const SecByteBlock &data) - { - output += key; - output += "= "; - HexEncoder(new StringSink(output), false).Put(data, data.size()); - output += "\n"; - } - - void OutputData(std::string &output, const std::string &key, const Integer &data, int size=-1) - { - SecByteBlock s(size < 0 ? data.MinEncodedSize() : size); - data.Encode(s, s.size()); - OutputData(output, key, s); - } - - void OutputData(std::string &output, const std::string &key, const PolynomialMod2 &data, int size=-1) - { - SecByteBlock s(size < 0 ? data.MinEncodedSize() : size); - data.Encode(s, s.size()); - OutputData(output, key, s); - } - - void OutputData(std::string &output, DataType t, const std::string &data) - { - if (m_algorithm == "SKIPJACK") - { - if (m_test == "KAT") - { - if (t == OUTPUT) - output = m_line + data + "\n"; - } - else - { - if (t != COUNT) - { - output += m_typeToName[t]; - output += "="; - } - output += data; - output += t == OUTPUT ? "\n" : " "; - } - } - else if (m_algorithm == "TDES" && t == KEY_T && m_typeToName[KEY_T].empty()) - { - output += "KEY1 = "; - output += data.substr(0, 16); - output += "\nKEY2 = "; - output += data.size() > 16 ? data.substr(16, 16) : data.substr(0, 16); - output += "\nKEY3 = "; - output += data.size() > 32 ? data.substr(32, 16) : data.substr(0, 16); - output += "\n"; - } - else - { - output += m_typeToName[t]; - output += " = "; - output += data; - output += "\n"; - } - } - - void OutputData(std::string &output, DataType t, int i) - { - OutputData(output, t, IntToString(i)); - } - - void OutputData(std::string &output, DataType t, const SecByteBlock &data) - { - std::string hexData; - StringSource(data.begin(), data.size(), true, new HexEncoder(new StringSink(hexData), false)); - OutputData(output, t, hexData); - } - - void OutputGivenData(std::string &output, DataType t, bool optional = false) - { - if (m_data.find(m_typeToName[t]) == m_data.end()) - { - if (optional) - return; - throw Exception(Exception::OTHER_ERROR, "TestDataParser: key not found: " + m_typeToName[t]); - } - - OutputData(output, t, m_data[m_typeToName[t]]); - } - - template - BlockCipher * NewBT(T *) - { - if (!m_encrypt && (m_mode == "ECB" || m_mode == "CBC")) - return new typename T::Decryption; - else - return new typename T::Encryption; - } - - template - SymmetricCipher * NewMode(T *, BlockCipher &bt, const byte *iv) - { - if (!m_encrypt) - return new typename T::Decryption(bt, iv, m_feedbackSize/8); - else - return new typename T::Encryption(bt, iv, m_feedbackSize/8); - } - - static inline void Xor(SecByteBlock &z, const SecByteBlock &x, const SecByteBlock &y) - { - assert(x.size() == y.size()); - z.resize(x.size()); - xorbuf(z, x, y, x.size()); - } - - SecByteBlock UpdateKey(SecByteBlock key, const SecByteBlock *text) - { - unsigned int innerCount = (m_algorithm == "AES") ? 1000 : 10000; - int keySize = key.size(), blockSize = text[0].size(); - SecByteBlock x(keySize); - for (int k=0; k - void EC_KeyPair(string &output, int n, const OID &oid) - { - DL_GroupParameters_EC params(oid); - for (int i=0; i priv; - DL_PublicKey_EC pub; - priv.Initialize(m_rng, params); - priv.MakePublicKey(pub); - - OutputData(output, "d ", priv.GetPrivateExponent()); - OutputData(output, "Qx ", pub.GetPublicElement().x, params.GetCurve().GetField().MaxElementByteLength()); - OutputData(output, "Qy ", pub.GetPublicElement().y, params.GetCurve().GetField().MaxElementByteLength()); - } - } - - template - void EC_SigGen(string &output, const OID &oid) - { - DL_GroupParameters_EC params(oid); - typename ECDSA::PrivateKey priv; - typename ECDSA::PublicKey pub; - priv.Initialize(m_rng, params); - priv.MakePublicKey(pub); - - typename ECDSA::Signer signer(priv); - SecByteBlock sig(signer.SignatureLength()); - StringSource(m_data["Msg"], true, new HexDecoder(new SignerFilter(m_rng, signer, new ArraySink(sig, sig.size())))); - SecByteBlock R(sig, sig.size()/2), S(sig+sig.size()/2, sig.size()/2); - - OutputData(output, "Qx ", pub.GetPublicElement().x, params.GetCurve().GetField().MaxElementByteLength()); - OutputData(output, "Qy ", pub.GetPublicElement().y, params.GetCurve().GetField().MaxElementByteLength()); - OutputData(output, "R ", R); - OutputData(output, "S ", S); - } - - template - void EC_SigVer(string &output, const OID &oid) - { - SecByteBlock x(DecodeHex(m_data["Qx"])); - SecByteBlock y(DecodeHex(m_data["Qy"])); - Integer r((m_data["R"]+"h").c_str()); - Integer s((m_data["S"]+"h").c_str()); - - typename EC::FieldElement Qx(x, x.size()); - typename EC::FieldElement Qy(y, y.size()); - typename EC::Element Q(Qx, Qy); - - DL_GroupParameters_EC params(oid); - typename ECDSA::PublicKey pub; - pub.Initialize(params, Q); - typename ECDSA::Verifier verifier(pub); - - SecByteBlock sig(verifier.SignatureLength()); - r.Encode(sig, sig.size()/2); - s.Encode(sig+sig.size()/2, sig.size()/2); - - SignatureVerificationFilter filter(verifier); - filter.Put(sig, sig.size()); - StringSource(m_data["Msg"], true, new HexDecoder(new Redirector(filter, Redirector::DATA_ONLY))); - filter.MessageEnd(); - byte b; - filter.Get(b); - OutputData(output, "Result ", b ? "P" : "F"); - } - - template - static bool EC_PKV(RandomNumberGenerator &rng, const SecByteBlock &x, const SecByteBlock &y, const OID &oid) - { - typename EC::FieldElement Qx(x, x.size()); - typename EC::FieldElement Qy(y, y.size()); - typename EC::Element Q(Qx, Qy); - - DL_GroupParameters_EC params(oid); - typename ECDSA::PublicKey pub; - pub.Initialize(params, Q); - return pub.Validate(rng, 3); - } - - template - Result * CreateRSA2(const std::string &standard) - { - if (typeid(Result) == typeid(PK_Verifier)) - { - if (standard == "R") - return (Result *) new typename RSASS_ISO::Verifier; - else if (standard == "P") - return (Result *) new typename RSASS::Verifier; - else if (standard == "1") - return (Result *) new typename RSASS::Verifier; - } - else if (typeid(Result) == typeid(PK_Signer)) - { - if (standard == "R") - return (Result *) new typename RSASS_ISO::Signer; - else if (standard == "P") - return (Result *) new typename RSASS::Signer; - else if (standard == "1") - return (Result *) new typename RSASS::Signer; - } - - return NULL; - } - - template - Result * CreateRSA(const std::string &standard, const std::string &hash) - { - if (hash == "1") - return CreateRSA2(standard); - else if (hash == "224") - return CreateRSA2(standard); - else if (hash == "256") - return CreateRSA2(standard); - else if (hash == "384") - return CreateRSA2(standard); - else if (hash == "512") - return CreateRSA2(standard); - else - return NULL; - } - - virtual void DoTest() - { - std::string output; - - if (m_algorithm == "DSA") - { - if (m_test == "KeyPair") - { - DL_GroupParameters_DSA pqg; - int modLen = atol(m_bracketString.substr(6).c_str()); - pqg.GenerateRandomWithKeySize(m_rng, modLen); - - OutputData(output, "P ", pqg.GetModulus()); - OutputData(output, "Q ", pqg.GetSubgroupOrder()); - OutputData(output, "G ", pqg.GetSubgroupGenerator()); - - int n = atol(m_data["N"].c_str()); - for (int i=0; iPut((byte *)output.data(), output.size()); - output.resize(0); - } - } - else if (m_test == "PQGGen") - { - int n = atol(m_data["N"].c_str()); - for (int i=0; iPut((byte *)output.data(), output.size()); - output.resize(0); - } - } - else if (m_test == "SigGen") - { - std::string &encodedKey = m_data["PrivKey"]; - int modLen = atol(m_bracketString.substr(6).c_str()); - DSA::PrivateKey priv; - - if (!encodedKey.empty()) - { - StringStore s(encodedKey); - priv.BERDecode(s); - if (priv.GetGroupParameters().GetModulus().BitCount() != modLen) - encodedKey.clear(); - } - - if (encodedKey.empty()) - { - priv.Initialize(m_rng, modLen); - StringSink s(encodedKey); - priv.DEREncode(s); - OutputData(output, "P ", priv.GetGroupParameters().GetModulus()); - OutputData(output, "Q ", priv.GetGroupParameters().GetSubgroupOrder()); - OutputData(output, "G ", priv.GetGroupParameters().GetSubgroupGenerator()); - } - - DSA::Signer signer(priv); - DSA::Verifier pub(signer); - OutputData(output, "Msg ", m_data["Msg"]); - OutputData(output, "Y ", pub.GetKey().GetPublicElement()); - - SecByteBlock sig(signer.SignatureLength()); - StringSource(m_data["Msg"], true, new HexDecoder(new SignerFilter(m_rng, signer, new ArraySink(sig, sig.size())))); - SecByteBlock R(sig, sig.size()/2), S(sig+sig.size()/2, sig.size()/2); - OutputData(output, "R ", R); - OutputData(output, "S ", S); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - else if (m_test == "SigVer") - { - Integer p((m_data["P"] + "h").c_str()); - Integer q((m_data["Q"] + "h").c_str()); - Integer g((m_data["G"] + "h").c_str()); - Integer y((m_data["Y"] + "h").c_str()); - DSA::Verifier verifier(p, q, g, y); - - HexDecoder filter(new SignatureVerificationFilter(verifier)); - StringSource(m_data["R"], true, new Redirector(filter, Redirector::DATA_ONLY)); - StringSource(m_data["S"], true, new Redirector(filter, Redirector::DATA_ONLY)); - StringSource(m_data["Msg"], true, new Redirector(filter, Redirector::DATA_ONLY)); - filter.MessageEnd(); - byte b; - filter.Get(b); - OutputData(output, "Result ", b ? "P" : "F"); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - else if (m_test == "PQGVer") - { - Integer p((m_data["P"] + "h").c_str()); - Integer q((m_data["Q"] + "h").c_str()); - Integer g((m_data["G"] + "h").c_str()); - Integer h((m_data["H"] + "h").c_str()); - int c = atol(m_data["c"].c_str()); - SecByteBlock seed(m_data["Seed"].size()/2); - StringSource(m_data["Seed"], true, new HexDecoder(new ArraySink(seed, seed.size()))); - - Integer p1, q1; - bool result = DSA::GeneratePrimes(seed, seed.size()*8, c, p1, 1024, q1, true); - result = result && (p1 == p && q1 == q); - result = result && g == a_exp_b_mod_c(h, (p-1)/q, p); - - OutputData(output, "Result ", result ? "P" : "F"); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - - return; - } - - if (m_algorithm == "ECDSA") - { - std::map name2oid; - name2oid["P-192"] = ASN1::secp192r1(); - name2oid["P-224"] = ASN1::secp224r1(); - name2oid["P-256"] = ASN1::secp256r1(); - name2oid["P-384"] = ASN1::secp384r1(); - name2oid["P-521"] = ASN1::secp521r1(); - name2oid["K-163"] = ASN1::sect163k1(); - name2oid["K-233"] = ASN1::sect233k1(); - name2oid["K-283"] = ASN1::sect283k1(); - name2oid["K-409"] = ASN1::sect409k1(); - name2oid["K-571"] = ASN1::sect571k1(); - name2oid["B-163"] = ASN1::sect163r2(); - name2oid["B-233"] = ASN1::sect233r1(); - name2oid["B-283"] = ASN1::sect283r1(); - name2oid["B-409"] = ASN1::sect409r1(); - name2oid["B-571"] = ASN1::sect571r1(); - - if (m_test == "PKV") - { - bool pass; - if (m_bracketString[0] == 'P') - pass = EC_PKV(m_rng, DecodeHex(m_data["Qx"]), DecodeHex(m_data["Qy"]), name2oid[m_bracketString]); - else - pass = EC_PKV(m_rng, DecodeHex(m_data["Qx"]), DecodeHex(m_data["Qy"]), name2oid[m_bracketString]); - - OutputData(output, "Result ", pass ? "P" : "F"); - } - else if (m_test == "KeyPair") - { - if (m_bracketString[0] == 'P') - EC_KeyPair(output, atol(m_data["N"].c_str()), name2oid[m_bracketString]); - else - EC_KeyPair(output, atol(m_data["N"].c_str()), name2oid[m_bracketString]); - } - else if (m_test == "SigGen") - { - if (m_bracketString[0] == 'P') - EC_SigGen(output, name2oid[m_bracketString]); - else - EC_SigGen(output, name2oid[m_bracketString]); - } - else if (m_test == "SigVer") - { - if (m_bracketString[0] == 'P') - EC_SigVer(output, name2oid[m_bracketString]); - else - EC_SigVer(output, name2oid[m_bracketString]); - } - - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - return; - } - - if (m_algorithm == "RSA") - { - std::string shaAlg = m_data["SHAAlg"].substr(3); - - if (m_test == "Ver") - { - Integer n((m_data["n"] + "h").c_str()); - Integer e((m_data["e"] + "h").c_str()); - RSA::PublicKey pub; - pub.Initialize(n, e); - - member_ptr pV(CreateRSA(m_mode, shaAlg)); - pV->AccessMaterial().AssignFrom(pub); - - HexDecoder filter(new SignatureVerificationFilter(*pV)); - for (unsigned int i=m_data["S"].size(); iSignatureLength()*2; i++) - filter.Put('0'); - StringSource(m_data["S"], true, new Redirector(filter, Redirector::DATA_ONLY)); - StringSource(m_data["Msg"], true, new Redirector(filter, Redirector::DATA_ONLY)); - filter.MessageEnd(); - byte b; - filter.Get(b); - OutputData(output, "Result ", b ? "P" : "F"); - } - else - { - assert(m_test == "Gen"); - int modLen = atol(m_bracketString.substr(6).c_str()); - std::string &encodedKey = m_data["PrivKey"]; - RSA::PrivateKey priv; - - if (!encodedKey.empty()) - { - StringStore s(encodedKey); - priv.BERDecode(s); - if (priv.GetModulus().BitCount() != modLen) - encodedKey.clear(); - } - - if (encodedKey.empty()) - { - priv.Initialize(m_rng, modLen); - StringSink s(encodedKey); - priv.DEREncode(s); - OutputData(output, "n ", priv.GetModulus()); - OutputData(output, "e ", priv.GetPublicExponent(), modLen/8); - } - - member_ptr pS(CreateRSA(m_mode, shaAlg)); - pS->AccessMaterial().AssignFrom(priv); - - SecByteBlock sig(pS->SignatureLength()); - StringSource(m_data["Msg"], true, new HexDecoder(new SignerFilter(m_rng, *pS, new ArraySink(sig, sig.size())))); - OutputData(output, "SHAAlg ", m_data["SHAAlg"]); - OutputData(output, "Msg ", m_data["Msg"]); - OutputData(output, "S ", sig); - } - - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - return; - } - - if (m_algorithm == "SHA") - { - member_ptr pHF; - - if (m_mode == "1") - pHF.reset(new SHA1); - else if (m_mode == "224") - pHF.reset(new SHA224); - else if (m_mode == "256") - pHF.reset(new SHA256); - else if (m_mode == "384") - pHF.reset(new SHA384); - else if (m_mode == "512") - pHF.reset(new SHA512); - - if (m_test == "MONTE") - { - SecByteBlock seed = m_data2[INPUT]; - SecByteBlock MD[1003]; - int i,j; - - for (j=0; j<100; j++) - { - MD[0] = MD[1] = MD[2] = seed; - for (i=3; i<1003; i++) - { - SecByteBlock Mi = MD[i-3] + MD[i-2] + MD[i-1]; - MD[i].resize(pHF->DigestSize()); - pHF->CalculateDigest(MD[i], Mi, Mi.size()); - } - seed = MD[1002]; - OutputData(output, "COUNT ", j); - OutputData(output, "MD ", seed); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - } - else - { - SecByteBlock tag(pHF->DigestSize()); - SecByteBlock &msg(m_data2[INPUT]); - int len = atol(m_data["Len"].c_str()); - StringSource(msg.begin(), len/8, true, new HashFilter(*pHF, new ArraySink(tag, tag.size()))); - OutputData(output, "MD ", tag); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - return; - } - - SecByteBlock &key = m_data2[KEY_T]; - - if (m_algorithm == "TDES") - { - if (!m_data["KEY1"].empty()) - { - const std::string keys[3] = {m_data["KEY1"], m_data["KEY2"], m_data["KEY3"]}; - key.resize(24); - HexDecoder hexDec(new ArraySink(key, key.size())); - for (int i=0; i<3; i++) - hexDec.Put((byte *)keys[i].data(), keys[i].size()); - - if (keys[0] == keys[2]) - { - if (keys[0] == keys[1]) - key.resize(8); - else - key.resize(16); - } - else - key.resize(24); - } - } - - if (m_algorithm == "RNG") - { - key.resize(24); - StringSource(m_data["Key1"] + m_data["Key2"] + m_data["Key3"], true, new HexDecoder(new ArraySink(key, key.size()))); - - SecByteBlock seed(m_data2[INPUT]), dt(m_data2[IV]), r(8); - X917RNG rng(new DES_EDE3::Encryption(key, key.size()), seed, dt); - - if (m_test == "MCT") - { - for (int i=0; i<10000; i++) - rng.GenerateBlock(r, r.size()); - } - else - { - rng.GenerateBlock(r, r.size()); - } - - OutputData(output, "R ", r); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - return; - } - - if (m_algorithm == "HMAC") - { - member_ptr pMAC; - - if (m_bracketString == "L=20") - pMAC.reset(new HMAC); - else if (m_bracketString == "L=28") - pMAC.reset(new HMAC); - else if (m_bracketString == "L=32") - pMAC.reset(new HMAC); - else if (m_bracketString == "L=48") - pMAC.reset(new HMAC); - else if (m_bracketString == "L=64") - pMAC.reset(new HMAC); - else - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected HMAC bracket string: " + m_bracketString); - - pMAC->SetKey(key, key.size()); - int Tlen = atol(m_data["Tlen"].c_str()); - SecByteBlock tag(Tlen); - StringSource(m_data["Msg"], true, new HexDecoder(new HashFilter(*pMAC, new ArraySink(tag, Tlen), false, Tlen))); - OutputData(output, "Mac ", tag); - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - return; - } - - member_ptr pBT; - if (m_algorithm == "DES") - pBT.reset(NewBT((DES*)0)); - else if (m_algorithm == "TDES") - { - if (key.size() == 8) - pBT.reset(NewBT((DES*)0)); - else if (key.size() == 16) - pBT.reset(NewBT((DES_EDE2*)0)); - else - pBT.reset(NewBT((DES_EDE3*)0)); - } - else if (m_algorithm == "SKIPJACK") - pBT.reset(NewBT((SKIPJACK*)0)); - else if (m_algorithm == "AES") - pBT.reset(NewBT((AES*)0)); - else - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected algorithm: " + m_algorithm); - - if (!pBT->IsValidKeyLength(key.size())) - key.CleanNew(pBT->DefaultKeyLength()); // for Scbcvrct - pBT->SetKey(key.data(), key.size()); - - SecByteBlock &iv = m_data2[IV]; - if (iv.empty()) - iv.CleanNew(pBT->BlockSize()); - - member_ptr pCipher; - unsigned int K = m_feedbackSize; - - if (m_mode == "ECB") - pCipher.reset(NewMode((ECB_Mode_ExternalCipher*)0, *pBT, iv)); - else if (m_mode == "CBC") - pCipher.reset(NewMode((CBC_Mode_ExternalCipher*)0, *pBT, iv)); - else if (m_mode == "CFB") - pCipher.reset(NewMode((CFB_Mode_ExternalCipher*)0, *pBT, iv)); - else if (m_mode == "OFB") - pCipher.reset(NewMode((OFB_Mode_ExternalCipher*)0, *pBT, iv)); - else - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected mode: " + m_mode); - - bool encrypt = m_encrypt; - - if (m_test == "MONTE") - { - SecByteBlock KEY[401]; - KEY[0] = key; - int keySize = key.size(); - int blockSize = pBT->BlockSize(); - - std::vector IB(10001), OB(10001), PT(10001), CT(10001), RESULT(10001), TXT(10001), CV(10001); - PT[0] = GetData("PLAINTEXT"); - CT[0] = GetData("CIPHERTEXT"); - CV[0] = IB[0] = iv; - TXT[0] = GetData("TEXT"); - - int outerCount = (m_algorithm == "AES") ? 100 : 400; - int innerCount = (m_algorithm == "AES") ? 1000 : 10000; - - for (int i=0; iSetKey(KEY[i], keySize); - - for (int j=0; jProcessBlock(IB[j], CT[j]); - PT[j+1] = CT[j]; - } - else - { - IB[j] = CT[j]; - PT[j].resize(blockSize); - pBT->ProcessBlock(IB[j], PT[j]); - CT[j+1] = PT[j]; - } - } - else if (m_mode == "OFB") - { - OB[j].resize(blockSize); - pBT->ProcessBlock(IB[j], OB[j]); - Xor(RESULT[j], OB[j], TXT[j]); - TXT[j+1] = IB[j]; - IB[j+1] = OB[j]; - } - else if (m_mode == "CBC") - { - if (encrypt) - { - Xor(IB[j], PT[j], CV[j]); - CT[j].resize(blockSize); - pBT->ProcessBlock(IB[j], CT[j]); - PT[j+1] = CV[j]; - CV[j+1] = CT[j]; - } - else - { - IB[j] = CT[j]; - OB[j].resize(blockSize); - pBT->ProcessBlock(IB[j], OB[j]); - Xor(PT[j], OB[j], CV[j]); - CV[j+1] = CT[j]; - CT[j+1] = PT[j]; - } - } - else if (m_mode == "CFB") - { - if (encrypt) - { - OB[j].resize(blockSize); - pBT->ProcessBlock(IB[j], OB[j]); - AssignLeftMostBits(CT[j], OB[j], K); - Xor(CT[j], CT[j], PT[j]); - AssignLeftMostBits(PT[j+1], IB[j], K); - IB[j+1].resize(blockSize); - memcpy(IB[j+1], IB[j]+K/8, blockSize-K/8); - memcpy(IB[j+1]+blockSize-K/8, CT[j], K/8); - } - else - { - OB[j].resize(blockSize); - pBT->ProcessBlock(IB[j], OB[j]); - AssignLeftMostBits(PT[j], OB[j], K); - Xor(PT[j], PT[j], CT[j]); - IB[j+1].resize(blockSize); - memcpy(IB[j+1], IB[j]+K/8, blockSize-K/8); - memcpy(IB[j+1]+blockSize-K/8, CT[j], K/8); - AssignLeftMostBits(CT[j+1], OB[j], K); - } - } - else - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected mode: " + m_mode); - } - - OutputData(output, COUNT, IntToString(i)); - OutputData(output, KEY_T, KEY[i]); - if (m_mode == "CBC") - OutputData(output, IV, CV[0]); - if (m_mode == "OFB" || m_mode == "CFB") - OutputData(output, IV, IB[0]); - if (m_mode == "ECB" || m_mode == "CBC" || m_mode == "CFB") - { - if (encrypt) - { - OutputData(output, INPUT, PT[0]); - OutputData(output, OUTPUT, CT[innerCount-1]); - KEY[i+1] = UpdateKey(KEY[i], &CT[0]); - } - else - { - OutputData(output, INPUT, CT[0]); - OutputData(output, OUTPUT, PT[innerCount-1]); - KEY[i+1] = UpdateKey(KEY[i], &PT[0]); - } - PT[0] = PT[innerCount]; - IB[0] = IB[innerCount]; - CV[0] = CV[innerCount]; - CT[0] = CT[innerCount]; - } - else if (m_mode == "OFB") - { - OutputData(output, INPUT, TXT[0]); - OutputData(output, OUTPUT, RESULT[innerCount-1]); - KEY[i+1] = UpdateKey(KEY[i], &RESULT[0]); - Xor(TXT[0], TXT[0], IB[innerCount-1]); - IB[0] = OB[innerCount-1]; - } - output += "\n"; - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - } - } - else if (m_test == "MCT") - { - SecByteBlock KEY[101]; - KEY[0] = key; - int keySize = key.size(); - int blockSize = pBT->BlockSize(); - - SecByteBlock ivs[101], inputs[1001], outputs[1001]; - ivs[0] = iv; - inputs[0] = m_data2[INPUT]; - - for (int i=0; i<100; i++) - { - pCipher->SetKey(KEY[i], keySize, MakeParameters(Name::IV(), (const byte *)ivs[i])(Name::FeedbackSize(), (int)K/8, false)); - - for (int j=0; j<1000; j++) - { - outputs[j] = inputs[j]; - pCipher->ProcessString(outputs[j], outputs[j].size()); - if (K==8 && m_mode == "CFB") - { - if (j<16) - inputs[j+1].Assign(ivs[i]+j, 1); - else - inputs[j+1] = outputs[j-16]; - } - else if (m_mode == "ECB") - inputs[j+1] = outputs[j]; - else if (j == 0) - inputs[j+1] = ivs[i]; - else - inputs[j+1] = outputs[j-1]; - } - - if (m_algorithm == "AES") - OutputData(output, COUNT, m_count++); - OutputData(output, KEY_T, KEY[i]); - if (m_mode != "ECB") - OutputData(output, IV, ivs[i]); - OutputData(output, INPUT, inputs[0]); - OutputData(output, OUTPUT, outputs[999]); - output += "\n"; - AttachedTransformation()->Put((byte *)output.data(), output.size()); - output.resize(0); - - KEY[i+1] = UpdateKey(KEY[i], outputs); - ivs[i+1].CleanNew(pCipher->IVSize()); - ivs[i+1] = UpdateKey(ivs[i+1], outputs); - if (K==8 && m_mode == "CFB") - inputs[0] = outputs[999-16]; - else if (m_mode == "ECB") - inputs[0] = outputs[999]; - else - inputs[0] = outputs[998]; - } - } - else - { - assert(m_test == "KAT"); - - SecByteBlock &input = m_data2[INPUT]; - SecByteBlock result(input.size()); - member_ptr pFilter(new StreamTransformationFilter(*pCipher, new ArraySink(result, result.size()), StreamTransformationFilter::NO_PADDING)); - StringSource(input.data(), input.size(), true, pFilter.release()); - - OutputGivenData(output, COUNT, true); - OutputData(output, KEY_T, key); - OutputGivenData(output, IV, true); - OutputGivenData(output, INPUT); - OutputData(output, OUTPUT, result); - output += "\n"; - AttachedTransformation()->Put((byte *)output.data(), output.size()); - } - } - - std::vector Tokenize(const std::string &line) - { - std::vector result; - std::string s; - for (unsigned int i=0; i") - { - assert(m_test == "sha"); - m_bracketString = m_line.substr(2, m_line.size()-4); - m_line = m_line.substr(0, 13) + "Hashes") - copyLine = true; - - if (m_line == "Put((byte *)m_line.data(), m_line.size(), blocking); - return false; - } - - std::vector tokens = Tokenize(m_line); - - if (m_algorithm == "DSA" && m_test == "sha") - { - for (unsigned int i = 0; i < tokens.size(); i++) - { - if (tokens[i] == "^") - DoTest(); - else if (tokens[i] != "") - m_compactString.push_back(atol(tokens[i].c_str())); - } - } - else - { - if (!m_line.empty() && ((m_algorithm == "RSA" && m_test != "Gen") || m_algorithm == "RNG" || m_algorithm == "HMAC" || m_algorithm == "SHA" || (m_algorithm == "ECDSA" && m_test != "KeyPair") || (m_algorithm == "DSA" && (m_test == "PQGVer" || m_test == "SigVer")))) - { - // copy input to output - std::string output = m_line + '\n'; - AttachedTransformation()->Put((byte *)output.data(), output.size()); - } - - for (unsigned int i = 0; i < tokens.size(); i++) - { - if (m_firstLine && m_algorithm != "DSA") - { - if (tokens[i] == "Encrypt" || tokens[i] == "OFB") - SetEncrypt(true); - else if (tokens[i] == "Decrypt") - SetEncrypt(false); - else if (tokens[i] == "Modes") - m_test = "MONTE"; - } - else - { - if (tokens[i] != "=") - continue; - - if (i == 0) - throw Exception(Exception::OTHER_ERROR, "TestDataParser: unexpected data: " + m_line); - - const std::string &key = tokens[i-1]; - std::string &data = m_data[key]; - data = (tokens.size() > i+1) ? tokens[i+1] : ""; - DataType t = m_nameToType[key]; - m_typeToName[t] = key; - m_data2[t] = DecodeHex(data); - - if (key == m_trigger || (t == OUTPUT && !m_data2[INPUT].empty() && !isspace(m_line[0]))) - DoTest(); - } - } - } - - m_firstLine = false; - - return false; - } - - inline const SecByteBlock & GetData(const std::string &key) - { - return m_data2[m_nameToType[key]]; - } - - static SecByteBlock DecodeHex(const std::string &data) - { - SecByteBlock data2(data.size() / 2); - StringSource(data, true, new HexDecoder(new ArraySink(data2, data2.size()))); - return data2; - } - - std::string m_algorithm, m_test, m_mode, m_line, m_bracketString, m_trigger; - unsigned int m_feedbackSize, m_blankLineTransition; - bool m_encrypt, m_firstLine; - - typedef std::map NameToTypeMap; - NameToTypeMap m_nameToType; - typedef std::map TypeToNameMap; - TypeToNameMap m_typeToName; - - typedef std::map Map; - Map m_data; // raw data - typedef std::map Map2; - Map2 m_data2; - int m_count; - - AutoSeededX917RNG m_rng; - std::vector m_compactString; -}; - -int FIPS_140_AlgorithmTest(int argc, char **argv) -{ - argc--; - argv++; - - std::string algorithm = argv[1]; - std::string pathname = argv[2]; - unsigned int i = pathname.find_last_of("\\/"); - std::string filename = pathname.substr(i == std::string::npos ? 0 : i+1); - std::string dirname = pathname.substr(0, i); - - if (algorithm == "auto") - { - string algTable[] = {"AES", "ECDSA", "DSA", "HMAC", "RNG", "RSA", "TDES", "SKIPJACK", "SHA"}; // order is important here - for (i=0; i 3) - { - std::string outDir = argv[3]; - - if (outDir == "auto") - { - if (dirname.substr(dirname.size()-3) == "req") - outDir = dirname.substr(0, dirname.size()-3) + "resp"; - } - - if (*outDir.rbegin() != '\\' && *outDir.rbegin() != '/') - outDir += '/'; - std::string outPathname = outDir + filename.substr(0, filename.size() - 3) + "rsp"; - pSink = new FileSink(outPathname.c_str(), false); - } - else - pSink = new FileSink(cout); - - FileSource(pathname.c_str(), true, new LineBreakParser(new TestDataParser(algorithm, test, mode, feedbackSize, encrypt, pSink)), false); - } - catch (...) - { - cout << "file: " << filename << endl; - throw; - } - return 0; -} - -extern int (*AdhocTest)(int argc, char *argv[]); -static int s_i = (AdhocTest = &FIPS_140_AlgorithmTest, 0); -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/fipstest.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/fipstest.cpp deleted file mode 100644 index e882742e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/fipstest.cpp +++ /dev/null @@ -1,601 +0,0 @@ -// fipstest.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#define CRYPTOPP_DEFAULT_NO_DLL -#include "dll.h" - -#ifdef CRYPTOPP_WIN32_AVAILABLE -#define _WIN32_WINNT 0x0400 -#include - -#if defined(_MSC_VER) && _MSC_VER >= 1400 -#ifdef _M_IX86 -#define _CRT_DEBUGGER_HOOK _crt_debugger_hook -#else -#define _CRT_DEBUGGER_HOOK __crt_debugger_hook -#endif -extern "C" {_CRTIMP void __cdecl _CRT_DEBUGGER_HOOK(int);} -#endif -#endif - -#include - -NAMESPACE_BEGIN(CryptoPP) - -extern PowerUpSelfTestStatus g_powerUpSelfTestStatus; -SecByteBlock g_actualMac; -unsigned long g_macFileLocation = 0; - -// use a random dummy string here, to be searched/replaced later with the real MAC -static const byte s_moduleMac[CryptoPP::HMAC::DIGESTSIZE] = CRYPTOPP_DUMMY_DLL_MAC; -CRYPTOPP_COMPILE_ASSERT(sizeof(s_moduleMac) == CryptoPP::SHA1::DIGESTSIZE); - -#ifdef CRYPTOPP_WIN32_AVAILABLE -static HMODULE s_hModule = NULL; -#endif - -const byte * CRYPTOPP_API GetActualMacAndLocation(unsigned int &macSize, unsigned int &fileLocation) -{ - macSize = (unsigned int)g_actualMac.size(); - fileLocation = g_macFileLocation; - return g_actualMac; -} - -void KnownAnswerTest(RandomNumberGenerator &rng, const char *output) -{ - EqualityComparisonFilter comparison; - - RandomNumberStore(rng, strlen(output)/2).TransferAllTo(comparison, "0"); - StringSource(output, true, new HexDecoder(new ChannelSwitch(comparison, "1"))); - - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); -} - -template -void X917RNG_KnownAnswerTest( - const char *key, - const char *seed, - const char *deterministicTimeVector, - const char *output, - CIPHER *dummy = NULL) -{ -#ifdef OS_RNG_AVAILABLE - std::string decodedKey, decodedSeed, decodedDeterministicTimeVector; - StringSource(key, true, new HexDecoder(new StringSink(decodedKey))); - StringSource(seed, true, new HexDecoder(new StringSink(decodedSeed))); - StringSource(deterministicTimeVector, true, new HexDecoder(new StringSink(decodedDeterministicTimeVector))); - - AutoSeededX917RNG rng(false, false); - rng.Reseed((const byte *)decodedKey.data(), decodedKey.size(), (const byte *)decodedSeed.data(), (const byte *)decodedDeterministicTimeVector.data()); - KnownAnswerTest(rng, output); -#else - throw 0; -#endif -} - -void KnownAnswerTest(StreamTransformation &encryption, StreamTransformation &decryption, const char *plaintext, const char *ciphertext) -{ - EqualityComparisonFilter comparison; - - StringSource(plaintext, true, new HexDecoder(new StreamTransformationFilter(encryption, new ChannelSwitch(comparison, "0"), StreamTransformationFilter::NO_PADDING))); - StringSource(ciphertext, true, new HexDecoder(new ChannelSwitch(comparison, "1"))); - - StringSource(ciphertext, true, new HexDecoder(new StreamTransformationFilter(decryption, new ChannelSwitch(comparison, "0"), StreamTransformationFilter::NO_PADDING))); - StringSource(plaintext, true, new HexDecoder(new ChannelSwitch(comparison, "1"))); - - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); -} - -template -void SymmetricEncryptionKnownAnswerTest( - const char *key, - const char *hexIV, - const char *plaintext, - const char *ecb, - const char *cbc, - const char *cfb, - const char *ofb, - const char *ctr, - CIPHER *dummy = NULL) -{ - std::string decodedKey; - StringSource(key, true, new HexDecoder(new StringSink(decodedKey))); - - typename CIPHER::Encryption encryption((const byte *)decodedKey.data(), decodedKey.size()); - typename CIPHER::Decryption decryption((const byte *)decodedKey.data(), decodedKey.size()); - - SecByteBlock iv(encryption.BlockSize()); - StringSource(hexIV, true, new HexDecoder(new ArraySink(iv, iv.size()))); - - if (ecb) - KnownAnswerTest(ECB_Mode_ExternalCipher::Encryption(encryption).Ref(), ECB_Mode_ExternalCipher::Decryption(decryption).Ref(), plaintext, ecb); - if (cbc) - KnownAnswerTest(CBC_Mode_ExternalCipher::Encryption(encryption, iv).Ref(), CBC_Mode_ExternalCipher::Decryption(decryption, iv).Ref(), plaintext, cbc); - if (cfb) - KnownAnswerTest(CFB_Mode_ExternalCipher::Encryption(encryption, iv).Ref(), CFB_Mode_ExternalCipher::Decryption(encryption, iv).Ref(), plaintext, cfb); - if (ofb) - KnownAnswerTest(OFB_Mode_ExternalCipher::Encryption(encryption, iv).Ref(), OFB_Mode_ExternalCipher::Decryption(encryption, iv).Ref(), plaintext, ofb); - if (ctr) - KnownAnswerTest(CTR_Mode_ExternalCipher::Encryption(encryption, iv).Ref(), CTR_Mode_ExternalCipher::Decryption(encryption, iv).Ref(), plaintext, ctr); -} - -void KnownAnswerTest(HashTransformation &hash, const char *message, const char *digest) -{ - EqualityComparisonFilter comparison; - StringSource(digest, true, new HexDecoder(new ChannelSwitch(comparison, "1"))); - StringSource(message, true, new HashFilter(hash, new ChannelSwitch(comparison, "0"))); - - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); -} - -template -void SecureHashKnownAnswerTest(const char *message, const char *digest, HASH *dummy = NULL) -{ - HASH hash; - KnownAnswerTest(hash, message, digest); -} - -template -void MAC_KnownAnswerTest(const char *key, const char *message, const char *digest, MAC *dummy = NULL) -{ - std::string decodedKey; - StringSource(key, true, new HexDecoder(new StringSink(decodedKey))); - - MAC mac((const byte *)decodedKey.data(), decodedKey.size()); - KnownAnswerTest(mac, message, digest); -} - -template -void SignatureKnownAnswerTest(const char *key, const char *message, const char *signature, SCHEME *dummy = NULL) -{ - typename SCHEME::Signer signer(StringSource(key, true, new HexDecoder).Ref()); - typename SCHEME::Verifier verifier(signer); - - RandomPool rng; - EqualityComparisonFilter comparison; - - StringSource(message, true, new SignerFilter(rng, signer, new ChannelSwitch(comparison, "0"))); - StringSource(signature, true, new HexDecoder(new ChannelSwitch(comparison, "1"))); - - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); - - VerifierFilter verifierFilter(verifier, NULL, VerifierFilter::SIGNATURE_AT_BEGIN | VerifierFilter::THROW_EXCEPTION); - StringSource(signature, true, new HexDecoder(new Redirector(verifierFilter, Redirector::DATA_ONLY))); - StringSource(message, true, new Redirector(verifierFilter)); -} - -void EncryptionPairwiseConsistencyTest(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor) -{ - try - { - RandomPool rng; - const char *testMessage ="test message"; - std::string ciphertext, decrypted; - - StringSource( - testMessage, - true, - new PK_EncryptorFilter( - rng, - encryptor, - new StringSink(ciphertext))); - - if (ciphertext == testMessage) - throw 0; - - StringSource( - ciphertext, - true, - new PK_DecryptorFilter( - rng, - decryptor, - new StringSink(decrypted))); - - if (decrypted != testMessage) - throw 0; - } - catch (...) - { - throw SelfTestFailure(encryptor.AlgorithmName() + ": pairwise consistency test failed"); - } -} - -void SignaturePairwiseConsistencyTest(const PK_Signer &signer, const PK_Verifier &verifier) -{ - try - { - RandomPool rng; - - StringSource( - "test message", - true, - new SignerFilter( - rng, - signer, - new VerifierFilter(verifier, NULL, VerifierFilter::THROW_EXCEPTION), - true)); - } - catch (...) - { - throw SelfTestFailure(signer.AlgorithmName() + ": pairwise consistency test failed"); - } -} - -template -void SignaturePairwiseConsistencyTest(const char *key, SCHEME *dummy = NULL) -{ - typename SCHEME::Signer signer(StringSource(key, true, new HexDecoder).Ref()); - typename SCHEME::Verifier verifier(signer); - - SignaturePairwiseConsistencyTest(signer, verifier); -} - -MessageAuthenticationCode * NewIntegrityCheckingMAC() -{ - byte key[] = {0x47, 0x1E, 0x33, 0x96, 0x65, 0xB1, 0x6A, 0xED, 0x0B, 0xF8, 0x6B, 0xFD, 0x01, 0x65, 0x05, 0xCC}; - return new HMAC(key, sizeof(key)); -} - -bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModuleMac, SecByteBlock *pActualMac, unsigned long *pMacFileLocation) -{ - std::auto_ptr mac(NewIntegrityCheckingMAC()); - unsigned int macSize = mac->DigestSize(); - - SecByteBlock tempMac; - SecByteBlock &actualMac = pActualMac ? *pActualMac : tempMac; - actualMac.resize(macSize); - - unsigned long tempLocation; - unsigned long &macFileLocation = pMacFileLocation ? *pMacFileLocation : tempLocation; - macFileLocation = 0; - - MeterFilter verifier(new HashFilter(*mac, new ArraySink(actualMac, actualMac.size()))); -// MeterFilter verifier(new FileSink("c:\\dt.tmp")); - std::ifstream moduleStream; - -#ifdef CRYPTOPP_WIN32_AVAILABLE - HMODULE h; - { - char moduleFilenameBuf[MAX_PATH] = ""; - if (moduleFilename == NULL) - { -#if (_MSC_VER >= 1400 && !defined(_STLPORT_VERSION)) // ifstream doesn't support wide filename on other compilers - wchar_t wideModuleFilename[MAX_PATH]; - if (GetModuleFileNameW(s_hModule, wideModuleFilename, MAX_PATH) > 0) - { - moduleStream.open(wideModuleFilename, std::ios::in | std::ios::binary); - h = GetModuleHandleW(wideModuleFilename); - } - else -#endif - { - GetModuleFileNameA(s_hModule, moduleFilenameBuf, MAX_PATH); - moduleFilename = moduleFilenameBuf; - } - } -#endif - if (moduleFilename != NULL) - { - moduleStream.open(moduleFilename, std::ios::in | std::ios::binary); -#ifdef CRYPTOPP_WIN32_AVAILABLE - h = GetModuleHandleA(moduleFilename); - moduleFilename = NULL; - } -#endif - } - - if (!moduleStream) - { -#ifdef CRYPTOPP_WIN32_AVAILABLE - OutputDebugString("Crypto++ DLL integrity check failed. Cannot open file for reading."); -#endif - return false; - } - FileStore file(moduleStream); - -#ifdef CRYPTOPP_WIN32_AVAILABLE - // try to hash from memory first - const byte *memBase = (const byte *)h; - const IMAGE_DOS_HEADER *ph = (IMAGE_DOS_HEADER *)memBase; - const IMAGE_NT_HEADERS *phnt = (IMAGE_NT_HEADERS *)(memBase + ph->e_lfanew); - const IMAGE_SECTION_HEADER *phs = IMAGE_FIRST_SECTION(phnt); - DWORD nSections = phnt->FileHeader.NumberOfSections; - size_t currentFilePos = 0; - - size_t checksumPos = (byte *)&phnt->OptionalHeader.CheckSum - memBase; - size_t checksumSize = sizeof(phnt->OptionalHeader.CheckSum); - size_t certificateTableDirectoryPos = (byte *)&phnt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] - memBase; - size_t certificateTableDirectorySize = sizeof(phnt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]); - size_t certificateTablePos = phnt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY].VirtualAddress; - size_t certificateTableSize = phnt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY].Size; - - verifier.AddRangeToSkip(0, checksumPos, checksumSize); - verifier.AddRangeToSkip(0, certificateTableDirectoryPos, certificateTableDirectorySize); - verifier.AddRangeToSkip(0, certificateTablePos, certificateTableSize); - - while (nSections--) - { - switch (phs->Characteristics) - { - default: - break; - case IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ: - case IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ: - unsigned int sectionSize = STDMIN(phs->SizeOfRawData, phs->Misc.VirtualSize); - const byte *sectionMemStart = memBase + phs->VirtualAddress; - unsigned int sectionFileStart = phs->PointerToRawData; - size_t subSectionStart = 0, nextSubSectionStart; - - do - { - const byte *subSectionMemStart = sectionMemStart + subSectionStart; - size_t subSectionFileStart = sectionFileStart + subSectionStart; - size_t subSectionSize = sectionSize - subSectionStart; - nextSubSectionStart = 0; - - unsigned int entriesToReadFromDisk[] = {IMAGE_DIRECTORY_ENTRY_IMPORT, IMAGE_DIRECTORY_ENTRY_IAT}; - for (unsigned int i=0; iOptionalHeader.DataDirectory[entriesToReadFromDisk[i]]; - const byte *entryMemStart = memBase + entry.VirtualAddress; - if (subSectionMemStart <= entryMemStart && entryMemStart < subSectionMemStart + subSectionSize) - { - subSectionSize = entryMemStart - subSectionMemStart; - nextSubSectionStart = entryMemStart - sectionMemStart + entry.Size; - } - } - -#if defined(_MSC_VER) && _MSC_VER >= 1400 - // first byte of _CRT_DEBUGGER_HOOK gets modified in memory by the debugger invisibly, so read it from file - if (IsDebuggerPresent()) - { - if (subSectionMemStart <= (byte *)&_CRT_DEBUGGER_HOOK && (byte *)&_CRT_DEBUGGER_HOOK < subSectionMemStart + subSectionSize) - { - subSectionSize = (byte *)&_CRT_DEBUGGER_HOOK - subSectionMemStart; - nextSubSectionStart = (byte *)&_CRT_DEBUGGER_HOOK - sectionMemStart + 1; - } - } -#endif - - if (subSectionMemStart <= expectedModuleMac && expectedModuleMac < subSectionMemStart + subSectionSize) - { - // found stored MAC - macFileLocation = (unsigned long)(subSectionFileStart + (expectedModuleMac - subSectionMemStart)); - verifier.AddRangeToSkip(0, macFileLocation, macSize); - } - - file.TransferTo(verifier, subSectionFileStart - currentFilePos); - verifier.Put(subSectionMemStart, subSectionSize); - file.Skip(subSectionSize); - currentFilePos = subSectionFileStart + subSectionSize; - subSectionStart = nextSubSectionStart; - } while (nextSubSectionStart != 0); - } - phs++; - } -#endif - file.TransferAllTo(verifier); - -#ifdef CRYPTOPP_WIN32_AVAILABLE - // if that fails (could be caused by debug breakpoints or DLL base relocation modifying image in memory), - // hash from disk instead - if (!VerifyBufsEqual(expectedModuleMac, actualMac, macSize)) - { - OutputDebugString("In memory integrity check failed. This may be caused by debug breakpoints or DLL relocation.\n"); - moduleStream.clear(); - moduleStream.seekg(0); - verifier.Initialize(MakeParameters(Name::OutputBuffer(), ByteArrayParameter(actualMac, (unsigned int)actualMac.size()))); -// verifier.Initialize(MakeParameters(Name::OutputFileName(), (const char *)"c:\\dt2.tmp")); - verifier.AddRangeToSkip(0, checksumPos, checksumSize); - verifier.AddRangeToSkip(0, certificateTableDirectoryPos, certificateTableDirectorySize); - verifier.AddRangeToSkip(0, certificateTablePos, certificateTableSize); - verifier.AddRangeToSkip(0, macFileLocation, macSize); - FileStore(moduleStream).TransferAllTo(verifier); - } -#endif - - if (VerifyBufsEqual(expectedModuleMac, actualMac, macSize)) - return true; - -#ifdef CRYPTOPP_WIN32_AVAILABLE - std::string hexMac; - HexEncoder(new StringSink(hexMac)).PutMessageEnd(actualMac, actualMac.size()); - OutputDebugString((("Crypto++ DLL integrity check failed. Actual MAC is: " + hexMac) + "\n").c_str()); -#endif - return false; -} - -void DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac) -{ - g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_NOT_DONE; - SetPowerUpSelfTestInProgressOnThisThread(true); - - try - { - if (FIPS_140_2_ComplianceEnabled() || expectedModuleMac != NULL) - { - if (!IntegrityCheckModule(moduleFilename, expectedModuleMac, &g_actualMac, &g_macFileLocation)) - throw 0; // throw here so we break in the debugger, this will be caught right away - } - - // algorithm tests - - X917RNG_KnownAnswerTest( - "2b7e151628aed2a6abf7158809cf4f3c", // key - "000102030405060708090a0b0c0d0e0f", // seed - "00000000000000000000000000000001", // time vector - "D176EDD27493B0395F4D10546232B0693DC7061C03C3A554F09CECF6F6B46D945A"); // output - - SymmetricEncryptionKnownAnswerTest( - "385D7189A5C3D485E1370AA5D408082B5CCCCB5E19F2D90E", - "C141B5FCCD28DC8A", - "6E1BD7C6120947A464A6AAB293A0F89A563D8D40D3461B68", - "64EAAD4ACBB9CEAD6C7615E7C7E4792FE587D91F20C7D2F4", - "6235A461AFD312973E3B4F7AA7D23E34E03371F8E8C376C9", - "E26BA806A59B0330DE40CA38E77A3E494BE2B212F6DD624B", - "E26BA806A59B03307DE2BCC25A08BA40A8BA335F5D604C62", - "E26BA806A59B03303C62C2EFF32D3ACDD5D5F35EBCC53371"); - - SymmetricEncryptionKnownAnswerTest( - "1555E5531C3A169B2D65", - "6EC9795701F49864", - "00AFA48E9621E52E8CBDA312660184EDDB1F33D9DACDA8DA", - "DBEC73562EFCAEB56204EB8AE9557EBF77473FBB52D17CD1", - "0C7B0B74E21F99B8F2C8DF37879F6C044967F42A796DCA8B", - "79FDDA9724E36CC2E023E9A5C717A8A8A7FDA465CADCBF63", - "79FDDA9724E36CC26CACBD83C1ABC06EAF5B249BE5B1E040", - "79FDDA9724E36CC211B0AEC607B95A96BCDA318440B82F49"); - - SymmetricEncryptionKnownAnswerTest( - "2b7e151628aed2a6abf7158809cf4f3c", - "000102030405060708090a0b0c0d0e0f", - "6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710", // plaintext - "3ad77bb40d7a3660a89ecaf32466ef97f5d3d58503b9699de785895a96fdbaaf43b1cd7f598ece23881b00e3ed0306887b0c785e27e8ad3f8223207104725dd4", // ecb - "7649abac8119b246cee98e9b12e9197d5086cb9b507219ee95db113a917678b273bed6b8e3c1743b7116e69e222295163ff1caa1681fac09120eca307586e1a7", // cbc - "3b3fd92eb72dad20333449f8e83cfb4ac8a64537a0b3a93fcde3cdad9f1ce58b26751f67a3cbb140b1808cf187a4f4dfc04b05357c5d1c0eeac4c66f9ff7f2e6", // cfb - "3b3fd92eb72dad20333449f8e83cfb4a7789508d16918f03f53c52dac54ed8259740051e9c5fecf64344f7a82260edcc304c6528f659c77866a510d9c1d6ae5e", // ofb - NULL); - - SymmetricEncryptionKnownAnswerTest( - "2b7e151628aed2a6abf7158809cf4f3c", - "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", - "6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710", - NULL, - NULL, - NULL, - NULL, - "874d6191b620e3261bef6864990db6ce9806f66b7970fdff8617187bb9fffdff5ae4df3edbd5d35e5b4f09020db03eab1e031dda2fbe03d1792170a0f3009cee"); // ctr - - - SecureHashKnownAnswerTest( - "abc", - "A9993E364706816ABA3E25717850C26C9CD0D89D"); - - SecureHashKnownAnswerTest( - "abc", - "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7"); - - SecureHashKnownAnswerTest( - "abc", - "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"); - - SecureHashKnownAnswerTest( - "abc", - "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7"); - - SecureHashKnownAnswerTest( - "abc", - "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f"); - - MAC_KnownAnswerTest >( - "303132333435363738393a3b3c3d3e3f40414243", - "Sample #2", - "0922d3405faa3d194f82a45830737d5cc6c75d24"); - - const char *keyRSA1 = - "30820150020100300d06092a864886f70d01010105000482013a3082013602010002400a66791dc6988168de7ab77419bb7fb0" - "c001c62710270075142942e19a8d8c51d053b3e3782a1de5dc5af4ebe99468170114a1dfe67cdc9a9af55d655620bbab0203010001" - "02400123c5b61ba36edb1d3679904199a89ea80c09b9122e1400c09adcf7784676d01d23356a7d44d6bd8bd50e94bfc723fa" - "87d8862b75177691c11d757692df8881022033d48445c859e52340de704bcdda065fbb4058d740bd1d67d29e9c146c11cf61" - "0220335e8408866b0fd38dc7002d3f972c67389a65d5d8306566d5c4f2a5aa52628b0220045ec90071525325d3d46db79695e9af" - "acc4523964360e02b119baa366316241022015eb327360c7b60d12e5e2d16bdcd97981d17fba6b70db13b20b436e24eada590220" - "2ca6366d72781dfa24d34a9a24cbc2ae927a9958af426563ff63fb11658a461d"; - - const char *keyRSA2 = - "30820273020100300D06092A864886F70D01010105000482025D3082025902010002818100D40AF9" - "A2B713034249E5780056D70FC7DE75D76E44565AA6A6B8ED9646F3C19F9E254D72D7DE6E49DB2264" - "0C1D05AB9E2A5F901D8F3FE1F7AE02CEE2ECCE54A40ABAE55A004692752E70725AEEE7CDEA67628A" - "82A9239B4AB660C2BC56D9F01E90CBAAB9BF0FC8E17173CEFC5709A29391A7DDF3E0B758691AAF30" - "725B292F4F020111027F18C0BA087D082C45D75D3594E0767E4820818EB35612B80CEAB8C880ACA5" - "44B6876DFFEF85A576C0D45B551AFAA1FD63209CD745DF75C5A0F0B580296EA466CD0338207E4752" - "FF4E7DB724D8AE18CE5CF4153BB94C27869FBB50E64F02546E4B02997A0B8623E64017CC770759C6" - "695DB649EEFD829D688D441BCC4E7348F1024100EF86DD7AF3F32CDE8A9F6564E43A559A0C9F8BAD" - "36CC25330548B347AC158A345631FA90F7B873C36EFFAE2F7823227A3F580B5DD18304D5932751E7" - "43E9234F024100E2A039854B55688740E32A51DF4AF88613D91A371CF8DDD95D780A89D7CF2119A9" - "54F1AC0F3DCDB2F6959926E6D9D37D8BC07A4C634DE6F16315BD5F0DAC340102407ECEEDB9903572" - "1B76909F174BA6698DCA72953D957B22C0A871C8531EDE3A1BB52984A719BC010D1CA57A555DB83F" - "6DE54CBAB932AEC652F38D497A6F3F30CF024100854F30E4FF232E6DADB2CD99926855F484255AB7" - "01FBCDCB27EC426F33A7046972AA700ADBCA008763DF87440F52F4E070531AC385B55AAC1C2AE7DD" - "8F9278F1024100C313F4AF9E4A9DE1253C21080CE524251560C111550772FD08690F13FBE658342E" - "BD2D41C9DCB12374E871B1839E26CAE252E1AE3DAAD5F1EE1F42B4D0EE7581"; - - SignatureKnownAnswerTest >( - keyRSA1, - "Everyone gets Friday off.", - "0610761F95FFD1B8F29DA34212947EC2AA0E358866A722F03CC3C41487ADC604A48FF54F5C6BEDB9FB7BD59F82D6E55D8F3174BA361B2214B2D74E8825E04E81"); - - SignatureKnownAnswerTest >( - keyRSA2, - "test", - "32F6BA41C8930DE71EE67F2627172CC539EDE04267FDE03AC295E3C50311F26C3B275D3AF513AC96" - "8EE493BAB7DA3A754661D1A7C4A0D1A2B7EE8B313AACD8CB8BFBC5C15EFB0EF15C86A9334A1E87AD" - "291EB961B5CA0E84930429B28780816AA94F96FC2367B71E2D2E4866FA966795B147F00600E5207E" - "2F189C883B37477C"); - - SignaturePairwiseConsistencyTest( - "3082014A0201003082012B06072A8648CE3804013082011E02818100F468699A6F6EBCC0120D3B34C8E007F125EC7D81F763B8D0F33869AE3BD6B9F2ECCC7DF34DF84C0307449E9B85D30D57194BCCEB310F48141914DD13A077AAF9B624A6CBE666BBA1D7EBEA95B5BA6F54417FD5D4E4220C601E071D316A24EA814E8B0122DBF47EE8AEEFD319EBB01DD95683F10DBB4FEB023F8262A07EAEB7FD02150082AD4E034DA6EEACDFDAE68C36F2BAD614F9E53B02818071AAF73361A26081529F7D84078ADAFCA48E031DB54AD57FB1A833ADBD8672328AABAA0C756247998D7A5B10DACA359D231332CE8120B483A784FE07D46EEBFF0D7D374A10691F78653E6DC29E27CCB1B174923960DFE5B959B919B2C3816C19251832AFD8E35D810E598F82877ABF7D40A041565168BD7F0E21E3FE2A8D8C1C0416021426EBA66E846E755169F84A1DA981D86502405DDF"); - - SignaturePairwiseConsistencyTest >( - "302D020100301006072A8648CE3D020106052B8104000404163014020101040F0070337065E1E196980A9D00E37211"); - - SignaturePairwiseConsistencyTest >( - "3039020100301306072A8648CE3D020106082A8648CE3D030101041F301D02010104182BB8A13C8B867010BD9471D9E81FDB01ABD0538C64D6249A"); - - SignaturePairwiseConsistencyTest >(keyRSA1); - } - catch (...) - { - g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_FAILED; - goto done; - } - - g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_PASSED; - -done: - SetPowerUpSelfTestInProgressOnThisThread(false); - return; -} - -#ifdef CRYPTOPP_WIN32_AVAILABLE - -void DoDllPowerUpSelfTest() -{ - CryptoPP::DoPowerUpSelfTest(NULL, s_moduleMac); -} - -#else - -void DoDllPowerUpSelfTest() -{ - throw NotImplemented("DoDllPowerUpSelfTest() only available on Windows"); -} - -#endif // #ifdef CRYPTOPP_WIN32_AVAILABLE - -NAMESPACE_END - -#ifdef CRYPTOPP_WIN32_AVAILABLE - -// DllMain needs to be in the global namespace -BOOL APIENTRY DllMain(HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved) -{ - if (ul_reason_for_call == DLL_PROCESS_ATTACH) - { - CryptoPP::s_hModule = (HMODULE)hModule; - CryptoPP::DoDllPowerUpSelfTest(); - } - return TRUE; -} - -#endif // #ifdef CRYPTOPP_WIN32_AVAILABLE - -#endif // #ifndef CRYPTOPP_IMPORTS diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/fltrimpl.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/fltrimpl.h deleted file mode 100644 index 4087d7d9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/fltrimpl.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef CRYPTOPP_FLTRIMPL_H -#define CRYPTOPP_FLTRIMPL_H - -#define FILTER_BEGIN \ - switch (m_continueAt) \ - { \ - case 0: \ - m_inputPosition = 0; - -#define FILTER_END_NO_MESSAGE_END_NO_RETURN \ - break; \ - default: \ - assert(false); \ - } - -#define FILTER_END_NO_MESSAGE_END \ - FILTER_END_NO_MESSAGE_END_NO_RETURN \ - return 0; - -/* -#define FILTER_END \ - case -1: \ - if (messageEnd && Output(-1, NULL, 0, messageEnd, blocking)) \ - return 1; \ - FILTER_END_NO_MESSAGE_END -*/ - -#define FILTER_OUTPUT3(site, statement, output, length, messageEnd, channel) \ - {\ - case site: \ - statement; \ - if (Output(site, output, length, messageEnd, blocking, channel)) \ - return STDMAX(size_t(1), length-m_inputPosition);\ - } - -#define FILTER_OUTPUT2(site, statement, output, length, messageEnd) \ - FILTER_OUTPUT3(site, statement, output, length, messageEnd, DEFAULT_CHANNEL) - -#define FILTER_OUTPUT(site, output, length, messageEnd) \ - FILTER_OUTPUT2(site, 0, output, length, messageEnd) - -#define FILTER_OUTPUT_BYTE(site, output) \ - FILTER_OUTPUT(site, &(const byte &)(byte)output, 1, 0) - -#define FILTER_OUTPUT2_MODIFIABLE(site, statement, output, length, messageEnd) \ - {\ - case site: \ - statement; \ - if (OutputModifiable(site, output, length, messageEnd, blocking)) \ - return STDMAX(size_t(1), length-m_inputPosition);\ - } - -#define FILTER_OUTPUT_MODIFIABLE(site, output, length, messageEnd) \ - FILTER_OUTPUT2_MODIFIABLE(site, 0, output, length, messageEnd) - -#define FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, statement, output, length, messageEnd, modifiable) \ - {\ - case site: \ - statement; \ - if (modifiable ? OutputModifiable(site, output, length, messageEnd, blocking) : Output(site, output, length, messageEnd, blocking)) \ - return STDMAX(size_t(1), length-m_inputPosition);\ - } - -#define FILTER_OUTPUT_MAYBE_MODIFIABLE(site, output, length, messageEnd, modifiable) \ - FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, 0, output, length, messageEnd, modifiable) - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.cpp deleted file mode 100644 index 237325d9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.cpp +++ /dev/null @@ -1,828 +0,0 @@ -// gcm.cpp - written and placed in the public domain by Wei Dai - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM gcm.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "gcm.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -word16 GCM_Base::s_reductionTable[256]; -volatile bool GCM_Base::s_reductionTableInitialized = false; - -void GCM_Base::GCTR::IncrementCounterBy256() -{ - IncrementCounterByOne(m_counterArray+BlockSize()-4, 3); -} - -#if 0 -// preserved for testing -void gcm_gf_mult(const unsigned char *a, const unsigned char *b, unsigned char *c) -{ - word64 Z0=0, Z1=0, V0, V1; - - typedef BlockGetAndPut Block; - Block::Get(a)(V0)(V1); - - for (int i=0; i<16; i++) - { - for (int j=0x80; j!=0; j>>=1) - { - int x = b[i] & j; - Z0 ^= x ? V0 : 0; - Z1 ^= x ? V1 : 0; - x = (int)V1 & 1; - V1 = (V1>>1) | (V0<<63); - V0 = (V0>>1) ^ (x ? W64LIT(0xe1) << 56 : 0); - } - } - Block::Put(NULL, c)(Z0)(Z1); -} - -__m128i _mm_clmulepi64_si128(const __m128i &a, const __m128i &b, int i) -{ - word64 A[1] = {ByteReverse(((word64*)&a)[i&1])}; - word64 B[1] = {ByteReverse(((word64*)&b)[i>>4])}; - - PolynomialMod2 pa((byte *)A, 8); - PolynomialMod2 pb((byte *)B, 8); - PolynomialMod2 c = pa*pb; - - __m128i output; - for (int i=0; i<16; i++) - ((byte *)&output)[i] = c.GetByte(i); - return output; -} -#endif - -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -inline static void SSE2_Xor16(byte *a, const byte *b, const byte *c) -{ -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE - *(__m128i *)a = _mm_xor_si128(*(__m128i *)b, *(__m128i *)c); -#else - asm ("movdqa %1, %%xmm0; pxor %2, %%xmm0; movdqa %%xmm0, %0;" : "=m" (a[0]) : "m"(b[0]), "m"(c[0])); -#endif -} -#endif - -inline static void Xor16(byte *a, const byte *b, const byte *c) -{ - ((word64 *)a)[0] = ((word64 *)b)[0] ^ ((word64 *)c)[0]; - ((word64 *)a)[1] = ((word64 *)b)[1] ^ ((word64 *)c)[1]; -} - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE -static CRYPTOPP_ALIGN_DATA(16) const word64 s_clmulConstants64[] = { - W64LIT(0xe100000000000000), W64LIT(0xc200000000000000), - W64LIT(0x08090a0b0c0d0e0f), W64LIT(0x0001020304050607), - W64LIT(0x0001020304050607), W64LIT(0x08090a0b0c0d0e0f)}; -static const __m128i *s_clmulConstants = (const __m128i *)s_clmulConstants64; -static const unsigned int s_clmulTableSizeInBlocks = 8; - -inline __m128i CLMUL_Reduce(__m128i c0, __m128i c1, __m128i c2, const __m128i &r) -{ - /* - The polynomial to be reduced is c0 * x^128 + c1 * x^64 + c2. c0t below refers to the most - significant half of c0 as a polynomial, which, due to GCM's bit reflection, are in the - rightmost bit positions, and the lowest byte addresses. - - c1 ^= c0t * 0xc200000000000000 - c2t ^= c0t - t = shift (c1t ^ c0b) left 1 bit - c2 ^= t * 0xe100000000000000 - c2t ^= c1b - shift c2 left 1 bit and xor in lowest bit of c1t - */ -#if 0 // MSVC 2010 workaround: see http://connect.microsoft.com/VisualStudio/feedback/details/575301 - c2 = _mm_xor_si128(c2, _mm_move_epi64(c0)); -#else - c1 = _mm_xor_si128(c1, _mm_slli_si128(c0, 8)); -#endif - c1 = _mm_xor_si128(c1, _mm_clmulepi64_si128(c0, r, 0x10)); - c0 = _mm_srli_si128(c0, 8); - c0 = _mm_xor_si128(c0, c1); - c0 = _mm_slli_epi64(c0, 1); - c0 = _mm_clmulepi64_si128(c0, r, 0); - c2 = _mm_xor_si128(c2, c0); - c2 = _mm_xor_si128(c2, _mm_srli_si128(c1, 8)); - c1 = _mm_unpacklo_epi64(c1, c2); - c1 = _mm_srli_epi64(c1, 63); - c2 = _mm_slli_epi64(c2, 1); - return _mm_xor_si128(c2, c1); -} - -inline __m128i CLMUL_GF_Mul(const __m128i &x, const __m128i &h, const __m128i &r) -{ - __m128i c0 = _mm_clmulepi64_si128(x,h,0); - __m128i c1 = _mm_xor_si128(_mm_clmulepi64_si128(x,h,1), _mm_clmulepi64_si128(x,h,0x10)); - __m128i c2 = _mm_clmulepi64_si128(x,h,0x11); - - return CLMUL_Reduce(c0, c1, c2, r); -} -#endif - -void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms) -{ - BlockCipher &blockCipher = AccessBlockCipher(); - blockCipher.SetKey(userKey, keylength, params); - - if (blockCipher.BlockSize() != REQUIRED_BLOCKSIZE) - throw InvalidArgument(AlgorithmName() + ": block size of underlying block cipher is not 16"); - - int tableSize, i, j, k; - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasCLMUL()) - { - params.GetIntValue(Name::TableSize(), tableSize); // avoid "parameter not used" error - tableSize = s_clmulTableSizeInBlocks * REQUIRED_BLOCKSIZE; - } - else -#endif - { - if (params.GetIntValue(Name::TableSize(), tableSize)) - tableSize = (tableSize >= 64*1024) ? 64*1024 : 2*1024; - else - tableSize = (GetTablesOption() == GCM_64K_Tables) ? 64*1024 : 2*1024; - -#if defined(_MSC_VER) && (_MSC_VER >= 1300 && _MSC_VER < 1400) - // VC 2003 workaround: compiler generates bad code for 64K tables - tableSize = 2*1024; -#endif - } - - m_buffer.resize(3*REQUIRED_BLOCKSIZE + tableSize); - byte *table = MulTable(); - byte *hashKey = HashKey(); - memset(hashKey, 0, REQUIRED_BLOCKSIZE); - blockCipher.ProcessBlock(hashKey); - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasCLMUL()) - { - const __m128i r = s_clmulConstants[0]; - __m128i h0 = _mm_shuffle_epi8(_mm_load_si128((__m128i *)hashKey), s_clmulConstants[1]); - __m128i h = h0; - - for (i=0; i Block; - Block::Get(hashKey)(V0)(V1); - - if (tableSize == 64*1024) - { - for (i=0; i<128; i++) - { - k = i%8; - Block::Put(NULL, table+(i/8)*256*16+(size_t(1)<<(11-k)))(V0)(V1); - - int x = (int)V1 & 1; - V1 = (V1>>1) | (V0<<63); - V0 = (V0>>1) ^ (x ? W64LIT(0xe1) << 56 : 0); - } - - for (i=0; i<16; i++) - { - memset(table+i*256*16, 0, 16); -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - if (HasSSE2()) - for (j=2; j<=0x80; j*=2) - for (k=1; k>1) | (V0<<63); - V0 = (V0>>1) ^ (x ? W64LIT(0xe1) << 56 : 0); - } - - for (i=0; i<4; i++) - { - memset(table+i*256, 0, 16); - memset(table+1024+i*256, 0, 16); -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - if (HasSSE2()) - for (j=2; j<=8; j*=2) - for (k=1; k= HASH_BLOCKSIZE) - { - len = GCM_Base::AuthenticateBlocks(iv, len); - iv += (origLen - len); - } - - if (len > 0) - { - memcpy(m_buffer, iv, len); - memset(m_buffer+len, 0, HASH_BLOCKSIZE-len); - GCM_Base::AuthenticateBlocks(m_buffer, HASH_BLOCKSIZE); - } - - PutBlock(NULL, m_buffer)(0)(origLen*8); - GCM_Base::AuthenticateBlocks(m_buffer, HASH_BLOCKSIZE); - - ReverseHashBufferIfNeeded(); - } - - if (m_state >= State_IVSet) - m_ctr.Resynchronize(hashBuffer, REQUIRED_BLOCKSIZE); - else - m_ctr.SetCipherWithIV(cipher, hashBuffer); - - m_ctr.Seek(HASH_BLOCKSIZE); - - memset(hashBuffer, 0, HASH_BLOCKSIZE); -} - -unsigned int GCM_Base::OptimalDataAlignment() const -{ - return -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - HasSSE2() ? 16 : -#endif - GetBlockCipher().OptimalDataAlignment(); -} - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void GCM_AuthenticateBlocks_2K(const byte *data, size_t blocks, word64 *hashBuffer, const word16 *reductionTable); -void GCM_AuthenticateBlocks_64K(const byte *data, size_t blocks, word64 *hashBuffer); -} -#endif - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len) -{ -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasCLMUL()) - { - const __m128i *table = (const __m128i *)MulTable(); - __m128i x = _mm_load_si128((__m128i *)HashBuffer()); - const __m128i r = s_clmulConstants[0], bswapMask = s_clmulConstants[1], bswapMask2 = s_clmulConstants[2]; - - while (len >= 16) - { - size_t s = UnsignedMin(len/16, s_clmulTableSizeInBlocks), i=0; - __m128i d, d2 = _mm_shuffle_epi8(_mm_loadu_si128((const __m128i *)(data+(s-1)*16)), bswapMask2);; - __m128i c0 = _mm_setzero_si128(); - __m128i c1 = _mm_setzero_si128(); - __m128i c2 = _mm_setzero_si128(); - - while (true) - { - __m128i h0 = _mm_load_si128(table+i); - __m128i h1 = _mm_load_si128(table+i+1); - __m128i h01 = _mm_xor_si128(h0, h1); - - if (++i == s) - { - d = _mm_shuffle_epi8(_mm_loadu_si128((const __m128i *)data), bswapMask); - d = _mm_xor_si128(d, x); - c0 = _mm_xor_si128(c0, _mm_clmulepi64_si128(d, h0, 0)); - c2 = _mm_xor_si128(c2, _mm_clmulepi64_si128(d, h1, 1)); - d = _mm_xor_si128(d, _mm_shuffle_epi32(d, _MM_SHUFFLE(1, 0, 3, 2))); - c1 = _mm_xor_si128(c1, _mm_clmulepi64_si128(d, h01, 0)); - break; - } - - d = _mm_shuffle_epi8(_mm_loadu_si128((const __m128i *)(data+(s-i)*16-8)), bswapMask2); - c0 = _mm_xor_si128(c0, _mm_clmulepi64_si128(d2, h0, 1)); - c2 = _mm_xor_si128(c2, _mm_clmulepi64_si128(d, h1, 1)); - d2 = _mm_xor_si128(d2, d); - c1 = _mm_xor_si128(c1, _mm_clmulepi64_si128(d2, h01, 1)); - - if (++i == s) - { - d = _mm_shuffle_epi8(_mm_loadu_si128((const __m128i *)data), bswapMask); - d = _mm_xor_si128(d, x); - c0 = _mm_xor_si128(c0, _mm_clmulepi64_si128(d, h0, 0x10)); - c2 = _mm_xor_si128(c2, _mm_clmulepi64_si128(d, h1, 0x11)); - d = _mm_xor_si128(d, _mm_shuffle_epi32(d, _MM_SHUFFLE(1, 0, 3, 2))); - c1 = _mm_xor_si128(c1, _mm_clmulepi64_si128(d, h01, 0x10)); - break; - } - - d2 = _mm_shuffle_epi8(_mm_loadu_si128((const __m128i *)(data+(s-i)*16-8)), bswapMask); - c0 = _mm_xor_si128(c0, _mm_clmulepi64_si128(d, h0, 0x10)); - c2 = _mm_xor_si128(c2, _mm_clmulepi64_si128(d2, h1, 0x10)); - d = _mm_xor_si128(d, d2); - c1 = _mm_xor_si128(c1, _mm_clmulepi64_si128(d, h01, 0x10)); - } - data += s*16; - len -= s*16; - - c1 = _mm_xor_si128(_mm_xor_si128(c1, c0), c2); - x = CLMUL_Reduce(c0, c1, c2, r); - } - - _mm_store_si128((__m128i *)HashBuffer(), x); - return len; - } -#endif - - typedef BlockGetAndPut Block; - word64 *hashBuffer = (word64 *)HashBuffer(); - - switch (2*(m_buffer.size()>=64*1024) -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - + HasSSE2() -#endif - ) - { - case 0: // non-SSE2 and 2K tables - { - byte *table = MulTable(); - word64 x0 = hashBuffer[0], x1 = hashBuffer[1]; - - do - { - word64 y0, y1, a0, a1, b0, b1, c0, c1, d0, d1; - Block::Get(data)(y0)(y1); - x0 ^= y0; - x1 ^= y1; - - data += HASH_BLOCKSIZE; - len -= HASH_BLOCKSIZE; - - #define READ_TABLE_WORD64_COMMON(a, b, c, d) *(word64 *)(table+(a*1024)+(b*256)+c+d*8) - - #ifdef IS_LITTLE_ENDIAN - #if CRYPTOPP_BOOL_SLOW_WORD64 - word32 z0 = (word32)x0; - word32 z1 = (word32)(x0>>32); - word32 z2 = (word32)x1; - word32 z3 = (word32)(x1>>32); - #define READ_TABLE_WORD64(a, b, c, d, e) READ_TABLE_WORD64_COMMON((d%2), c, (d?(z##c>>((d?d-1:0)*4))&0xf0:(z##c&0xf)<<4), e) - #else - #define READ_TABLE_WORD64(a, b, c, d, e) READ_TABLE_WORD64_COMMON((d%2), c, ((d+8*b)?(x##a>>(((d+8*b)?(d+8*b)-1:1)*4))&0xf0:(x##a&0xf)<<4), e) - #endif - #define GF_MOST_SIG_8BITS(a) (a##1 >> 7*8) - #define GF_SHIFT_8(a) a##1 = (a##1 << 8) ^ (a##0 >> 7*8); a##0 <<= 8; - #else - #define READ_TABLE_WORD64(a, b, c, d, e) READ_TABLE_WORD64_COMMON((1-d%2), c, ((15-d-8*b)?(x##a>>(((15-d-8*b)?(15-d-8*b)-1:0)*4))&0xf0:(x##a&0xf)<<4), e) - #define GF_MOST_SIG_8BITS(a) (a##1 & 0xff) - #define GF_SHIFT_8(a) a##1 = (a##1 >> 8) ^ (a##0 << 7*8); a##0 >>= 8; - #endif - - #define GF_MUL_32BY128(op, a, b, c) \ - a0 op READ_TABLE_WORD64(a, b, c, 0, 0) ^ READ_TABLE_WORD64(a, b, c, 1, 0);\ - a1 op READ_TABLE_WORD64(a, b, c, 0, 1) ^ READ_TABLE_WORD64(a, b, c, 1, 1);\ - b0 op READ_TABLE_WORD64(a, b, c, 2, 0) ^ READ_TABLE_WORD64(a, b, c, 3, 0);\ - b1 op READ_TABLE_WORD64(a, b, c, 2, 1) ^ READ_TABLE_WORD64(a, b, c, 3, 1);\ - c0 op READ_TABLE_WORD64(a, b, c, 4, 0) ^ READ_TABLE_WORD64(a, b, c, 5, 0);\ - c1 op READ_TABLE_WORD64(a, b, c, 4, 1) ^ READ_TABLE_WORD64(a, b, c, 5, 1);\ - d0 op READ_TABLE_WORD64(a, b, c, 6, 0) ^ READ_TABLE_WORD64(a, b, c, 7, 0);\ - d1 op READ_TABLE_WORD64(a, b, c, 6, 1) ^ READ_TABLE_WORD64(a, b, c, 7, 1);\ - - GF_MUL_32BY128(=, 0, 0, 0) - GF_MUL_32BY128(^=, 0, 1, 1) - GF_MUL_32BY128(^=, 1, 0, 2) - GF_MUL_32BY128(^=, 1, 1, 3) - - word32 r = (word32)s_reductionTable[GF_MOST_SIG_8BITS(d)] << 16; - GF_SHIFT_8(d) - c0 ^= d0; c1 ^= d1; - r ^= (word32)s_reductionTable[GF_MOST_SIG_8BITS(c)] << 8; - GF_SHIFT_8(c) - b0 ^= c0; b1 ^= c1; - r ^= s_reductionTable[GF_MOST_SIG_8BITS(b)]; - GF_SHIFT_8(b) - a0 ^= b0; a1 ^= b1; - a0 ^= ConditionalByteReverse(LITTLE_ENDIAN_ORDER, r); - x0 = a0; x1 = a1; - } - while (len >= HASH_BLOCKSIZE); - - hashBuffer[0] = x0; hashBuffer[1] = x1; - return len; - } - - case 2: // non-SSE2 and 64K tables - { - byte *table = MulTable(); - word64 x0 = hashBuffer[0], x1 = hashBuffer[1]; - - do - { - word64 y0, y1, a0, a1; - Block::Get(data)(y0)(y1); - x0 ^= y0; - x1 ^= y1; - - data += HASH_BLOCKSIZE; - len -= HASH_BLOCKSIZE; - - #undef READ_TABLE_WORD64_COMMON - #undef READ_TABLE_WORD64 - - #define READ_TABLE_WORD64_COMMON(a, c, d) *(word64 *)(table+(a)*256*16+(c)+(d)*8) - - #ifdef IS_LITTLE_ENDIAN - #if CRYPTOPP_BOOL_SLOW_WORD64 - word32 z0 = (word32)x0; - word32 z1 = (word32)(x0>>32); - word32 z2 = (word32)x1; - word32 z3 = (word32)(x1>>32); - #define READ_TABLE_WORD64(b, c, d, e) READ_TABLE_WORD64_COMMON(c*4+d, (d?(z##c>>((d?d:1)*8-4))&0xff0:(z##c&0xff)<<4), e) - #else - #define READ_TABLE_WORD64(b, c, d, e) READ_TABLE_WORD64_COMMON(c*4+d, ((d+4*(c%2))?(x##b>>(((d+4*(c%2))?(d+4*(c%2)):1)*8-4))&0xff0:(x##b&0xff)<<4), e) - #endif - #else - #define READ_TABLE_WORD64(b, c, d, e) READ_TABLE_WORD64_COMMON(c*4+d, ((7-d-4*(c%2))?(x##b>>(((7-d-4*(c%2))?(7-d-4*(c%2)):1)*8-4))&0xff0:(x##b&0xff)<<4), e) - #endif - - #define GF_MUL_8BY128(op, b, c, d) \ - a0 op READ_TABLE_WORD64(b, c, d, 0);\ - a1 op READ_TABLE_WORD64(b, c, d, 1);\ - - GF_MUL_8BY128(=, 0, 0, 0) - GF_MUL_8BY128(^=, 0, 0, 1) - GF_MUL_8BY128(^=, 0, 0, 2) - GF_MUL_8BY128(^=, 0, 0, 3) - GF_MUL_8BY128(^=, 0, 1, 0) - GF_MUL_8BY128(^=, 0, 1, 1) - GF_MUL_8BY128(^=, 0, 1, 2) - GF_MUL_8BY128(^=, 0, 1, 3) - GF_MUL_8BY128(^=, 1, 2, 0) - GF_MUL_8BY128(^=, 1, 2, 1) - GF_MUL_8BY128(^=, 1, 2, 2) - GF_MUL_8BY128(^=, 1, 2, 3) - GF_MUL_8BY128(^=, 1, 3, 0) - GF_MUL_8BY128(^=, 1, 3, 1) - GF_MUL_8BY128(^=, 1, 3, 2) - GF_MUL_8BY128(^=, 1, 3, 3) - - x0 = a0; x1 = a1; - } - while (len >= HASH_BLOCKSIZE); - - hashBuffer[0] = x0; hashBuffer[1] = x1; - return len; - } -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE - case 1: // SSE2 and 2K tables - GCM_AuthenticateBlocks_2K(data, len/16, hashBuffer, s_reductionTable); - return len % 16; - case 3: // SSE2 and 64K tables - GCM_AuthenticateBlocks_64K(data, len/16, hashBuffer); - return len % 16; -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - case 1: // SSE2 and 2K tables - { - #ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - #elif defined(CRYPTOPP_GENERATE_X64_MASM) - ALIGN 8 - GCM_AuthenticateBlocks_2K PROC FRAME - rex_push_reg rsi - push_reg rdi - push_reg rbx - .endprolog - mov rsi, r8 - mov r11, r9 - #else - AS2( mov WORD_REG(cx), data ) - AS2( mov WORD_REG(dx), len ) - AS2( mov WORD_REG(si), hashBuffer ) - AS2( shr WORD_REG(dx), 4 ) - #endif - - AS_PUSH_IF86( bx) - AS_PUSH_IF86( bp) - - #ifdef __GNUC__ - AS2( mov AS_REG_7, WORD_REG(di)) - #elif CRYPTOPP_BOOL_X86 - AS2( lea AS_REG_7, s_reductionTable) - #endif - - AS2( movdqa xmm0, [WORD_REG(si)] ) - - #define MUL_TABLE_0 WORD_REG(si) + 32 - #define MUL_TABLE_1 WORD_REG(si) + 32 + 1024 - #define RED_TABLE AS_REG_7 - - ASL(0) - AS2( movdqu xmm4, [WORD_REG(cx)] ) - AS2( pxor xmm0, xmm4 ) - - AS2( movd ebx, xmm0 ) - AS2( mov eax, AS_HEX(f0f0f0f0) ) - AS2( and eax, ebx ) - AS2( shl ebx, 4 ) - AS2( and ebx, AS_HEX(f0f0f0f0) ) - AS2( movzx edi, ah ) - AS2( movdqa xmm5, XMMWORD_PTR [MUL_TABLE_1 + WORD_REG(di)] ) - AS2( movzx edi, al ) - AS2( movdqa xmm4, XMMWORD_PTR [MUL_TABLE_1 + WORD_REG(di)] ) - AS2( shr eax, 16 ) - AS2( movzx edi, ah ) - AS2( movdqa xmm3, XMMWORD_PTR [MUL_TABLE_1 + WORD_REG(di)] ) - AS2( movzx edi, al ) - AS2( movdqa xmm2, XMMWORD_PTR [MUL_TABLE_1 + WORD_REG(di)] ) - - #define SSE2_MUL_32BITS(i) \ - AS2( psrldq xmm0, 4 )\ - AS2( movd eax, xmm0 )\ - AS2( and eax, AS_HEX(f0f0f0f0) )\ - AS2( movzx edi, bh )\ - AS2( pxor xmm5, XMMWORD_PTR [MUL_TABLE_0 + (i-1)*256 + WORD_REG(di)] )\ - AS2( movzx edi, bl )\ - AS2( pxor xmm4, XMMWORD_PTR [MUL_TABLE_0 + (i-1)*256 + WORD_REG(di)] )\ - AS2( shr ebx, 16 )\ - AS2( movzx edi, bh )\ - AS2( pxor xmm3, XMMWORD_PTR [MUL_TABLE_0 + (i-1)*256 + WORD_REG(di)] )\ - AS2( movzx edi, bl )\ - AS2( pxor xmm2, XMMWORD_PTR [MUL_TABLE_0 + (i-1)*256 + WORD_REG(di)] )\ - AS2( movd ebx, xmm0 )\ - AS2( shl ebx, 4 )\ - AS2( and ebx, AS_HEX(f0f0f0f0) )\ - AS2( movzx edi, ah )\ - AS2( pxor xmm5, XMMWORD_PTR [MUL_TABLE_1 + i*256 + WORD_REG(di)] )\ - AS2( movzx edi, al )\ - AS2( pxor xmm4, XMMWORD_PTR [MUL_TABLE_1 + i*256 + WORD_REG(di)] )\ - AS2( shr eax, 16 )\ - AS2( movzx edi, ah )\ - AS2( pxor xmm3, XMMWORD_PTR [MUL_TABLE_1 + i*256 + WORD_REG(di)] )\ - AS2( movzx edi, al )\ - AS2( pxor xmm2, XMMWORD_PTR [MUL_TABLE_1 + i*256 + WORD_REG(di)] )\ - - SSE2_MUL_32BITS(1) - SSE2_MUL_32BITS(2) - SSE2_MUL_32BITS(3) - - AS2( movzx edi, bh ) - AS2( pxor xmm5, XMMWORD_PTR [MUL_TABLE_0 + 3*256 + WORD_REG(di)] ) - AS2( movzx edi, bl ) - AS2( pxor xmm4, XMMWORD_PTR [MUL_TABLE_0 + 3*256 + WORD_REG(di)] ) - AS2( shr ebx, 16 ) - AS2( movzx edi, bh ) - AS2( pxor xmm3, XMMWORD_PTR [MUL_TABLE_0 + 3*256 + WORD_REG(di)] ) - AS2( movzx edi, bl ) - AS2( pxor xmm2, XMMWORD_PTR [MUL_TABLE_0 + 3*256 + WORD_REG(di)] ) - - AS2( movdqa xmm0, xmm3 ) - AS2( pslldq xmm3, 1 ) - AS2( pxor xmm2, xmm3 ) - AS2( movdqa xmm1, xmm2 ) - AS2( pslldq xmm2, 1 ) - AS2( pxor xmm5, xmm2 ) - - AS2( psrldq xmm0, 15 ) - AS2( movd WORD_REG(di), xmm0 ) - AS2( movzx eax, WORD PTR [RED_TABLE + WORD_REG(di)*2] ) - AS2( shl eax, 8 ) - - AS2( movdqa xmm0, xmm5 ) - AS2( pslldq xmm5, 1 ) - AS2( pxor xmm4, xmm5 ) - - AS2( psrldq xmm1, 15 ) - AS2( movd WORD_REG(di), xmm1 ) - AS2( xor ax, WORD PTR [RED_TABLE + WORD_REG(di)*2] ) - AS2( shl eax, 8 ) - - AS2( psrldq xmm0, 15 ) - AS2( movd WORD_REG(di), xmm0 ) - AS2( xor ax, WORD PTR [RED_TABLE + WORD_REG(di)*2] ) - - AS2( movd xmm0, eax ) - AS2( pxor xmm0, xmm4 ) - - AS2( add WORD_REG(cx), 16 ) - AS2( sub WORD_REG(dx), 1 ) - ASJ( jnz, 0, b ) - AS2( movdqa [WORD_REG(si)], xmm0 ) - - AS_POP_IF86( bp) - AS_POP_IF86( bx) - - #ifdef __GNUC__ - ".att_syntax prefix;" - : - : "c" (data), "d" (len/16), "S" (hashBuffer), "D" (s_reductionTable) - : "memory", "cc", "%eax" - #if CRYPTOPP_BOOL_X64 - , "%ebx", "%r11" - #endif - ); - #elif defined(CRYPTOPP_GENERATE_X64_MASM) - pop rbx - pop rdi - pop rsi - ret - GCM_AuthenticateBlocks_2K ENDP - #endif - - return len%16; - } - case 3: // SSE2 and 64K tables - { - #ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - #elif defined(CRYPTOPP_GENERATE_X64_MASM) - ALIGN 8 - GCM_AuthenticateBlocks_64K PROC FRAME - rex_push_reg rsi - push_reg rdi - .endprolog - mov rsi, r8 - #else - AS2( mov WORD_REG(cx), data ) - AS2( mov WORD_REG(dx), len ) - AS2( mov WORD_REG(si), hashBuffer ) - AS2( shr WORD_REG(dx), 4 ) - #endif - - AS2( movdqa xmm0, [WORD_REG(si)] ) - - #undef MUL_TABLE - #define MUL_TABLE(i,j) WORD_REG(si) + 32 + (i*4+j)*256*16 - - ASL(1) - AS2( movdqu xmm1, [WORD_REG(cx)] ) - AS2( pxor xmm1, xmm0 ) - AS2( pxor xmm0, xmm0 ) - - #undef SSE2_MUL_32BITS - #define SSE2_MUL_32BITS(i) \ - AS2( movd eax, xmm1 )\ - AS2( psrldq xmm1, 4 )\ - AS2( movzx edi, al )\ - AS2( add WORD_REG(di), WORD_REG(di) )\ - AS2( pxor xmm0, [MUL_TABLE(i,0) + WORD_REG(di)*8] )\ - AS2( movzx edi, ah )\ - AS2( add WORD_REG(di), WORD_REG(di) )\ - AS2( pxor xmm0, [MUL_TABLE(i,1) + WORD_REG(di)*8] )\ - AS2( shr eax, 16 )\ - AS2( movzx edi, al )\ - AS2( add WORD_REG(di), WORD_REG(di) )\ - AS2( pxor xmm0, [MUL_TABLE(i,2) + WORD_REG(di)*8] )\ - AS2( movzx edi, ah )\ - AS2( add WORD_REG(di), WORD_REG(di) )\ - AS2( pxor xmm0, [MUL_TABLE(i,3) + WORD_REG(di)*8] )\ - - SSE2_MUL_32BITS(0) - SSE2_MUL_32BITS(1) - SSE2_MUL_32BITS(2) - SSE2_MUL_32BITS(3) - - AS2( add WORD_REG(cx), 16 ) - AS2( sub WORD_REG(dx), 1 ) - ASJ( jnz, 1, b ) - AS2( movdqa [WORD_REG(si)], xmm0 ) - - #ifdef __GNUC__ - ".att_syntax prefix;" - : - : "c" (data), "d" (len/16), "S" (hashBuffer) - : "memory", "cc", "%edi", "%eax" - ); - #elif defined(CRYPTOPP_GENERATE_X64_MASM) - pop rdi - pop rsi - ret - GCM_AuthenticateBlocks_64K ENDP - #endif - - return len%16; - } -#endif -#ifndef CRYPTOPP_GENERATE_X64_MASM - } - - return len%16; -} - -void GCM_Base::AuthenticateLastHeaderBlock() -{ - if (m_bufferedDataLength > 0) - { - memset(m_buffer+m_bufferedDataLength, 0, HASH_BLOCKSIZE-m_bufferedDataLength); - m_bufferedDataLength = 0; - GCM_Base::AuthenticateBlocks(m_buffer, HASH_BLOCKSIZE); - } -} - -void GCM_Base::AuthenticateLastConfidentialBlock() -{ - GCM_Base::AuthenticateLastHeaderBlock(); - PutBlock(NULL, m_buffer)(m_totalHeaderLength*8)(m_totalMessageLength*8); - GCM_Base::AuthenticateBlocks(m_buffer, HASH_BLOCKSIZE); -} - -void GCM_Base::AuthenticateLastFooterBlock(byte *mac, size_t macSize) -{ - m_ctr.Seek(0); - ReverseHashBufferIfNeeded(); - m_ctr.ProcessData(mac, HashBuffer(), macSize); -} - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.h deleted file mode 100644 index 0b32524f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gcm.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef CRYPTOPP_GCM_H -#define CRYPTOPP_GCM_H - -#include "authenc.h" -#include "modes.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! . -enum GCM_TablesOption {GCM_2K_Tables, GCM_64K_Tables}; - -//! . -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE GCM_Base : public AuthenticatedSymmetricCipherBase -{ -public: - // AuthenticatedSymmetricCipher - std::string AlgorithmName() const - {return GetBlockCipher().AlgorithmName() + std::string("/GCM");} - size_t MinKeyLength() const - {return GetBlockCipher().MinKeyLength();} - size_t MaxKeyLength() const - {return GetBlockCipher().MaxKeyLength();} - size_t DefaultKeyLength() const - {return GetBlockCipher().DefaultKeyLength();} - size_t GetValidKeyLength(size_t n) const - {return GetBlockCipher().GetValidKeyLength(n);} - bool IsValidKeyLength(size_t n) const - {return GetBlockCipher().IsValidKeyLength(n);} - unsigned int OptimalDataAlignment() const; - IV_Requirement IVRequirement() const - {return UNIQUE_IV;} - unsigned int IVSize() const - {return 12;} - unsigned int MinIVLength() const - {return 1;} - unsigned int MaxIVLength() const - {return UINT_MAX;} // (W64LIT(1)<<61)-1 in the standard - unsigned int DigestSize() const - {return 16;} - lword MaxHeaderLength() const - {return (W64LIT(1)<<61)-1;} - lword MaxMessageLength() const - {return ((W64LIT(1)<<39)-256)/8;} - -protected: - // AuthenticatedSymmetricCipherBase - bool AuthenticationIsOnPlaintext() const - {return false;} - unsigned int AuthenticationBlockSize() const - {return HASH_BLOCKSIZE;} - void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs ¶ms); - void Resync(const byte *iv, size_t len); - size_t AuthenticateBlocks(const byte *data, size_t len); - void AuthenticateLastHeaderBlock(); - void AuthenticateLastConfidentialBlock(); - void AuthenticateLastFooterBlock(byte *mac, size_t macSize); - SymmetricCipher & AccessSymmetricCipher() {return m_ctr;} - - virtual BlockCipher & AccessBlockCipher() =0; - virtual GCM_TablesOption GetTablesOption() const =0; - - const BlockCipher & GetBlockCipher() const {return const_cast(this)->AccessBlockCipher();}; - byte *HashBuffer() {return m_buffer+REQUIRED_BLOCKSIZE;} - byte *HashKey() {return m_buffer+2*REQUIRED_BLOCKSIZE;} - byte *MulTable() {return m_buffer+3*REQUIRED_BLOCKSIZE;} - inline void ReverseHashBufferIfNeeded(); - - class CRYPTOPP_DLL GCTR : public CTR_Mode_ExternalCipher::Encryption - { - protected: - void IncrementCounterBy256(); - }; - - GCTR m_ctr; - static word16 s_reductionTable[256]; - static volatile bool s_reductionTableInitialized; - enum {REQUIRED_BLOCKSIZE = 16, HASH_BLOCKSIZE = 16}; -}; - -//! . -template -class GCM_Final : public GCM_Base -{ -public: - static std::string StaticAlgorithmName() - {return T_BlockCipher::StaticAlgorithmName() + std::string("/GCM");} - bool IsForwardTransformation() const - {return T_IsEncryption;} - -private: - GCM_TablesOption GetTablesOption() const {return T_TablesOption;} - BlockCipher & AccessBlockCipher() {return m_cipher;} - typename T_BlockCipher::Encryption m_cipher; -}; - -//! GCM -template -struct GCM : public AuthenticatedSymmetricCipherDocumentation -{ - typedef GCM_Final Encryption; - typedef GCM_Final Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.cpp deleted file mode 100644 index 72026d1e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// gf256.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "gf256.h" - -NAMESPACE_BEGIN(CryptoPP) - -GF256::Element GF256::Multiply(Element a, Element b) const -{ - word result = 0, t = b; - - for (unsigned int i=0; i<8; i++) - { - result <<= 1; - if (result & 0x100) - result ^= m_modulus; - - t <<= 1; - if (t & 0x100) - result ^= a; - } - - return (GF256::Element) result; -} - -GF256::Element GF256::MultiplicativeInverse(Element a) const -{ - Element result = a; - for (int i=1; i<7; i++) - result = Multiply(Square(result), a); - return Square(result); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.h deleted file mode 100644 index e0ea7482..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf256.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef CRYPTOPP_GF256_H -#define CRYPTOPP_GF256_H - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! GF(256) with polynomial basis -class GF256 -{ -public: - typedef byte Element; - typedef int RandomizationParameter; - - GF256(byte modulus) : m_modulus(modulus) {} - - Element RandomElement(RandomNumberGenerator &rng, int ignored = 0) const - {return rng.GenerateByte();} - - bool Equal(Element a, Element b) const - {return a==b;} - - Element Zero() const - {return 0;} - - Element Add(Element a, Element b) const - {return a^b;} - - Element& Accumulate(Element &a, Element b) const - {return a^=b;} - - Element Inverse(Element a) const - {return a;} - - Element Subtract(Element a, Element b) const - {return a^b;} - - Element& Reduce(Element &a, Element b) const - {return a^=b;} - - Element Double(Element a) const - {return 0;} - - Element One() const - {return 1;} - - Element Multiply(Element a, Element b) const; - - Element Square(Element a) const - {return Multiply(a, a);} - - bool IsUnit(Element a) const - {return a != 0;} - - Element MultiplicativeInverse(Element a) const; - - Element Divide(Element a, Element b) const - {return Multiply(a, MultiplicativeInverse(b));} - -private: - word m_modulus; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.cpp deleted file mode 100644 index ae4874a4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// gf2_32.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "misc.h" -#include "gf2_32.h" - -NAMESPACE_BEGIN(CryptoPP) - -GF2_32::Element GF2_32::Multiply(Element a, Element b) const -{ - word32 table[4]; - table[0] = 0; - table[1] = m_modulus; - if (a & 0x80000000) - { - table[2] = m_modulus ^ (a<<1); - table[3] = a<<1; - } - else - { - table[2] = a<<1; - table[3] = m_modulus ^ (a<<1); - } - -#if CRYPTOPP_FAST_ROTATE(32) - b = rotrFixed(b, 30U); - word32 result = table[b&2]; - - for (int i=29; i>=0; --i) - { - b = rotlFixed(b, 1U); - result = (result<<1) ^ table[(b&2) + (result>>31)]; - } - - return (b&1) ? result ^ a : result; -#else - word32 result = table[(b>>30) & 2]; - - for (int i=29; i>=0; --i) - result = (result<<1) ^ table[((b>>i)&2) + (result>>31)]; - - return (b&1) ? result ^ a : result; -#endif -} - -GF2_32::Element GF2_32::MultiplicativeInverse(Element a) const -{ - if (a <= 1) // 1 is a special case - return a; - - // warning - don't try to adapt this algorithm for another situation - word32 g0=m_modulus, g1=a, g2=a; - word32 v0=0, v1=1, v2=1; - - assert(g1); - - while (!(g2 & 0x80000000)) - { - g2 <<= 1; - v2 <<= 1; - } - - g2 <<= 1; - v2 <<= 1; - - g0 ^= g2; - v0 ^= v2; - - while (g0 != 1) - { - if (g1 < g0 || ((g0^g1) < g0 && (g0^g1) < g1)) - { - assert(BitPrecision(g1) <= BitPrecision(g0)); - g2 = g1; - v2 = v1; - } - else - { - assert(BitPrecision(g1) > BitPrecision(g0)); - g2 = g0; g0 = g1; g1 = g2; - v2 = v0; v0 = v1; v1 = v2; - } - - while ((g0^g2) >= g2) - { - assert(BitPrecision(g0) > BitPrecision(g2)); - g2 <<= 1; - v2 <<= 1; - } - - assert(BitPrecision(g0) == BitPrecision(g2)); - g0 ^= g2; - v0 ^= v2; - } - - return v0; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.h deleted file mode 100644 index 31713f4c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2_32.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef CRYPTOPP_GF2_32_H -#define CRYPTOPP_GF2_32_H - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! GF(2^32) with polynomial basis -class GF2_32 -{ -public: - typedef word32 Element; - typedef int RandomizationParameter; - - GF2_32(word32 modulus=0x0000008D) : m_modulus(modulus) {} - - Element RandomElement(RandomNumberGenerator &rng, int ignored = 0) const - {return rng.GenerateWord32();} - - bool Equal(Element a, Element b) const - {return a==b;} - - Element Identity() const - {return 0;} - - Element Add(Element a, Element b) const - {return a^b;} - - Element& Accumulate(Element &a, Element b) const - {return a^=b;} - - Element Inverse(Element a) const - {return a;} - - Element Subtract(Element a, Element b) const - {return a^b;} - - Element& Reduce(Element &a, Element b) const - {return a^=b;} - - Element Double(Element a) const - {return 0;} - - Element MultiplicativeIdentity() const - {return 1;} - - Element Multiply(Element a, Element b) const; - - Element Square(Element a) const - {return Multiply(a, a);} - - bool IsUnit(Element a) const - {return a != 0;} - - Element MultiplicativeInverse(Element a) const; - - Element Divide(Element a, Element b) const - {return Multiply(a, MultiplicativeInverse(b));} - -private: - word32 m_modulus; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.cpp deleted file mode 100644 index bcc56071..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.cpp +++ /dev/null @@ -1,882 +0,0 @@ -// gf2n.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "gf2n.h" -#include "algebra.h" -#include "words.h" -#include "randpool.h" -#include "asn.h" -#include "oids.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -PolynomialMod2::PolynomialMod2() -{ -} - -PolynomialMod2::PolynomialMod2(word value, size_t bitLength) - : reg(BitsToWords(bitLength)) -{ - assert(value==0 || reg.size()>0); - - if (reg.size() > 0) - { - reg[0] = value; - SetWords(reg+1, 0, reg.size()-1); - } -} - -PolynomialMod2::PolynomialMod2(const PolynomialMod2& t) - : reg(t.reg.size()) -{ - CopyWords(reg, t.reg, reg.size()); -} - -void PolynomialMod2::Randomize(RandomNumberGenerator &rng, size_t nbits) -{ - const size_t nbytes = nbits/8 + 1; - SecByteBlock buf(nbytes); - rng.GenerateBlock(buf, nbytes); - buf[0] = (byte)Crop(buf[0], nbits % 8); - Decode(buf, nbytes); -} - -PolynomialMod2 PolynomialMod2::AllOnes(size_t bitLength) -{ - PolynomialMod2 result((word)0, bitLength); - SetWords(result.reg, ~(word)0, result.reg.size()); - if (bitLength%WORD_BITS) - result.reg[result.reg.size()-1] = (word)Crop(result.reg[result.reg.size()-1], bitLength%WORD_BITS); - return result; -} - -void PolynomialMod2::SetBit(size_t n, int value) -{ - if (value) - { - reg.CleanGrow(n/WORD_BITS + 1); - reg[n/WORD_BITS] |= (word(1) << (n%WORD_BITS)); - } - else - { - if (n/WORD_BITS < reg.size()) - reg[n/WORD_BITS] &= ~(word(1) << (n%WORD_BITS)); - } -} - -byte PolynomialMod2::GetByte(size_t n) const -{ - if (n/WORD_SIZE >= reg.size()) - return 0; - else - return byte(reg[n/WORD_SIZE] >> ((n%WORD_SIZE)*8)); -} - -void PolynomialMod2::SetByte(size_t n, byte value) -{ - reg.CleanGrow(BytesToWords(n+1)); - reg[n/WORD_SIZE] &= ~(word(0xff) << 8*(n%WORD_SIZE)); - reg[n/WORD_SIZE] |= (word(value) << 8*(n%WORD_SIZE)); -} - -PolynomialMod2 PolynomialMod2::Monomial(size_t i) -{ - PolynomialMod2 r((word)0, i+1); - r.SetBit(i); - return r; -} - -PolynomialMod2 PolynomialMod2::Trinomial(size_t t0, size_t t1, size_t t2) -{ - PolynomialMod2 r((word)0, t0+1); - r.SetBit(t0); - r.SetBit(t1); - r.SetBit(t2); - return r; -} - -PolynomialMod2 PolynomialMod2::Pentanomial(size_t t0, size_t t1, size_t t2, size_t t3, size_t t4) -{ - PolynomialMod2 r((word)0, t0+1); - r.SetBit(t0); - r.SetBit(t1); - r.SetBit(t2); - r.SetBit(t3); - r.SetBit(t4); - return r; -} - -template -struct NewPolynomialMod2 -{ - PolynomialMod2 * operator()() const - { - return new PolynomialMod2(i); - } -}; - -const PolynomialMod2 &PolynomialMod2::Zero() -{ - return Singleton().Ref(); -} - -const PolynomialMod2 &PolynomialMod2::One() -{ - return Singleton >().Ref(); -} - -void PolynomialMod2::Decode(const byte *input, size_t inputLen) -{ - StringStore store(input, inputLen); - Decode(store, inputLen); -} - -void PolynomialMod2::Encode(byte *output, size_t outputLen) const -{ - ArraySink sink(output, outputLen); - Encode(sink, outputLen); -} - -void PolynomialMod2::Decode(BufferedTransformation &bt, size_t inputLen) -{ - reg.CleanNew(BytesToWords(inputLen)); - - for (size_t i=inputLen; i > 0; i--) - { - byte b; - bt.Get(b); - reg[(i-1)/WORD_SIZE] |= word(b) << ((i-1)%WORD_SIZE)*8; - } -} - -void PolynomialMod2::Encode(BufferedTransformation &bt, size_t outputLen) const -{ - for (size_t i=outputLen; i > 0; i--) - bt.Put(GetByte(i-1)); -} - -void PolynomialMod2::DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const -{ - DERGeneralEncoder enc(bt, OCTET_STRING); - Encode(enc, length); - enc.MessageEnd(); -} - -void PolynomialMod2::BERDecodeAsOctetString(BufferedTransformation &bt, size_t length) -{ - BERGeneralDecoder dec(bt, OCTET_STRING); - if (!dec.IsDefiniteLength() || dec.RemainingLength() != length) - BERDecodeError(); - Decode(dec, length); - dec.MessageEnd(); -} - -unsigned int PolynomialMod2::WordCount() const -{ - return (unsigned int)CountWords(reg, reg.size()); -} - -unsigned int PolynomialMod2::ByteCount() const -{ - unsigned wordCount = WordCount(); - if (wordCount) - return (wordCount-1)*WORD_SIZE + BytePrecision(reg[wordCount-1]); - else - return 0; -} - -unsigned int PolynomialMod2::BitCount() const -{ - unsigned wordCount = WordCount(); - if (wordCount) - return (wordCount-1)*WORD_BITS + BitPrecision(reg[wordCount-1]); - else - return 0; -} - -unsigned int PolynomialMod2::Parity() const -{ - unsigned i; - word temp=0; - for (i=0; i= reg.size()) - { - PolynomialMod2 result((word)0, b.reg.size()*WORD_BITS); - XorWords(result.reg, reg, b.reg, reg.size()); - CopyWords(result.reg+reg.size(), b.reg+reg.size(), b.reg.size()-reg.size()); - return result; - } - else - { - PolynomialMod2 result((word)0, reg.size()*WORD_BITS); - XorWords(result.reg, reg, b.reg, b.reg.size()); - CopyWords(result.reg+b.reg.size(), reg+b.reg.size(), reg.size()-b.reg.size()); - return result; - } -} - -PolynomialMod2 PolynomialMod2::And(const PolynomialMod2 &b) const -{ - PolynomialMod2 result((word)0, WORD_BITS*STDMIN(reg.size(), b.reg.size())); - AndWords(result.reg, reg, b.reg, result.reg.size()); - return result; -} - -PolynomialMod2 PolynomialMod2::Times(const PolynomialMod2 &b) const -{ - PolynomialMod2 result((word)0, BitCount() + b.BitCount()); - - for (int i=b.Degree(); i>=0; i--) - { - result <<= 1; - if (b[i]) - XorWords(result.reg, reg, reg.size()); - } - return result; -} - -PolynomialMod2 PolynomialMod2::Squared() const -{ - static const word map[16] = {0, 1, 4, 5, 16, 17, 20, 21, 64, 65, 68, 69, 80, 81, 84, 85}; - - PolynomialMod2 result((word)0, 2*reg.size()*WORD_BITS); - - for (unsigned i=0; i> (j/2)) % 16] << j; - - for (j=0; j> (j/2 + WORD_BITS/2)) % 16] << j; - } - - return result; -} - -void PolynomialMod2::Divide(PolynomialMod2 &remainder, PolynomialMod2 "ient, - const PolynomialMod2 ÷nd, const PolynomialMod2 &divisor) -{ - if (!divisor) - throw PolynomialMod2::DivideByZero(); - - int degree = divisor.Degree(); - remainder.reg.CleanNew(BitsToWords(degree+1)); - if (dividend.BitCount() >= divisor.BitCount()) - quotient.reg.CleanNew(BitsToWords(dividend.BitCount() - divisor.BitCount() + 1)); - else - quotient.reg.CleanNew(0); - - for (int i=dividend.Degree(); i>=0; i--) - { - remainder <<= 1; - remainder.reg[0] |= dividend[i]; - if (remainder[degree]) - { - remainder -= divisor; - quotient.SetBit(i); - } - } -} - -PolynomialMod2 PolynomialMod2::DividedBy(const PolynomialMod2 &b) const -{ - PolynomialMod2 remainder, quotient; - PolynomialMod2::Divide(remainder, quotient, *this, b); - return quotient; -} - -PolynomialMod2 PolynomialMod2::Modulo(const PolynomialMod2 &b) const -{ - PolynomialMod2 remainder, quotient; - PolynomialMod2::Divide(remainder, quotient, *this, b); - return remainder; -} - -PolynomialMod2& PolynomialMod2::operator<<=(unsigned int n) -{ - if (!reg.size()) - return *this; - - int i; - word u; - word carry=0; - word *r=reg; - - if (n==1) // special case code for most frequent case - { - i = (int)reg.size(); - while (i--) - { - u = *r; - *r = (u << 1) | carry; - carry = u >> (WORD_BITS-1); - r++; - } - - if (carry) - { - reg.Grow(reg.size()+1); - reg[reg.size()-1] = carry; - } - - return *this; - } - - int shiftWords = n / WORD_BITS; - int shiftBits = n % WORD_BITS; - - if (shiftBits) - { - i = (int)reg.size(); - while (i--) - { - u = *r; - *r = (u << shiftBits) | carry; - carry = u >> (WORD_BITS-shiftBits); - r++; - } - } - - if (carry) - { - reg.Grow(reg.size()+shiftWords+1); - reg[reg.size()-1] = carry; - } - else - reg.Grow(reg.size()+shiftWords); - - if (shiftWords) - { - for (i = (int)reg.size()-1; i>=shiftWords; i--) - reg[i] = reg[i-shiftWords]; - for (; i>=0; i--) - reg[i] = 0; - } - - return *this; -} - -PolynomialMod2& PolynomialMod2::operator>>=(unsigned int n) -{ - if (!reg.size()) - return *this; - - int shiftWords = n / WORD_BITS; - int shiftBits = n % WORD_BITS; - - size_t i; - word u; - word carry=0; - word *r=reg+reg.size()-1; - - if (shiftBits) - { - i = reg.size(); - while (i--) - { - u = *r; - *r = (u >> shiftBits) | carry; - carry = u << (WORD_BITS-shiftBits); - r--; - } - } - - if (shiftWords) - { - for (i=0; i>(unsigned int n) const -{ - PolynomialMod2 result(*this); - return result>>=n; -} - -bool PolynomialMod2::operator!() const -{ - for (unsigned i=0; i s(a.BitCount()/bits+1); - unsigned i; - - static const char upper[]="0123456789ABCDEF"; - static const char lower[]="0123456789abcdef"; - const char* vec = (out.flags() & std::ios::uppercase) ? upper : lower; - - for (i=0; i*bits < a.BitCount(); i++) - { - int digit=0; - for (int j=0; j().Gcd(a, b); -} - -PolynomialMod2 PolynomialMod2::InverseMod(const PolynomialMod2 &modulus) const -{ - typedef EuclideanDomainOf Domain; - return QuotientRing(Domain(), modulus).MultiplicativeInverse(*this); -} - -bool PolynomialMod2::IsIrreducible() const -{ - signed int d = Degree(); - if (d <= 0) - return false; - - PolynomialMod2 t(2), u(t); - for (int i=1; i<=d/2; i++) - { - u = u.Squared()%(*this); - if (!Gcd(u+t, *this).IsUnit()) - return false; - } - return true; -} - -// ******************************************************** - -GF2NP::GF2NP(const PolynomialMod2 &modulus) - : QuotientRing >(EuclideanDomainOf(), modulus), m(modulus.Degree()) -{ -} - -GF2NP::Element GF2NP::SquareRoot(const Element &a) const -{ - Element r = a; - for (unsigned int i=1; i t1 && t1 > t2 && t2==0); -} - -const GF2NT::Element& GF2NT::MultiplicativeInverse(const Element &a) const -{ - if (t0-t1 < WORD_BITS) - return GF2NP::MultiplicativeInverse(a); - - SecWordBlock T(m_modulus.reg.size() * 4); - word *b = T; - word *c = T+m_modulus.reg.size(); - word *f = T+2*m_modulus.reg.size(); - word *g = T+3*m_modulus.reg.size(); - size_t bcLen=1, fgLen=m_modulus.reg.size(); - unsigned int k=0; - - SetWords(T, 0, 3*m_modulus.reg.size()); - b[0]=1; - assert(a.reg.size() <= m_modulus.reg.size()); - CopyWords(f, a.reg, a.reg.size()); - CopyWords(g, m_modulus.reg, m_modulus.reg.size()); - - while (1) - { - word t=f[0]; - while (!t) - { - ShiftWordsRightByWords(f, fgLen, 1); - if (c[bcLen-1]) - bcLen++; - assert(bcLen <= m_modulus.reg.size()); - ShiftWordsLeftByWords(c, bcLen, 1); - k+=WORD_BITS; - t=f[0]; - } - - unsigned int i=0; - while (t%2 == 0) - { - t>>=1; - i++; - } - k+=i; - - if (t==1 && CountWords(f, fgLen)==1) - break; - - if (i==1) - { - ShiftWordsRightByBits(f, fgLen, 1); - t=ShiftWordsLeftByBits(c, bcLen, 1); - } - else - { - ShiftWordsRightByBits(f, fgLen, i); - t=ShiftWordsLeftByBits(c, bcLen, i); - } - if (t) - { - c[bcLen] = t; - bcLen++; - assert(bcLen <= m_modulus.reg.size()); - } - - if (f[fgLen-1]==0 && g[fgLen-1]==0) - fgLen--; - - if (f[fgLen-1] < g[fgLen-1]) - { - std::swap(f, g); - std::swap(b, c); - } - - XorWords(f, g, fgLen); - XorWords(b, c, bcLen); - } - - while (k >= WORD_BITS) - { - word temp = b[0]; - // right shift b - for (unsigned i=0; i+1> j) & 1) << (t1 + j); - else - b[t1/WORD_BITS-1] ^= temp << t1%WORD_BITS; - - if (t1 % WORD_BITS) - b[t1/WORD_BITS] ^= temp >> (WORD_BITS - t1%WORD_BITS); - - if (t0%WORD_BITS) - { - b[t0/WORD_BITS-1] ^= temp << t0%WORD_BITS; - b[t0/WORD_BITS] ^= temp >> (WORD_BITS - t0%WORD_BITS); - } - else - b[t0/WORD_BITS-1] ^= temp; - - k -= WORD_BITS; - } - - if (k) - { - word temp = b[0] << (WORD_BITS - k); - ShiftWordsRightByBits(b, BitsToWords(m), k); - - if (t1 < WORD_BITS) - for (unsigned int j=0; j> j) & 1) << (t1 + j); - else - b[t1/WORD_BITS-1] ^= temp << t1%WORD_BITS; - - if (t1 % WORD_BITS) - b[t1/WORD_BITS] ^= temp >> (WORD_BITS - t1%WORD_BITS); - - if (t0%WORD_BITS) - { - b[t0/WORD_BITS-1] ^= temp << t0%WORD_BITS; - b[t0/WORD_BITS] ^= temp >> (WORD_BITS - t0%WORD_BITS); - } - else - b[t0/WORD_BITS-1] ^= temp; - } - - CopyWords(result.reg.begin(), b, result.reg.size()); - return result; -} - -const GF2NT::Element& GF2NT::Multiply(const Element &a, const Element &b) const -{ - size_t aSize = STDMIN(a.reg.size(), result.reg.size()); - Element r((word)0, m); - - for (int i=m-1; i>=0; i--) - { - if (r[m-1]) - { - ShiftWordsLeftByBits(r.reg.begin(), r.reg.size(), 1); - XorWords(r.reg.begin(), m_modulus.reg, r.reg.size()); - } - else - ShiftWordsLeftByBits(r.reg.begin(), r.reg.size(), 1); - - if (b[i]) - XorWords(r.reg.begin(), a.reg, aSize); - } - - if (m%WORD_BITS) - r.reg.begin()[r.reg.size()-1] = (word)Crop(r.reg[r.reg.size()-1], m%WORD_BITS); - - CopyWords(result.reg.begin(), r.reg.begin(), result.reg.size()); - return result; -} - -const GF2NT::Element& GF2NT::Reduced(const Element &a) const -{ - if (t0-t1 < WORD_BITS) - return m_domain.Mod(a, m_modulus); - - SecWordBlock b(a.reg); - - size_t i; - for (i=b.size()-1; i>=BitsToWords(t0); i--) - { - word temp = b[i]; - - if (t0%WORD_BITS) - { - b[i-t0/WORD_BITS] ^= temp >> t0%WORD_BITS; - b[i-t0/WORD_BITS-1] ^= temp << (WORD_BITS - t0%WORD_BITS); - } - else - b[i-t0/WORD_BITS] ^= temp; - - if ((t0-t1)%WORD_BITS) - { - b[i-(t0-t1)/WORD_BITS] ^= temp >> (t0-t1)%WORD_BITS; - b[i-(t0-t1)/WORD_BITS-1] ^= temp << (WORD_BITS - (t0-t1)%WORD_BITS); - } - else - b[i-(t0-t1)/WORD_BITS] ^= temp; - } - - if (i==BitsToWords(t0)-1 && t0%WORD_BITS) - { - word mask = ((word)1<<(t0%WORD_BITS))-1; - word temp = b[i] & ~mask; - b[i] &= mask; - - b[i-t0/WORD_BITS] ^= temp >> t0%WORD_BITS; - - if ((t0-t1)%WORD_BITS) - { - b[i-(t0-t1)/WORD_BITS] ^= temp >> (t0-t1)%WORD_BITS; - if ((t0-t1)%WORD_BITS > t0%WORD_BITS) - b[i-(t0-t1)/WORD_BITS-1] ^= temp << (WORD_BITS - (t0-t1)%WORD_BITS); - else - assert(temp << (WORD_BITS - (t0-t1)%WORD_BITS) == 0); - } - else - b[i-(t0-t1)/WORD_BITS] ^= temp; - } - - SetWords(result.reg.begin(), 0, result.reg.size()); - CopyWords(result.reg.begin(), b, STDMIN(b.size(), result.reg.size())); - return result; -} - -void GF2NP::DEREncodeElement(BufferedTransformation &out, const Element &a) const -{ - a.DEREncodeAsOctetString(out, MaxElementByteLength()); -} - -void GF2NP::BERDecodeElement(BufferedTransformation &in, Element &a) const -{ - a.BERDecodeAsOctetString(in, MaxElementByteLength()); -} - -void GF2NT::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - ASN1::characteristic_two_field().DEREncode(seq); - DERSequenceEncoder parameters(seq); - DEREncodeUnsigned(parameters, m); - ASN1::tpBasis().DEREncode(parameters); - DEREncodeUnsigned(parameters, t1); - parameters.MessageEnd(); - seq.MessageEnd(); -} - -void GF2NPP::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - ASN1::characteristic_two_field().DEREncode(seq); - DERSequenceEncoder parameters(seq); - DEREncodeUnsigned(parameters, m); - ASN1::ppBasis().DEREncode(parameters); - DERSequenceEncoder pentanomial(parameters); - DEREncodeUnsigned(pentanomial, t3); - DEREncodeUnsigned(pentanomial, t2); - DEREncodeUnsigned(pentanomial, t1); - pentanomial.MessageEnd(); - parameters.MessageEnd(); - seq.MessageEnd(); -} - -GF2NP * BERDecodeGF2NP(BufferedTransformation &bt) -{ - // VC60 workaround: auto_ptr lacks reset() - member_ptr result; - - BERSequenceDecoder seq(bt); - if (OID(seq) != ASN1::characteristic_two_field()) - BERDecodeError(); - BERSequenceDecoder parameters(seq); - unsigned int m; - BERDecodeUnsigned(parameters, m); - OID oid(parameters); - if (oid == ASN1::tpBasis()) - { - unsigned int t1; - BERDecodeUnsigned(parameters, t1); - result.reset(new GF2NT(m, t1, 0)); - } - else if (oid == ASN1::ppBasis()) - { - unsigned int t1, t2, t3; - BERSequenceDecoder pentanomial(parameters); - BERDecodeUnsigned(pentanomial, t3); - BERDecodeUnsigned(pentanomial, t2); - BERDecodeUnsigned(pentanomial, t1); - pentanomial.MessageEnd(); - result.reset(new GF2NPP(m, t3, t2, t1, 0)); - } - else - { - BERDecodeError(); - return NULL; - } - parameters.MessageEnd(); - seq.MessageEnd(); - - return result.release(); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.h deleted file mode 100644 index 67ade641..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gf2n.h +++ /dev/null @@ -1,369 +0,0 @@ -#ifndef CRYPTOPP_GF2N_H -#define CRYPTOPP_GF2N_H - -/*! \file */ - -#include "cryptlib.h" -#include "secblock.h" -#include "misc.h" -#include "algebra.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! Polynomial with Coefficients in GF(2) -/*! \nosubgrouping */ -class CRYPTOPP_DLL PolynomialMod2 -{ -public: - //! \name ENUMS, EXCEPTIONS, and TYPEDEFS - //@{ - //! divide by zero exception - class DivideByZero : public Exception - { - public: - DivideByZero() : Exception(OTHER_ERROR, "PolynomialMod2: division by zero") {} - }; - - typedef unsigned int RandomizationParameter; - //@} - - //! \name CREATORS - //@{ - //! creates the zero polynomial - PolynomialMod2(); - //! copy constructor - PolynomialMod2(const PolynomialMod2& t); - - //! convert from word - /*! value should be encoded with the least significant bit as coefficient to x^0 - and most significant bit as coefficient to x^(WORD_BITS-1) - bitLength denotes how much memory to allocate initially - */ - PolynomialMod2(word value, size_t bitLength=WORD_BITS); - - //! convert from big-endian byte array - PolynomialMod2(const byte *encodedPoly, size_t byteCount) - {Decode(encodedPoly, byteCount);} - - //! convert from big-endian form stored in a BufferedTransformation - PolynomialMod2(BufferedTransformation &encodedPoly, size_t byteCount) - {Decode(encodedPoly, byteCount);} - - //! create a random polynomial uniformly distributed over all polynomials with degree less than bitcount - PolynomialMod2(RandomNumberGenerator &rng, size_t bitcount) - {Randomize(rng, bitcount);} - - //! return x^i - static PolynomialMod2 CRYPTOPP_API Monomial(size_t i); - //! return x^t0 + x^t1 + x^t2 - static PolynomialMod2 CRYPTOPP_API Trinomial(size_t t0, size_t t1, size_t t2); - //! return x^t0 + x^t1 + x^t2 + x^t3 + x^t4 - static PolynomialMod2 CRYPTOPP_API Pentanomial(size_t t0, size_t t1, size_t t2, size_t t3, size_t t4); - //! return x^(n-1) + ... + x + 1 - static PolynomialMod2 CRYPTOPP_API AllOnes(size_t n); - - //! - static const PolynomialMod2 & CRYPTOPP_API Zero(); - //! - static const PolynomialMod2 & CRYPTOPP_API One(); - //@} - - //! \name ENCODE/DECODE - //@{ - //! minimum number of bytes to encode this polynomial - /*! MinEncodedSize of 0 is 1 */ - unsigned int MinEncodedSize() const {return STDMAX(1U, ByteCount());} - - //! encode in big-endian format - /*! if outputLen < MinEncodedSize, the most significant bytes will be dropped - if outputLen > MinEncodedSize, the most significant bytes will be padded - */ - void Encode(byte *output, size_t outputLen) const; - //! - void Encode(BufferedTransformation &bt, size_t outputLen) const; - - //! - void Decode(const byte *input, size_t inputLen); - //! - //* Precondition: bt.MaxRetrievable() >= inputLen - void Decode(BufferedTransformation &bt, size_t inputLen); - - //! encode value as big-endian octet string - void DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const; - //! decode value as big-endian octet string - void BERDecodeAsOctetString(BufferedTransformation &bt, size_t length); - //@} - - //! \name ACCESSORS - //@{ - //! number of significant bits = Degree() + 1 - unsigned int BitCount() const; - //! number of significant bytes = ceiling(BitCount()/8) - unsigned int ByteCount() const; - //! number of significant words = ceiling(ByteCount()/sizeof(word)) - unsigned int WordCount() const; - - //! return the n-th bit, n=0 being the least significant bit - bool GetBit(size_t n) const {return GetCoefficient(n)!=0;} - //! return the n-th byte - byte GetByte(size_t n) const; - - //! the zero polynomial will return a degree of -1 - signed int Degree() const {return BitCount()-1;} - //! degree + 1 - unsigned int CoefficientCount() const {return BitCount();} - //! return coefficient for x^i - int GetCoefficient(size_t i) const - {return (i/WORD_BITS < reg.size()) ? int(reg[i/WORD_BITS] >> (i % WORD_BITS)) & 1 : 0;} - //! return coefficient for x^i - int operator[](unsigned int i) const {return GetCoefficient(i);} - - //! - bool IsZero() const {return !*this;} - //! - bool Equals(const PolynomialMod2 &rhs) const; - //@} - - //! \name MANIPULATORS - //@{ - //! - PolynomialMod2& operator=(const PolynomialMod2& t); - //! - PolynomialMod2& operator&=(const PolynomialMod2& t); - //! - PolynomialMod2& operator^=(const PolynomialMod2& t); - //! - PolynomialMod2& operator+=(const PolynomialMod2& t) {return *this ^= t;} - //! - PolynomialMod2& operator-=(const PolynomialMod2& t) {return *this ^= t;} - //! - PolynomialMod2& operator*=(const PolynomialMod2& t); - //! - PolynomialMod2& operator/=(const PolynomialMod2& t); - //! - PolynomialMod2& operator%=(const PolynomialMod2& t); - //! - PolynomialMod2& operator<<=(unsigned int); - //! - PolynomialMod2& operator>>=(unsigned int); - - //! - void Randomize(RandomNumberGenerator &rng, size_t bitcount); - - //! - void SetBit(size_t i, int value = 1); - //! set the n-th byte to value - void SetByte(size_t n, byte value); - - //! - void SetCoefficient(size_t i, int value) {SetBit(i, value);} - - //! - void swap(PolynomialMod2 &a) {reg.swap(a.reg);} - //@} - - //! \name UNARY OPERATORS - //@{ - //! - bool operator!() const; - //! - PolynomialMod2 operator+() const {return *this;} - //! - PolynomialMod2 operator-() const {return *this;} - //@} - - //! \name BINARY OPERATORS - //@{ - //! - PolynomialMod2 And(const PolynomialMod2 &b) const; - //! - PolynomialMod2 Xor(const PolynomialMod2 &b) const; - //! - PolynomialMod2 Plus(const PolynomialMod2 &b) const {return Xor(b);} - //! - PolynomialMod2 Minus(const PolynomialMod2 &b) const {return Xor(b);} - //! - PolynomialMod2 Times(const PolynomialMod2 &b) const; - //! - PolynomialMod2 DividedBy(const PolynomialMod2 &b) const; - //! - PolynomialMod2 Modulo(const PolynomialMod2 &b) const; - - //! - PolynomialMod2 operator>>(unsigned int n) const; - //! - PolynomialMod2 operator<<(unsigned int n) const; - //@} - - //! \name OTHER ARITHMETIC FUNCTIONS - //@{ - //! sum modulo 2 of all coefficients - unsigned int Parity() const; - - //! check for irreducibility - bool IsIrreducible() const; - - //! is always zero since we're working modulo 2 - PolynomialMod2 Doubled() const {return Zero();} - //! - PolynomialMod2 Squared() const; - - //! only 1 is a unit - bool IsUnit() const {return Equals(One());} - //! return inverse if *this is a unit, otherwise return 0 - PolynomialMod2 MultiplicativeInverse() const {return IsUnit() ? One() : Zero();} - - //! greatest common divisor - static PolynomialMod2 CRYPTOPP_API Gcd(const PolynomialMod2 &a, const PolynomialMod2 &n); - //! calculate multiplicative inverse of *this mod n - PolynomialMod2 InverseMod(const PolynomialMod2 &) const; - - //! calculate r and q such that (a == d*q + r) && (deg(r) < deg(d)) - static void CRYPTOPP_API Divide(PolynomialMod2 &r, PolynomialMod2 &q, const PolynomialMod2 &a, const PolynomialMod2 &d); - //@} - - //! \name INPUT/OUTPUT - //@{ - //! - friend std::ostream& operator<<(std::ostream& out, const PolynomialMod2 &a); - //@} - -private: - friend class GF2NT; - - SecWordBlock reg; -}; - -//! -inline bool operator==(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return a.Equals(b);} -//! -inline bool operator!=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return !(a==b);} -//! compares degree -inline bool operator> (const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return a.Degree() > b.Degree();} -//! compares degree -inline bool operator>=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return a.Degree() >= b.Degree();} -//! compares degree -inline bool operator< (const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return a.Degree() < b.Degree();} -//! compares degree -inline bool operator<=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) -{return a.Degree() <= b.Degree();} -//! -inline CryptoPP::PolynomialMod2 operator&(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.And(b);} -//! -inline CryptoPP::PolynomialMod2 operator^(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Xor(b);} -//! -inline CryptoPP::PolynomialMod2 operator+(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Plus(b);} -//! -inline CryptoPP::PolynomialMod2 operator-(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Minus(b);} -//! -inline CryptoPP::PolynomialMod2 operator*(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Times(b);} -//! -inline CryptoPP::PolynomialMod2 operator/(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.DividedBy(b);} -//! -inline CryptoPP::PolynomialMod2 operator%(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Modulo(b);} - -// CodeWarrior 8 workaround: put these template instantiations after overloaded operator declarations, -// but before the use of QuotientRing > for VC .NET 2003 -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup; -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractRing; -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractEuclideanDomain; -CRYPTOPP_DLL_TEMPLATE_CLASS EuclideanDomainOf; -CRYPTOPP_DLL_TEMPLATE_CLASS QuotientRing >; - -//! GF(2^n) with Polynomial Basis -class CRYPTOPP_DLL GF2NP : public QuotientRing > -{ -public: - GF2NP(const PolynomialMod2 &modulus); - - virtual GF2NP * Clone() const {return new GF2NP(*this);} - virtual void DEREncode(BufferedTransformation &bt) const - {assert(false);} // no ASN.1 syntax yet for general polynomial basis - - void DEREncodeElement(BufferedTransformation &out, const Element &a) const; - void BERDecodeElement(BufferedTransformation &in, Element &a) const; - - bool Equal(const Element &a, const Element &b) const - {assert(a.Degree() < m_modulus.Degree() && b.Degree() < m_modulus.Degree()); return a.Equals(b);} - - bool IsUnit(const Element &a) const - {assert(a.Degree() < m_modulus.Degree()); return !!a;} - - unsigned int MaxElementBitLength() const - {return m;} - - unsigned int MaxElementByteLength() const - {return (unsigned int)BitsToBytes(MaxElementBitLength());} - - Element SquareRoot(const Element &a) const; - - Element HalfTrace(const Element &a) const; - - // returns z such that z^2 + z == a - Element SolveQuadraticEquation(const Element &a) const; - -protected: - unsigned int m; -}; - -//! GF(2^n) with Trinomial Basis -class CRYPTOPP_DLL GF2NT : public GF2NP -{ -public: - // polynomial modulus = x^t0 + x^t1 + x^t2, t0 > t1 > t2 - GF2NT(unsigned int t0, unsigned int t1, unsigned int t2); - - GF2NP * Clone() const {return new GF2NT(*this);} - void DEREncode(BufferedTransformation &bt) const; - - const Element& Multiply(const Element &a, const Element &b) const; - - const Element& Square(const Element &a) const - {return Reduced(a.Squared());} - - const Element& MultiplicativeInverse(const Element &a) const; - -private: - const Element& Reduced(const Element &a) const; - - unsigned int t0, t1; - mutable PolynomialMod2 result; -}; - -//! GF(2^n) with Pentanomial Basis -class CRYPTOPP_DLL GF2NPP : public GF2NP -{ -public: - // polynomial modulus = x^t0 + x^t1 + x^t2 + x^t3 + x^t4, t0 > t1 > t2 > t3 > t4 - GF2NPP(unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4) - : GF2NP(PolynomialMod2::Pentanomial(t0, t1, t2, t3, t4)), t0(t0), t1(t1), t2(t2), t3(t3) {} - - GF2NP * Clone() const {return new GF2NPP(*this);} - void DEREncode(BufferedTransformation &bt) const; - -private: - unsigned int t0, t1, t2, t3; -}; - -// construct new GF2NP from the ASN.1 sequence Characteristic-two -CRYPTOPP_DLL GF2NP * CRYPTOPP_API BERDecodeGF2NP(BufferedTransformation &bt); - -NAMESPACE_END - -#ifndef __BORLANDC__ -NAMESPACE_BEGIN(std) -template<> inline void swap(CryptoPP::PolynomialMod2 &a, CryptoPP::PolynomialMod2 &b) -{ - a.swap(b); -} -NAMESPACE_END -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.cpp deleted file mode 100644 index 6d9ffceb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.cpp +++ /dev/null @@ -1,275 +0,0 @@ -// dsa.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "gfpcrypt.h" -#include "asn.h" -#include "oids.h" -#include "nbtheory.h" - -NAMESPACE_BEGIN(CryptoPP) - -void TestInstantiations_gfpcrypt() -{ - GDSA::Signer test; - GDSA::Verifier test1; - DSA::Signer test5(NullRNG(), 100); - DSA::Signer test2(test5); - NR::Signer test3; - NR::Verifier test4; - DLIES<>::Encryptor test6; - DLIES<>::Decryptor test7; -} - -void DL_GroupParameters_DSA::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - Integer p, q, g; - - if (alg.GetValue("Modulus", p) && alg.GetValue("SubgroupGenerator", g)) - { - q = alg.GetValueWithDefault("SubgroupOrder", ComputeGroupOrder(p)/2); - } - else - { - int modulusSize = 1024; - alg.GetIntValue("ModulusSize", modulusSize) || alg.GetIntValue("KeySize", modulusSize); - - if (!DSA::IsValidPrimeLength(modulusSize)) - throw InvalidArgument("DSA: not a valid prime length"); - - SecByteBlock seed(SHA::DIGESTSIZE); - Integer h; - int c; - - do - { - rng.GenerateBlock(seed, SHA::DIGESTSIZE); - } while (!DSA::GeneratePrimes(seed, SHA::DIGESTSIZE*8, c, p, modulusSize, q)); - - do - { - h.Randomize(rng, 2, p-2); - g = a_exp_b_mod_c(h, (p-1)/q, p); - } while (g <= 1); - } - - Initialize(p, q, g); -} - -bool DL_GroupParameters_DSA::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = DL_GroupParameters_GFP::ValidateGroup(rng, level); - pass = pass && DSA::IsValidPrimeLength(GetModulus().BitCount()); - pass = pass && GetSubgroupOrder().BitCount() == 160; - return pass; -} - -void DL_SignatureMessageEncodingMethod_DSA::ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - assert(recoverableMessageLength == 0); - assert(hashIdentifier.second == 0); - const size_t representativeByteLength = BitsToBytes(representativeBitLength); - const size_t digestSize = hash.DigestSize(); - const size_t paddingLength = SaturatingSubtract(representativeByteLength, digestSize); - - memset(representative, 0, paddingLength); - hash.TruncatedFinal(representative+paddingLength, STDMIN(representativeByteLength, digestSize)); - - if (digestSize*8 > representativeBitLength) - { - Integer h(representative, representativeByteLength); - h >>= representativeByteLength*8 - representativeBitLength; - h.Encode(representative, representativeByteLength); - } -} - -void DL_SignatureMessageEncodingMethod_NR::ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - assert(recoverableMessageLength == 0); - assert(hashIdentifier.second == 0); - const size_t representativeByteLength = BitsToBytes(representativeBitLength); - const size_t digestSize = hash.DigestSize(); - const size_t paddingLength = SaturatingSubtract(representativeByteLength, digestSize); - - memset(representative, 0, paddingLength); - hash.TruncatedFinal(representative+paddingLength, STDMIN(representativeByteLength, digestSize)); - - if (digestSize*8 >= representativeBitLength) - { - Integer h(representative, representativeByteLength); - h >>= representativeByteLength*8 - representativeBitLength + 1; - h.Encode(representative, representativeByteLength); - } -} - -bool DL_GroupParameters_IntegerBased::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const -{ - const Integer &p = GetModulus(), &q = GetSubgroupOrder(); - - bool pass = true; - pass = pass && p > Integer::One() && p.IsOdd(); - pass = pass && q > Integer::One() && q.IsOdd(); - - if (level >= 1) - pass = pass && GetCofactor() > Integer::One() && GetGroupOrder() % q == Integer::Zero(); - if (level >= 2) - pass = pass && VerifyPrime(rng, q, level-2) && VerifyPrime(rng, p, level-2); - - return pass; -} - -bool DL_GroupParameters_IntegerBased::ValidateElement(unsigned int level, const Integer &g, const DL_FixedBasePrecomputation *gpc) const -{ - const Integer &p = GetModulus(), &q = GetSubgroupOrder(); - - bool pass = true; - pass = pass && GetFieldType() == 1 ? g.IsPositive() : g.NotNegative(); - pass = pass && g < p && !IsIdentity(g); - - if (level >= 1) - { - if (gpc) - pass = pass && gpc->Exponentiate(GetGroupPrecomputation(), Integer::One()) == g; - } - if (level >= 2) - { - if (GetFieldType() == 2) - pass = pass && Jacobi(g*g-4, p)==-1; - - // verifying that Lucas((p+1)/2, w, p)==2 is omitted because it's too costly - // and at most 1 bit is leaked if it's false - bool fullValidate = (GetFieldType() == 2 && level >= 3) || !FastSubgroupCheckAvailable(); - - if (fullValidate && pass) - { - Integer gp = gpc ? gpc->Exponentiate(GetGroupPrecomputation(), q) : ExponentiateElement(g, q); - pass = pass && IsIdentity(gp); - } - else if (GetFieldType() == 1) - pass = pass && Jacobi(g, p) == 1; - } - - return pass; -} - -void DL_GroupParameters_IntegerBased::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - Integer p, q, g; - - if (alg.GetValue("Modulus", p) && alg.GetValue("SubgroupGenerator", g)) - { - q = alg.GetValueWithDefault("SubgroupOrder", ComputeGroupOrder(p)/2); - } - else - { - int modulusSize, subgroupOrderSize; - - if (!alg.GetIntValue("ModulusSize", modulusSize)) - modulusSize = alg.GetIntValueWithDefault("KeySize", 2048); - - if (!alg.GetIntValue("SubgroupOrderSize", subgroupOrderSize)) - subgroupOrderSize = GetDefaultSubgroupOrderSize(modulusSize); - - PrimeAndGenerator pg; - pg.Generate(GetFieldType() == 1 ? 1 : -1, rng, modulusSize, subgroupOrderSize); - p = pg.Prime(); - q = pg.SubPrime(); - g = pg.Generator(); - } - - Initialize(p, q, g); -} - -Integer DL_GroupParameters_IntegerBased::DecodeElement(const byte *encoded, bool checkForGroupMembership) const -{ - Integer g(encoded, GetModulus().ByteCount()); - if (!ValidateElement(1, g, NULL)) - throw DL_BadElement(); - return g; -} - -void DL_GroupParameters_IntegerBased::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder parameters(bt); - Integer p(parameters); - Integer q(parameters); - Integer g; - if (parameters.EndReached()) - { - g = q; - q = ComputeGroupOrder(p) / 2; - } - else - g.BERDecode(parameters); - parameters.MessageEnd(); - - SetModulusAndSubgroupGenerator(p, g); - SetSubgroupOrder(q); -} - -void DL_GroupParameters_IntegerBased::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder parameters(bt); - GetModulus().DEREncode(parameters); - m_q.DEREncode(parameters); - GetSubgroupGenerator().DEREncode(parameters); - parameters.MessageEnd(); -} - -bool DL_GroupParameters_IntegerBased::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper >(this, name, valueType, pValue) - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus); -} - -void DL_GroupParameters_IntegerBased::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY2(Modulus, SubgroupGenerator) - CRYPTOPP_SET_FUNCTION_ENTRY(SubgroupOrder) - ; -} - -OID DL_GroupParameters_IntegerBased::GetAlgorithmID() const -{ - return ASN1::id_dsa(); -} - -void DL_GroupParameters_GFP::SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const -{ - ModularArithmetic ma(GetModulus()); - ma.SimultaneousExponentiate(results, base, exponents, exponentsCount); -} - -DL_GroupParameters_GFP::Element DL_GroupParameters_GFP::MultiplyElements(const Element &a, const Element &b) const -{ - return a_times_b_mod_c(a, b, GetModulus()); -} - -DL_GroupParameters_GFP::Element DL_GroupParameters_GFP::CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const -{ - ModularArithmetic ma(GetModulus()); - return ma.CascadeExponentiate(element1, exponent1, element2, exponent2); -} - -Integer DL_GroupParameters_IntegerBased::GetMaxExponent() const -{ - return STDMIN(GetSubgroupOrder()-1, Integer::Power2(2*DiscreteLogWorkFactor(GetFieldType()*GetModulus().BitCount()))); -} - -unsigned int DL_GroupParameters_IntegerBased::GetDefaultSubgroupOrderSize(unsigned int modulusSize) const -{ - return 2*DiscreteLogWorkFactor(GetFieldType()*modulusSize); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.h deleted file mode 100644 index 5e9c635d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gfpcrypt.h +++ /dev/null @@ -1,536 +0,0 @@ -#ifndef CRYPTOPP_GFPCRYPT_H -#define CRYPTOPP_GFPCRYPT_H - -/** \file - Implementation of schemes based on DL over GF(p) -*/ - -#include "pubkey.h" -#include "modexppc.h" -#include "sha.h" -#include "algparam.h" -#include "asn.h" -#include "smartptr.h" -#include "hmac.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBased : public ASN1CryptoMaterial > -{ - typedef DL_GroupParameters_IntegerBased ThisClass; - -public: - void Initialize(const DL_GroupParameters_IntegerBased ¶ms) - {Initialize(params.GetModulus(), params.GetSubgroupOrder(), params.GetSubgroupGenerator());} - void Initialize(RandomNumberGenerator &rng, unsigned int pbits) - {GenerateRandom(rng, MakeParameters("ModulusSize", (int)pbits));} - void Initialize(const Integer &p, const Integer &g) - {SetModulusAndSubgroupGenerator(p, g); SetSubgroupOrder(ComputeGroupOrder(p)/2);} - void Initialize(const Integer &p, const Integer &q, const Integer &g) - {SetModulusAndSubgroupGenerator(p, g); SetSubgroupOrder(q);} - - // ASN1Object interface - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - // GeneratibleCryptoMaterial interface - /*! parameters: (ModulusSize, SubgroupOrderSize (optional)) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // DL_GroupParameters - const Integer & GetSubgroupOrder() const {return m_q;} - Integer GetGroupOrder() const {return GetFieldType() == 1 ? GetModulus()-Integer::One() : GetModulus()+Integer::One();} - bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const; - bool ValidateElement(unsigned int level, const Integer &element, const DL_FixedBasePrecomputation *precomp) const; - bool FastSubgroupCheckAvailable() const {return GetCofactor() == 2;} - void EncodeElement(bool reversible, const Element &element, byte *encoded) const - {element.Encode(encoded, GetModulus().ByteCount());} - unsigned int GetEncodedElementSize(bool reversible) const {return GetModulus().ByteCount();} - Integer DecodeElement(const byte *encoded, bool checkForGroupMembership) const; - Integer ConvertElementToInteger(const Element &element) const - {return element;} - Integer GetMaxExponent() const; - static std::string CRYPTOPP_API StaticAlgorithmNamePrefix() {return "";} - - OID GetAlgorithmID() const; - - virtual const Integer & GetModulus() const =0; - virtual void SetModulusAndSubgroupGenerator(const Integer &p, const Integer &g) =0; - - void SetSubgroupOrder(const Integer &q) - {m_q = q; ParametersChanged();} - -protected: - Integer ComputeGroupOrder(const Integer &modulus) const - {return modulus-(GetFieldType() == 1 ? 1 : -1);} - - // GF(p) = 1, GF(p^2) = 2 - virtual int GetFieldType() const =0; - virtual unsigned int GetDefaultSubgroupOrderSize(unsigned int modulusSize) const; - -private: - Integer m_q; -}; - -//! _ -template > -class CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBasedImpl : public DL_GroupParametersImpl -{ - typedef DL_GroupParameters_IntegerBasedImpl ThisClass; - -public: - typedef typename GROUP_PRECOMP::Element Element; - - // GeneratibleCryptoMaterial interface - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - {return GetValueHelper(this, name, valueType, pValue).Assignable();} - - void AssignFrom(const NameValuePairs &source) - {AssignFromHelper(this, source);} - - // DL_GroupParameters - const DL_FixedBasePrecomputation & GetBasePrecomputation() const {return this->m_gpc;} - DL_FixedBasePrecomputation & AccessBasePrecomputation() {return this->m_gpc;} - - // IntegerGroupParameters - const Integer & GetModulus() const {return this->m_groupPrecomputation.GetModulus();} - const Integer & GetGenerator() const {return this->m_gpc.GetBase(this->GetGroupPrecomputation());} - - void SetModulusAndSubgroupGenerator(const Integer &p, const Integer &g) // these have to be set together - {this->m_groupPrecomputation.SetModulus(p); this->m_gpc.SetBase(this->GetGroupPrecomputation(), g); this->ParametersChanged();} - - // non-inherited - bool operator==(const DL_GroupParameters_IntegerBasedImpl &rhs) const - {return GetModulus() == rhs.GetModulus() && GetGenerator() == rhs.GetGenerator() && this->GetSubgroupOrder() == rhs.GetSubgroupOrder();} - bool operator!=(const DL_GroupParameters_IntegerBasedImpl &rhs) const - {return !operator==(rhs);} -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_IntegerBasedImpl; - -//! GF(p) group parameters -class CRYPTOPP_DLL DL_GroupParameters_GFP : public DL_GroupParameters_IntegerBasedImpl -{ -public: - // DL_GroupParameters - bool IsIdentity(const Integer &element) const {return element == Integer::One();} - void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; - - // NameValuePairs interface - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper(this, name, valueType, pValue).Assignable(); - } - - // used by MQV - Element MultiplyElements(const Element &a, const Element &b) const; - Element CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const; - -protected: - int GetFieldType() const {return 1;} -}; - -//! GF(p) group parameters that default to same primes -class CRYPTOPP_DLL DL_GroupParameters_GFP_DefaultSafePrime : public DL_GroupParameters_GFP -{ -public: - typedef NoCofactorMultiplication DefaultCofactorOption; - -protected: - unsigned int GetDefaultSubgroupOrderSize(unsigned int modulusSize) const {return modulusSize-1;} -}; - -//! GDSA algorithm -template -class DL_Algorithm_GDSA : public DL_ElgamalLikeSignatureAlgorithm -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "DSA-1363";} - - void Sign(const DL_GroupParameters ¶ms, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const - { - const Integer &q = params.GetSubgroupOrder(); - r %= q; - Integer kInv = k.InverseMod(q); - s = (kInv * (x*r + e)) % q; - assert(!!r && !!s); - } - - bool Verify(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &e, const Integer &r, const Integer &s) const - { - const Integer &q = params.GetSubgroupOrder(); - if (r>=q || r<1 || s>=q || s<1) - return false; - - Integer w = s.InverseMod(q); - Integer u1 = (e * w) % q; - Integer u2 = (r * w) % q; - // verify r == (g^u1 * y^u2 mod p) mod q - return r == params.ConvertElementToInteger(publicKey.CascadeExponentiateBaseAndPublicElement(u1, u2)) % q; - } -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA; - -//! NR algorithm -template -class DL_Algorithm_NR : public DL_ElgamalLikeSignatureAlgorithm -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "NR";} - - void Sign(const DL_GroupParameters ¶ms, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const - { - const Integer &q = params.GetSubgroupOrder(); - r = (r + e) % q; - s = (k - x*r) % q; - assert(!!r); - } - - bool Verify(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &e, const Integer &r, const Integer &s) const - { - const Integer &q = params.GetSubgroupOrder(); - if (r>=q || r<1 || s>=q) - return false; - - // check r == (m_g^s * m_y^r + m) mod m_q - return r == (params.ConvertElementToInteger(publicKey.CascadeExponentiateBaseAndPublicElement(s, r)) + e) % q; - } -}; - -/*! DSA public key format is defined in 7.3.3 of RFC 2459. The - private key format is defined in 12.9 of PKCS #11 v2.10. */ -template -class DL_PublicKey_GFP : public DL_PublicKeyImpl -{ -public: - void Initialize(const DL_GroupParameters_IntegerBased ¶ms, const Integer &y) - {this->AccessGroupParameters().Initialize(params); this->SetPublicElement(y);} - void Initialize(const Integer &p, const Integer &g, const Integer &y) - {this->AccessGroupParameters().Initialize(p, g); this->SetPublicElement(y);} - void Initialize(const Integer &p, const Integer &q, const Integer &g, const Integer &y) - {this->AccessGroupParameters().Initialize(p, q, g); this->SetPublicElement(y);} - - // X509PublicKey - void BERDecodePublicKey(BufferedTransformation &bt, bool, size_t) - {this->SetPublicElement(Integer(bt));} - void DEREncodePublicKey(BufferedTransformation &bt) const - {this->GetPublicElement().DEREncode(bt);} -}; - -//! DL private key (in GF(p) groups) -template -class DL_PrivateKey_GFP : public DL_PrivateKeyImpl -{ -public: - void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits) - {this->GenerateRandomWithKeySize(rng, modulusBits);} - void Initialize(RandomNumberGenerator &rng, const Integer &p, const Integer &g) - {this->GenerateRandom(rng, MakeParameters("Modulus", p)("SubgroupGenerator", g));} - void Initialize(RandomNumberGenerator &rng, const Integer &p, const Integer &q, const Integer &g) - {this->GenerateRandom(rng, MakeParameters("Modulus", p)("SubgroupOrder", q)("SubgroupGenerator", g));} - void Initialize(const DL_GroupParameters_IntegerBased ¶ms, const Integer &x) - {this->AccessGroupParameters().Initialize(params); this->SetPrivateExponent(x);} - void Initialize(const Integer &p, const Integer &g, const Integer &x) - {this->AccessGroupParameters().Initialize(p, g); this->SetPrivateExponent(x);} - void Initialize(const Integer &p, const Integer &q, const Integer &g, const Integer &x) - {this->AccessGroupParameters().Initialize(p, q, g); this->SetPrivateExponent(x);} -}; - -//! DL signing/verification keys (in GF(p) groups) -struct DL_SignatureKeys_GFP -{ - typedef DL_GroupParameters_GFP GroupParameters; - typedef DL_PublicKey_GFP PublicKey; - typedef DL_PrivateKey_GFP PrivateKey; -}; - -//! DL encryption/decryption keys (in GF(p) groups) -struct DL_CryptoKeys_GFP -{ - typedef DL_GroupParameters_GFP_DefaultSafePrime GroupParameters; - typedef DL_PublicKey_GFP PublicKey; - typedef DL_PrivateKey_GFP PrivateKey; -}; - -//! provided for backwards compatibility, this class uses the old non-standard Crypto++ key format -template -class DL_PublicKey_GFP_OldFormat : public BASE -{ -public: - void BERDecode(BufferedTransformation &bt) - { - BERSequenceDecoder seq(bt); - Integer v1(seq); - Integer v2(seq); - Integer v3(seq); - - if (seq.EndReached()) - { - this->AccessGroupParameters().Initialize(v1, v1/2, v2); - this->SetPublicElement(v3); - } - else - { - Integer v4(seq); - this->AccessGroupParameters().Initialize(v1, v2, v3); - this->SetPublicElement(v4); - } - - seq.MessageEnd(); - } - - void DEREncode(BufferedTransformation &bt) const - { - DERSequenceEncoder seq(bt); - this->GetGroupParameters().GetModulus().DEREncode(seq); - if (this->GetGroupParameters().GetCofactor() != 2) - this->GetGroupParameters().GetSubgroupOrder().DEREncode(seq); - this->GetGroupParameters().GetGenerator().DEREncode(seq); - this->GetPublicElement().DEREncode(seq); - seq.MessageEnd(); - } -}; - -//! provided for backwards compatibility, this class uses the old non-standard Crypto++ key format -template -class DL_PrivateKey_GFP_OldFormat : public BASE -{ -public: - void BERDecode(BufferedTransformation &bt) - { - BERSequenceDecoder seq(bt); - Integer v1(seq); - Integer v2(seq); - Integer v3(seq); - Integer v4(seq); - - if (seq.EndReached()) - { - this->AccessGroupParameters().Initialize(v1, v1/2, v2); - this->SetPrivateExponent(v4 % (v1/2)); // some old keys may have x >= q - } - else - { - Integer v5(seq); - this->AccessGroupParameters().Initialize(v1, v2, v3); - this->SetPrivateExponent(v5); - } - - seq.MessageEnd(); - } - - void DEREncode(BufferedTransformation &bt) const - { - DERSequenceEncoder seq(bt); - this->GetGroupParameters().GetModulus().DEREncode(seq); - if (this->GetGroupParameters().GetCofactor() != 2) - this->GetGroupParameters().GetSubgroupOrder().DEREncode(seq); - this->GetGroupParameters().GetGenerator().DEREncode(seq); - this->GetGroupParameters().ExponentiateBase(this->GetPrivateExponent()).DEREncode(seq); - this->GetPrivateExponent().DEREncode(seq); - seq.MessageEnd(); - } -}; - -//! DSA-1363 -template -struct GDSA : public DL_SS< - DL_SignatureKeys_GFP, - DL_Algorithm_GDSA, - DL_SignatureMessageEncodingMethod_DSA, - H> -{ -}; - -//! NR -template -struct NR : public DL_SS< - DL_SignatureKeys_GFP, - DL_Algorithm_NR, - DL_SignatureMessageEncodingMethod_NR, - H> -{ -}; - -//! DSA group parameters, these are GF(p) group parameters that are allowed by the DSA standard -class CRYPTOPP_DLL DL_GroupParameters_DSA : public DL_GroupParameters_GFP -{ -public: - /*! also checks that the lengths of p and q are allowed by the DSA standard */ - bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const; - /*! parameters: (ModulusSize), or (Modulus, SubgroupOrder, SubgroupGenerator) */ - /*! ModulusSize must be between DSA::MIN_PRIME_LENGTH and DSA::MAX_PRIME_LENGTH, and divisible by DSA::PRIME_LENGTH_MULTIPLE */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); -}; - -struct DSA; - -//! DSA keys -struct DL_Keys_DSA -{ - typedef DL_PublicKey_GFP PublicKey; - typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest, DSA> PrivateKey; -}; - -//! DSA -struct CRYPTOPP_DLL DSA : public DL_SS< - DL_Keys_DSA, - DL_Algorithm_GDSA, - DL_SignatureMessageEncodingMethod_DSA, - SHA, - DSA> -{ - static const char * CRYPTOPP_API StaticAlgorithmName() {return "DSA";} - - //! Generate DSA primes according to NIST standard - /*! Both seedLength and primeLength are in bits, but seedLength should - be a multiple of 8. - If useInputCounterValue == true, the counter parameter is taken as input, otherwise it's used for output - */ - static bool CRYPTOPP_API GeneratePrimes(const byte *seed, unsigned int seedLength, int &counter, - Integer &p, unsigned int primeLength, Integer &q, bool useInputCounterValue = false); - - static bool CRYPTOPP_API IsValidPrimeLength(unsigned int pbits) - {return pbits >= MIN_PRIME_LENGTH && pbits <= MAX_PRIME_LENGTH && pbits % PRIME_LENGTH_MULTIPLE == 0;} - - //! FIPS 186-2 Change Notice 1 changed the minimum modulus length to 1024 - enum { -#if (DSA_1024_BIT_MODULUS_ONLY) - MIN_PRIME_LENGTH = 1024, -#else - MIN_PRIME_LENGTH = 512, -#endif - MAX_PRIME_LENGTH = 1024, PRIME_LENGTH_MULTIPLE = 64}; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_GFP; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_GFP; -CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest, DSA>; - -//! the XOR encryption method, for use with DL-based cryptosystems -template -class DL_EncryptionAlgorithm_Xor : public DL_SymmetricEncryptionAlgorithm -{ -public: - bool ParameterSupported(const char *name) const {return strcmp(name, Name::EncodingParameters()) == 0;} - size_t GetSymmetricKeyLength(size_t plaintextLength) const - {return plaintextLength + MAC::DEFAULT_KEYLENGTH;} - size_t GetSymmetricCiphertextLength(size_t plaintextLength) const - {return plaintextLength + MAC::DIGESTSIZE;} - size_t GetMaxSymmetricPlaintextLength(size_t ciphertextLength) const - {return (unsigned int)SaturatingSubtract(ciphertextLength, (unsigned int)MAC::DIGESTSIZE);} - void SymmetricEncrypt(RandomNumberGenerator &rng, const byte *key, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs ¶meters) const - { - const byte *cipherKey, *macKey; - if (DHAES_MODE) - { - macKey = key; - cipherKey = key + MAC::DEFAULT_KEYLENGTH; - } - else - { - cipherKey = key; - macKey = key + plaintextLength; - } - - ConstByteArrayParameter encodingParameters; - parameters.GetValue(Name::EncodingParameters(), encodingParameters); - - xorbuf(ciphertext, plaintext, cipherKey, plaintextLength); - MAC mac(macKey); - mac.Update(ciphertext, plaintextLength); - mac.Update(encodingParameters.begin(), encodingParameters.size()); - if (DHAES_MODE) - { - byte L[8] = {0,0,0,0}; - PutWord(false, BIG_ENDIAN_ORDER, L+4, word32(encodingParameters.size())); - mac.Update(L, 8); - } - mac.Final(ciphertext + plaintextLength); - } - DecodingResult SymmetricDecrypt(const byte *key, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs ¶meters) const - { - size_t plaintextLength = GetMaxSymmetricPlaintextLength(ciphertextLength); - const byte *cipherKey, *macKey; - if (DHAES_MODE) - { - macKey = key; - cipherKey = key + MAC::DEFAULT_KEYLENGTH; - } - else - { - cipherKey = key; - macKey = key + plaintextLength; - } - - ConstByteArrayParameter encodingParameters; - parameters.GetValue(Name::EncodingParameters(), encodingParameters); - - MAC mac(macKey); - mac.Update(ciphertext, plaintextLength); - mac.Update(encodingParameters.begin(), encodingParameters.size()); - if (DHAES_MODE) - { - byte L[8] = {0,0,0,0}; - PutWord(false, BIG_ENDIAN_ORDER, L+4, word32(encodingParameters.size())); - mac.Update(L, 8); - } - if (!mac.Verify(ciphertext + plaintextLength)) - return DecodingResult(); - - xorbuf(plaintext, ciphertext, cipherKey, plaintextLength); - return DecodingResult(plaintextLength); - } -}; - -//! _ -template -class DL_KeyDerivationAlgorithm_P1363 : public DL_KeyDerivationAlgorithm -{ -public: - bool ParameterSupported(const char *name) const {return strcmp(name, Name::KeyDerivationParameters()) == 0;} - void Derive(const DL_GroupParameters ¶ms, byte *derivedKey, size_t derivedLength, const T &agreedElement, const T &ephemeralPublicKey, const NameValuePairs ¶meters) const - { - SecByteBlock agreedSecret; - if (DHAES_MODE) - { - agreedSecret.New(params.GetEncodedElementSize(true) + params.GetEncodedElementSize(false)); - params.EncodeElement(true, ephemeralPublicKey, agreedSecret); - params.EncodeElement(false, agreedElement, agreedSecret + params.GetEncodedElementSize(true)); - } - else - { - agreedSecret.New(params.GetEncodedElementSize(false)); - params.EncodeElement(false, agreedElement, agreedSecret); - } - - ConstByteArrayParameter derivationParameters; - parameters.GetValue(Name::KeyDerivationParameters(), derivationParameters); - KDF::DeriveKey(derivedKey, derivedLength, agreedSecret, agreedSecret.size(), derivationParameters.begin(), derivationParameters.size()); - } -}; - -//! Discrete Log Integrated Encryption Scheme, AKA DLIES -template -struct DLIES - : public DL_ES< - DL_CryptoKeys_GFP, - DL_KeyAgreementAlgorithm_DH, - DL_KeyDerivationAlgorithm_P1363 >, - DL_EncryptionAlgorithm_Xor, DHAES_MODE>, - DLIES<> > -{ - static std::string CRYPTOPP_API StaticAlgorithmName() {return "DLIES";} // TODO: fix this after name is standardized -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.cpp deleted file mode 100644 index bbd82975..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include "pch.h" -#include "gost.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -// these are the S-boxes given in Applied Cryptography 2nd Ed., p. 333 -const byte GOST::Base::sBox[8][16]={ - {4, 10, 9, 2, 13, 8, 0, 14, 6, 11, 1, 12, 7, 15, 5, 3}, - {14, 11, 4, 12, 6, 13, 15, 10, 2, 3, 8, 1, 0, 7, 5, 9}, - {5, 8, 1, 13, 10, 3, 4, 2, 14, 15, 12, 7, 6, 0, 9, 11}, - {7, 13, 10, 1, 0, 8, 9, 15, 14, 4, 6, 12, 11, 2, 5, 3}, - {6, 12, 7, 1, 5, 15, 13, 8, 4, 10, 9, 14, 0, 3, 11, 2}, - {4, 11, 10, 0, 7, 2, 1, 13, 3, 6, 8, 5, 9, 12, 15, 14}, - {13, 11, 4, 1, 3, 15, 5, 9, 0, 10, 14, 7, 6, 8, 2, 12}, - {1, 15, 13, 0, 5, 7, 10, 4, 9, 2, 3, 14, 6, 11, 8, 12}}; - -/* // these are the S-boxes given in the GOST source code listing in Applied - // Cryptography 2nd Ed., p. 644. they appear to be from the DES S-boxes - {13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7 }, - { 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1 }, - {12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11 }, - { 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9 }, - { 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15 }, - {10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8 }, - {15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10 }, - {14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7 }}; -*/ - -volatile bool GOST::Base::sTableCalculated = false; -word32 GOST::Base::sTable[4][256]; - -void GOST::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - PrecalculateSTable(); - - GetUserKey(LITTLE_ENDIAN_ORDER, key.begin(), 8, userKey, KEYLENGTH); -} - -void GOST::Base::PrecalculateSTable() -{ - if (!sTableCalculated) - { - for (unsigned i = 0; i < 4; i++) - for (unsigned j = 0; j < 256; j++) - { - word32 temp = sBox[2*i][j%16] | (sBox[2*i+1][j/16] << 4); - sTable[i][j] = rotlMod(temp, 11+8*i); - } - - sTableCalculated=true; - } -} - -#define f(x) ( t=x, \ - sTable[3][GETBYTE(t, 3)] ^ sTable[2][GETBYTE(t, 2)] \ - ^ sTable[1][GETBYTE(t, 1)] ^ sTable[0][GETBYTE(t, 0)] ) - -typedef BlockGetAndPut Block; - -void GOST::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 n1, n2, t; - - Block::Get(inBlock)(n1)(n2); - - for (unsigned int i=0; i<3; i++) - { - n2 ^= f(n1+key[0]); - n1 ^= f(n2+key[1]); - n2 ^= f(n1+key[2]); - n1 ^= f(n2+key[3]); - n2 ^= f(n1+key[4]); - n1 ^= f(n2+key[5]); - n2 ^= f(n1+key[6]); - n1 ^= f(n2+key[7]); - } - - n2 ^= f(n1+key[7]); - n1 ^= f(n2+key[6]); - n2 ^= f(n1+key[5]); - n1 ^= f(n2+key[4]); - n2 ^= f(n1+key[3]); - n1 ^= f(n2+key[2]); - n2 ^= f(n1+key[1]); - n1 ^= f(n2+key[0]); - - Block::Put(xorBlock, outBlock)(n2)(n1); -} - -void GOST::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 n1, n2, t; - - Block::Get(inBlock)(n1)(n2); - - n2 ^= f(n1+key[0]); - n1 ^= f(n2+key[1]); - n2 ^= f(n1+key[2]); - n1 ^= f(n2+key[3]); - n2 ^= f(n1+key[4]); - n1 ^= f(n2+key[5]); - n2 ^= f(n1+key[6]); - n1 ^= f(n2+key[7]); - - for (unsigned int i=0; i<3; i++) - { - n2 ^= f(n1+key[7]); - n1 ^= f(n2+key[6]); - n2 ^= f(n1+key[5]); - n1 ^= f(n2+key[4]); - n2 ^= f(n1+key[3]); - n1 ^= f(n2+key[2]); - n2 ^= f(n1+key[1]); - n1 ^= f(n2+key[0]); - } - - Block::Put(xorBlock, outBlock)(n2)(n1); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.h deleted file mode 100644 index e6fe4693..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gost.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CRYPTOPP_GOST_H -#define CRYPTOPP_GOST_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct GOST_Info : public FixedBlockSize<8>, public FixedKeyLength<32> -{ - static const char *StaticAlgorithmName() {return "GOST";} -}; - -/// GOST -class GOST : public GOST_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - static void PrecalculateSTable(); - - static const byte sBox[8][16]; - static volatile bool sTableCalculated; - static word32 sTable[4][256]; - - FixedSizeSecBlock key; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef GOST::Encryption GOSTEncryption; -typedef GOST::Decryption GOSTDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.cpp deleted file mode 100644 index 09e420a7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// gzip.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "gzip.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Gzip::WritePrestreamHeader() -{ - m_totalLen = 0; - m_crc.Restart(); - - AttachedTransformation()->Put(MAGIC1); - AttachedTransformation()->Put(MAGIC2); - AttachedTransformation()->Put(DEFLATED); - AttachedTransformation()->Put(0); // general flag - AttachedTransformation()->PutWord32(0); // time stamp - byte extra = (GetDeflateLevel() == 1) ? FAST : ((GetDeflateLevel() == 9) ? SLOW : 0); - AttachedTransformation()->Put(extra); - AttachedTransformation()->Put(GZIP_OS_CODE); -} - -void Gzip::ProcessUncompressedData(const byte *inString, size_t length) -{ - m_crc.Update(inString, length); - m_totalLen += (word32)length; -} - -void Gzip::WritePoststreamTail() -{ - SecByteBlock crc(4); - m_crc.Final(crc); - AttachedTransformation()->Put(crc, 4); - AttachedTransformation()->PutWord32(m_totalLen, LITTLE_ENDIAN_ORDER); -} - -// ************************************************************* - -Gunzip::Gunzip(BufferedTransformation *attachment, bool repeat, int propagation) - : Inflator(attachment, repeat, propagation) -{ -} - -void Gunzip::ProcessPrestreamHeader() -{ - m_length = 0; - m_crc.Restart(); - - byte buf[6]; - byte b, flags; - - if (m_inQueue.Get(buf, 2)!=2) throw HeaderErr(); - if (buf[0] != MAGIC1 || buf[1] != MAGIC2) throw HeaderErr(); - if (!m_inQueue.Skip(1)) throw HeaderErr(); // skip extra flags - if (!m_inQueue.Get(flags)) throw HeaderErr(); - if (flags & (ENCRYPTED | CONTINUED)) throw HeaderErr(); - if (m_inQueue.Skip(6)!=6) throw HeaderErr(); // Skip file time, extra flags and OS type - - if (flags & EXTRA_FIELDS) // skip extra fields - { - word16 length; - if (m_inQueue.GetWord16(length, LITTLE_ENDIAN_ORDER) != 2) throw HeaderErr(); - if (m_inQueue.Skip(length)!=length) throw HeaderErr(); - } - - if (flags & FILENAME) // skip filename - do - if(!m_inQueue.Get(b)) throw HeaderErr(); - while (b); - - if (flags & COMMENTS) // skip comments - do - if(!m_inQueue.Get(b)) throw HeaderErr(); - while (b); -} - -void Gunzip::ProcessDecompressedData(const byte *inString, size_t length) -{ - AttachedTransformation()->Put(inString, length); - m_crc.Update(inString, length); - m_length += (word32)length; -} - -void Gunzip::ProcessPoststreamTail() -{ - SecByteBlock crc(4); - if (m_inQueue.Get(crc, 4) != 4) - throw TailErr(); - if (!m_crc.Verify(crc)) - throw CrcErr(); - - word32 lengthCheck; - if (m_inQueue.GetWord32(lengthCheck, LITTLE_ENDIAN_ORDER) != 4) - throw TailErr(); - if (lengthCheck != m_length) - throw LengthErr(); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.h deleted file mode 100644 index f3148ad7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/gzip.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef CRYPTOPP_GZIP_H -#define CRYPTOPP_GZIP_H - -#include "zdeflate.h" -#include "zinflate.h" -#include "crc.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// GZIP Compression (RFC 1952) -class Gzip : public Deflator -{ -public: - Gzip(BufferedTransformation *attachment=NULL, unsigned int deflateLevel=DEFAULT_DEFLATE_LEVEL, unsigned int log2WindowSize=DEFAULT_LOG2_WINDOW_SIZE, bool detectUncompressible=true) - : Deflator(attachment, deflateLevel, log2WindowSize, detectUncompressible) {} - Gzip(const NameValuePairs ¶meters, BufferedTransformation *attachment=NULL) - : Deflator(parameters, attachment) {} - -protected: - enum {MAGIC1=0x1f, MAGIC2=0x8b, // flags for the header - DEFLATED=8, FAST=4, SLOW=2}; - - void WritePrestreamHeader(); - void ProcessUncompressedData(const byte *string, size_t length); - void WritePoststreamTail(); - - word32 m_totalLen; - CRC32 m_crc; -}; - -/// GZIP Decompression (RFC 1952) -class Gunzip : public Inflator -{ -public: - typedef Inflator::Err Err; - class HeaderErr : public Err {public: HeaderErr() : Err(INVALID_DATA_FORMAT, "Gunzip: header decoding error") {}}; - class TailErr : public Err {public: TailErr() : Err(INVALID_DATA_FORMAT, "Gunzip: tail too short") {}}; - class CrcErr : public Err {public: CrcErr() : Err(DATA_INTEGRITY_CHECK_FAILED, "Gunzip: CRC check error") {}}; - class LengthErr : public Err {public: LengthErr() : Err(DATA_INTEGRITY_CHECK_FAILED, "Gunzip: length check error") {}}; - - /*! \param repeat decompress multiple compressed streams in series - \param autoSignalPropagation 0 to turn off MessageEnd signal - */ - Gunzip(BufferedTransformation *attachment = NULL, bool repeat = false, int autoSignalPropagation = -1); - -protected: - enum {MAGIC1=0x1f, MAGIC2=0x8b, // flags for the header - DEFLATED=8}; - - enum FLAG_MASKS { - CONTINUED=2, EXTRA_FIELDS=4, FILENAME=8, COMMENTS=16, ENCRYPTED=32}; - - unsigned int MaxPrestreamHeaderSize() const {return 1024;} - void ProcessPrestreamHeader(); - void ProcessDecompressedData(const byte *string, size_t length); - unsigned int MaxPoststreamTailSize() const {return 8;} - void ProcessPoststreamTail(); - - word32 m_length; - CRC32 m_crc; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.cpp deleted file mode 100644 index 5731df55..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// hex.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "hex.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const byte s_vecUpper[] = "0123456789ABCDEF"; -static const byte s_vecLower[] = "0123456789abcdef"; - -void HexEncoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - bool uppercase = parameters.GetValueWithDefault(Name::Uppercase(), true); - m_filter->Initialize(CombinedNameValuePairs( - parameters, - MakeParameters(Name::EncodingLookupArray(), uppercase ? &s_vecUpper[0] : &s_vecLower[0], false)(Name::Log2Base(), 4, true))); -} - -void HexDecoder::IsolatedInitialize(const NameValuePairs ¶meters) -{ - BaseN_Decoder::IsolatedInitialize(CombinedNameValuePairs( - parameters, - MakeParameters(Name::DecodingLookupArray(), GetDefaultDecodingLookupArray(), false)(Name::Log2Base(), 4, true))); -} - -const int *HexDecoder::GetDefaultDecodingLookupArray() -{ - static volatile bool s_initialized = false; - static int s_array[256]; - - if (!s_initialized) - { - InitializeDecodingLookupArray(s_array, s_vecUpper, 16, true); - s_initialized = true; - } - return s_array; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.h deleted file mode 100644 index 006914c5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/hex.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef CRYPTOPP_HEX_H -#define CRYPTOPP_HEX_H - -#include "basecode.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Converts given data to base 16 -class CRYPTOPP_DLL HexEncoder : public SimpleProxyFilter -{ -public: - HexEncoder(BufferedTransformation *attachment = NULL, bool uppercase = true, int outputGroupSize = 0, const std::string &separator = ":", const std::string &terminator = "") - : SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment) - { - IsolatedInitialize(MakeParameters(Name::Uppercase(), uppercase)(Name::GroupSize(), outputGroupSize)(Name::Separator(), ConstByteArrayParameter(separator))(Name::Terminator(), ConstByteArrayParameter(terminator))); - } - - void IsolatedInitialize(const NameValuePairs ¶meters); -}; - -//! Decode base 16 data back to bytes -class CRYPTOPP_DLL HexDecoder : public BaseN_Decoder -{ -public: - HexDecoder(BufferedTransformation *attachment = NULL) - : BaseN_Decoder(GetDefaultDecodingLookupArray(), 4, attachment) {} - - void IsolatedInitialize(const NameValuePairs ¶meters); - -private: - static const int * CRYPTOPP_API GetDefaultDecodingLookupArray(); -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/hmac.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/hmac.cpp deleted file mode 100644 index d4a649c0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/hmac.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// hmac.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "hmac.h" - -NAMESPACE_BEGIN(CryptoPP) - -void HMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - Restart(); - - HashTransformation &hash = AccessHash(); - unsigned int blockSize = hash.BlockSize(); - - if (!blockSize) - throw InvalidArgument("HMAC: can only be used with a block-based hash function"); - - m_buf.resize(2*AccessHash().BlockSize() + AccessHash().DigestSize()); - - if (keylength <= blockSize) - memcpy(AccessIpad(), userKey, keylength); - else - { - AccessHash().CalculateDigest(AccessIpad(), userKey, keylength); - keylength = hash.DigestSize(); - } - - assert(keylength <= blockSize); - memset(AccessIpad()+keylength, 0, blockSize-keylength); - - for (unsigned int i=0; i, public MessageAuthenticationCode -{ -public: - HMAC_Base() : m_innerHashKeyed(false) {} - void UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs ¶ms); - - void Restart(); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *mac, size_t size); - unsigned int OptimalBlockSize() const {return const_cast(this)->AccessHash().OptimalBlockSize();} - unsigned int DigestSize() const {return const_cast(this)->AccessHash().DigestSize();} - -protected: - virtual HashTransformation & AccessHash() =0; - byte * AccessIpad() {return m_buf;} - byte * AccessOpad() {return m_buf + AccessHash().BlockSize();} - byte * AccessInnerHash() {return m_buf + 2*AccessHash().BlockSize();} - -private: - void KeyInnerHash(); - - SecByteBlock m_buf; - bool m_innerHashKeyed; -}; - -//! HMAC -/*! HMAC(K, text) = H(K XOR opad, H(K XOR ipad, text)) */ -template -class HMAC : public MessageAuthenticationCodeImpl > -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE=T::DIGESTSIZE) - CRYPTOPP_CONSTANT(BLOCKSIZE=T::BLOCKSIZE) - - HMAC() {} - HMAC(const byte *key, size_t length=HMAC_Base::DEFAULT_KEYLENGTH) - {this->SetKey(key, length);} - - static std::string StaticAlgorithmName() {return std::string("HMAC(") + T::StaticAlgorithmName() + ")";} - std::string AlgorithmName() const {return std::string("HMAC(") + m_hash.AlgorithmName() + ")";} - -private: - HashTransformation & AccessHash() {return m_hash;} - - T m_hash; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.cpp deleted file mode 100644 index 906ec4a0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// hrtimer.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "hrtimer.h" -#include "misc.h" -#include // for NULL -#include - -#if defined(CRYPTOPP_WIN32_AVAILABLE) -#include -#elif defined(CRYPTOPP_UNIX_AVAILABLE) -#include -#include -#include -#endif - -#include - -NAMESPACE_BEGIN(CryptoPP) - -#ifndef CRYPTOPP_IMPORTS - -double TimerBase::ConvertTo(TimerWord t, Unit unit) -{ - static unsigned long unitsPerSecondTable[] = {1, 1000, 1000*1000, 1000*1000*1000}; - - assert(unit < sizeof(unitsPerSecondTable) / sizeof(unitsPerSecondTable[0])); - return (double)CRYPTOPP_VC6_INT64 t * unitsPerSecondTable[unit] / CRYPTOPP_VC6_INT64 TicksPerSecond(); -} - -void TimerBase::StartTimer() -{ - m_last = m_start = GetCurrentTimerValue(); - m_started = true; -} - -double TimerBase::ElapsedTimeAsDouble() -{ - if (m_stuckAtZero) - return 0; - - if (m_started) - { - TimerWord now = GetCurrentTimerValue(); - if (m_last < now) // protect against OS bugs where time goes backwards - m_last = now; - return ConvertTo(m_last - m_start, m_timerUnit); - } - - StartTimer(); - return 0; -} - -unsigned long TimerBase::ElapsedTime() -{ - double elapsed = ElapsedTimeAsDouble(); - assert(elapsed <= ULONG_MAX); - return (unsigned long)elapsed; -} - -TimerWord Timer::GetCurrentTimerValue() -{ -#if defined(CRYPTOPP_WIN32_AVAILABLE) - LARGE_INTEGER now; - if (!QueryPerformanceCounter(&now)) - throw Exception(Exception::OTHER_ERROR, "Timer: QueryPerformanceCounter failed with error " + IntToString(GetLastError())); - return now.QuadPart; -#elif defined(CRYPTOPP_UNIX_AVAILABLE) - timeval now; - gettimeofday(&now, NULL); - return (TimerWord)now.tv_sec * 1000000 + now.tv_usec; -#else - clock_t now; - return clock(); -#endif -} - -TimerWord Timer::TicksPerSecond() -{ -#if defined(CRYPTOPP_WIN32_AVAILABLE) - static LARGE_INTEGER freq = {0}; - if (freq.QuadPart == 0) - { - if (!QueryPerformanceFrequency(&freq)) - throw Exception(Exception::OTHER_ERROR, "Timer: QueryPerformanceFrequency failed with error " + IntToString(GetLastError())); - } - return freq.QuadPart; -#elif defined(CRYPTOPP_UNIX_AVAILABLE) - return 1000000; -#else - return CLOCKS_PER_SEC; -#endif -} - -#endif // #ifndef CRYPTOPP_IMPORTS - -TimerWord ThreadUserTimer::GetCurrentTimerValue() -{ -#if defined(CRYPTOPP_WIN32_AVAILABLE) - static bool getCurrentThreadImplemented = true; - if (getCurrentThreadImplemented) - { - FILETIME now, ignored; - if (!GetThreadTimes(GetCurrentThread(), &ignored, &ignored, &ignored, &now)) - { - DWORD lastError = GetLastError(); - if (lastError == ERROR_CALL_NOT_IMPLEMENTED) - { - getCurrentThreadImplemented = false; - goto GetCurrentThreadNotImplemented; - } - throw Exception(Exception::OTHER_ERROR, "ThreadUserTimer: GetThreadTimes failed with error " + IntToString(lastError)); - } - return now.dwLowDateTime + ((TimerWord)now.dwHighDateTime << 32); - } -GetCurrentThreadNotImplemented: - return (TimerWord)clock() * (10*1000*1000 / CLOCKS_PER_SEC); -#elif defined(CRYPTOPP_UNIX_AVAILABLE) - tms now; - times(&now); - return now.tms_utime; -#else - return clock(); -#endif -} - -TimerWord ThreadUserTimer::TicksPerSecond() -{ -#if defined(CRYPTOPP_WIN32_AVAILABLE) - return 10*1000*1000; -#elif defined(CRYPTOPP_UNIX_AVAILABLE) - static const long ticksPerSecond = sysconf(_SC_CLK_TCK); - return ticksPerSecond; -#else - return CLOCKS_PER_SEC; -#endif -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.h deleted file mode 100644 index 858dbd22..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/hrtimer.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef CRYPTOPP_HRTIMER_H -#define CRYPTOPP_HRTIMER_H - -#include "config.h" -#ifndef HIGHRES_TIMER_AVAILABLE -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef HIGHRES_TIMER_AVAILABLE - typedef word64 TimerWord; -#else - typedef clock_t TimerWord; -#endif - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TimerBase -{ -public: - enum Unit {SECONDS = 0, MILLISECONDS, MICROSECONDS, NANOSECONDS}; - TimerBase(Unit unit, bool stuckAtZero) : m_timerUnit(unit), m_stuckAtZero(stuckAtZero), m_started(false) {} - - virtual TimerWord GetCurrentTimerValue() =0; // GetCurrentTime is a macro in MSVC 6.0 - virtual TimerWord TicksPerSecond() =0; // this is not the resolution, just a conversion factor into seconds - - void StartTimer(); - double ElapsedTimeAsDouble(); - unsigned long ElapsedTime(); - -private: - double ConvertTo(TimerWord t, Unit unit); - - Unit m_timerUnit; // HPUX workaround: m_unit is a system macro on HPUX - bool m_stuckAtZero, m_started; - TimerWord m_start, m_last; -}; - -//! measure CPU time spent executing instructions of this thread (if supported by OS) -/*! /note This only works correctly on Windows NT or later. On Unix it reports process time, and others wall clock time. -*/ -class ThreadUserTimer : public TimerBase -{ -public: - ThreadUserTimer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false) : TimerBase(unit, stuckAtZero) {} - TimerWord GetCurrentTimerValue(); - TimerWord TicksPerSecond(); -}; - -//! high resolution timer -class CRYPTOPP_DLL Timer : public TimerBase -{ -public: - Timer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false) : TimerBase(unit, stuckAtZero) {} - TimerWord GetCurrentTimerValue(); - TimerWord TicksPerSecond(); -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.cpp deleted file mode 100644 index 5cb43b22..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.cpp +++ /dev/null @@ -1,421 +0,0 @@ -// ida.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "ida.h" - -#include "algebra.h" -#include "gf2_32.h" -#include "polynomi.h" -#include - -#include "polynomi.cpp" - -ANONYMOUS_NAMESPACE_BEGIN -static const CryptoPP::GF2_32 field; -NAMESPACE_END - -using namespace std; - -NAMESPACE_BEGIN(CryptoPP) - -void RawIDA::IsolatedInitialize(const NameValuePairs ¶meters) -{ - if (!parameters.GetIntValue("RecoveryThreshold", m_threshold)) - throw InvalidArgument("RawIDA: missing RecoveryThreshold argument"); - - if (m_threshold <= 0) - throw InvalidArgument("RawIDA: RecoveryThreshold must be greater than 0"); - - m_lastMapPosition = m_inputChannelMap.end(); - m_channelsReady = 0; - m_channelsFinished = 0; - m_w.New(m_threshold); - m_y.New(m_threshold); - m_inputQueues.reserve(m_threshold); - - m_outputChannelIds.clear(); - m_outputChannelIdStrings.clear(); - m_outputQueues.clear(); - - word32 outputChannelID; - if (parameters.GetValue("OutputChannelID", outputChannelID)) - AddOutputChannel(outputChannelID); - else - { - int nShares = parameters.GetIntValueWithDefault("NumberOfShares", m_threshold); - for (int i=0; ifirst == channelId) - goto skipFind; - ++m_lastMapPosition; - if (m_lastMapPosition != m_inputChannelMap.end() && m_lastMapPosition->first == channelId) - goto skipFind; - } - m_lastMapPosition = m_inputChannelMap.find(channelId); - -skipFind: - if (m_lastMapPosition == m_inputChannelMap.end()) - { - if (m_inputChannelIds.size() == m_threshold) - return m_threshold; - - m_lastMapPosition = m_inputChannelMap.insert(InputChannelMap::value_type(channelId, (unsigned int)m_inputChannelIds.size())).first; - m_inputQueues.push_back(MessageQueue()); - m_inputChannelIds.push_back(channelId); - - if (m_inputChannelIds.size() == m_threshold) - PrepareInterpolation(); - } - return m_lastMapPosition->second; -} - -unsigned int RawIDA::LookupInputChannel(word32 channelId) const -{ - map::const_iterator it = m_inputChannelMap.find(channelId); - if (it == m_inputChannelMap.end()) - return m_threshold; - else - return it->second; -} - -void RawIDA::ChannelData(word32 channelId, const byte *inString, size_t length, bool messageEnd) -{ - int i = InsertInputChannel(channelId); - if (i < m_threshold) - { - lword size = m_inputQueues[i].MaxRetrievable(); - m_inputQueues[i].Put(inString, length); - if (size < 4 && size + length >= 4) - { - m_channelsReady++; - if (m_channelsReady == m_threshold) - ProcessInputQueues(); - } - - if (messageEnd) - { - m_inputQueues[i].MessageEnd(); - if (m_inputQueues[i].NumberOfMessages() == 1) - { - m_channelsFinished++; - if (m_channelsFinished == m_threshold) - { - m_channelsReady = 0; - for (i=0; i= m_v.size()) - { - m_v.resize(i+1); - m_outputToInput.resize(i+1); - } - - m_outputToInput[i] = LookupInputChannel(m_outputChannelIds[i]); - if (m_outputToInput[i] == m_threshold && i * m_threshold <= 1000*1000) - { - m_v[i].resize(m_threshold); - PrepareBulkPolynomialInterpolationAt(field, m_v[i].begin(), m_outputChannelIds[i], &(m_inputChannelIds[0]), m_w.begin(), m_threshold); - } -} - -void RawIDA::AddOutputChannel(word32 channelId) -{ - m_outputChannelIds.push_back(channelId); - m_outputChannelIdStrings.push_back(WordToString(channelId)); - m_outputQueues.push_back(ByteQueue()); - if (m_inputChannelIds.size() == m_threshold) - ComputeV((unsigned int)m_outputChannelIds.size() - 1); -} - -void RawIDA::PrepareInterpolation() -{ - assert(m_inputChannelIds.size() == m_threshold); - PrepareBulkPolynomialInterpolation(field, m_w.begin(), &(m_inputChannelIds[0]), m_threshold); - for (unsigned int i=0; i 0 : m_channelsReady == m_threshold) - { - m_channelsReady = 0; - for (i=0; i 0 || queue.MaxRetrievable() >= 4; - } - - for (i=0; (unsigned int)i 0 && m_outputQueues[0].AnyRetrievable()) - FlushOutputQueues(); - - if (finished) - { - OutputMessageEnds(); - - m_channelsReady = 0; - m_channelsFinished = 0; - m_v.clear(); - - vector inputQueues; - vector inputChannelIds; - - inputQueues.swap(m_inputQueues); - inputChannelIds.swap(m_inputChannelIds); - m_inputChannelMap.clear(); - m_lastMapPosition = m_inputChannelMap.end(); - - for (i=0; iChannelMessageEnd(m_outputChannelIdStrings[i], GetAutoSignalPropagation()-1); - } -} - -// **************************************************************** - -void SecretSharing::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_pad = parameters.GetValueWithDefault("AddPadding", true); - m_ida.IsolatedInitialize(parameters); -} - -size_t SecretSharing::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("SecretSharing"); - - SecByteBlock buf(UnsignedMin(256, length)); - unsigned int threshold = m_ida.GetThreshold(); - while (length > 0) - { - size_t len = STDMIN(length, buf.size()); - m_ida.ChannelData(0xffffffff, begin, len, false); - for (unsigned int i=0; i 0) - SecretSharing::Put(0); - } - m_ida.ChannelData(0xffffffff, NULL, 0, true); - for (unsigned int i=0; iMessageEnd(GetAutoSignalPropagation()-1); -} - -// **************************************************************** - -void InformationDispersal::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_nextChannel = 0; - m_pad = parameters.GetValueWithDefault("AddPadding", true); - m_ida.IsolatedInitialize(parameters); -} - -size_t InformationDispersal::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("InformationDispersal"); - - while (length--) - { - m_ida.ChannelData(m_nextChannel, begin, 1, false); - begin++; - m_nextChannel++; - if (m_nextChannel == m_ida.GetThreshold()) - m_nextChannel = 0; - } - - if (messageEnd) - { - m_ida.SetAutoSignalPropagation(messageEnd-1); - if (m_pad) - InformationDispersal::Put(1); - for (word32 i=0; iMessageEnd(GetAutoSignalPropagation()-1); -} - -size_t PaddingRemover::Put2(const byte *begin, size_t length, int messageEnd, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("PaddingRemover"); - - const byte *const end = begin + length; - - if (m_possiblePadding) - { - size_t len = find_if(begin, end, bind2nd(not_equal_to(), 0)) - begin; - m_zeroCount += len; - begin += len; - if (begin == end) - return 0; - - AttachedTransformation()->Put(1); - while (m_zeroCount--) - AttachedTransformation()->Put(0); - AttachedTransformation()->Put(*begin++); - m_possiblePadding = false; - } - -#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300) - // VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one - typedef reverse_bidirectional_iterator RevIt; -#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) - typedef reverse_iterator RevIt; -#else - typedef reverse_iterator RevIt; -#endif - const byte *x = find_if(RevIt(end), RevIt(begin), bind2nd(not_equal_to(), 0)).base(); - if (x != begin && *(x-1) == 1) - { - AttachedTransformation()->Put(begin, x-begin-1); - m_possiblePadding = true; - m_zeroCount = end - x; - } - else - AttachedTransformation()->Put(begin, end-begin); - - if (messageEnd) - { - m_possiblePadding = false; - Output(0, begin, length, messageEnd, blocking); - } - return 0; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.h deleted file mode 100644 index 8ebb4ec9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ida.h +++ /dev/null @@ -1,152 +0,0 @@ -#ifndef CRYPTOPP_IDA_H -#define CRYPTOPP_IDA_H - -#include "mqueue.h" -#include "filters.h" -#include "channels.h" -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -/// base class for secret sharing and information dispersal -class RawIDA : public AutoSignaling > > -{ -public: - RawIDA(BufferedTransformation *attachment=NULL) - {Detach(attachment);} - - unsigned int GetThreshold() const {return m_threshold;} - void AddOutputChannel(word32 channelId); - void ChannelData(word32 channelId, const byte *inString, size_t length, bool messageEnd); - lword InputBuffered(word32 channelId) const; - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) - { - if (!blocking) - throw BlockingInputOnly("RawIDA"); - ChannelData(StringToWord(channel), begin, length, messageEnd != 0); - return 0; - } - -protected: - virtual void FlushOutputQueues(); - virtual void OutputMessageEnds(); - - unsigned int InsertInputChannel(word32 channelId); - unsigned int LookupInputChannel(word32 channelId) const; - void ComputeV(unsigned int); - void PrepareInterpolation(); - void ProcessInputQueues(); - - typedef std::map InputChannelMap; - InputChannelMap m_inputChannelMap; - InputChannelMap::iterator m_lastMapPosition; - std::vector m_inputQueues; - std::vector m_inputChannelIds, m_outputChannelIds, m_outputToInput; - std::vector m_outputChannelIdStrings; - std::vector m_outputQueues; - int m_threshold; - unsigned int m_channelsReady, m_channelsFinished; - std::vector > m_v; - SecBlock m_u, m_w, m_y; -}; - -/// a variant of Shamir's Secret Sharing Algorithm -class SecretSharing : public CustomFlushPropagation -{ -public: - SecretSharing(RandomNumberGenerator &rng, int threshold, int nShares, BufferedTransformation *attachment=NULL, bool addPadding=true) - : m_rng(rng), m_ida(new OutputProxy(*this, true)) - { - Detach(attachment); - IsolatedInitialize(MakeParameters("RecoveryThreshold", threshold)("NumberOfShares", nShares)("AddPadding", addPadding)); - } - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) {return m_ida.Flush(hardFlush, propagation, blocking);} - -protected: - RandomNumberGenerator &m_rng; - RawIDA m_ida; - bool m_pad; -}; - -/// a variant of Shamir's Secret Sharing Algorithm -class SecretRecovery : public RawIDA -{ -public: - SecretRecovery(int threshold, BufferedTransformation *attachment=NULL, bool removePadding=true) - : RawIDA(attachment) - {IsolatedInitialize(MakeParameters("RecoveryThreshold", threshold)("RemovePadding", removePadding));} - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - -protected: - void FlushOutputQueues(); - void OutputMessageEnds(); - - bool m_pad; -}; - -/// a variant of Rabin's Information Dispersal Algorithm -class InformationDispersal : public CustomFlushPropagation -{ -public: - InformationDispersal(int threshold, int nShares, BufferedTransformation *attachment=NULL, bool addPadding=true) - : m_ida(new OutputProxy(*this, true)) - { - Detach(attachment); - IsolatedInitialize(MakeParameters("RecoveryThreshold", threshold)("NumberOfShares", nShares)("AddPadding", addPadding)); - } - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) {return m_ida.Flush(hardFlush, propagation, blocking);} - -protected: - RawIDA m_ida; - bool m_pad; - unsigned int m_nextChannel; -}; - -/// a variant of Rabin's Information Dispersal Algorithm -class InformationRecovery : public RawIDA -{ -public: - InformationRecovery(int threshold, BufferedTransformation *attachment=NULL, bool removePadding=true) - : RawIDA(attachment) - {IsolatedInitialize(MakeParameters("RecoveryThreshold", threshold)("RemovePadding", removePadding));} - - void IsolatedInitialize(const NameValuePairs ¶meters=g_nullNameValuePairs); - -protected: - void FlushOutputQueues(); - void OutputMessageEnds(); - - bool m_pad; - ByteQueue m_queue; -}; - -class PaddingRemover : public Unflushable -{ -public: - PaddingRemover(BufferedTransformation *attachment=NULL) - : m_possiblePadding(false) {Detach(attachment);} - - void IsolatedInitialize(const NameValuePairs ¶meters) {m_possiblePadding = false;} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking); - - // GetPossiblePadding() == false at the end of a message indicates incorrect padding - bool GetPossiblePadding() const {return m_possiblePadding;} - -private: - bool m_possiblePadding; - lword m_zeroCount; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/idea.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/idea.cpp deleted file mode 100644 index 793f912f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/idea.cpp +++ /dev/null @@ -1,192 +0,0 @@ -// idea.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "idea.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const int IDEA_KEYLEN=(6*IDEA::ROUNDS+4); // key schedule length in # of word16s - -#define low16(x) ((x)&0xffff) // compiler should be able to optimize this away if word is 16 bits -#define high16(x) ((x)>>16) - -CRYPTOPP_COMPILE_ASSERT(sizeof(IDEA::Word) >= 2); - -// should use an inline function but macros are still faster in MSVC 4.0 -#define DirectMUL(a,b) \ -{ \ - assert(b <= 0xffff); \ - \ - word32 p=(word32)low16(a)*b; \ - \ - if (p) \ - { \ - p = low16(p) - high16(p); \ - a = (IDEA::Word)p - (IDEA::Word)high16(p); \ - } \ - else \ - a = 1-a-b; \ -} - -#ifdef IDEA_LARGECACHE -volatile bool IDEA::Base::tablesBuilt = false; -word16 IDEA::Base::log[0x10000]; -word16 IDEA::Base::antilog[0x10000]; - -void IDEA::Base::BuildLogTables() -{ - if (tablesBuilt) - return; - else - { - tablesBuilt = true; - - IDEA::Word x=1; - word32 i; - - for (i=0; i<0x10000; i++) - { - antilog[i] = (word16)x; - DirectMUL(x, 3); - } - - for (i=0; i<0x10000; i++) - log[antilog[i]] = (word16)i; - } -} - -void IDEA::Base::LookupKeyLogs() -{ - IDEA::Word* Z=key; - int r=ROUNDS; - do - { - Z[0] = log[Z[0]]; - Z[3] = log[Z[3]]; - Z[4] = log[Z[4]]; - Z[5] = log[Z[5]]; - Z+=6; - } while (--r); - Z[0] = log[Z[0]]; - Z[3] = log[Z[3]]; -} - -inline void IDEA::Base::LookupMUL(IDEA::Word &a, IDEA::Word b) -{ - a = antilog[low16(log[low16(a)]+b)]; -} -#endif // IDEA_LARGECACHE - -void IDEA::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - -#ifdef IDEA_LARGECACHE - BuildLogTables(); -#endif - - EnKey(userKey); - - if (!IsForwardTransformation()) - DeKey(); - -#ifdef IDEA_LARGECACHE - LookupKeyLogs(); -#endif -} - -void IDEA::Base::EnKey (const byte *userKey) -{ - unsigned int i; - - for (i=0; i<8; i++) - m_key[i] = ((IDEA::Word)userKey[2*i]<<8) | userKey[2*i+1]; - - for (; i> 7)); - } -} - -static IDEA::Word MulInv(IDEA::Word x) -{ - IDEA::Word y=x; - for (unsigned i=0; i<15; i++) - { - DirectMUL(y,low16(y)); - DirectMUL(y,x); - } - return low16(y); -} - -static inline IDEA::Word AddInv(IDEA::Word x) -{ - return low16(0-x); -} - -void IDEA::Base::DeKey() -{ - FixedSizeSecBlock tempkey; - size_t i; - - for (i=0; i0)]); - tempkey[i*6+2] = AddInv(m_key[(ROUNDS-i)*6+2-(i>0)]); - tempkey[i*6+3] = MulInv(m_key[(ROUNDS-i)*6+3]); - tempkey[i*6+4] = m_key[(ROUNDS-1-i)*6+4]; - tempkey[i*6+5] = m_key[(ROUNDS-1-i)*6+5]; - } - - tempkey[i*6+0] = MulInv(m_key[(ROUNDS-i)*6+0]); - tempkey[i*6+1] = AddInv(m_key[(ROUNDS-i)*6+1]); - tempkey[i*6+2] = AddInv(m_key[(ROUNDS-i)*6+2]); - tempkey[i*6+3] = MulInv(m_key[(ROUNDS-i)*6+3]); - - m_key = tempkey; -} - -#ifdef IDEA_LARGECACHE -#define MUL(a,b) LookupMUL(a,b) -#else -#define MUL(a,b) DirectMUL(a,b) -#endif - -void IDEA::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - typedef BlockGetAndPut Block; - - const IDEA::Word *key = m_key; - IDEA::Word x0,x1,x2,x3,t0,t1; - Block::Get(inBlock)(x0)(x1)(x2)(x3); - - for (unsigned int i=0; i, public FixedKeyLength<16>, public FixedRounds<8> -{ - static const char *StaticAlgorithmName() {return "IDEA";} -}; - -/// IDEA -class IDEA : public IDEA_Info, public BlockCipherDocumentation -{ -public: // made public for internal purposes -#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - typedef word Word; -#else - typedef hword Word; -#endif - -private: - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - unsigned int OptimalDataAlignment() const {return 2;} - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - private: - void EnKey(const byte *); - void DeKey(); - FixedSizeSecBlock m_key; - - #ifdef IDEA_LARGECACHE - static inline void LookupMUL(word &a, word b); - void LookupKeyLogs(); - static void BuildLogTables(); - static volatile bool tablesBuilt; - static word16 log[0x10000], antilog[0x10000]; - #endif - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef IDEA::Encryption IDEAEncryption; -typedef IDEA::Decryption IDEADecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.cpp deleted file mode 100644 index f07cce87..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.cpp +++ /dev/null @@ -1,4235 +0,0 @@ -// integer.cpp - written and placed in the public domain by Wei Dai -// contains public domain code contributed by Alister Lee and Leonard Janke - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "integer.h" -#include "modarith.h" -#include "nbtheory.h" -#include "asn.h" -#include "oids.h" -#include "words.h" -#include "algparam.h" -#include "pubkey.h" // for P1363_KDF2 -#include "sha.h" -#include "cpu.h" - -#include - -#if _MSC_VER >= 1400 - #include -#endif - -#ifdef __DECCXX - #include -#endif - -#ifdef CRYPTOPP_MSVC6_NO_PP - #pragma message("You do not seem to have the Visual C++ Processor Pack installed, so use of SSE2 instructions will be disabled.") -#endif - -#define CRYPTOPP_INTEGER_SSE2 (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86) - -NAMESPACE_BEGIN(CryptoPP) - -bool AssignIntToInteger(const std::type_info &valueType, void *pInteger, const void *pInt) -{ - if (valueType != typeid(Integer)) - return false; - *reinterpret_cast(pInteger) = *reinterpret_cast(pInt); - return true; -} - -inline static int Compare(const word *A, const word *B, size_t N) -{ - while (N--) - if (A[N] > B[N]) - return 1; - else if (A[N] < B[N]) - return -1; - - return 0; -} - -inline static int Increment(word *A, size_t N, word B=1) -{ - assert(N); - word t = A[0]; - A[0] = t+B; - if (A[0] >= t) - return 0; - for (unsigned i=1; i>(WORD_BITS-1)); d##0 = 2*d##0 + (c>>(WORD_BITS-1)); c *= 2; - #endif - #ifndef Acc2WordsBy2 - #define Acc2WordsBy2(a, b) a##0 += b##0; a##1 += a##0 < b##0; a##1 += b##1; - #endif - #define AddWithCarry(u, a, b) {word t = a+b; u##0 = t + u##1; u##1 = (ta) + (u##0>t);} - #define GetCarry(u) u##1 - #define GetBorrow(u) u##1 -#else - #define Declare2Words(x) dword x; - #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) - #define MultiplyWords(p, a, b) p = __emulu(a, b); - #else - #define MultiplyWords(p, a, b) p = (dword)a*b; - #endif - #define AssignWord(a, b) a = b; - #define Add2WordsBy1(a, b, c) a = b + c; - #define Acc2WordsBy2(a, b) a += b; - #define LowWord(a) word(a) - #define HighWord(a) word(a>>WORD_BITS) - #define Double3Words(c, d) d = 2*d + (c>>(WORD_BITS-1)); c *= 2; - #define AddWithCarry(u, a, b) u = dword(a) + b + GetCarry(u); - #define SubtractWithBorrow(u, a, b) u = dword(a) - b - GetBorrow(u); - #define GetCarry(u) HighWord(u) - #define GetBorrow(u) word(u>>(WORD_BITS*2-1)) -#endif -#ifndef MulAcc - #define MulAcc(c, d, a, b) MultiplyWords(p, a, b); Acc2WordsBy1(p, c); c = LowWord(p); Acc2WordsBy1(d, HighWord(p)); -#endif -#ifndef Acc2WordsBy1 - #define Acc2WordsBy1(a, b) Add2WordsBy1(a, a, b) -#endif -#ifndef Acc3WordsBy2 - #define Acc3WordsBy2(c, d, e) Acc2WordsBy1(e, c); c = LowWord(e); Add2WordsBy1(e, d, HighWord(e)); -#endif - -class DWord -{ -public: - DWord() {} - -#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - explicit DWord(word low) - { - m_whole = low; - } -#else - explicit DWord(word low) - { - m_halfs.low = low; - m_halfs.high = 0; - } -#endif - - DWord(word low, word high) - { - m_halfs.low = low; - m_halfs.high = high; - } - - static DWord Multiply(word a, word b) - { - DWord r; - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - r.m_whole = (dword)a * b; - #elif defined(MultiplyWordsLoHi) - MultiplyWordsLoHi(r.m_halfs.low, r.m_halfs.high, a, b); - #endif - return r; - } - - static DWord MultiplyAndAdd(word a, word b, word c) - { - DWord r = Multiply(a, b); - return r += c; - } - - DWord & operator+=(word a) - { - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - m_whole = m_whole + a; - #else - m_halfs.low += a; - m_halfs.high += (m_halfs.low < a); - #endif - return *this; - } - - DWord operator+(word a) - { - DWord r; - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - r.m_whole = m_whole + a; - #else - r.m_halfs.low = m_halfs.low + a; - r.m_halfs.high = m_halfs.high + (r.m_halfs.low < a); - #endif - return r; - } - - DWord operator-(DWord a) - { - DWord r; - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - r.m_whole = m_whole - a.m_whole; - #else - r.m_halfs.low = m_halfs.low - a.m_halfs.low; - r.m_halfs.high = m_halfs.high - a.m_halfs.high - (r.m_halfs.low > m_halfs.low); - #endif - return r; - } - - DWord operator-(word a) - { - DWord r; - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - r.m_whole = m_whole - a; - #else - r.m_halfs.low = m_halfs.low - a; - r.m_halfs.high = m_halfs.high - (r.m_halfs.low > m_halfs.low); - #endif - return r; - } - - // returns quotient, which must fit in a word - word operator/(word divisor); - - word operator%(word a); - - bool operator!() const - { - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - return !m_whole; - #else - return !m_halfs.high && !m_halfs.low; - #endif - } - - word GetLowHalf() const {return m_halfs.low;} - word GetHighHalf() const {return m_halfs.high;} - word GetHighHalfAsBorrow() const {return 0-m_halfs.high;} - -private: - union - { - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - dword m_whole; - #endif - struct - { - #ifdef IS_LITTLE_ENDIAN - word low; - word high; - #else - word high; - word low; - #endif - } m_halfs; - }; -}; - -class Word -{ -public: - Word() {} - - Word(word value) - { - m_whole = value; - } - - Word(hword low, hword high) - { - m_whole = low | (word(high) << (WORD_BITS/2)); - } - - static Word Multiply(hword a, hword b) - { - Word r; - r.m_whole = (word)a * b; - return r; - } - - Word operator-(Word a) - { - Word r; - r.m_whole = m_whole - a.m_whole; - return r; - } - - Word operator-(hword a) - { - Word r; - r.m_whole = m_whole - a; - return r; - } - - // returns quotient, which must fit in a word - hword operator/(hword divisor) - { - return hword(m_whole / divisor); - } - - bool operator!() const - { - return !m_whole; - } - - word GetWhole() const {return m_whole;} - hword GetLowHalf() const {return hword(m_whole);} - hword GetHighHalf() const {return hword(m_whole>>(WORD_BITS/2));} - hword GetHighHalfAsBorrow() const {return 0-hword(m_whole>>(WORD_BITS/2));} - -private: - word m_whole; -}; - -// do a 3 word by 2 word divide, returns quotient and leaves remainder in A -template -S DivideThreeWordsByTwo(S *A, S B0, S B1, D *dummy=NULL) -{ - // assert {A[2],A[1]} < {B1,B0}, so quotient can fit in a S - assert(A[2] < B1 || (A[2]==B1 && A[1] < B0)); - - // estimate the quotient: do a 2 S by 1 S divide - S Q; - if (S(B1+1) == 0) - Q = A[2]; - else if (B1 > 0) - Q = D(A[1], A[2]) / S(B1+1); - else - Q = D(A[0], A[1]) / B0; - - // now subtract Q*B from A - D p = D::Multiply(B0, Q); - D u = (D) A[0] - p.GetLowHalf(); - A[0] = u.GetLowHalf(); - u = (D) A[1] - p.GetHighHalf() - u.GetHighHalfAsBorrow() - D::Multiply(B1, Q); - A[1] = u.GetLowHalf(); - A[2] += u.GetHighHalf(); - - // Q <= actual quotient, so fix it - while (A[2] || A[1] > B1 || (A[1]==B1 && A[0]>=B0)) - { - u = (D) A[0] - B0; - A[0] = u.GetLowHalf(); - u = (D) A[1] - B1 - u.GetHighHalfAsBorrow(); - A[1] = u.GetLowHalf(); - A[2] += u.GetHighHalf(); - Q++; - assert(Q); // shouldn't overflow - } - - return Q; -} - -// do a 4 word by 2 word divide, returns 2 word quotient in Q0 and Q1 -template -inline D DivideFourWordsByTwo(S *T, const D &Al, const D &Ah, const D &B) -{ - if (!B) // if divisor is 0, we assume divisor==2**(2*WORD_BITS) - return D(Ah.GetLowHalf(), Ah.GetHighHalf()); - else - { - S Q[2]; - T[0] = Al.GetLowHalf(); - T[1] = Al.GetHighHalf(); - T[2] = Ah.GetLowHalf(); - T[3] = Ah.GetHighHalf(); - Q[1] = DivideThreeWordsByTwo(T+1, B.GetLowHalf(), B.GetHighHalf()); - Q[0] = DivideThreeWordsByTwo(T, B.GetLowHalf(), B.GetHighHalf()); - return D(Q[0], Q[1]); - } -} - -// returns quotient, which must fit in a word -inline word DWord::operator/(word a) -{ - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - return word(m_whole / a); - #else - hword r[4]; - return DivideFourWordsByTwo(r, m_halfs.low, m_halfs.high, a).GetWhole(); - #endif -} - -inline word DWord::operator%(word a) -{ - #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - return word(m_whole % a); - #else - if (a < (word(1) << (WORD_BITS/2))) - { - hword h = hword(a); - word r = m_halfs.high % h; - r = ((m_halfs.low >> (WORD_BITS/2)) + (r << (WORD_BITS/2))) % h; - return hword((hword(m_halfs.low) + (r << (WORD_BITS/2))) % h); - } - else - { - hword r[4]; - DivideFourWordsByTwo(r, m_halfs.low, m_halfs.high, a); - return Word(r[0], r[1]).GetWhole(); - } - #endif -} - -// ******************************************************** - -// use some tricks to share assembly code between MSVC and GCC -#if defined(__GNUC__) - #define AddPrologue \ - int result; \ - __asm__ __volatile__ \ - ( \ - ".intel_syntax noprefix;" - #define AddEpilogue \ - ".att_syntax prefix;" \ - : "=a" (result)\ - : "d" (C), "a" (A), "D" (B), "c" (N) \ - : "%esi", "memory", "cc" \ - );\ - return result; - #define MulPrologue \ - __asm__ __volatile__ \ - ( \ - ".intel_syntax noprefix;" \ - AS1( push ebx) \ - AS2( mov ebx, edx) - #define MulEpilogue \ - AS1( pop ebx) \ - ".att_syntax prefix;" \ - : \ - : "d" (s_maskLow16), "c" (C), "a" (A), "D" (B) \ - : "%esi", "memory", "cc" \ - ); - #define SquPrologue MulPrologue - #define SquEpilogue \ - AS1( pop ebx) \ - ".att_syntax prefix;" \ - : \ - : "d" (s_maskLow16), "c" (C), "a" (A) \ - : "%esi", "%edi", "memory", "cc" \ - ); - #define TopPrologue MulPrologue - #define TopEpilogue \ - AS1( pop ebx) \ - ".att_syntax prefix;" \ - : \ - : "d" (s_maskLow16), "c" (C), "a" (A), "D" (B), "S" (L) \ - : "memory", "cc" \ - ); -#else - #define AddPrologue \ - __asm push edi \ - __asm push esi \ - __asm mov eax, [esp+12] \ - __asm mov edi, [esp+16] - #define AddEpilogue \ - __asm pop esi \ - __asm pop edi \ - __asm ret 8 -#if _MSC_VER < 1300 - #define SaveEBX __asm push ebx - #define RestoreEBX __asm pop ebx -#else - #define SaveEBX - #define RestoreEBX -#endif - #define SquPrologue \ - AS2( mov eax, A) \ - AS2( mov ecx, C) \ - SaveEBX \ - AS2( lea ebx, s_maskLow16) - #define MulPrologue \ - AS2( mov eax, A) \ - AS2( mov edi, B) \ - AS2( mov ecx, C) \ - SaveEBX \ - AS2( lea ebx, s_maskLow16) - #define TopPrologue \ - AS2( mov eax, A) \ - AS2( mov edi, B) \ - AS2( mov ecx, C) \ - AS2( mov esi, L) \ - SaveEBX \ - AS2( lea ebx, s_maskLow16) - #define SquEpilogue RestoreEBX - #define MulEpilogue RestoreEBX - #define TopEpilogue RestoreEBX -#endif - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -int Baseline_Add(size_t N, word *C, const word *A, const word *B); -int Baseline_Sub(size_t N, word *C, const word *A, const word *B); -} -#elif defined(CRYPTOPP_X64_ASM_AVAILABLE) && defined(__GNUC__) && defined(CRYPTOPP_WORD128_AVAILABLE) -int Baseline_Add(size_t N, word *C, const word *A, const word *B) -{ - word result; - __asm__ __volatile__ - ( - ".intel_syntax;" - AS1( neg %1) - ASJ( jz, 1, f) - AS2( mov %0,[%3+8*%1]) - AS2( add %0,[%4+8*%1]) - AS2( mov [%2+8*%1],%0) - ASL(0) - AS2( mov %0,[%3+8*%1+8]) - AS2( adc %0,[%4+8*%1+8]) - AS2( mov [%2+8*%1+8],%0) - AS2( lea %1,[%1+2]) - ASJ( jrcxz, 1, f) - AS2( mov %0,[%3+8*%1]) - AS2( adc %0,[%4+8*%1]) - AS2( mov [%2+8*%1],%0) - ASJ( jmp, 0, b) - ASL(1) - AS2( mov %0, 0) - AS2( adc %0, %0) - ".att_syntax;" - : "=&r" (result), "+c" (N) - : "r" (C+N), "r" (A+N), "r" (B+N) - : "memory", "cc" - ); - return (int)result; -} - -int Baseline_Sub(size_t N, word *C, const word *A, const word *B) -{ - word result; - __asm__ __volatile__ - ( - ".intel_syntax;" - AS1( neg %1) - ASJ( jz, 1, f) - AS2( mov %0,[%3+8*%1]) - AS2( sub %0,[%4+8*%1]) - AS2( mov [%2+8*%1],%0) - ASL(0) - AS2( mov %0,[%3+8*%1+8]) - AS2( sbb %0,[%4+8*%1+8]) - AS2( mov [%2+8*%1+8],%0) - AS2( lea %1,[%1+2]) - ASJ( jrcxz, 1, f) - AS2( mov %0,[%3+8*%1]) - AS2( sbb %0,[%4+8*%1]) - AS2( mov [%2+8*%1],%0) - ASJ( jmp, 0, b) - ASL(1) - AS2( mov %0, 0) - AS2( adc %0, %0) - ".att_syntax;" - : "=&r" (result), "+c" (N) - : "r" (C+N), "r" (A+N), "r" (B+N) - : "memory", "cc" - ); - return (int)result; -} -#elif defined(CRYPTOPP_X86_ASM_AVAILABLE) && CRYPTOPP_BOOL_X86 -CRYPTOPP_NAKED int CRYPTOPP_FASTCALL Baseline_Add(size_t N, word *C, const word *A, const word *B) -{ - AddPrologue - - // now: eax = A, edi = B, edx = C, ecx = N - AS2( lea eax, [eax+4*ecx]) - AS2( lea edi, [edi+4*ecx]) - AS2( lea edx, [edx+4*ecx]) - - AS1( neg ecx) // ecx is negative index - AS2( test ecx, 2) // this clears carry flag - ASJ( jz, 0, f) - AS2( sub ecx, 2) - ASJ( jmp, 1, f) - - ASL(0) - ASJ( jecxz, 2, f) // loop until ecx overflows and becomes zero - AS2( mov esi,[eax+4*ecx]) - AS2( adc esi,[edi+4*ecx]) - AS2( mov [edx+4*ecx],esi) - AS2( mov esi,[eax+4*ecx+4]) - AS2( adc esi,[edi+4*ecx+4]) - AS2( mov [edx+4*ecx+4],esi) - ASL(1) - AS2( mov esi,[eax+4*ecx+8]) - AS2( adc esi,[edi+4*ecx+8]) - AS2( mov [edx+4*ecx+8],esi) - AS2( mov esi,[eax+4*ecx+12]) - AS2( adc esi,[edi+4*ecx+12]) - AS2( mov [edx+4*ecx+12],esi) - - AS2( lea ecx,[ecx+4]) // advance index, avoid inc which causes slowdown on Intel Core 2 - ASJ( jmp, 0, b) - - ASL(2) - AS2( mov eax, 0) - AS1( setc al) // store carry into eax (return result register) - - AddEpilogue -} - -CRYPTOPP_NAKED int CRYPTOPP_FASTCALL Baseline_Sub(size_t N, word *C, const word *A, const word *B) -{ - AddPrologue - - // now: eax = A, edi = B, edx = C, ecx = N - AS2( lea eax, [eax+4*ecx]) - AS2( lea edi, [edi+4*ecx]) - AS2( lea edx, [edx+4*ecx]) - - AS1( neg ecx) // ecx is negative index - AS2( test ecx, 2) // this clears carry flag - ASJ( jz, 0, f) - AS2( sub ecx, 2) - ASJ( jmp, 1, f) - - ASL(0) - ASJ( jecxz, 2, f) // loop until ecx overflows and becomes zero - AS2( mov esi,[eax+4*ecx]) - AS2( sbb esi,[edi+4*ecx]) - AS2( mov [edx+4*ecx],esi) - AS2( mov esi,[eax+4*ecx+4]) - AS2( sbb esi,[edi+4*ecx+4]) - AS2( mov [edx+4*ecx+4],esi) - ASL(1) - AS2( mov esi,[eax+4*ecx+8]) - AS2( sbb esi,[edi+4*ecx+8]) - AS2( mov [edx+4*ecx+8],esi) - AS2( mov esi,[eax+4*ecx+12]) - AS2( sbb esi,[edi+4*ecx+12]) - AS2( mov [edx+4*ecx+12],esi) - - AS2( lea ecx,[ecx+4]) // advance index, avoid inc which causes slowdown on Intel Core 2 - ASJ( jmp, 0, b) - - ASL(2) - AS2( mov eax, 0) - AS1( setc al) // store carry into eax (return result register) - - AddEpilogue -} - -#if CRYPTOPP_INTEGER_SSE2 -CRYPTOPP_NAKED int CRYPTOPP_FASTCALL SSE2_Add(size_t N, word *C, const word *A, const word *B) -{ - AddPrologue - - // now: eax = A, edi = B, edx = C, ecx = N - AS2( lea eax, [eax+4*ecx]) - AS2( lea edi, [edi+4*ecx]) - AS2( lea edx, [edx+4*ecx]) - - AS1( neg ecx) // ecx is negative index - AS2( pxor mm2, mm2) - ASJ( jz, 2, f) - AS2( test ecx, 2) // this clears carry flag - ASJ( jz, 0, f) - AS2( sub ecx, 2) - ASJ( jmp, 1, f) - - ASL(0) - AS2( movd mm0, DWORD PTR [eax+4*ecx]) - AS2( movd mm1, DWORD PTR [edi+4*ecx]) - AS2( paddq mm0, mm1) - AS2( paddq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx], mm2) - AS2( psrlq mm2, 32) - - AS2( movd mm0, DWORD PTR [eax+4*ecx+4]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+4]) - AS2( paddq mm0, mm1) - AS2( paddq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx+4], mm2) - AS2( psrlq mm2, 32) - - ASL(1) - AS2( movd mm0, DWORD PTR [eax+4*ecx+8]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+8]) - AS2( paddq mm0, mm1) - AS2( paddq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx+8], mm2) - AS2( psrlq mm2, 32) - - AS2( movd mm0, DWORD PTR [eax+4*ecx+12]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+12]) - AS2( paddq mm0, mm1) - AS2( paddq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx+12], mm2) - AS2( psrlq mm2, 32) - - AS2( add ecx, 4) - ASJ( jnz, 0, b) - - ASL(2) - AS2( movd eax, mm2) - AS1( emms) - - AddEpilogue -} -CRYPTOPP_NAKED int CRYPTOPP_FASTCALL SSE2_Sub(size_t N, word *C, const word *A, const word *B) -{ - AddPrologue - - // now: eax = A, edi = B, edx = C, ecx = N - AS2( lea eax, [eax+4*ecx]) - AS2( lea edi, [edi+4*ecx]) - AS2( lea edx, [edx+4*ecx]) - - AS1( neg ecx) // ecx is negative index - AS2( pxor mm2, mm2) - ASJ( jz, 2, f) - AS2( test ecx, 2) // this clears carry flag - ASJ( jz, 0, f) - AS2( sub ecx, 2) - ASJ( jmp, 1, f) - - ASL(0) - AS2( movd mm0, DWORD PTR [eax+4*ecx]) - AS2( movd mm1, DWORD PTR [edi+4*ecx]) - AS2( psubq mm0, mm1) - AS2( psubq mm0, mm2) - AS2( movd DWORD PTR [edx+4*ecx], mm0) - AS2( psrlq mm0, 63) - - AS2( movd mm2, DWORD PTR [eax+4*ecx+4]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+4]) - AS2( psubq mm2, mm1) - AS2( psubq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx+4], mm2) - AS2( psrlq mm2, 63) - - ASL(1) - AS2( movd mm0, DWORD PTR [eax+4*ecx+8]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+8]) - AS2( psubq mm0, mm1) - AS2( psubq mm0, mm2) - AS2( movd DWORD PTR [edx+4*ecx+8], mm0) - AS2( psrlq mm0, 63) - - AS2( movd mm2, DWORD PTR [eax+4*ecx+12]) - AS2( movd mm1, DWORD PTR [edi+4*ecx+12]) - AS2( psubq mm2, mm1) - AS2( psubq mm2, mm0) - AS2( movd DWORD PTR [edx+4*ecx+12], mm2) - AS2( psrlq mm2, 63) - - AS2( add ecx, 4) - ASJ( jnz, 0, b) - - ASL(2) - AS2( movd eax, mm2) - AS1( emms) - - AddEpilogue -} -#endif // #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#else -int CRYPTOPP_FASTCALL Baseline_Add(size_t N, word *C, const word *A, const word *B) -{ - assert (N%2 == 0); - - Declare2Words(u); - AssignWord(u, 0); - for (size_t i=0; i=2 && N%2==0); - - if (N <= s_recursionLimit) - s_pMul[N/4](R, A, B); - else - { - const size_t N2 = N/2; - - size_t AN2 = Compare(A0, A1, N2) > 0 ? 0 : N2; - Subtract(R0, A + AN2, A + (N2 ^ AN2), N2); - - size_t BN2 = Compare(B0, B1, N2) > 0 ? 0 : N2; - Subtract(R1, B + BN2, B + (N2 ^ BN2), N2); - - RecursiveMultiply(R2, T2, A1, B1, N2); - RecursiveMultiply(T0, T2, R0, R1, N2); - RecursiveMultiply(R0, T2, A0, B0, N2); - - // now T[01] holds (A1-A0)*(B0-B1), R[01] holds A0*B0, R[23] holds A1*B1 - - int c2 = Add(R2, R2, R1, N2); - int c3 = c2; - c2 += Add(R1, R2, R0, N2); - c3 += Add(R2, R2, R3, N2); - - if (AN2 == BN2) - c3 -= Subtract(R1, R1, T0, N); - else - c3 += Add(R1, R1, T0, N); - - c3 += Increment(R2, N2, c2); - assert (c3 >= 0 && c3 <= 2); - Increment(R3, N2, c3); - } -} - -// R[2*N] - result = A*A -// T[2*N] - temporary work space -// A[N] --- number to be squared - -void RecursiveSquare(word *R, word *T, const word *A, size_t N) -{ - assert(N && N%2==0); - - if (N <= s_recursionLimit) - s_pSqu[N/4](R, A); - else - { - const size_t N2 = N/2; - - RecursiveSquare(R0, T2, A0, N2); - RecursiveSquare(R2, T2, A1, N2); - RecursiveMultiply(T0, T2, A0, A1, N2); - - int carry = Add(R1, R1, T0, N); - carry += Add(R1, R1, T0, N); - Increment(R3, N2, carry); - } -} - -// R[N] - bottom half of A*B -// T[3*N/2] - temporary work space -// A[N] - multiplier -// B[N] - multiplicant - -void RecursiveMultiplyBottom(word *R, word *T, const word *A, const word *B, size_t N) -{ - assert(N>=2 && N%2==0); - - if (N <= s_recursionLimit) - s_pBot[N/4](R, A, B); - else - { - const size_t N2 = N/2; - - RecursiveMultiply(R, T, A0, B0, N2); - RecursiveMultiplyBottom(T0, T1, A1, B0, N2); - Add(R1, R1, T0, N2); - RecursiveMultiplyBottom(T0, T1, A0, B1, N2); - Add(R1, R1, T0, N2); - } -} - -// R[N] --- upper half of A*B -// T[2*N] - temporary work space -// L[N] --- lower half of A*B -// A[N] --- multiplier -// B[N] --- multiplicant - -void MultiplyTop(word *R, word *T, const word *L, const word *A, const word *B, size_t N) -{ - assert(N>=2 && N%2==0); - - if (N <= s_recursionLimit) - s_pTop[N/4](R, A, B, L[N-1]); - else - { - const size_t N2 = N/2; - - size_t AN2 = Compare(A0, A1, N2) > 0 ? 0 : N2; - Subtract(R0, A + AN2, A + (N2 ^ AN2), N2); - - size_t BN2 = Compare(B0, B1, N2) > 0 ? 0 : N2; - Subtract(R1, B + BN2, B + (N2 ^ BN2), N2); - - RecursiveMultiply(T0, T2, R0, R1, N2); - RecursiveMultiply(R0, T2, A1, B1, N2); - - // now T[01] holds (A1-A0)*(B0-B1) = A1*B0+A0*B1-A1*B1-A0*B0, R[01] holds A1*B1 - - int t, c3; - int c2 = Subtract(T2, L+N2, L, N2); - - if (AN2 == BN2) - { - c2 -= Add(T2, T2, T0, N2); - t = (Compare(T2, R0, N2) == -1); - c3 = t - Subtract(T2, T2, T1, N2); - } - else - { - c2 += Subtract(T2, T2, T0, N2); - t = (Compare(T2, R0, N2) == -1); - c3 = t + Add(T2, T2, T1, N2); - } - - c2 += t; - if (c2 >= 0) - c3 += Increment(T2, N2, c2); - else - c3 -= Decrement(T2, N2, -c2); - c3 += Add(R0, T2, R1, N2); - - assert (c3 >= 0 && c3 <= 2); - Increment(R1, N2, c3); - } -} - -inline void Multiply(word *R, word *T, const word *A, const word *B, size_t N) -{ - RecursiveMultiply(R, T, A, B, N); -} - -inline void Square(word *R, word *T, const word *A, size_t N) -{ - RecursiveSquare(R, T, A, N); -} - -inline void MultiplyBottom(word *R, word *T, const word *A, const word *B, size_t N) -{ - RecursiveMultiplyBottom(R, T, A, B, N); -} - -// R[NA+NB] - result = A*B -// T[NA+NB] - temporary work space -// A[NA] ---- multiplier -// B[NB] ---- multiplicant - -void AsymmetricMultiply(word *R, word *T, const word *A, size_t NA, const word *B, size_t NB) -{ - if (NA == NB) - { - if (A == B) - Square(R, T, A, NA); - else - Multiply(R, T, A, B, NA); - - return; - } - - if (NA > NB) - { - std::swap(A, B); - std::swap(NA, NB); - } - - assert(NB % NA == 0); - - if (NA==2 && !A[1]) - { - switch (A[0]) - { - case 0: - SetWords(R, 0, NB+2); - return; - case 1: - CopyWords(R, B, NB); - R[NB] = R[NB+1] = 0; - return; - default: - R[NB] = LinearMultiply(R, B, A[0], NB); - R[NB+1] = 0; - return; - } - } - - size_t i; - if ((NB/NA)%2 == 0) - { - Multiply(R, T, A, B, NA); - CopyWords(T+2*NA, R+NA, NA); - - for (i=2*NA; i=4); - -#define M0 M -#define M1 (M+N2) -#define V0 V -#define V1 (V+N2) - -#define X0 X -#define X1 (X+N2) -#define X2 (X+N) -#define X3 (X+N+N2) - - const size_t N2 = N/2; - Multiply(T0, T2, V0, X3, N2); - int c2 = Add(T0, T0, X0, N); - MultiplyBottom(T3, T2, T0, U, N2); - MultiplyTop(T2, R, T0, T3, M0, N2); - c2 -= Subtract(T2, T1, T2, N2); - Multiply(T0, R, T3, M1, N2); - c2 -= Subtract(T0, T2, T0, N2); - int c3 = -(int)Subtract(T1, X2, T1, N2); - Multiply(R0, T2, V1, X3, N2); - c3 += Add(R, R, T, N); - - if (c2>0) - c3 += Increment(R1, N2); - else if (c2<0) - c3 -= Decrement(R1, N2, -c2); - - assert(c3>=-1 && c3<=1); - if (c3>0) - Subtract(R, R, M, N); - else if (c3<0) - Add(R, R, M, N); - -#undef M0 -#undef M1 -#undef V0 -#undef V1 - -#undef X0 -#undef X1 -#undef X2 -#undef X3 -} - -#undef A0 -#undef A1 -#undef B0 -#undef B1 - -#undef T0 -#undef T1 -#undef T2 -#undef T3 - -#undef R0 -#undef R1 -#undef R2 -#undef R3 - -/* -// do a 3 word by 2 word divide, returns quotient and leaves remainder in A -static word SubatomicDivide(word *A, word B0, word B1) -{ - // assert {A[2],A[1]} < {B1,B0}, so quotient can fit in a word - assert(A[2] < B1 || (A[2]==B1 && A[1] < B0)); - - // estimate the quotient: do a 2 word by 1 word divide - word Q; - if (B1+1 == 0) - Q = A[2]; - else - Q = DWord(A[1], A[2]).DividedBy(B1+1); - - // now subtract Q*B from A - DWord p = DWord::Multiply(B0, Q); - DWord u = (DWord) A[0] - p.GetLowHalf(); - A[0] = u.GetLowHalf(); - u = (DWord) A[1] - p.GetHighHalf() - u.GetHighHalfAsBorrow() - DWord::Multiply(B1, Q); - A[1] = u.GetLowHalf(); - A[2] += u.GetHighHalf(); - - // Q <= actual quotient, so fix it - while (A[2] || A[1] > B1 || (A[1]==B1 && A[0]>=B0)) - { - u = (DWord) A[0] - B0; - A[0] = u.GetLowHalf(); - u = (DWord) A[1] - B1 - u.GetHighHalfAsBorrow(); - A[1] = u.GetLowHalf(); - A[2] += u.GetHighHalf(); - Q++; - assert(Q); // shouldn't overflow - } - - return Q; -} - -// do a 4 word by 2 word divide, returns 2 word quotient in Q0 and Q1 -static inline void AtomicDivide(word *Q, const word *A, const word *B) -{ - if (!B[0] && !B[1]) // if divisor is 0, we assume divisor==2**(2*WORD_BITS) - { - Q[0] = A[2]; - Q[1] = A[3]; - } - else - { - word T[4]; - T[0] = A[0]; T[1] = A[1]; T[2] = A[2]; T[3] = A[3]; - Q[1] = SubatomicDivide(T+1, B[0], B[1]); - Q[0] = SubatomicDivide(T, B[0], B[1]); - -#ifndef NDEBUG - // multiply quotient and divisor and add remainder, make sure it equals dividend - assert(!T[2] && !T[3] && (T[1] < B[1] || (T[1]==B[1] && T[0](T, DWord(A[0], A[1]), DWord(A[2], A[3]), DWord(B[0], B[1])); - Q[0] = q.GetLowHalf(); - Q[1] = q.GetHighHalf(); - -#ifndef NDEBUG - if (B[0] || B[1]) - { - // multiply quotient and divisor and add remainder, make sure it equals dividend - assert(!T[2] && !T[3] && (T[1] < B[1] || (T[1]==B[1] && T[0]= 0) - { - R[N] -= Subtract(R, R, B, N); - Q[1] += (++Q[0]==0); - assert(Q[0] || Q[1]); // no overflow - } -} - -// R[NB] -------- remainder = A%B -// Q[NA-NB+2] --- quotient = A/B -// T[NA+3*(NB+2)] - temp work space -// A[NA] -------- dividend -// B[NB] -------- divisor - -void Divide(word *R, word *Q, word *T, const word *A, size_t NA, const word *B, size_t NB) -{ - assert(NA && NB && NA%2==0 && NB%2==0); - assert(B[NB-1] || B[NB-2]); - assert(NB <= NA); - - // set up temporary work space - word *const TA=T; - word *const TB=T+NA+2; - word *const TP=T+NA+2+NB; - - // copy B into TB and normalize it so that TB has highest bit set to 1 - unsigned shiftWords = (B[NB-1]==0); - TB[0] = TB[NB-1] = 0; - CopyWords(TB+shiftWords, B, NB-shiftWords); - unsigned shiftBits = WORD_BITS - BitPrecision(TB[NB-1]); - assert(shiftBits < WORD_BITS); - ShiftWordsLeftByBits(TB, NB, shiftBits); - - // copy A into TA and normalize it - TA[0] = TA[NA] = TA[NA+1] = 0; - CopyWords(TA+shiftWords, A, NA); - ShiftWordsLeftByBits(TA, NA+2, shiftBits); - - if (TA[NA+1]==0 && TA[NA] <= 1) - { - Q[NA-NB+1] = Q[NA-NB] = 0; - while (TA[NA] || Compare(TA+NA-NB, TB, NB) >= 0) - { - TA[NA] -= Subtract(TA+NA-NB, TA+NA-NB, TB, NB); - ++Q[NA-NB]; - } - } - else - { - NA+=2; - assert(Compare(TA+NA-NB, TB, NB) < 0); - } - - word BT[2]; - BT[0] = TB[NB-2] + 1; - BT[1] = TB[NB-1] + (BT[0]==0); - - // start reducing TA mod TB, 2 words at a time - for (size_t i=NA-2; i>=NB; i-=2) - { - AtomicDivide(Q+i-NB, TA+i-2, BT); - CorrectQuotientEstimate(TA+i-NB, TP, Q+i-NB, TB, NB); - } - - // copy TA into R, and denormalize it - CopyWords(R, TA+shiftWords, NB); - ShiftWordsRightByBits(R, NB, shiftBits); -} - -static inline size_t EvenWordCount(const word *X, size_t N) -{ - while (N && X[N-2]==0 && X[N-1]==0) - N-=2; - return N; -} - -// return k -// R[N] --- result = A^(-1) * 2^k mod M -// T[4*N] - temporary work space -// A[NA] -- number to take inverse of -// M[N] --- modulus - -unsigned int AlmostInverse(word *R, word *T, const word *A, size_t NA, const word *M, size_t N) -{ - assert(NA<=N && N && N%2==0); - - word *b = T; - word *c = T+N; - word *f = T+2*N; - word *g = T+3*N; - size_t bcLen=2, fgLen=EvenWordCount(M, N); - unsigned int k=0; - bool s=false; - - SetWords(T, 0, 3*N); - b[0]=1; - CopyWords(f, A, NA); - CopyWords(g, M, N); - - while (1) - { - word t=f[0]; - while (!t) - { - if (EvenWordCount(f, fgLen)==0) - { - SetWords(R, 0, N); - return 0; - } - - ShiftWordsRightByWords(f, fgLen, 1); - bcLen += 2 * (c[bcLen-1] != 0); - assert(bcLen <= N); - ShiftWordsLeftByWords(c, bcLen, 1); - k+=WORD_BITS; - t=f[0]; - } - - unsigned int i = TrailingZeros(t); - t >>= i; - k += i; - - if (t==1 && f[1]==0 && EvenWordCount(f+2, fgLen-2)==0) - { - if (s) - Subtract(R, M, b, N); - else - CopyWords(R, b, N); - return k; - } - - ShiftWordsRightByBits(f, fgLen, i); - t = ShiftWordsLeftByBits(c, bcLen, i); - c[bcLen] += t; - bcLen += 2 * (t!=0); - assert(bcLen <= N); - - bool swap = Compare(f, g, fgLen)==-1; - ConditionalSwapPointers(swap, f, g); - ConditionalSwapPointers(swap, b, c); - s ^= swap; - - fgLen -= 2 * !(f[fgLen-2] | f[fgLen-1]); - - Subtract(f, f, g, fgLen); - t = Add(b, b, c, bcLen); - b[bcLen] += t; - bcLen += 2*t; - assert(bcLen <= N); - } -} - -// R[N] - result = A/(2^k) mod M -// A[N] - input -// M[N] - modulus - -void DivideByPower2Mod(word *R, const word *A, size_t k, const word *M, size_t N) -{ - CopyWords(R, A, N); - - while (k--) - { - if (R[0]%2==0) - ShiftWordsRightByBits(R, N, 1); - else - { - word carry = Add(R, R, M, N); - ShiftWordsRightByBits(R, N, 1); - R[N-1] += carry<<(WORD_BITS-1); - } - } -} - -// R[N] - result = A*(2^k) mod M -// A[N] - input -// M[N] - modulus - -void MultiplyByPower2Mod(word *R, const word *A, size_t k, const word *M, size_t N) -{ - CopyWords(R, A, N); - - while (k--) - if (ShiftWordsLeftByBits(R, N, 1) || Compare(R, M, N)>=0) - Subtract(R, R, M, N); -} - -// ****************************************************************** - -InitializeInteger::InitializeInteger() -{ - if (!g_pAssignIntToInteger) - { - SetFunctionPointers(); - g_pAssignIntToInteger = AssignIntToInteger; - } -} - -static const unsigned int RoundupSizeTable[] = {2, 2, 2, 4, 4, 8, 8, 8, 8}; - -static inline size_t RoundupSize(size_t n) -{ - if (n<=8) - return RoundupSizeTable[n]; - else if (n<=16) - return 16; - else if (n<=32) - return 32; - else if (n<=64) - return 64; - else return size_t(1) << BitPrecision(n-1); -} - -Integer::Integer() - : reg(2), sign(POSITIVE) -{ - reg[0] = reg[1] = 0; -} - -Integer::Integer(const Integer& t) - : reg(RoundupSize(t.WordCount())), sign(t.sign) -{ - CopyWords(reg, t.reg, reg.size()); -} - -Integer::Integer(Sign s, lword value) - : reg(2), sign(s) -{ - reg[0] = word(value); - reg[1] = word(SafeRightShift(value)); -} - -Integer::Integer(signed long value) - : reg(2) -{ - if (value >= 0) - sign = POSITIVE; - else - { - sign = NEGATIVE; - value = -value; - } - reg[0] = word(value); - reg[1] = word(SafeRightShift((unsigned long)value)); -} - -Integer::Integer(Sign s, word high, word low) - : reg(2), sign(s) -{ - reg[0] = low; - reg[1] = high; -} - -bool Integer::IsConvertableToLong() const -{ - if (ByteCount() > sizeof(long)) - return false; - - unsigned long value = (unsigned long)reg[0]; - value += SafeLeftShift((unsigned long)reg[1]); - - if (sign==POSITIVE) - return (signed long)value >= 0; - else - return -(signed long)value < 0; -} - -signed long Integer::ConvertToLong() const -{ - assert(IsConvertableToLong()); - - unsigned long value = (unsigned long)reg[0]; - value += SafeLeftShift((unsigned long)reg[1]); - return sign==POSITIVE ? value : -(signed long)value; -} - -Integer::Integer(BufferedTransformation &encodedInteger, size_t byteCount, Signedness s) -{ - Decode(encodedInteger, byteCount, s); -} - -Integer::Integer(const byte *encodedInteger, size_t byteCount, Signedness s) -{ - Decode(encodedInteger, byteCount, s); -} - -Integer::Integer(BufferedTransformation &bt) -{ - BERDecode(bt); -} - -Integer::Integer(RandomNumberGenerator &rng, size_t bitcount) -{ - Randomize(rng, bitcount); -} - -Integer::Integer(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv, const Integer &mod) -{ - if (!Randomize(rng, min, max, rnType, equiv, mod)) - throw Integer::RandomNumberNotFound(); -} - -Integer Integer::Power2(size_t e) -{ - Integer r((word)0, BitsToWords(e+1)); - r.SetBit(e); - return r; -} - -template -struct NewInteger -{ - Integer * operator()() const - { - return new Integer(i); - } -}; - -const Integer &Integer::Zero() -{ - return Singleton().Ref(); -} - -const Integer &Integer::One() -{ - return Singleton >().Ref(); -} - -const Integer &Integer::Two() -{ - return Singleton >().Ref(); -} - -bool Integer::operator!() const -{ - return IsNegative() ? false : (reg[0]==0 && WordCount()==0); -} - -Integer& Integer::operator=(const Integer& t) -{ - if (this != &t) - { - if (reg.size() != t.reg.size() || t.reg[t.reg.size()/2] == 0) - reg.New(RoundupSize(t.WordCount())); - CopyWords(reg, t.reg, reg.size()); - sign = t.sign; - } - return *this; -} - -bool Integer::GetBit(size_t n) const -{ - if (n/WORD_BITS >= reg.size()) - return 0; - else - return bool((reg[n/WORD_BITS] >> (n % WORD_BITS)) & 1); -} - -void Integer::SetBit(size_t n, bool value) -{ - if (value) - { - reg.CleanGrow(RoundupSize(BitsToWords(n+1))); - reg[n/WORD_BITS] |= (word(1) << (n%WORD_BITS)); - } - else - { - if (n/WORD_BITS < reg.size()) - reg[n/WORD_BITS] &= ~(word(1) << (n%WORD_BITS)); - } -} - -byte Integer::GetByte(size_t n) const -{ - if (n/WORD_SIZE >= reg.size()) - return 0; - else - return byte(reg[n/WORD_SIZE] >> ((n%WORD_SIZE)*8)); -} - -void Integer::SetByte(size_t n, byte value) -{ - reg.CleanGrow(RoundupSize(BytesToWords(n+1))); - reg[n/WORD_SIZE] &= ~(word(0xff) << 8*(n%WORD_SIZE)); - reg[n/WORD_SIZE] |= (word(value) << 8*(n%WORD_SIZE)); -} - -lword Integer::GetBits(size_t i, size_t n) const -{ - lword v = 0; - assert(n <= sizeof(v)*8); - for (unsigned int j=0; j -static Integer StringToInteger(const T *str) -{ - int radix; - // GCC workaround - // std::char_traits::length() not defined in GCC 3.2 and STLport 4.5.3 - unsigned int length; - for (length = 0; str[length] != 0; length++) {} - - Integer v; - - if (length == 0) - return v; - - switch (str[length-1]) - { - case 'h': - case 'H': - radix=16; - break; - case 'o': - case 'O': - radix=8; - break; - case 'b': - case 'B': - radix=2; - break; - default: - radix=10; - } - - if (length > 2 && str[0] == '0' && str[1] == 'x') - radix = 16; - - for (unsigned i=0; i= '0' && str[i] <= '9') - digit = str[i] - '0'; - else if (str[i] >= 'A' && str[i] <= 'F') - digit = str[i] - 'A' + 10; - else if (str[i] >= 'a' && str[i] <= 'f') - digit = str[i] - 'a' + 10; - else - digit = radix; - - if (digit < radix) - { - v *= radix; - v += digit; - } - } - - if (str[0] == '-') - v.Negate(); - - return v; -} - -Integer::Integer(const char *str) - : reg(2), sign(POSITIVE) -{ - *this = StringToInteger(str); -} - -Integer::Integer(const wchar_t *str) - : reg(2), sign(POSITIVE) -{ - *this = StringToInteger(str); -} - -unsigned int Integer::WordCount() const -{ - return (unsigned int)CountWords(reg, reg.size()); -} - -unsigned int Integer::ByteCount() const -{ - unsigned wordCount = WordCount(); - if (wordCount) - return (wordCount-1)*WORD_SIZE + BytePrecision(reg[wordCount-1]); - else - return 0; -} - -unsigned int Integer::BitCount() const -{ - unsigned wordCount = WordCount(); - if (wordCount) - return (wordCount-1)*WORD_BITS + BitPrecision(reg[wordCount-1]); - else - return 0; -} - -void Integer::Decode(const byte *input, size_t inputLen, Signedness s) -{ - StringStore store(input, inputLen); - Decode(store, inputLen, s); -} - -void Integer::Decode(BufferedTransformation &bt, size_t inputLen, Signedness s) -{ - assert(bt.MaxRetrievable() >= inputLen); - - byte b; - bt.Peek(b); - sign = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE; - - while (inputLen>0 && (sign==POSITIVE ? b==0 : b==0xff)) - { - bt.Skip(1); - inputLen--; - bt.Peek(b); - } - - reg.CleanNew(RoundupSize(BytesToWords(inputLen))); - - for (size_t i=inputLen; i > 0; i--) - { - bt.Get(b); - reg[(i-1)/WORD_SIZE] |= word(b) << ((i-1)%WORD_SIZE)*8; - } - - if (sign == NEGATIVE) - { - for (size_t i=inputLen; i 0; i--) - bt.Put(GetByte(i-1)); - } - else - { - // take two's complement of *this - Integer temp = Integer::Power2(8*STDMAX((size_t)ByteCount(), outputLen)) + *this; - temp.Encode(bt, outputLen, UNSIGNED); - } -} - -void Integer::DEREncode(BufferedTransformation &bt) const -{ - DERGeneralEncoder enc(bt, INTEGER); - Encode(enc, MinEncodedSize(SIGNED), SIGNED); - enc.MessageEnd(); -} - -void Integer::BERDecode(const byte *input, size_t len) -{ - StringStore store(input, len); - BERDecode(store); -} - -void Integer::BERDecode(BufferedTransformation &bt) -{ - BERGeneralDecoder dec(bt, INTEGER); - if (!dec.IsDefiniteLength() || dec.MaxRetrievable() < dec.RemainingLength()) - BERDecodeError(); - Decode(dec, (size_t)dec.RemainingLength(), SIGNED); - dec.MessageEnd(); -} - -void Integer::DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const -{ - DERGeneralEncoder enc(bt, OCTET_STRING); - Encode(enc, length); - enc.MessageEnd(); -} - -void Integer::BERDecodeAsOctetString(BufferedTransformation &bt, size_t length) -{ - BERGeneralDecoder dec(bt, OCTET_STRING); - if (!dec.IsDefiniteLength() || dec.RemainingLength() != length) - BERDecodeError(); - Decode(dec, length); - dec.MessageEnd(); -} - -size_t Integer::OpenPGPEncode(byte *output, size_t len) const -{ - ArraySink sink(output, len); - return OpenPGPEncode(sink); -} - -size_t Integer::OpenPGPEncode(BufferedTransformation &bt) const -{ - word16 bitCount = BitCount(); - bt.PutWord16(bitCount); - size_t byteCount = BitsToBytes(bitCount); - Encode(bt, byteCount); - return 2 + byteCount; -} - -void Integer::OpenPGPDecode(const byte *input, size_t len) -{ - StringStore store(input, len); - OpenPGPDecode(store); -} - -void Integer::OpenPGPDecode(BufferedTransformation &bt) -{ - word16 bitCount; - if (bt.GetWord16(bitCount) != 2 || bt.MaxRetrievable() < BitsToBytes(bitCount)) - throw OpenPGPDecodeErr(); - Decode(bt, BitsToBytes(bitCount)); -} - -void Integer::Randomize(RandomNumberGenerator &rng, size_t nbits) -{ - const size_t nbytes = nbits/8 + 1; - SecByteBlock buf(nbytes); - rng.GenerateBlock(buf, nbytes); - if (nbytes) - buf[0] = (byte)Crop(buf[0], nbits % 8); - Decode(buf, nbytes, UNSIGNED); -} - -void Integer::Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max) -{ - if (min > max) - throw InvalidArgument("Integer: Min must be no greater than Max"); - - Integer range = max - min; - const unsigned int nbits = range.BitCount(); - - do - { - Randomize(rng, nbits); - } - while (*this > range); - - *this += min; -} - -bool Integer::Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv, const Integer &mod) -{ - return GenerateRandomNoThrow(rng, MakeParameters("Min", min)("Max", max)("RandomNumberType", rnType)("EquivalentTo", equiv)("Mod", mod)); -} - -class KDF2_RNG : public RandomNumberGenerator -{ -public: - KDF2_RNG(const byte *seed, size_t seedSize) - : m_counter(0), m_counterAndSeed(seedSize + 4) - { - memcpy(m_counterAndSeed + 4, seed, seedSize); - } - - void GenerateBlock(byte *output, size_t size) - { - PutWord(false, BIG_ENDIAN_ORDER, m_counterAndSeed, m_counter); - ++m_counter; - P1363_KDF2::DeriveKey(output, size, m_counterAndSeed, m_counterAndSeed.size(), NULL, 0); - } - -private: - word32 m_counter; - SecByteBlock m_counterAndSeed; -}; - -bool Integer::GenerateRandomNoThrow(RandomNumberGenerator &i_rng, const NameValuePairs ¶ms) -{ - Integer min = params.GetValueWithDefault("Min", Integer::Zero()); - Integer max; - if (!params.GetValue("Max", max)) - { - int bitLength; - if (params.GetIntValue("BitLength", bitLength)) - max = Integer::Power2(bitLength); - else - throw InvalidArgument("Integer: missing Max argument"); - } - if (min > max) - throw InvalidArgument("Integer: Min must be no greater than Max"); - - Integer equiv = params.GetValueWithDefault("EquivalentTo", Integer::Zero()); - Integer mod = params.GetValueWithDefault("Mod", Integer::One()); - - if (equiv.IsNegative() || equiv >= mod) - throw InvalidArgument("Integer: invalid EquivalentTo and/or Mod argument"); - - Integer::RandomNumberType rnType = params.GetValueWithDefault("RandomNumberType", Integer::ANY); - - member_ptr kdf2Rng; - ConstByteArrayParameter seed; - if (params.GetValue(Name::Seed(), seed)) - { - ByteQueue bq; - DERSequenceEncoder seq(bq); - min.DEREncode(seq); - max.DEREncode(seq); - equiv.DEREncode(seq); - mod.DEREncode(seq); - DEREncodeUnsigned(seq, rnType); - DEREncodeOctetString(seq, seed.begin(), seed.size()); - seq.MessageEnd(); - - SecByteBlock finalSeed((size_t)bq.MaxRetrievable()); - bq.Get(finalSeed, finalSeed.size()); - kdf2Rng.reset(new KDF2_RNG(finalSeed.begin(), finalSeed.size())); - } - RandomNumberGenerator &rng = kdf2Rng.get() ? (RandomNumberGenerator &)*kdf2Rng : i_rng; - - switch (rnType) - { - case ANY: - if (mod == One()) - Randomize(rng, min, max); - else - { - Integer min1 = min + (equiv-min)%mod; - if (max < min1) - return false; - Randomize(rng, Zero(), (max - min1) / mod); - *this *= mod; - *this += min1; - } - return true; - - case PRIME: - { - const PrimeSelector *pSelector = params.GetValueWithDefault(Name::PointerToPrimeSelector(), (const PrimeSelector *)NULL); - - int i; - i = 0; - while (1) - { - if (++i==16) - { - // check if there are any suitable primes in [min, max] - Integer first = min; - if (FirstPrime(first, max, equiv, mod, pSelector)) - { - // if there is only one suitable prime, we're done - *this = first; - if (!FirstPrime(first, max, equiv, mod, pSelector)) - return true; - } - else - return false; - } - - Randomize(rng, min, max); - if (FirstPrime(*this, STDMIN(*this+mod*PrimeSearchInterval(max), max), equiv, mod, pSelector)) - return true; - } - } - - default: - throw InvalidArgument("Integer: invalid RandomNumberType argument"); - } -} - -std::istream& operator>>(std::istream& in, Integer &a) -{ - char c; - unsigned int length = 0; - SecBlock str(length + 16); - - std::ws(in); - - do - { - in.read(&c, 1); - str[length++] = c; - if (length >= str.size()) - str.Grow(length + 16); - } - while (in && (c=='-' || c=='x' || (c>='0' && c<='9') || (c>='a' && c<='f') || (c>='A' && c<='F') || c=='h' || c=='H' || c=='o' || c=='O' || c==',' || c=='.')); - - if (in.gcount()) - in.putback(c); - str[length-1] = '\0'; - a = Integer(str); - - return in; -} - -std::ostream& operator<<(std::ostream& out, const Integer &a) -{ - // Get relevant conversion specifications from ostream. - long f = out.flags() & std::ios::basefield; // Get base digits. - int base, block; - char suffix; - switch(f) - { - case std::ios::oct : - base = 8; - block = 8; - suffix = 'o'; - break; - case std::ios::hex : - base = 16; - block = 4; - suffix = 'h'; - break; - default : - base = 10; - block = 3; - suffix = '.'; - } - - Integer temp1=a, temp2; - - if (a.IsNegative()) - { - out << '-'; - temp1.Negate(); - } - - if (!a) - out << '0'; - - static const char upper[]="0123456789ABCDEF"; - static const char lower[]="0123456789abcdef"; - - const char* vec = (out.flags() & std::ios::uppercase) ? upper : lower; - unsigned i=0; - SecBlock s(a.BitCount() / (BitPrecision(base)-1) + 1); - - while (!!temp1) - { - word digit; - Integer::Divide(digit, temp2, temp1, base); - s[i++]=vec[digit]; - temp1.swap(temp2); - } - - while (i--) - { - out << s[i]; -// if (i && !(i%block)) -// out << ","; - } - return out << suffix; -} - -Integer& Integer::operator++() -{ - if (NotNegative()) - { - if (Increment(reg, reg.size())) - { - reg.CleanGrow(2*reg.size()); - reg[reg.size()/2]=1; - } - } - else - { - word borrow = Decrement(reg, reg.size()); - assert(!borrow); - if (WordCount()==0) - *this = Zero(); - } - return *this; -} - -Integer& Integer::operator--() -{ - if (IsNegative()) - { - if (Increment(reg, reg.size())) - { - reg.CleanGrow(2*reg.size()); - reg[reg.size()/2]=1; - } - } - else - { - if (Decrement(reg, reg.size())) - *this = -One(); - } - return *this; -} - -void PositiveAdd(Integer &sum, const Integer &a, const Integer& b) -{ - int carry; - if (a.reg.size() == b.reg.size()) - carry = Add(sum.reg, a.reg, b.reg, a.reg.size()); - else if (a.reg.size() > b.reg.size()) - { - carry = Add(sum.reg, a.reg, b.reg, b.reg.size()); - CopyWords(sum.reg+b.reg.size(), a.reg+b.reg.size(), a.reg.size()-b.reg.size()); - carry = Increment(sum.reg+b.reg.size(), a.reg.size()-b.reg.size(), carry); - } - else - { - carry = Add(sum.reg, a.reg, b.reg, a.reg.size()); - CopyWords(sum.reg+a.reg.size(), b.reg+a.reg.size(), b.reg.size()-a.reg.size()); - carry = Increment(sum.reg+a.reg.size(), b.reg.size()-a.reg.size(), carry); - } - - if (carry) - { - sum.reg.CleanGrow(2*sum.reg.size()); - sum.reg[sum.reg.size()/2] = 1; - } - sum.sign = Integer::POSITIVE; -} - -void PositiveSubtract(Integer &diff, const Integer &a, const Integer& b) -{ - unsigned aSize = a.WordCount(); - aSize += aSize%2; - unsigned bSize = b.WordCount(); - bSize += bSize%2; - - if (aSize == bSize) - { - if (Compare(a.reg, b.reg, aSize) >= 0) - { - Subtract(diff.reg, a.reg, b.reg, aSize); - diff.sign = Integer::POSITIVE; - } - else - { - Subtract(diff.reg, b.reg, a.reg, aSize); - diff.sign = Integer::NEGATIVE; - } - } - else if (aSize > bSize) - { - word borrow = Subtract(diff.reg, a.reg, b.reg, bSize); - CopyWords(diff.reg+bSize, a.reg+bSize, aSize-bSize); - borrow = Decrement(diff.reg+bSize, aSize-bSize, borrow); - assert(!borrow); - diff.sign = Integer::POSITIVE; - } - else - { - word borrow = Subtract(diff.reg, b.reg, a.reg, aSize); - CopyWords(diff.reg+aSize, b.reg+aSize, bSize-aSize); - borrow = Decrement(diff.reg+aSize, bSize-aSize, borrow); - assert(!borrow); - diff.sign = Integer::NEGATIVE; - } -} - -// MSVC .NET 2003 workaround -template inline const T& STDMAX2(const T& a, const T& b) -{ - return a < b ? b : a; -} - -Integer Integer::Plus(const Integer& b) const -{ - Integer sum((word)0, STDMAX2(reg.size(), b.reg.size())); - if (NotNegative()) - { - if (b.NotNegative()) - PositiveAdd(sum, *this, b); - else - PositiveSubtract(sum, *this, b); - } - else - { - if (b.NotNegative()) - PositiveSubtract(sum, b, *this); - else - { - PositiveAdd(sum, *this, b); - sum.sign = Integer::NEGATIVE; - } - } - return sum; -} - -Integer& Integer::operator+=(const Integer& t) -{ - reg.CleanGrow(t.reg.size()); - if (NotNegative()) - { - if (t.NotNegative()) - PositiveAdd(*this, *this, t); - else - PositiveSubtract(*this, *this, t); - } - else - { - if (t.NotNegative()) - PositiveSubtract(*this, t, *this); - else - { - PositiveAdd(*this, *this, t); - sign = Integer::NEGATIVE; - } - } - return *this; -} - -Integer Integer::Minus(const Integer& b) const -{ - Integer diff((word)0, STDMAX2(reg.size(), b.reg.size())); - if (NotNegative()) - { - if (b.NotNegative()) - PositiveSubtract(diff, *this, b); - else - PositiveAdd(diff, *this, b); - } - else - { - if (b.NotNegative()) - { - PositiveAdd(diff, *this, b); - diff.sign = Integer::NEGATIVE; - } - else - PositiveSubtract(diff, b, *this); - } - return diff; -} - -Integer& Integer::operator-=(const Integer& t) -{ - reg.CleanGrow(t.reg.size()); - if (NotNegative()) - { - if (t.NotNegative()) - PositiveSubtract(*this, *this, t); - else - PositiveAdd(*this, *this, t); - } - else - { - if (t.NotNegative()) - { - PositiveAdd(*this, *this, t); - sign = Integer::NEGATIVE; - } - else - PositiveSubtract(*this, t, *this); - } - return *this; -} - -Integer& Integer::operator<<=(size_t n) -{ - const size_t wordCount = WordCount(); - const size_t shiftWords = n / WORD_BITS; - const unsigned int shiftBits = (unsigned int)(n % WORD_BITS); - - reg.CleanGrow(RoundupSize(wordCount+BitsToWords(n))); - ShiftWordsLeftByWords(reg, wordCount + shiftWords, shiftWords); - ShiftWordsLeftByBits(reg+shiftWords, wordCount+BitsToWords(shiftBits), shiftBits); - return *this; -} - -Integer& Integer::operator>>=(size_t n) -{ - const size_t wordCount = WordCount(); - const size_t shiftWords = n / WORD_BITS; - const unsigned int shiftBits = (unsigned int)(n % WORD_BITS); - - ShiftWordsRightByWords(reg, wordCount, shiftWords); - if (wordCount > shiftWords) - ShiftWordsRightByBits(reg, wordCount-shiftWords, shiftBits); - if (IsNegative() && WordCount()==0) // avoid -0 - *this = Zero(); - return *this; -} - -void PositiveMultiply(Integer &product, const Integer &a, const Integer &b) -{ - size_t aSize = RoundupSize(a.WordCount()); - size_t bSize = RoundupSize(b.WordCount()); - - product.reg.CleanNew(RoundupSize(aSize+bSize)); - product.sign = Integer::POSITIVE; - - IntegerSecBlock workspace(aSize + bSize); - AsymmetricMultiply(product.reg, workspace, a.reg, aSize, b.reg, bSize); -} - -void Multiply(Integer &product, const Integer &a, const Integer &b) -{ - PositiveMultiply(product, a, b); - - if (a.NotNegative() != b.NotNegative()) - product.Negate(); -} - -Integer Integer::Times(const Integer &b) const -{ - Integer product; - Multiply(product, *this, b); - return product; -} - -/* -void PositiveDivide(Integer &remainder, Integer "ient, - const Integer ÷nd, const Integer &divisor) -{ - remainder.reg.CleanNew(divisor.reg.size()); - remainder.sign = Integer::POSITIVE; - quotient.reg.New(0); - quotient.sign = Integer::POSITIVE; - unsigned i=dividend.BitCount(); - while (i--) - { - word overflow = ShiftWordsLeftByBits(remainder.reg, remainder.reg.size(), 1); - remainder.reg[0] |= dividend[i]; - if (overflow || remainder >= divisor) - { - Subtract(remainder.reg, remainder.reg, divisor.reg, remainder.reg.size()); - quotient.SetBit(i); - } - } -} -*/ - -void PositiveDivide(Integer &remainder, Integer "ient, - const Integer &a, const Integer &b) -{ - unsigned aSize = a.WordCount(); - unsigned bSize = b.WordCount(); - - if (!bSize) - throw Integer::DivideByZero(); - - if (aSize < bSize) - { - remainder = a; - remainder.sign = Integer::POSITIVE; - quotient = Integer::Zero(); - return; - } - - aSize += aSize%2; // round up to next even number - bSize += bSize%2; - - remainder.reg.CleanNew(RoundupSize(bSize)); - remainder.sign = Integer::POSITIVE; - quotient.reg.CleanNew(RoundupSize(aSize-bSize+2)); - quotient.sign = Integer::POSITIVE; - - IntegerSecBlock T(aSize+3*(bSize+2)); - Divide(remainder.reg, quotient.reg, T, a.reg, aSize, b.reg, bSize); -} - -void Integer::Divide(Integer &remainder, Integer "ient, const Integer ÷nd, const Integer &divisor) -{ - PositiveDivide(remainder, quotient, dividend, divisor); - - if (dividend.IsNegative()) - { - quotient.Negate(); - if (remainder.NotZero()) - { - --quotient; - remainder = divisor.AbsoluteValue() - remainder; - } - } - - if (divisor.IsNegative()) - quotient.Negate(); -} - -void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, unsigned int n) -{ - q = a; - q >>= n; - - const size_t wordCount = BitsToWords(n); - if (wordCount <= a.WordCount()) - { - r.reg.resize(RoundupSize(wordCount)); - CopyWords(r.reg, a.reg, wordCount); - SetWords(r.reg+wordCount, 0, r.reg.size()-wordCount); - if (n % WORD_BITS != 0) - r.reg[wordCount-1] %= (word(1) << (n % WORD_BITS)); - } - else - { - r.reg.resize(RoundupSize(a.WordCount())); - CopyWords(r.reg, a.reg, r.reg.size()); - } - r.sign = POSITIVE; - - if (a.IsNegative() && r.NotZero()) - { - --q; - r = Power2(n) - r; - } -} - -Integer Integer::DividedBy(const Integer &b) const -{ - Integer remainder, quotient; - Integer::Divide(remainder, quotient, *this, b); - return quotient; -} - -Integer Integer::Modulo(const Integer &b) const -{ - Integer remainder, quotient; - Integer::Divide(remainder, quotient, *this, b); - return remainder; -} - -void Integer::Divide(word &remainder, Integer "ient, const Integer ÷nd, word divisor) -{ - if (!divisor) - throw Integer::DivideByZero(); - - assert(divisor); - - if ((divisor & (divisor-1)) == 0) // divisor is a power of 2 - { - quotient = dividend >> (BitPrecision(divisor)-1); - remainder = dividend.reg[0] & (divisor-1); - return; - } - - unsigned int i = dividend.WordCount(); - quotient.reg.CleanNew(RoundupSize(i)); - remainder = 0; - while (i--) - { - quotient.reg[i] = DWord(dividend.reg[i], remainder) / divisor; - remainder = DWord(dividend.reg[i], remainder) % divisor; - } - - if (dividend.NotNegative()) - quotient.sign = POSITIVE; - else - { - quotient.sign = NEGATIVE; - if (remainder) - { - --quotient; - remainder = divisor - remainder; - } - } -} - -Integer Integer::DividedBy(word b) const -{ - word remainder; - Integer quotient; - Integer::Divide(remainder, quotient, *this, b); - return quotient; -} - -word Integer::Modulo(word divisor) const -{ - if (!divisor) - throw Integer::DivideByZero(); - - assert(divisor); - - word remainder; - - if ((divisor & (divisor-1)) == 0) // divisor is a power of 2 - remainder = reg[0] & (divisor-1); - else - { - unsigned int i = WordCount(); - - if (divisor <= 5) - { - DWord sum(0, 0); - while (i--) - sum += reg[i]; - remainder = sum % divisor; - } - else - { - remainder = 0; - while (i--) - remainder = DWord(reg[i], remainder) % divisor; - } - } - - if (IsNegative() && remainder) - remainder = divisor - remainder; - - return remainder; -} - -void Integer::Negate() -{ - if (!!(*this)) // don't flip sign if *this==0 - sign = Sign(1-sign); -} - -int Integer::PositiveCompare(const Integer& t) const -{ - unsigned size = WordCount(), tSize = t.WordCount(); - - if (size == tSize) - return CryptoPP::Compare(reg, t.reg, size); - else - return size > tSize ? 1 : -1; -} - -int Integer::Compare(const Integer& t) const -{ - if (NotNegative()) - { - if (t.NotNegative()) - return PositiveCompare(t); - else - return 1; - } - else - { - if (t.NotNegative()) - return -1; - else - return -PositiveCompare(t); - } -} - -Integer Integer::SquareRoot() const -{ - if (!IsPositive()) - return Zero(); - - // overestimate square root - Integer x, y = Power2((BitCount()+1)/2); - assert(y*y >= *this); - - do - { - x = y; - y = (x + *this/x) >> 1; - } while (y().Gcd(a, b); -} - -Integer Integer::InverseMod(const Integer &m) const -{ - assert(m.NotNegative()); - - if (IsNegative()) - return Modulo(m).InverseMod(m); - - if (m.IsEven()) - { - if (!m || IsEven()) - return Zero(); // no inverse - if (*this == One()) - return One(); - - Integer u = m.Modulo(*this).InverseMod(*this); - return !u ? Zero() : (m*(*this-u)+1)/(*this); - } - - SecBlock T(m.reg.size() * 4); - Integer r((word)0, m.reg.size()); - unsigned k = AlmostInverse(r.reg, T, reg, reg.size(), m.reg, m.reg.size()); - DivideByPower2Mod(r.reg, r.reg, k, m.reg, m.reg.size()); - return r; -} - -word Integer::InverseMod(word mod) const -{ - word g0 = mod, g1 = *this % mod; - word v0 = 0, v1 = 1; - word y; - - while (g1) - { - if (g1 == 1) - return v1; - y = g0 / g1; - g0 = g0 % g1; - v0 += y * v1; - - if (!g0) - break; - if (g0 == 1) - return mod-v0; - y = g1 / g0; - g1 = g1 % g0; - v1 += y * v0; - } - return 0; -} - -// ******************************************************** - -ModularArithmetic::ModularArithmetic(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - OID oid(seq); - if (oid != ASN1::prime_field()) - BERDecodeError(); - m_modulus.BERDecode(seq); - seq.MessageEnd(); - m_result.reg.resize(m_modulus.reg.size()); -} - -void ModularArithmetic::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - ASN1::prime_field().DEREncode(seq); - m_modulus.DEREncode(seq); - seq.MessageEnd(); -} - -void ModularArithmetic::DEREncodeElement(BufferedTransformation &out, const Element &a) const -{ - a.DEREncodeAsOctetString(out, MaxElementByteLength()); -} - -void ModularArithmetic::BERDecodeElement(BufferedTransformation &in, Element &a) const -{ - a.BERDecodeAsOctetString(in, MaxElementByteLength()); -} - -const Integer& ModularArithmetic::Half(const Integer &a) const -{ - if (a.reg.size()==m_modulus.reg.size()) - { - CryptoPP::DivideByPower2Mod(m_result.reg.begin(), a.reg, 1, m_modulus.reg, a.reg.size()); - return m_result; - } - else - return m_result1 = (a.IsEven() ? (a >> 1) : ((a+m_modulus) >> 1)); -} - -const Integer& ModularArithmetic::Add(const Integer &a, const Integer &b) const -{ - if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size()) - { - if (CryptoPP::Add(m_result.reg.begin(), a.reg, b.reg, a.reg.size()) - || Compare(m_result.reg, m_modulus.reg, a.reg.size()) >= 0) - { - CryptoPP::Subtract(m_result.reg.begin(), m_result.reg, m_modulus.reg, a.reg.size()); - } - return m_result; - } - else - { - m_result1 = a+b; - if (m_result1 >= m_modulus) - m_result1 -= m_modulus; - return m_result1; - } -} - -Integer& ModularArithmetic::Accumulate(Integer &a, const Integer &b) const -{ - if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size()) - { - if (CryptoPP::Add(a.reg, a.reg, b.reg, a.reg.size()) - || Compare(a.reg, m_modulus.reg, a.reg.size()) >= 0) - { - CryptoPP::Subtract(a.reg, a.reg, m_modulus.reg, a.reg.size()); - } - } - else - { - a+=b; - if (a>=m_modulus) - a-=m_modulus; - } - - return a; -} - -const Integer& ModularArithmetic::Subtract(const Integer &a, const Integer &b) const -{ - if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size()) - { - if (CryptoPP::Subtract(m_result.reg.begin(), a.reg, b.reg, a.reg.size())) - CryptoPP::Add(m_result.reg.begin(), m_result.reg, m_modulus.reg, a.reg.size()); - return m_result; - } - else - { - m_result1 = a-b; - if (m_result1.IsNegative()) - m_result1 += m_modulus; - return m_result1; - } -} - -Integer& ModularArithmetic::Reduce(Integer &a, const Integer &b) const -{ - if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size()) - { - if (CryptoPP::Subtract(a.reg, a.reg, b.reg, a.reg.size())) - CryptoPP::Add(a.reg, a.reg, m_modulus.reg, a.reg.size()); - } - else - { - a-=b; - if (a.IsNegative()) - a+=m_modulus; - } - - return a; -} - -const Integer& ModularArithmetic::Inverse(const Integer &a) const -{ - if (!a) - return a; - - CopyWords(m_result.reg.begin(), m_modulus.reg, m_modulus.reg.size()); - if (CryptoPP::Subtract(m_result.reg.begin(), m_result.reg, a.reg, a.reg.size())) - Decrement(m_result.reg.begin()+a.reg.size(), m_modulus.reg.size()-a.reg.size()); - - return m_result; -} - -Integer ModularArithmetic::CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const -{ - if (m_modulus.IsOdd()) - { - MontgomeryRepresentation dr(m_modulus); - return dr.ConvertOut(dr.CascadeExponentiate(dr.ConvertIn(x), e1, dr.ConvertIn(y), e2)); - } - else - return AbstractRing::CascadeExponentiate(x, e1, y, e2); -} - -void ModularArithmetic::SimultaneousExponentiate(Integer *results, const Integer &base, const Integer *exponents, unsigned int exponentsCount) const -{ - if (m_modulus.IsOdd()) - { - MontgomeryRepresentation dr(m_modulus); - dr.SimultaneousExponentiate(results, dr.ConvertIn(base), exponents, exponentsCount); - for (unsigned int i=0; i::SimultaneousExponentiate(results, base, exponents, exponentsCount); -} - -MontgomeryRepresentation::MontgomeryRepresentation(const Integer &m) // modulus must be odd - : ModularArithmetic(m), - m_u((word)0, m_modulus.reg.size()), - m_workspace(5*m_modulus.reg.size()) -{ - if (!m_modulus.IsOdd()) - throw InvalidArgument("MontgomeryRepresentation: Montgomery representation requires an odd modulus"); - - RecursiveInverseModPower2(m_u.reg, m_workspace, m_modulus.reg, m_modulus.reg.size()); -} - -const Integer& MontgomeryRepresentation::Multiply(const Integer &a, const Integer &b) const -{ - word *const T = m_workspace.begin(); - word *const R = m_result.reg.begin(); - const size_t N = m_modulus.reg.size(); - assert(a.reg.size()<=N && b.reg.size()<=N); - - AsymmetricMultiply(T, T+2*N, a.reg, a.reg.size(), b.reg, b.reg.size()); - SetWords(T+a.reg.size()+b.reg.size(), 0, 2*N-a.reg.size()-b.reg.size()); - MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N); - return m_result; -} - -const Integer& MontgomeryRepresentation::Square(const Integer &a) const -{ - word *const T = m_workspace.begin(); - word *const R = m_result.reg.begin(); - const size_t N = m_modulus.reg.size(); - assert(a.reg.size()<=N); - - CryptoPP::Square(T, T+2*N, a.reg, a.reg.size()); - SetWords(T+2*a.reg.size(), 0, 2*N-2*a.reg.size()); - MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N); - return m_result; -} - -Integer MontgomeryRepresentation::ConvertOut(const Integer &a) const -{ - word *const T = m_workspace.begin(); - word *const R = m_result.reg.begin(); - const size_t N = m_modulus.reg.size(); - assert(a.reg.size()<=N); - - CopyWords(T, a.reg, a.reg.size()); - SetWords(T+a.reg.size(), 0, 2*N-a.reg.size()); - MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N); - return m_result; -} - -const Integer& MontgomeryRepresentation::MultiplicativeInverse(const Integer &a) const -{ -// return (EuclideanMultiplicativeInverse(a, modulus)<<(2*WORD_BITS*modulus.reg.size()))%modulus; - word *const T = m_workspace.begin(); - word *const R = m_result.reg.begin(); - const size_t N = m_modulus.reg.size(); - assert(a.reg.size()<=N); - - CopyWords(T, a.reg, a.reg.size()); - SetWords(T+a.reg.size(), 0, 2*N-a.reg.size()); - MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N); - unsigned k = AlmostInverse(R, T, R, N, m_modulus.reg, N); - -// cout << "k=" << k << " N*32=" << 32*N << endl; - - if (k>N*WORD_BITS) - DivideByPower2Mod(R, R, k-N*WORD_BITS, m_modulus.reg, N); - else - MultiplyByPower2Mod(R, R, N*WORD_BITS-k, m_modulus.reg, N); - - return m_result; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.h deleted file mode 100644 index 6d844fa5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/integer.h +++ /dev/null @@ -1,420 +0,0 @@ -#ifndef CRYPTOPP_INTEGER_H -#define CRYPTOPP_INTEGER_H - -/** \file */ - -#include "cryptlib.h" -#include "secblock.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -struct InitializeInteger // used to initialize static variables -{ - InitializeInteger(); -}; - -typedef SecBlock > IntegerSecBlock; - -//! multiple precision integer and basic arithmetics -/*! This class can represent positive and negative integers - with absolute value less than (256**sizeof(word)) ** (256**sizeof(int)). - \nosubgrouping -*/ -class CRYPTOPP_DLL Integer : private InitializeInteger, public ASN1Object -{ -public: - //! \name ENUMS, EXCEPTIONS, and TYPEDEFS - //@{ - //! division by zero exception - class DivideByZero : public Exception - { - public: - DivideByZero() : Exception(OTHER_ERROR, "Integer: division by zero") {} - }; - - //! - class RandomNumberNotFound : public Exception - { - public: - RandomNumberNotFound() : Exception(OTHER_ERROR, "Integer: no integer satisfies the given parameters") {} - }; - - //! - enum Sign {POSITIVE=0, NEGATIVE=1}; - - //! - enum Signedness { - //! - UNSIGNED, - //! - SIGNED}; - - //! - enum RandomNumberType { - //! - ANY, - //! - PRIME}; - //@} - - //! \name CREATORS - //@{ - //! creates the zero integer - Integer(); - - //! copy constructor - Integer(const Integer& t); - - //! convert from signed long - Integer(signed long value); - - //! convert from lword - Integer(Sign s, lword value); - - //! convert from two words - Integer(Sign s, word highWord, word lowWord); - - //! convert from string - /*! str can be in base 2, 8, 10, or 16. Base is determined by a - case insensitive suffix of 'h', 'o', or 'b'. No suffix means base 10. - */ - explicit Integer(const char *str); - explicit Integer(const wchar_t *str); - - //! convert from big-endian byte array - Integer(const byte *encodedInteger, size_t byteCount, Signedness s=UNSIGNED); - - //! convert from big-endian form stored in a BufferedTransformation - Integer(BufferedTransformation &bt, size_t byteCount, Signedness s=UNSIGNED); - - //! convert from BER encoded byte array stored in a BufferedTransformation object - explicit Integer(BufferedTransformation &bt); - - //! create a random integer - /*! The random integer created is uniformly distributed over [0, 2**bitcount). */ - Integer(RandomNumberGenerator &rng, size_t bitcount); - - //! avoid calling constructors for these frequently used integers - static const Integer & CRYPTOPP_API Zero(); - //! avoid calling constructors for these frequently used integers - static const Integer & CRYPTOPP_API One(); - //! avoid calling constructors for these frequently used integers - static const Integer & CRYPTOPP_API Two(); - - //! create a random integer of special type - /*! Ideally, the random integer created should be uniformly distributed - over {x | min <= x <= max and x is of rnType and x % mod == equiv}. - However the actual distribution may not be uniform because sequential - search is used to find an appropriate number from a random starting - point. - May return (with very small probability) a pseudoprime when a prime - is requested and max > lastSmallPrime*lastSmallPrime (lastSmallPrime - is declared in nbtheory.h). - \throw RandomNumberNotFound if the set is empty. - */ - Integer(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType=ANY, const Integer &equiv=Zero(), const Integer &mod=One()); - - //! return the integer 2**e - static Integer CRYPTOPP_API Power2(size_t e); - //@} - - //! \name ENCODE/DECODE - //@{ - //! minimum number of bytes to encode this integer - /*! MinEncodedSize of 0 is 1 */ - size_t MinEncodedSize(Signedness=UNSIGNED) const; - //! encode in big-endian format - /*! unsigned means encode absolute value, signed means encode two's complement if negative. - if outputLen < MinEncodedSize, the most significant bytes will be dropped - if outputLen > MinEncodedSize, the most significant bytes will be padded - */ - void Encode(byte *output, size_t outputLen, Signedness=UNSIGNED) const; - //! - void Encode(BufferedTransformation &bt, size_t outputLen, Signedness=UNSIGNED) const; - - //! encode using Distinguished Encoding Rules, put result into a BufferedTransformation object - void DEREncode(BufferedTransformation &bt) const; - - //! encode absolute value as big-endian octet string - void DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const; - - //! encode absolute value in OpenPGP format, return length of output - size_t OpenPGPEncode(byte *output, size_t bufferSize) const; - //! encode absolute value in OpenPGP format, put result into a BufferedTransformation object - size_t OpenPGPEncode(BufferedTransformation &bt) const; - - //! - void Decode(const byte *input, size_t inputLen, Signedness=UNSIGNED); - //! - //* Precondition: bt.MaxRetrievable() >= inputLen - void Decode(BufferedTransformation &bt, size_t inputLen, Signedness=UNSIGNED); - - //! - void BERDecode(const byte *input, size_t inputLen); - //! - void BERDecode(BufferedTransformation &bt); - - //! decode nonnegative value as big-endian octet string - void BERDecodeAsOctetString(BufferedTransformation &bt, size_t length); - - class OpenPGPDecodeErr : public Exception - { - public: - OpenPGPDecodeErr() : Exception(INVALID_DATA_FORMAT, "OpenPGP decode error") {} - }; - - //! - void OpenPGPDecode(const byte *input, size_t inputLen); - //! - void OpenPGPDecode(BufferedTransformation &bt); - //@} - - //! \name ACCESSORS - //@{ - //! return true if *this can be represented as a signed long - bool IsConvertableToLong() const; - //! return equivalent signed long if possible, otherwise undefined - signed long ConvertToLong() const; - - //! number of significant bits = floor(log2(abs(*this))) + 1 - unsigned int BitCount() const; - //! number of significant bytes = ceiling(BitCount()/8) - unsigned int ByteCount() const; - //! number of significant words = ceiling(ByteCount()/sizeof(word)) - unsigned int WordCount() const; - - //! return the i-th bit, i=0 being the least significant bit - bool GetBit(size_t i) const; - //! return the i-th byte - byte GetByte(size_t i) const; - //! return n lowest bits of *this >> i - lword GetBits(size_t i, size_t n) const; - - //! - bool IsZero() const {return !*this;} - //! - bool NotZero() const {return !IsZero();} - //! - bool IsNegative() const {return sign == NEGATIVE;} - //! - bool NotNegative() const {return !IsNegative();} - //! - bool IsPositive() const {return NotNegative() && NotZero();} - //! - bool NotPositive() const {return !IsPositive();} - //! - bool IsEven() const {return GetBit(0) == 0;} - //! - bool IsOdd() const {return GetBit(0) == 1;} - //@} - - //! \name MANIPULATORS - //@{ - //! - Integer& operator=(const Integer& t); - - //! - Integer& operator+=(const Integer& t); - //! - Integer& operator-=(const Integer& t); - //! - Integer& operator*=(const Integer& t) {return *this = Times(t);} - //! - Integer& operator/=(const Integer& t) {return *this = DividedBy(t);} - //! - Integer& operator%=(const Integer& t) {return *this = Modulo(t);} - //! - Integer& operator/=(word t) {return *this = DividedBy(t);} - //! - Integer& operator%=(word t) {return *this = Integer(POSITIVE, 0, Modulo(t));} - - //! - Integer& operator<<=(size_t); - //! - Integer& operator>>=(size_t); - - //! - void Randomize(RandomNumberGenerator &rng, size_t bitcount); - //! - void Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max); - //! set this Integer to a random element of {x | min <= x <= max and x is of rnType and x % mod == equiv} - /*! returns false if the set is empty */ - bool Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv=Zero(), const Integer &mod=One()); - - bool GenerateRandomNoThrow(RandomNumberGenerator &rng, const NameValuePairs ¶ms = g_nullNameValuePairs); - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶ms = g_nullNameValuePairs) - { - if (!GenerateRandomNoThrow(rng, params)) - throw RandomNumberNotFound(); - } - - //! set the n-th bit to value - void SetBit(size_t n, bool value=1); - //! set the n-th byte to value - void SetByte(size_t n, byte value); - - //! - void Negate(); - //! - void SetPositive() {sign = POSITIVE;} - //! - void SetNegative() {if (!!(*this)) sign = NEGATIVE;} - - //! - void swap(Integer &a); - //@} - - //! \name UNARY OPERATORS - //@{ - //! - bool operator!() const; - //! - Integer operator+() const {return *this;} - //! - Integer operator-() const; - //! - Integer& operator++(); - //! - Integer& operator--(); - //! - Integer operator++(int) {Integer temp = *this; ++*this; return temp;} - //! - Integer operator--(int) {Integer temp = *this; --*this; return temp;} - //@} - - //! \name BINARY OPERATORS - //@{ - //! signed comparison - /*! \retval -1 if *this < a - \retval 0 if *this = a - \retval 1 if *this > a - */ - int Compare(const Integer& a) const; - - //! - Integer Plus(const Integer &b) const; - //! - Integer Minus(const Integer &b) const; - //! - Integer Times(const Integer &b) const; - //! - Integer DividedBy(const Integer &b) const; - //! - Integer Modulo(const Integer &b) const; - //! - Integer DividedBy(word b) const; - //! - word Modulo(word b) const; - - //! - Integer operator>>(size_t n) const {return Integer(*this)>>=n;} - //! - Integer operator<<(size_t n) const {return Integer(*this)<<=n;} - //@} - - //! \name OTHER ARITHMETIC FUNCTIONS - //@{ - //! - Integer AbsoluteValue() const; - //! - Integer Doubled() const {return Plus(*this);} - //! - Integer Squared() const {return Times(*this);} - //! extract square root, if negative return 0, else return floor of square root - Integer SquareRoot() const; - //! return whether this integer is a perfect square - bool IsSquare() const; - - //! is 1 or -1 - bool IsUnit() const; - //! return inverse if 1 or -1, otherwise return 0 - Integer MultiplicativeInverse() const; - - //! modular multiplication - CRYPTOPP_DLL friend Integer CRYPTOPP_API a_times_b_mod_c(const Integer &x, const Integer& y, const Integer& m); - //! modular exponentiation - CRYPTOPP_DLL friend Integer CRYPTOPP_API a_exp_b_mod_c(const Integer &x, const Integer& e, const Integer& m); - - //! calculate r and q such that (a == d*q + r) && (0 <= r < abs(d)) - static void CRYPTOPP_API Divide(Integer &r, Integer &q, const Integer &a, const Integer &d); - //! use a faster division algorithm when divisor is short - static void CRYPTOPP_API Divide(word &r, Integer &q, const Integer &a, word d); - - //! returns same result as Divide(r, q, a, Power2(n)), but faster - static void CRYPTOPP_API DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, unsigned int n); - - //! greatest common divisor - static Integer CRYPTOPP_API Gcd(const Integer &a, const Integer &n); - //! calculate multiplicative inverse of *this mod n - Integer InverseMod(const Integer &n) const; - //! - word InverseMod(word n) const; - //@} - - //! \name INPUT/OUTPUT - //@{ - //! - friend CRYPTOPP_DLL std::istream& CRYPTOPP_API operator>>(std::istream& in, Integer &a); - //! - friend CRYPTOPP_DLL std::ostream& CRYPTOPP_API operator<<(std::ostream& out, const Integer &a); - //@} - -private: - friend class ModularArithmetic; - friend class MontgomeryRepresentation; - friend class HalfMontgomeryRepresentation; - - Integer(word value, size_t length); - - int PositiveCompare(const Integer &t) const; - friend void PositiveAdd(Integer &sum, const Integer &a, const Integer &b); - friend void PositiveSubtract(Integer &diff, const Integer &a, const Integer &b); - friend void PositiveMultiply(Integer &product, const Integer &a, const Integer &b); - friend void PositiveDivide(Integer &remainder, Integer "ient, const Integer ÷nd, const Integer &divisor); - - IntegerSecBlock reg; - Sign sign; -}; - -//! -inline bool operator==(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)==0;} -//! -inline bool operator!=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)!=0;} -//! -inline bool operator> (const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)> 0;} -//! -inline bool operator>=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)>=0;} -//! -inline bool operator< (const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)< 0;} -//! -inline bool operator<=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)<=0;} -//! -inline CryptoPP::Integer operator+(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Plus(b);} -//! -inline CryptoPP::Integer operator-(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Minus(b);} -//! -inline CryptoPP::Integer operator*(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Times(b);} -//! -inline CryptoPP::Integer operator/(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.DividedBy(b);} -//! -inline CryptoPP::Integer operator%(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Modulo(b);} -//! -inline CryptoPP::Integer operator/(const CryptoPP::Integer &a, CryptoPP::word b) {return a.DividedBy(b);} -//! -inline CryptoPP::word operator%(const CryptoPP::Integer &a, CryptoPP::word b) {return a.Modulo(b);} - -NAMESPACE_END - -#ifndef __BORLANDC__ -NAMESPACE_BEGIN(std) -inline void swap(CryptoPP::Integer &a, CryptoPP::Integer &b) -{ - a.swap(b); -} -NAMESPACE_END -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.cpp deleted file mode 100644 index 1e31e9fb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.cpp +++ /dev/null @@ -1,160 +0,0 @@ -// iterhash.cpp - written and placed in the public domain by Wei Dai - -#ifndef __GNUC__ -#define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#endif - -#include "iterhash.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -template void IteratedHashBase::Update(const byte *input, size_t len) -{ - HashWordType oldCountLo = m_countLo, oldCountHi = m_countHi; - if ((m_countLo = oldCountLo + HashWordType(len)) < oldCountLo) - m_countHi++; // carry from low to high - m_countHi += (HashWordType)SafeRightShift<8*sizeof(HashWordType)>(len); - if (m_countHi < oldCountHi || SafeRightShift<2*8*sizeof(HashWordType)>(len) != 0) - throw HashInputTooLong(this->AlgorithmName()); - - unsigned int blockSize = this->BlockSize(); - unsigned int num = ModPowerOf2(oldCountLo, blockSize); - T* dataBuf = this->DataBuf(); - byte* data = (byte *)dataBuf; - - if (num != 0) // process left over data - { - if (num+len >= blockSize) - { - memcpy(data+num, input, blockSize-num); - HashBlock(dataBuf); - input += (blockSize-num); - len -= (blockSize-num); - num = 0; - // drop through and do the rest - } - else - { - memcpy(data+num, input, len); - return; - } - } - - // now process the input data in blocks of blockSize bytes and save the leftovers to m_data - if (len >= blockSize) - { - if (input == data) - { - assert(len == blockSize); - HashBlock(dataBuf); - return; - } - else if (IsAligned(input)) - { - size_t leftOver = HashMultipleBlocks((T *)input, len); - input += (len - leftOver); - len = leftOver; - } - else - do - { // copy input first if it's not aligned correctly - memcpy(data, input, blockSize); - HashBlock(dataBuf); - input+=blockSize; - len-=blockSize; - } while (len >= blockSize); - } - - if (len && data != input) - memcpy(data, input, len); -} - -template byte * IteratedHashBase::CreateUpdateSpace(size_t &size) -{ - unsigned int blockSize = this->BlockSize(); - unsigned int num = ModPowerOf2(m_countLo, blockSize); - size = blockSize - num; - return (byte *)DataBuf() + num; -} - -template size_t IteratedHashBase::HashMultipleBlocks(const T *input, size_t length) -{ - unsigned int blockSize = this->BlockSize(); - bool noReverse = NativeByteOrderIs(this->GetByteOrder()); - T* dataBuf = this->DataBuf(); - do - { - if (noReverse) - this->HashEndianCorrectedBlock(input); - else - { - ByteReverse(dataBuf, input, this->BlockSize()); - this->HashEndianCorrectedBlock(dataBuf); - } - - input += blockSize/sizeof(T); - length -= blockSize; - } - while (length >= blockSize); - return length; -} - -template void IteratedHashBase::PadLastBlock(unsigned int lastBlockSize, byte padFirst) -{ - unsigned int blockSize = this->BlockSize(); - unsigned int num = ModPowerOf2(m_countLo, blockSize); - T* dataBuf = this->DataBuf(); - byte* data = (byte *)dataBuf; - data[num++] = padFirst; - if (num <= lastBlockSize) - memset(data+num, 0, lastBlockSize-num); - else - { - memset(data+num, 0, blockSize-num); - HashBlock(dataBuf); - memset(data, 0, lastBlockSize); - } -} - -template void IteratedHashBase::Restart() -{ - m_countLo = m_countHi = 0; - Init(); -} - -template void IteratedHashBase::TruncatedFinal(byte *digest, size_t size) -{ - this->ThrowIfInvalidTruncatedSize(size); - - T* dataBuf = this->DataBuf(); - T* stateBuf = this->StateBuf(); - unsigned int blockSize = this->BlockSize(); - ByteOrder order = this->GetByteOrder(); - - PadLastBlock(blockSize - 2*sizeof(HashWordType)); - dataBuf[blockSize/sizeof(T)-2+order] = ConditionalByteReverse(order, this->GetBitCountLo()); - dataBuf[blockSize/sizeof(T)-1-order] = ConditionalByteReverse(order, this->GetBitCountHi()); - - HashBlock(dataBuf); - - if (IsAligned(digest) && size%sizeof(HashWordType)==0) - ConditionalByteReverse(order, (HashWordType *)digest, stateBuf, size); - else - { - ConditionalByteReverse(order, stateBuf, stateBuf, this->DigestSize()); - memcpy(digest, stateBuf, size); - } - - this->Restart(); // reinit for next use -} - -#ifdef __GNUC__ - template class IteratedHashBase; - template class IteratedHashBase; - - template class IteratedHashBase; - template class IteratedHashBase; -#endif - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.h deleted file mode 100644 index cce9e821..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/iterhash.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef CRYPTOPP_ITERHASH_H -#define CRYPTOPP_ITERHASH_H - -#include "cryptlib.h" -#include "secblock.h" -#include "misc.h" -#include "simple.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! exception thrown when trying to hash more data than is allowed by a hash function -class CRYPTOPP_DLL HashInputTooLong : public InvalidDataFormat -{ -public: - explicit HashInputTooLong(const std::string &alg) - : InvalidDataFormat("IteratedHashBase: input data exceeds maximum allowed by hash function " + alg) {} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE IteratedHashBase : public BASE -{ -public: - typedef T HashWordType; - - IteratedHashBase() : m_countLo(0), m_countHi(0) {} - unsigned int OptimalBlockSize() const {return this->BlockSize();} - unsigned int OptimalDataAlignment() const {return GetAlignmentOf();} - void Update(const byte *input, size_t length); - byte * CreateUpdateSpace(size_t &size); - void Restart(); - void TruncatedFinal(byte *digest, size_t size); - -protected: - inline T GetBitCountHi() const {return (m_countLo >> (8*sizeof(T)-3)) + (m_countHi << 3);} - inline T GetBitCountLo() const {return m_countLo << 3;} - - void PadLastBlock(unsigned int lastBlockSize, byte padFirst=0x80); - virtual void Init() =0; - - virtual ByteOrder GetByteOrder() const =0; - virtual void HashEndianCorrectedBlock(const HashWordType *data) =0; - virtual size_t HashMultipleBlocks(const T *input, size_t length); - void HashBlock(const HashWordType *input) {HashMultipleBlocks(input, this->BlockSize());} - - virtual T* DataBuf() =0; - virtual T* StateBuf() =0; - -private: - T m_countLo, m_countHi; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE IteratedHash : public IteratedHashBase -{ -public: - typedef T_Endianness ByteOrderClass; - typedef T_HashWordType HashWordType; - - CRYPTOPP_CONSTANT(BLOCKSIZE = T_BlockSize) - // BCB2006 workaround: can't use BLOCKSIZE here - CRYPTOPP_COMPILE_ASSERT((T_BlockSize & (T_BlockSize - 1)) == 0); // blockSize is a power of 2 - unsigned int BlockSize() const {return T_BlockSize;} - - ByteOrder GetByteOrder() const {return T_Endianness::ToEnum();} - - inline static void CorrectEndianess(HashWordType *out, const HashWordType *in, size_t byteCount) - { - ConditionalByteReverse(T_Endianness::ToEnum(), out, in, byteCount); - } - -protected: - T_HashWordType* DataBuf() {return this->m_data;} - FixedSizeSecBlock m_data; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE IteratedHashWithStaticTransform - : public ClonableImpl, T_Transform> > -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE = T_DigestSize ? T_DigestSize : T_StateSize) - unsigned int DigestSize() const {return DIGESTSIZE;}; - -protected: - IteratedHashWithStaticTransform() {this->Init();} - void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);} - void Init() {T_Transform::InitState(this->m_state);} - - T_HashWordType* StateBuf() {return this->m_state;} - FixedSizeAlignedSecBlock m_state; -}; - -#ifndef __GNUC__ - CRYPTOPP_DLL_TEMPLATE_CLASS IteratedHashBase; - CRYPTOPP_STATIC_TEMPLATE_CLASS IteratedHashBase; - - CRYPTOPP_DLL_TEMPLATE_CLASS IteratedHashBase; - CRYPTOPP_STATIC_TEMPLATE_CLASS IteratedHashBase; -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/lubyrack.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/lubyrack.h deleted file mode 100644 index e8fd2f74..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/lubyrack.h +++ /dev/null @@ -1,141 +0,0 @@ -// lubyrack.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_LUBYRACK_H -#define CRYPTOPP_LUBYRACK_H - -/** \file */ - -#include "simple.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -template struct DigestSizeDoubleWorkaround // VC60 workaround -{ - CRYPTOPP_CONSTANT(RESULT = 2*T::DIGESTSIZE) -}; - -//! algorithm info -template -struct LR_Info : public VariableKeyLength<16, 0, 2*(INT_MAX/2), 2>, public FixedBlockSize::RESULT> -{ - static std::string StaticAlgorithmName() {return std::string("LR/")+T::StaticAlgorithmName();} -}; - -//! Luby-Rackoff -template -class LR : public LR_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl > - { - public: - // VC60 workaround: have to define these functions within class definition - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms) - { - this->AssertValidKeyLength(length); - - L = length/2; - buffer.New(2*S); - digest.New(S); - key.Assign(userKey, 2*L); - } - - protected: - CRYPTOPP_CONSTANT(S=T::DIGESTSIZE) - unsigned int L; // key length / 2 - SecByteBlock key; - - mutable T hm; - mutable SecByteBlock buffer, digest; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - -#define KL this->key -#define KR this->key+this->L -#define BL this->buffer -#define BR this->buffer+this->S -#define IL inBlock -#define IR inBlock+this->S -#define OL outBlock -#define OR outBlock+this->S - - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const - { - this->hm.Update(KL, this->L); - this->hm.Update(IL, this->S); - this->hm.Final(BR); - xorbuf(BR, IR, this->S); - - this->hm.Update(KR, this->L); - this->hm.Update(BR, this->S); - this->hm.Final(BL); - xorbuf(BL, IL, this->S); - - this->hm.Update(KL, this->L); - this->hm.Update(BL, this->S); - this->hm.Final(this->digest); - xorbuf(BR, this->digest, this->S); - - this->hm.Update(KR, this->L); - this->hm.Update(OR, this->S); - this->hm.Final(this->digest); - xorbuf(BL, this->digest, this->S); - - if (xorBlock) - xorbuf(outBlock, xorBlock, this->buffer, 2*this->S); - else - memcpy_s(outBlock, 2*this->S, this->buffer, 2*this->S); - } - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const - { - this->hm.Update(KR, this->L); - this->hm.Update(IR, this->S); - this->hm.Final(BL); - xorbuf(BL, IL, this->S); - - this->hm.Update(KL, this->L); - this->hm.Update(BL, this->S); - this->hm.Final(BR); - xorbuf(BR, IR, this->S); - - this->hm.Update(KR, this->L); - this->hm.Update(BR, this->S); - this->hm.Final(this->digest); - xorbuf(BL, this->digest, this->S); - - this->hm.Update(KL, this->L); - this->hm.Update(OL, this->S); - this->hm.Final(this->digest); - xorbuf(BR, this->digest, this->S); - - if (xorBlock) - xorbuf(outBlock, xorBlock, this->buffer, 2*this->S); - else - memcpy(outBlock, this->buffer, 2*this->S); - } -#undef KL -#undef KR -#undef BL -#undef BR -#undef IL -#undef IR -#undef OL -#undef OR - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.cpp deleted file mode 100644 index 43cd2ed2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.cpp +++ /dev/null @@ -1,210 +0,0 @@ -// luc.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "luc.h" -#include "asn.h" -#include "nbtheory.h" -#include "sha.h" -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -void LUC_TestInstantiations() -{ - LUC_HMP::Signer t1; - LUCFunction t2; - InvertibleLUCFunction t3; -} - -void DL_Algorithm_LUC_HMP::Sign(const DL_GroupParameters ¶ms, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const -{ - const Integer &q = params.GetSubgroupOrder(); - r = params.ExponentiateBase(k); - s = (k + x*(r+e)) % q; -} - -bool DL_Algorithm_LUC_HMP::Verify(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &e, const Integer &r, const Integer &s) const -{ - Integer p = params.GetGroupOrder()-1; - const Integer &q = params.GetSubgroupOrder(); - - Integer Vsg = params.ExponentiateBase(s); - Integer Vry = publicKey.ExponentiatePublicElement((r+e)%q); - return (Vsg*Vsg + Vry*Vry + r*r) % p == (Vsg * Vry * r + 4) % p; -} - -Integer DL_BasePrecomputation_LUC::Exponentiate(const DL_GroupPrecomputation &group, const Integer &exponent) const -{ - return Lucas(exponent, m_g, static_cast(group).GetModulus()); -} - -void DL_GroupParameters_LUC::SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const -{ - for (unsigned int i=0; i Integer::One() && m_n.IsOdd(); - pass = pass && m_e > Integer::One() && m_e.IsOdd() && m_e < m_n; - return pass; -} - -bool LUCFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_GET_FUNCTION_ENTRY(PublicExponent) - ; -} - -void LUCFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_SET_FUNCTION_ENTRY(PublicExponent) - ; -} - -// ***************************************************************************** -// private key operations: - -class LUCPrimeSelector : public PrimeSelector -{ -public: - LUCPrimeSelector(const Integer &e) : m_e(e) {} - bool IsAcceptable(const Integer &candidate) const - { - return RelativelyPrime(m_e, candidate+1) && RelativelyPrime(m_e, candidate-1); - } - Integer m_e; -}; - -void InvertibleLUCFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - int modulusSize = 2048; - alg.GetIntValue("ModulusSize", modulusSize) || alg.GetIntValue("KeySize", modulusSize); - - if (modulusSize < 16) - throw InvalidArgument("InvertibleLUCFunction: specified modulus size is too small"); - - m_e = alg.GetValueWithDefault("PublicExponent", Integer(17)); - - if (m_e < 5 || m_e.IsEven()) - throw InvalidArgument("InvertibleLUCFunction: invalid public exponent"); - - LUCPrimeSelector selector(m_e); - AlgorithmParameters primeParam = MakeParametersForTwoPrimesOfEqualSize(modulusSize) - ("PointerToPrimeSelector", selector.GetSelectorPointer()); - m_p.GenerateRandom(rng, primeParam); - m_q.GenerateRandom(rng, primeParam); - - m_n = m_p * m_q; - m_u = m_q.InverseMod(m_p); -} - -void InvertibleLUCFunction::Initialize(RandomNumberGenerator &rng, unsigned int keybits, const Integer &e) -{ - GenerateRandom(rng, MakeParameters("ModulusSize", (int)keybits)("PublicExponent", e)); -} - -void InvertibleLUCFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - - Integer version(seq); - if (!!version) // make sure version is 0 - BERDecodeError(); - - m_n.BERDecode(seq); - m_e.BERDecode(seq); - m_p.BERDecode(seq); - m_q.BERDecode(seq); - m_u.BERDecode(seq); - seq.MessageEnd(); -} - -void InvertibleLUCFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - - const byte version[] = {INTEGER, 1, 0}; - seq.Put(version, sizeof(version)); - m_n.DEREncode(seq); - m_e.DEREncode(seq); - m_p.DEREncode(seq); - m_q.DEREncode(seq); - m_u.DEREncode(seq); - seq.MessageEnd(); -} - -Integer InvertibleLUCFunction::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const -{ - // not clear how to do blinding with LUC - DoQuickSanityCheck(); - return InverseLucas(m_e, x, m_q, m_p, m_u); -} - -bool InvertibleLUCFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = LUCFunction::Validate(rng, level); - pass = pass && m_p > Integer::One() && m_p.IsOdd() && m_p < m_n; - pass = pass && m_q > Integer::One() && m_q.IsOdd() && m_q < m_n; - pass = pass && m_u.IsPositive() && m_u < m_p; - if (level >= 1) - { - pass = pass && m_p * m_q == m_n; - pass = pass && RelativelyPrime(m_e, m_p+1); - pass = pass && RelativelyPrime(m_e, m_p-1); - pass = pass && RelativelyPrime(m_e, m_q+1); - pass = pass && RelativelyPrime(m_e, m_q-1); - pass = pass && m_u * m_q % m_p == 1; - } - if (level >= 2) - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - return pass; -} - -bool InvertibleLUCFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_GET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_GET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -void InvertibleLUCFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_SET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.h deleted file mode 100644 index 730776d5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/luc.h +++ /dev/null @@ -1,236 +0,0 @@ -#ifndef CRYPTOPP_LUC_H -#define CRYPTOPP_LUC_H - -/** \file -*/ - -#include "pkcspad.h" -#include "oaep.h" -#include "integer.h" -#include "dh.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! The LUC function. -/*! This class is here for historical and pedagogical interest. It has no - practical advantages over other trapdoor functions and probably shouldn't - be used in production software. The discrete log based LUC schemes - defined later in this .h file may be of more practical interest. -*/ -class LUCFunction : public TrapdoorFunction, public PublicKey -{ - typedef LUCFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &e) - {m_n = n; m_e = e;} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return m_n;} - Integer ImageBound() const {return m_n;} - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // non-derived interface - const Integer & GetModulus() const {return m_n;} - const Integer & GetPublicExponent() const {return m_e;} - - void SetModulus(const Integer &n) {m_n = n;} - void SetPublicExponent(const Integer &e) {m_e = e;} - -protected: - Integer m_n, m_e; -}; - -//! _ -class InvertibleLUCFunction : public LUCFunction, public TrapdoorFunctionInverse, public PrivateKey -{ - typedef InvertibleLUCFunction ThisClass; - -public: - void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits, const Integer &eStart=17); - void Initialize(const Integer &n, const Integer &e, const Integer &p, const Integer &q, const Integer &u) - {m_n = n; m_e = e; m_p = p; m_q = q; m_u = u;} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const; - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - /*! parameters: (ModulusSize, PublicExponent (default 17)) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - - // non-derived interface - const Integer& GetPrime1() const {return m_p;} - const Integer& GetPrime2() const {return m_q;} - const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;} - - void SetPrime1(const Integer &p) {m_p = p;} - void SetPrime2(const Integer &q) {m_q = q;} - void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;} - -protected: - Integer m_p, m_q, m_u; -}; - -struct LUC -{ - static std::string StaticAlgorithmName() {return "LUC";} - typedef LUCFunction PublicKey; - typedef InvertibleLUCFunction PrivateKey; -}; - -//! LUC cryptosystem -template -struct LUCES : public TF_ES -{ -}; - -//! LUC signature scheme with appendix -template -struct LUCSS : public TF_SS -{ -}; - -// analagous to the RSA schemes defined in PKCS #1 v2.0 -typedef LUCES >::Decryptor LUCES_OAEP_SHA_Decryptor; -typedef LUCES >::Encryptor LUCES_OAEP_SHA_Encryptor; - -typedef LUCSS::Signer LUCSSA_PKCS1v15_SHA_Signer; -typedef LUCSS::Verifier LUCSSA_PKCS1v15_SHA_Verifier; - -// ******************************************************** - -// no actual precomputation -class DL_GroupPrecomputation_LUC : public DL_GroupPrecomputation -{ -public: - const AbstractGroup & GetGroup() const {assert(false); throw 0;} - Element BERDecodeElement(BufferedTransformation &bt) const {return Integer(bt);} - void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {v.DEREncode(bt);} - - // non-inherited - void SetModulus(const Integer &v) {m_p = v;} - const Integer & GetModulus() const {return m_p;} - -private: - Integer m_p; -}; - -//! _ -class DL_BasePrecomputation_LUC : public DL_FixedBasePrecomputation -{ -public: - // DL_FixedBasePrecomputation - bool IsInitialized() const {return m_g.NotZero();} - void SetBase(const DL_GroupPrecomputation &group, const Integer &base) {m_g = base;} - const Integer & GetBase(const DL_GroupPrecomputation &group) const {return m_g;} - void Precompute(const DL_GroupPrecomputation &group, unsigned int maxExpBits, unsigned int storage) {} - void Load(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation) {} - void Save(const DL_GroupPrecomputation &group, BufferedTransformation &storedPrecomputation) const {} - Integer Exponentiate(const DL_GroupPrecomputation &group, const Integer &exponent) const; - Integer CascadeExponentiate(const DL_GroupPrecomputation &group, const Integer &exponent, const DL_FixedBasePrecomputation &pc2, const Integer &exponent2) const - {throw NotImplemented("DL_BasePrecomputation_LUC: CascadeExponentiate not implemented");} // shouldn't be called - -private: - Integer m_g; -}; - -//! _ -class DL_GroupParameters_LUC : public DL_GroupParameters_IntegerBasedImpl -{ -public: - // DL_GroupParameters - bool IsIdentity(const Integer &element) const {return element == Integer::Two();} - void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; - Element MultiplyElements(const Element &a, const Element &b) const - {throw NotImplemented("LUC_GroupParameters: MultiplyElements can not be implemented");} - Element CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const - {throw NotImplemented("LUC_GroupParameters: MultiplyElements can not be implemented");} - - // NameValuePairs interface - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper(this, name, valueType, pValue).Assignable(); - } - -private: - int GetFieldType() const {return 2;} -}; - -//! _ -class DL_GroupParameters_LUC_DefaultSafePrime : public DL_GroupParameters_LUC -{ -public: - typedef NoCofactorMultiplication DefaultCofactorOption; - -protected: - unsigned int GetDefaultSubgroupOrderSize(unsigned int modulusSize) const {return modulusSize-1;} -}; - -//! _ -class DL_Algorithm_LUC_HMP : public DL_ElgamalLikeSignatureAlgorithm -{ -public: - static const char * StaticAlgorithmName() {return "LUC-HMP";} - - void Sign(const DL_GroupParameters ¶ms, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const; - bool Verify(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &e, const Integer &r, const Integer &s) const; - - size_t RLen(const DL_GroupParameters ¶ms) const - {return params.GetGroupOrder().ByteCount();} -}; - -//! _ -struct DL_SignatureKeys_LUC -{ - typedef DL_GroupParameters_LUC GroupParameters; - typedef DL_PublicKey_GFP PublicKey; - typedef DL_PrivateKey_GFP PrivateKey; -}; - -//! LUC-HMP, based on "Digital signature schemes based on Lucas functions" by Patrick Horster, Markus Michels, Holger Petersen -template -struct LUC_HMP : public DL_SS -{ -}; - -//! _ -struct DL_CryptoKeys_LUC -{ - typedef DL_GroupParameters_LUC_DefaultSafePrime GroupParameters; - typedef DL_PublicKey_GFP PublicKey; - typedef DL_PrivateKey_GFP PrivateKey; -}; - -//! LUC-IES -template -struct LUC_IES - : public DL_ES< - DL_CryptoKeys_LUC, - DL_KeyAgreementAlgorithm_DH, - DL_KeyDerivationAlgorithm_P1363 >, - DL_EncryptionAlgorithm_Xor, DHAES_MODE>, - LUC_IES<> > -{ - static std::string StaticAlgorithmName() {return "LUC-IES";} // non-standard name -}; - -// ******************************************************** - -//! LUC-DH -typedef DH_Domain LUC_DH; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.cpp deleted file mode 100644 index fe9b1186..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// mars.cpp - written and placed in the public domain by Wei Dai - -// includes IBM's key setup "tweak" proposed in August 1999 (http://www.research.ibm.com/security/key-setup.txt) - -#include "pch.h" -#include "mars.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void MARS::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - // Initialize T[] with the key data - FixedSizeSecBlock T; - GetUserKey(LITTLE_ENDIAN_ORDER, T.begin(), 15, userKey, length); - T[length/4] = length/4; - - for (unsigned int j=0; j<4; j++) // compute 10 words of K[] in each iteration - { - unsigned int i; - // Do linear transformation - for (i=0; i<15; i++) - T[i] = T[i] ^ rotlFixed(T[(i+8)%15] ^ T[(i+13)%15], 3) ^ (4*i+j); - - // Do four rounds of stirring - for (unsigned int k=0; k<4; k++) - for (i=0; i<15; i++) - T[i] = rotlFixed(T[i] + Sbox[T[(i+14)%15]%512], 9); - - // Store next 10 key words into K[] - for (i=0; i<10; i++) - m_k[10*j+i] = T[4*i%15]; - } - - // Modify multiplication key-words - for(unsigned int i = 5; i < 37; i += 2) - { - word32 m, w = m_k[i] | 3; - m = (~w ^ (w<<1)) & (~w ^ (w>>1)) & 0x7ffffffe; - m &= m>>1; m &= m>>2; m &= m>>4; - m |= m<<1; m |= m<<2; m |= m<<4; - m &= 0x7ffffffc; - w ^= rotlMod(Sbox[265 + (m_k[i] & 3)], m_k[i-1]) & m; - m_k[i] = w; - } -} - -#define S(a) Sbox[(a)&0x1ff] -#define S0(a) Sbox[(a)&0xff] -#define S1(a) Sbox[((a)&0xff) + 256] - -typedef BlockGetAndPut Block; - -void MARS::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - unsigned int i; - word32 a, b, c, d, l, m, r, t; - const word32 *k = m_k; - - Block::Get(inBlock)(a)(b)(c)(d); - - a += k[0]; b += k[1]; c += k[2]; d += k[3]; - - for (i=0; i<8; i++) - { - b = (b ^ S0(a)) + S1(a>>8); - c += S0(a>>16); - a = rotrFixed(a, 24); - d ^= S1(a); - a += (i%4==0) ? d : 0; - a += (i%4==1) ? b : 0; - t = a; a = b; b = c; c = d; d = t; - } - - for (i=0; i<16; i++) - { - t = rotlFixed(a, 13); - r = rotlFixed(t * k[2*i+5], 10); - m = a + k[2*i+4]; - l = rotlMod((S(m) ^ rotrFixed(r, 5) ^ r), r); - c += rotlMod(m, rotrFixed(r, 5)); - (i<8 ? b : d) += l; - (i<8 ? d : b) ^= r; - a = b; b = c; c = d; d = t; - } - - for (i=0; i<8; i++) - { - a -= (i%4==2) ? d : 0; - a -= (i%4==3) ? b : 0; - b ^= S1(a); - c -= S0(a>>24); - t = rotlFixed(a, 24); - d = (d - S1(a>>16)) ^ S0(t); - a = b; b = c; c = d; d = t; - } - - a -= k[36]; b -= k[37]; c -= k[38]; d -= k[39]; - - Block::Put(xorBlock, outBlock)(a)(b)(c)(d); -} - -void MARS::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - unsigned int i; - word32 a, b, c, d, l, m, r, t; - const word32 *k = m_k; - - Block::Get(inBlock)(d)(c)(b)(a); - - d += k[36]; c += k[37]; b += k[38]; a += k[39]; - - for (i=0; i<8; i++) - { - b = (b ^ S0(a)) + S1(a>>8); - c += S0(a>>16); - a = rotrFixed(a, 24); - d ^= S1(a); - a += (i%4==0) ? d : 0; - a += (i%4==1) ? b : 0; - t = a; a = b; b = c; c = d; d = t; - } - - for (i=0; i<16; i++) - { - t = rotrFixed(a, 13); - r = rotlFixed(a * k[35-2*i], 10); - m = t + k[34-2*i]; - l = rotlMod((S(m) ^ rotrFixed(r, 5) ^ r), r); - c -= rotlMod(m, rotrFixed(r, 5)); - (i<8 ? b : d) -= l; - (i<8 ? d : b) ^= r; - a = b; b = c; c = d; d = t; - } - - for (i=0; i<8; i++) - { - a -= (i%4==2) ? d : 0; - a -= (i%4==3) ? b : 0; - b ^= S1(a); - c -= S0(a>>24); - t = rotlFixed(a, 24); - d = (d - S1(a>>16)) ^ S0(t); - a = b; b = c; c = d; d = t; - } - - d -= k[0]; c -= k[1]; b -= k[2]; a -= k[3]; - - Block::Put(xorBlock, outBlock)(d)(c)(b)(a); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.h deleted file mode 100644 index 414adf42..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mars.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef CRYPTOPP_MARS_H -#define CRYPTOPP_MARS_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct MARS_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 56, 4> -{ - static const char *StaticAlgorithmName() {return "MARS";} -}; - -/// MARS -class MARS : public MARS_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - static const word32 Sbox[512]; - - FixedSizeSecBlock m_k; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef MARS::Encryption MARSEncryption; -typedef MARS::Decryption MARSDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/marss.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/marss.cpp deleted file mode 100644 index 7c38f146..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/marss.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// MARS S-Box - -#include "pch.h" -#include "mars.h" - -NAMESPACE_BEGIN(CryptoPP) - -const word32 MARS::Base::Sbox[512] = { - 0x09d0c479, 0x28c8ffe0, 0x84aa6c39, 0x9dad7287, - 0x7dff9be3, 0xd4268361, 0xc96da1d4, 0x7974cc93, - 0x85d0582e, 0x2a4b5705, 0x1ca16a62, 0xc3bd279d, - 0x0f1f25e5, 0x5160372f, 0xc695c1fb, 0x4d7ff1e4, - 0xae5f6bf4, 0x0d72ee46, 0xff23de8a, 0xb1cf8e83, - 0xf14902e2, 0x3e981e42, 0x8bf53eb6, 0x7f4bf8ac, - 0x83631f83, 0x25970205, 0x76afe784, 0x3a7931d4, - 0x4f846450, 0x5c64c3f6, 0x210a5f18, 0xc6986a26, - 0x28f4e826, 0x3a60a81c, 0xd340a664, 0x7ea820c4, - 0x526687c5, 0x7eddd12b, 0x32a11d1d, 0x9c9ef086, - 0x80f6e831, 0xab6f04ad, 0x56fb9b53, 0x8b2e095c, - 0xb68556ae, 0xd2250b0d, 0x294a7721, 0xe21fb253, - 0xae136749, 0xe82aae86, 0x93365104, 0x99404a66, - 0x78a784dc, 0xb69ba84b, 0x04046793, 0x23db5c1e, - 0x46cae1d6, 0x2fe28134, 0x5a223942, 0x1863cd5b, - 0xc190c6e3, 0x07dfb846, 0x6eb88816, 0x2d0dcc4a, - 0xa4ccae59, 0x3798670d, 0xcbfa9493, 0x4f481d45, - 0xeafc8ca8, 0xdb1129d6, 0xb0449e20, 0x0f5407fb, - 0x6167d9a8, 0xd1f45763, 0x4daa96c3, 0x3bec5958, - 0xababa014, 0xb6ccd201, 0x38d6279f, 0x02682215, - 0x8f376cd5, 0x092c237e, 0xbfc56593, 0x32889d2c, - 0x854b3e95, 0x05bb9b43, 0x7dcd5dcd, 0xa02e926c, - 0xfae527e5, 0x36a1c330, 0x3412e1ae, 0xf257f462, - 0x3c4f1d71, 0x30a2e809, 0x68e5f551, 0x9c61ba44, - 0x5ded0ab8, 0x75ce09c8, 0x9654f93e, 0x698c0cca, - 0x243cb3e4, 0x2b062b97, 0x0f3b8d9e, 0x00e050df, - 0xfc5d6166, 0xe35f9288, 0xc079550d, 0x0591aee8, - 0x8e531e74, 0x75fe3578, 0x2f6d829a, 0xf60b21ae, - 0x95e8eb8d, 0x6699486b, 0x901d7d9b, 0xfd6d6e31, - 0x1090acef, 0xe0670dd8, 0xdab2e692, 0xcd6d4365, - 0xe5393514, 0x3af345f0, 0x6241fc4d, 0x460da3a3, - 0x7bcf3729, 0x8bf1d1e0, 0x14aac070, 0x1587ed55, - 0x3afd7d3e, 0xd2f29e01, 0x29a9d1f6, 0xefb10c53, - 0xcf3b870f, 0xb414935c, 0x664465ed, 0x024acac7, - 0x59a744c1, 0x1d2936a7, 0xdc580aa6, 0xcf574ca8, - 0x040a7a10, 0x6cd81807, 0x8a98be4c, 0xaccea063, - 0xc33e92b5, 0xd1e0e03d, 0xb322517e, 0x2092bd13, - 0x386b2c4a, 0x52e8dd58, 0x58656dfb, 0x50820371, - 0x41811896, 0xe337ef7e, 0xd39fb119, 0xc97f0df6, - 0x68fea01b, 0xa150a6e5, 0x55258962, 0xeb6ff41b, - 0xd7c9cd7a, 0xa619cd9e, 0xbcf09576, 0x2672c073, - 0xf003fb3c, 0x4ab7a50b, 0x1484126a, 0x487ba9b1, - 0xa64fc9c6, 0xf6957d49, 0x38b06a75, 0xdd805fcd, - 0x63d094cf, 0xf51c999e, 0x1aa4d343, 0xb8495294, - 0xce9f8e99, 0xbffcd770, 0xc7c275cc, 0x378453a7, - 0x7b21be33, 0x397f41bd, 0x4e94d131, 0x92cc1f98, - 0x5915ea51, 0x99f861b7, 0xc9980a88, 0x1d74fd5f, - 0xb0a495f8, 0x614deed0, 0xb5778eea, 0x5941792d, - 0xfa90c1f8, 0x33f824b4, 0xc4965372, 0x3ff6d550, - 0x4ca5fec0, 0x8630e964, 0x5b3fbbd6, 0x7da26a48, - 0xb203231a, 0x04297514, 0x2d639306, 0x2eb13149, - 0x16a45272, 0x532459a0, 0x8e5f4872, 0xf966c7d9, - 0x07128dc0, 0x0d44db62, 0xafc8d52d, 0x06316131, - 0xd838e7ce, 0x1bc41d00, 0x3a2e8c0f, 0xea83837e, - 0xb984737d, 0x13ba4891, 0xc4f8b949, 0xa6d6acb3, - 0xa215cdce, 0x8359838b, 0x6bd1aa31, 0xf579dd52, - 0x21b93f93, 0xf5176781, 0x187dfdde, 0xe94aeb76, - 0x2b38fd54, 0x431de1da, 0xab394825, 0x9ad3048f, - 0xdfea32aa, 0x659473e3, 0x623f7863, 0xf3346c59, - 0xab3ab685, 0x3346a90b, 0x6b56443e, 0xc6de01f8, - 0x8d421fc0, 0x9b0ed10c, 0x88f1a1e9, 0x54c1f029, - 0x7dead57b, 0x8d7ba426, 0x4cf5178a, 0x551a7cca, - 0x1a9a5f08, 0xfcd651b9, 0x25605182, 0xe11fc6c3, - 0xb6fd9676, 0x337b3027, 0xb7c8eb14, 0x9e5fd030, - 0x6b57e354, 0xad913cf7, 0x7e16688d, 0x58872a69, - 0x2c2fc7df, 0xe389ccc6, 0x30738df1, 0x0824a734, - 0xe1797a8b, 0xa4a8d57b, 0x5b5d193b, 0xc8a8309b, - 0x73f9a978, 0x73398d32, 0x0f59573e, 0xe9df2b03, - 0xe8a5b6c8, 0x848d0704, 0x98df93c2, 0x720a1dc3, - 0x684f259a, 0x943ba848, 0xa6370152, 0x863b5ea3, - 0xd17b978b, 0x6d9b58ef, 0x0a700dd4, 0xa73d36bf, - 0x8e6a0829, 0x8695bc14, 0xe35b3447, 0x933ac568, - 0x8894b022, 0x2f511c27, 0xddfbcc3c, 0x006662b6, - 0x117c83fe, 0x4e12b414, 0xc2bca766, 0x3a2fec10, - 0xf4562420, 0x55792e2a, 0x46f5d857, 0xceda25ce, - 0xc3601d3b, 0x6c00ab46, 0xefac9c28, 0xb3c35047, - 0x611dfee3, 0x257c3207, 0xfdd58482, 0x3b14d84f, - 0x23becb64, 0xa075f3a3, 0x088f8ead, 0x07adf158, - 0x7796943c, 0xfacabf3d, 0xc09730cd, 0xf7679969, - 0xda44e9ed, 0x2c854c12, 0x35935fa3, 0x2f057d9f, - 0x690624f8, 0x1cb0bafd, 0x7b0dbdc6, 0x810f23bb, - 0xfa929a1a, 0x6d969a17, 0x6742979b, 0x74ac7d05, - 0x010e65c4, 0x86a3d963, 0xf907b5a0, 0xd0042bd3, - 0x158d7d03, 0x287a8255, 0xbba8366f, 0x096edc33, - 0x21916a7b, 0x77b56b86, 0x951622f9, 0xa6c5e650, - 0x8cea17d1, 0xcd8c62bc, 0xa3d63433, 0x358a68fd, - 0x0f9b9d3c, 0xd6aa295b, 0xfe33384a, 0xc000738e, - 0xcd67eb2f, 0xe2eb6dc2, 0x97338b02, 0x06c9f246, - 0x419cf1ad, 0x2b83c045, 0x3723f18a, 0xcb5b3089, - 0x160bead7, 0x5d494656, 0x35f8a74b, 0x1e4e6c9e, - 0x000399bd, 0x67466880, 0xb4174831, 0xacf423b2, - 0xca815ab3, 0x5a6395e7, 0x302a67c5, 0x8bdb446b, - 0x108f8fa4, 0x10223eda, 0x92b8b48b, 0x7f38d0ee, - 0xab2701d4, 0x0262d415, 0xaf224a30, 0xb3d88aba, - 0xf8b2c3af, 0xdaf7ef70, 0xcc97d3b7, 0xe9614b6c, - 0x2baebff4, 0x70f687cf, 0x386c9156, 0xce092ee5, - 0x01e87da6, 0x6ce91e6a, 0xbb7bcc84, 0xc7922c20, - 0x9d3b71fd, 0x060e41c6, 0xd7590f15, 0x4e03bb47, - 0x183c198e, 0x63eeb240, 0x2ddbf49a, 0x6d5cba54, - 0x923750af, 0xf9e14236, 0x7838162b, 0x59726c72, - 0x81b66760, 0xbb2926c1, 0x48a0ce0d, 0xa6c0496d, - 0xad43507b, 0x718d496a, 0x9df057af, 0x44b1bde6, - 0x054356dc, 0xde7ced35, 0xd51a138b, 0x62088cc9, - 0x35830311, 0xc96efca2, 0x686f86ec, 0x8e77cb68, - 0x63e1d6b8, 0xc80f9778, 0x79c491fd, 0x1b4c67f2, - 0x72698d7d, 0x5e368c31, 0xf7d95e2e, 0xa1d3493f, - 0xdcd9433e, 0x896f1552, 0x4bc4ca7a, 0xa6d1baf4, - 0xa5a96dcc, 0x0bef8b46, 0xa169fda7, 0x74df40b7, - 0x4e208804, 0x9a756607, 0x038e87c8, 0x20211e44, - 0x8b7ad4bf, 0xc6403f35, 0x1848e36d, 0x80bdb038, - 0x1e62891c, 0x643d2107, 0xbf04d6f8, 0x21092c8c, - 0xf644f389, 0x0778404e, 0x7b78adb8, 0xa2c52d53, - 0x42157abe, 0xa2253e2e, 0x7bf3f4ae, 0x80f594f9, - 0x953194e7, 0x77eb92ed, 0xb3816930, 0xda8d9336, - 0xbf447469, 0xf26d9483, 0xee6faed5, 0x71371235, - 0xde425f73, 0xb4e59f43, 0x7dbe2d4e, 0x2d37b185, - 0x49dc9a63, 0x98c39d98, 0x1301c9a2, 0x389b1bbf, - 0x0c18588d, 0xa421c1ba, 0x7aa3865c, 0x71e08558, - 0x3c5cfcaa, 0x7d239ca4, 0x0297d9dd, 0xd7dc2830, - 0x4b37802b, 0x7428ab54, 0xaeee0347, 0x4b3fbb85, - 0x692f2f08, 0x134e578e, 0x36d9e0bf, 0xae8b5fcf, - 0xedb93ecf, 0x2b27248e, 0x170eb1ef, 0x7dc57fd6, - 0x1e760f16, 0xb1136601, 0x864e1b9b, 0xd7ea7319, - 0x3ab871bd, 0xcfa4d76f, 0xe31bd782, 0x0dbeb469, - 0xabb96061, 0x5370f85d, 0xffb07e37, 0xda30d0fb, - 0xebc977b6, 0x0b98b40f, 0x3a4d0fe6, 0xdf4fc26b, - 0x159cf22a, 0xc298d6e2, 0x2b78ef6a, 0x61a94ac0, - 0xab561187, 0x14eea0f0, 0xdf0d4164, 0x19af70ee -}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/md2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/md2.cpp deleted file mode 100644 index 41f714b5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/md2.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// md2.cpp - modified by Wei Dai from Andrew M. Kuchling's md2.c -// The original code and all modifications are in the public domain. - -// This is the original introductory comment: - -/* - * md2.c : MD2 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. - * - */ - -#include "pch.h" -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "md2.h" - -NAMESPACE_BEGIN(CryptoPP) -namespace Weak1 { - -MD2::MD2() - : m_X(48), m_C(16), m_buf(16) -{ - Init(); -} - -void MD2::Init() -{ - memset(m_X, 0, 48); - memset(m_C, 0, 16); - memset(m_buf, 0, 16); - m_count = 0; -} - -void MD2::Update(const byte *buf, size_t len) -{ - static const byte S[256] = { - 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, - 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, - 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, - 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, - 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, - 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, - 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, - 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, - 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, - 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, - 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, - 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, - 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, - 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, - 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, - 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, - 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, - 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 - }; - - while (len) - { - unsigned int L = UnsignedMin(16U-m_count, len); - memcpy(m_buf+m_count, buf, L); - m_count+=L; - buf+=L; - len-=L; - if (m_count==16) - { - byte t; - int i,j; - - m_count=0; - memcpy(m_X+16, m_buf, 16); - t=m_C[15]; - for(i=0; i<16; i++) - { - m_X[32+i]=m_X[16+i]^m_X[i]; - t=m_C[i]^=S[m_buf[i]^t]; - } - - t=0; - for(i=0; i<18; i++) - { - for(j=0; j<48; j+=8) - { - t=m_X[j+0]^=S[t]; - t=m_X[j+1]^=S[t]; - t=m_X[j+2]^=S[t]; - t=m_X[j+3]^=S[t]; - t=m_X[j+4]^=S[t]; - t=m_X[j+5]^=S[t]; - t=m_X[j+6]^=S[t]; - t=m_X[j+7]^=S[t]; - } - t=(t+i) & 0xFF; - } - } - } -} - -void MD2::TruncatedFinal(byte *hash, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - byte padding[16]; - word32 padlen; - unsigned int i; - - padlen= 16-m_count; - for(i=0; iMD2 -class MD2 : public HashTransformation -{ -public: - MD2(); - void Update(const byte *input, size_t length); - void TruncatedFinal(byte *hash, size_t size); - unsigned int DigestSize() const {return DIGESTSIZE;} - unsigned int BlockSize() const {return BLOCKSIZE;} - static const char * StaticAlgorithmName() {return "MD2";} - - CRYPTOPP_CONSTANT(DIGESTSIZE = 16) - CRYPTOPP_CONSTANT(BLOCKSIZE = 16) - -private: - void Transform(); - void Init(); - SecByteBlock m_X, m_C, m_buf; - unsigned int m_count; -}; - -} -#if CRYPTOPP_ENABLE_NAMESPACE_WEAK >= 1 -namespace Weak {using namespace Weak1;} // import Weak1 into CryptoPP::Weak -#else -using namespace Weak1; // import Weak1 into CryptoPP with warning -#ifdef __GNUC__ -#warning "You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning." -#else -#pragma message("You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning.") -#endif -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.cpp deleted file mode 100644 index 9ed639cb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// md4.cpp - 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. - * - */ - -#include "pch.h" -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "md4.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) -namespace Weak1 { - -void MD4::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; -} - -void MD4::Transform (word32 *digest, const word32 *in) -{ -// #define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#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)) - - word32 A, B, C, D; - - A=digest[0]; - B=digest[1]; - C=digest[2]; - D=digest[3]; - -#define function(a,b,c,d,k,s) a=rotlFixed(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 -#define function(a,b,c,d,k,s) a=rotlFixed(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 -#define function(a,b,c,d,k,s) a=rotlFixed(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); - - digest[0]+=A; - digest[1]+=B; - digest[2]+=C; - digest[3]+=D; -} - -} -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.h deleted file mode 100644 index 53387003..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/md4.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef CRYPTOPP_MD4_H -#define CRYPTOPP_MD4_H - -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -namespace Weak1 { - -//! MD4 -/*! \warning MD4 is considered insecure, and should not be used - unless you absolutely need it for compatibility. */ -class MD4 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char *StaticAlgorithmName() {return "MD4";} -}; - -} -#if CRYPTOPP_ENABLE_NAMESPACE_WEAK >= 1 -namespace Weak {using namespace Weak1;} // import Weak1 into CryptoPP::Weak -#else -using namespace Weak1; // import Weak1 into CryptoPP with warning -#ifdef __GNUC__ -#warning "You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning." -#else -#pragma message("You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning.") -#endif -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.cpp deleted file mode 100644 index a5229781..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// md5.cpp - modified by Wei Dai from Colin Plumb's public domain md5.c -// any modifications are placed in the public domain - -#include "pch.h" -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "md5.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) -namespace Weak1 { - -void MD5_TestInstantiations() -{ - MD5 x; -} - -void MD5::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; -} - -void MD5::Transform (word32 *digest, const word32 *in) -{ -// #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)) - -#define MD5STEP(f, w, x, y, z, data, s) \ - w = rotlFixed(w + f(x, y, z) + data, s) + x - - word32 a, b, c, d; - - a=digest[0]; - b=digest[1]; - c=digest[2]; - d=digest[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); - - digest[0]+=a; - digest[1]+=b; - digest[2]+=c; - digest[3]+=d; -} - -} -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.h deleted file mode 100644 index 73ec5326..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/md5.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CRYPTOPP_MD5_H -#define CRYPTOPP_MD5_H - -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -namespace Weak1 { - -//! MD5 -class MD5 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char * StaticAlgorithmName() {return "MD5";} -}; - -} -#if CRYPTOPP_ENABLE_NAMESPACE_WEAK >= 1 -namespace Weak {using namespace Weak1;} // import Weak1 into CryptoPP::Weak -#else -using namespace Weak1; // import Weak1 into CryptoPP with warning -#ifdef __GNUC__ -#warning "You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning." -#else -#pragma message("You may be using a weak algorithm that has been retained for backwards compatibility. Please '#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1' before including this .h file and prepend the class name with 'Weak::' to remove this warning.") -#endif -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mdc.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/mdc.h deleted file mode 100644 index cc90cdc4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mdc.h +++ /dev/null @@ -1,72 +0,0 @@ - // mdc.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_MDC_H -#define CRYPTOPP_MDC_H - -/** \file -*/ - -#include "seckey.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -struct MDC_Info : public FixedBlockSize, public FixedKeyLength -{ - static std::string StaticAlgorithmName() {return std::string("MDC/")+T::StaticAlgorithmName();} -}; - -//! MDC -/*! a construction by Peter Gutmann to turn an iterated hash function into a PRF */ -template -class MDC : public MDC_Info -{ - class CRYPTOPP_NO_VTABLE Enc : public BlockCipherImpl > - { - typedef typename T::HashWordType HashWordType; - - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms) - { - this->AssertValidKeyLength(length); - memcpy_s(m_key, m_key.size(), userKey, this->KEYLENGTH); - T::CorrectEndianess(Key(), Key(), this->KEYLENGTH); - } - - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const - { - T::CorrectEndianess(Buffer(), (HashWordType *)inBlock, this->BLOCKSIZE); - T::Transform(Buffer(), Key()); - if (xorBlock) - { - T::CorrectEndianess(Buffer(), Buffer(), this->BLOCKSIZE); - xorbuf(outBlock, xorBlock, m_buffer, this->BLOCKSIZE); - } - else - T::CorrectEndianess((HashWordType *)outBlock, Buffer(), this->BLOCKSIZE); - } - - bool IsPermutation() const {return false;} - - unsigned int OptimalDataAlignment() const {return sizeof(HashWordType);} - - private: - HashWordType *Key() {return (HashWordType *)m_key.data();} - const HashWordType *Key() const {return (const HashWordType *)m_key.data();} - HashWordType *Buffer() const {return (HashWordType *)m_buffer.data();} - - // VC60 workaround: bug triggered if using FixedSizeAllocatorWithCleanup - FixedSizeSecBlock::KEYLENGTH, AllocatorWithCleanup > m_key; - mutable FixedSizeSecBlock::BLOCKSIZE, AllocatorWithCleanup > m_buffer; - }; - -public: - //! use BlockCipher interface - typedef BlockCipherFinal Encryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/misc.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/misc.cpp deleted file mode 100644 index 3c2c2a5f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/misc.cpp +++ /dev/null @@ -1,187 +0,0 @@ -// misc.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "misc.h" -#include "words.h" -#include - -#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX) -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -void xorbuf(byte *buf, const byte *mask, size_t count) -{ - size_t i; - - if (IsAligned(buf) && IsAligned(mask)) - { - if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned(buf) && IsAligned(mask)) - { - for (i=0; i(output) && IsAligned(input) && IsAligned(mask)) - { - if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned(output) && IsAligned(input) && IsAligned(mask)) - { - for (i=0; i(buf) && IsAligned(mask)) - { - word32 acc32 = 0; - if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned(buf) && IsAligned(mask)) - { - word64 acc64 = 0; - for (i=0; i>32); - } - - for (i=0; i>8) | byte(acc32>>16) | byte(acc32>>24); - } - - for (i=0; i // for memcpy and memmove - -#ifdef _MSC_VER - #if _MSC_VER >= 1400 - // VC2005 workaround: disable declarations that conflict with winnt.h - #define _interlockedbittestandset CRYPTOPP_DISABLED_INTRINSIC_1 - #define _interlockedbittestandreset CRYPTOPP_DISABLED_INTRINSIC_2 - #define _interlockedbittestandset64 CRYPTOPP_DISABLED_INTRINSIC_3 - #define _interlockedbittestandreset64 CRYPTOPP_DISABLED_INTRINSIC_4 - #include - #undef _interlockedbittestandset - #undef _interlockedbittestandreset - #undef _interlockedbittestandset64 - #undef _interlockedbittestandreset64 - #define CRYPTOPP_FAST_ROTATE(x) 1 - #elif _MSC_VER >= 1300 - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32 | (x) == 64) - #else - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32) - #endif -#elif (defined(__MWERKS__) && TARGET_CPU_PPC) || \ - (defined(__GNUC__) && (defined(_ARCH_PWR2) || defined(_ARCH_PWR) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || defined(_ARCH_COM))) - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32) -#elif defined(__GNUC__) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86) // depend on GCC's peephole optimization to generate rotate instructions - #define CRYPTOPP_FAST_ROTATE(x) 1 -#else - #define CRYPTOPP_FAST_ROTATE(x) 0 -#endif - -#ifdef __BORLANDC__ -#include -#endif - -#if defined(__GNUC__) && defined(__linux__) -#define CRYPTOPP_BYTESWAP_AVAILABLE -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -// ************** compile-time assertion *************** - -template -struct CompileAssert -{ - static char dummy[2*b-1]; -}; - -#define CRYPTOPP_COMPILE_ASSERT(assertion) CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, __LINE__) -#if defined(CRYPTOPP_EXPORTS) || defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) -#else -#define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) static CompileAssert<(assertion)> CRYPTOPP_ASSERT_JOIN(cryptopp_assert_, instance) -#endif -#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y) -#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y - -// ************** misc classes *************** - -class CRYPTOPP_DLL Empty -{ -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE TwoBases : public BASE1, public BASE2 -{ -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE ThreeBases : public BASE1, public BASE2, public BASE3 -{ -}; - -template -class ObjectHolder -{ -protected: - T m_object; -}; - -class NotCopyable -{ -public: - NotCopyable() {} -private: - NotCopyable(const NotCopyable &); - void operator=(const NotCopyable &); -}; - -template -struct NewObject -{ - T* operator()() const {return new T;} -}; - -/*! This function safely initializes a static object in a multithreaded environment without using locks (for portability). - Note that if two threads call Ref() at the same time, they may get back different references, and one object - may end up being memory leaked. This is by design. -*/ -template , int instance=0> -class Singleton -{ -public: - Singleton(F objectFactory = F()) : m_objectFactory(objectFactory) {} - - // prevent this function from being inlined - CRYPTOPP_NOINLINE const T & Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const; - -private: - F m_objectFactory; -}; - -template -const T & Singleton::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const -{ - static volatile simple_ptr s_pObject; - T *p = s_pObject.m_p; - - if (p) - return *p; - - T *newObject = m_objectFactory(); - p = s_pObject.m_p; - - if (p) - { - delete newObject; - return *p; - } - - s_pObject.m_p = newObject; - return *newObject; -} - -// ************** misc functions *************** - -#if (!__STDC_WANT_SECURE_LIB__) -inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count) -{ - if (count > sizeInBytes) - throw InvalidArgument("memcpy_s: buffer overflow"); - memcpy(dest, src, count); -} - -inline void memmove_s(void *dest, size_t sizeInBytes, const void *src, size_t count) -{ - if (count > sizeInBytes) - throw InvalidArgument("memmove_s: buffer overflow"); - memmove(dest, src, count); -} - -#if __BORLANDC__ >= 0x620 -// C++Builder 2010 workaround: can't use std::memcpy_s because it doesn't allow 0 lengths -#define memcpy_s CryptoPP::memcpy_s -#define memmove_s CryptoPP::memmove_s -#endif -#endif - -inline void * memset_z(void *ptr, int value, size_t num) -{ -// avoid extranous warning on GCC 4.3.2 Ubuntu 8.10 -#if CRYPTOPP_GCC_VERSION >= 30001 - if (__builtin_constant_p(num) && num==0) - return ptr; -#endif - return memset(ptr, value, num); -} - -// can't use std::min or std::max in MSVC60 or Cygwin 1.1.0 -template inline const T& STDMIN(const T& a, const T& b) -{ - return b < a ? b : a; -} - -template inline const T1 UnsignedMin(const T1& a, const T2& b) -{ - CRYPTOPP_COMPILE_ASSERT((sizeof(T1)<=sizeof(T2) && T2(-1)>0) || (sizeof(T1)>sizeof(T2) && T1(-1)>0)); - assert(a==0 || a>0); // GCC workaround: get rid of the warning "comparison is always true due to limited range of data type" - assert(b>=0); - - if (sizeof(T1)<=sizeof(T2)) - return b < (T2)a ? (T1)b : a; - else - return (T1)b < a ? (T1)b : a; -} - -template inline const T& STDMAX(const T& a, const T& b) -{ - return a < b ? b : a; -} - -#define RETURN_IF_NONZERO(x) size_t returnedValue = x; if (returnedValue) return returnedValue - -// this version of the macro is fastest on Pentium 3 and Pentium 4 with MSVC 6 SP5 w/ Processor Pack -#define GETBYTE(x, y) (unsigned int)byte((x)>>(8*(y))) -// these may be faster on other CPUs/compilers -// #define GETBYTE(x, y) (unsigned int)(((x)>>(8*(y)))&255) -// #define GETBYTE(x, y) (((byte *)&(x))[y]) - -#define CRYPTOPP_GET_BYTE_AS_BYTE(x, y) byte((x)>>(8*(y))) - -template -unsigned int Parity(T value) -{ - for (unsigned int i=8*sizeof(value)/2; i>0; i/=2) - value ^= value >> i; - return (unsigned int)value&1; -} - -template -unsigned int BytePrecision(const T &value) -{ - if (!value) - return 0; - - unsigned int l=0, h=8*sizeof(value); - - while (h-l > 8) - { - unsigned int t = (l+h)/2; - if (value >> t) - l = t; - else - h = t; - } - - return h/8; -} - -template -unsigned int BitPrecision(const T &value) -{ - if (!value) - return 0; - - unsigned int l=0, h=8*sizeof(value); - - while (h-l > 1) - { - unsigned int t = (l+h)/2; - if (value >> t) - l = t; - else - h = t; - } - - return h; -} - -inline unsigned int TrailingZeros(word32 v) -{ -#if defined(__GNUC__) && CRYPTOPP_GCC_VERSION >= 30400 - return __builtin_ctz(v); -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - unsigned long result; - _BitScanForward(&result, v); - return result; -#else - // from http://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightMultLookup - static const int MultiplyDeBruijnBitPosition[32] = - { - 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, - 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 - }; - return MultiplyDeBruijnBitPosition[((word32)((v & -v) * 0x077CB531U)) >> 27]; -#endif -} - -inline unsigned int TrailingZeros(word64 v) -{ -#if defined(__GNUC__) && CRYPTOPP_GCC_VERSION >= 30400 - return __builtin_ctzll(v); -#elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_X64) || defined(_M_IA64)) - unsigned long result; - _BitScanForward64(&result, v); - return result; -#else - return word32(v) ? TrailingZeros(word32(v)) : 32 + TrailingZeros(word32(v>>32)); -#endif -} - -template -inline T Crop(T value, size_t size) -{ - if (size < 8*sizeof(value)) - return T(value & ((T(1) << size) - 1)); - else - return value; -} - -template -inline bool SafeConvert(T1 from, T2 &to) -{ - to = (T2)from; - if (from != to || (from > 0) != (to > 0)) - return false; - return true; -} - -inline size_t BitsToBytes(size_t bitCount) -{ - return ((bitCount+7)/(8)); -} - -inline size_t BytesToWords(size_t byteCount) -{ - return ((byteCount+WORD_SIZE-1)/WORD_SIZE); -} - -inline size_t BitsToWords(size_t bitCount) -{ - return ((bitCount+WORD_BITS-1)/(WORD_BITS)); -} - -inline size_t BitsToDwords(size_t bitCount) -{ - return ((bitCount+2*WORD_BITS-1)/(2*WORD_BITS)); -} - -CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *buf, const byte *mask, size_t count); -CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *output, const byte *input, const byte *mask, size_t count); - -CRYPTOPP_DLL bool CRYPTOPP_API VerifyBufsEqual(const byte *buf1, const byte *buf2, size_t count); - -template -inline bool IsPowerOf2(const T &n) -{ - return n > 0 && (n & (n-1)) == 0; -} - -template -inline T2 ModPowerOf2(const T1 &a, const T2 &b) -{ - assert(IsPowerOf2(b)); - return T2(a) & (b-1); -} - -template -inline T1 RoundDownToMultipleOf(const T1 &n, const T2 &m) -{ - if (IsPowerOf2(m)) - return n - ModPowerOf2(n, m); - else - return n - n%m; -} - -template -inline T1 RoundUpToMultipleOf(const T1 &n, const T2 &m) -{ - if (n+m-1 < n) - throw InvalidArgument("RoundUpToMultipleOf: integer overflow"); - return RoundDownToMultipleOf(n+m-1, m); -} - -template -inline unsigned int GetAlignmentOf(T *dummy=NULL) // VC60 workaround -{ -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (sizeof(T) < 16) - return 1; -#endif - -#if (_MSC_VER >= 1300) - return __alignof(T); -#elif defined(__GNUC__) - return __alignof__(T); -#elif CRYPTOPP_BOOL_SLOW_WORD64 - return UnsignedMin(4U, sizeof(T)); -#else - return sizeof(T); -#endif -} - -inline bool IsAlignedOn(const void *p, unsigned int alignment) -{ - return alignment==1 || (IsPowerOf2(alignment) ? ModPowerOf2((size_t)p, alignment) == 0 : (size_t)p % alignment == 0); -} - -template -inline bool IsAligned(const void *p, T *dummy=NULL) // VC60 workaround -{ - return IsAlignedOn(p, GetAlignmentOf()); -} - -#ifdef IS_LITTLE_ENDIAN - typedef LittleEndian NativeByteOrder; -#else - typedef BigEndian NativeByteOrder; -#endif - -inline ByteOrder GetNativeByteOrder() -{ - return NativeByteOrder::ToEnum(); -} - -inline bool NativeByteOrderIs(ByteOrder order) -{ - return order == GetNativeByteOrder(); -} - -template -std::string IntToString(T a, unsigned int base = 10) -{ - if (a == 0) - return "0"; - bool negate = false; - if (a < 0) - { - negate = true; - a = 0-a; // VC .NET does not like -a - } - std::string result; - while (a > 0) - { - T digit = a % base; - result = char((digit < 10 ? '0' : ('a' - 10)) + digit) + result; - a /= base; - } - if (negate) - result = "-" + result; - return result; -} - -template -inline T1 SaturatingSubtract(const T1 &a, const T2 &b) -{ - return T1((a > b) ? (a - b) : 0); -} - -template -inline CipherDir GetCipherDir(const T &obj) -{ - return obj.IsForwardTransformation() ? ENCRYPTION : DECRYPTION; -} - -CRYPTOPP_DLL void CRYPTOPP_API CallNewHandler(); - -inline void IncrementCounterByOne(byte *inout, unsigned int s) -{ - for (int i=s-1, carry=1; i>=0 && carry; i--) - carry = !++inout[i]; -} - -inline void IncrementCounterByOne(byte *output, const byte *input, unsigned int s) -{ - int i, carry; - for (i=s-1, carry=1; i>=0 && carry; i--) - carry = ((output[i] = input[i]+1) == 0); - memcpy_s(output, s, input, i+1); -} - -template -inline void ConditionalSwap(bool c, T &a, T &b) -{ - T t = c * (a ^ b); - a ^= t; - b ^= t; -} - -template -inline void ConditionalSwapPointers(bool c, T &a, T &b) -{ - ptrdiff_t t = c * (a - b); - a -= t; - b += t; -} - -// see http://www.dwheeler.com/secure-programs/Secure-Programs-HOWTO/protect-secrets.html -// and https://www.securecoding.cert.org/confluence/display/cplusplus/MSC06-CPP.+Be+aware+of+compiler+optimization+when+dealing+with+sensitive+data -template -void SecureWipeBuffer(T *buf, size_t n) -{ - // GCC 4.3.2 on Cygwin optimizes away the first store if this loop is done in the forward direction - volatile T *p = buf+n; - while (n--) - *(--p) = 0; -} - -#if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86) - -template<> inline void SecureWipeBuffer(byte *buf, size_t n) -{ - volatile byte *p = buf; -#ifdef __GNUC__ - asm volatile("rep stosb" : "+c"(n), "+D"(p) : "a"(0) : "memory"); -#else - __stosb((byte *)(size_t)p, 0, n); -#endif -} - -template<> inline void SecureWipeBuffer(word16 *buf, size_t n) -{ - volatile word16 *p = buf; -#ifdef __GNUC__ - asm volatile("rep stosw" : "+c"(n), "+D"(p) : "a"(0) : "memory"); -#else - __stosw((word16 *)(size_t)p, 0, n); -#endif -} - -template<> inline void SecureWipeBuffer(word32 *buf, size_t n) -{ - volatile word32 *p = buf; -#ifdef __GNUC__ - asm volatile("rep stosl" : "+c"(n), "+D"(p) : "a"(0) : "memory"); -#else - __stosd((unsigned long *)(size_t)p, 0, n); -#endif -} - -template<> inline void SecureWipeBuffer(word64 *buf, size_t n) -{ -#if CRYPTOPP_BOOL_X64 - volatile word64 *p = buf; -#ifdef __GNUC__ - asm volatile("rep stosq" : "+c"(n), "+D"(p) : "a"(0) : "memory"); -#else - __stosq((word64 *)(size_t)p, 0, n); -#endif -#else - SecureWipeBuffer((word32 *)buf, 2*n); -#endif -} - -#endif // #if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86) - -template -inline void SecureWipeArray(T *buf, size_t n) -{ - if (sizeof(T) % 8 == 0 && GetAlignmentOf() % GetAlignmentOf() == 0) - SecureWipeBuffer((word64 *)buf, n * (sizeof(T)/8)); - else if (sizeof(T) % 4 == 0 && GetAlignmentOf() % GetAlignmentOf() == 0) - SecureWipeBuffer((word32 *)buf, n * (sizeof(T)/4)); - else if (sizeof(T) % 2 == 0 && GetAlignmentOf() % GetAlignmentOf() == 0) - SecureWipeBuffer((word16 *)buf, n * (sizeof(T)/2)); - else - SecureWipeBuffer((byte *)buf, n * sizeof(T)); -} - -// this function uses wcstombs(), which assumes that setlocale() has been called -static std::string StringNarrow(const wchar_t *str, bool throwOnError = true) -{ -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4996) // 'wcstombs': This function or variable may be unsafe. -#endif - size_t size = wcstombs(NULL, str, 0); - if (size == size_t(0)-1) - { - if (throwOnError) - throw InvalidArgument("StringNarrow: wcstombs() call failed"); - else - return std::string(); - } - std::string result(size, 0); - wcstombs(&result[0], str, size); - return result; -#ifdef _MSC_VER -#pragma warning(pop) -#endif -} - -#if CRYPTOPP_BOOL_ALIGN16_ENABLED -CRYPTOPP_DLL void * CRYPTOPP_API AlignedAllocate(size_t size); -CRYPTOPP_DLL void CRYPTOPP_API AlignedDeallocate(void *p); -#endif - -CRYPTOPP_DLL void * CRYPTOPP_API UnalignedAllocate(size_t size); -CRYPTOPP_DLL void CRYPTOPP_API UnalignedDeallocate(void *p); - -// ************** rotate functions *************** - -template inline T rotlFixed(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x<>(sizeof(T)*8-y))); -} - -template inline T rotrFixed(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -template inline T rotlVariable(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x<>(sizeof(T)*8-y))); -} - -template inline T rotrVariable(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -template inline T rotlMod(T x, unsigned int y) -{ - y %= sizeof(T)*8; - return T((x<>(sizeof(T)*8-y))); -} - -template inline T rotrMod(T x, unsigned int y) -{ - y %= sizeof(T)*8; - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -#ifdef _MSC_VER - -template<> inline word32 rotlFixed(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _lrotl(x, y) : x; -} - -template<> inline word32 rotrFixed(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _lrotr(x, y) : x; -} - -template<> inline word32 rotlVariable(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _lrotl(x, y); -} - -template<> inline word32 rotrVariable(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _lrotr(x, y); -} - -template<> inline word32 rotlMod(word32 x, unsigned int y) -{ - return _lrotl(x, y); -} - -template<> inline word32 rotrMod(word32 x, unsigned int y) -{ - return _lrotr(x, y); -} - -#endif // #ifdef _MSC_VER - -#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) -// Intel C++ Compiler 10.0 calls a function instead of using the rotate instruction when using these instructions - -template<> inline word64 rotlFixed(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl64(x, y) : x; -} - -template<> inline word64 rotrFixed(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr64(x, y) : x; -} - -template<> inline word64 rotlVariable(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl64(x, y); -} - -template<> inline word64 rotrVariable(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr64(x, y); -} - -template<> inline word64 rotlMod(word64 x, unsigned int y) -{ - return _rotl64(x, y); -} - -template<> inline word64 rotrMod(word64 x, unsigned int y) -{ - return _rotr64(x, y); -} - -#endif // #if _MSC_VER >= 1310 - -#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) -// Intel C++ Compiler 10.0 gives undefined externals with these - -template<> inline word16 rotlFixed(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl16(x, y) : x; -} - -template<> inline word16 rotrFixed(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr16(x, y) : x; -} - -template<> inline word16 rotlVariable(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl16(x, y); -} - -template<> inline word16 rotrVariable(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr16(x, y); -} - -template<> inline word16 rotlMod(word16 x, unsigned int y) -{ - return _rotl16(x, y); -} - -template<> inline word16 rotrMod(word16 x, unsigned int y) -{ - return _rotr16(x, y); -} - -template<> inline byte rotlFixed(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl8(x, y) : x; -} - -template<> inline byte rotrFixed(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr8(x, y) : x; -} - -template<> inline byte rotlVariable(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl8(x, y); -} - -template<> inline byte rotrVariable(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr8(x, y); -} - -template<> inline byte rotlMod(byte x, unsigned int y) -{ - return _rotl8(x, y); -} - -template<> inline byte rotrMod(byte x, unsigned int y) -{ - return _rotr8(x, y); -} - -#endif // #if _MSC_VER >= 1400 - -#if (defined(__MWERKS__) && TARGET_CPU_PPC) - -template<> inline word32 rotlFixed(word32 x, unsigned int y) -{ - assert(y < 32); - return y ? __rlwinm(x,y,0,31) : x; -} - -template<> inline word32 rotrFixed(word32 x, unsigned int y) -{ - assert(y < 32); - return y ? __rlwinm(x,32-y,0,31) : x; -} - -template<> inline word32 rotlVariable(word32 x, unsigned int y) -{ - assert(y < 32); - return (__rlwnm(x,y,0,31)); -} - -template<> inline word32 rotrVariable(word32 x, unsigned int y) -{ - assert(y < 32); - return (__rlwnm(x,32-y,0,31)); -} - -template<> inline word32 rotlMod(word32 x, unsigned int y) -{ - return (__rlwnm(x,y,0,31)); -} - -template<> inline word32 rotrMod(word32 x, unsigned int y) -{ - return (__rlwnm(x,32-y,0,31)); -} - -#endif // #if (defined(__MWERKS__) && TARGET_CPU_PPC) - -// ************** endian reversal *************** - -template -inline unsigned int GetByte(ByteOrder order, T value, unsigned int index) -{ - if (order == LITTLE_ENDIAN_ORDER) - return GETBYTE(value, index); - else - return GETBYTE(value, sizeof(T)-index-1); -} - -inline byte ByteReverse(byte value) -{ - return value; -} - -inline word16 ByteReverse(word16 value) -{ -#ifdef CRYPTOPP_BYTESWAP_AVAILABLE - return bswap_16(value); -#elif defined(_MSC_VER) && _MSC_VER >= 1300 - return _byteswap_ushort(value); -#else - return rotlFixed(value, 8U); -#endif -} - -inline word32 ByteReverse(word32 value) -{ -#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE) - __asm__ ("bswap %0" : "=r" (value) : "0" (value)); - return value; -#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE) - return bswap_32(value); -#elif defined(__MWERKS__) && TARGET_CPU_PPC - return (word32)__lwbrx(&value,0); -#elif _MSC_VER >= 1400 || (_MSC_VER >= 1300 && !defined(_DLL)) - return _byteswap_ulong(value); -#elif CRYPTOPP_FAST_ROTATE(32) - // 5 instructions with rotate instruction, 9 without - return (rotrFixed(value, 8U) & 0xff00ff00) | (rotlFixed(value, 8U) & 0x00ff00ff); -#else - // 6 instructions with rotate instruction, 8 without - value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); - return rotlFixed(value, 16U); -#endif -} - -inline word64 ByteReverse(word64 value) -{ -#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE) && defined(__x86_64__) - __asm__ ("bswap %0" : "=r" (value) : "0" (value)); - return value; -#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE) - return bswap_64(value); -#elif defined(_MSC_VER) && _MSC_VER >= 1300 - return _byteswap_uint64(value); -#elif CRYPTOPP_BOOL_SLOW_WORD64 - return (word64(ByteReverse(word32(value))) << 32) | ByteReverse(word32(value>>32)); -#else - value = ((value & W64LIT(0xFF00FF00FF00FF00)) >> 8) | ((value & W64LIT(0x00FF00FF00FF00FF)) << 8); - value = ((value & W64LIT(0xFFFF0000FFFF0000)) >> 16) | ((value & W64LIT(0x0000FFFF0000FFFF)) << 16); - return rotlFixed(value, 32U); -#endif -} - -inline byte BitReverse(byte value) -{ - value = ((value & 0xAA) >> 1) | ((value & 0x55) << 1); - value = ((value & 0xCC) >> 2) | ((value & 0x33) << 2); - return rotlFixed(value, 4U); -} - -inline word16 BitReverse(word16 value) -{ - value = ((value & 0xAAAA) >> 1) | ((value & 0x5555) << 1); - value = ((value & 0xCCCC) >> 2) | ((value & 0x3333) << 2); - value = ((value & 0xF0F0) >> 4) | ((value & 0x0F0F) << 4); - return ByteReverse(value); -} - -inline word32 BitReverse(word32 value) -{ - value = ((value & 0xAAAAAAAA) >> 1) | ((value & 0x55555555) << 1); - value = ((value & 0xCCCCCCCC) >> 2) | ((value & 0x33333333) << 2); - value = ((value & 0xF0F0F0F0) >> 4) | ((value & 0x0F0F0F0F) << 4); - return ByteReverse(value); -} - -inline word64 BitReverse(word64 value) -{ -#if CRYPTOPP_BOOL_SLOW_WORD64 - return (word64(BitReverse(word32(value))) << 32) | BitReverse(word32(value>>32)); -#else - value = ((value & W64LIT(0xAAAAAAAAAAAAAAAA)) >> 1) | ((value & W64LIT(0x5555555555555555)) << 1); - value = ((value & W64LIT(0xCCCCCCCCCCCCCCCC)) >> 2) | ((value & W64LIT(0x3333333333333333)) << 2); - value = ((value & W64LIT(0xF0F0F0F0F0F0F0F0)) >> 4) | ((value & W64LIT(0x0F0F0F0F0F0F0F0F)) << 4); - return ByteReverse(value); -#endif -} - -template -inline T BitReverse(T value) -{ - if (sizeof(T) == 1) - return (T)BitReverse((byte)value); - else if (sizeof(T) == 2) - return (T)BitReverse((word16)value); - else if (sizeof(T) == 4) - return (T)BitReverse((word32)value); - else - { - assert(sizeof(T) == 8); - return (T)BitReverse((word64)value); - } -} - -template -inline T ConditionalByteReverse(ByteOrder order, T value) -{ - return NativeByteOrderIs(order) ? value : ByteReverse(value); -} - -template -void ByteReverse(T *out, const T *in, size_t byteCount) -{ - assert(byteCount % sizeof(T) == 0); - size_t count = byteCount/sizeof(T); - for (size_t i=0; i -inline void ConditionalByteReverse(ByteOrder order, T *out, const T *in, size_t byteCount) -{ - if (!NativeByteOrderIs(order)) - ByteReverse(out, in, byteCount); - else if (in != out) - memcpy_s(out, byteCount, in, byteCount); -} - -template -inline void GetUserKey(ByteOrder order, T *out, size_t outlen, const byte *in, size_t inlen) -{ - const size_t U = sizeof(T); - assert(inlen <= outlen*U); - memcpy_s(out, outlen*U, in, inlen); - memset_z((byte *)out+inlen, 0, outlen*U-inlen); - ConditionalByteReverse(order, out, out, RoundUpToMultipleOf(inlen, U)); -} - -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS -inline byte UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const byte *) -{ - return block[0]; -} - -inline word16 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word16 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? block[1] | (block[0] << 8) - : block[0] | (block[1] << 8); -} - -inline word32 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word32 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? word32(block[3]) | (word32(block[2]) << 8) | (word32(block[1]) << 16) | (word32(block[0]) << 24) - : word32(block[0]) | (word32(block[1]) << 8) | (word32(block[2]) << 16) | (word32(block[3]) << 24); -} - -inline word64 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word64 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? - (word64(block[7]) | - (word64(block[6]) << 8) | - (word64(block[5]) << 16) | - (word64(block[4]) << 24) | - (word64(block[3]) << 32) | - (word64(block[2]) << 40) | - (word64(block[1]) << 48) | - (word64(block[0]) << 56)) - : - (word64(block[0]) | - (word64(block[1]) << 8) | - (word64(block[2]) << 16) | - (word64(block[3]) << 24) | - (word64(block[4]) << 32) | - (word64(block[5]) << 40) | - (word64(block[6]) << 48) | - (word64(block[7]) << 56)); -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, byte value, const byte *xorBlock) -{ - block[0] = xorBlock ? (value ^ xorBlock[0]) : value; -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word16 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - } - } -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word32 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - } - } -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word64 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - } - } -} -#endif // #ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - -template -inline T GetWord(bool assumeAligned, ByteOrder order, const byte *block) -{ -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (!assumeAligned) - return UnalignedGetWordNonTemplate(order, block, (T*)NULL); - assert(IsAligned(block)); -#endif - return ConditionalByteReverse(order, *reinterpret_cast(block)); -} - -template -inline void GetWord(bool assumeAligned, ByteOrder order, T &result, const byte *block) -{ - result = GetWord(assumeAligned, order, block); -} - -template -inline void PutWord(bool assumeAligned, ByteOrder order, byte *block, T value, const byte *xorBlock = NULL) -{ -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (!assumeAligned) - return UnalignedPutWordNonTemplate(order, block, value, xorBlock); - assert(IsAligned(block)); - assert(IsAligned(xorBlock)); -#endif - *reinterpret_cast(block) = ConditionalByteReverse(order, value) ^ (xorBlock ? *reinterpret_cast(xorBlock) : 0); -} - -template -class GetBlock -{ -public: - GetBlock(const void *block) - : m_block((const byte *)block) {} - - template - inline GetBlock & operator()(U &x) - { - CRYPTOPP_COMPILE_ASSERT(sizeof(U) >= sizeof(T)); - x = GetWord(A, B::ToEnum(), m_block); - m_block += sizeof(T); - return *this; - } - -private: - const byte *m_block; -}; - -template -class PutBlock -{ -public: - PutBlock(const void *xorBlock, void *block) - : m_xorBlock((const byte *)xorBlock), m_block((byte *)block) {} - - template - inline PutBlock & operator()(U x) - { - PutWord(A, B::ToEnum(), m_block, (T)x, m_xorBlock); - m_block += sizeof(T); - if (m_xorBlock) - m_xorBlock += sizeof(T); - return *this; - } - -private: - const byte *m_xorBlock; - byte *m_block; -}; - -template -struct BlockGetAndPut -{ - // function needed because of C++ grammatical ambiguity between expression-statements and declarations - static inline GetBlock Get(const void *block) {return GetBlock(block);} - typedef PutBlock Put; -}; - -template -std::string WordToString(T value, ByteOrder order = BIG_ENDIAN_ORDER) -{ - if (!NativeByteOrderIs(order)) - value = ByteReverse(value); - - return std::string((char *)&value, sizeof(value)); -} - -template -T StringToWord(const std::string &str, ByteOrder order = BIG_ENDIAN_ORDER) -{ - T value = 0; - memcpy_s(&value, sizeof(value), str.data(), UnsignedMin(str.size(), sizeof(value))); - return NativeByteOrderIs(order) ? value : ByteReverse(value); -} - -// ************** help remove warning on g++ *************** - -template struct SafeShifter; - -template<> struct SafeShifter -{ - template - static inline T RightShift(T value, unsigned int bits) - { - return 0; - } - - template - static inline T LeftShift(T value, unsigned int bits) - { - return 0; - } -}; - -template<> struct SafeShifter -{ - template - static inline T RightShift(T value, unsigned int bits) - { - return value >> bits; - } - - template - static inline T LeftShift(T value, unsigned int bits) - { - return value << bits; - } -}; - -template -inline T SafeRightShift(T value) -{ - return SafeShifter<(bits>=(8*sizeof(T)))>::RightShift(value, bits); -} - -template -inline T SafeLeftShift(T value) -{ - return SafeShifter<(bits>=(8*sizeof(T)))>::LeftShift(value, bits); -} - -// ************** use one buffer for multiple data members *************** - -#define CRYPTOPP_BLOCK_1(n, t, s) t* m_##n() {return (t *)(m_aggregate+0);} size_t SS1() {return sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_2(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS1());} size_t SS2() {return SS1()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_3(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS2());} size_t SS3() {return SS2()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_4(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS3());} size_t SS4() {return SS3()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_5(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS4());} size_t SS5() {return SS4()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_6(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS5());} size_t SS6() {return SS5()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_7(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS6());} size_t SS7() {return SS6()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_8(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS7());} size_t SS8() {return SS7()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCKS_END(i) size_t SST() {return SS##i();} void AllocateBlocks() {m_aggregate.New(SST());} AlignedSecByteBlock m_aggregate; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/modarith.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/modarith.h deleted file mode 100644 index c0368e3f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/modarith.h +++ /dev/null @@ -1,158 +0,0 @@ -#ifndef CRYPTOPP_MODARITH_H -#define CRYPTOPP_MODARITH_H - -// implementations are in integer.cpp - -#include "cryptlib.h" -#include "misc.h" -#include "integer.h" -#include "algebra.h" - -NAMESPACE_BEGIN(CryptoPP) - -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup; -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractRing; -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractEuclideanDomain; - -//! ring of congruence classes modulo n -/*! \note this implementation represents each congruence class as the smallest non-negative integer in that class */ -class CRYPTOPP_DLL ModularArithmetic : public AbstractRing -{ -public: - - typedef int RandomizationParameter; - typedef Integer Element; - - ModularArithmetic(const Integer &modulus = Integer::One()) - : m_modulus(modulus), m_result((word)0, modulus.reg.size()) {} - - ModularArithmetic(const ModularArithmetic &ma) - : m_modulus(ma.m_modulus), m_result((word)0, m_modulus.reg.size()) {} - - ModularArithmetic(BufferedTransformation &bt); // construct from BER encoded parameters - - virtual ModularArithmetic * Clone() const {return new ModularArithmetic(*this);} - - void DEREncode(BufferedTransformation &bt) const; - - void DEREncodeElement(BufferedTransformation &out, const Element &a) const; - void BERDecodeElement(BufferedTransformation &in, Element &a) const; - - const Integer& GetModulus() const {return m_modulus;} - void SetModulus(const Integer &newModulus) {m_modulus = newModulus; m_result.reg.resize(m_modulus.reg.size());} - - virtual bool IsMontgomeryRepresentation() const {return false;} - - virtual Integer ConvertIn(const Integer &a) const - {return a%m_modulus;} - - virtual Integer ConvertOut(const Integer &a) const - {return a;} - - const Integer& Half(const Integer &a) const; - - bool Equal(const Integer &a, const Integer &b) const - {return a==b;} - - const Integer& Identity() const - {return Integer::Zero();} - - const Integer& Add(const Integer &a, const Integer &b) const; - - Integer& Accumulate(Integer &a, const Integer &b) const; - - const Integer& Inverse(const Integer &a) const; - - const Integer& Subtract(const Integer &a, const Integer &b) const; - - Integer& Reduce(Integer &a, const Integer &b) const; - - const Integer& Double(const Integer &a) const - {return Add(a, a);} - - const Integer& MultiplicativeIdentity() const - {return Integer::One();} - - const Integer& Multiply(const Integer &a, const Integer &b) const - {return m_result1 = a*b%m_modulus;} - - const Integer& Square(const Integer &a) const - {return m_result1 = a.Squared()%m_modulus;} - - bool IsUnit(const Integer &a) const - {return Integer::Gcd(a, m_modulus).IsUnit();} - - const Integer& MultiplicativeInverse(const Integer &a) const - {return m_result1 = a.InverseMod(m_modulus);} - - const Integer& Divide(const Integer &a, const Integer &b) const - {return Multiply(a, MultiplicativeInverse(b));} - - Integer CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const; - - void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const; - - unsigned int MaxElementBitLength() const - {return (m_modulus-1).BitCount();} - - unsigned int MaxElementByteLength() const - {return (m_modulus-1).ByteCount();} - - Element RandomElement( RandomNumberGenerator &rng , const RandomizationParameter &ignore_for_now = 0 ) const - // left RandomizationParameter arg as ref in case RandomizationParameter becomes a more complicated struct - { - return Element( rng , Integer( (long) 0) , m_modulus - Integer( (long) 1 ) ) ; - } - - bool operator==(const ModularArithmetic &rhs) const - {return m_modulus == rhs.m_modulus;} - - static const RandomizationParameter DefaultRandomizationParameter ; - -protected: - Integer m_modulus; - mutable Integer m_result, m_result1; - -}; - -// const ModularArithmetic::RandomizationParameter ModularArithmetic::DefaultRandomizationParameter = 0 ; - -//! do modular arithmetics in Montgomery representation for increased speed -/*! \note the Montgomery representation represents each congruence class [a] as a*r%n, where r is a convenient power of 2 */ -class CRYPTOPP_DLL MontgomeryRepresentation : public ModularArithmetic -{ -public: - MontgomeryRepresentation(const Integer &modulus); // modulus must be odd - - virtual ModularArithmetic * Clone() const {return new MontgomeryRepresentation(*this);} - - bool IsMontgomeryRepresentation() const {return true;} - - Integer ConvertIn(const Integer &a) const - {return (a<<(WORD_BITS*m_modulus.reg.size()))%m_modulus;} - - Integer ConvertOut(const Integer &a) const; - - const Integer& MultiplicativeIdentity() const - {return m_result1 = Integer::Power2(WORD_BITS*m_modulus.reg.size())%m_modulus;} - - const Integer& Multiply(const Integer &a, const Integer &b) const; - - const Integer& Square(const Integer &a) const; - - const Integer& MultiplicativeInverse(const Integer &a) const; - - Integer CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const - {return AbstractRing::CascadeExponentiate(x, e1, y, e2);} - - void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const - {AbstractRing::SimultaneousExponentiate(results, base, exponents, exponentsCount);} - -private: - Integer m_u; - mutable IntegerSecBlock m_workspace; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.cpp deleted file mode 100644 index 46332284..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.cpp +++ /dev/null @@ -1,245 +0,0 @@ -// modes.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "modes.h" - -#ifndef NDEBUG -#include "des.h" -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifndef NDEBUG -void Modes_TestInstantiations() -{ - CFB_Mode::Encryption m0; - CFB_Mode::Decryption m1; - OFB_Mode::Encryption m2; - CTR_Mode::Encryption m3; - ECB_Mode::Encryption m4; - CBC_Mode::Encryption m5; -} -#endif - -void CFB_ModePolicy::Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount) -{ - assert(m_cipher->IsForwardTransformation()); // CFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt - assert(m_feedbackSize == BlockSize()); - - unsigned int s = BlockSize(); - if (dir == ENCRYPTION) - { - m_cipher->ProcessAndXorBlock(m_register, input, output); - m_cipher->AdvancedProcessBlocks(output, input+s, output+s, (iterationCount-1)*s, 0); - memcpy(m_register, output+(iterationCount-1)*s, s); - } - else - { - memcpy(m_temp, input+(iterationCount-1)*s, s); // make copy first in case of in-place decryption - m_cipher->AdvancedProcessBlocks(input, input+s, output+s, (iterationCount-1)*s, BlockTransformation::BT_ReverseDirection); - m_cipher->ProcessAndXorBlock(m_register, input, output); - memcpy(m_register, m_temp, s); - } -} - -void CFB_ModePolicy::TransformRegister() -{ - assert(m_cipher->IsForwardTransformation()); // CFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt - m_cipher->ProcessBlock(m_register, m_temp); - unsigned int updateSize = BlockSize()-m_feedbackSize; - memmove_s(m_register, m_register.size(), m_register+m_feedbackSize, updateSize); - memcpy_s(m_register+updateSize, m_register.size()-updateSize, m_temp, m_feedbackSize); -} - -void CFB_ModePolicy::CipherResynchronize(const byte *iv, size_t length) -{ - assert(length == BlockSize()); - CopyOrZero(m_register, iv, length); - TransformRegister(); -} - -void CFB_ModePolicy::SetFeedbackSize(unsigned int feedbackSize) -{ - if (feedbackSize > BlockSize()) - throw InvalidArgument("CFB_Mode: invalid feedback size"); - m_feedbackSize = feedbackSize ? feedbackSize : BlockSize(); -} - -void CFB_ModePolicy::ResizeBuffers() -{ - CipherModeBase::ResizeBuffers(); - m_temp.New(BlockSize()); -} - -void OFB_ModePolicy::WriteKeystream(byte *keystreamBuffer, size_t iterationCount) -{ - assert(m_cipher->IsForwardTransformation()); // OFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt - unsigned int s = BlockSize(); - m_cipher->ProcessBlock(m_register, keystreamBuffer); - if (iterationCount > 1) - m_cipher->AdvancedProcessBlocks(keystreamBuffer, NULL, keystreamBuffer+s, s*(iterationCount-1), 0); - memcpy(m_register, keystreamBuffer+s*(iterationCount-1), s); -} - -void OFB_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) -{ - assert(length == BlockSize()); - CopyOrZero(m_register, iv, length); -} - -void CTR_ModePolicy::SeekToIteration(lword iterationCount) -{ - int carry=0; - for (int i=BlockSize()-1; i>=0; i--) - { - unsigned int sum = m_register[i] + byte(iterationCount) + carry; - m_counterArray[i] = (byte) sum; - carry = sum >> 8; - iterationCount >>= 8; - } -} - -void CTR_ModePolicy::IncrementCounterBy256() -{ - IncrementCounterByOne(m_counterArray, BlockSize()-1); -} - -void CTR_ModePolicy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ - assert(m_cipher->IsForwardTransformation()); // CTR mode needs the "encrypt" direction of the underlying block cipher, even to decrypt - unsigned int s = BlockSize(); - unsigned int inputIncrement = input ? s : 0; - - while (iterationCount) - { - byte lsb = m_counterArray[s-1]; - size_t blocks = UnsignedMin(iterationCount, 256U-lsb); - m_cipher->AdvancedProcessBlocks(m_counterArray, input, output, blocks*s, BlockTransformation::BT_InBlockIsCounter|BlockTransformation::BT_AllowParallel); - if ((m_counterArray[s-1] = lsb + (byte)blocks) == 0) - IncrementCounterBy256(); - - output += blocks*s; - input += blocks*inputIncrement; - iterationCount -= blocks; - } -} - -void CTR_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) -{ - assert(length == BlockSize()); - CopyOrZero(m_register, iv, length); - m_counterArray = m_register; -} - -void BlockOrientedCipherModeBase::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - m_cipher->SetKey(key, length, params); - ResizeBuffers(); - if (IsResynchronizable()) - { - size_t ivLength; - const byte *iv = GetIVAndThrowIfInvalid(params, ivLength); - Resynchronize(iv, (int)ivLength); - } -} - -void ECB_OneWay::ProcessData(byte *outString, const byte *inString, size_t length) -{ - assert(length%BlockSize()==0); - m_cipher->AdvancedProcessBlocks(inString, NULL, outString, length, BlockTransformation::BT_AllowParallel); -} - -void CBC_Encryption::ProcessData(byte *outString, const byte *inString, size_t length) -{ - if (!length) - return; - assert(length%BlockSize()==0); - - unsigned int blockSize = BlockSize(); - m_cipher->AdvancedProcessBlocks(inString, m_register, outString, blockSize, BlockTransformation::BT_XorInput); - if (length > blockSize) - m_cipher->AdvancedProcessBlocks(inString+blockSize, outString, outString+blockSize, length-blockSize, BlockTransformation::BT_XorInput); - memcpy(m_register, outString + length - blockSize, blockSize); -} - -void CBC_CTS_Encryption::ProcessLastBlock(byte *outString, const byte *inString, size_t length) -{ - if (length <= BlockSize()) - { - if (!m_stolenIV) - throw InvalidArgument("CBC_Encryption: message is too short for ciphertext stealing"); - - // steal from IV - memcpy(outString, m_register, length); - outString = m_stolenIV; - } - else - { - // steal from next to last block - xorbuf(m_register, inString, BlockSize()); - m_cipher->ProcessBlock(m_register); - inString += BlockSize(); - length -= BlockSize(); - memcpy(outString+BlockSize(), m_register, length); - } - - // output last full ciphertext block - xorbuf(m_register, inString, length); - m_cipher->ProcessBlock(m_register); - memcpy(outString, m_register, BlockSize()); -} - -void CBC_Decryption::ProcessData(byte *outString, const byte *inString, size_t length) -{ - if (!length) - return; - assert(length%BlockSize()==0); - - unsigned int blockSize = BlockSize(); - memcpy(m_temp, inString+length-blockSize, blockSize); // save copy now in case of in-place decryption - if (length > blockSize) - m_cipher->AdvancedProcessBlocks(inString+blockSize, inString, outString+blockSize, length-blockSize, BlockTransformation::BT_ReverseDirection|BlockTransformation::BT_AllowParallel); - m_cipher->ProcessAndXorBlock(inString, m_register, outString); - m_register.swap(m_temp); -} - -void CBC_CTS_Decryption::ProcessLastBlock(byte *outString, const byte *inString, size_t length) -{ - const byte *pn, *pn1; - bool stealIV = length <= BlockSize(); - - if (stealIV) - { - pn = inString; - pn1 = m_register; - } - else - { - pn = inString + BlockSize(); - pn1 = inString; - length -= BlockSize(); - } - - // decrypt last partial plaintext block - memcpy(m_temp, pn1, BlockSize()); - m_cipher->ProcessBlock(m_temp); - xorbuf(m_temp, pn, length); - - if (stealIV) - memcpy(outString, m_temp, length); - else - { - memcpy(outString+BlockSize(), m_temp, length); - // decrypt next to last plaintext block - memcpy(m_temp, pn, length); - m_cipher->ProcessBlock(m_temp); - xorbuf(outString, m_temp, m_register, BlockSize()); - } -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.h deleted file mode 100644 index c0c30c47..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/modes.h +++ /dev/null @@ -1,422 +0,0 @@ -#ifndef CRYPTOPP_MODES_H -#define CRYPTOPP_MODES_H - -/*! \file -*/ - -#include "cryptlib.h" -#include "secblock.h" -#include "misc.h" -#include "strciphr.h" -#include "argnames.h" -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Cipher modes documentation. See NIST SP 800-38A for definitions of these modes. See AuthenticatedSymmetricCipherDocumentation for authenticated encryption modes. - -/*! Each class derived from this one defines two types, Encryption and Decryption, - both of which implement the SymmetricCipher interface. - For each mode there are two classes, one of which is a template class, - and the other one has a name that ends in "_ExternalCipher". - The "external cipher" mode objects hold a reference to the underlying block cipher, - instead of holding an instance of it. The reference must be passed in to the constructor. - For the "cipher holder" classes, the CIPHER template parameter should be a class - derived from BlockCipherDocumentation, for example DES or AES. -*/ -struct CipherModeDocumentation : public SymmetricCipherDocumentation -{ -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CipherModeBase : public SymmetricCipher -{ -public: - size_t MinKeyLength() const {return m_cipher->MinKeyLength();} - size_t MaxKeyLength() const {return m_cipher->MaxKeyLength();} - size_t DefaultKeyLength() const {return m_cipher->DefaultKeyLength();} - size_t GetValidKeyLength(size_t n) const {return m_cipher->GetValidKeyLength(n);} - bool IsValidKeyLength(size_t n) const {return m_cipher->IsValidKeyLength(n);} - - unsigned int OptimalDataAlignment() const {return m_cipher->OptimalDataAlignment();} - - unsigned int IVSize() const {return BlockSize();} - virtual IV_Requirement IVRequirement() const =0; - - void SetCipher(BlockCipher &cipher) - { - this->ThrowIfResynchronizable(); - this->m_cipher = &cipher; - this->ResizeBuffers(); - } - - void SetCipherWithIV(BlockCipher &cipher, const byte *iv, int feedbackSize = 0) - { - this->ThrowIfInvalidIV(iv); - this->m_cipher = &cipher; - this->ResizeBuffers(); - this->SetFeedbackSize(feedbackSize); - if (this->IsResynchronizable()) - this->Resynchronize(iv); - } - -protected: - CipherModeBase() : m_cipher(NULL) {} - inline unsigned int BlockSize() const {assert(m_register.size() > 0); return (unsigned int)m_register.size();} - virtual void SetFeedbackSize(unsigned int feedbackSize) - { - if (!(feedbackSize == 0 || feedbackSize == BlockSize())) - throw InvalidArgument("CipherModeBase: feedback size cannot be specified for this cipher mode"); - } - virtual void ResizeBuffers() - { - m_register.New(m_cipher->BlockSize()); - } - - BlockCipher *m_cipher; - AlignedSecByteBlock m_register; -}; - -template -class CRYPTOPP_NO_VTABLE ModePolicyCommonTemplate : public CipherModeBase, public POLICY_INTERFACE -{ - unsigned int GetAlignment() const {return m_cipher->OptimalDataAlignment();} - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); -}; - -template -void ModePolicyCommonTemplate::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - m_cipher->SetKey(key, length, params); - ResizeBuffers(); - int feedbackSize = params.GetIntValueWithDefault(Name::FeedbackSize(), 0); - SetFeedbackSize(feedbackSize); -} - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CFB_ModePolicy : public ModePolicyCommonTemplate -{ -public: - IV_Requirement IVRequirement() const {return RANDOM_IV;} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "CFB";} - -protected: - unsigned int GetBytesPerIteration() const {return m_feedbackSize;} - byte * GetRegisterBegin() {return m_register + BlockSize() - m_feedbackSize;} - bool CanIterate() const {return m_feedbackSize == BlockSize();} - void Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount); - void TransformRegister(); - void CipherResynchronize(const byte *iv, size_t length); - void SetFeedbackSize(unsigned int feedbackSize); - void ResizeBuffers(); - - SecByteBlock m_temp; - unsigned int m_feedbackSize; -}; - -inline void CopyOrZero(void *dest, const void *src, size_t s) -{ - if (src) - memcpy_s(dest, s, src, s); - else - memset(dest, 0, s); -} - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE OFB_ModePolicy : public ModePolicyCommonTemplate -{ -public: - bool CipherIsRandomAccess() const {return false;} - IV_Requirement IVRequirement() const {return UNIQUE_IV;} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "OFB";} - -private: - unsigned int GetBytesPerIteration() const {return BlockSize();} - unsigned int GetIterationsToBuffer() const {return m_cipher->OptimalNumberOfParallelBlocks();} - void WriteKeystream(byte *keystreamBuffer, size_t iterationCount); - void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length); -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CTR_ModePolicy : public ModePolicyCommonTemplate -{ -public: - bool CipherIsRandomAccess() const {return true;} - IV_Requirement IVRequirement() const {return RANDOM_IV;} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "CTR";} - -protected: - virtual void IncrementCounterBy256(); - - unsigned int GetAlignment() const {return m_cipher->OptimalDataAlignment();} - unsigned int GetBytesPerIteration() const {return BlockSize();} - unsigned int GetIterationsToBuffer() const {return m_cipher->OptimalNumberOfParallelBlocks();} - void WriteKeystream(byte *buffer, size_t iterationCount) - {OperateKeystream(WRITE_KEYSTREAM, buffer, NULL, iterationCount);} - bool CanOperateKeystream() const {return true;} - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length); - void SeekToIteration(lword iterationCount); - - AlignedSecByteBlock m_counterArray; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockOrientedCipherModeBase : public CipherModeBase -{ -public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - unsigned int MandatoryBlockSize() const {return BlockSize();} - bool IsRandomAccess() const {return false;} - bool IsSelfInverting() const {return false;} - bool IsForwardTransformation() const {return m_cipher->IsForwardTransformation();} - void Resynchronize(const byte *iv, int length=-1) {memcpy_s(m_register, m_register.size(), iv, ThrowIfInvalidIVLength(length));} - -protected: - bool RequireAlignedInput() const {return true;} - void ResizeBuffers() - { - CipherModeBase::ResizeBuffers(); - m_buffer.New(BlockSize()); - } - - SecByteBlock m_buffer; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ECB_OneWay : public BlockOrientedCipherModeBase -{ -public: - void SetKey(const byte *key, size_t length, const NameValuePairs ¶ms = g_nullNameValuePairs) - {m_cipher->SetKey(key, length, params); BlockOrientedCipherModeBase::ResizeBuffers();} - IV_Requirement IVRequirement() const {return NOT_RESYNCHRONIZABLE;} - unsigned int OptimalBlockSize() const {return BlockSize() * m_cipher->OptimalNumberOfParallelBlocks();} - void ProcessData(byte *outString, const byte *inString, size_t length); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECB";} -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_ModeBase : public BlockOrientedCipherModeBase -{ -public: - IV_Requirement IVRequirement() const {return UNPREDICTABLE_RANDOM_IV;} - bool RequireAlignedInput() const {return false;} - unsigned int MinLastBlockSize() const {return 0;} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "CBC";} -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_Encryption : public CBC_ModeBase -{ -public: - void ProcessData(byte *outString, const byte *inString, size_t length); -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_CTS_Encryption : public CBC_Encryption -{ -public: - void SetStolenIV(byte *iv) {m_stolenIV = iv;} - unsigned int MinLastBlockSize() const {return BlockSize()+1;} - void ProcessLastBlock(byte *outString, const byte *inString, size_t length); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "CBC/CTS";} - -protected: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) - { - CBC_Encryption::UncheckedSetKey(key, length, params); - m_stolenIV = params.GetValueWithDefault(Name::StolenIV(), (byte *)NULL); - } - - byte *m_stolenIV; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_Decryption : public CBC_ModeBase -{ -public: - void ProcessData(byte *outString, const byte *inString, size_t length); - -protected: - void ResizeBuffers() - { - BlockOrientedCipherModeBase::ResizeBuffers(); - m_temp.New(BlockSize()); - } - AlignedSecByteBlock m_temp; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_CTS_Decryption : public CBC_Decryption -{ -public: - unsigned int MinLastBlockSize() const {return BlockSize()+1;} - void ProcessLastBlock(byte *outString, const byte *inString, size_t length); -}; - -//! _ -template -class CipherModeFinalTemplate_CipherHolder : protected ObjectHolder, public AlgorithmImpl > -{ -public: - CipherModeFinalTemplate_CipherHolder() - { - this->m_cipher = &this->m_object; - this->ResizeBuffers(); - } - CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length) - { - this->m_cipher = &this->m_object; - this->SetKey(key, length); - } - CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length, const byte *iv) - { - this->m_cipher = &this->m_object; - this->SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, this->m_cipher->BlockSize()))); - } - CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length, const byte *iv, int feedbackSize) - { - this->m_cipher = &this->m_object; - this->SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, this->m_cipher->BlockSize()))(Name::FeedbackSize(), feedbackSize)); - } - - static std::string CRYPTOPP_API StaticAlgorithmName() - {return CIPHER::StaticAlgorithmName() + "/" + BASE::StaticAlgorithmName();} -}; - -//! _ -template -class CipherModeFinalTemplate_ExternalCipher : public BASE -{ -public: - CipherModeFinalTemplate_ExternalCipher() {} - CipherModeFinalTemplate_ExternalCipher(BlockCipher &cipher) - {this->SetCipher(cipher);} - CipherModeFinalTemplate_ExternalCipher(BlockCipher &cipher, const byte *iv, int feedbackSize = 0) - {this->SetCipherWithIV(cipher, iv, feedbackSize);} - - std::string AlgorithmName() const - {return (this->m_cipher ? this->m_cipher->AlgorithmName() + "/" : std::string("")) + BASE::StaticAlgorithmName();} -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_CipherTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_EncryptionTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_DecryptionTemplate >; - -//! CFB mode -template -struct CFB_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder > > > Encryption; - typedef CipherModeFinalTemplate_CipherHolder > > > Decryption; -}; - -//! CFB mode, external cipher -struct CFB_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher > > > Encryption; - typedef CipherModeFinalTemplate_ExternalCipher > > > Decryption; -}; - -//! CFB mode FIPS variant, requiring full block plaintext according to FIPS 800-38A -template -struct CFB_FIPS_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder > > > > Encryption; - typedef CipherModeFinalTemplate_CipherHolder > > > > Decryption; -}; - -//! CFB mode FIPS variant, requiring full block plaintext according to FIPS 800-38A, external cipher -struct CFB_FIPS_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher > > > > Encryption; - typedef CipherModeFinalTemplate_ExternalCipher > > > > Decryption; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate >; - -//! OFB mode -template -struct OFB_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder > > > Encryption; - typedef Encryption Decryption; -}; - -//! OFB mode, external cipher -struct OFB_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher > > > Encryption; - typedef Encryption Decryption; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher > > >; - -//! CTR mode -template -struct CTR_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder > > > Encryption; - typedef Encryption Decryption; -}; - -//! CTR mode, external cipher -struct CTR_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher > > > Encryption; - typedef Encryption Decryption; -}; - -//! ECB mode -template -struct ECB_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder Encryption; - typedef CipherModeFinalTemplate_CipherHolder Decryption; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher; - -//! ECB mode, external cipher -struct ECB_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher Encryption; - typedef Encryption Decryption; -}; - -//! CBC mode -template -struct CBC_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder Encryption; - typedef CipherModeFinalTemplate_CipherHolder Decryption; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher; -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher; - -//! CBC mode, external cipher -struct CBC_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher Encryption; - typedef CipherModeFinalTemplate_ExternalCipher Decryption; -}; - -//! CBC mode with ciphertext stealing -template -struct CBC_CTS_Mode : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_CipherHolder Encryption; - typedef CipherModeFinalTemplate_CipherHolder Decryption; -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher; -CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher; - -//! CBC mode with ciphertext stealing, external cipher -struct CBC_CTS_Mode_ExternalCipher : public CipherModeDocumentation -{ - typedef CipherModeFinalTemplate_ExternalCipher Encryption; - typedef CipherModeFinalTemplate_ExternalCipher Decryption; -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef CFB_Mode_ExternalCipher::Encryption CFBEncryption; -typedef CFB_Mode_ExternalCipher::Decryption CFBDecryption; -typedef OFB_Mode_ExternalCipher::Encryption OFB; -typedef CTR_Mode_ExternalCipher::Encryption CounterMode; -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/modexppc.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/modexppc.h deleted file mode 100644 index fbe70127..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/modexppc.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CRYPTOPP_MODEXPPC_H -#define CRYPTOPP_MODEXPPC_H - -#include "modarith.h" -#include "eprecomp.h" -#include "smartptr.h" -#include "pubkey.h" - -NAMESPACE_BEGIN(CryptoPP) - -CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl; - -class ModExpPrecomputation : public DL_GroupPrecomputation -{ -public: - // DL_GroupPrecomputation - bool NeedConversions() const {return true;} - Element ConvertIn(const Element &v) const {return m_mr->ConvertIn(v);} - virtual Element ConvertOut(const Element &v) const {return m_mr->ConvertOut(v);} - const AbstractGroup & GetGroup() const {return m_mr->MultiplicativeGroup();} - Element BERDecodeElement(BufferedTransformation &bt) const {return Integer(bt);} - void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {v.DEREncode(bt);} - - // non-inherited - void SetModulus(const Integer &v) {m_mr.reset(new MontgomeryRepresentation(v));} - const Integer & GetModulus() const {return m_mr->GetModulus();} - -private: - value_ptr m_mr; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.cpp deleted file mode 100644 index 1d645d83..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// mqueue.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "mqueue.h" - -NAMESPACE_BEGIN(CryptoPP) - -MessageQueue::MessageQueue(unsigned int nodeSize) - : m_queue(nodeSize), m_lengths(1, 0U), m_messageCounts(1, 0U) -{ -} - -size_t MessageQueue::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - if (begin >= MaxRetrievable()) - return 0; - - return m_queue.CopyRangeTo2(target, begin, STDMIN(MaxRetrievable(), end), channel, blocking); -} - -size_t MessageQueue::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - transferBytes = STDMIN(MaxRetrievable(), transferBytes); - size_t blockedBytes = m_queue.TransferTo2(target, transferBytes, channel, blocking); - m_lengths.front() -= transferBytes; - return blockedBytes; -} - -bool MessageQueue::GetNextMessage() -{ - if (NumberOfMessages() > 0 && !AnyRetrievable()) - { - m_lengths.pop_front(); - if (m_messageCounts[0] == 0 && m_messageCounts.size() > 1) - m_messageCounts.pop_front(); - return true; - } - else - return false; -} - -unsigned int MessageQueue::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const -{ - ByteQueue::Walker walker(m_queue); - std::deque::const_iterator it = m_lengths.begin(); - unsigned int i; - for (i=0; i 0 && q2.AnyRetrievable()) - { - size_t len = length; - const byte *data = q2.Spy(len); - len = STDMIN(len, length); - if (memcmp(inString, data, len) != 0) - goto mismatch; - inString += len; - length -= len; - q2.Skip(len); - } - - q1.Put(inString, length); - - if (messageEnd) - { - if (q2.AnyRetrievable()) - goto mismatch; - else if (q2.AnyMessages()) - q2.GetNextMessage(); - else if (q2.NumberOfMessageSeries() > 0) - goto mismatch; - else - q1.MessageEnd(); - } - - return 0; - -mismatch: - return HandleMismatchDetected(blocking); - } -} - -bool EqualityComparisonFilter::ChannelMessageSeriesEnd(const std::string &channel, int propagation, bool blocking) -{ - unsigned int i = MapChannel(channel); - - if (i == 2) - { - OutputMessageSeriesEnd(4, propagation, blocking, channel); - return false; - } - else if (m_mismatchDetected) - return false; - else - { - MessageQueue &q1 = m_q[i], &q2 = m_q[1-i]; - - if (q2.AnyRetrievable() || q2.AnyMessages()) - goto mismatch; - else if (q2.NumberOfMessageSeries() > 0) - return Output(2, (const byte *)"\1", 1, 0, blocking) != 0; - else - q1.MessageSeriesEnd(); - - return false; - -mismatch: - return HandleMismatchDetected(blocking); - } -} - -bool EqualityComparisonFilter::HandleMismatchDetected(bool blocking) -{ - m_mismatchDetected = true; - if (m_throwIfNotEqual) - throw MismatchDetected(); - return Output(1, (const byte *)"\0", 1, 0, blocking) != 0; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.h deleted file mode 100644 index efa57a7c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqueue.h +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef CRYPTOPP_MQUEUE_H -#define CRYPTOPP_MQUEUE_H - -#include "queue.h" -#include "filters.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! Message Queue -class CRYPTOPP_DLL MessageQueue : public AutoSignaling -{ -public: - MessageQueue(unsigned int nodeSize=256); - - void IsolatedInitialize(const NameValuePairs ¶meters) - {m_queue.IsolatedInitialize(parameters); m_lengths.assign(1, 0U); m_messageCounts.assign(1, 0U);} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - { - m_queue.Put(begin, length); - m_lengths.back() += length; - if (messageEnd) - { - m_lengths.push_back(0); - m_messageCounts.back()++; - } - return 0; - } - bool IsolatedFlush(bool hardFlush, bool blocking) {return false;} - bool IsolatedMessageSeriesEnd(bool blocking) - {m_messageCounts.push_back(0); return false;} - - lword MaxRetrievable() const - {return m_lengths.front();} - bool AnyRetrievable() const - {return m_lengths.front() > 0;} - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - - lword TotalBytesRetrievable() const - {return m_queue.MaxRetrievable();} - unsigned int NumberOfMessages() const - {return (unsigned int)m_lengths.size()-1;} - bool GetNextMessage(); - - unsigned int NumberOfMessagesInThisSeries() const - {return m_messageCounts[0];} - unsigned int NumberOfMessageSeries() const - {return (unsigned int)m_messageCounts.size()-1;} - - unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const; - - const byte * Spy(size_t &contiguousSize) const; - - void swap(MessageQueue &rhs); - -private: - ByteQueue m_queue; - std::deque m_lengths; - std::deque m_messageCounts; -}; - - -//! A filter that checks messages on two channels for equality -class CRYPTOPP_DLL EqualityComparisonFilter : public Unflushable > -{ -public: - struct MismatchDetected : public Exception {MismatchDetected() : Exception(DATA_INTEGRITY_CHECK_FAILED, "EqualityComparisonFilter: did not receive the same data on two channels") {}}; - - /*! if throwIfNotEqual is false, this filter will output a '\\0' byte when it detects a mismatch, '\\1' otherwise */ - EqualityComparisonFilter(BufferedTransformation *attachment=NULL, bool throwIfNotEqual=true, const std::string &firstChannel="0", const std::string &secondChannel="1") - : m_throwIfNotEqual(throwIfNotEqual), m_mismatchDetected(false) - , m_firstChannel(firstChannel), m_secondChannel(secondChannel) - {Detach(attachment);} - - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true); - -private: - unsigned int MapChannel(const std::string &channel) const; - bool HandleMismatchDetected(bool blocking); - - bool m_throwIfNotEqual, m_mismatchDetected; - std::string m_firstChannel, m_secondChannel; - MessageQueue m_q[2]; -}; - -NAMESPACE_END - -#ifndef __BORLANDC__ -NAMESPACE_BEGIN(std) -template<> inline void swap(CryptoPP::MessageQueue &a, CryptoPP::MessageQueue &b) -{ - a.swap(b); -} -NAMESPACE_END -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.cpp deleted file mode 100644 index c427561b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// mqv.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "mqv.h" - -NAMESPACE_BEGIN(CryptoPP) - -void TestInstantiations_MQV() -{ - MQV mqv; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.h deleted file mode 100644 index 2683817b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/mqv.h +++ /dev/null @@ -1,141 +0,0 @@ -#ifndef CRYPTOPP_MQV_H -#define CRYPTOPP_MQV_H - -/** \file -*/ - -#include "gfpcrypt.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -class MQV_Domain : public AuthenticatedKeyAgreementDomain -{ -public: - typedef GROUP_PARAMETERS GroupParameters; - typedef typename GroupParameters::Element Element; - typedef MQV_Domain Domain; - - MQV_Domain() {} - - MQV_Domain(const GroupParameters ¶ms) - : m_groupParameters(params) {} - - MQV_Domain(BufferedTransformation &bt) - {m_groupParameters.BERDecode(bt);} - - template - MQV_Domain(T1 v1, T2 v2) - {m_groupParameters.Initialize(v1, v2);} - - template - MQV_Domain(T1 v1, T2 v2, T3 v3) - {m_groupParameters.Initialize(v1, v2, v3);} - - template - MQV_Domain(T1 v1, T2 v2, T3 v3, T4 v4) - {m_groupParameters.Initialize(v1, v2, v3, v4);} - - const GroupParameters & GetGroupParameters() const {return m_groupParameters;} - GroupParameters & AccessGroupParameters() {return m_groupParameters;} - - CryptoParameters & AccessCryptoParameters() {return AccessAbstractGroupParameters();} - - unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);} - unsigned int StaticPrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();} - unsigned int StaticPublicKeyLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(true);} - - void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const - { - Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent()); - x.Encode(privateKey, StaticPrivateKeyLength()); - } - - void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - { - const DL_GroupParameters ¶ms = GetAbstractGroupParameters(); - Integer x(privateKey, StaticPrivateKeyLength()); - Element y = params.ExponentiateBase(x); - params.EncodeElement(true, y, publicKey); - } - - unsigned int EphemeralPrivateKeyLength() const {return StaticPrivateKeyLength() + StaticPublicKeyLength();} - unsigned int EphemeralPublicKeyLength() const {return StaticPublicKeyLength();} - - void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const - { - const DL_GroupParameters ¶ms = GetAbstractGroupParameters(); - Integer x(rng, Integer::One(), params.GetMaxExponent()); - x.Encode(privateKey, StaticPrivateKeyLength()); - Element y = params.ExponentiateBase(x); - params.EncodeElement(true, y, privateKey+StaticPrivateKeyLength()); - } - - void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - { - memcpy(publicKey, privateKey+StaticPrivateKeyLength(), EphemeralPublicKeyLength()); - } - - bool Agree(byte *agreedValue, - const byte *staticPrivateKey, const byte *ephemeralPrivateKey, - const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey, - bool validateStaticOtherPublicKey=true) const - { - try - { - const DL_GroupParameters ¶ms = GetAbstractGroupParameters(); - Element WW = params.DecodeElement(staticOtherPublicKey, validateStaticOtherPublicKey); - Element VV = params.DecodeElement(ephemeralOtherPublicKey, true); - - Integer s(staticPrivateKey, StaticPrivateKeyLength()); - Integer u(ephemeralPrivateKey, StaticPrivateKeyLength()); - Element V = params.DecodeElement(ephemeralPrivateKey+StaticPrivateKeyLength(), false); - - const Integer &r = params.GetSubgroupOrder(); - Integer h2 = Integer::Power2((r.BitCount()+1)/2); - Integer e = ((h2+params.ConvertElementToInteger(V)%h2)*s+u) % r; - Integer tt = h2 + params.ConvertElementToInteger(VV) % h2; - - if (COFACTOR_OPTION::ToEnum() == NO_COFACTOR_MULTIPLICTION) - { - Element P = params.ExponentiateElement(WW, tt); - P = m_groupParameters.MultiplyElements(P, VV); - Element R[2]; - const Integer e2[2] = {r, e}; - params.SimultaneousExponentiate(R, P, e2, 2); - if (!params.IsIdentity(R[0]) || params.IsIdentity(R[1])) - return false; - params.EncodeElement(false, R[1], agreedValue); - } - else - { - const Integer &k = params.GetCofactor(); - if (COFACTOR_OPTION::ToEnum() == COMPATIBLE_COFACTOR_MULTIPLICTION) - e = ModularArithmetic(r).Divide(e, k); - Element P = m_groupParameters.CascadeExponentiate(VV, k*e, WW, k*(e*tt%r)); - if (params.IsIdentity(P)) - return false; - params.EncodeElement(false, P, agreedValue); - } - } - catch (DL_BadElement &) - { - return false; - } - return true; - } - -private: - DL_GroupParameters & AccessAbstractGroupParameters() {return m_groupParameters;} - const DL_GroupParameters & GetAbstractGroupParameters() const {return m_groupParameters;} - - GroupParameters m_groupParameters; -}; - -//! Menezes-Qu-Vanstone in GF(p) with key validation, AKA MQV -typedef MQV_Domain MQV; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.cpp deleted file mode 100644 index 3fdea4e6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.cpp +++ /dev/null @@ -1,1123 +0,0 @@ -// nbtheory.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "nbtheory.h" -#include "modarith.h" -#include "algparam.h" - -#include -#include - -#ifdef _OPENMP -// needed in MSVC 2005 to generate correct manifest -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -const word s_lastSmallPrime = 32719; - -struct NewPrimeTable -{ - std::vector * operator()() const - { - const unsigned int maxPrimeTableSize = 3511; - - std::auto_ptr > pPrimeTable(new std::vector); - std::vector &primeTable = *pPrimeTable; - primeTable.reserve(maxPrimeTableSize); - - primeTable.push_back(2); - unsigned int testEntriesEnd = 1; - - for (unsigned int p=3; p<=s_lastSmallPrime; p+=2) - { - unsigned int j; - for (j=1; j &primeTable = Singleton, NewPrimeTable>().Ref(); - size = (unsigned int)primeTable.size(); - return &primeTable[0]; -} - -bool IsSmallPrime(const Integer &p) -{ - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - if (p.IsPositive() && p <= primeTable[primeTableSize-1]) - return std::binary_search(primeTable, primeTable+primeTableSize, (word16)p.ConvertToLong()); - else - return false; -} - -bool TrialDivision(const Integer &p, unsigned bound) -{ - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - assert(primeTable[primeTableSize-1] >= bound); - - unsigned int i; - for (i = 0; primeTable[i]3 && b>1 && b3 && b>1 && b>a; - - Integer z = a_exp_b_mod_c(b, m, n); - if (z==1 || z==nminus1) - return true; - for (unsigned j=1; j3); - - Integer b; - for (unsigned int i=0; i2); - - Integer b=3; - unsigned int i=0; - int j; - - while ((j=Jacobi(b.Squared()-4, n)) == 1) - { - if (++i==64 && n.IsSquare()) // avoid infinite loop if n is a square - return false; - ++b; ++b; - } - - if (j==0) - return false; - else - return Lucas(n+1, b, n)==2; -} - -bool IsStrongLucasProbablePrime(const Integer &n) -{ - if (n <= 1) - return false; - - if (n.IsEven()) - return n==2; - - assert(n>2); - - Integer b=3; - unsigned int i=0; - int j; - - while ((j=Jacobi(b.Squared()-4, n)) == 1) - { - if (++i==64 && n.IsSquare()) // avoid infinite loop if n is a square - return false; - ++b; ++b; - } - - if (j==0) - return false; - - Integer n1 = n+1; - unsigned int a; - - // calculate a = largest power of 2 that divides n1 - for (a=0; ; a++) - if (n1.GetBit(a)) - break; - Integer m = n1>>a; - - Integer z = Lucas(m, b, n); - if (z==2 || z==n-2) - return true; - for (i=1; i().Ref()) - return SmallDivisorsTest(p); - else - return SmallDivisorsTest(p) && IsStrongProbablePrime(p, 3) && IsStrongLucasProbablePrime(p); -} - -bool VerifyPrime(RandomNumberGenerator &rng, const Integer &p, unsigned int level) -{ - bool pass = IsPrime(p) && RabinMillerTest(rng, p, 1); - if (level >= 1) - pass = pass && RabinMillerTest(rng, p, 10); - return pass; -} - -unsigned int PrimeSearchInterval(const Integer &max) -{ - return max.BitCount(); -} - -static inline bool FastProbablePrimeTest(const Integer &n) -{ - return IsStrongProbablePrime(n,2); -} - -AlgorithmParameters MakeParametersForTwoPrimesOfEqualSize(unsigned int productBitLength) -{ - if (productBitLength < 16) - throw InvalidArgument("invalid bit length"); - - Integer minP, maxP; - - if (productBitLength%2==0) - { - minP = Integer(182) << (productBitLength/2-8); - maxP = Integer::Power2(productBitLength/2)-1; - } - else - { - minP = Integer::Power2((productBitLength-1)/2); - maxP = Integer(181) << ((productBitLength+1)/2-8); - } - - return MakeParameters("RandomNumberType", Integer::PRIME)("Min", minP)("Max", maxP); -} - -class PrimeSieve -{ -public: - // delta == 1 or -1 means double sieve with p = 2*q + delta - PrimeSieve(const Integer &first, const Integer &last, const Integer &step, signed int delta=0); - bool NextCandidate(Integer &c); - - void DoSieve(); - static void SieveSingle(std::vector &sieve, word16 p, const Integer &first, const Integer &step, word16 stepInv); - - Integer m_first, m_last, m_step; - signed int m_delta; - word m_next; - std::vector m_sieve; -}; - -PrimeSieve::PrimeSieve(const Integer &first, const Integer &last, const Integer &step, signed int delta) - : m_first(first), m_last(last), m_step(step), m_delta(delta), m_next(0) -{ - DoSieve(); -} - -bool PrimeSieve::NextCandidate(Integer &c) -{ - bool safe = SafeConvert(std::find(m_sieve.begin()+m_next, m_sieve.end(), false) - m_sieve.begin(), m_next); - assert(safe); - if (m_next == m_sieve.size()) - { - m_first += long(m_sieve.size())*m_step; - if (m_first > m_last) - return false; - else - { - m_next = 0; - DoSieve(); - return NextCandidate(c); - } - } - else - { - c = m_first + long(m_next)*m_step; - ++m_next; - return true; - } -} - -void PrimeSieve::SieveSingle(std::vector &sieve, word16 p, const Integer &first, const Integer &step, word16 stepInv) -{ - if (stepInv) - { - size_t sieveSize = sieve.size(); - size_t j = (word32(p-(first%p))*stepInv) % p; - // if the first multiple of p is p, skip it - if (first.WordCount() <= 1 && first + step*long(j) == p) - j += p; - for (; j < sieveSize; j += p) - sieve[j] = true; - } -} - -void PrimeSieve::DoSieve() -{ - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - const unsigned int maxSieveSize = 32768; - unsigned int sieveSize = STDMIN(Integer(maxSieveSize), (m_last-m_first)/m_step+1).ConvertToLong(); - - m_sieve.clear(); - m_sieve.resize(sieveSize, false); - - if (m_delta == 0) - { - for (unsigned int i = 0; i < primeTableSize; ++i) - SieveSingle(m_sieve, primeTable[i], m_first, m_step, (word16)m_step.InverseMod(primeTable[i])); - } - else - { - assert(m_step%2==0); - Integer qFirst = (m_first-m_delta) >> 1; - Integer halfStep = m_step >> 1; - for (unsigned int i = 0; i < primeTableSize; ++i) - { - word16 p = primeTable[i]; - word16 stepInv = (word16)m_step.InverseMod(p); - SieveSingle(m_sieve, p, m_first, m_step, stepInv); - - word16 halfStepInv = 2*stepInv < p ? 2*stepInv : 2*stepInv-p; - SieveSingle(m_sieve, p, qFirst, halfStep, halfStepInv); - } - } -} - -bool FirstPrime(Integer &p, const Integer &max, const Integer &equiv, const Integer &mod, const PrimeSelector *pSelector) -{ - assert(!equiv.IsNegative() && equiv < mod); - - Integer gcd = GCD(equiv, mod); - if (gcd != Integer::One()) - { - // the only possible prime p such that p%mod==equiv where GCD(mod,equiv)!=1 is GCD(mod,equiv) - if (p <= gcd && gcd <= max && IsPrime(gcd) && (!pSelector || pSelector->IsAcceptable(gcd))) - { - p = gcd; - return true; - } - else - return false; - } - - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - if (p <= primeTable[primeTableSize-1]) - { - const word16 *pItr; - - --p; - if (p.IsPositive()) - pItr = std::upper_bound(primeTable, primeTable+primeTableSize, (word)p.ConvertToLong()); - else - pItr = primeTable; - - while (pItr < primeTable+primeTableSize && !(*pItr%mod == equiv && (!pSelector || pSelector->IsAcceptable(*pItr)))) - ++pItr; - - if (pItr < primeTable+primeTableSize) - { - p = *pItr; - return p <= max; - } - - p = primeTable[primeTableSize-1]+1; - } - - assert(p > primeTable[primeTableSize-1]); - - if (mod.IsOdd()) - return FirstPrime(p, max, CRT(equiv, mod, 1, 2, 1), mod<<1, pSelector); - - p += (equiv-p)%mod; - - if (p>max) - return false; - - PrimeSieve sieve(p, max, mod); - - while (sieve.NextCandidate(p)) - { - if ((!pSelector || pSelector->IsAcceptable(p)) && FastProbablePrimeTest(p) && IsPrime(p)) - return true; - } - - return false; -} - -// the following two functions are based on code and comments provided by Preda Mihailescu -static bool ProvePrime(const Integer &p, const Integer &q) -{ - assert(p < q*q*q); - assert(p % q == 1); - -// this is the Quisquater test. Numbers p having passed the Lucas - Lehmer test -// for q and verifying p < q^3 can only be built up of two factors, both = 1 mod q, -// or be prime. The next two lines build the discriminant of a quadratic equation -// which holds iff p is built up of two factors (excercise ... ) - - Integer r = (p-1)/q; - if (((r%q).Squared()-4*(r/q)).IsSquare()) - return false; - - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - assert(primeTableSize >= 50); - for (int i=0; i<50; i++) - { - Integer b = a_exp_b_mod_c(primeTable[i], r, p); - if (b != 1) - return a_exp_b_mod_c(b, q, p) == 1; - } - return false; -} - -Integer MihailescuProvablePrime(RandomNumberGenerator &rng, unsigned int pbits) -{ - Integer p; - Integer minP = Integer::Power2(pbits-1); - Integer maxP = Integer::Power2(pbits) - 1; - - if (maxP <= Integer(s_lastSmallPrime).Squared()) - { - // Randomize() will generate a prime provable by trial division - p.Randomize(rng, minP, maxP, Integer::PRIME); - return p; - } - - unsigned int qbits = (pbits+2)/3 + 1 + rng.GenerateWord32(0, pbits/36); - Integer q = MihailescuProvablePrime(rng, qbits); - Integer q2 = q<<1; - - while (true) - { - // this initializes the sieve to search in the arithmetic - // progression p = p_0 + \lambda * q2 = p_0 + 2 * \lambda * q, - // with q the recursively generated prime above. We will be able - // to use Lucas tets for proving primality. A trick of Quisquater - // allows taking q > cubic_root(p) rather then square_root: this - // decreases the recursion. - - p.Randomize(rng, minP, maxP, Integer::ANY, 1, q2); - PrimeSieve sieve(p, STDMIN(p+PrimeSearchInterval(maxP)*q2, maxP), q2); - - while (sieve.NextCandidate(p)) - { - if (FastProbablePrimeTest(p) && ProvePrime(p, q)) - return p; - } - } - - // not reached - return p; -} - -Integer MaurerProvablePrime(RandomNumberGenerator &rng, unsigned int bits) -{ - const unsigned smallPrimeBound = 29, c_opt=10; - Integer p; - - unsigned int primeTableSize; - const word16 * primeTable = GetPrimeTable(primeTableSize); - - if (bits < smallPrimeBound) - { - do - p.Randomize(rng, Integer::Power2(bits-1), Integer::Power2(bits)-1, Integer::ANY, 1, 2); - while (TrialDivision(p, 1 << ((bits+1)/2))); - } - else - { - const unsigned margin = bits > 50 ? 20 : (bits-10)/2; - double relativeSize; - do - relativeSize = pow(2.0, double(rng.GenerateWord32())/0xffffffff - 1); - while (bits * relativeSize >= bits - margin); - - Integer a,b; - Integer q = MaurerProvablePrime(rng, unsigned(bits*relativeSize)); - Integer I = Integer::Power2(bits-2)/q; - Integer I2 = I << 1; - unsigned int trialDivisorBound = (unsigned int)STDMIN((unsigned long)primeTable[primeTableSize-1], (unsigned long)bits*bits/c_opt); - bool success = false; - while (!success) - { - p.Randomize(rng, I, I2, Integer::ANY); - p *= q; p <<= 1; ++p; - if (!TrialDivision(p, trialDivisorBound)) - { - a.Randomize(rng, 2, p-1, Integer::ANY); - b = a_exp_b_mod_c(a, (p-1)/q, p); - success = (GCD(b-1, p) == 1) && (a_exp_b_mod_c(b, q, p) == 1); - } - } - } - return p; -} - -Integer CRT(const Integer &xp, const Integer &p, const Integer &xq, const Integer &q, const Integer &u) -{ - // isn't operator overloading great? - return p * (u * (xq-xp) % q) + xp; -/* - Integer t1 = xq-xp; - cout << hex << t1 << endl; - Integer t2 = u * t1; - cout << hex << t2 << endl; - Integer t3 = t2 % q; - cout << hex << t3 << endl; - Integer t4 = p * t3; - cout << hex << t4 << endl; - Integer t5 = t4 + xp; - cout << hex << t5 << endl; - return t5; -*/ -} - -Integer ModularSquareRoot(const Integer &a, const Integer &p) -{ - if (p%4 == 3) - return a_exp_b_mod_c(a, (p+1)/4, p); - - Integer q=p-1; - unsigned int r=0; - while (q.IsEven()) - { - r++; - q >>= 1; - } - - Integer n=2; - while (Jacobi(n, p) != -1) - ++n; - - Integer y = a_exp_b_mod_c(n, q, p); - Integer x = a_exp_b_mod_c(a, (q-1)/2, p); - Integer b = (x.Squared()%p)*a%p; - x = a*x%p; - Integer tempb, t; - - while (b != 1) - { - unsigned m=0; - tempb = b; - do - { - m++; - b = b.Squared()%p; - if (m==r) - return Integer::Zero(); - } - while (b != 1); - - t = y; - for (unsigned i=0; i>= 1; - b >>= 1; - k++; - } - - while (a[0]==0) - a >>= 1; - - while (b[0]==0) - b >>= 1; - - while (1) - { - switch (a.Compare(b)) - { - case -1: - b -= a; - while (b[0]==0) - b >>= 1; - break; - - case 0: - return (a <<= k); - - case 1: - a -= b; - while (a[0]==0) - a >>= 1; - break; - - default: - assert(false); - } - } -} - -Integer EuclideanMultiplicativeInverse(const Integer &a, const Integer &b) -{ - assert(b.Positive()); - - if (a.Negative()) - return EuclideanMultiplicativeInverse(a%b, b); - - if (b[0]==0) - { - if (!b || a[0]==0) - return Integer::Zero(); // no inverse - if (a==1) - return 1; - Integer u = EuclideanMultiplicativeInverse(b, a); - if (!u) - return Integer::Zero(); // no inverse - else - return (b*(a-u)+1)/a; - } - - Integer u=1, d=a, v1=b, v3=b, t1, t3, b2=(b+1)>>1; - - if (a[0]) - { - t1 = Integer::Zero(); - t3 = -b; - } - else - { - t1 = b2; - t3 = a>>1; - } - - while (!!t3) - { - while (t3[0]==0) - { - t3 >>= 1; - if (t1[0]==0) - t1 >>= 1; - else - { - t1 >>= 1; - t1 += b2; - } - } - if (t3.Positive()) - { - u = t1; - d = t3; - } - else - { - v1 = b-t1; - v3 = -t3; - } - t1 = u-v1; - t3 = d-v3; - if (t1.Negative()) - t1 += b; - } - if (d==1) - return u; - else - return Integer::Zero(); // no inverse -} -*/ - -int Jacobi(const Integer &aIn, const Integer &bIn) -{ - assert(bIn.IsOdd()); - - Integer b = bIn, a = aIn%bIn; - int result = 1; - - while (!!a) - { - unsigned i=0; - while (a.GetBit(i)==0) - i++; - a>>=i; - - if (i%2==1 && (b%8==3 || b%8==5)) - result = -result; - - if (a%4==3 && b%4==3) - result = -result; - - std::swap(a, b); - a %= b; - } - - return (b==1) ? result : 0; -} - -Integer Lucas(const Integer &e, const Integer &pIn, const Integer &n) -{ - unsigned i = e.BitCount(); - if (i==0) - return Integer::Two(); - - MontgomeryRepresentation m(n); - Integer p=m.ConvertIn(pIn%n), two=m.ConvertIn(Integer::Two()); - Integer v=p, v1=m.Subtract(m.Square(p), two); - - i--; - while (i--) - { - if (e.GetBit(i)) - { - // v = (v*v1 - p) % m; - v = m.Subtract(m.Multiply(v,v1), p); - // v1 = (v1*v1 - 2) % m; - v1 = m.Subtract(m.Square(v1), two); - } - else - { - // v1 = (v*v1 - p) % m; - v1 = m.Subtract(m.Multiply(v,v1), p); - // v = (v*v - 2) % m; - v = m.Subtract(m.Square(v), two); - } - } - return m.ConvertOut(v); -} - -// This is Peter Montgomery's unpublished Lucas sequence evalutation algorithm. -// The total number of multiplies and squares used is less than the binary -// algorithm (see above). Unfortunately I can't get it to run as fast as -// the binary algorithm because of the extra overhead. -/* -Integer Lucas(const Integer &n, const Integer &P, const Integer &modulus) -{ - if (!n) - return 2; - -#define f(A, B, C) m.Subtract(m.Multiply(A, B), C) -#define X2(A) m.Subtract(m.Square(A), two) -#define X3(A) m.Multiply(A, m.Subtract(m.Square(A), three)) - - MontgomeryRepresentation m(modulus); - Integer two=m.ConvertIn(2), three=m.ConvertIn(3); - Integer A=m.ConvertIn(P), B, C, p, d=n, e, r, t, T, U; - - while (d!=1) - { - p = d; - unsigned int b = WORD_BITS * p.WordCount(); - Integer alpha = (Integer(5)<<(2*b-2)).SquareRoot() - Integer::Power2(b-1); - r = (p*alpha)>>b; - e = d-r; - B = A; - C = two; - d = r; - - while (d!=e) - { - if (d>2)) - if ((dm3+em3==0 || dm3+em3==3) && (t = e, t >>= 2, t += e, d <= t)) - { - // #1 -// t = (d+d-e)/3; -// t = d; t += d; t -= e; t /= 3; -// e = (e+e-d)/3; -// e += e; e -= d; e /= 3; -// d = t; - -// t = (d+e)/3 - t = d; t += e; t /= 3; - e -= t; - d -= t; - - T = f(A, B, C); - U = f(T, A, B); - B = f(T, B, A); - A = U; - continue; - } - -// if (dm6 == em6 && d <= e + (e>>2)) - if (dm3 == em3 && dm2 == em2 && (t = e, t >>= 2, t += e, d <= t)) - { - // #2 -// d = (d-e)>>1; - d -= e; d >>= 1; - B = f(A, B, C); - A = X2(A); - continue; - } - -// if (d <= (e<<2)) - if (d <= (t = e, t <<= 2)) - { - // #3 - d -= e; - C = f(A, B, C); - swap(B, C); - continue; - } - - if (dm2 == em2) - { - // #4 -// d = (d-e)>>1; - d -= e; d >>= 1; - B = f(A, B, C); - A = X2(A); - continue; - } - - if (dm2 == 0) - { - // #5 - d >>= 1; - C = f(A, C, B); - A = X2(A); - continue; - } - - if (dm3 == 0) - { - // #6 -// d = d/3 - e; - d /= 3; d -= e; - T = X2(A); - C = f(T, f(A, B, C), C); - swap(B, C); - A = f(T, A, A); - continue; - } - - if (dm3+em3==0 || dm3+em3==3) - { - // #7 -// d = (d-e-e)/3; - d -= e; d -= e; d /= 3; - T = f(A, B, C); - B = f(T, A, B); - A = X3(A); - continue; - } - - if (dm3 == em3) - { - // #8 -// d = (d-e)/3; - d -= e; d /= 3; - T = f(A, B, C); - C = f(A, C, B); - B = T; - A = X3(A); - continue; - } - - assert(em2 == 0); - // #9 - e >>= 1; - C = f(C, B, A); - B = X2(B); - } - - A = f(A, B, C); - } - -#undef f -#undef X2 -#undef X3 - - return m.ConvertOut(A); -} -*/ - -Integer InverseLucas(const Integer &e, const Integer &m, const Integer &p, const Integer &q, const Integer &u) -{ - Integer d = (m*m-4); - Integer p2, q2; - #pragma omp parallel - #pragma omp sections - { - #pragma omp section - { - p2 = p-Jacobi(d,p); - p2 = Lucas(EuclideanMultiplicativeInverse(e,p2), m, p); - } - #pragma omp section - { - q2 = q-Jacobi(d,q); - q2 = Lucas(EuclideanMultiplicativeInverse(e,q2), m, q); - } - } - return CRT(p2, p, q2, q, u); -} - -unsigned int FactoringWorkFactor(unsigned int n) -{ - // extrapolated from the table in Odlyzko's "The Future of Integer Factorization" - // updated to reflect the factoring of RSA-130 - if (n<5) return 0; - else return (unsigned int)(2.4 * pow((double)n, 1.0/3.0) * pow(log(double(n)), 2.0/3.0) - 5); -} - -unsigned int DiscreteLogWorkFactor(unsigned int n) -{ - // assuming discrete log takes about the same time as factoring - if (n<5) return 0; - else return (unsigned int)(2.4 * pow((double)n, 1.0/3.0) * pow(log(double(n)), 2.0/3.0) - 5); -} - -// ******************************************************** - -void PrimeAndGenerator::Generate(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned int qbits) -{ - // no prime exists for delta = -1, qbits = 4, and pbits = 5 - assert(qbits > 4); - assert(pbits > qbits); - - if (qbits+1 == pbits) - { - Integer minP = Integer::Power2(pbits-1); - Integer maxP = Integer::Power2(pbits) - 1; - bool success = false; - - while (!success) - { - p.Randomize(rng, minP, maxP, Integer::ANY, 6+5*delta, 12); - PrimeSieve sieve(p, STDMIN(p+PrimeSearchInterval(maxP)*12, maxP), 12, delta); - - while (sieve.NextCandidate(p)) - { - assert(IsSmallPrime(p) || SmallDivisorsTest(p)); - q = (p-delta) >> 1; - assert(IsSmallPrime(q) || SmallDivisorsTest(q)); - if (FastProbablePrimeTest(q) && FastProbablePrimeTest(p) && IsPrime(q) && IsPrime(p)) - { - success = true; - break; - } - } - } - - if (delta == 1) - { - // find g such that g is a quadratic residue mod p, then g has order q - // g=4 always works, but this way we get the smallest quadratic residue (other than 1) - for (g=2; Jacobi(g, p) != 1; ++g) {} - // contributed by Walt Tuvell: g should be the following according to the Law of Quadratic Reciprocity - assert((p%8==1 || p%8==7) ? g==2 : (p%12==1 || p%12==11) ? g==3 : g==4); - } - else - { - assert(delta == -1); - // find g such that g*g-4 is a quadratic non-residue, - // and such that g has order q - for (g=3; ; ++g) - if (Jacobi(g*g-4, p)==-1 && Lucas(q, g, p)==2) - break; - } - } - else - { - Integer minQ = Integer::Power2(qbits-1); - Integer maxQ = Integer::Power2(qbits) - 1; - Integer minP = Integer::Power2(pbits-1); - Integer maxP = Integer::Power2(pbits) - 1; - - do - { - q.Randomize(rng, minQ, maxQ, Integer::PRIME); - } while (!p.Randomize(rng, minP, maxP, Integer::PRIME, delta%q, q)); - - // find a random g of order q - if (delta==1) - { - do - { - Integer h(rng, 2, p-2, Integer::ANY); - g = a_exp_b_mod_c(h, (p-1)/q, p); - } while (g <= 1); - assert(a_exp_b_mod_c(g, q, p)==1); - } - else - { - assert(delta==-1); - do - { - Integer h(rng, 3, p-1, Integer::ANY); - if (Jacobi(h*h-4, p)==1) - continue; - g = Lucas((p+1)/q, h, p); - } while (g <= 2); - assert(Lucas(q, g, p) == 2); - } - } -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.h deleted file mode 100644 index 63647926..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/nbtheory.h +++ /dev/null @@ -1,131 +0,0 @@ -// nbtheory.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_NBTHEORY_H -#define CRYPTOPP_NBTHEORY_H - -#include "integer.h" -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -// obtain pointer to small prime table and get its size -CRYPTOPP_DLL const word16 * CRYPTOPP_API GetPrimeTable(unsigned int &size); - -// ************ primality testing **************** - -// generate a provable prime -CRYPTOPP_DLL Integer CRYPTOPP_API MaurerProvablePrime(RandomNumberGenerator &rng, unsigned int bits); -CRYPTOPP_DLL Integer CRYPTOPP_API MihailescuProvablePrime(RandomNumberGenerator &rng, unsigned int bits); - -CRYPTOPP_DLL bool CRYPTOPP_API IsSmallPrime(const Integer &p); - -// returns true if p is divisible by some prime less than bound -// bound not be greater than the largest entry in the prime table -CRYPTOPP_DLL bool CRYPTOPP_API TrialDivision(const Integer &p, unsigned bound); - -// returns true if p is NOT divisible by small primes -CRYPTOPP_DLL bool CRYPTOPP_API SmallDivisorsTest(const Integer &p); - -// These is no reason to use these two, use the ones below instead -CRYPTOPP_DLL bool CRYPTOPP_API IsFermatProbablePrime(const Integer &n, const Integer &b); -CRYPTOPP_DLL bool CRYPTOPP_API IsLucasProbablePrime(const Integer &n); - -CRYPTOPP_DLL bool CRYPTOPP_API IsStrongProbablePrime(const Integer &n, const Integer &b); -CRYPTOPP_DLL bool CRYPTOPP_API IsStrongLucasProbablePrime(const Integer &n); - -// Rabin-Miller primality test, i.e. repeating the strong probable prime test -// for several rounds with random bases -CRYPTOPP_DLL bool CRYPTOPP_API RabinMillerTest(RandomNumberGenerator &rng, const Integer &w, unsigned int rounds); - -// primality test, used to generate primes -CRYPTOPP_DLL bool CRYPTOPP_API IsPrime(const Integer &p); - -// more reliable than IsPrime(), used to verify primes generated by others -CRYPTOPP_DLL bool CRYPTOPP_API VerifyPrime(RandomNumberGenerator &rng, const Integer &p, unsigned int level = 1); - -class CRYPTOPP_DLL PrimeSelector -{ -public: - const PrimeSelector *GetSelectorPointer() const {return this;} - virtual bool IsAcceptable(const Integer &candidate) const =0; -}; - -// use a fast sieve to find the first probable prime in {x | p<=x<=max and x%mod==equiv} -// returns true iff successful, value of p is undefined if no such prime exists -CRYPTOPP_DLL bool CRYPTOPP_API FirstPrime(Integer &p, const Integer &max, const Integer &equiv, const Integer &mod, const PrimeSelector *pSelector); - -CRYPTOPP_DLL unsigned int CRYPTOPP_API PrimeSearchInterval(const Integer &max); - -CRYPTOPP_DLL AlgorithmParameters CRYPTOPP_API MakeParametersForTwoPrimesOfEqualSize(unsigned int productBitLength); - -// ********** other number theoretic functions ************ - -inline Integer GCD(const Integer &a, const Integer &b) - {return Integer::Gcd(a,b);} -inline bool RelativelyPrime(const Integer &a, const Integer &b) - {return Integer::Gcd(a,b) == Integer::One();} -inline Integer LCM(const Integer &a, const Integer &b) - {return a/Integer::Gcd(a,b)*b;} -inline Integer EuclideanMultiplicativeInverse(const Integer &a, const Integer &b) - {return a.InverseMod(b);} - -// use Chinese Remainder Theorem to calculate x given x mod p and x mod q, and u = inverse of p mod q -CRYPTOPP_DLL Integer CRYPTOPP_API CRT(const Integer &xp, const Integer &p, const Integer &xq, const Integer &q, const Integer &u); - -// if b is prime, then Jacobi(a, b) returns 0 if a%b==0, 1 if a is quadratic residue mod b, -1 otherwise -// check a number theory book for what Jacobi symbol means when b is not prime -CRYPTOPP_DLL int CRYPTOPP_API Jacobi(const Integer &a, const Integer &b); - -// calculates the Lucas function V_e(p, 1) mod n -CRYPTOPP_DLL Integer CRYPTOPP_API Lucas(const Integer &e, const Integer &p, const Integer &n); -// calculates x such that m==Lucas(e, x, p*q), p q primes, u=inverse of p mod q -CRYPTOPP_DLL Integer CRYPTOPP_API InverseLucas(const Integer &e, const Integer &m, const Integer &p, const Integer &q, const Integer &u); - -inline Integer ModularExponentiation(const Integer &a, const Integer &e, const Integer &m) - {return a_exp_b_mod_c(a, e, m);} -// returns x such that x*x%p == a, p prime -CRYPTOPP_DLL Integer CRYPTOPP_API ModularSquareRoot(const Integer &a, const Integer &p); -// returns x such that a==ModularExponentiation(x, e, p*q), p q primes, -// and e relatively prime to (p-1)*(q-1) -// dp=d%(p-1), dq=d%(q-1), (d is inverse of e mod (p-1)*(q-1)) -// and u=inverse of p mod q -CRYPTOPP_DLL Integer CRYPTOPP_API ModularRoot(const Integer &a, const Integer &dp, const Integer &dq, const Integer &p, const Integer &q, const Integer &u); - -// find r1 and r2 such that ax^2 + bx + c == 0 (mod p) for x in {r1, r2}, p prime -// returns true if solutions exist -CRYPTOPP_DLL bool CRYPTOPP_API SolveModularQuadraticEquation(Integer &r1, Integer &r2, const Integer &a, const Integer &b, const Integer &c, const Integer &p); - -// returns log base 2 of estimated number of operations to calculate discrete log or factor a number -CRYPTOPP_DLL unsigned int CRYPTOPP_API DiscreteLogWorkFactor(unsigned int bitlength); -CRYPTOPP_DLL unsigned int CRYPTOPP_API FactoringWorkFactor(unsigned int bitlength); - -// ******************************************************** - -//! generator of prime numbers of special forms -class CRYPTOPP_DLL PrimeAndGenerator -{ -public: - PrimeAndGenerator() {} - // generate a random prime p of the form 2*q+delta, where delta is 1 or -1 and q is also prime - // Precondition: pbits > 5 - // warning: this is slow, because primes of this form are harder to find - PrimeAndGenerator(signed int delta, RandomNumberGenerator &rng, unsigned int pbits) - {Generate(delta, rng, pbits, pbits-1);} - // generate a random prime p of the form 2*r*q+delta, where q is also prime - // Precondition: qbits > 4 && pbits > qbits - PrimeAndGenerator(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned qbits) - {Generate(delta, rng, pbits, qbits);} - - void Generate(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned qbits); - - const Integer& Prime() const {return p;} - const Integer& SubPrime() const {return q;} - const Integer& Generator() const {return g;} - -private: - Integer p, q, g; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/network.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/network.cpp deleted file mode 100644 index 9b7198d1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/network.cpp +++ /dev/null @@ -1,550 +0,0 @@ -// network.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "network.h" -#include "wait.h" - -#define CRYPTOPP_TRACE_NETWORK 0 - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef HIGHRES_TIMER_AVAILABLE - -lword LimitedBandwidth::ComputeCurrentTransceiveLimit() -{ - if (!m_maxBytesPerSecond) - return ULONG_MAX; - - double curTime = GetCurTimeAndCleanUp(); - lword total = 0; - for (OpQueue::size_type i=0; i!=m_ops.size(); ++i) - total += m_ops[i].second; - return SaturatingSubtract(m_maxBytesPerSecond, total); -} - -double LimitedBandwidth::TimeToNextTransceive() -{ - if (!m_maxBytesPerSecond) - return 0; - - if (!m_nextTransceiveTime) - ComputeNextTransceiveTime(); - - return SaturatingSubtract(m_nextTransceiveTime, m_timer.ElapsedTimeAsDouble()); -} - -void LimitedBandwidth::NoteTransceive(lword size) -{ - if (m_maxBytesPerSecond) - { - double curTime = GetCurTimeAndCleanUp(); - m_ops.push_back(std::make_pair(curTime, size)); - m_nextTransceiveTime = 0; - } -} - -void LimitedBandwidth::ComputeNextTransceiveTime() -{ - double curTime = GetCurTimeAndCleanUp(); - lword total = 0; - for (unsigned int i=0; i!=m_ops.size(); ++i) - total += m_ops[i].second; - m_nextTransceiveTime = - (total < m_maxBytesPerSecond) ? curTime : m_ops.front().first + 1000; -} - -double LimitedBandwidth::GetCurTimeAndCleanUp() -{ - if (!m_maxBytesPerSecond) - return 0; - - double curTime = m_timer.ElapsedTimeAsDouble(); - while (m_ops.size() && (m_ops.front().first + 1000 < curTime)) - m_ops.pop_front(); - return curTime; -} - -void LimitedBandwidth::GetWaitObjects(WaitObjectContainer &container, const CallStack &callStack) -{ - double nextTransceiveTime = TimeToNextTransceive(); - if (nextTransceiveTime) - container.ScheduleEvent(nextTransceiveTime, CallStack("LimitedBandwidth::GetWaitObjects()", &callStack)); -} - -// ************************************************************* - -size_t NonblockingSource::GeneralPump2( - lword& byteCount, bool blockingOutput, - unsigned long maxTime, bool checkDelimiter, byte delimiter) -{ - m_blockedBySpeedLimit = false; - - if (!GetMaxBytesPerSecond()) - { - size_t ret = DoPump(byteCount, blockingOutput, maxTime, checkDelimiter, delimiter); - m_doPumpBlocked = (ret != 0); - return ret; - } - - bool forever = (maxTime == INFINITE_TIME); - unsigned long timeToGo = maxTime; - Timer timer(Timer::MILLISECONDS, forever); - lword maxSize = byteCount; - byteCount = 0; - - timer.StartTimer(); - - while (true) - { - lword curMaxSize = UnsignedMin(ComputeCurrentTransceiveLimit(), maxSize - byteCount); - - if (curMaxSize || m_doPumpBlocked) - { - if (!forever) timeToGo = SaturatingSubtract(maxTime, timer.ElapsedTime()); - size_t ret = DoPump(curMaxSize, blockingOutput, timeToGo, checkDelimiter, delimiter); - m_doPumpBlocked = (ret != 0); - if (curMaxSize) - { - NoteTransceive(curMaxSize); - byteCount += curMaxSize; - } - if (ret) - return ret; - } - - if (maxSize != ULONG_MAX && byteCount >= maxSize) - break; - - if (!forever) - { - timeToGo = SaturatingSubtract(maxTime, timer.ElapsedTime()); - if (!timeToGo) - break; - } - - double waitTime = TimeToNextTransceive(); - if (!forever && waitTime > timeToGo) - { - m_blockedBySpeedLimit = true; - break; - } - - WaitObjectContainer container; - LimitedBandwidth::GetWaitObjects(container, CallStack("NonblockingSource::GeneralPump2() - speed limit", 0)); - container.Wait((unsigned long)waitTime); - } - - return 0; -} - -size_t NonblockingSource::PumpMessages2(unsigned int &messageCount, bool blocking) -{ - if (messageCount == 0) - return 0; - - messageCount = 0; - - lword byteCount; - do { - byteCount = LWORD_MAX; - RETURN_IF_NONZERO(Pump2(byteCount, blocking)); - } while(byteCount == LWORD_MAX); - - if (!m_messageEndSent && SourceExhausted()) - { - RETURN_IF_NONZERO(AttachedTransformation()->Put2(NULL, 0, GetAutoSignalPropagation(), true)); - m_messageEndSent = true; - messageCount = 1; - } - return 0; -} - -lword NonblockingSink::TimedFlush(unsigned long maxTime, size_t targetSize) -{ - m_blockedBySpeedLimit = false; - - size_t curBufSize = GetCurrentBufferSize(); - if (curBufSize <= targetSize && (targetSize || !EofPending())) - return 0; - - if (!GetMaxBytesPerSecond()) - return DoFlush(maxTime, targetSize); - - bool forever = (maxTime == INFINITE_TIME); - unsigned long timeToGo = maxTime; - Timer timer(Timer::MILLISECONDS, forever); - lword totalFlushed = 0; - - timer.StartTimer(); - - while (true) - { - size_t flushSize = UnsignedMin(curBufSize - targetSize, ComputeCurrentTransceiveLimit()); - if (flushSize || EofPending()) - { - if (!forever) timeToGo = SaturatingSubtract(maxTime, timer.ElapsedTime()); - size_t ret = (size_t)DoFlush(timeToGo, curBufSize - flushSize); - if (ret) - { - NoteTransceive(ret); - curBufSize -= ret; - totalFlushed += ret; - } - } - - if (curBufSize <= targetSize && (targetSize || !EofPending())) - break; - - if (!forever) - { - timeToGo = SaturatingSubtract(maxTime, timer.ElapsedTime()); - if (!timeToGo) - break; - } - - double waitTime = TimeToNextTransceive(); - if (!forever && waitTime > timeToGo) - { - m_blockedBySpeedLimit = true; - break; - } - - WaitObjectContainer container; - LimitedBandwidth::GetWaitObjects(container, CallStack("NonblockingSink::TimedFlush() - speed limit", 0)); - container.Wait((unsigned long)waitTime); - } - - return totalFlushed; -} - -bool NonblockingSink::IsolatedFlush(bool hardFlush, bool blocking) -{ - TimedFlush(blocking ? INFINITE_TIME : 0); - return hardFlush && (!!GetCurrentBufferSize() || EofPending()); -} - -// ************************************************************* - -NetworkSource::NetworkSource(BufferedTransformation *attachment) - : NonblockingSource(attachment), m_buf(1024*16) - , m_waitingForResult(false), m_outputBlocked(false) - , m_dataBegin(0), m_dataEnd(0) -{ -} - -unsigned int NetworkSource::GetMaxWaitObjectCount() const -{ - return LimitedBandwidth::GetMaxWaitObjectCount() - + GetReceiver().GetMaxWaitObjectCount() - + AttachedTransformation()->GetMaxWaitObjectCount(); -} - -void NetworkSource::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (BlockedBySpeedLimit()) - LimitedBandwidth::GetWaitObjects(container, CallStack("NetworkSource::GetWaitObjects() - speed limit", &callStack)); - else if (!m_outputBlocked) - { - if (m_dataBegin == m_dataEnd) - AccessReceiver().GetWaitObjects(container, CallStack("NetworkSource::GetWaitObjects() - no data", &callStack)); - else - container.SetNoWait(CallStack("NetworkSource::GetWaitObjects() - have data", &callStack)); - } - - AttachedTransformation()->GetWaitObjects(container, CallStack("NetworkSource::GetWaitObjects() - attachment", &callStack)); -} - -size_t NetworkSource::DoPump(lword &byteCount, bool blockingOutput, unsigned long maxTime, bool checkDelimiter, byte delimiter) -{ - NetworkReceiver &receiver = AccessReceiver(); - - lword maxSize = byteCount; - byteCount = 0; - bool forever = maxTime == INFINITE_TIME; - Timer timer(Timer::MILLISECONDS, forever); - BufferedTransformation *t = AttachedTransformation(); - - if (m_outputBlocked) - goto DoOutput; - - while (true) - { - if (m_dataBegin == m_dataEnd) - { - if (receiver.EofReceived()) - break; - - if (m_waitingForResult) - { - if (receiver.MustWaitForResult() && - !receiver.Wait(SaturatingSubtract(maxTime, timer.ElapsedTime()), - CallStack("NetworkSource::DoPump() - wait receive result", 0))) - break; - - unsigned int recvResult = receiver.GetReceiveResult(); -#if CRYPTOPP_TRACE_NETWORK - OutputDebugString((IntToString((unsigned int)this) + ": Received " + IntToString(recvResult) + " bytes\n").c_str()); -#endif - m_dataEnd += recvResult; - m_waitingForResult = false; - - if (!receiver.MustWaitToReceive() && !receiver.EofReceived() && m_dataEnd != m_buf.size()) - goto ReceiveNoWait; - } - else - { - m_dataEnd = m_dataBegin = 0; - - if (receiver.MustWaitToReceive()) - { - if (!receiver.Wait(SaturatingSubtract(maxTime, timer.ElapsedTime()), - CallStack("NetworkSource::DoPump() - wait receive", 0))) - break; - - receiver.Receive(m_buf+m_dataEnd, m_buf.size()-m_dataEnd); - m_waitingForResult = true; - } - else - { -ReceiveNoWait: - m_waitingForResult = true; - // call Receive repeatedly as long as data is immediately available, - // because some receivers tend to return data in small pieces -#if CRYPTOPP_TRACE_NETWORK - OutputDebugString((IntToString((unsigned int)this) + ": Receiving " + IntToString(m_buf.size()-m_dataEnd) + " bytes\n").c_str()); -#endif - while (receiver.Receive(m_buf+m_dataEnd, m_buf.size()-m_dataEnd)) - { - unsigned int recvResult = receiver.GetReceiveResult(); -#if CRYPTOPP_TRACE_NETWORK - OutputDebugString((IntToString((unsigned int)this) + ": Received " + IntToString(recvResult) + " bytes\n").c_str()); -#endif - m_dataEnd += recvResult; - if (receiver.EofReceived() || m_dataEnd > m_buf.size() /2) - { - m_waitingForResult = false; - break; - } - } - } - } - } - else - { - m_putSize = UnsignedMin(m_dataEnd - m_dataBegin, maxSize - byteCount); - - if (checkDelimiter) - m_putSize = std::find(m_buf+m_dataBegin, m_buf+m_dataBegin+m_putSize, delimiter) - (m_buf+m_dataBegin); - -DoOutput: - size_t result = t->PutModifiable2(m_buf+m_dataBegin, m_putSize, 0, forever || blockingOutput); - if (result) - { - if (t->Wait(SaturatingSubtract(maxTime, timer.ElapsedTime()), - CallStack("NetworkSource::DoPump() - wait attachment", 0))) - goto DoOutput; - else - { - m_outputBlocked = true; - return result; - } - } - m_outputBlocked = false; - - byteCount += m_putSize; - m_dataBegin += m_putSize; - if (checkDelimiter && m_dataBegin < m_dataEnd && m_buf[m_dataBegin] == delimiter) - break; - if (maxSize != ULONG_MAX && byteCount == maxSize) - break; - // once time limit is reached, return even if there is more data waiting - // but make 0 a special case so caller can request a large amount of data to be - // pumped as long as it is immediately available - if (maxTime > 0 && timer.ElapsedTime() > maxTime) - break; - } - } - - return 0; -} - -// ************************************************************* - -NetworkSink::NetworkSink(unsigned int maxBufferSize, unsigned int autoFlushBound) - : m_maxBufferSize(maxBufferSize), m_autoFlushBound(autoFlushBound) - , m_needSendResult(false), m_wasBlocked(false), m_eofState(EOF_NONE) - , m_buffer(STDMIN(16U*1024U+256, maxBufferSize)), m_skipBytes(0) - , m_speedTimer(Timer::MILLISECONDS), m_byteCountSinceLastTimerReset(0) - , m_currentSpeed(0), m_maxObservedSpeed(0) -{ -} - -float NetworkSink::ComputeCurrentSpeed() -{ - if (m_speedTimer.ElapsedTime() > 1000) - { - m_currentSpeed = m_byteCountSinceLastTimerReset * 1000 / m_speedTimer.ElapsedTime(); - m_maxObservedSpeed = STDMAX(m_currentSpeed, m_maxObservedSpeed * 0.98f); - m_byteCountSinceLastTimerReset = 0; - m_speedTimer.StartTimer(); -// OutputDebugString(("max speed: " + IntToString((int)m_maxObservedSpeed) + " current speed: " + IntToString((int)m_currentSpeed) + "\n").c_str()); - } - return m_currentSpeed; -} - -float NetworkSink::GetMaxObservedSpeed() const -{ - lword m = GetMaxBytesPerSecond(); - return m ? STDMIN(m_maxObservedSpeed, float(CRYPTOPP_VC6_INT64 m)) : m_maxObservedSpeed; -} - -unsigned int NetworkSink::GetMaxWaitObjectCount() const -{ - return LimitedBandwidth::GetMaxWaitObjectCount() + GetSender().GetMaxWaitObjectCount(); -} - -void NetworkSink::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (BlockedBySpeedLimit()) - LimitedBandwidth::GetWaitObjects(container, CallStack("NetworkSink::GetWaitObjects() - speed limit", &callStack)); - else if (m_wasBlocked) - AccessSender().GetWaitObjects(container, CallStack("NetworkSink::GetWaitObjects() - was blocked", &callStack)); - else if (!m_buffer.IsEmpty()) - AccessSender().GetWaitObjects(container, CallStack("NetworkSink::GetWaitObjects() - buffer not empty", &callStack)); - else if (EofPending()) - AccessSender().GetWaitObjects(container, CallStack("NetworkSink::GetWaitObjects() - EOF pending", &callStack)); -} - -size_t NetworkSink::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - if (m_eofState == EOF_DONE) - { - if (length || messageEnd) - throw Exception(Exception::OTHER_ERROR, "NetworkSink::Put2() being called after EOF had been sent"); - - return 0; - } - - if (m_eofState > EOF_NONE) - goto EofSite; - - { - if (m_skipBytes) - { - assert(length >= m_skipBytes); - inString += m_skipBytes; - length -= m_skipBytes; - } - - m_buffer.Put(inString, length); - - if (!blocking || m_buffer.CurrentSize() > m_autoFlushBound) - TimedFlush(0, 0); - - size_t targetSize = messageEnd ? 0 : m_maxBufferSize; - if (blocking) - TimedFlush(INFINITE_TIME, targetSize); - - if (m_buffer.CurrentSize() > targetSize) - { - assert(!blocking); - m_wasBlocked = true; - m_skipBytes += length; - size_t blockedBytes = UnsignedMin(length, m_buffer.CurrentSize() - targetSize); - return STDMAX(blockedBytes, 1); - } - - m_wasBlocked = false; - m_skipBytes = 0; - } - - if (messageEnd) - { - m_eofState = EOF_PENDING_SEND; - - EofSite: - TimedFlush(blocking ? INFINITE_TIME : 0, 0); - if (m_eofState != EOF_DONE) - return 1; - } - - return 0; -} - -lword NetworkSink::DoFlush(unsigned long maxTime, size_t targetSize) -{ - NetworkSender &sender = AccessSender(); - - bool forever = maxTime == INFINITE_TIME; - Timer timer(Timer::MILLISECONDS, forever); - unsigned int totalFlushSize = 0; - - while (true) - { - if (m_buffer.CurrentSize() <= targetSize) - break; - - if (m_needSendResult) - { - if (sender.MustWaitForResult() && - !sender.Wait(SaturatingSubtract(maxTime, timer.ElapsedTime()), - CallStack("NetworkSink::DoFlush() - wait send result", 0))) - break; - - unsigned int sendResult = sender.GetSendResult(); -#if CRYPTOPP_TRACE_NETWORK - OutputDebugString((IntToString((unsigned int)this) + ": Sent " + IntToString(sendResult) + " bytes\n").c_str()); -#endif - m_buffer.Skip(sendResult); - totalFlushSize += sendResult; - m_needSendResult = false; - - if (!m_buffer.AnyRetrievable()) - break; - } - - unsigned long timeOut = maxTime ? SaturatingSubtract(maxTime, timer.ElapsedTime()) : 0; - if (sender.MustWaitToSend() && !sender.Wait(timeOut, CallStack("NetworkSink::DoFlush() - wait send", 0))) - break; - - size_t contiguousSize = 0; - const byte *block = m_buffer.Spy(contiguousSize); - -#if CRYPTOPP_TRACE_NETWORK - OutputDebugString((IntToString((unsigned int)this) + ": Sending " + IntToString(contiguousSize) + " bytes\n").c_str()); -#endif - sender.Send(block, contiguousSize); - m_needSendResult = true; - - if (maxTime > 0 && timeOut == 0) - break; // once time limit is reached, return even if there is more data waiting - } - - m_byteCountSinceLastTimerReset += totalFlushSize; - ComputeCurrentSpeed(); - - if (m_buffer.IsEmpty() && !m_needSendResult) - { - if (m_eofState == EOF_PENDING_SEND) - { - sender.SendEof(); - m_eofState = sender.MustWaitForEof() ? EOF_PENDING_DELIVERY : EOF_DONE; - } - - while (m_eofState == EOF_PENDING_DELIVERY) - { - unsigned long timeOut = maxTime ? SaturatingSubtract(maxTime, timer.ElapsedTime()) : 0; - if (!sender.Wait(timeOut, CallStack("NetworkSink::DoFlush() - wait EOF", 0))) - break; - - if (sender.EofSent()) - m_eofState = EOF_DONE; - } - } - - return totalFlushSize; -} - -#endif // #ifdef HIGHRES_TIMER_AVAILABLE - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/network.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/network.h deleted file mode 100644 index 96cd4567..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/network.h +++ /dev/null @@ -1,235 +0,0 @@ -#ifndef CRYPTOPP_NETWORK_H -#define CRYPTOPP_NETWORK_H - -#include "config.h" - -#ifdef HIGHRES_TIMER_AVAILABLE - -#include "filters.h" -#include "hrtimer.h" - -#include - -NAMESPACE_BEGIN(CryptoPP) - -class LimitedBandwidth -{ -public: - LimitedBandwidth(lword maxBytesPerSecond = 0) - : m_maxBytesPerSecond(maxBytesPerSecond), m_timer(Timer::MILLISECONDS) - , m_nextTransceiveTime(0) - { m_timer.StartTimer(); } - - lword GetMaxBytesPerSecond() const - { return m_maxBytesPerSecond; } - - void SetMaxBytesPerSecond(lword v) - { m_maxBytesPerSecond = v; } - - lword ComputeCurrentTransceiveLimit(); - - double TimeToNextTransceive(); - - void NoteTransceive(lword size); - -public: - /*! GetWaitObjects() must be called despite the 0 return from GetMaxWaitObjectCount(); - the 0 is because the ScheduleEvent() method is used instead of adding a wait object */ - unsigned int GetMaxWaitObjectCount() const { return 0; } - void GetWaitObjects(WaitObjectContainer &container, const CallStack &callStack); - -private: - lword m_maxBytesPerSecond; - - typedef std::deque > OpQueue; - OpQueue m_ops; - - Timer m_timer; - double m_nextTransceiveTime; - - void ComputeNextTransceiveTime(); - double GetCurTimeAndCleanUp(); -}; - -//! a Source class that can pump from a device for a specified amount of time. -class CRYPTOPP_NO_VTABLE NonblockingSource : public AutoSignaling, public LimitedBandwidth -{ -public: - NonblockingSource(BufferedTransformation *attachment) - : m_messageEndSent(false) , m_doPumpBlocked(false), m_blockedBySpeedLimit(false) {Detach(attachment);} - - //! \name NONBLOCKING SOURCE - //@{ - - //! pump up to maxSize bytes using at most maxTime milliseconds - /*! If checkDelimiter is true, pump up to delimiter, which itself is not extracted or pumped. */ - size_t GeneralPump2(lword &byteCount, bool blockingOutput=true, unsigned long maxTime=INFINITE_TIME, bool checkDelimiter=false, byte delimiter='\n'); - - lword GeneralPump(lword maxSize=LWORD_MAX, unsigned long maxTime=INFINITE_TIME, bool checkDelimiter=false, byte delimiter='\n') - { - GeneralPump2(maxSize, true, maxTime, checkDelimiter, delimiter); - return maxSize; - } - lword TimedPump(unsigned long maxTime) - {return GeneralPump(LWORD_MAX, maxTime);} - lword PumpLine(byte delimiter='\n', lword maxSize=1024) - {return GeneralPump(maxSize, INFINITE_TIME, true, delimiter);} - - size_t Pump2(lword &byteCount, bool blocking=true) - {return GeneralPump2(byteCount, blocking, blocking ? INFINITE_TIME : 0);} - size_t PumpMessages2(unsigned int &messageCount, bool blocking=true); - //@} - -protected: - virtual size_t DoPump(lword &byteCount, bool blockingOutput, - unsigned long maxTime, bool checkDelimiter, byte delimiter) =0; - - bool BlockedBySpeedLimit() const { return m_blockedBySpeedLimit; } - -private: - bool m_messageEndSent, m_doPumpBlocked, m_blockedBySpeedLimit; -}; - -//! Network Receiver -class CRYPTOPP_NO_VTABLE NetworkReceiver : public Waitable -{ -public: - virtual bool MustWaitToReceive() {return false;} - virtual bool MustWaitForResult() {return false;} - //! receive data from network source, returns whether result is immediately available - virtual bool Receive(byte* buf, size_t bufLen) =0; - virtual unsigned int GetReceiveResult() =0; - virtual bool EofReceived() const =0; -}; - -class CRYPTOPP_NO_VTABLE NonblockingSinkInfo -{ -public: - virtual ~NonblockingSinkInfo() {} - virtual size_t GetMaxBufferSize() const =0; - virtual size_t GetCurrentBufferSize() const =0; - virtual bool EofPending() const =0; - //! compute the current speed of this sink in bytes per second - virtual float ComputeCurrentSpeed() =0; - //! get the maximum observed speed of this sink in bytes per second - virtual float GetMaxObservedSpeed() const =0; -}; - -//! a Sink class that queues input and can flush to a device for a specified amount of time. -class CRYPTOPP_NO_VTABLE NonblockingSink : public Sink, public NonblockingSinkInfo, public LimitedBandwidth -{ -public: - NonblockingSink() : m_blockedBySpeedLimit(false) {} - - bool IsolatedFlush(bool hardFlush, bool blocking); - - //! flush to device for no more than maxTime milliseconds - /*! This function will repeatedly attempt to flush data to some device, until - the queue is empty, or a total of maxTime milliseconds have elapsed. - If maxTime == 0, at least one attempt will be made to flush some data, but - it is likely that not all queued data will be flushed, even if the device - is ready to receive more data without waiting. If you want to flush as much data - as possible without waiting for the device, call this function in a loop. - For example: while (sink.TimedFlush(0) > 0) {} - \return number of bytes flushed - */ - lword TimedFlush(unsigned long maxTime, size_t targetSize = 0); - - virtual void SetMaxBufferSize(size_t maxBufferSize) =0; - //! set a bound which will cause sink to flush if exceeded by GetCurrentBufferSize() - virtual void SetAutoFlushBound(size_t bound) =0; - -protected: - virtual lword DoFlush(unsigned long maxTime, size_t targetSize) = 0; - - bool BlockedBySpeedLimit() const { return m_blockedBySpeedLimit; } - -private: - bool m_blockedBySpeedLimit; -}; - -//! Network Sender -class CRYPTOPP_NO_VTABLE NetworkSender : public Waitable -{ -public: - virtual bool MustWaitToSend() {return false;} - virtual bool MustWaitForResult() {return false;} - virtual void Send(const byte* buf, size_t bufLen) =0; - virtual unsigned int GetSendResult() =0; - virtual bool MustWaitForEof() {return false;} - virtual void SendEof() =0; - virtual bool EofSent() {return false;} // implement if MustWaitForEof() == true -}; - -//! Network Source -class CRYPTOPP_NO_VTABLE NetworkSource : public NonblockingSource -{ -public: - NetworkSource(BufferedTransformation *attachment); - - unsigned int GetMaxWaitObjectCount() const; - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - - bool SourceExhausted() const {return m_dataBegin == m_dataEnd && GetReceiver().EofReceived();} - -protected: - size_t DoPump(lword &byteCount, bool blockingOutput, unsigned long maxTime, bool checkDelimiter, byte delimiter); - - virtual NetworkReceiver & AccessReceiver() =0; - const NetworkReceiver & GetReceiver() const {return const_cast(this)->AccessReceiver();} - -private: - SecByteBlock m_buf; - size_t m_putSize, m_dataBegin, m_dataEnd; - bool m_waitingForResult, m_outputBlocked; -}; - -//! Network Sink -class CRYPTOPP_NO_VTABLE NetworkSink : public NonblockingSink -{ -public: - NetworkSink(unsigned int maxBufferSize, unsigned int autoFlushBound); - - unsigned int GetMaxWaitObjectCount() const; - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - - void SetMaxBufferSize(size_t maxBufferSize) {m_maxBufferSize = maxBufferSize; m_buffer.SetNodeSize(UnsignedMin(maxBufferSize, 16U*1024U+256U));} - void SetAutoFlushBound(size_t bound) {m_autoFlushBound = bound;} - - size_t GetMaxBufferSize() const {return m_maxBufferSize;} - size_t GetCurrentBufferSize() const {return (size_t)m_buffer.CurrentSize();} - - void ClearBuffer() { m_buffer.Clear(); } - - bool EofPending() const { return m_eofState > EOF_NONE && m_eofState < EOF_DONE; } - - //! compute the current speed of this sink in bytes per second - float ComputeCurrentSpeed(); - //! get the maximum observed speed of this sink in bytes per second - float GetMaxObservedSpeed() const; - -protected: - lword DoFlush(unsigned long maxTime, size_t targetSize); - - virtual NetworkSender & AccessSender() =0; - const NetworkSender & GetSender() const {return const_cast(this)->AccessSender();} - -private: - enum EofState { EOF_NONE, EOF_PENDING_SEND, EOF_PENDING_DELIVERY, EOF_DONE }; - - size_t m_maxBufferSize, m_autoFlushBound; - bool m_needSendResult, m_wasBlocked; - EofState m_eofState; - ByteQueue m_buffer; - size_t m_skipBytes; - Timer m_speedTimer; - float m_byteCountSinceLastTimerReset, m_currentSpeed, m_maxObservedSpeed; -}; - -NAMESPACE_END - -#endif // #ifdef HIGHRES_TIMER_AVAILABLE - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/nr.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/nr.h deleted file mode 100644 index c398e355..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/nr.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CRYPTOPP_NR_H -#define CRYPTOPP_NR_H - -#include "gfpcrypt.h" - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.cpp deleted file mode 100644 index 1d474be5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// oaep.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "oaep.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -// ******************************************************** - -size_t OAEP_Base::MaxUnpaddedLength(size_t paddedLength) const -{ - return SaturatingSubtract(paddedLength/8, 1+2*DigestSize()); -} - -void OAEP_Base::Pad(RandomNumberGenerator &rng, const byte *input, size_t inputLength, byte *oaepBlock, size_t oaepBlockLen, const NameValuePairs ¶meters) const -{ - assert (inputLength <= MaxUnpaddedLength(oaepBlockLen)); - - // convert from bit length to byte length - if (oaepBlockLen % 8 != 0) - { - oaepBlock[0] = 0; - oaepBlock++; - } - oaepBlockLen /= 8; - - std::auto_ptr pHash(NewHash()); - const size_t hLen = pHash->DigestSize(); - const size_t seedLen = hLen, dbLen = oaepBlockLen-seedLen; - byte *const maskedSeed = oaepBlock; - byte *const maskedDB = oaepBlock+seedLen; - - ConstByteArrayParameter encodingParameters; - parameters.GetValue(Name::EncodingParameters(), encodingParameters); - - // DB = pHash || 00 ... || 01 || M - pHash->CalculateDigest(maskedDB, encodingParameters.begin(), encodingParameters.size()); - memset(maskedDB+hLen, 0, dbLen-hLen-inputLength-1); - maskedDB[dbLen-inputLength-1] = 0x01; - memcpy(maskedDB+dbLen-inputLength, input, inputLength); - - rng.GenerateBlock(maskedSeed, seedLen); - std::auto_ptr pMGF(NewMGF()); - pMGF->GenerateAndMask(*pHash, maskedDB, dbLen, maskedSeed, seedLen); - pMGF->GenerateAndMask(*pHash, maskedSeed, seedLen, maskedDB, dbLen); -} - -DecodingResult OAEP_Base::Unpad(const byte *oaepBlock, size_t oaepBlockLen, byte *output, const NameValuePairs ¶meters) const -{ - bool invalid = false; - - // convert from bit length to byte length - if (oaepBlockLen % 8 != 0) - { - invalid = (oaepBlock[0] != 0) || invalid; - oaepBlock++; - } - oaepBlockLen /= 8; - - std::auto_ptr pHash(NewHash()); - const size_t hLen = pHash->DigestSize(); - const size_t seedLen = hLen, dbLen = oaepBlockLen-seedLen; - - invalid = (oaepBlockLen < 2*hLen+1) || invalid; - - SecByteBlock t(oaepBlock, oaepBlockLen); - byte *const maskedSeed = t; - byte *const maskedDB = t+seedLen; - - std::auto_ptr pMGF(NewMGF()); - pMGF->GenerateAndMask(*pHash, maskedSeed, seedLen, maskedDB, dbLen); - pMGF->GenerateAndMask(*pHash, maskedDB, dbLen, maskedSeed, seedLen); - - ConstByteArrayParameter encodingParameters; - parameters.GetValue(Name::EncodingParameters(), encodingParameters); - - // DB = pHash' || 00 ... || 01 || M - byte *M = std::find(maskedDB+hLen, maskedDB+dbLen, 0x01); - invalid = (M == maskedDB+dbLen) || invalid; - invalid = (std::find_if(maskedDB+hLen, M, std::bind2nd(std::not_equal_to(), 0)) != M) || invalid; - invalid = !pHash->VerifyDigest(maskedDB, encodingParameters.begin(), encodingParameters.size()) || invalid; - - if (invalid) - return DecodingResult(); - - M++; - memcpy(output, M, maskedDB+dbLen-M); - return DecodingResult(maskedDB+dbLen-M); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.h deleted file mode 100644 index 4bf6b0d8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/oaep.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef CRYPTOPP_OAEP_H -#define CRYPTOPP_OAEP_H - -#include "pubkey.h" -#include "sha.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL OAEP_Base : public PK_EncryptionMessageEncodingMethod -{ -public: - bool ParameterSupported(const char *name) const {return strcmp(name, Name::EncodingParameters()) == 0;} - size_t MaxUnpaddedLength(size_t paddedLength) const; - void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedLength, const NameValuePairs ¶meters) const; - DecodingResult Unpad(const byte *padded, size_t paddedLength, byte *raw, const NameValuePairs ¶meters) const; - -protected: - virtual unsigned int DigestSize() const =0; - virtual HashTransformation * NewHash() const =0; - virtual MaskGeneratingFunction * NewMGF() const =0; -}; - -//! EME-OAEP, for use with classes derived from TF_ES -template -class OAEP : public OAEP_Base, public EncryptionStandard -{ -public: - static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string("OAEP-") + MGF::StaticAlgorithmName() + "(" + H::StaticAlgorithmName() + ")";} - typedef OAEP EncryptionMessageEncodingMethod; - -protected: - unsigned int DigestSize() const {return H::DIGESTSIZE;} - HashTransformation * NewHash() const {return new H;} - MaskGeneratingFunction * NewMGF() const {return new MGF;} -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS OAEP; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/oids.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/oids.h deleted file mode 100644 index 8b103015..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/oids.h +++ /dev/null @@ -1,123 +0,0 @@ -#ifndef CRYPTOPP_OIDS_H -#define CRYPTOPP_OIDS_H - -// crypto-related ASN.1 object identifiers - -#include "asn.h" - -NAMESPACE_BEGIN(CryptoPP) - -NAMESPACE_BEGIN(ASN1) - -#define DEFINE_OID(value, name) inline OID name() {return value;} - -DEFINE_OID(1, iso) - DEFINE_OID(iso()+2, member_body) - DEFINE_OID(member_body()+840, iso_us) - DEFINE_OID(iso_us()+10040, ansi_x9_57) - DEFINE_OID(ansi_x9_57()+4+1, id_dsa) - DEFINE_OID(iso_us()+10045, ansi_x9_62) - DEFINE_OID(ansi_x9_62()+1, id_fieldType) - DEFINE_OID(id_fieldType()+1, prime_field) - DEFINE_OID(id_fieldType()+2, characteristic_two_field) - DEFINE_OID(characteristic_two_field()+3, id_characteristic_two_basis) - DEFINE_OID(id_characteristic_two_basis()+1, gnBasis) - DEFINE_OID(id_characteristic_two_basis()+2, tpBasis) - DEFINE_OID(id_characteristic_two_basis()+3, ppBasis) - DEFINE_OID(ansi_x9_62()+2, id_publicKeyType) - DEFINE_OID(id_publicKeyType()+1, id_ecPublicKey) - DEFINE_OID(ansi_x9_62()+3, ansi_x9_62_curves) - DEFINE_OID(ansi_x9_62_curves()+1, ansi_x9_62_curves_prime) - DEFINE_OID(ansi_x9_62_curves_prime()+1, secp192r1) - DEFINE_OID(ansi_x9_62_curves_prime()+7, secp256r1) - DEFINE_OID(iso_us()+113549, rsadsi) - DEFINE_OID(rsadsi()+1, pkcs) - DEFINE_OID(pkcs()+1, pkcs_1) - DEFINE_OID(pkcs_1()+1, rsaEncryption); - DEFINE_OID(rsadsi()+2, rsadsi_digestAlgorithm) - DEFINE_OID(rsadsi_digestAlgorithm()+2, id_md2) - DEFINE_OID(rsadsi_digestAlgorithm()+5, id_md5) - DEFINE_OID(iso()+3, identified_organization); - DEFINE_OID(identified_organization()+14, oiw); - DEFINE_OID(oiw()+3, oiw_secsig); - DEFINE_OID(oiw_secsig()+2, oiw_secsig_algorithms); - DEFINE_OID(oiw_secsig_algorithms()+26, id_sha1); - - DEFINE_OID(identified_organization()+36, teletrust); - DEFINE_OID(teletrust()+3, teletrust_algorithm) - DEFINE_OID(teletrust_algorithm()+2+1, id_ripemd160) - DEFINE_OID(teletrust_algorithm()+3+2+8+1, teletrust_ellipticCurve) - DEFINE_OID(teletrust_ellipticCurve()+1+1, brainpoolP160r1) - DEFINE_OID(teletrust_ellipticCurve()+1+3, brainpoolP192r1) - DEFINE_OID(teletrust_ellipticCurve()+1+5, brainpoolP224r1) - DEFINE_OID(teletrust_ellipticCurve()+1+7, brainpoolP256r1) - DEFINE_OID(teletrust_ellipticCurve()+1+9, brainpoolP320r1) - DEFINE_OID(teletrust_ellipticCurve()+1+11, brainpoolP384r1) - DEFINE_OID(teletrust_ellipticCurve()+1+13, brainpoolP512r1) - - DEFINE_OID(identified_organization()+132, certicom); - DEFINE_OID(certicom()+0, certicom_ellipticCurve); - // these are sorted by curve type and then by OID - // first curves based on GF(p) - DEFINE_OID(certicom_ellipticCurve()+6, secp112r1); - DEFINE_OID(certicom_ellipticCurve()+7, secp112r2); - DEFINE_OID(certicom_ellipticCurve()+8, secp160r1); - DEFINE_OID(certicom_ellipticCurve()+9, secp160k1); - DEFINE_OID(certicom_ellipticCurve()+10, secp256k1); - DEFINE_OID(certicom_ellipticCurve()+28, secp128r1); - DEFINE_OID(certicom_ellipticCurve()+29, secp128r2); - DEFINE_OID(certicom_ellipticCurve()+30, secp160r2); - DEFINE_OID(certicom_ellipticCurve()+31, secp192k1); - DEFINE_OID(certicom_ellipticCurve()+32, secp224k1); - DEFINE_OID(certicom_ellipticCurve()+33, secp224r1); - DEFINE_OID(certicom_ellipticCurve()+34, secp384r1); - DEFINE_OID(certicom_ellipticCurve()+35, secp521r1); - // then curves based on GF(2^n) - DEFINE_OID(certicom_ellipticCurve()+1, sect163k1); - DEFINE_OID(certicom_ellipticCurve()+2, sect163r1); - DEFINE_OID(certicom_ellipticCurve()+3, sect239k1); - DEFINE_OID(certicom_ellipticCurve()+4, sect113r1); - DEFINE_OID(certicom_ellipticCurve()+5, sect113r2); - DEFINE_OID(certicom_ellipticCurve()+15, sect163r2); - DEFINE_OID(certicom_ellipticCurve()+16, sect283k1); - DEFINE_OID(certicom_ellipticCurve()+17, sect283r1); - DEFINE_OID(certicom_ellipticCurve()+22, sect131r1); - DEFINE_OID(certicom_ellipticCurve()+23, sect131r2); - DEFINE_OID(certicom_ellipticCurve()+24, sect193r1); - DEFINE_OID(certicom_ellipticCurve()+25, sect193r2); - DEFINE_OID(certicom_ellipticCurve()+26, sect233k1); - DEFINE_OID(certicom_ellipticCurve()+27, sect233r1); - DEFINE_OID(certicom_ellipticCurve()+36, sect409k1); - DEFINE_OID(certicom_ellipticCurve()+37, sect409r1); - DEFINE_OID(certicom_ellipticCurve()+38, sect571k1); - DEFINE_OID(certicom_ellipticCurve()+39, sect571r1); -DEFINE_OID(2, joint_iso_ccitt) - DEFINE_OID(joint_iso_ccitt()+16, country) - DEFINE_OID(country()+840, joint_iso_ccitt_us) - DEFINE_OID(joint_iso_ccitt_us()+1, us_organization) - DEFINE_OID(us_organization()+101, us_gov) - DEFINE_OID(us_gov()+3, csor) - DEFINE_OID(csor()+4, nistalgorithms) - DEFINE_OID(nistalgorithms()+1, aes) - DEFINE_OID(aes()+1, id_aes128_ECB) - DEFINE_OID(aes()+2, id_aes128_cbc) - DEFINE_OID(aes()+3, id_aes128_ofb) - DEFINE_OID(aes()+4, id_aes128_cfb) - DEFINE_OID(aes()+21, id_aes192_ECB) - DEFINE_OID(aes()+22, id_aes192_cbc) - DEFINE_OID(aes()+23, id_aes192_ofb) - DEFINE_OID(aes()+24, id_aes192_cfb) - DEFINE_OID(aes()+41, id_aes256_ECB) - DEFINE_OID(aes()+42, id_aes256_cbc) - DEFINE_OID(aes()+43, id_aes256_ofb) - DEFINE_OID(aes()+44, id_aes256_cfb) - DEFINE_OID(nistalgorithms()+2, nist_hashalgs) - DEFINE_OID(nist_hashalgs()+1, id_sha256) - DEFINE_OID(nist_hashalgs()+2, id_sha384) - DEFINE_OID(nist_hashalgs()+3, id_sha512) - -NAMESPACE_END - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.cpp deleted file mode 100644 index fa6dd36d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.cpp +++ /dev/null @@ -1,171 +0,0 @@ -// osrng.cpp - written and placed in the public domain by Wei Dai - -// Thanks to Leonard Janke for the suggestion for AutoSeededRandomPool. - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "osrng.h" - -#ifdef OS_RNG_AVAILABLE - -#include "rng.h" - -#ifdef CRYPTOPP_WIN32_AVAILABLE -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif -#include -#include -#endif - -#ifdef CRYPTOPP_UNIX_AVAILABLE -#include -#include -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#if defined(NONBLOCKING_RNG_AVAILABLE) || defined(BLOCKING_RNG_AVAILABLE) -OS_RNG_Err::OS_RNG_Err(const std::string &operation) - : Exception(OTHER_ERROR, "OS_Rng: " + operation + " operation failed with error " + -#ifdef CRYPTOPP_WIN32_AVAILABLE - "0x" + IntToString(GetLastError(), 16) -#else - IntToString(errno) -#endif - ) -{ -} -#endif - -#ifdef NONBLOCKING_RNG_AVAILABLE - -#ifdef CRYPTOPP_WIN32_AVAILABLE - -MicrosoftCryptoProvider::MicrosoftCryptoProvider() -{ - if(!CryptAcquireContext(&m_hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) - throw OS_RNG_Err("CryptAcquireContext"); -} - -MicrosoftCryptoProvider::~MicrosoftCryptoProvider() -{ - CryptReleaseContext(m_hProvider, 0); -} - -#endif - -NonblockingRng::NonblockingRng() -{ -#ifndef CRYPTOPP_WIN32_AVAILABLE - m_fd = open("/dev/urandom",O_RDONLY); - if (m_fd == -1) - throw OS_RNG_Err("open /dev/urandom"); -#endif -} - -NonblockingRng::~NonblockingRng() -{ -#ifndef CRYPTOPP_WIN32_AVAILABLE - close(m_fd); -#endif -} - -void NonblockingRng::GenerateBlock(byte *output, size_t size) -{ -#ifdef CRYPTOPP_WIN32_AVAILABLE -# ifdef WORKAROUND_MS_BUG_Q258000 - const MicrosoftCryptoProvider &m_Provider = Singleton().Ref(); -# endif - if (!CryptGenRandom(m_Provider.GetProviderHandle(), (DWORD)size, output)) - throw OS_RNG_Err("CryptGenRandom"); -#else - if (read(m_fd, output, size) != size) - throw OS_RNG_Err("read /dev/urandom"); -#endif -} - -#endif - -// ************************************************************* - -#ifdef BLOCKING_RNG_AVAILABLE - -#ifndef CRYPTOPP_BLOCKING_RNG_FILENAME -#ifdef __OpenBSD__ -#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/srandom" -#else -#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/random" -#endif -#endif - -BlockingRng::BlockingRng() -{ - m_fd = open(CRYPTOPP_BLOCKING_RNG_FILENAME,O_RDONLY); - if (m_fd == -1) - throw OS_RNG_Err("open " CRYPTOPP_BLOCKING_RNG_FILENAME); -} - -BlockingRng::~BlockingRng() -{ - close(m_fd); -} - -void BlockingRng::GenerateBlock(byte *output, size_t size) -{ - while (size) - { - // on some systems /dev/random will block until all bytes - // are available, on others it will returns immediately - ssize_t len = read(m_fd, output, size); - if (len < 0) - throw OS_RNG_Err("read " CRYPTOPP_BLOCKING_RNG_FILENAME); - size -= len; - output += len; - if (size) - sleep(1); - } -} - -#endif - -// ************************************************************* - -void OS_GenerateRandomBlock(bool blocking, byte *output, size_t size) -{ -#ifdef NONBLOCKING_RNG_AVAILABLE - if (blocking) -#endif - { -#ifdef BLOCKING_RNG_AVAILABLE - BlockingRng rng; - rng.GenerateBlock(output, size); -#endif - } - -#ifdef BLOCKING_RNG_AVAILABLE - if (!blocking) -#endif - { -#ifdef NONBLOCKING_RNG_AVAILABLE - NonblockingRng rng; - rng.GenerateBlock(output, size); -#endif - } -} - -void AutoSeededRandomPool::Reseed(bool blocking, unsigned int seedSize) -{ - SecByteBlock seed(seedSize); - OS_GenerateRandomBlock(blocking, seed, seedSize); - IncorporateEntropy(seed, seedSize); -} - -NAMESPACE_END - -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.h deleted file mode 100644 index ae07d057..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/osrng.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef CRYPTOPP_OSRNG_H -#define CRYPTOPP_OSRNG_H - -//! \file - -#include "config.h" - -#ifdef OS_RNG_AVAILABLE - -#include "randpool.h" -#include "rng.h" -#include "aes.h" -#include "sha.h" -#include "fips140.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Exception class for Operating-System Random Number Generator. -class CRYPTOPP_DLL OS_RNG_Err : public Exception -{ -public: - OS_RNG_Err(const std::string &operation); -}; - -#ifdef NONBLOCKING_RNG_AVAILABLE - -#ifdef CRYPTOPP_WIN32_AVAILABLE -class CRYPTOPP_DLL MicrosoftCryptoProvider -{ -public: - MicrosoftCryptoProvider(); - ~MicrosoftCryptoProvider(); -#if defined(_WIN64) - typedef unsigned __int64 ProviderHandle; // type HCRYPTPROV, avoid #include -#else - typedef unsigned long ProviderHandle; -#endif - ProviderHandle GetProviderHandle() const {return m_hProvider;} -private: - ProviderHandle m_hProvider; -}; - -#pragma comment(lib, "advapi32.lib") -#endif - -//! encapsulate CryptoAPI's CryptGenRandom or /dev/urandom -class CRYPTOPP_DLL NonblockingRng : public RandomNumberGenerator -{ -public: - NonblockingRng(); - ~NonblockingRng(); - void GenerateBlock(byte *output, size_t size); - -protected: -#ifdef CRYPTOPP_WIN32_AVAILABLE -# ifndef WORKAROUND_MS_BUG_Q258000 - MicrosoftCryptoProvider m_Provider; -# endif -#else - int m_fd; -#endif -}; - -#endif - -#ifdef BLOCKING_RNG_AVAILABLE - -//! encapsulate /dev/random, or /dev/srandom on OpenBSD -class CRYPTOPP_DLL BlockingRng : public RandomNumberGenerator -{ -public: - BlockingRng(); - ~BlockingRng(); - void GenerateBlock(byte *output, size_t size); - -protected: - int m_fd; -}; - -#endif - -CRYPTOPP_DLL void CRYPTOPP_API OS_GenerateRandomBlock(bool blocking, byte *output, size_t size); - -//! Automaticly Seeded Randomness Pool -/*! This class seeds itself using an operating system provided RNG. */ -class CRYPTOPP_DLL AutoSeededRandomPool : public RandomPool -{ -public: - //! use blocking to choose seeding with BlockingRng or NonblockingRng. the parameter is ignored if only one of these is available - explicit AutoSeededRandomPool(bool blocking = false, unsigned int seedSize = 32) - {Reseed(blocking, seedSize);} - void Reseed(bool blocking = false, unsigned int seedSize = 32); -}; - -//! RNG from ANSI X9.17 Appendix C, seeded using an OS provided RNG -template -class AutoSeededX917RNG : public RandomNumberGenerator, public NotCopyable -{ -public: - //! use blocking to choose seeding with BlockingRng or NonblockingRng. the parameter is ignored if only one of these is available - explicit AutoSeededX917RNG(bool blocking = false, bool autoSeed = true) - {if (autoSeed) Reseed(blocking);} - void Reseed(bool blocking = false, const byte *additionalEntropy = NULL, size_t length = 0); - // exposed for testing - void Reseed(const byte *key, size_t keylength, const byte *seed, const byte *timeVector); - - bool CanIncorporateEntropy() const {return true;} - void IncorporateEntropy(const byte *input, size_t length) {Reseed(false, input, length);} - void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length) {m_rng->GenerateIntoBufferedTransformation(target, channel, length);} - -private: - member_ptr m_rng; -}; - -template -void AutoSeededX917RNG::Reseed(const byte *key, size_t keylength, const byte *seed, const byte *timeVector) -{ - m_rng.reset(new X917RNG(new typename BLOCK_CIPHER::Encryption(key, keylength), seed, timeVector)); -} - -template -void AutoSeededX917RNG::Reseed(bool blocking, const byte *input, size_t length) -{ - SecByteBlock seed(BLOCK_CIPHER::BLOCKSIZE + BLOCK_CIPHER::DEFAULT_KEYLENGTH); - const byte *key; - do - { - OS_GenerateRandomBlock(blocking, seed, seed.size()); - if (length > 0) - { - SHA256 hash; - hash.Update(seed, seed.size()); - hash.Update(input, length); - hash.TruncatedFinal(seed, UnsignedMin(hash.DigestSize(), seed.size())); - } - key = seed + BLOCK_CIPHER::BLOCKSIZE; - } // check that seed and key don't have same value - while (memcmp(key, seed, STDMIN((unsigned int)BLOCK_CIPHER::BLOCKSIZE, (unsigned int)BLOCK_CIPHER::DEFAULT_KEYLENGTH)) == 0); - - Reseed(key, BLOCK_CIPHER::DEFAULT_KEYLENGTH, seed, NULL); -} - -CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG; - -//! this is AutoSeededX917RNG\ in FIPS mode, otherwise it's AutoSeededRandomPool -#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 -typedef AutoSeededX917RNG DefaultAutoSeededRNG; -#else -typedef AutoSeededRandomPool DefaultAutoSeededRNG; -#endif - -NAMESPACE_END - -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.cpp deleted file mode 100644 index 09b1708f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.cpp +++ /dev/null @@ -1,508 +0,0 @@ -// panama.cpp - written and placed in the public domain by Wei Dai - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM panama.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "panama.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -template -void Panama::Reset() -{ - memset(m_state, 0, m_state.SizeInBytes()); -#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE - m_state[17] = HasSSSE3(); -#endif -} - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void Panama_SSE2_Pull(size_t count, word32 *state, word32 *z, const word32 *y); -} -#elif CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - -#ifdef CRYPTOPP_GENERATE_X64_MASM - Panama_SSE2_Pull PROC FRAME - rex_push_reg rdi - alloc_stack(2*16) - save_xmm128 xmm6, 0h - save_xmm128 xmm7, 10h - .endprolog -#else -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code -void CRYPTOPP_NOINLINE Panama_SSE2_Pull(size_t count, word32 *state, word32 *z, const word32 *y) -{ -#ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY - asm __volatile__ - ( - ".intel_syntax noprefix;" - AS_PUSH_IF86( bx) -#else - AS2( mov AS_REG_1, count) - AS2( mov AS_REG_2, state) - AS2( mov AS_REG_3, z) - AS2( mov AS_REG_4, y) -#endif -#endif // #ifdef CRYPTOPP_GENERATE_X64_MASM - -#if CRYPTOPP_BOOL_X86 - #define REG_loopEnd [esp] -#elif defined(CRYPTOPP_GENERATE_X64_MASM) - #define REG_loopEnd rdi -#else - #define REG_loopEnd r8 -#endif - - AS2( shl AS_REG_1, 5) - ASJ( jz, 5, f) - AS2( mov AS_REG_6d, [AS_REG_2+4*17]) - AS2( add AS_REG_1, AS_REG_6) - - #if CRYPTOPP_BOOL_X64 - AS2( mov REG_loopEnd, AS_REG_1) - #else - AS1( push ebp) - AS1( push AS_REG_1) - #endif - - AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_2+0*16]) - AS2( movdqa xmm1, XMMWORD_PTR [AS_REG_2+1*16]) - AS2( movdqa xmm2, XMMWORD_PTR [AS_REG_2+2*16]) - AS2( movdqa xmm3, XMMWORD_PTR [AS_REG_2+3*16]) - AS2( mov eax, dword ptr [AS_REG_2+4*16]) - - ASL(4) - // gamma and pi -#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE - AS2( test AS_REG_6, 1) - ASJ( jnz, 6, f) -#endif - AS2( movdqa xmm6, xmm2) - AS2( movss xmm6, xmm3) - ASS( pshufd xmm5, xmm6, 0, 3, 2, 1) - AS2( movd xmm6, eax) - AS2( movdqa xmm7, xmm3) - AS2( movss xmm7, xmm6) - ASS( pshufd xmm6, xmm7, 0, 3, 2, 1) -#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE - ASJ( jmp, 7, f) - ASL(6) - AS2( movdqa xmm5, xmm3) - AS3( palignr xmm5, xmm2, 4) - AS2( movd xmm6, eax) - AS3( palignr xmm6, xmm3, 4) - ASL(7) -#endif - - AS2( movd AS_REG_1d, xmm2) - AS1( not AS_REG_1d) - AS2( movd AS_REG_7d, xmm3) - AS2( or AS_REG_1d, AS_REG_7d) - AS2( xor eax, AS_REG_1d) - -#define SSE2_Index(i) ASM_MOD(((i)*13+16), 17) - -#define pi(i) \ - AS2( movd AS_REG_1d, xmm7)\ - AS2( rol AS_REG_1d, ASM_MOD((ASM_MOD(5*i,17)*(ASM_MOD(5*i,17)+1)/2), 32))\ - AS2( mov [AS_REG_2+SSE2_Index(ASM_MOD(5*(i), 17))*4], AS_REG_1d) - -#define pi4(x, y, z, a, b, c, d) \ - AS2( pcmpeqb xmm7, xmm7)\ - AS2( pxor xmm7, x)\ - AS2( por xmm7, y)\ - AS2( pxor xmm7, z)\ - pi(a)\ - ASS( pshuflw xmm7, xmm7, 1, 0, 3, 2)\ - pi(b)\ - AS2( punpckhqdq xmm7, xmm7)\ - pi(c)\ - ASS( pshuflw xmm7, xmm7, 1, 0, 3, 2)\ - pi(d) - - pi4(xmm1, xmm2, xmm3, 1, 5, 9, 13) - pi4(xmm0, xmm1, xmm2, 2, 6, 10, 14) - pi4(xmm6, xmm0, xmm1, 3, 7, 11, 15) - pi4(xmm5, xmm6, xmm0, 4, 8, 12, 16) - - // output keystream and update buffer here to hide partial memory stalls between pi and theta - AS2( movdqa xmm4, xmm3) - AS2( punpcklqdq xmm3, xmm2) // 1 5 2 6 - AS2( punpckhdq xmm4, xmm2) // 9 10 13 14 - AS2( movdqa xmm2, xmm1) - AS2( punpcklqdq xmm1, xmm0) // 3 7 4 8 - AS2( punpckhdq xmm2, xmm0) // 11 12 15 16 - - // keystream - AS2( test AS_REG_3, AS_REG_3) - ASJ( jz, 0, f) - AS2( movdqa xmm6, xmm4) - AS2( punpcklqdq xmm4, xmm2) - AS2( punpckhqdq xmm6, xmm2) - AS2( test AS_REG_4, 15) - ASJ( jnz, 2, f) - AS2( test AS_REG_4, AS_REG_4) - ASJ( jz, 1, f) - AS2( pxor xmm4, [AS_REG_4]) - AS2( pxor xmm6, [AS_REG_4+16]) - AS2( add AS_REG_4, 32) - ASJ( jmp, 1, f) - ASL(2) - AS2( movdqu xmm0, [AS_REG_4]) - AS2( movdqu xmm2, [AS_REG_4+16]) - AS2( pxor xmm4, xmm0) - AS2( pxor xmm6, xmm2) - AS2( add AS_REG_4, 32) - ASL(1) - AS2( test AS_REG_3, 15) - ASJ( jnz, 3, f) - AS2( movdqa XMMWORD_PTR [AS_REG_3], xmm4) - AS2( movdqa XMMWORD_PTR [AS_REG_3+16], xmm6) - AS2( add AS_REG_3, 32) - ASJ( jmp, 0, f) - ASL(3) - AS2( movdqu XMMWORD_PTR [AS_REG_3], xmm4) - AS2( movdqu XMMWORD_PTR [AS_REG_3+16], xmm6) - AS2( add AS_REG_3, 32) - ASL(0) - - // buffer update - AS2( lea AS_REG_1, [AS_REG_6 + 32]) - AS2( and AS_REG_1, 31*32) - AS2( lea AS_REG_7, [AS_REG_6 + (32-24)*32]) - AS2( and AS_REG_7, 31*32) - - AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+0*8]) - AS2( pxor xmm3, xmm0) - ASS( pshufd xmm0, xmm0, 2, 3, 0, 1) - AS2( movdqa XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+0*8], xmm3) - AS2( pxor xmm0, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+2*8]) - AS2( movdqa XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+2*8], xmm0) - - AS2( movdqa xmm4, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+2*8]) - AS2( pxor xmm1, xmm4) - AS2( movdqa XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+2*8], xmm1) - AS2( pxor xmm4, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+0*8]) - AS2( movdqa XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+0*8], xmm4) - - // theta - AS2( movdqa xmm3, XMMWORD_PTR [AS_REG_2+3*16]) - AS2( movdqa xmm2, XMMWORD_PTR [AS_REG_2+2*16]) - AS2( movdqa xmm1, XMMWORD_PTR [AS_REG_2+1*16]) - AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_2+0*16]) - -#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE - AS2( test AS_REG_6, 1) - ASJ( jnz, 8, f) -#endif - AS2( movd xmm6, eax) - AS2( movdqa xmm7, xmm3) - AS2( movss xmm7, xmm6) - AS2( movdqa xmm6, xmm2) - AS2( movss xmm6, xmm3) - AS2( movdqa xmm5, xmm1) - AS2( movss xmm5, xmm2) - AS2( movdqa xmm4, xmm0) - AS2( movss xmm4, xmm1) - ASS( pshufd xmm7, xmm7, 0, 3, 2, 1) - ASS( pshufd xmm6, xmm6, 0, 3, 2, 1) - ASS( pshufd xmm5, xmm5, 0, 3, 2, 1) - ASS( pshufd xmm4, xmm4, 0, 3, 2, 1) -#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE - ASJ( jmp, 9, f) - ASL(8) - AS2( movd xmm7, eax) - AS3( palignr xmm7, xmm3, 4) - AS2( movq xmm6, xmm3) - AS3( palignr xmm6, xmm2, 4) - AS2( movq xmm5, xmm2) - AS3( palignr xmm5, xmm1, 4) - AS2( movq xmm4, xmm1) - AS3( palignr xmm4, xmm0, 4) - ASL(9) -#endif - - AS2( xor eax, 1) - AS2( movd AS_REG_1d, xmm0) - AS2( xor eax, AS_REG_1d) - AS2( movd AS_REG_1d, xmm3) - AS2( xor eax, AS_REG_1d) - - AS2( pxor xmm3, xmm2) - AS2( pxor xmm2, xmm1) - AS2( pxor xmm1, xmm0) - AS2( pxor xmm0, xmm7) - AS2( pxor xmm3, xmm7) - AS2( pxor xmm2, xmm6) - AS2( pxor xmm1, xmm5) - AS2( pxor xmm0, xmm4) - - // sigma - AS2( lea AS_REG_1, [AS_REG_6 + (32-4)*32]) - AS2( and AS_REG_1, 31*32) - AS2( lea AS_REG_7, [AS_REG_6 + 16*32]) - AS2( and AS_REG_7, 31*32) - - AS2( movdqa xmm4, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+0*16]) - AS2( movdqa xmm5, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+0*16]) - AS2( movdqa xmm6, xmm4) - AS2( punpcklqdq xmm4, xmm5) - AS2( punpckhqdq xmm6, xmm5) - AS2( pxor xmm3, xmm4) - AS2( pxor xmm2, xmm6) - - AS2( movdqa xmm4, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_1+1*16]) - AS2( movdqa xmm5, XMMWORD_PTR [AS_REG_2+20*4+AS_REG_7+1*16]) - AS2( movdqa xmm6, xmm4) - AS2( punpcklqdq xmm4, xmm5) - AS2( punpckhqdq xmm6, xmm5) - AS2( pxor xmm1, xmm4) - AS2( pxor xmm0, xmm6) - - // loop - AS2( add AS_REG_6, 32) - AS2( cmp AS_REG_6, REG_loopEnd) - ASJ( jne, 4, b) - - // save state - AS2( mov [AS_REG_2+4*16], eax) - AS2( movdqa XMMWORD_PTR [AS_REG_2+3*16], xmm3) - AS2( movdqa XMMWORD_PTR [AS_REG_2+2*16], xmm2) - AS2( movdqa XMMWORD_PTR [AS_REG_2+1*16], xmm1) - AS2( movdqa XMMWORD_PTR [AS_REG_2+0*16], xmm0) - - #if CRYPTOPP_BOOL_X86 - AS2( add esp, 4) - AS1( pop ebp) - #endif - ASL(5) - -#ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY - AS_POP_IF86( bx) - ".att_syntax prefix;" - : - #if CRYPTOPP_BOOL_X64 - : "D" (count), "S" (state), "d" (z), "c" (y) - : "%r8", "%r9", "r10", "%eax", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7" - #else - : "c" (count), "d" (state), "S" (z), "D" (y) - : "%eax", "memory", "cc" - #endif - ); -#endif -#ifdef CRYPTOPP_GENERATE_X64_MASM - movdqa xmm6, [rsp + 0h] - movdqa xmm7, [rsp + 10h] - add rsp, 2*16 - pop rdi - ret - Panama_SSE2_Pull ENDP -#else -} -#endif -#endif // #ifdef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -template -void Panama::Iterate(size_t count, const word32 *p, word32 *z, const word32 *y) -{ - word32 bstart = m_state[17]; - word32 *const aPtr = m_state; - word32 cPtr[17]; - -#define bPtr ((byte *)(aPtr+20)) - -// reorder the state for SSE2 -// a and c: 4 8 12 16 | 3 7 11 15 | 2 6 10 14 | 1 5 9 13 | 0 -// xmm0 xmm1 xmm2 xmm3 eax -#define a(i) aPtr[((i)*13+16) % 17] // 13 is inverse of 4 mod 17 -#define c(i) cPtr[((i)*13+16) % 17] -// b: 0 4 | 1 5 | 2 6 | 3 7 -#define b(i, j) b##i[(j)*2%8 + (j)/4] - -// output -#define OA(i) z[i] = ConditionalByteReverse(B::ToEnum(), a(i+9)) -#define OX(i) z[i] = y[i] ^ ConditionalByteReverse(B::ToEnum(), a(i+9)) -// buffer update -#define US(i) {word32 t=b(0,i); b(0,i)=ConditionalByteReverse(B::ToEnum(), p[i])^t; b(25,(i+6)%8)^=t;} -#define UL(i) {word32 t=b(0,i); b(0,i)=a(i+1)^t; b(25,(i+6)%8)^=t;} -// gamma and pi -#define GP(i) c(5*i%17) = rotlFixed(a(i) ^ (a((i+1)%17) | ~a((i+2)%17)), ((5*i%17)*((5*i%17)+1)/2)%32) -// theta and sigma -#define T(i,x) a(i) = c(i) ^ c((i+1)%17) ^ c((i+4)%17) ^ x -#define TS1S(i) T(i+1, ConditionalByteReverse(B::ToEnum(), p[i])) -#define TS1L(i) T(i+1, b(4,i)) -#define TS2(i) T(i+9, b(16,i)) - - while (count--) - { - if (z) - { - if (y) - { - OX(0); OX(1); OX(2); OX(3); OX(4); OX(5); OX(6); OX(7); - y += 8; - } - else - { - OA(0); OA(1); OA(2); OA(3); OA(4); OA(5); OA(6); OA(7); - } - z += 8; - } - - word32 *const b16 = (word32 *)(bPtr+((bstart+16*32) & 31*32)); - word32 *const b4 = (word32 *)(bPtr+((bstart+(32-4)*32) & 31*32)); - bstart += 32; - word32 *const b0 = (word32 *)(bPtr+((bstart) & 31*32)); - word32 *const b25 = (word32 *)(bPtr+((bstart+(32-25)*32) & 31*32)); - - if (p) - { - US(0); US(1); US(2); US(3); US(4); US(5); US(6); US(7); - } - else - { - UL(0); UL(1); UL(2); UL(3); UL(4); UL(5); UL(6); UL(7); - } - - GP(0); - GP(1); - GP(2); - GP(3); - GP(4); - GP(5); - GP(6); - GP(7); - GP(8); - GP(9); - GP(10); - GP(11); - GP(12); - GP(13); - GP(14); - GP(15); - GP(16); - - T(0,1); - - if (p) - { - TS1S(0); TS1S(1); TS1S(2); TS1S(3); TS1S(4); TS1S(5); TS1S(6); TS1S(7); - p += 8; - } - else - { - TS1L(0); TS1L(1); TS1L(2); TS1L(3); TS1L(4); TS1L(5); TS1L(6); TS1L(7); - } - - TS2(0); TS2(1); TS2(2); TS2(3); TS2(4); TS2(5); TS2(6); TS2(7); - } - m_state[17] = bstart; -} - -namespace Weak { -template -size_t PanamaHash::HashMultipleBlocks(const word32 *input, size_t length) -{ - this->Iterate(length / this->BLOCKSIZE, input); - return length % this->BLOCKSIZE; -} - -template -void PanamaHash::TruncatedFinal(byte *hash, size_t size) -{ - this->ThrowIfInvalidTruncatedSize(size); - - PadLastBlock(this->BLOCKSIZE, 0x01); - - HashEndianCorrectedBlock(this->m_data); - - this->Iterate(32); // pull - - FixedSizeSecBlock buf; - this->Iterate(1, NULL, buf, NULL); - - memcpy(hash, buf, size); - - this->Restart(); // reinit for next use -} -} - -template -void PanamaCipherPolicy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - assert(length==32); - memcpy(m_key, key, 32); -} - -template -void PanamaCipherPolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) -{ - assert(length==32); - this->Reset(); - this->Iterate(1, m_key); - if (iv && IsAligned(iv)) - this->Iterate(1, (const word32 *)iv); - else - { - FixedSizeSecBlock buf; - if (iv) - memcpy(buf, iv, 32); - else - memset(buf, 0, 32); - this->Iterate(1, buf); - } - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - if (B::ToEnum() == LITTLE_ENDIAN_ORDER && HasSSE2() && !IsP4()) // SSE2 code is slower on P4 Prescott - Panama_SSE2_Pull(32, this->m_state, NULL, NULL); - else -#endif - this->Iterate(32); -} - -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 -template -unsigned int PanamaCipherPolicy::GetAlignment() const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - if (B::ToEnum() == LITTLE_ENDIAN_ORDER && HasSSE2()) - return 16; - else -#endif - return 1; -} -#endif - -template -void PanamaCipherPolicy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - if (B::ToEnum() == LITTLE_ENDIAN_ORDER && HasSSE2()) - Panama_SSE2_Pull(iterationCount, this->m_state, (word32 *)output, (const word32 *)input); - else -#endif - this->Iterate(iterationCount, NULL, (word32 *)output, (const word32 *)input); -} - -template class Panama; -template class Panama; - -template class Weak::PanamaHash; -template class Weak::PanamaHash; - -template class PanamaCipherPolicy; -template class PanamaCipherPolicy; - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.h deleted file mode 100644 index 5a236813..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/panama.h +++ /dev/null @@ -1,144 +0,0 @@ -#ifndef CRYPTOPP_PANAMA_H -#define CRYPTOPP_PANAMA_H - -#include "strciphr.h" -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// base class, do not use directly -template -class CRYPTOPP_NO_VTABLE Panama -{ -public: - void Reset(); - void Iterate(size_t count, const word32 *p=NULL, word32 *z=NULL, const word32 *y=NULL); - -protected: - typedef word32 Stage[8]; - CRYPTOPP_CONSTANT(STAGES = 32) - - FixedSizeAlignedSecBlock m_state; -}; - -namespace Weak { -/// Panama Hash -template -class PanamaHash : protected Panama, public AlgorithmImpl, PanamaHash > -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE = 32) - PanamaHash() {Panama::Reset();} - unsigned int DigestSize() const {return DIGESTSIZE;} - void TruncatedFinal(byte *hash, size_t size); - static const char * StaticAlgorithmName() {return B::ToEnum() == BIG_ENDIAN_ORDER ? "Panama-BE" : "Panama-LE";} - -protected: - void Init() {Panama::Reset();} - void HashEndianCorrectedBlock(const word32 *data) {this->Iterate(1, data);} // push - size_t HashMultipleBlocks(const word32 *input, size_t length); - word32* StateBuf() {return NULL;} -}; -} - -//! MAC construction using a hermetic hash function -template -class HermeticHashFunctionMAC : public AlgorithmImpl > >, T_Info> -{ -public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) - { - m_key.Assign(key, length); - Restart(); - } - - void Restart() - { - m_hash.Restart(); - m_keyed = false; - } - - void Update(const byte *input, size_t length) - { - if (!m_keyed) - KeyHash(); - m_hash.Update(input, length); - } - - void TruncatedFinal(byte *digest, size_t digestSize) - { - if (!m_keyed) - KeyHash(); - m_hash.TruncatedFinal(digest, digestSize); - m_keyed = false; - } - - unsigned int DigestSize() const - {return m_hash.DigestSize();} - unsigned int BlockSize() const - {return m_hash.BlockSize();} - unsigned int OptimalBlockSize() const - {return m_hash.OptimalBlockSize();} - unsigned int OptimalDataAlignment() const - {return m_hash.OptimalDataAlignment();} - -protected: - void KeyHash() - { - m_hash.Update(m_key, m_key.size()); - m_keyed = true; - } - - T_Hash m_hash; - bool m_keyed; - SecByteBlock m_key; -}; - -namespace Weak { -/// Panama MAC -template -class PanamaMAC : public HermeticHashFunctionMAC > -{ -public: - PanamaMAC() {} - PanamaMAC(const byte *key, unsigned int length) - {this->SetKey(key, length);} -}; -} - -//! algorithm info -template -struct PanamaCipherInfo : public FixedKeyLength<32, SimpleKeyingInterface::UNIQUE_IV, 32> -{ - static const char * StaticAlgorithmName() {return B::ToEnum() == BIG_ENDIAN_ORDER ? "Panama-BE" : "Panama-LE";} -}; - -//! _ -template -class PanamaCipherPolicy : public AdditiveCipherConcretePolicy, - public PanamaCipherInfo, - protected Panama -{ -protected: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - bool CipherIsRandomAccess() const {return false;} - void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length); -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 - unsigned int GetAlignment() const; -#endif - - FixedSizeSecBlock m_key; -}; - -//! Panama Stream Cipher -template -struct PanamaCipher : public PanamaCipherInfo, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal, AdditiveCipherTemplate<> >, PanamaCipherInfo > Encryption; - typedef Encryption Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.cpp deleted file mode 100644 index 1d9f38c5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.h deleted file mode 100644 index 418c3907..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pch.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CRYPTOPP_PCH_H -#define CRYPTOPP_PCH_H - -#ifdef CRYPTOPP_GENERATE_X64_MASM - - #include "cpu.h" - -#else - - #include "config.h" - - #ifdef USE_PRECOMPILED_HEADERS - #include "simple.h" - #include "secblock.h" - #include "misc.h" - #include "smartptr.h" - #endif - -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.cpp deleted file mode 100644 index e1f1d1e2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.cpp +++ /dev/null @@ -1,124 +0,0 @@ -// pkcspad.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_PKCSPAD_CPP // SunCC workaround: compiler could cause this file to be included twice -#define CRYPTOPP_PKCSPAD_CPP - -#include "pkcspad.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -// more in dll.cpp -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x02,0x05,0x00,0x04,0x10}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x04,0x10}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2b,0x24,0x03,0x02,0x01,0x05,0x00,0x04,0x14}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -template<> const byte PKCS_DigestDecoration::decoration[] = {0x30,0x29,0x30,0x0D,0x06,0x09,0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0C,0x02,0x05,0x00,0x04,0x18}; -template<> const unsigned int PKCS_DigestDecoration::length = sizeof(PKCS_DigestDecoration::decoration); - -size_t PKCS_EncryptionPaddingScheme::MaxUnpaddedLength(size_t paddedLength) const -{ - return SaturatingSubtract(paddedLength/8, 10U); -} - -void PKCS_EncryptionPaddingScheme::Pad(RandomNumberGenerator &rng, const byte *input, size_t inputLen, byte *pkcsBlock, size_t pkcsBlockLen, const NameValuePairs ¶meters) const -{ - assert (inputLen <= MaxUnpaddedLength(pkcsBlockLen)); // this should be checked by caller - - // convert from bit length to byte length - if (pkcsBlockLen % 8 != 0) - { - pkcsBlock[0] = 0; - pkcsBlock++; - } - pkcsBlockLen /= 8; - - pkcsBlock[0] = 2; // block type 2 - - // pad with non-zero random bytes - for (unsigned i = 1; i < pkcsBlockLen-inputLen-1; i++) - pkcsBlock[i] = (byte)rng.GenerateWord32(1, 0xff); - - pkcsBlock[pkcsBlockLen-inputLen-1] = 0; // separator - memcpy(pkcsBlock+pkcsBlockLen-inputLen, input, inputLen); -} - -DecodingResult PKCS_EncryptionPaddingScheme::Unpad(const byte *pkcsBlock, size_t pkcsBlockLen, byte *output, const NameValuePairs ¶meters) const -{ - bool invalid = false; - size_t maxOutputLen = MaxUnpaddedLength(pkcsBlockLen); - - // convert from bit length to byte length - if (pkcsBlockLen % 8 != 0) - { - invalid = (pkcsBlock[0] != 0) || invalid; - pkcsBlock++; - } - pkcsBlockLen /= 8; - - // Require block type 2. - invalid = (pkcsBlock[0] != 2) || invalid; - - // skip past the padding until we find the separator - size_t i=1; - while (i maxOutputLen) || invalid; - - if (invalid) - return DecodingResult(); - - memcpy (output, pkcsBlock+i, outputLen); - return DecodingResult(outputLen); -} - -// ******************************************************** - -#ifndef CRYPTOPP_IMPORTS - -void PKCS1v15_SignatureMessageEncodingMethod::ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - assert(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize())); - - size_t pkcsBlockLen = representativeBitLength; - // convert from bit length to byte length - if (pkcsBlockLen % 8 != 0) - { - representative[0] = 0; - representative++; - } - pkcsBlockLen /= 8; - - representative[0] = 1; // block type 1 - - unsigned int digestSize = hash.DigestSize(); - byte *pPadding = representative + 1; - byte *pDigest = representative + pkcsBlockLen - digestSize; - byte *pHashId = pDigest - hashIdentifier.second; - byte *pSeparator = pHashId - 1; - - // pad with 0xff - memset(pPadding, 0xff, pSeparator-pPadding); - *pSeparator = 0; - memcpy(pHashId, hashIdentifier.first, hashIdentifier.second); - hash.Final(pDigest); -} - -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.h deleted file mode 100644 index 6371c769..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pkcspad.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef CRYPTOPP_PKCSPAD_H -#define CRYPTOPP_PKCSPAD_H - -#include "cryptlib.h" -#include "pubkey.h" - -#ifdef CRYPTOPP_IS_DLL -#include "sha.h" -#endif - -NAMESPACE_BEGIN(CryptoPP) - -//! EME-PKCS1-v1_5 -class PKCS_EncryptionPaddingScheme : public PK_EncryptionMessageEncodingMethod -{ -public: - static const char * StaticAlgorithmName() {return "EME-PKCS1-v1_5";} - - size_t MaxUnpaddedLength(size_t paddedLength) const; - void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedLength, const NameValuePairs ¶meters) const; - DecodingResult Unpad(const byte *padded, size_t paddedLength, byte *raw, const NameValuePairs ¶meters) const; -}; - -template class PKCS_DigestDecoration -{ -public: - static const byte decoration[]; - static const unsigned int length; -}; - -// PKCS_DigestDecoration can be instantiated with the following -// classes as specified in PKCS#1 v2.0 and P1363a -class SHA1; -class RIPEMD160; -class Tiger; -class SHA224; -class SHA256; -class SHA384; -class SHA512; -namespace Weak1 { -class MD2; -class MD5; -} -// end of list - -#ifdef CRYPTOPP_IS_DLL -CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration; -CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration; -CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration; -CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration; -CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration; -#endif - -//! EMSA-PKCS1-v1_5 -class CRYPTOPP_DLL PKCS1v15_SignatureMessageEncodingMethod : public PK_DeterministicSignatureMessageEncodingMethod -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "EMSA-PKCS1-v1_5";} - - size_t MinRepresentativeBitLength(size_t hashIdentifierSize, size_t digestSize) const - {return 8 * (digestSize + hashIdentifierSize + 10);} - - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; - - struct HashIdentifierLookup - { - template struct HashIdentifierLookup2 - { - static HashIdentifier Lookup() - { - return HashIdentifier(PKCS_DigestDecoration::decoration, PKCS_DigestDecoration::length); - } - }; - }; -}; - -//! PKCS #1 version 1.5, for use with RSAES and RSASS -/*! Only the following hash functions are supported by this signature standard: - \dontinclude pkcspad.h - \skip can be instantiated - \until end of list -*/ -struct PKCS1v15 : public SignatureStandard, public EncryptionStandard -{ - typedef PKCS_EncryptionPaddingScheme EncryptionMessageEncodingMethod; - typedef PKCS1v15_SignatureMessageEncodingMethod SignatureMessageEncodingMethod; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.cpp deleted file mode 100644 index 734cae92..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.cpp +++ /dev/null @@ -1,577 +0,0 @@ -// polynomi.cpp - written and placed in the public domain by Wei Dai - -// Part of the code for polynomial evaluation and interpolation -// originally came from Hal Finney's public domain secsplit.c. - -#include "pch.h" -#include "polynomi.h" -#include "secblock.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -template -void PolynomialOver::Randomize(RandomNumberGenerator &rng, const RandomizationParameter ¶meter, const Ring &ring) -{ - m_coefficients.resize(parameter.m_coefficientCount); - for (unsigned int i=0; i -void PolynomialOver::FromStr(const char *str, const Ring &ring) -{ - std::istringstream in((char *)str); - bool positive = true; - CoefficientType coef; - unsigned int power; - - while (in) - { - std::ws(in); - if (in.peek() == 'x') - coef = ring.MultiplicativeIdentity(); - else - in >> coef; - - std::ws(in); - if (in.peek() == 'x') - { - in.get(); - std::ws(in); - if (in.peek() == '^') - { - in.get(); - in >> power; - } - else - power = 1; - } - else - power = 0; - - if (!positive) - coef = ring.Inverse(coef); - - SetCoefficient(power, coef, ring); - - std::ws(in); - switch (in.get()) - { - case '+': - positive = true; - break; - case '-': - positive = false; - break; - default: - return; // something's wrong with the input string - } - } -} - -template -unsigned int PolynomialOver::CoefficientCount(const Ring &ring) const -{ - unsigned count = m_coefficients.size(); - while (count && ring.Equal(m_coefficients[count-1], ring.Identity())) - count--; - const_cast &>(m_coefficients).resize(count); - return count; -} - -template -typename PolynomialOver::CoefficientType PolynomialOver::GetCoefficient(unsigned int i, const Ring &ring) const -{ - return (i < m_coefficients.size()) ? m_coefficients[i] : ring.Identity(); -} - -template -PolynomialOver& PolynomialOver::operator=(const PolynomialOver& t) -{ - if (this != &t) - { - m_coefficients.resize(t.m_coefficients.size()); - for (unsigned int i=0; i -PolynomialOver& PolynomialOver::Accumulate(const PolynomialOver& t, const Ring &ring) -{ - unsigned int count = t.CoefficientCount(ring); - - if (count > CoefficientCount(ring)) - m_coefficients.resize(count, ring.Identity()); - - for (unsigned int i=0; i -PolynomialOver& PolynomialOver::Reduce(const PolynomialOver& t, const Ring &ring) -{ - unsigned int count = t.CoefficientCount(ring); - - if (count > CoefficientCount(ring)) - m_coefficients.resize(count, ring.Identity()); - - for (unsigned int i=0; i -typename PolynomialOver::CoefficientType PolynomialOver::EvaluateAt(const CoefficientType &x, const Ring &ring) const -{ - int degree = Degree(ring); - - if (degree < 0) - return ring.Identity(); - - CoefficientType result = m_coefficients[degree]; - for (int j=degree-1; j>=0; j--) - { - result = ring.Multiply(result, x); - ring.Accumulate(result, m_coefficients[j]); - } - return result; -} - -template -PolynomialOver& PolynomialOver::ShiftLeft(unsigned int n, const Ring &ring) -{ - unsigned int i = CoefficientCount(ring) + n; - m_coefficients.resize(i, ring.Identity()); - while (i > n) - { - i--; - m_coefficients[i] = m_coefficients[i-n]; - } - while (i) - { - i--; - m_coefficients[i] = ring.Identity(); - } - return *this; -} - -template -PolynomialOver& PolynomialOver::ShiftRight(unsigned int n, const Ring &ring) -{ - unsigned int count = CoefficientCount(ring); - if (count > n) - { - for (unsigned int i=0; i -void PolynomialOver::SetCoefficient(unsigned int i, const CoefficientType &value, const Ring &ring) -{ - if (i >= m_coefficients.size()) - m_coefficients.resize(i+1, ring.Identity()); - m_coefficients[i] = value; -} - -template -void PolynomialOver::Negate(const Ring &ring) -{ - unsigned int count = CoefficientCount(ring); - for (unsigned int i=0; i -void PolynomialOver::swap(PolynomialOver &t) -{ - m_coefficients.swap(t.m_coefficients); -} - -template -bool PolynomialOver::Equals(const PolynomialOver& t, const Ring &ring) const -{ - unsigned int count = CoefficientCount(ring); - - if (count != t.CoefficientCount(ring)) - return false; - - for (unsigned int i=0; i -PolynomialOver PolynomialOver::Plus(const PolynomialOver& t, const Ring &ring) const -{ - unsigned int i; - unsigned int count = CoefficientCount(ring); - unsigned int tCount = t.CoefficientCount(ring); - - if (count > tCount) - { - PolynomialOver result(ring, count); - - for (i=0; i result(ring, tCount); - - for (i=0; i -PolynomialOver PolynomialOver::Minus(const PolynomialOver& t, const Ring &ring) const -{ - unsigned int i; - unsigned int count = CoefficientCount(ring); - unsigned int tCount = t.CoefficientCount(ring); - - if (count > tCount) - { - PolynomialOver result(ring, count); - - for (i=0; i result(ring, tCount); - - for (i=0; i -PolynomialOver PolynomialOver::Inverse(const Ring &ring) const -{ - unsigned int count = CoefficientCount(ring); - PolynomialOver result(ring, count); - - for (unsigned int i=0; i -PolynomialOver PolynomialOver::Times(const PolynomialOver& t, const Ring &ring) const -{ - if (IsZero(ring) || t.IsZero(ring)) - return PolynomialOver(); - - unsigned int count1 = CoefficientCount(ring), count2 = t.CoefficientCount(ring); - PolynomialOver result(ring, count1 + count2 - 1); - - for (unsigned int i=0; i -PolynomialOver PolynomialOver::DividedBy(const PolynomialOver& t, const Ring &ring) const -{ - PolynomialOver remainder, quotient; - Divide(remainder, quotient, *this, t, ring); - return quotient; -} - -template -PolynomialOver PolynomialOver::Modulo(const PolynomialOver& t, const Ring &ring) const -{ - PolynomialOver remainder, quotient; - Divide(remainder, quotient, *this, t, ring); - return remainder; -} - -template -PolynomialOver PolynomialOver::MultiplicativeInverse(const Ring &ring) const -{ - return Degree(ring)==0 ? ring.MultiplicativeInverse(m_coefficients[0]) : ring.Identity(); -} - -template -bool PolynomialOver::IsUnit(const Ring &ring) const -{ - return Degree(ring)==0 && ring.IsUnit(m_coefficients[0]); -} - -template -std::istream& PolynomialOver::Input(std::istream &in, const Ring &ring) -{ - char c; - unsigned int length = 0; - SecBlock str(length + 16); - bool paren = false; - - std::ws(in); - - if (in.peek() == '(') - { - paren = true; - in.get(); - } - - do - { - in.read(&c, 1); - str[length++] = c; - if (length >= str.size()) - str.Grow(length + 16); - } - // if we started with a left paren, then read until we find a right paren, - // otherwise read until the end of the line - while (in && ((paren && c != ')') || (!paren && c != '\n'))); - - str[length-1] = '\0'; - *this = PolynomialOver(str, ring); - - return in; -} - -template -std::ostream& PolynomialOver::Output(std::ostream &out, const Ring &ring) const -{ - unsigned int i = CoefficientCount(ring); - if (i) - { - bool firstTerm = true; - - while (i--) - { - if (m_coefficients[i] != ring.Identity()) - { - if (firstTerm) - { - firstTerm = false; - if (!i || !ring.Equal(m_coefficients[i], ring.MultiplicativeIdentity())) - out << m_coefficients[i]; - } - else - { - CoefficientType inverse = ring.Inverse(m_coefficients[i]); - std::ostringstream pstr, nstr; - - pstr << m_coefficients[i]; - nstr << inverse; - - if (pstr.str().size() <= nstr.str().size()) - { - out << " + "; - if (!i || !ring.Equal(m_coefficients[i], ring.MultiplicativeIdentity())) - out << m_coefficients[i]; - } - else - { - out << " - "; - if (!i || !ring.Equal(inverse, ring.MultiplicativeIdentity())) - out << inverse; - } - } - - switch (i) - { - case 0: - break; - case 1: - out << "x"; - break; - default: - out << "x^" << i; - } - } - } - } - else - { - out << ring.Identity(); - } - return out; -} - -template -void PolynomialOver::Divide(PolynomialOver &r, PolynomialOver &q, const PolynomialOver &a, const PolynomialOver &d, const Ring &ring) -{ - unsigned int i = a.CoefficientCount(ring); - const int dDegree = d.Degree(ring); - - if (dDegree < 0) - throw DivideByZero(); - - r = a; - q.m_coefficients.resize(STDMAX(0, int(i - dDegree))); - - while (i > (unsigned int)dDegree) - { - --i; - q.m_coefficients[i-dDegree] = ring.Divide(r.m_coefficients[i], d.m_coefficients[dDegree]); - for (int j=0; j<=dDegree; j++) - ring.Reduce(r.m_coefficients[i-dDegree+j], ring.Multiply(q.m_coefficients[i-dDegree], d.m_coefficients[j])); - } - - r.CoefficientCount(ring); // resize r.m_coefficients -} - -// ******************************************************** - -// helper function for Interpolate() and InterpolateAt() -template -void RingOfPolynomialsOver::CalculateAlpha(std::vector &alpha, const CoefficientType x[], const CoefficientType y[], unsigned int n) const -{ - for (unsigned int j=0; j=k; --j) - { - m_ring.Reduce(alpha[j], alpha[j-1]); - - CoefficientType d = m_ring.Subtract(x[j], x[j-k]); - if (!m_ring.IsUnit(d)) - throw InterpolationFailed(); - alpha[j] = m_ring.Divide(alpha[j], d); - } - } -} - -template -typename RingOfPolynomialsOver::Element RingOfPolynomialsOver::Interpolate(const CoefficientType x[], const CoefficientType y[], unsigned int n) const -{ - assert(n > 0); - - std::vector alpha(n); - CalculateAlpha(alpha, x, y, n); - - std::vector coefficients((size_t)n, m_ring.Identity()); - coefficients[0] = alpha[n-1]; - - for (int j=n-2; j>=0; --j) - { - for (unsigned int i=n-j-1; i>0; i--) - coefficients[i] = m_ring.Subtract(coefficients[i-1], m_ring.Multiply(coefficients[i], x[j])); - - coefficients[0] = m_ring.Subtract(alpha[j], m_ring.Multiply(coefficients[0], x[j])); - } - - return PolynomialOver(coefficients.begin(), coefficients.end()); -} - -template -typename RingOfPolynomialsOver::CoefficientType RingOfPolynomialsOver::InterpolateAt(const CoefficientType &position, const CoefficientType x[], const CoefficientType y[], unsigned int n) const -{ - assert(n > 0); - - std::vector alpha(n); - CalculateAlpha(alpha, x, y, n); - - CoefficientType result = alpha[n-1]; - for (int j=n-2; j>=0; --j) - { - result = m_ring.Multiply(result, m_ring.Subtract(position, x[j])); - m_ring.Accumulate(result, alpha[j]); - } - return result; -} - -template -void PrepareBulkPolynomialInterpolation(const Ring &ring, Element *w, const Element x[], unsigned int n) -{ - for (unsigned int i=0; i -void PrepareBulkPolynomialInterpolationAt(const Ring &ring, Element *v, const Element &position, const Element x[], const Element w[], unsigned int n) -{ - assert(n > 0); - - std::vector a(2*n-1); - unsigned int i; - - for (i=0; i1; i--) - a[i-1] = ring.Multiply(a[2*i], a[2*i-1]); - - a[0] = ring.MultiplicativeIdentity(); - - for (i=0; i -Element BulkPolynomialInterpolateAt(const Ring &ring, const Element y[], const Element v[], unsigned int n) -{ - Element result = ring.Identity(); - for (unsigned int i=0; i -const PolynomialOverFixedRing &PolynomialOverFixedRing::Zero() -{ - return Singleton().Ref(); -} - -template -const PolynomialOverFixedRing &PolynomialOverFixedRing::One() -{ - return Singleton().Ref(); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.h deleted file mode 100644 index cddadaea..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/polynomi.h +++ /dev/null @@ -1,459 +0,0 @@ -#ifndef CRYPTOPP_POLYNOMI_H -#define CRYPTOPP_POLYNOMI_H - -/*! \file */ - -#include "cryptlib.h" -#include "misc.h" -#include "algebra.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! represents single-variable polynomials over arbitrary rings -/*! \nosubgrouping */ -template class PolynomialOver -{ -public: - //! \name ENUMS, EXCEPTIONS, and TYPEDEFS - //@{ - //! division by zero exception - class DivideByZero : public Exception - { - public: - DivideByZero() : Exception(OTHER_ERROR, "PolynomialOver: division by zero") {} - }; - - //! specify the distribution for randomization functions - class RandomizationParameter - { - public: - RandomizationParameter(unsigned int coefficientCount, const typename T::RandomizationParameter &coefficientParameter ) - : m_coefficientCount(coefficientCount), m_coefficientParameter(coefficientParameter) {} - - private: - unsigned int m_coefficientCount; - typename T::RandomizationParameter m_coefficientParameter; - friend class PolynomialOver; - }; - - typedef T Ring; - typedef typename T::Element CoefficientType; - //@} - - //! \name CREATORS - //@{ - //! creates the zero polynomial - PolynomialOver() {} - - //! - PolynomialOver(const Ring &ring, unsigned int count) - : m_coefficients((size_t)count, ring.Identity()) {} - - //! copy constructor - PolynomialOver(const PolynomialOver &t) - : m_coefficients(t.m_coefficients.size()) {*this = t;} - - //! construct constant polynomial - PolynomialOver(const CoefficientType &element) - : m_coefficients(1, element) {} - - //! construct polynomial with specified coefficients, starting from coefficient of x^0 - template PolynomialOver(Iterator begin, Iterator end) - : m_coefficients(begin, end) {} - - //! convert from string - PolynomialOver(const char *str, const Ring &ring) {FromStr(str, ring);} - - //! convert from big-endian byte array - PolynomialOver(const byte *encodedPolynomialOver, unsigned int byteCount); - - //! convert from Basic Encoding Rules encoded byte array - explicit PolynomialOver(const byte *BEREncodedPolynomialOver); - - //! convert from BER encoded byte array stored in a BufferedTransformation object - explicit PolynomialOver(BufferedTransformation &bt); - - //! create a random PolynomialOver - PolynomialOver(RandomNumberGenerator &rng, const RandomizationParameter ¶meter, const Ring &ring) - {Randomize(rng, parameter, ring);} - //@} - - //! \name ACCESSORS - //@{ - //! the zero polynomial will return a degree of -1 - int Degree(const Ring &ring) const {return int(CoefficientCount(ring))-1;} - //! - unsigned int CoefficientCount(const Ring &ring) const; - //! return coefficient for x^i - CoefficientType GetCoefficient(unsigned int i, const Ring &ring) const; - //@} - - //! \name MANIPULATORS - //@{ - //! - PolynomialOver& operator=(const PolynomialOver& t); - - //! - void Randomize(RandomNumberGenerator &rng, const RandomizationParameter ¶meter, const Ring &ring); - - //! set the coefficient for x^i to value - void SetCoefficient(unsigned int i, const CoefficientType &value, const Ring &ring); - - //! - void Negate(const Ring &ring); - - //! - void swap(PolynomialOver &t); - //@} - - - //! \name BASIC ARITHMETIC ON POLYNOMIALS - //@{ - bool Equals(const PolynomialOver &t, const Ring &ring) const; - bool IsZero(const Ring &ring) const {return CoefficientCount(ring)==0;} - - PolynomialOver Plus(const PolynomialOver& t, const Ring &ring) const; - PolynomialOver Minus(const PolynomialOver& t, const Ring &ring) const; - PolynomialOver Inverse(const Ring &ring) const; - - PolynomialOver Times(const PolynomialOver& t, const Ring &ring) const; - PolynomialOver DividedBy(const PolynomialOver& t, const Ring &ring) const; - PolynomialOver Modulo(const PolynomialOver& t, const Ring &ring) const; - PolynomialOver MultiplicativeInverse(const Ring &ring) const; - bool IsUnit(const Ring &ring) const; - - PolynomialOver& Accumulate(const PolynomialOver& t, const Ring &ring); - PolynomialOver& Reduce(const PolynomialOver& t, const Ring &ring); - - //! - PolynomialOver Doubled(const Ring &ring) const {return Plus(*this, ring);} - //! - PolynomialOver Squared(const Ring &ring) const {return Times(*this, ring);} - - CoefficientType EvaluateAt(const CoefficientType &x, const Ring &ring) const; - - PolynomialOver& ShiftLeft(unsigned int n, const Ring &ring); - PolynomialOver& ShiftRight(unsigned int n, const Ring &ring); - - //! calculate r and q such that (a == d*q + r) && (0 <= degree of r < degree of d) - static void Divide(PolynomialOver &r, PolynomialOver &q, const PolynomialOver &a, const PolynomialOver &d, const Ring &ring); - //@} - - //! \name INPUT/OUTPUT - //@{ - std::istream& Input(std::istream &in, const Ring &ring); - std::ostream& Output(std::ostream &out, const Ring &ring) const; - //@} - -private: - void FromStr(const char *str, const Ring &ring); - - std::vector m_coefficients; -}; - -//! Polynomials over a fixed ring -/*! Having a fixed ring allows overloaded operators */ -template class PolynomialOverFixedRing : private PolynomialOver -{ - typedef PolynomialOver B; - typedef PolynomialOverFixedRing ThisType; - -public: - typedef T Ring; - typedef typename T::Element CoefficientType; - typedef typename B::DivideByZero DivideByZero; - typedef typename B::RandomizationParameter RandomizationParameter; - - //! \name CREATORS - //@{ - //! creates the zero polynomial - PolynomialOverFixedRing(unsigned int count = 0) : B(ms_fixedRing, count) {} - - //! copy constructor - PolynomialOverFixedRing(const ThisType &t) : B(t) {} - - explicit PolynomialOverFixedRing(const B &t) : B(t) {} - - //! construct constant polynomial - PolynomialOverFixedRing(const CoefficientType &element) : B(element) {} - - //! construct polynomial with specified coefficients, starting from coefficient of x^0 - template PolynomialOverFixedRing(Iterator first, Iterator last) - : B(first, last) {} - - //! convert from string - explicit PolynomialOverFixedRing(const char *str) : B(str, ms_fixedRing) {} - - //! convert from big-endian byte array - PolynomialOverFixedRing(const byte *encodedPoly, unsigned int byteCount) : B(encodedPoly, byteCount) {} - - //! convert from Basic Encoding Rules encoded byte array - explicit PolynomialOverFixedRing(const byte *BEREncodedPoly) : B(BEREncodedPoly) {} - - //! convert from BER encoded byte array stored in a BufferedTransformation object - explicit PolynomialOverFixedRing(BufferedTransformation &bt) : B(bt) {} - - //! create a random PolynomialOverFixedRing - PolynomialOverFixedRing(RandomNumberGenerator &rng, const RandomizationParameter ¶meter) : B(rng, parameter, ms_fixedRing) {} - - static const ThisType &Zero(); - static const ThisType &One(); - //@} - - //! \name ACCESSORS - //@{ - //! the zero polynomial will return a degree of -1 - int Degree() const {return B::Degree(ms_fixedRing);} - //! degree + 1 - unsigned int CoefficientCount() const {return B::CoefficientCount(ms_fixedRing);} - //! return coefficient for x^i - CoefficientType GetCoefficient(unsigned int i) const {return B::GetCoefficient(i, ms_fixedRing);} - //! return coefficient for x^i - CoefficientType operator[](unsigned int i) const {return B::GetCoefficient(i, ms_fixedRing);} - //@} - - //! \name MANIPULATORS - //@{ - //! - ThisType& operator=(const ThisType& t) {B::operator=(t); return *this;} - //! - ThisType& operator+=(const ThisType& t) {Accumulate(t, ms_fixedRing); return *this;} - //! - ThisType& operator-=(const ThisType& t) {Reduce(t, ms_fixedRing); return *this;} - //! - ThisType& operator*=(const ThisType& t) {return *this = *this*t;} - //! - ThisType& operator/=(const ThisType& t) {return *this = *this/t;} - //! - ThisType& operator%=(const ThisType& t) {return *this = *this%t;} - - //! - ThisType& operator<<=(unsigned int n) {ShiftLeft(n, ms_fixedRing); return *this;} - //! - ThisType& operator>>=(unsigned int n) {ShiftRight(n, ms_fixedRing); return *this;} - - //! set the coefficient for x^i to value - void SetCoefficient(unsigned int i, const CoefficientType &value) {B::SetCoefficient(i, value, ms_fixedRing);} - - //! - void Randomize(RandomNumberGenerator &rng, const RandomizationParameter ¶meter) {B::Randomize(rng, parameter, ms_fixedRing);} - - //! - void Negate() {B::Negate(ms_fixedRing);} - - void swap(ThisType &t) {B::swap(t);} - //@} - - //! \name UNARY OPERATORS - //@{ - //! - bool operator!() const {return CoefficientCount()==0;} - //! - ThisType operator+() const {return *this;} - //! - ThisType operator-() const {return ThisType(Inverse(ms_fixedRing));} - //@} - - //! \name BINARY OPERATORS - //@{ - //! - friend ThisType operator>>(ThisType a, unsigned int n) {return ThisType(a>>=n);} - //! - friend ThisType operator<<(ThisType a, unsigned int n) {return ThisType(a<<=n);} - //@} - - //! \name OTHER ARITHMETIC FUNCTIONS - //@{ - //! - ThisType MultiplicativeInverse() const {return ThisType(B::MultiplicativeInverse(ms_fixedRing));} - //! - bool IsUnit() const {return B::IsUnit(ms_fixedRing);} - - //! - ThisType Doubled() const {return ThisType(B::Doubled(ms_fixedRing));} - //! - ThisType Squared() const {return ThisType(B::Squared(ms_fixedRing));} - - CoefficientType EvaluateAt(const CoefficientType &x) const {return B::EvaluateAt(x, ms_fixedRing);} - - //! calculate r and q such that (a == d*q + r) && (0 <= r < abs(d)) - static void Divide(ThisType &r, ThisType &q, const ThisType &a, const ThisType &d) - {B::Divide(r, q, a, d, ms_fixedRing);} - //@} - - //! \name INPUT/OUTPUT - //@{ - //! - friend std::istream& operator>>(std::istream& in, ThisType &a) - {return a.Input(in, ms_fixedRing);} - //! - friend std::ostream& operator<<(std::ostream& out, const ThisType &a) - {return a.Output(out, ms_fixedRing);} - //@} - -private: - struct NewOnePolynomial - { - ThisType * operator()() const - { - return new ThisType(ms_fixedRing.MultiplicativeIdentity()); - } - }; - - static const Ring ms_fixedRing; -}; - -//! Ring of polynomials over another ring -template class RingOfPolynomialsOver : public AbstractEuclideanDomain > -{ -public: - typedef T CoefficientRing; - typedef PolynomialOver Element; - typedef typename Element::CoefficientType CoefficientType; - typedef typename Element::RandomizationParameter RandomizationParameter; - - RingOfPolynomialsOver(const CoefficientRing &ring) : m_ring(ring) {} - - Element RandomElement(RandomNumberGenerator &rng, const RandomizationParameter ¶meter) - {return Element(rng, parameter, m_ring);} - - bool Equal(const Element &a, const Element &b) const - {return a.Equals(b, m_ring);} - - const Element& Identity() const - {return this->result = m_ring.Identity();} - - const Element& Add(const Element &a, const Element &b) const - {return this->result = a.Plus(b, m_ring);} - - Element& Accumulate(Element &a, const Element &b) const - {a.Accumulate(b, m_ring); return a;} - - const Element& Inverse(const Element &a) const - {return this->result = a.Inverse(m_ring);} - - const Element& Subtract(const Element &a, const Element &b) const - {return this->result = a.Minus(b, m_ring);} - - Element& Reduce(Element &a, const Element &b) const - {return a.Reduce(b, m_ring);} - - const Element& Double(const Element &a) const - {return this->result = a.Doubled(m_ring);} - - const Element& MultiplicativeIdentity() const - {return this->result = m_ring.MultiplicativeIdentity();} - - const Element& Multiply(const Element &a, const Element &b) const - {return this->result = a.Times(b, m_ring);} - - const Element& Square(const Element &a) const - {return this->result = a.Squared(m_ring);} - - bool IsUnit(const Element &a) const - {return a.IsUnit(m_ring);} - - const Element& MultiplicativeInverse(const Element &a) const - {return this->result = a.MultiplicativeInverse(m_ring);} - - const Element& Divide(const Element &a, const Element &b) const - {return this->result = a.DividedBy(b, m_ring);} - - const Element& Mod(const Element &a, const Element &b) const - {return this->result = a.Modulo(b, m_ring);} - - void DivisionAlgorithm(Element &r, Element &q, const Element &a, const Element &d) const - {Element::Divide(r, q, a, d, m_ring);} - - class InterpolationFailed : public Exception - { - public: - InterpolationFailed() : Exception(OTHER_ERROR, "RingOfPolynomialsOver: interpolation failed") {} - }; - - Element Interpolate(const CoefficientType x[], const CoefficientType y[], unsigned int n) const; - - // a faster version of Interpolate(x, y, n).EvaluateAt(position) - CoefficientType InterpolateAt(const CoefficientType &position, const CoefficientType x[], const CoefficientType y[], unsigned int n) const; -/* - void PrepareBulkInterpolation(CoefficientType *w, const CoefficientType x[], unsigned int n) const; - void PrepareBulkInterpolationAt(CoefficientType *v, const CoefficientType &position, const CoefficientType x[], const CoefficientType w[], unsigned int n) const; - CoefficientType BulkInterpolateAt(const CoefficientType y[], const CoefficientType v[], unsigned int n) const; -*/ -protected: - void CalculateAlpha(std::vector &alpha, const CoefficientType x[], const CoefficientType y[], unsigned int n) const; - - CoefficientRing m_ring; -}; - -template -void PrepareBulkPolynomialInterpolation(const Ring &ring, Element *w, const Element x[], unsigned int n); -template -void PrepareBulkPolynomialInterpolationAt(const Ring &ring, Element *v, const Element &position, const Element x[], const Element w[], unsigned int n); -template -Element BulkPolynomialInterpolateAt(const Ring &ring, const Element y[], const Element v[], unsigned int n); - -//! -template -inline bool operator==(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return a.Equals(b, a.ms_fixedRing);} -//! -template -inline bool operator!=(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return !(a==b);} - -//! -template -inline bool operator> (const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return a.Degree() > b.Degree();} -//! -template -inline bool operator>=(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return a.Degree() >= b.Degree();} -//! -template -inline bool operator< (const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return a.Degree() < b.Degree();} -//! -template -inline bool operator<=(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return a.Degree() <= b.Degree();} - -//! -template -inline CryptoPP::PolynomialOverFixedRing operator+(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return CryptoPP::PolynomialOverFixedRing(a.Plus(b, a.ms_fixedRing));} -//! -template -inline CryptoPP::PolynomialOverFixedRing operator-(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return CryptoPP::PolynomialOverFixedRing(a.Minus(b, a.ms_fixedRing));} -//! -template -inline CryptoPP::PolynomialOverFixedRing operator*(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return CryptoPP::PolynomialOverFixedRing(a.Times(b, a.ms_fixedRing));} -//! -template -inline CryptoPP::PolynomialOverFixedRing operator/(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return CryptoPP::PolynomialOverFixedRing(a.DividedBy(b, a.ms_fixedRing));} -//! -template -inline CryptoPP::PolynomialOverFixedRing operator%(const CryptoPP::PolynomialOverFixedRing &a, const CryptoPP::PolynomialOverFixedRing &b) - {return CryptoPP::PolynomialOverFixedRing(a.Modulo(b, a.ms_fixedRing));} - -NAMESPACE_END - -NAMESPACE_BEGIN(std) -template inline void swap(CryptoPP::PolynomialOver &a, CryptoPP::PolynomialOver &b) -{ - a.swap(b); -} -template inline void swap(CryptoPP::PolynomialOverFixedRing &a, CryptoPP::PolynomialOverFixedRing &b) -{ - a.swap(b); -} -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.cpp deleted file mode 100644 index ccbe4ee2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.cpp +++ /dev/null @@ -1,145 +0,0 @@ -// pssr.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "pssr.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -// more in dll.cpp -template<> const byte EMSA2HashId::id = 0x31; -template<> const byte EMSA2HashId::id = 0x32; -template<> const byte EMSA2HashId::id = 0x37; - -#ifndef CRYPTOPP_IMPORTS - -size_t PSSR_MEM_Base::MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const -{ - size_t saltLen = SaltLen(digestLength); - size_t minPadLen = MinPadLen(digestLength); - return 9 + 8*(minPadLen + saltLen + digestLength + hashIdentifierLength); -} - -size_t PSSR_MEM_Base::MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const -{ - if (AllowRecovery()) - return SaturatingSubtract(representativeBitLength, MinRepresentativeBitLength(hashIdentifierLength, digestLength)) / 8; - return 0; -} - -bool PSSR_MEM_Base::IsProbabilistic() const -{ - return SaltLen(1) > 0; -} - -bool PSSR_MEM_Base::AllowNonrecoverablePart() const -{ - return true; -} - -bool PSSR_MEM_Base::RecoverablePartFirst() const -{ - return false; -} - -void PSSR_MEM_Base::ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - assert(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize())); - - const size_t u = hashIdentifier.second + 1; - const size_t representativeByteLength = BitsToBytes(representativeBitLength); - const size_t digestSize = hash.DigestSize(); - const size_t saltSize = SaltLen(digestSize); - byte *const h = representative + representativeByteLength - u - digestSize; - - SecByteBlock digest(digestSize), salt(saltSize); - hash.Final(digest); - rng.GenerateBlock(salt, saltSize); - - // compute H = hash of M' - byte c[8]; - PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength)); - PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3)); - hash.Update(c, 8); - hash.Update(recoverableMessage, recoverableMessageLength); - hash.Update(digest, digestSize); - hash.Update(salt, saltSize); - hash.Final(h); - - // compute representative - GetMGF().GenerateAndMask(hash, representative, representativeByteLength - u - digestSize, h, digestSize, false); - byte *xorStart = representative + representativeByteLength - u - digestSize - salt.size() - recoverableMessageLength - 1; - xorStart[0] ^= 1; - xorbuf(xorStart + 1, recoverableMessage, recoverableMessageLength); - xorbuf(xorStart + 1 + recoverableMessageLength, salt, salt.size()); - memcpy(representative + representativeByteLength - u, hashIdentifier.first, hashIdentifier.second); - representative[representativeByteLength - 1] = hashIdentifier.second ? 0xcc : 0xbc; - if (representativeBitLength % 8 != 0) - representative[0] = (byte)Crop(representative[0], representativeBitLength % 8); -} - -DecodingResult PSSR_MEM_Base::RecoverMessageFromRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength, - byte *recoverableMessage) const -{ - assert(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize())); - - const size_t u = hashIdentifier.second + 1; - const size_t representativeByteLength = BitsToBytes(representativeBitLength); - const size_t digestSize = hash.DigestSize(); - const size_t saltSize = SaltLen(digestSize); - const byte *const h = representative + representativeByteLength - u - digestSize; - - SecByteBlock digest(digestSize); - hash.Final(digest); - - DecodingResult result(0); - bool &valid = result.isValidCoding; - size_t &recoverableMessageLength = result.messageLength; - - valid = (representative[representativeByteLength - 1] == (hashIdentifier.second ? 0xcc : 0xbc)) && valid; - valid = VerifyBufsEqual(representative + representativeByteLength - u, hashIdentifier.first, hashIdentifier.second) && valid; - - GetMGF().GenerateAndMask(hash, representative, representativeByteLength - u - digestSize, h, digestSize); - if (representativeBitLength % 8 != 0) - representative[0] = (byte)Crop(representative[0], representativeBitLength % 8); - - // extract salt and recoverableMessage from DB = 00 ... || 01 || M || salt - byte *salt = representative + representativeByteLength - u - digestSize - saltSize; - byte *M = std::find_if(representative, salt-1, std::bind2nd(std::not_equal_to(), 0)); - recoverableMessageLength = salt-M-1; - if (*M == 0x01 - && (size_t)(M - representative - (representativeBitLength % 8 != 0)) >= MinPadLen(digestSize) - && recoverableMessageLength <= MaxRecoverableLength(representativeBitLength, hashIdentifier.second, digestSize)) - { - memcpy(recoverableMessage, M+1, recoverableMessageLength); - } - else - { - recoverableMessageLength = 0; - valid = false; - } - - // verify H = hash of M' - byte c[8]; - PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength)); - PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3)); - hash.Update(c, 8); - hash.Update(recoverableMessage, recoverableMessageLength); - hash.Update(digest, digestSize); - hash.Update(salt, saltSize); - valid = hash.Verify(h) && valid; - - if (!AllowRecovery() && valid && recoverableMessageLength != 0) - {throw NotImplemented("PSSR_MEM: message recovery disabled");} - - return result; -} - -#endif - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.h deleted file mode 100644 index 6ec6936e..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pssr.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef CRYPTOPP_PSSR_H -#define CRYPTOPP_PSSR_H - -#include "pubkey.h" -#include "emsa2.h" - -#ifdef CRYPTOPP_IS_DLL -#include "sha.h" -#endif - -NAMESPACE_BEGIN(CryptoPP) - -class CRYPTOPP_DLL PSSR_MEM_Base : public PK_RecoverableSignatureMessageEncodingMethod -{ - virtual bool AllowRecovery() const =0; - virtual size_t SaltLen(size_t hashLen) const =0; - virtual size_t MinPadLen(size_t hashLen) const =0; - virtual const MaskGeneratingFunction & GetMGF() const =0; - -public: - size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const; - size_t MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const; - bool IsProbabilistic() const; - bool AllowNonrecoverablePart() const; - bool RecoverablePartFirst() const; - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; - DecodingResult RecoverMessageFromRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength, - byte *recoverableMessage) const; -}; - -template class PSSR_MEM_BaseWithHashId; -template<> class PSSR_MEM_BaseWithHashId : public EMSA2HashIdLookup {}; -template<> class PSSR_MEM_BaseWithHashId : public PSSR_MEM_Base {}; - -template -class PSSR_MEM : public PSSR_MEM_BaseWithHashId -{ - virtual bool AllowRecovery() const {return ALLOW_RECOVERY;} - virtual size_t SaltLen(size_t hashLen) const {return SALT_LEN < 0 ? hashLen : SALT_LEN;} - virtual size_t MinPadLen(size_t hashLen) const {return MIN_PAD_LEN < 0 ? hashLen : MIN_PAD_LEN;} - virtual const MaskGeneratingFunction & GetMGF() const {static MGF mgf; return mgf;} - -public: - static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(ALLOW_RECOVERY ? "PSSR-" : "PSS-") + MGF::StaticAlgorithmName();} -}; - -//! PSSR-MGF1 -struct PSSR : public SignatureStandard -{ - typedef PSSR_MEM SignatureMessageEncodingMethod; -}; - -//! PSS-MGF1 -struct PSS : public SignatureStandard -{ - typedef PSSR_MEM SignatureMessageEncodingMethod; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.cpp deleted file mode 100644 index 1159e534..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// pubkey.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "pubkey.h" - -NAMESPACE_BEGIN(CryptoPP) - -void P1363_MGF1KDF2_Common(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength, bool mask, unsigned int counterStart) -{ - ArraySink *sink; - HashFilter filter(hash, sink = mask ? new ArrayXorSink(output, outputLength) : new ArraySink(output, outputLength)); - word32 counter = counterStart; - while (sink->AvailableSize() > 0) - { - filter.Put(input, inputLength); - filter.PutWord32(counter++); - filter.Put(derivationParams, derivationParamsLength); - filter.MessageEnd(); - } -} - -bool PK_DeterministicSignatureMessageEncodingMethod::VerifyMessageRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - SecByteBlock computedRepresentative(BitsToBytes(representativeBitLength)); - ComputeMessageRepresentative(NullRNG(), NULL, 0, hash, hashIdentifier, messageEmpty, computedRepresentative, representativeBitLength); - return VerifyBufsEqual(representative, computedRepresentative, computedRepresentative.size()); -} - -bool PK_RecoverableSignatureMessageEncodingMethod::VerifyMessageRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const -{ - SecByteBlock recoveredMessage(MaxRecoverableLength(representativeBitLength, hashIdentifier.second, hash.DigestSize())); - DecodingResult result = RecoverMessageFromRepresentative( - hash, hashIdentifier, messageEmpty, representative, representativeBitLength, recoveredMessage); - return result.isValidCoding && result.messageLength == 0; -} - -void TF_SignerBase::InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const -{ - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - HashIdentifier id = GetHashIdentifier(); - const MessageEncodingInterface &encoding = GetMessageEncodingInterface(); - - if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize())) - throw PK_SignatureScheme::KeyTooShort(); - - size_t maxRecoverableLength = encoding.MaxRecoverableLength(MessageRepresentativeBitLength(), GetHashIdentifier().second, ma.AccessHash().DigestSize()); - - if (maxRecoverableLength == 0) - {throw NotImplemented("TF_SignerBase: this algorithm does not support messsage recovery or the key is too short");} - if (recoverableMessageLength > maxRecoverableLength) - throw InvalidArgument("TF_SignerBase: the recoverable message part is too long for the given key and algorithm"); - - ma.m_recoverableMessage.Assign(recoverableMessage, recoverableMessageLength); - encoding.ProcessRecoverableMessage( - ma.AccessHash(), - recoverableMessage, recoverableMessageLength, - NULL, 0, ma.m_semisignature); -} - -size_t TF_SignerBase::SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart) const -{ - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - HashIdentifier id = GetHashIdentifier(); - const MessageEncodingInterface &encoding = GetMessageEncodingInterface(); - - if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize())) - throw PK_SignatureScheme::KeyTooShort(); - - SecByteBlock representative(MessageRepresentativeLength()); - encoding.ComputeMessageRepresentative(rng, - ma.m_recoverableMessage, ma.m_recoverableMessage.size(), - ma.AccessHash(), id, ma.m_empty, - representative, MessageRepresentativeBitLength()); - ma.m_empty = true; - - Integer r(representative, representative.size()); - size_t signatureLength = SignatureLength(); - GetTrapdoorFunctionInterface().CalculateRandomizedInverse(rng, r).Encode(signature, signatureLength); - return signatureLength; -} - -void TF_VerifierBase::InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const -{ - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - HashIdentifier id = GetHashIdentifier(); - const MessageEncodingInterface &encoding = GetMessageEncodingInterface(); - - if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize())) - throw PK_SignatureScheme::KeyTooShort(); - - ma.m_representative.New(MessageRepresentativeLength()); - Integer x = GetTrapdoorFunctionInterface().ApplyFunction(Integer(signature, signatureLength)); - if (x.BitCount() > MessageRepresentativeBitLength()) - x = Integer::Zero(); // don't return false here to prevent timing attack - x.Encode(ma.m_representative, ma.m_representative.size()); -} - -bool TF_VerifierBase::VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const -{ - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - HashIdentifier id = GetHashIdentifier(); - const MessageEncodingInterface &encoding = GetMessageEncodingInterface(); - - if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize())) - throw PK_SignatureScheme::KeyTooShort(); - - bool result = encoding.VerifyMessageRepresentative( - ma.AccessHash(), id, ma.m_empty, ma.m_representative, MessageRepresentativeBitLength()); - ma.m_empty = true; - return result; -} - -DecodingResult TF_VerifierBase::RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const -{ - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - HashIdentifier id = GetHashIdentifier(); - const MessageEncodingInterface &encoding = GetMessageEncodingInterface(); - - if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize())) - throw PK_SignatureScheme::KeyTooShort(); - - DecodingResult result = encoding.RecoverMessageFromRepresentative( - ma.AccessHash(), id, ma.m_empty, ma.m_representative, MessageRepresentativeBitLength(), recoveredMessage); - ma.m_empty = true; - return result; -} - -DecodingResult TF_DecryptorBase::Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs ¶meters) const -{ - if (ciphertextLength != FixedCiphertextLength()) - throw InvalidArgument(AlgorithmName() + ": ciphertext length of " + IntToString(ciphertextLength) + " doesn't match the required length of " + IntToString(FixedCiphertextLength()) + " for this key"); - - SecByteBlock paddedBlock(PaddedBlockByteLength()); - Integer x = GetTrapdoorFunctionInterface().CalculateInverse(rng, Integer(ciphertext, ciphertextLength)); - if (x.ByteCount() > paddedBlock.size()) - x = Integer::Zero(); // don't return false here to prevent timing attack - x.Encode(paddedBlock, paddedBlock.size()); - return GetMessageEncodingInterface().Unpad(paddedBlock, PaddedBlockBitLength(), plaintext, parameters); -} - -void TF_EncryptorBase::Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs ¶meters) const -{ - if (plaintextLength > FixedMaxPlaintextLength()) - { - if (FixedMaxPlaintextLength() < 1) - throw InvalidArgument(AlgorithmName() + ": this key is too short to encrypt any messages"); - else - throw InvalidArgument(AlgorithmName() + ": message length of " + IntToString(plaintextLength) + " exceeds the maximum of " + IntToString(FixedMaxPlaintextLength()) + " for this public key"); - } - - SecByteBlock paddedBlock(PaddedBlockByteLength()); - GetMessageEncodingInterface().Pad(rng, plaintext, plaintextLength, paddedBlock, PaddedBlockBitLength(), parameters); - GetTrapdoorFunctionInterface().ApplyRandomizedFunction(rng, Integer(paddedBlock, paddedBlock.size())).Encode(ciphertext, FixedCiphertextLength()); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.h deleted file mode 100644 index 3a3f3bcd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pubkey.h +++ /dev/null @@ -1,1678 +0,0 @@ -// pubkey.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_PUBKEY_H -#define CRYPTOPP_PUBKEY_H - -/** \file - - This file contains helper classes/functions for implementing public key algorithms. - - The class hierachies in this .h file tend to look like this: -

-                  x1
-                 / \
-                y1  z1
-                 |  |
-            x2  x2
-                 |  |
-                y2  z2
-                 |  |
-            x3  x3
-                 |  |
-                y3  z3
-
- - x1, y1, z1 are abstract interface classes defined in cryptlib.h - - x2, y2, z2 are implementations of the interfaces using "abstract policies", which - are pure virtual functions that should return interfaces to interchangeable algorithms. - These classes have "Base" suffixes. - - x3, y3, z3 hold actual algorithms and implement those virtual functions. - These classes have "Impl" suffixes. - - The "TF_" prefix means an implementation using trapdoor functions on integers. - The "DL_" prefix means an implementation using group operations (in groups where discrete log is hard). -*/ - -#include "modarith.h" -#include "filters.h" -#include "eprecomp.h" -#include "fips140.h" -#include "argnames.h" -#include - -// VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file -#undef INTERFACE - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunctionBounds -{ -public: - virtual ~TrapdoorFunctionBounds() {} - - virtual Integer PreimageBound() const =0; - virtual Integer ImageBound() const =0; - virtual Integer MaxPreimage() const {return --PreimageBound();} - virtual Integer MaxImage() const {return --ImageBound();} -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomizedTrapdoorFunction : public TrapdoorFunctionBounds -{ -public: - virtual Integer ApplyRandomizedFunction(RandomNumberGenerator &rng, const Integer &x) const =0; - virtual bool IsRandomized() const {return true;} -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunction : public RandomizedTrapdoorFunction -{ -public: - Integer ApplyRandomizedFunction(RandomNumberGenerator &rng, const Integer &x) const - {return ApplyFunction(x);} - bool IsRandomized() const {return false;} - - virtual Integer ApplyFunction(const Integer &x) const =0; -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomizedTrapdoorFunctionInverse -{ -public: - virtual ~RandomizedTrapdoorFunctionInverse() {} - - virtual Integer CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const =0; - virtual bool IsRandomized() const {return true;} -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunctionInverse : public RandomizedTrapdoorFunctionInverse -{ -public: - virtual ~TrapdoorFunctionInverse() {} - - Integer CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const - {return CalculateInverse(rng, x);} - bool IsRandomized() const {return false;} - - virtual Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const =0; -}; - -// ******************************************************** - -//! message encoding method for public key encryption -class CRYPTOPP_NO_VTABLE PK_EncryptionMessageEncodingMethod -{ -public: - virtual ~PK_EncryptionMessageEncodingMethod() {} - - virtual bool ParameterSupported(const char *name) const {return false;} - - //! max size of unpadded message in bytes, given max size of padded message in bits (1 less than size of modulus) - virtual size_t MaxUnpaddedLength(size_t paddedLength) const =0; - - virtual void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedBitLength, const NameValuePairs ¶meters) const =0; - - virtual DecodingResult Unpad(const byte *padded, size_t paddedBitLength, byte *raw, const NameValuePairs ¶meters) const =0; -}; - -// ******************************************************** - -//! _ -template -class CRYPTOPP_NO_VTABLE TF_Base -{ -protected: - virtual const TrapdoorFunctionBounds & GetTrapdoorFunctionBounds() const =0; - - typedef TFI TrapdoorFunctionInterface; - virtual const TrapdoorFunctionInterface & GetTrapdoorFunctionInterface() const =0; - - typedef MEI MessageEncodingInterface; - virtual const MessageEncodingInterface & GetMessageEncodingInterface() const =0; -}; - -// ******************************************************** - -//! _ -template -class CRYPTOPP_NO_VTABLE PK_FixedLengthCryptoSystemImpl : public BASE -{ -public: - size_t MaxPlaintextLength(size_t ciphertextLength) const - {return ciphertextLength == FixedCiphertextLength() ? FixedMaxPlaintextLength() : 0;} - size_t CiphertextLength(size_t plaintextLength) const - {return plaintextLength <= FixedMaxPlaintextLength() ? FixedCiphertextLength() : 0;} - - virtual size_t FixedMaxPlaintextLength() const =0; - virtual size_t FixedCiphertextLength() const =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE TF_CryptoSystemBase : public PK_FixedLengthCryptoSystemImpl, protected BASE -{ -public: - bool ParameterSupported(const char *name) const {return this->GetMessageEncodingInterface().ParameterSupported(name);} - size_t FixedMaxPlaintextLength() const {return this->GetMessageEncodingInterface().MaxUnpaddedLength(PaddedBlockBitLength());} - size_t FixedCiphertextLength() const {return this->GetTrapdoorFunctionBounds().MaxImage().ByteCount();} - -protected: - size_t PaddedBlockByteLength() const {return BitsToBytes(PaddedBlockBitLength());} - size_t PaddedBlockBitLength() const {return this->GetTrapdoorFunctionBounds().PreimageBound().BitCount()-1;} -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_DecryptorBase : public TF_CryptoSystemBase > -{ -public: - DecodingResult Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const; -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_EncryptorBase : public TF_CryptoSystemBase > -{ -public: - void Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs ¶meters = g_nullNameValuePairs) const; -}; - -// ******************************************************** - -typedef std::pair HashIdentifier; - -//! interface for message encoding method for public key signature schemes -class CRYPTOPP_NO_VTABLE PK_SignatureMessageEncodingMethod -{ -public: - virtual ~PK_SignatureMessageEncodingMethod() {} - - virtual size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const - {return 0;} - virtual size_t MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const - {return 0;} - - bool IsProbabilistic() const - {return true;} - bool AllowNonrecoverablePart() const - {throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");} - virtual bool RecoverablePartFirst() const - {throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");} - - // for verification, DL - virtual void ProcessSemisignature(HashTransformation &hash, const byte *semisignature, size_t semisignatureLength) const {} - - // for signature - virtual void ProcessRecoverableMessage(HashTransformation &hash, - const byte *recoverableMessage, size_t recoverableMessageLength, - const byte *presignature, size_t presignatureLength, - SecByteBlock &semisignature) const - { - if (RecoverablePartFirst()) - assert(!"ProcessRecoverableMessage() not implemented"); - } - - virtual void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const =0; - - virtual bool VerifyMessageRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const =0; - - virtual DecodingResult RecoverMessageFromRepresentative( // for TF - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength, - byte *recoveredMessage) const - {throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");} - - virtual DecodingResult RecoverMessageFromSemisignature( // for DL - HashTransformation &hash, HashIdentifier hashIdentifier, - const byte *presignature, size_t presignatureLength, - const byte *semisignature, size_t semisignatureLength, - byte *recoveredMessage) const - {throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");} - - // VC60 workaround - struct HashIdentifierLookup - { - template struct HashIdentifierLookup2 - { - static HashIdentifier CRYPTOPP_API Lookup() - { - return HashIdentifier((const byte *)NULL, 0); - } - }; - }; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_DeterministicSignatureMessageEncodingMethod : public PK_SignatureMessageEncodingMethod -{ -public: - bool VerifyMessageRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_RecoverableSignatureMessageEncodingMethod : public PK_SignatureMessageEncodingMethod -{ -public: - bool VerifyMessageRepresentative( - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; -}; - -class CRYPTOPP_DLL DL_SignatureMessageEncodingMethod_DSA : public PK_DeterministicSignatureMessageEncodingMethod -{ -public: - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; -}; - -class CRYPTOPP_DLL DL_SignatureMessageEncodingMethod_NR : public PK_DeterministicSignatureMessageEncodingMethod -{ -public: - void ComputeMessageRepresentative(RandomNumberGenerator &rng, - const byte *recoverableMessage, size_t recoverableMessageLength, - HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty, - byte *representative, size_t representativeBitLength) const; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_MessageAccumulatorBase : public PK_MessageAccumulator -{ -public: - PK_MessageAccumulatorBase() : m_empty(true) {} - - virtual HashTransformation & AccessHash() =0; - - void Update(const byte *input, size_t length) - { - AccessHash().Update(input, length); - m_empty = m_empty && length == 0; - } - - SecByteBlock m_recoverableMessage, m_representative, m_presignature, m_semisignature; - Integer m_k, m_s; - bool m_empty; -}; - -template -class PK_MessageAccumulatorImpl : public PK_MessageAccumulatorBase, protected ObjectHolder -{ -public: - HashTransformation & AccessHash() {return this->m_object;} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE TF_SignatureSchemeBase : public INTERFACE, protected BASE -{ -public: - size_t SignatureLength() const - {return this->GetTrapdoorFunctionBounds().MaxPreimage().ByteCount();} - size_t MaxRecoverableLength() const - {return this->GetMessageEncodingInterface().MaxRecoverableLength(MessageRepresentativeBitLength(), GetHashIdentifier().second, GetDigestSize());} - size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const - {return this->MaxRecoverableLength();} - - bool IsProbabilistic() const - {return this->GetTrapdoorFunctionInterface().IsRandomized() || this->GetMessageEncodingInterface().IsProbabilistic();} - bool AllowNonrecoverablePart() const - {return this->GetMessageEncodingInterface().AllowNonrecoverablePart();} - bool RecoverablePartFirst() const - {return this->GetMessageEncodingInterface().RecoverablePartFirst();} - -protected: - size_t MessageRepresentativeLength() const {return BitsToBytes(MessageRepresentativeBitLength());} - size_t MessageRepresentativeBitLength() const {return this->GetTrapdoorFunctionBounds().ImageBound().BitCount()-1;} - virtual HashIdentifier GetHashIdentifier() const =0; - virtual size_t GetDigestSize() const =0; -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_SignerBase : public TF_SignatureSchemeBase > -{ -public: - void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const; - size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart=true) const; -}; - -//! _ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_VerifierBase : public TF_SignatureSchemeBase > -{ -public: - void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const; - bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const; - DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &recoveryAccumulator) const; -}; - -// ******************************************************** - -//! _ -template -struct TF_CryptoSchemeOptions -{ - typedef T1 AlgorithmInfo; - typedef T2 Keys; - typedef typename Keys::PrivateKey PrivateKey; - typedef typename Keys::PublicKey PublicKey; - typedef T3 MessageEncodingMethod; -}; - -//! _ -template -struct TF_SignatureSchemeOptions : public TF_CryptoSchemeOptions -{ - typedef T4 HashFunction; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE TF_ObjectImplBase : public AlgorithmImpl -{ -public: - typedef SCHEME_OPTIONS SchemeOptions; - typedef KEY_CLASS KeyClass; - - PublicKey & AccessPublicKey() {return AccessKey();} - const PublicKey & GetPublicKey() const {return GetKey();} - - PrivateKey & AccessPrivateKey() {return AccessKey();} - const PrivateKey & GetPrivateKey() const {return GetKey();} - - virtual const KeyClass & GetKey() const =0; - virtual KeyClass & AccessKey() =0; - - const KeyClass & GetTrapdoorFunction() const {return GetKey();} - - PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const - { - return new PK_MessageAccumulatorImpl; - } - PK_MessageAccumulator * NewVerificationAccumulator() const - { - return new PK_MessageAccumulatorImpl; - } - -protected: - const typename BASE::MessageEncodingInterface & GetMessageEncodingInterface() const - {return Singleton().Ref();} - const TrapdoorFunctionBounds & GetTrapdoorFunctionBounds() const - {return GetKey();} - const typename BASE::TrapdoorFunctionInterface & GetTrapdoorFunctionInterface() const - {return GetKey();} - - // for signature scheme - HashIdentifier GetHashIdentifier() const - { - typedef CPP_TYPENAME SchemeOptions::MessageEncodingMethod::HashIdentifierLookup::template HashIdentifierLookup2 L; - return L::Lookup(); - } - size_t GetDigestSize() const - { - typedef CPP_TYPENAME SchemeOptions::HashFunction H; - return H::DIGESTSIZE; - } -}; - -//! _ -template -class TF_ObjectImplExtRef : public TF_ObjectImplBase -{ -public: - TF_ObjectImplExtRef(const KEY *pKey = NULL) : m_pKey(pKey) {} - void SetKeyPtr(const KEY *pKey) {m_pKey = pKey;} - - const KEY & GetKey() const {return *m_pKey;} - KEY & AccessKey() {throw NotImplemented("TF_ObjectImplExtRef: cannot modify refererenced key");} - -private: - const KEY * m_pKey; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE TF_ObjectImpl : public TF_ObjectImplBase -{ -public: - typedef KEY_CLASS KeyClass; - - const KeyClass & GetKey() const {return m_trapdoorFunction;} - KeyClass & AccessKey() {return m_trapdoorFunction;} - -private: - KeyClass m_trapdoorFunction; -}; - -//! _ -template -class TF_DecryptorImpl : public TF_ObjectImpl -{ -}; - -//! _ -template -class TF_EncryptorImpl : public TF_ObjectImpl -{ -}; - -//! _ -template -class TF_SignerImpl : public TF_ObjectImpl -{ -}; - -//! _ -template -class TF_VerifierImpl : public TF_ObjectImpl -{ -}; - -// ******************************************************** - -//! _ -class CRYPTOPP_NO_VTABLE MaskGeneratingFunction -{ -public: - virtual ~MaskGeneratingFunction() {} - virtual void GenerateAndMask(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, bool mask = true) const =0; -}; - -CRYPTOPP_DLL void CRYPTOPP_API P1363_MGF1KDF2_Common(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength, bool mask, unsigned int counterStart); - -//! _ -class P1363_MGF1 : public MaskGeneratingFunction -{ -public: - static const char * CRYPTOPP_API StaticAlgorithmName() {return "MGF1";} - void GenerateAndMask(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, bool mask = true) const - { - P1363_MGF1KDF2_Common(hash, output, outputLength, input, inputLength, NULL, 0, mask, 0); - } -}; - -// ******************************************************** - -//! _ -template -class P1363_KDF2 -{ -public: - static void CRYPTOPP_API DeriveKey(byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength) - { - H h; - P1363_MGF1KDF2_Common(h, output, outputLength, input, inputLength, derivationParams, derivationParamsLength, false, 1); - } -}; - -// ******************************************************** - -//! to be thrown by DecodeElement and AgreeWithStaticPrivateKey -class DL_BadElement : public InvalidDataFormat -{ -public: - DL_BadElement() : InvalidDataFormat("CryptoPP: invalid group element") {} -}; - -//! interface for DL group parameters -template -class CRYPTOPP_NO_VTABLE DL_GroupParameters : public CryptoParameters -{ - typedef DL_GroupParameters ThisClass; - -public: - typedef T Element; - - DL_GroupParameters() : m_validationLevel(0) {} - - // CryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const - { - if (!GetBasePrecomputation().IsInitialized()) - return false; - - if (m_validationLevel > level) - return true; - - bool pass = ValidateGroup(rng, level); - pass = pass && ValidateElement(level, GetSubgroupGenerator(), &GetBasePrecomputation()); - - m_validationLevel = pass ? level+1 : 0; - - return pass; - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper(this, name, valueType, pValue) - CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupOrder) - CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupGenerator) - ; - } - - bool SupportsPrecomputation() const {return true;} - - void Precompute(unsigned int precomputationStorage=16) - { - AccessBasePrecomputation().Precompute(GetGroupPrecomputation(), GetSubgroupOrder().BitCount(), precomputationStorage); - } - - void LoadPrecomputation(BufferedTransformation &storedPrecomputation) - { - AccessBasePrecomputation().Load(GetGroupPrecomputation(), storedPrecomputation); - m_validationLevel = 0; - } - - void SavePrecomputation(BufferedTransformation &storedPrecomputation) const - { - GetBasePrecomputation().Save(GetGroupPrecomputation(), storedPrecomputation); - } - - // non-inherited - virtual const Element & GetSubgroupGenerator() const {return GetBasePrecomputation().GetBase(GetGroupPrecomputation());} - virtual void SetSubgroupGenerator(const Element &base) {AccessBasePrecomputation().SetBase(GetGroupPrecomputation(), base);} - virtual Element ExponentiateBase(const Integer &exponent) const - { - return GetBasePrecomputation().Exponentiate(GetGroupPrecomputation(), exponent); - } - virtual Element ExponentiateElement(const Element &base, const Integer &exponent) const - { - Element result; - SimultaneousExponentiate(&result, base, &exponent, 1); - return result; - } - - virtual const DL_GroupPrecomputation & GetGroupPrecomputation() const =0; - virtual const DL_FixedBasePrecomputation & GetBasePrecomputation() const =0; - virtual DL_FixedBasePrecomputation & AccessBasePrecomputation() =0; - virtual const Integer & GetSubgroupOrder() const =0; // order of subgroup generated by base element - virtual Integer GetMaxExponent() const =0; - virtual Integer GetGroupOrder() const {return GetSubgroupOrder()*GetCofactor();} // one of these two needs to be overriden - virtual Integer GetCofactor() const {return GetGroupOrder()/GetSubgroupOrder();} - virtual unsigned int GetEncodedElementSize(bool reversible) const =0; - virtual void EncodeElement(bool reversible, const Element &element, byte *encoded) const =0; - virtual Element DecodeElement(const byte *encoded, bool checkForGroupMembership) const =0; - virtual Integer ConvertElementToInteger(const Element &element) const =0; - virtual bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const =0; - virtual bool ValidateElement(unsigned int level, const Element &element, const DL_FixedBasePrecomputation *precomp) const =0; - virtual bool FastSubgroupCheckAvailable() const =0; - virtual bool IsIdentity(const Element &element) const =0; - virtual void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const =0; - -protected: - void ParametersChanged() {m_validationLevel = 0;} - -private: - mutable unsigned int m_validationLevel; -}; - -//! _ -template , class BASE = DL_GroupParameters > -class DL_GroupParametersImpl : public BASE -{ -public: - typedef GROUP_PRECOMP GroupPrecomputation; - typedef typename GROUP_PRECOMP::Element Element; - typedef BASE_PRECOMP BasePrecomputation; - - const DL_GroupPrecomputation & GetGroupPrecomputation() const {return m_groupPrecomputation;} - const DL_FixedBasePrecomputation & GetBasePrecomputation() const {return m_gpc;} - DL_FixedBasePrecomputation & AccessBasePrecomputation() {return m_gpc;} - -protected: - GROUP_PRECOMP m_groupPrecomputation; - BASE_PRECOMP m_gpc; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_Key -{ -public: - virtual const DL_GroupParameters & GetAbstractGroupParameters() const =0; - virtual DL_GroupParameters & AccessAbstractGroupParameters() =0; -}; - -//! interface for DL public keys -template -class CRYPTOPP_NO_VTABLE DL_PublicKey : public DL_Key -{ - typedef DL_PublicKey ThisClass; - -public: - typedef T Element; - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters()) - CRYPTOPP_GET_FUNCTION_ENTRY(PublicElement); - } - - void AssignFrom(const NameValuePairs &source); - - // non-inherited - virtual const Element & GetPublicElement() const {return GetPublicPrecomputation().GetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation());} - virtual void SetPublicElement(const Element &y) {AccessPublicPrecomputation().SetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation(), y);} - virtual Element ExponentiatePublicElement(const Integer &exponent) const - { - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - return GetPublicPrecomputation().Exponentiate(params.GetGroupPrecomputation(), exponent); - } - virtual Element CascadeExponentiateBaseAndPublicElement(const Integer &baseExp, const Integer &publicExp) const - { - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - return params.GetBasePrecomputation().CascadeExponentiate(params.GetGroupPrecomputation(), baseExp, GetPublicPrecomputation(), publicExp); - } - - virtual const DL_FixedBasePrecomputation & GetPublicPrecomputation() const =0; - virtual DL_FixedBasePrecomputation & AccessPublicPrecomputation() =0; -}; - -//! interface for DL private keys -template -class CRYPTOPP_NO_VTABLE DL_PrivateKey : public DL_Key -{ - typedef DL_PrivateKey ThisClass; - -public: - typedef T Element; - - void MakePublicKey(DL_PublicKey &pub) const - { - pub.AccessAbstractGroupParameters().AssignFrom(this->GetAbstractGroupParameters()); - pub.SetPublicElement(this->GetAbstractGroupParameters().ExponentiateBase(GetPrivateExponent())); - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters()) - CRYPTOPP_GET_FUNCTION_ENTRY(PrivateExponent); - } - - void AssignFrom(const NameValuePairs &source) - { - this->AccessAbstractGroupParameters().AssignFrom(source); - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(PrivateExponent); - } - - virtual const Integer & GetPrivateExponent() const =0; - virtual void SetPrivateExponent(const Integer &x) =0; -}; - -template -void DL_PublicKey::AssignFrom(const NameValuePairs &source) -{ - DL_PrivateKey *pPrivateKey = NULL; - if (source.GetThisPointer(pPrivateKey)) - pPrivateKey->MakePublicKey(*this); - else - { - this->AccessAbstractGroupParameters().AssignFrom(source); - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(PublicElement); - } -} - -class OID; - -//! _ -template -class DL_KeyImpl : public PK -{ -public: - typedef GP GroupParameters; - - O GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();} -// void BERDecode(BufferedTransformation &bt) -// {PK::BERDecode(bt);} -// void DEREncode(BufferedTransformation &bt) const -// {PK::DEREncode(bt);} - bool BERDecodeAlgorithmParameters(BufferedTransformation &bt) - {AccessGroupParameters().BERDecode(bt); return true;} - bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const - {GetGroupParameters().DEREncode(bt); return true;} - - const GP & GetGroupParameters() const {return m_groupParameters;} - GP & AccessGroupParameters() {return m_groupParameters;} - -private: - GP m_groupParameters; -}; - -class X509PublicKey; -class PKCS8PrivateKey; - -//! _ -template -class DL_PrivateKeyImpl : public DL_PrivateKey, public DL_KeyImpl -{ -public: - typedef typename GP::Element Element; - - // GeneratableCryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const - { - bool pass = GetAbstractGroupParameters().Validate(rng, level); - - const Integer &q = GetAbstractGroupParameters().GetSubgroupOrder(); - const Integer &x = GetPrivateExponent(); - - pass = pass && x.IsPositive() && x < q; - if (level >= 1) - pass = pass && Integer::Gcd(x, q) == Integer::One(); - return pass; - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper >(this, name, valueType, pValue).Assignable(); - } - - void AssignFrom(const NameValuePairs &source) - { - AssignFromHelper >(this, source); - } - - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶ms) - { - if (!params.GetThisObject(this->AccessGroupParameters())) - this->AccessGroupParameters().GenerateRandom(rng, params); -// std::pair seed; - Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent()); -// Integer::ANY, Integer::Zero(), Integer::One(), -// params.GetValue("DeterministicKeyGenerationSeed", seed) ? &seed : NULL); - SetPrivateExponent(x); - } - - bool SupportsPrecomputation() const {return true;} - - void Precompute(unsigned int precomputationStorage=16) - {AccessAbstractGroupParameters().Precompute(precomputationStorage);} - - void LoadPrecomputation(BufferedTransformation &storedPrecomputation) - {AccessAbstractGroupParameters().LoadPrecomputation(storedPrecomputation);} - - void SavePrecomputation(BufferedTransformation &storedPrecomputation) const - {GetAbstractGroupParameters().SavePrecomputation(storedPrecomputation);} - - // DL_Key - const DL_GroupParameters & GetAbstractGroupParameters() const {return this->GetGroupParameters();} - DL_GroupParameters & AccessAbstractGroupParameters() {return this->AccessGroupParameters();} - - // DL_PrivateKey - const Integer & GetPrivateExponent() const {return m_x;} - void SetPrivateExponent(const Integer &x) {m_x = x;} - - // PKCS8PrivateKey - void BERDecodePrivateKey(BufferedTransformation &bt, bool, size_t) - {m_x.BERDecode(bt);} - void DEREncodePrivateKey(BufferedTransformation &bt) const - {m_x.DEREncode(bt);} - -private: - Integer m_x; -}; - -//! _ -template -class DL_PrivateKey_WithSignaturePairwiseConsistencyTest : public BASE -{ -public: - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶ms) - { - BASE::GenerateRandom(rng, params); - - if (FIPS_140_2_ComplianceEnabled()) - { - typename SIGNATURE_SCHEME::Signer signer(*this); - typename SIGNATURE_SCHEME::Verifier verifier(signer); - SignaturePairwiseConsistencyTest_FIPS_140_Only(signer, verifier); - } - } -}; - -//! _ -template -class DL_PublicKeyImpl : public DL_PublicKey, public DL_KeyImpl -{ -public: - typedef typename GP::Element Element; - - // CryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const - { - bool pass = GetAbstractGroupParameters().Validate(rng, level); - pass = pass && GetAbstractGroupParameters().ValidateElement(level, this->GetPublicElement(), &GetPublicPrecomputation()); - return pass; - } - - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const - { - return GetValueHelper >(this, name, valueType, pValue).Assignable(); - } - - void AssignFrom(const NameValuePairs &source) - { - AssignFromHelper >(this, source); - } - - bool SupportsPrecomputation() const {return true;} - - void Precompute(unsigned int precomputationStorage=16) - { - AccessAbstractGroupParameters().Precompute(precomputationStorage); - AccessPublicPrecomputation().Precompute(GetAbstractGroupParameters().GetGroupPrecomputation(), GetAbstractGroupParameters().GetSubgroupOrder().BitCount(), precomputationStorage); - } - - void LoadPrecomputation(BufferedTransformation &storedPrecomputation) - { - AccessAbstractGroupParameters().LoadPrecomputation(storedPrecomputation); - AccessPublicPrecomputation().Load(GetAbstractGroupParameters().GetGroupPrecomputation(), storedPrecomputation); - } - - void SavePrecomputation(BufferedTransformation &storedPrecomputation) const - { - GetAbstractGroupParameters().SavePrecomputation(storedPrecomputation); - GetPublicPrecomputation().Save(GetAbstractGroupParameters().GetGroupPrecomputation(), storedPrecomputation); - } - - // DL_Key - const DL_GroupParameters & GetAbstractGroupParameters() const {return this->GetGroupParameters();} - DL_GroupParameters & AccessAbstractGroupParameters() {return this->AccessGroupParameters();} - - // DL_PublicKey - const DL_FixedBasePrecomputation & GetPublicPrecomputation() const {return m_ypc;} - DL_FixedBasePrecomputation & AccessPublicPrecomputation() {return m_ypc;} - - // non-inherited - bool operator==(const DL_PublicKeyImpl &rhs) const - {return this->GetGroupParameters() == rhs.GetGroupParameters() && this->GetPublicElement() == rhs.GetPublicElement();} - -private: - typename GP::BasePrecomputation m_ypc; -}; - -//! interface for Elgamal-like signature algorithms -template -class CRYPTOPP_NO_VTABLE DL_ElgamalLikeSignatureAlgorithm -{ -public: - virtual void Sign(const DL_GroupParameters ¶ms, const Integer &privateKey, const Integer &k, const Integer &e, Integer &r, Integer &s) const =0; - virtual bool Verify(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &e, const Integer &r, const Integer &s) const =0; - virtual Integer RecoverPresignature(const DL_GroupParameters ¶ms, const DL_PublicKey &publicKey, const Integer &r, const Integer &s) const - {throw NotImplemented("DL_ElgamalLikeSignatureAlgorithm: this signature scheme does not support message recovery");} - virtual size_t RLen(const DL_GroupParameters ¶ms) const - {return params.GetSubgroupOrder().ByteCount();} - virtual size_t SLen(const DL_GroupParameters ¶ms) const - {return params.GetSubgroupOrder().ByteCount();} -}; - -//! interface for DL key agreement algorithms -template -class CRYPTOPP_NO_VTABLE DL_KeyAgreementAlgorithm -{ -public: - typedef T Element; - - virtual Element AgreeWithEphemeralPrivateKey(const DL_GroupParameters ¶ms, const DL_FixedBasePrecomputation &publicPrecomputation, const Integer &privateExponent) const =0; - virtual Element AgreeWithStaticPrivateKey(const DL_GroupParameters ¶ms, const Element &publicElement, bool validateOtherPublicKey, const Integer &privateExponent) const =0; -}; - -//! interface for key derivation algorithms used in DL cryptosystems -template -class CRYPTOPP_NO_VTABLE DL_KeyDerivationAlgorithm -{ -public: - virtual bool ParameterSupported(const char *name) const {return false;} - virtual void Derive(const DL_GroupParameters &groupParams, byte *derivedKey, size_t derivedLength, const T &agreedElement, const T &ephemeralPublicKey, const NameValuePairs &derivationParams) const =0; -}; - -//! interface for symmetric encryption algorithms used in DL cryptosystems -class CRYPTOPP_NO_VTABLE DL_SymmetricEncryptionAlgorithm -{ -public: - virtual bool ParameterSupported(const char *name) const {return false;} - virtual size_t GetSymmetricKeyLength(size_t plaintextLength) const =0; - virtual size_t GetSymmetricCiphertextLength(size_t plaintextLength) const =0; - virtual size_t GetMaxSymmetricPlaintextLength(size_t ciphertextLength) const =0; - virtual void SymmetricEncrypt(RandomNumberGenerator &rng, const byte *key, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs ¶meters) const =0; - virtual DecodingResult SymmetricDecrypt(const byte *key, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs ¶meters) const =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_Base -{ -protected: - typedef KI KeyInterface; - typedef typename KI::Element Element; - - const DL_GroupParameters & GetAbstractGroupParameters() const {return GetKeyInterface().GetAbstractGroupParameters();} - DL_GroupParameters & AccessAbstractGroupParameters() {return AccessKeyInterface().AccessAbstractGroupParameters();} - - virtual KeyInterface & AccessKeyInterface() =0; - virtual const KeyInterface & GetKeyInterface() const =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_SignatureSchemeBase : public INTERFACE, public DL_Base -{ -public: - size_t SignatureLength() const - { - return GetSignatureAlgorithm().RLen(this->GetAbstractGroupParameters()) - + GetSignatureAlgorithm().SLen(this->GetAbstractGroupParameters()); - } - size_t MaxRecoverableLength() const - {return GetMessageEncodingInterface().MaxRecoverableLength(0, GetHashIdentifier().second, GetDigestSize());} - size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const - {assert(false); return 0;} // TODO - - bool IsProbabilistic() const - {return true;} - bool AllowNonrecoverablePart() const - {return GetMessageEncodingInterface().AllowNonrecoverablePart();} - bool RecoverablePartFirst() const - {return GetMessageEncodingInterface().RecoverablePartFirst();} - -protected: - size_t MessageRepresentativeLength() const {return BitsToBytes(MessageRepresentativeBitLength());} - size_t MessageRepresentativeBitLength() const {return this->GetAbstractGroupParameters().GetSubgroupOrder().BitCount();} - - virtual const DL_ElgamalLikeSignatureAlgorithm & GetSignatureAlgorithm() const =0; - virtual const PK_SignatureMessageEncodingMethod & GetMessageEncodingInterface() const =0; - virtual HashIdentifier GetHashIdentifier() const =0; - virtual size_t GetDigestSize() const =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_SignerBase : public DL_SignatureSchemeBase > -{ -public: - // for validation testing - void RawSign(const Integer &k, const Integer &e, Integer &r, Integer &s) const - { - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PrivateKey &key = this->GetKeyInterface(); - - r = params.ConvertElementToInteger(params.ExponentiateBase(k)); - alg.Sign(params, key.GetPrivateExponent(), k, e, r, s); - } - - void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const - { - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - ma.m_recoverableMessage.Assign(recoverableMessage, recoverableMessageLength); - this->GetMessageEncodingInterface().ProcessRecoverableMessage(ma.AccessHash(), - recoverableMessage, recoverableMessageLength, - ma.m_presignature, ma.m_presignature.size(), - ma.m_semisignature); - } - - size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart) const - { - this->GetMaterial().DoQuickSanityCheck(); - - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PrivateKey &key = this->GetKeyInterface(); - - SecByteBlock representative(this->MessageRepresentativeLength()); - this->GetMessageEncodingInterface().ComputeMessageRepresentative( - rng, - ma.m_recoverableMessage, ma.m_recoverableMessage.size(), - ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty, - representative, this->MessageRepresentativeBitLength()); - ma.m_empty = true; - Integer e(representative, representative.size()); - - // hash message digest into random number k to prevent reusing the same k on a different messages - // after virtual machine rollback - if (rng.CanIncorporateEntropy()) - rng.IncorporateEntropy(representative, representative.size()); - Integer k(rng, 1, params.GetSubgroupOrder()-1); - Integer r, s; - r = params.ConvertElementToInteger(params.ExponentiateBase(k)); - alg.Sign(params, key.GetPrivateExponent(), k, e, r, s); - - /* - Integer r, s; - if (this->MaxRecoverableLength() > 0) - r.Decode(ma.m_semisignature, ma.m_semisignature.size()); - else - r.Decode(ma.m_presignature, ma.m_presignature.size()); - alg.Sign(params, key.GetPrivateExponent(), ma.m_k, e, r, s); - */ - - size_t rLen = alg.RLen(params); - r.Encode(signature, rLen); - s.Encode(signature+rLen, alg.SLen(params)); - - if (restart) - RestartMessageAccumulator(rng, ma); - - return this->SignatureLength(); - } - -protected: - void RestartMessageAccumulator(RandomNumberGenerator &rng, PK_MessageAccumulatorBase &ma) const - { - // k needs to be generated before hashing for signature schemes with recovery - // but to defend against VM rollbacks we need to generate k after hashing. - // so this code is commented out, since no DL-based signature scheme with recovery - // has been implemented in Crypto++ anyway - /* - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - ma.m_k.Randomize(rng, 1, params.GetSubgroupOrder()-1); - ma.m_presignature.New(params.GetEncodedElementSize(false)); - params.ConvertElementToInteger(params.ExponentiateBase(ma.m_k)).Encode(ma.m_presignature, ma.m_presignature.size()); - */ - } -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_VerifierBase : public DL_SignatureSchemeBase > -{ -public: - void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const - { - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - - size_t rLen = alg.RLen(params); - ma.m_semisignature.Assign(signature, rLen); - ma.m_s.Decode(signature+rLen, alg.SLen(params)); - - this->GetMessageEncodingInterface().ProcessSemisignature(ma.AccessHash(), ma.m_semisignature, ma.m_semisignature.size()); - } - - bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const - { - this->GetMaterial().DoQuickSanityCheck(); - - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PublicKey &key = this->GetKeyInterface(); - - SecByteBlock representative(this->MessageRepresentativeLength()); - this->GetMessageEncodingInterface().ComputeMessageRepresentative(NullRNG(), ma.m_recoverableMessage, ma.m_recoverableMessage.size(), - ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty, - representative, this->MessageRepresentativeBitLength()); - ma.m_empty = true; - Integer e(representative, representative.size()); - - Integer r(ma.m_semisignature, ma.m_semisignature.size()); - return alg.Verify(params, key, e, r, ma.m_s); - } - - DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const - { - this->GetMaterial().DoQuickSanityCheck(); - - PK_MessageAccumulatorBase &ma = static_cast(messageAccumulator); - const DL_ElgamalLikeSignatureAlgorithm &alg = this->GetSignatureAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PublicKey &key = this->GetKeyInterface(); - - SecByteBlock representative(this->MessageRepresentativeLength()); - this->GetMessageEncodingInterface().ComputeMessageRepresentative( - NullRNG(), - ma.m_recoverableMessage, ma.m_recoverableMessage.size(), - ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty, - representative, this->MessageRepresentativeBitLength()); - ma.m_empty = true; - Integer e(representative, representative.size()); - - ma.m_presignature.New(params.GetEncodedElementSize(false)); - Integer r(ma.m_semisignature, ma.m_semisignature.size()); - alg.RecoverPresignature(params, key, r, ma.m_s).Encode(ma.m_presignature, ma.m_presignature.size()); - - return this->GetMessageEncodingInterface().RecoverMessageFromSemisignature( - ma.AccessHash(), this->GetHashIdentifier(), - ma.m_presignature, ma.m_presignature.size(), - ma.m_semisignature, ma.m_semisignature.size(), - recoveredMessage); - } -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_CryptoSystemBase : public PK, public DL_Base -{ -public: - typedef typename DL_Base::Element Element; - - size_t MaxPlaintextLength(size_t ciphertextLength) const - { - unsigned int minLen = this->GetAbstractGroupParameters().GetEncodedElementSize(true); - return ciphertextLength < minLen ? 0 : GetSymmetricEncryptionAlgorithm().GetMaxSymmetricPlaintextLength(ciphertextLength - minLen); - } - - size_t CiphertextLength(size_t plaintextLength) const - { - size_t len = GetSymmetricEncryptionAlgorithm().GetSymmetricCiphertextLength(plaintextLength); - return len == 0 ? 0 : this->GetAbstractGroupParameters().GetEncodedElementSize(true) + len; - } - - bool ParameterSupported(const char *name) const - {return GetKeyDerivationAlgorithm().ParameterSupported(name) || GetSymmetricEncryptionAlgorithm().ParameterSupported(name);} - -protected: - virtual const DL_KeyAgreementAlgorithm & GetKeyAgreementAlgorithm() const =0; - virtual const DL_KeyDerivationAlgorithm & GetKeyDerivationAlgorithm() const =0; - virtual const DL_SymmetricEncryptionAlgorithm & GetSymmetricEncryptionAlgorithm() const =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_DecryptorBase : public DL_CryptoSystemBase > -{ -public: - typedef T Element; - - DecodingResult Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const - { - try - { - const DL_KeyAgreementAlgorithm &agreeAlg = this->GetKeyAgreementAlgorithm(); - const DL_KeyDerivationAlgorithm &derivAlg = this->GetKeyDerivationAlgorithm(); - const DL_SymmetricEncryptionAlgorithm &encAlg = this->GetSymmetricEncryptionAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PrivateKey &key = this->GetKeyInterface(); - - Element q = params.DecodeElement(ciphertext, true); - size_t elementSize = params.GetEncodedElementSize(true); - ciphertext += elementSize; - ciphertextLength -= elementSize; - - Element z = agreeAlg.AgreeWithStaticPrivateKey(params, q, true, key.GetPrivateExponent()); - - SecByteBlock derivedKey(encAlg.GetSymmetricKeyLength(encAlg.GetMaxSymmetricPlaintextLength(ciphertextLength))); - derivAlg.Derive(params, derivedKey, derivedKey.size(), z, q, parameters); - - return encAlg.SymmetricDecrypt(derivedKey, ciphertext, ciphertextLength, plaintext, parameters); - } - catch (DL_BadElement &) - { - return DecodingResult(); - } - } -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_EncryptorBase : public DL_CryptoSystemBase > -{ -public: - typedef T Element; - - void Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs ¶meters = g_nullNameValuePairs) const - { - const DL_KeyAgreementAlgorithm &agreeAlg = this->GetKeyAgreementAlgorithm(); - const DL_KeyDerivationAlgorithm &derivAlg = this->GetKeyDerivationAlgorithm(); - const DL_SymmetricEncryptionAlgorithm &encAlg = this->GetSymmetricEncryptionAlgorithm(); - const DL_GroupParameters ¶ms = this->GetAbstractGroupParameters(); - const DL_PublicKey &key = this->GetKeyInterface(); - - Integer x(rng, Integer::One(), params.GetMaxExponent()); - Element q = params.ExponentiateBase(x); - params.EncodeElement(true, q, ciphertext); - unsigned int elementSize = params.GetEncodedElementSize(true); - ciphertext += elementSize; - - Element z = agreeAlg.AgreeWithEphemeralPrivateKey(params, key.GetPublicPrecomputation(), x); - - SecByteBlock derivedKey(encAlg.GetSymmetricKeyLength(plaintextLength)); - derivAlg.Derive(params, derivedKey, derivedKey.size(), z, q, parameters); - - encAlg.SymmetricEncrypt(rng, derivedKey, plaintext, plaintextLength, ciphertext, parameters); - } -}; - -//! _ -template -struct DL_SchemeOptionsBase -{ - typedef T1 AlgorithmInfo; - typedef T2 GroupParameters; - typedef typename GroupParameters::Element Element; -}; - -//! _ -template -struct DL_KeyedSchemeOptions : public DL_SchemeOptionsBase -{ - typedef T2 Keys; - typedef typename Keys::PrivateKey PrivateKey; - typedef typename Keys::PublicKey PublicKey; -}; - -//! _ -template -struct DL_SignatureSchemeOptions : public DL_KeyedSchemeOptions -{ - typedef T3 SignatureAlgorithm; - typedef T4 MessageEncodingMethod; - typedef T5 HashFunction; -}; - -//! _ -template -struct DL_CryptoSchemeOptions : public DL_KeyedSchemeOptions -{ - typedef T3 KeyAgreementAlgorithm; - typedef T4 KeyDerivationAlgorithm; - typedef T5 SymmetricEncryptionAlgorithm; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_ObjectImplBase : public AlgorithmImpl -{ -public: - typedef SCHEME_OPTIONS SchemeOptions; - typedef typename KEY::Element Element; - - PrivateKey & AccessPrivateKey() {return m_key;} - PublicKey & AccessPublicKey() {return m_key;} - - // KeyAccessor - const KEY & GetKey() const {return m_key;} - KEY & AccessKey() {return m_key;} - -protected: - typename BASE::KeyInterface & AccessKeyInterface() {return m_key;} - const typename BASE::KeyInterface & GetKeyInterface() const {return m_key;} - - // for signature scheme - HashIdentifier GetHashIdentifier() const - { - typedef typename SchemeOptions::MessageEncodingMethod::HashIdentifierLookup HashLookup; - return HashLookup::template HashIdentifierLookup2::Lookup(); - } - size_t GetDigestSize() const - { - typedef CPP_TYPENAME SchemeOptions::HashFunction H; - return H::DIGESTSIZE; - } - -private: - KEY m_key; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_ObjectImpl : public DL_ObjectImplBase -{ -public: - typedef typename KEY::Element Element; - -protected: - const DL_ElgamalLikeSignatureAlgorithm & GetSignatureAlgorithm() const - {return Singleton().Ref();} - const DL_KeyAgreementAlgorithm & GetKeyAgreementAlgorithm() const - {return Singleton().Ref();} - const DL_KeyDerivationAlgorithm & GetKeyDerivationAlgorithm() const - {return Singleton().Ref();} - const DL_SymmetricEncryptionAlgorithm & GetSymmetricEncryptionAlgorithm() const - {return Singleton().Ref();} - HashIdentifier GetHashIdentifier() const - {return HashIdentifier();} - const PK_SignatureMessageEncodingMethod & GetMessageEncodingInterface() const - {return Singleton().Ref();} -}; - -//! _ -template -class DL_SignerImpl : public DL_ObjectImpl, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey> -{ -public: - PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const - { - std::auto_ptr p(new PK_MessageAccumulatorImpl); - this->RestartMessageAccumulator(rng, *p); - return p.release(); - } -}; - -//! _ -template -class DL_VerifierImpl : public DL_ObjectImpl, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey> -{ -public: - PK_MessageAccumulator * NewVerificationAccumulator() const - { - return new PK_MessageAccumulatorImpl; - } -}; - -//! _ -template -class DL_EncryptorImpl : public DL_ObjectImpl, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey> -{ -}; - -//! _ -template -class DL_DecryptorImpl : public DL_ObjectImpl, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey> -{ -}; - -// ******************************************************** - -//! _ -template -class CRYPTOPP_NO_VTABLE DL_SimpleKeyAgreementDomainBase : public SimpleKeyAgreementDomain -{ -public: - typedef T Element; - - CryptoParameters & AccessCryptoParameters() {return AccessAbstractGroupParameters();} - unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);} - unsigned int PrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();} - unsigned int PublicKeyLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(true);} - - void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const - { - Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent()); - x.Encode(privateKey, PrivateKeyLength()); - } - - void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const - { - const DL_GroupParameters ¶ms = GetAbstractGroupParameters(); - Integer x(privateKey, PrivateKeyLength()); - Element y = params.ExponentiateBase(x); - params.EncodeElement(true, y, publicKey); - } - - bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const - { - try - { - const DL_GroupParameters ¶ms = GetAbstractGroupParameters(); - Integer x(privateKey, PrivateKeyLength()); - Element w = params.DecodeElement(otherPublicKey, validateOtherPublicKey); - - Element z = GetKeyAgreementAlgorithm().AgreeWithStaticPrivateKey( - GetAbstractGroupParameters(), w, validateOtherPublicKey, x); - params.EncodeElement(false, z, agreedValue); - } - catch (DL_BadElement &) - { - return false; - } - return true; - } - - const Element &GetGenerator() const {return GetAbstractGroupParameters().GetSubgroupGenerator();} - -protected: - virtual const DL_KeyAgreementAlgorithm & GetKeyAgreementAlgorithm() const =0; - virtual DL_GroupParameters & AccessAbstractGroupParameters() =0; - const DL_GroupParameters & GetAbstractGroupParameters() const {return const_cast *>(this)->AccessAbstractGroupParameters();} -}; - -enum CofactorMultiplicationOption {NO_COFACTOR_MULTIPLICTION, COMPATIBLE_COFACTOR_MULTIPLICTION, INCOMPATIBLE_COFACTOR_MULTIPLICTION}; -typedef EnumToType NoCofactorMultiplication; -typedef EnumToType CompatibleCofactorMultiplication; -typedef EnumToType IncompatibleCofactorMultiplication; - -//! DH key agreement algorithm -template -class DL_KeyAgreementAlgorithm_DH : public DL_KeyAgreementAlgorithm -{ -public: - typedef ELEMENT Element; - - static const char * CRYPTOPP_API StaticAlgorithmName() - {return COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION ? "DHC" : "DH";} - - Element AgreeWithEphemeralPrivateKey(const DL_GroupParameters ¶ms, const DL_FixedBasePrecomputation &publicPrecomputation, const Integer &privateExponent) const - { - return publicPrecomputation.Exponentiate(params.GetGroupPrecomputation(), - COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION ? privateExponent*params.GetCofactor() : privateExponent); - } - - Element AgreeWithStaticPrivateKey(const DL_GroupParameters ¶ms, const Element &publicElement, bool validateOtherPublicKey, const Integer &privateExponent) const - { - if (COFACTOR_OPTION::ToEnum() == COMPATIBLE_COFACTOR_MULTIPLICTION) - { - const Integer &k = params.GetCofactor(); - return params.ExponentiateElement(publicElement, - ModularArithmetic(params.GetSubgroupOrder()).Divide(privateExponent, k)*k); - } - else if (COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION) - return params.ExponentiateElement(publicElement, privateExponent*params.GetCofactor()); - else - { - assert(COFACTOR_OPTION::ToEnum() == NO_COFACTOR_MULTIPLICTION); - - if (!validateOtherPublicKey) - return params.ExponentiateElement(publicElement, privateExponent); - - if (params.FastSubgroupCheckAvailable()) - { - if (!params.ValidateElement(2, publicElement, NULL)) - throw DL_BadElement(); - return params.ExponentiateElement(publicElement, privateExponent); - } - else - { - const Integer e[2] = {params.GetSubgroupOrder(), privateExponent}; - Element r[2]; - params.SimultaneousExponentiate(r, publicElement, e, 2); - if (!params.IsIdentity(r[0])) - throw DL_BadElement(); - return r[1]; - } - } - } -}; - -// ******************************************************** - -//! A template implementing constructors for public key algorithm classes -template -class CRYPTOPP_NO_VTABLE PK_FinalTemplate : public BASE -{ -public: - PK_FinalTemplate() {} - - PK_FinalTemplate(const CryptoMaterial &key) - {this->AccessKey().AssignFrom(key);} - - PK_FinalTemplate(BufferedTransformation &bt) - {this->AccessKey().BERDecode(bt);} - - PK_FinalTemplate(const AsymmetricAlgorithm &algorithm) - {this->AccessKey().AssignFrom(algorithm.GetMaterial());} - - PK_FinalTemplate(const Integer &v1) - {this->AccessKey().Initialize(v1);} - -#if (defined(_MSC_VER) && _MSC_VER < 1300) - - template - PK_FinalTemplate(T1 &v1, T2 &v2) - {this->AccessKey().Initialize(v1, v2);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3) - {this->AccessKey().Initialize(v1, v2, v3);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4) - {this->AccessKey().Initialize(v1, v2, v3, v4);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6, T7 &v7) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);} - - template - PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6, T7 &v7, T8 &v8) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);} - -#else - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2) - {this->AccessKey().Initialize(v1, v2);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3) - {this->AccessKey().Initialize(v1, v2, v3);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4) - {this->AccessKey().Initialize(v1, v2, v3, v4);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);} - - template - PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7, const T8 &v8) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2) - {this->AccessKey().Initialize(v1, v2);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3) - {this->AccessKey().Initialize(v1, v2, v3);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4) - {this->AccessKey().Initialize(v1, v2, v3, v4);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);} - - template - PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7, const T8 &v8) - {this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);} - -#endif -}; - -//! Base class for public key encryption standard classes. These classes are used to select from variants of algorithms. Note that not all standards apply to all algorithms. -struct EncryptionStandard {}; - -//! Base class for public key signature standard classes. These classes are used to select from variants of algorithms. Note that not all standards apply to all algorithms. -struct SignatureStandard {}; - -template -class TF_ES; - -//! Trapdoor Function Based Encryption Scheme -template > -class TF_ES : public KEYS -{ - typedef typename STANDARD::EncryptionMessageEncodingMethod MessageEncodingMethod; - -public: - //! see EncryptionStandard for a list of standards - typedef STANDARD Standard; - typedef TF_CryptoSchemeOptions SchemeOptions; - - static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(KEYS::StaticAlgorithmName()) + "/" + MessageEncodingMethod::StaticAlgorithmName();} - - //! implements PK_Decryptor interface - typedef PK_FinalTemplate > Decryptor; - //! implements PK_Encryptor interface - typedef PK_FinalTemplate > Encryptor; -}; - -template // VC60 workaround: doesn't work if KEYS is first parameter -class TF_SS; - -//! Trapdoor Function Based Signature Scheme -template > // VC60 workaround: doesn't work if KEYS is first parameter -class TF_SS : public KEYS -{ -public: - //! see SignatureStandard for a list of standards - typedef STANDARD Standard; - typedef typename Standard::SignatureMessageEncodingMethod MessageEncodingMethod; - typedef TF_SignatureSchemeOptions SchemeOptions; - - static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(KEYS::StaticAlgorithmName()) + "/" + MessageEncodingMethod::StaticAlgorithmName() + "(" + H::StaticAlgorithmName() + ")";} - - //! implements PK_Signer interface - typedef PK_FinalTemplate > Signer; - //! implements PK_Verifier interface - typedef PK_FinalTemplate > Verifier; -}; - -template -class DL_SS; - -//! Discrete Log Based Signature Scheme -template > -class DL_SS : public KEYS -{ - typedef DL_SignatureSchemeOptions SchemeOptions; - -public: - static std::string StaticAlgorithmName() {return SA::StaticAlgorithmName() + std::string("/EMSA1(") + H::StaticAlgorithmName() + ")";} - - //! implements PK_Signer interface - typedef PK_FinalTemplate > Signer; - //! implements PK_Verifier interface - typedef PK_FinalTemplate > Verifier; -}; - -//! Discrete Log Based Encryption Scheme -template -class DL_ES : public KEYS -{ - typedef DL_CryptoSchemeOptions SchemeOptions; - -public: - //! implements PK_Decryptor interface - typedef PK_FinalTemplate > Decryptor; - //! implements PK_Encryptor interface - typedef PK_FinalTemplate > Encryptor; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/pwdbased.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/pwdbased.h deleted file mode 100644 index f755724b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/pwdbased.h +++ /dev/null @@ -1,214 +0,0 @@ -// pwdbased.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_PWDBASED_H -#define CRYPTOPP_PWDBASED_H - -#include "cryptlib.h" -#include "hmac.h" -#include "hrtimer.h" -#include "integer.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! abstract base class for password based key derivation function -class PasswordBasedKeyDerivationFunction -{ -public: - virtual size_t MaxDerivedKeyLength() const =0; - virtual bool UsesPurposeByte() const =0; - //! derive key from password - /*! If timeInSeconds != 0, will iterate until time elapsed, as measured by ThreadUserTimer - Returns actual iteration count, which is equal to iterations if timeInSeconds == 0, and not less than iterations otherwise. */ - virtual unsigned int DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds=0) const =0; -}; - -//! PBKDF1 from PKCS #5, T should be a HashTransformation class -template -class PKCS5_PBKDF1 : public PasswordBasedKeyDerivationFunction -{ -public: - size_t MaxDerivedKeyLength() const {return T::DIGESTSIZE;} - bool UsesPurposeByte() const {return false;} - // PKCS #5 says PBKDF1 should only take 8-byte salts. This implementation allows salts of any length. - unsigned int DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds=0) const; -}; - -//! PBKDF2 from PKCS #5, T should be a HashTransformation class -template -class PKCS5_PBKDF2_HMAC : public PasswordBasedKeyDerivationFunction -{ -public: - size_t MaxDerivedKeyLength() const {return 0xffffffffU;} // should multiply by T::DIGESTSIZE, but gets overflow that way - bool UsesPurposeByte() const {return false;} - unsigned int DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds=0) const; -}; - -/* -class PBKDF2Params -{ -public: - SecByteBlock m_salt; - unsigned int m_interationCount; - ASNOptional > m_keyLength; -}; -*/ - -template -unsigned int PKCS5_PBKDF1::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const -{ - assert(derivedLen <= MaxDerivedKeyLength()); - assert(iterations > 0 || timeInSeconds > 0); - - if (!iterations) - iterations = 1; - - T hash; - hash.Update(password, passwordLen); - hash.Update(salt, saltLen); - - SecByteBlock buffer(hash.DigestSize()); - hash.Final(buffer); - - unsigned int i; - ThreadUserTimer timer; - - if (timeInSeconds) - timer.StartTimer(); - - for (i=1; i -unsigned int PKCS5_PBKDF2_HMAC::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const -{ - assert(derivedLen <= MaxDerivedKeyLength()); - assert(iterations > 0 || timeInSeconds > 0); - - if (!iterations) - iterations = 1; - - HMAC hmac(password, passwordLen); - SecByteBlock buffer(hmac.DigestSize()); - ThreadUserTimer timer; - - unsigned int i=1; - while (derivedLen > 0) - { - hmac.Update(salt, saltLen); - unsigned int j; - for (j=0; j<4; j++) - { - byte b = byte(i >> ((3-j)*8)); - hmac.Update(&b, 1); - } - hmac.Final(buffer); - - size_t segmentLen = STDMIN(derivedLen, buffer.size()); - memcpy(derived, buffer, segmentLen); - - if (timeInSeconds) - { - timeInSeconds = timeInSeconds / ((derivedLen + buffer.size() - 1) / buffer.size()); - timer.StartTimer(); - } - - for (j=1; j -class PKCS12_PBKDF : public PasswordBasedKeyDerivationFunction -{ -public: - size_t MaxDerivedKeyLength() const {return size_t(0)-1;} - bool UsesPurposeByte() const {return true;} - unsigned int DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const; -}; - -template -unsigned int PKCS12_PBKDF::DeriveKey(byte *derived, size_t derivedLen, byte purpose, const byte *password, size_t passwordLen, const byte *salt, size_t saltLen, unsigned int iterations, double timeInSeconds) const -{ - assert(derivedLen <= MaxDerivedKeyLength()); - assert(iterations > 0 || timeInSeconds > 0); - - if (!iterations) - iterations = 1; - - const size_t v = T::BLOCKSIZE; // v is in bytes rather than bits as in PKCS #12 - const size_t DLen = v, SLen = RoundUpToMultipleOf(saltLen, v); - const size_t PLen = RoundUpToMultipleOf(passwordLen, v), ILen = SLen + PLen; - SecByteBlock buffer(DLen + SLen + PLen); - byte *D = buffer, *S = buffer+DLen, *P = buffer+DLen+SLen, *I = S; - - memset(D, purpose, DLen); - size_t i; - for (i=0; i 0) - { - hash.CalculateDigest(Ai, buffer, buffer.size()); - - if (timeInSeconds) - { - timeInSeconds = timeInSeconds / ((derivedLen + Ai.size() - 1) / Ai.size()); - timer.StartTimer(); - } - - for (i=1; inext; current; current=current->next) - { - m_tail->next = new ByteQueueNode(*current); - m_tail = m_tail->next; - } - - m_tail->next = NULL; - - Put(copy.m_lazyString, copy.m_lazyLength); -} - -ByteQueue::~ByteQueue() -{ - Destroy(); -} - -void ByteQueue::Destroy() -{ - for (ByteQueueNode *next, *current=m_head; current; current=next) - { - next=current->next; - delete current; - } -} - -void ByteQueue::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_nodeSize = parameters.GetIntValueWithDefault("NodeSize", 256); - Clear(); -} - -lword ByteQueue::CurrentSize() const -{ - lword size=0; - - for (ByteQueueNode *current=m_head; current; current=current->next) - size += current->CurrentSize(); - - return size + m_lazyLength; -} - -bool ByteQueue::IsEmpty() const -{ - return m_head==m_tail && m_head->CurrentSize()==0 && m_lazyLength==0; -} - -void ByteQueue::Clear() -{ - for (ByteQueueNode *next, *current=m_head->next; current; current=next) - { - next=current->next; - delete current; - } - - m_tail = m_head; - m_head->Clear(); - m_head->next = NULL; - m_lazyLength = 0; -} - -size_t ByteQueue::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - if (m_lazyLength > 0) - FinalizeLazyPut(); - - size_t len; - while ((len=m_tail->Put(inString, length)) < length) - { - inString += len; - length -= len; - if (m_autoNodeSize && m_nodeSize < s_maxAutoNodeSize) - do - { - m_nodeSize *= 2; - } - while (m_nodeSize < length && m_nodeSize < s_maxAutoNodeSize); - m_tail->next = new ByteQueueNode(STDMAX(m_nodeSize, length)); - m_tail = m_tail->next; - } - - return 0; -} - -void ByteQueue::CleanupUsedNodes() -{ - while (m_head != m_tail && m_head->UsedUp()) - { - ByteQueueNode *temp=m_head; - m_head=m_head->next; - delete temp; - } - - if (m_head->CurrentSize() == 0) - m_head->Clear(); -} - -void ByteQueue::LazyPut(const byte *inString, size_t size) -{ - if (m_lazyLength > 0) - FinalizeLazyPut(); - - if (inString == m_tail->buf+m_tail->m_tail) - Put(inString, size); - else - { - m_lazyString = const_cast(inString); - m_lazyLength = size; - m_lazyStringModifiable = false; - } -} - -void ByteQueue::LazyPutModifiable(byte *inString, size_t size) -{ - if (m_lazyLength > 0) - FinalizeLazyPut(); - m_lazyString = inString; - m_lazyLength = size; - m_lazyStringModifiable = true; -} - -void ByteQueue::UndoLazyPut(size_t size) -{ - if (m_lazyLength < size) - throw InvalidArgument("ByteQueue: size specified for UndoLazyPut is too large"); - - m_lazyLength -= size; -} - -void ByteQueue::FinalizeLazyPut() -{ - size_t len = m_lazyLength; - m_lazyLength = 0; - if (len) - Put(m_lazyString, len); -} - -size_t ByteQueue::Get(byte &outByte) -{ - if (m_head->Get(outByte)) - { - if (m_head->UsedUp()) - CleanupUsedNodes(); - return 1; - } - else if (m_lazyLength > 0) - { - outByte = *m_lazyString++; - m_lazyLength--; - return 1; - } - else - return 0; -} - -size_t ByteQueue::Get(byte *outString, size_t getMax) -{ - ArraySink sink(outString, getMax); - return (size_t)TransferTo(sink, getMax); -} - -size_t ByteQueue::Peek(byte &outByte) const -{ - if (m_head->Peek(outByte)) - return 1; - else if (m_lazyLength > 0) - { - outByte = *m_lazyString; - return 1; - } - else - return 0; -} - -size_t ByteQueue::Peek(byte *outString, size_t peekMax) const -{ - ArraySink sink(outString, peekMax); - return (size_t)CopyTo(sink, peekMax); -} - -size_t ByteQueue::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - if (blocking) - { - lword bytesLeft = transferBytes; - for (ByteQueueNode *current=m_head; bytesLeft && current; current=current->next) - bytesLeft -= current->TransferTo(target, bytesLeft, channel); - CleanupUsedNodes(); - - size_t len = (size_t)STDMIN(bytesLeft, (lword)m_lazyLength); - if (len) - { - if (m_lazyStringModifiable) - target.ChannelPutModifiable(channel, m_lazyString, len); - else - target.ChannelPut(channel, m_lazyString, len); - m_lazyString += len; - m_lazyLength -= len; - bytesLeft -= len; - } - transferBytes -= bytesLeft; - return 0; - } - else - { - Walker walker(*this); - size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking); - Skip(transferBytes); - return blockedBytes; - } -} - -size_t ByteQueue::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - Walker walker(*this); - walker.Skip(begin); - lword transferBytes = end-begin; - size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking); - begin += transferBytes; - return blockedBytes; -} - -void ByteQueue::Unget(byte inByte) -{ - Unget(&inByte, 1); -} - -void ByteQueue::Unget(const byte *inString, size_t length) -{ - size_t len = STDMIN(length, m_head->m_head); - length -= len; - m_head->m_head -= len; - memcpy(m_head->buf + m_head->m_head, inString + length, len); - - if (length > 0) - { - ByteQueueNode *newHead = new ByteQueueNode(length); - newHead->next = m_head; - m_head = newHead; - m_head->Put(inString, length); - } -} - -const byte * ByteQueue::Spy(size_t &contiguousSize) const -{ - contiguousSize = m_head->m_tail - m_head->m_head; - if (contiguousSize == 0 && m_lazyLength > 0) - { - contiguousSize = m_lazyLength; - return m_lazyString; - } - else - return m_head->buf + m_head->m_head; -} - -byte * ByteQueue::CreatePutSpace(size_t &size) -{ - if (m_lazyLength > 0) - FinalizeLazyPut(); - - if (m_tail->m_tail == m_tail->MaxSize()) - { - m_tail->next = new ByteQueueNode(STDMAX(m_nodeSize, size)); - m_tail = m_tail->next; - } - - size = m_tail->MaxSize() - m_tail->m_tail; - return m_tail->buf + m_tail->m_tail; -} - -ByteQueue & ByteQueue::operator=(const ByteQueue &rhs) -{ - Destroy(); - CopyFrom(rhs); - return *this; -} - -bool ByteQueue::operator==(const ByteQueue &rhs) const -{ - const lword currentSize = CurrentSize(); - - if (currentSize != rhs.CurrentSize()) - return false; - - Walker walker1(*this), walker2(rhs); - byte b1, b2; - - while (walker1.Get(b1) && walker2.Get(b2)) - if (b1 != b2) - return false; - - return true; -} - -byte ByteQueue::operator[](lword i) const -{ - for (ByteQueueNode *current=m_head; current; current=current->next) - { - if (i < current->CurrentSize()) - return (*current)[(size_t)i]; - - i -= current->CurrentSize(); - } - - assert(i < m_lazyLength); - return m_lazyString[i]; -} - -void ByteQueue::swap(ByteQueue &rhs) -{ - std::swap(m_autoNodeSize, rhs.m_autoNodeSize); - std::swap(m_nodeSize, rhs.m_nodeSize); - std::swap(m_head, rhs.m_head); - std::swap(m_tail, rhs.m_tail); - std::swap(m_lazyString, rhs.m_lazyString); - std::swap(m_lazyLength, rhs.m_lazyLength); - std::swap(m_lazyStringModifiable, rhs.m_lazyStringModifiable); -} - -// ******************************************************** - -void ByteQueue::Walker::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_node = m_queue.m_head; - m_position = 0; - m_offset = 0; - m_lazyString = m_queue.m_lazyString; - m_lazyLength = m_queue.m_lazyLength; -} - -size_t ByteQueue::Walker::Get(byte &outByte) -{ - ArraySink sink(&outByte, 1); - return (size_t)TransferTo(sink, 1); -} - -size_t ByteQueue::Walker::Get(byte *outString, size_t getMax) -{ - ArraySink sink(outString, getMax); - return (size_t)TransferTo(sink, getMax); -} - -size_t ByteQueue::Walker::Peek(byte &outByte) const -{ - ArraySink sink(&outByte, 1); - return (size_t)CopyTo(sink, 1); -} - -size_t ByteQueue::Walker::Peek(byte *outString, size_t peekMax) const -{ - ArraySink sink(outString, peekMax); - return (size_t)CopyTo(sink, peekMax); -} - -size_t ByteQueue::Walker::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking) -{ - lword bytesLeft = transferBytes; - size_t blockedBytes = 0; - - while (m_node) - { - size_t len = (size_t)STDMIN(bytesLeft, (lword)m_node->CurrentSize()-m_offset); - blockedBytes = target.ChannelPut2(channel, m_node->buf+m_node->m_head+m_offset, len, 0, blocking); - - if (blockedBytes) - goto done; - - m_position += len; - bytesLeft -= len; - - if (!bytesLeft) - { - m_offset += len; - goto done; - } - - m_node = m_node->next; - m_offset = 0; - } - - if (bytesLeft && m_lazyLength) - { - size_t len = (size_t)STDMIN(bytesLeft, (lword)m_lazyLength); - blockedBytes = target.ChannelPut2(channel, m_lazyString, len, 0, blocking); - if (blockedBytes) - goto done; - - m_lazyString += len; - m_lazyLength -= len; - bytesLeft -= len; - } - -done: - transferBytes -= bytesLeft; - return blockedBytes; -} - -size_t ByteQueue::Walker::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const -{ - Walker walker(*this); - walker.Skip(begin); - lword transferBytes = end-begin; - size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking); - begin += transferBytes; - return blockedBytes; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/queue.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/queue.h deleted file mode 100644 index 75f7807f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/queue.h +++ /dev/null @@ -1,143 +0,0 @@ -// specification file for an unlimited queue for storing bytes - -#ifndef CRYPTOPP_QUEUE_H -#define CRYPTOPP_QUEUE_H - -#include "simple.h" -//#include - -NAMESPACE_BEGIN(CryptoPP) - -/** The queue is implemented as a linked list of byte arrays, but you don't need to - know about that. So just ignore this next line. :) */ -class ByteQueueNode; - -//! Byte Queue -class CRYPTOPP_DLL ByteQueue : public Bufferless -{ -public: - ByteQueue(size_t nodeSize=0); - ByteQueue(const ByteQueue ©); - ~ByteQueue(); - - lword MaxRetrievable() const - {return CurrentSize();} - bool AnyRetrievable() const - {return !IsEmpty();} - - void IsolatedInitialize(const NameValuePairs ¶meters); - byte * CreatePutSpace(size_t &size); - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - - size_t Get(byte &outByte); - size_t Get(byte *outString, size_t getMax); - - size_t Peek(byte &outByte) const; - size_t Peek(byte *outString, size_t peekMax) const; - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - - // these member functions are not inherited - void SetNodeSize(size_t nodeSize); - - lword CurrentSize() const; - bool IsEmpty() const; - - void Clear(); - - void Unget(byte inByte); - void Unget(const byte *inString, size_t length); - - const byte * Spy(size_t &contiguousSize) const; - - void LazyPut(const byte *inString, size_t size); - void LazyPutModifiable(byte *inString, size_t size); - void UndoLazyPut(size_t size); - void FinalizeLazyPut(); - - ByteQueue & operator=(const ByteQueue &rhs); - bool operator==(const ByteQueue &rhs) const; - byte operator[](lword i) const; - void swap(ByteQueue &rhs); - - class Walker : public InputRejecting - { - public: - Walker(const ByteQueue &queue) - : m_queue(queue) {Initialize();} - - lword GetCurrentPosition() {return m_position;} - - lword MaxRetrievable() const - {return m_queue.CurrentSize() - m_position;} - - void IsolatedInitialize(const NameValuePairs ¶meters); - - size_t Get(byte &outByte); - size_t Get(byte *outString, size_t getMax); - - size_t Peek(byte &outByte) const; - size_t Peek(byte *outString, size_t peekMax) const; - - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const; - - private: - const ByteQueue &m_queue; - const ByteQueueNode *m_node; - lword m_position; - size_t m_offset; - const byte *m_lazyString; - size_t m_lazyLength; - }; - - friend class Walker; - -private: - void CleanupUsedNodes(); - void CopyFrom(const ByteQueue ©); - void Destroy(); - - bool m_autoNodeSize; - size_t m_nodeSize; - ByteQueueNode *m_head, *m_tail; - byte *m_lazyString; - size_t m_lazyLength; - bool m_lazyStringModifiable; -}; - -//! use this to make sure LazyPut is finalized in event of exception -class CRYPTOPP_DLL LazyPutter -{ -public: - LazyPutter(ByteQueue &bq, const byte *inString, size_t size) - : m_bq(bq) {bq.LazyPut(inString, size);} - ~LazyPutter() - {try {m_bq.FinalizeLazyPut();} catch(...) {}} -protected: - LazyPutter(ByteQueue &bq) : m_bq(bq) {} -private: - ByteQueue &m_bq; -}; - -//! like LazyPutter, but does a LazyPutModifiable instead -class LazyPutterModifiable : public LazyPutter -{ -public: - LazyPutterModifiable(ByteQueue &bq, byte *inString, size_t size) - : LazyPutter(bq) {bq.LazyPutModifiable(inString, size);} -}; - -NAMESPACE_END - -#ifndef __BORLANDC__ -NAMESPACE_BEGIN(std) -template<> inline void swap(CryptoPP::ByteQueue &a, CryptoPP::ByteQueue &b) -{ - a.swap(b); -} -NAMESPACE_END -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.cpp deleted file mode 100644 index d496333b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// rabin.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "rabin.h" -#include "nbtheory.h" -#include "asn.h" -#include "sha.h" -#include "modarith.h" - -NAMESPACE_BEGIN(CryptoPP) - -void RabinFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - m_r.BERDecode(seq); - m_s.BERDecode(seq); - seq.MessageEnd(); -} - -void RabinFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - m_r.DEREncode(seq); - m_s.DEREncode(seq); - seq.MessageEnd(); -} - -Integer RabinFunction::ApplyFunction(const Integer &in) const -{ - DoQuickSanityCheck(); - - Integer out = in.Squared()%m_n; - if (in.IsOdd()) - out = out*m_r%m_n; - if (Jacobi(in, m_n)==-1) - out = out*m_s%m_n; - return out; -} - -bool RabinFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = true; - pass = pass && m_n > Integer::One() && m_n%4 == 1; - pass = pass && m_r > Integer::One() && m_r < m_n; - pass = pass && m_s > Integer::One() && m_s < m_n; - if (level >= 1) - pass = pass && Jacobi(m_r, m_n) == -1 && Jacobi(m_s, m_n) == -1; - return pass; -} - -bool RabinFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_GET_FUNCTION_ENTRY(QuadraticResidueModPrime1) - CRYPTOPP_GET_FUNCTION_ENTRY(QuadraticResidueModPrime2) - ; -} - -void RabinFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_SET_FUNCTION_ENTRY(QuadraticResidueModPrime1) - CRYPTOPP_SET_FUNCTION_ENTRY(QuadraticResidueModPrime2) - ; -} - -// ***************************************************************************** -// private key operations: - -// generate a random private key -void InvertibleRabinFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - int modulusSize = 2048; - alg.GetIntValue("ModulusSize", modulusSize) || alg.GetIntValue("KeySize", modulusSize); - - if (modulusSize < 16) - throw InvalidArgument("InvertibleRabinFunction: specified modulus size is too small"); - - // VC70 workaround: putting these after primeParam causes overlapped stack allocation - bool rFound=false, sFound=false; - Integer t=2; - - AlgorithmParameters primeParam = MakeParametersForTwoPrimesOfEqualSize(modulusSize) - ("EquivalentTo", 3)("Mod", 4); - m_p.GenerateRandom(rng, primeParam); - m_q.GenerateRandom(rng, primeParam); - - while (!(rFound && sFound)) - { - int jp = Jacobi(t, m_p); - int jq = Jacobi(t, m_q); - - if (!rFound && jp==1 && jq==-1) - { - m_r = t; - rFound = true; - } - - if (!sFound && jp==-1 && jq==1) - { - m_s = t; - sFound = true; - } - - ++t; - } - - m_n = m_p * m_q; - m_u = m_q.InverseMod(m_p); -} - -void InvertibleRabinFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - m_r.BERDecode(seq); - m_s.BERDecode(seq); - m_p.BERDecode(seq); - m_q.BERDecode(seq); - m_u.BERDecode(seq); - seq.MessageEnd(); -} - -void InvertibleRabinFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - m_r.DEREncode(seq); - m_s.DEREncode(seq); - m_p.DEREncode(seq); - m_q.DEREncode(seq); - m_u.DEREncode(seq); - seq.MessageEnd(); -} - -Integer InvertibleRabinFunction::CalculateInverse(RandomNumberGenerator &rng, const Integer &in) const -{ - DoQuickSanityCheck(); - - ModularArithmetic modn(m_n); - Integer r(rng, Integer::One(), m_n - Integer::One()); - r = modn.Square(r); - Integer r2 = modn.Square(r); - Integer c = modn.Multiply(in, r2); // blind - - Integer cp=c%m_p, cq=c%m_q; - - int jp = Jacobi(cp, m_p); - int jq = Jacobi(cq, m_q); - - if (jq==-1) - { - cp = cp*EuclideanMultiplicativeInverse(m_r, m_p)%m_p; - cq = cq*EuclideanMultiplicativeInverse(m_r, m_q)%m_q; - } - - if (jp==-1) - { - cp = cp*EuclideanMultiplicativeInverse(m_s, m_p)%m_p; - cq = cq*EuclideanMultiplicativeInverse(m_s, m_q)%m_q; - } - - cp = ModularSquareRoot(cp, m_p); - cq = ModularSquareRoot(cq, m_q); - - if (jp==-1) - cp = m_p-cp; - - Integer out = CRT(cq, m_q, cp, m_p, m_u); - - out = modn.Divide(out, r); // unblind - - if ((jq==-1 && out.IsEven()) || (jq==1 && out.IsOdd())) - out = m_n-out; - - return out; -} - -bool InvertibleRabinFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = RabinFunction::Validate(rng, level); - pass = pass && m_p > Integer::One() && m_p%4 == 3 && m_p < m_n; - pass = pass && m_q > Integer::One() && m_q%4 == 3 && m_q < m_n; - pass = pass && m_u.IsPositive() && m_u < m_p; - if (level >= 1) - { - pass = pass && m_p * m_q == m_n; - pass = pass && m_u * m_q % m_p == 1; - pass = pass && Jacobi(m_r, m_p) == 1; - pass = pass && Jacobi(m_r, m_q) == -1; - pass = pass && Jacobi(m_s, m_p) == -1; - pass = pass && Jacobi(m_s, m_q) == 1; - } - if (level >= 2) - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - return pass; -} - -bool InvertibleRabinFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_GET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_GET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -void InvertibleRabinFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_SET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.h deleted file mode 100644 index 1c9bcbb4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rabin.h +++ /dev/null @@ -1,107 +0,0 @@ -#ifndef CRYPTOPP_RABIN_H -#define CRYPTOPP_RABIN_H - -/** \file -*/ - -#include "oaep.h" -#include "pssr.h" -#include "integer.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class RabinFunction : public TrapdoorFunction, public PublicKey -{ - typedef RabinFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &r, const Integer &s) - {m_n = n; m_r = r; m_s = s;} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return m_n;} - Integer ImageBound() const {return m_n;} - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - const Integer& GetModulus() const {return m_n;} - const Integer& GetQuadraticResidueModPrime1() const {return m_r;} - const Integer& GetQuadraticResidueModPrime2() const {return m_s;} - - void SetModulus(const Integer &n) {m_n = n;} - void SetQuadraticResidueModPrime1(const Integer &r) {m_r = r;} - void SetQuadraticResidueModPrime2(const Integer &s) {m_s = s;} - -protected: - Integer m_n, m_r, m_s; -}; - -//! _ -class InvertibleRabinFunction : public RabinFunction, public TrapdoorFunctionInverse, public PrivateKey -{ - typedef InvertibleRabinFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &r, const Integer &s, - const Integer &p, const Integer &q, const Integer &u) - {m_n = n; m_r = r; m_s = s; m_p = p; m_q = q; m_u = u;} - void Initialize(RandomNumberGenerator &rng, unsigned int keybits) - {GenerateRandomWithKeySize(rng, keybits);} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const; - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - /*! parameters: (ModulusSize) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - - const Integer& GetPrime1() const {return m_p;} - const Integer& GetPrime2() const {return m_q;} - const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;} - - void SetPrime1(const Integer &p) {m_p = p;} - void SetPrime2(const Integer &q) {m_q = q;} - void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;} - -protected: - Integer m_p, m_q, m_u; -}; - -//! Rabin -struct Rabin -{ - static std::string StaticAlgorithmName() {return "Rabin-Crypto++Variant";} - typedef RabinFunction PublicKey; - typedef InvertibleRabinFunction PrivateKey; -}; - -//! Rabin encryption -template -struct RabinES : public TF_ES -{ -}; - -//! Rabin signature -template -struct RabinSS : public TF_SS -{ -}; - -// More typedefs for backwards compatibility -class SHA1; -typedef RabinES >::Decryptor RabinDecryptor; -typedef RabinES >::Encryptor RabinEncryptor; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.cpp deleted file mode 100644 index a063c899..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// randpool.cpp - written and placed in the public domain by Wei Dai -// RandomPool used to follow the design of randpool in PGP 2.6.x, -// but as of version 5.5 it has been redesigned to reduce the risk -// of reusing random numbers after state rollback (which may occur -// when running in a virtual machine like VMware). - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "randpool.h" -#include "aes.h" -#include "sha.h" -#include "hrtimer.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -RandomPool::RandomPool() - : m_pCipher(new AES::Encryption), m_keySet(false) -{ - memset(m_key, 0, m_key.SizeInBytes()); - memset(m_seed, 0, m_seed.SizeInBytes()); -} - -void RandomPool::IncorporateEntropy(const byte *input, size_t length) -{ - SHA256 hash; - hash.Update(m_key, 32); - hash.Update(input, length); - hash.Final(m_key); - m_keySet = false; -} - -void RandomPool::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size) -{ - if (size > 0) - { - if (!m_keySet) - m_pCipher->SetKey(m_key, 32); - - Timer timer; - TimerWord tw = timer.GetCurrentTimerValue(); - CRYPTOPP_COMPILE_ASSERT(sizeof(tw) <= 16); - *(TimerWord *)m_seed.data() += tw; - - time_t t = time(NULL); - CRYPTOPP_COMPILE_ASSERT(sizeof(t) <= 8); - *(time_t *)(m_seed.data()+8) += t; - - do - { - m_pCipher->ProcessBlock(m_seed); - size_t len = UnsignedMin(16, size); - target.ChannelPut(channel, m_seed, len); - size -= len; - } while (size > 0); - } -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.h deleted file mode 100644 index c25bc9bb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/randpool.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CRYPTOPP_RANDPOOL_H -#define CRYPTOPP_RANDPOOL_H - -#include "cryptlib.h" -#include "filters.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Randomness Pool -/*! This class can be used to generate cryptographic quality - pseudorandom bytes after seeding the pool with IncorporateEntropy() */ -class CRYPTOPP_DLL RandomPool : public RandomNumberGenerator, public NotCopyable -{ -public: - RandomPool(); - - bool CanIncorporateEntropy() const {return true;} - void IncorporateEntropy(const byte *input, size_t length); - void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size); - - // for backwards compatibility. use RandomNumberSource, RandomNumberStore, and RandomNumberSink for other BufferTransformation functionality - void Put(const byte *input, size_t length) {IncorporateEntropy(input, length);} - -private: - FixedSizeSecBlock m_key; - FixedSizeSecBlock m_seed; - member_ptr m_pCipher; - bool m_keySet; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.cpp deleted file mode 100644 index 48df2ef4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// rc2.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "rc2.h" -#include "misc.h" -#include "argnames.h" - -NAMESPACE_BEGIN(CryptoPP) - -void RC2::Base::UncheckedSetKey(const byte *key, unsigned int keyLen, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(keyLen); - - int effectiveLen = params.GetIntValueWithDefault(Name::EffectiveKeyLength(), DEFAULT_EFFECTIVE_KEYLENGTH); - if (effectiveLen > MAX_EFFECTIVE_KEYLENGTH) - throw InvalidArgument("RC2: effective key length parameter exceeds maximum"); - - static const unsigned char PITABLE[256] = { - 217,120,249,196, 25,221,181,237, 40,233,253,121, 74,160,216,157, - 198,126, 55,131, 43,118, 83,142, 98, 76,100,136, 68,139,251,162, - 23,154, 89,245,135,179, 79, 19, 97, 69,109,141, 9,129,125, 50, - 189,143, 64,235,134,183,123, 11,240,149, 33, 34, 92,107, 78,130, - 84,214,101,147,206, 96,178, 28,115, 86,192, 20,167,140,241,220, - 18,117,202, 31, 59,190,228,209, 66, 61,212, 48,163, 60,182, 38, - 111,191, 14,218, 70,105, 7, 87, 39,242, 29,155,188,148, 67, 3, - 248, 17,199,246,144,239, 62,231, 6,195,213, 47,200,102, 30,215, - 8,232,234,222,128, 82,238,247,132,170,114,172, 53, 77,106, 42, - 150, 26,210,113, 90, 21, 73,116, 75,159,208, 94, 4, 24,164,236, - 194,224, 65,110, 15, 81,203,204, 36,145,175, 80,161,244,112, 57, - 153,124, 58,133, 35,184,180,122,252, 2, 54, 91, 37, 85,151, 49, - 45, 93,250,152,227,138,146,174, 5,223, 41, 16,103,108,186,201, - 211, 0,230,207,225,158,168, 44, 99, 22, 1, 63, 88,226,137,169, - 13, 56, 52, 27,171, 51,255,176,187, 72, 12, 95,185,177,205, 46, - 197,243,219, 71,229,165,156,119, 10,166, 32,104,254,127,193,173}; - - SecByteBlock L(128); - memcpy(L, key, keyLen); - - int i; - for (i=keyLen; i<128; i++) - L[i] = PITABLE[(L[i-1] + L[i-keyLen]) & 255]; - - unsigned int T8 = (effectiveLen+7) / 8; - byte TM = 255 >> ((8-(effectiveLen%8))%8); - L[128-T8] = PITABLE[L[128-T8] & TM]; - - for (i=127-T8; i>=0; i--) - L[i] = PITABLE[L[i+1] ^ L[i+T8]]; - - for (i=0; i<64; i++) - K[i] = L[2*i] + (L[2*i+1] << 8); -} - -typedef BlockGetAndPut Block; - -void RC2::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word16 R0, R1, R2, R3; - Block::Get(inBlock)(R0)(R1)(R2)(R3); - - for (int i = 0; i < 16; i++) - { - R0 += (R1 & ~R3) + (R2 & R3) + K[4*i+0]; - R0 = rotlFixed(R0, 1); - - R1 += (R2 & ~R0) + (R3 & R0) + K[4*i+1]; - R1 = rotlFixed(R1, 2); - - R2 += (R3 & ~R1) + (R0 & R1) + K[4*i+2]; - R2 = rotlFixed(R2, 3); - - R3 += (R0 & ~R2) + (R1 & R2) + K[4*i+3]; - R3 = rotlFixed(R3, 5); - - if (i == 4 || i == 10) - { - R0 += K[R3 & 63]; - R1 += K[R0 & 63]; - R2 += K[R1 & 63]; - R3 += K[R2 & 63]; - } - } - - Block::Put(xorBlock, outBlock)(R0)(R1)(R2)(R3); -} - -void RC2::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word16 R0, R1, R2, R3; - Block::Get(inBlock)(R0)(R1)(R2)(R3); - - for (int i = 15; i >= 0; i--) - { - if (i == 4 || i == 10) - { - R3 -= K[R2 & 63]; - R2 -= K[R1 & 63]; - R1 -= K[R0 & 63]; - R0 -= K[R3 & 63]; - } - - R3 = rotrFixed(R3, 5); - R3 -= (R0 & ~R2) + (R1 & R2) + K[4*i+3]; - - R2 = rotrFixed(R2, 3); - R2 -= (R3 & ~R1) + (R0 & R1) + K[4*i+2]; - - R1 = rotrFixed(R1, 2); - R1 -= (R2 & ~R0) + (R3 & R0) + K[4*i+1]; - - R0 = rotrFixed(R0, 1); - R0 -= (R1 & ~R3) + (R2 & R3) + K[4*i+0]; - } - - Block::Put(xorBlock, outBlock)(R0)(R1)(R2)(R3); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.h deleted file mode 100644 index ebff798f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc2.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef CRYPTOPP_RC2_H -#define CRYPTOPP_RC2_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" -#include "algparam.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct RC2_Info : public FixedBlockSize<8>, public VariableKeyLength<16, 1, 128> -{ - CRYPTOPP_CONSTANT(DEFAULT_EFFECTIVE_KEYLENGTH = 1024) - CRYPTOPP_CONSTANT(MAX_EFFECTIVE_KEYLENGTH = 1024) - static const char *StaticAlgorithmName() {return "RC2";} -}; - -/// RC2 -class RC2 : public RC2_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - unsigned int OptimalDataAlignment() const {return GetAlignmentOf();} - - protected: - FixedSizeSecBlock K; // expanded key table - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - class Encryption : public BlockCipherFinal - { - public: - Encryption() {} - Encryption(const byte *key, size_t keyLen=DEFAULT_KEYLENGTH) - {SetKey(key, keyLen);} - Encryption(const byte *key, size_t keyLen, int effectiveKeyLen) - {SetKey(key, keyLen, MakeParameters("EffectiveKeyLength", effectiveKeyLen));} - }; - - class Decryption : public BlockCipherFinal - { - public: - Decryption() {} - Decryption(const byte *key, size_t keyLen=DEFAULT_KEYLENGTH) - {SetKey(key, keyLen);} - Decryption(const byte *key, size_t keyLen, int effectiveKeyLen) - {SetKey(key, keyLen, MakeParameters("EffectiveKeyLength", effectiveKeyLen));} - }; -}; - -typedef RC2::Encryption RC2Encryption; -typedef RC2::Decryption RC2Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc5.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rc5.cpp deleted file mode 100644 index 2b730def..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc5.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// rc5.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "rc5.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void RC5::Base::UncheckedSetKey(const byte *k, unsigned int keylen, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(keylen); - - r = GetRoundsAndThrowIfInvalid(params, this); - sTable.New(2*(r+1)); - - static const RC5_WORD MAGIC_P = 0xb7e15163L; // magic constant P for wordsize - static const RC5_WORD MAGIC_Q = 0x9e3779b9L; // magic constant Q for wordsize - static const int U=sizeof(RC5_WORD); - - const unsigned int c = STDMAX((keylen+U-1)/U, 1U); // RC6 paper says c=1 if keylen==0 - SecBlock l(c); - - GetUserKey(LITTLE_ENDIAN_ORDER, l.begin(), c, k, keylen); - - sTable[0] = MAGIC_P; - for (unsigned j=1; j Block; - -void RC5::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - const RC5_WORD *sptr = sTable; - RC5_WORD a, b; - - Block::Get(inBlock)(a)(b); - a += sptr[0]; - b += sptr[1]; - sptr += 2; - - for(unsigned i=0; i, public VariableKeyLength<16, 0, 255>, public VariableRounds<16> -{ - static const char *StaticAlgorithmName() {return "RC5";} - typedef word32 RC5_WORD; -}; - -/// RC5 -class RC5 : public RC5_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - unsigned int r; // number of rounds - SecBlock sTable; // expanded key table - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef RC5::Encryption RC5Encryption; -typedef RC5::Decryption RC5Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc6.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rc6.cpp deleted file mode 100644 index e58cb6ac..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rc6.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// rc6.cpp - written and placed in the public domain by Sean Woods -// based on Wei Dai's RC5 code. - -#include "pch.h" -#include "rc6.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void RC6::Base::UncheckedSetKey(const byte *k, unsigned int keylen, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(keylen); - - r = GetRoundsAndThrowIfInvalid(params, this); - sTable.New(2*(r+2)); - - static const RC6_WORD MAGIC_P = 0xb7e15163L; // magic constant P for wordsize - static const RC6_WORD MAGIC_Q = 0x9e3779b9L; // magic constant Q for wordsize - static const int U=sizeof(RC6_WORD); - - const unsigned int c = STDMAX((keylen+U-1)/U, 1U); // RC6 paper says c=1 if keylen==0 - SecBlock l(c); - - GetUserKey(LITTLE_ENDIAN_ORDER, l.begin(), c, k, keylen); - - sTable[0] = MAGIC_P; - for (unsigned j=1; j Block; - -void RC6::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - const RC6_WORD *sptr = sTable; - RC6_WORD a, b, c, d, t, u; - - Block::Get(inBlock)(a)(b)(c)(d); - b += sptr[0]; - d += sptr[1]; - sptr += 2; - - for(unsigned i=0; i, public VariableKeyLength<16, 0, 255>, public VariableRounds<20> -{ - static const char *StaticAlgorithmName() {return "RC6";} - typedef word32 RC6_WORD; -}; - -/// RC6 -class RC6 : public RC6_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - unsigned int r; // number of rounds - SecBlock sTable; // expanded key table - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef RC6::Encryption RC6Encryption; -typedef RC6::Decryption RC6Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rdtables.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rdtables.cpp deleted file mode 100644 index 49379325..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rdtables.cpp +++ /dev/null @@ -1,172 +0,0 @@ -// Rijndael tables - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "rijndael.h" - -// VC60 workaround: gives a C4786 warning without this function -// when runtime lib is set to multithread debug DLL -// even though warning 4786 is disabled! -void Rijndael_VC60Workaround() -{ -} - -NAMESPACE_BEGIN(CryptoPP) - -/* -Te0[x] = S [x].[02, 01, 01, 03]; -Te1[x] = S [x].[03, 02, 01, 01]; -Te2[x] = S [x].[01, 03, 02, 01]; -Te3[x] = S [x].[01, 01, 03, 02]; - -Td0[x] = Si[x].[0e, 09, 0d, 0b]; -Td1[x] = Si[x].[0b, 0e, 09, 0d]; -Td2[x] = Si[x].[0d, 0b, 0e, 09]; -Td3[x] = Si[x].[09, 0d, 0b, 0e]; -*/ - -const byte Rijndael::Base::Se[256] = { - 0x63, 0x7c, 0x77, 0x7b, - 0xf2, 0x6b, 0x6f, 0xc5, - 0x30, 0x01, 0x67, 0x2b, - 0xfe, 0xd7, 0xab, 0x76, - 0xca, 0x82, 0xc9, 0x7d, - 0xfa, 0x59, 0x47, 0xf0, - 0xad, 0xd4, 0xa2, 0xaf, - 0x9c, 0xa4, 0x72, 0xc0, - 0xb7, 0xfd, 0x93, 0x26, - 0x36, 0x3f, 0xf7, 0xcc, - 0x34, 0xa5, 0xe5, 0xf1, - 0x71, 0xd8, 0x31, 0x15, - 0x04, 0xc7, 0x23, 0xc3, - 0x18, 0x96, 0x05, 0x9a, - 0x07, 0x12, 0x80, 0xe2, - 0xeb, 0x27, 0xb2, 0x75, - 0x09, 0x83, 0x2c, 0x1a, - 0x1b, 0x6e, 0x5a, 0xa0, - 0x52, 0x3b, 0xd6, 0xb3, - 0x29, 0xe3, 0x2f, 0x84, - 0x53, 0xd1, 0x00, 0xed, - 0x20, 0xfc, 0xb1, 0x5b, - 0x6a, 0xcb, 0xbe, 0x39, - 0x4a, 0x4c, 0x58, 0xcf, - 0xd0, 0xef, 0xaa, 0xfb, - 0x43, 0x4d, 0x33, 0x85, - 0x45, 0xf9, 0x02, 0x7f, - 0x50, 0x3c, 0x9f, 0xa8, - 0x51, 0xa3, 0x40, 0x8f, - 0x92, 0x9d, 0x38, 0xf5, - 0xbc, 0xb6, 0xda, 0x21, - 0x10, 0xff, 0xf3, 0xd2, - 0xcd, 0x0c, 0x13, 0xec, - 0x5f, 0x97, 0x44, 0x17, - 0xc4, 0xa7, 0x7e, 0x3d, - 0x64, 0x5d, 0x19, 0x73, - 0x60, 0x81, 0x4f, 0xdc, - 0x22, 0x2a, 0x90, 0x88, - 0x46, 0xee, 0xb8, 0x14, - 0xde, 0x5e, 0x0b, 0xdb, - 0xe0, 0x32, 0x3a, 0x0a, - 0x49, 0x06, 0x24, 0x5c, - 0xc2, 0xd3, 0xac, 0x62, - 0x91, 0x95, 0xe4, 0x79, - 0xe7, 0xc8, 0x37, 0x6d, - 0x8d, 0xd5, 0x4e, 0xa9, - 0x6c, 0x56, 0xf4, 0xea, - 0x65, 0x7a, 0xae, 0x08, - 0xba, 0x78, 0x25, 0x2e, - 0x1c, 0xa6, 0xb4, 0xc6, - 0xe8, 0xdd, 0x74, 0x1f, - 0x4b, 0xbd, 0x8b, 0x8a, - 0x70, 0x3e, 0xb5, 0x66, - 0x48, 0x03, 0xf6, 0x0e, - 0x61, 0x35, 0x57, 0xb9, - 0x86, 0xc1, 0x1d, 0x9e, - 0xe1, 0xf8, 0x98, 0x11, - 0x69, 0xd9, 0x8e, 0x94, - 0x9b, 0x1e, 0x87, 0xe9, - 0xce, 0x55, 0x28, 0xdf, - 0x8c, 0xa1, 0x89, 0x0d, - 0xbf, 0xe6, 0x42, 0x68, - 0x41, 0x99, 0x2d, 0x0f, - 0xb0, 0x54, 0xbb, 0x16, -}; - -const byte Rijndael::Base::Sd[256] = { - 0x52, 0x09, 0x6a, 0xd5, - 0x30, 0x36, 0xa5, 0x38, - 0xbf, 0x40, 0xa3, 0x9e, - 0x81, 0xf3, 0xd7, 0xfb, - 0x7c, 0xe3, 0x39, 0x82, - 0x9b, 0x2f, 0xff, 0x87, - 0x34, 0x8e, 0x43, 0x44, - 0xc4, 0xde, 0xe9, 0xcb, - 0x54, 0x7b, 0x94, 0x32, - 0xa6, 0xc2, 0x23, 0x3d, - 0xee, 0x4c, 0x95, 0x0b, - 0x42, 0xfa, 0xc3, 0x4e, - 0x08, 0x2e, 0xa1, 0x66, - 0x28, 0xd9, 0x24, 0xb2, - 0x76, 0x5b, 0xa2, 0x49, - 0x6d, 0x8b, 0xd1, 0x25, - 0x72, 0xf8, 0xf6, 0x64, - 0x86, 0x68, 0x98, 0x16, - 0xd4, 0xa4, 0x5c, 0xcc, - 0x5d, 0x65, 0xb6, 0x92, - 0x6c, 0x70, 0x48, 0x50, - 0xfd, 0xed, 0xb9, 0xda, - 0x5e, 0x15, 0x46, 0x57, - 0xa7, 0x8d, 0x9d, 0x84, - 0x90, 0xd8, 0xab, 0x00, - 0x8c, 0xbc, 0xd3, 0x0a, - 0xf7, 0xe4, 0x58, 0x05, - 0xb8, 0xb3, 0x45, 0x06, - 0xd0, 0x2c, 0x1e, 0x8f, - 0xca, 0x3f, 0x0f, 0x02, - 0xc1, 0xaf, 0xbd, 0x03, - 0x01, 0x13, 0x8a, 0x6b, - 0x3a, 0x91, 0x11, 0x41, - 0x4f, 0x67, 0xdc, 0xea, - 0x97, 0xf2, 0xcf, 0xce, - 0xf0, 0xb4, 0xe6, 0x73, - 0x96, 0xac, 0x74, 0x22, - 0xe7, 0xad, 0x35, 0x85, - 0xe2, 0xf9, 0x37, 0xe8, - 0x1c, 0x75, 0xdf, 0x6e, - 0x47, 0xf1, 0x1a, 0x71, - 0x1d, 0x29, 0xc5, 0x89, - 0x6f, 0xb7, 0x62, 0x0e, - 0xaa, 0x18, 0xbe, 0x1b, - 0xfc, 0x56, 0x3e, 0x4b, - 0xc6, 0xd2, 0x79, 0x20, - 0x9a, 0xdb, 0xc0, 0xfe, - 0x78, 0xcd, 0x5a, 0xf4, - 0x1f, 0xdd, 0xa8, 0x33, - 0x88, 0x07, 0xc7, 0x31, - 0xb1, 0x12, 0x10, 0x59, - 0x27, 0x80, 0xec, 0x5f, - 0x60, 0x51, 0x7f, 0xa9, - 0x19, 0xb5, 0x4a, 0x0d, - 0x2d, 0xe5, 0x7a, 0x9f, - 0x93, 0xc9, 0x9c, 0xef, - 0xa0, 0xe0, 0x3b, 0x4d, - 0xae, 0x2a, 0xf5, 0xb0, - 0xc8, 0xeb, 0xbb, 0x3c, - 0x83, 0x53, 0x99, 0x61, - 0x17, 0x2b, 0x04, 0x7e, - 0xba, 0x77, 0xd6, 0x26, - 0xe1, 0x69, 0x14, 0x63, - 0x55, 0x21, 0x0c, 0x7d, -}; - -const word32 Rijndael::Base::rcon[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, - 0x10000000, 0x20000000, 0x40000000, 0x80000000, - 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/regtest.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/regtest.cpp deleted file mode 100644 index 49afcb69..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/regtest.cpp +++ /dev/null @@ -1,145 +0,0 @@ -#include "factory.h" - -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "modes.h" -#include "dh.h" -#include "esign.h" -#include "md2.h" -#include "rw.h" -#include "md5.h" -#include "rsa.h" -#include "ripemd.h" -#include "dsa.h" -#include "seal.h" -#include "whrlpool.h" -#include "ttmac.h" -#include "camellia.h" -#include "shacal2.h" -#include "tea.h" -#include "panama.h" -#include "pssr.h" -#include "aes.h" -#include "salsa.h" -#include "vmac.h" -#include "tiger.h" -#include "md5.h" -#include "sosemanuk.h" -#include "arc4.h" -#include "ccm.h" -#include "gcm.h" -#include "eax.h" -#include "twofish.h" -#include "serpent.h" -#include "cast.h" -#include "rc6.h" -#include "mars.h" -#include "shacal2.h" -#include "des.h" -#include "idea.h" -#include "rc5.h" -#include "tea.h" -#include "skipjack.h" -#include "cmac.h" -#include "dmac.h" -#include "blowfish.h" -#include "seed.h" -#include "wake.h" -#include "seal.h" -#include "crc.h" -#include "adler32.h" - -USING_NAMESPACE(CryptoPP) - -void RegisterFactories() -{ - static bool s_registered = false; - if (s_registered) - return; - - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterDefaultFactoryFor >(); - RegisterAsymmetricCipherDefaultFactories > >("RSA/OAEP-MGF1(SHA-1)"); - RegisterAsymmetricCipherDefaultFactories >("DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)"); - RegisterSignatureSchemeDefaultFactories("DSA(1363)"); - RegisterSignatureSchemeDefaultFactories >("NR(1363)/EMSA1(SHA-1)"); - RegisterSignatureSchemeDefaultFactories >("DSA-1363/EMSA1(SHA-1)"); - RegisterSignatureSchemeDefaultFactories >("RSA/PKCS1-1.5(MD2)"); - RegisterSignatureSchemeDefaultFactories >("RSA/PKCS1-1.5(SHA-1)"); - RegisterSignatureSchemeDefaultFactories >("ESIGN/EMSA5-MGF1(SHA-1)"); - RegisterSignatureSchemeDefaultFactories >("RW/EMSA2(SHA-1)"); - RegisterSignatureSchemeDefaultFactories >("RSA/PSS-MGF1(SHA-1)"); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories(); - RegisterSymmetricCipherDefaultFactories(); - RegisterSymmetricCipherDefaultFactories(); - RegisterSymmetricCipherDefaultFactories(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterAuthenticatedSymmetricCipherDefaultFactories >(); - RegisterAuthenticatedSymmetricCipherDefaultFactories >(); - RegisterAuthenticatedSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - - s_registered = true; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/resource.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/resource.h deleted file mode 100644 index 861e22ba..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/resource.h +++ /dev/null @@ -1,15 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by cryptopp.rc -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.cpp deleted file mode 100644 index 608b9d30..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.cpp +++ /dev/null @@ -1,1257 +0,0 @@ -// rijndael.cpp - modified by Chris Morgan -// and Wei Dai from Paulo Baretto's Rijndael implementation -// The original code and all modifications are in the public domain. - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM rijndael.cpp" to generate MASM code - -/* -July 2010: Added support for AES-NI instructions via compiler intrinsics. -*/ - -/* -Feb 2009: The x86/x64 assembly code was rewritten in by Wei Dai to do counter mode -caching, which was invented by Hongjun Wu and popularized by Daniel J. Bernstein -and Peter Schwabe in their paper "New AES software speed records". The round -function was also modified to include a trick similar to one in Brian Gladman's -x86 assembly code, doing an 8-bit register move to minimize the number of -register spills. Also switched to compressed tables and copying round keys to -the stack. - -The C++ implementation now uses compressed tables if -CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is defined. -*/ - -/* -July 2006: Defense against timing attacks was added in by Wei Dai. - -The code now uses smaller tables in the first and last rounds, -and preloads them into L1 cache before usage (by loading at least -one element in each cache line). - -We try to delay subsequent accesses to each table (used in the first -and last rounds) until all of the table has been preloaded. Hopefully -the compiler isn't smart enough to optimize that code away. - -After preloading the table, we also try not to access any memory location -other than the table and the stack, in order to prevent table entries from -being unloaded from L1 cache, until that round is finished. -(Some popular CPUs have 2-way associative caches.) -*/ - -// This is the original introductory comment: - -/** - * version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * author Vincent Rijmen - * author Antoon Bosselaers - * author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 THE AUTHORS 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. - */ - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "rijndael.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) -namespace rdtable {CRYPTOPP_ALIGN_DATA(16) word64 Te[256+2];} -using namespace rdtable; -#else -static word64 Te[256]; -#endif -static word64 Td[256]; -#else -static word32 Te[256*4], Td[256*4]; -#endif -static volatile bool s_TeFilled = false, s_TdFilled = false; - -// ************************* Portable Code ************************************ - -#define QUARTER_ROUND(L, T, t, a, b, c, d) \ - a ^= L(T, 3, byte(t)); t >>= 8;\ - b ^= L(T, 2, byte(t)); t >>= 8;\ - c ^= L(T, 1, byte(t)); t >>= 8;\ - d ^= L(T, 0, t); - -#define QUARTER_ROUND_LE(t, a, b, c, d) \ - tempBlock[a] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\ - tempBlock[b] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\ - tempBlock[c] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\ - tempBlock[d] = ((byte *)(Te+t))[1]; - -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - #define QUARTER_ROUND_LD(t, a, b, c, d) \ - tempBlock[a] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\ - tempBlock[b] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\ - tempBlock[c] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\ - tempBlock[d] = ((byte *)(Td+t))[GetNativeByteOrder()*7]; -#else - #define QUARTER_ROUND_LD(t, a, b, c, d) \ - tempBlock[a] = Sd[byte(t)]; t >>= 8;\ - tempBlock[b] = Sd[byte(t)]; t >>= 8;\ - tempBlock[c] = Sd[byte(t)]; t >>= 8;\ - tempBlock[d] = Sd[t]; -#endif - -#define QUARTER_ROUND_E(t, a, b, c, d) QUARTER_ROUND(TL_M, Te, t, a, b, c, d) -#define QUARTER_ROUND_D(t, a, b, c, d) QUARTER_ROUND(TL_M, Td, t, a, b, c, d) - -#ifdef IS_LITTLE_ENDIAN - #define QUARTER_ROUND_FE(t, a, b, c, d) QUARTER_ROUND(TL_F, Te, t, d, c, b, a) - #define QUARTER_ROUND_FD(t, a, b, c, d) QUARTER_ROUND(TL_F, Td, t, d, c, b, a) - #ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - #define TL_F(T, i, x) (*(word32 *)((byte *)T + x*8 + (6-i)%4+1)) - #define TL_M(T, i, x) (*(word32 *)((byte *)T + x*8 + (i+3)%4+1)) - #else - #define TL_F(T, i, x) rotrFixed(T[x], (3-i)*8) - #define TL_M(T, i, x) T[i*256 + x] - #endif -#else - #define QUARTER_ROUND_FE(t, a, b, c, d) QUARTER_ROUND(TL_F, Te, t, a, b, c, d) - #define QUARTER_ROUND_FD(t, a, b, c, d) QUARTER_ROUND(TL_F, Td, t, a, b, c, d) - #ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - #define TL_F(T, i, x) (*(word32 *)((byte *)T + x*8 + (4-i)%4)) - #define TL_M TL_F - #else - #define TL_F(T, i, x) rotrFixed(T[x], i*8) - #define TL_M(T, i, x) T[i*256 + x] - #endif -#endif - - -#define f2(x) ((x<<1)^(((x>>7)&1)*0x11b)) -#define f4(x) ((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b)) -#define f8(x) ((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b)) - -#define f3(x) (f2(x) ^ x) -#define f9(x) (f8(x) ^ x) -#define fb(x) (f8(x) ^ f2(x) ^ x) -#define fd(x) (f8(x) ^ f4(x) ^ x) -#define fe(x) (f8(x) ^ f4(x) ^ f2(x)) - -void Rijndael::Base::FillEncTable() -{ - for (int i=0; i<256; i++) - { - byte x = Se[i]; -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - word32 y = word32(x)<<8 | word32(x)<<16 | word32(f2(x))<<24; - Te[i] = word64(y | f3(x))<<32 | y; -#else - word32 y = f3(x) | word32(x)<<8 | word32(x)<<16 | word32(f2(x))<<24; - for (int j=0; j<4; j++) - { - Te[i+j*256] = y; - y = rotrFixed(y, 8); - } -#endif - } -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - Te[256] = Te[257] = 0; -#endif - s_TeFilled = true; -} - -void Rijndael::Base::FillDecTable() -{ - for (int i=0; i<256; i++) - { - byte x = Sd[i]; -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - word32 y = word32(fd(x))<<8 | word32(f9(x))<<16 | word32(fe(x))<<24; - Td[i] = word64(y | fb(x))<<32 | y | x; -#else - word32 y = fb(x) | word32(fd(x))<<8 | word32(f9(x))<<16 | word32(fe(x))<<24;; - for (int j=0; j<4; j++) - { - Td[i+j*256] = y; - y = rotrFixed(y, 8); - } -#endif - } - s_TdFilled = true; -} - -void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &) -{ - AssertValidKeyLength(keylen); - - m_rounds = keylen/4 + 6; - m_key.New(4*(m_rounds+1)); - - word32 *rk = m_key; - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE && (!defined(_MSC_VER) || _MSC_VER >= 1600 || CRYPTOPP_BOOL_X86) - // MSVC 2008 SP1 generates bad code for _mm_extract_epi32() when compiling for X64 - if (HasAESNI()) - { - static const word32 rcLE[] = { - 0x01, 0x02, 0x04, 0x08, - 0x10, 0x20, 0x40, 0x80, - 0x1B, 0x36, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ - }; - const word32 *rc = rcLE; - - __m128i temp = _mm_loadu_si128((__m128i *)(userKey+keylen-16)); - memcpy(rk, userKey, keylen); - - while (true) - { - rk[keylen/4] = rk[0] ^ _mm_extract_epi32(_mm_aeskeygenassist_si128(temp, 0), 3) ^ *(rc++); - rk[keylen/4+1] = rk[1] ^ rk[keylen/4]; - rk[keylen/4+2] = rk[2] ^ rk[keylen/4+1]; - rk[keylen/4+3] = rk[3] ^ rk[keylen/4+2]; - - if (rk + keylen/4 + 4 == m_key.end()) - break; - - if (keylen == 24) - { - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - temp = _mm_insert_epi32(temp, rk[11], 3); - } - else if (keylen == 32) - { - temp = _mm_insert_epi32(temp, rk[11], 3); - rk[12] = rk[ 4] ^ _mm_extract_epi32(_mm_aeskeygenassist_si128(temp, 0), 2); - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - temp = _mm_insert_epi32(temp, rk[15], 3); - } - else - temp = _mm_insert_epi32(temp, rk[7], 3); - - rk += keylen/4; - } - - if (!IsForwardTransformation()) - { - rk = m_key; - unsigned int i, j; - - std::swap(*(__m128i *)(rk), *(__m128i *)(rk+4*m_rounds)); - - for (i = 4, j = 4*m_rounds-4; i < j; i += 4, j -= 4) - { - temp = _mm_aesimc_si128(*(__m128i *)(rk+i)); - *(__m128i *)(rk+i) = _mm_aesimc_si128(*(__m128i *)(rk+j)); - *(__m128i *)(rk+j) = temp; - } - - *(__m128i *)(rk+i) = _mm_aesimc_si128(*(__m128i *)(rk+i)); - } - - return; - } -#endif - - GetUserKey(BIG_ENDIAN_ORDER, rk, keylen/4, userKey, keylen); - const word32 *rc = rcon; - word32 temp; - - while (true) - { - temp = rk[keylen/4-1]; - word32 x = (word32(Se[GETBYTE(temp, 2)]) << 24) ^ (word32(Se[GETBYTE(temp, 1)]) << 16) ^ (word32(Se[GETBYTE(temp, 0)]) << 8) ^ Se[GETBYTE(temp, 3)]; - rk[keylen/4] = rk[0] ^ x ^ *(rc++); - rk[keylen/4+1] = rk[1] ^ rk[keylen/4]; - rk[keylen/4+2] = rk[2] ^ rk[keylen/4+1]; - rk[keylen/4+3] = rk[3] ^ rk[keylen/4+2]; - - if (rk + keylen/4 + 4 == m_key.end()) - break; - - if (keylen == 24) - { - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - } - else if (keylen == 32) - { - temp = rk[11]; - rk[12] = rk[ 4] ^ (word32(Se[GETBYTE(temp, 3)]) << 24) ^ (word32(Se[GETBYTE(temp, 2)]) << 16) ^ (word32(Se[GETBYTE(temp, 1)]) << 8) ^ Se[GETBYTE(temp, 0)]; - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - } - rk += keylen/4; - } - - rk = m_key; - - if (IsForwardTransformation()) - { - if (!s_TeFilled) - FillEncTable(); - - ConditionalByteReverse(BIG_ENDIAN_ORDER, rk, rk, 16); - ConditionalByteReverse(BIG_ENDIAN_ORDER, rk + m_rounds*4, rk + m_rounds*4, 16); - } - else - { - if (!s_TdFilled) - FillDecTable(); - - unsigned int i, j; - -#define InverseMixColumn(x) TL_M(Td, 0, Se[GETBYTE(x, 3)]) ^ TL_M(Td, 1, Se[GETBYTE(x, 2)]) ^ TL_M(Td, 2, Se[GETBYTE(x, 1)]) ^ TL_M(Td, 3, Se[GETBYTE(x, 0)]) - - for (i = 4, j = 4*m_rounds-4; i < j; i += 4, j -= 4) - { - temp = InverseMixColumn(rk[i ]); rk[i ] = InverseMixColumn(rk[j ]); rk[j ] = temp; - temp = InverseMixColumn(rk[i + 1]); rk[i + 1] = InverseMixColumn(rk[j + 1]); rk[j + 1] = temp; - temp = InverseMixColumn(rk[i + 2]); rk[i + 2] = InverseMixColumn(rk[j + 2]); rk[j + 2] = temp; - temp = InverseMixColumn(rk[i + 3]); rk[i + 3] = InverseMixColumn(rk[j + 3]); rk[j + 3] = temp; - } - - rk[i+0] = InverseMixColumn(rk[i+0]); - rk[i+1] = InverseMixColumn(rk[i+1]); - rk[i+2] = InverseMixColumn(rk[i+2]); - rk[i+3] = InverseMixColumn(rk[i+3]); - - temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[0]); rk[0] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+0]); rk[4*m_rounds+0] = temp; - temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[1]); rk[1] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+1]); rk[4*m_rounds+1] = temp; - temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[2]); rk[2] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+2]); rk[4*m_rounds+2] = temp; - temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[3]); rk[3] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+3]); rk[4*m_rounds+3] = temp; - } - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasAESNI()) - ConditionalByteReverse(BIG_ENDIAN_ORDER, rk+4, rk+4, (m_rounds-1)*16); -#endif -} - -void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasSSE2()) - { - Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0); - return; - } -#endif - - typedef BlockGetAndPut Block; - - word32 s0, s1, s2, s3, t0, t1, t2, t3; - Block::Get(inBlock)(s0)(s1)(s2)(s3); - - const word32 *rk = m_key; - s0 ^= rk[0]; - s1 ^= rk[1]; - s2 ^= rk[2]; - s3 ^= rk[3]; - t0 = rk[4]; - t1 = rk[5]; - t2 = rk[6]; - t3 = rk[7]; - rk += 8; - - // timing attack countermeasure. see comments at top for more details - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; - word32 u = 0; -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - for (i=0; i<2048; i+=cacheLineSize) -#else - for (i=0; i<1024; i+=cacheLineSize) -#endif - u &= *(const word32 *)(((const byte *)Te)+i); - u &= Te[255]; - s0 |= u; s1 |= u; s2 |= u; s3 |= u; - - QUARTER_ROUND_FE(s3, t0, t1, t2, t3) - QUARTER_ROUND_FE(s2, t3, t0, t1, t2) - QUARTER_ROUND_FE(s1, t2, t3, t0, t1) - QUARTER_ROUND_FE(s0, t1, t2, t3, t0) - - // Nr - 2 full rounds: - unsigned int r = m_rounds/2 - 1; - do - { - s0 = rk[0]; s1 = rk[1]; s2 = rk[2]; s3 = rk[3]; - - QUARTER_ROUND_E(t3, s0, s1, s2, s3) - QUARTER_ROUND_E(t2, s3, s0, s1, s2) - QUARTER_ROUND_E(t1, s2, s3, s0, s1) - QUARTER_ROUND_E(t0, s1, s2, s3, s0) - - t0 = rk[4]; t1 = rk[5]; t2 = rk[6]; t3 = rk[7]; - - QUARTER_ROUND_E(s3, t0, t1, t2, t3) - QUARTER_ROUND_E(s2, t3, t0, t1, t2) - QUARTER_ROUND_E(s1, t2, t3, t0, t1) - QUARTER_ROUND_E(s0, t1, t2, t3, t0) - - rk += 8; - } while (--r); - - word32 tbw[4]; - byte *const tempBlock = (byte *)tbw; - - QUARTER_ROUND_LE(t2, 15, 2, 5, 8) - QUARTER_ROUND_LE(t1, 11, 14, 1, 4) - QUARTER_ROUND_LE(t0, 7, 10, 13, 0) - QUARTER_ROUND_LE(t3, 3, 6, 9, 12) - - Block::Put(xorBlock, outBlock)(tbw[0]^rk[0])(tbw[1]^rk[1])(tbw[2]^rk[2])(tbw[3]^rk[3]); -} - -void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasAESNI()) - { - Rijndael::Dec::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0); - return; - } -#endif - - typedef BlockGetAndPut Block; - - word32 s0, s1, s2, s3, t0, t1, t2, t3; - Block::Get(inBlock)(s0)(s1)(s2)(s3); - - const word32 *rk = m_key; - s0 ^= rk[0]; - s1 ^= rk[1]; - s2 ^= rk[2]; - s3 ^= rk[3]; - t0 = rk[4]; - t1 = rk[5]; - t2 = rk[6]; - t3 = rk[7]; - rk += 8; - - // timing attack countermeasure. see comments at top for more details - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; - word32 u = 0; -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - for (i=0; i<2048; i+=cacheLineSize) -#else - for (i=0; i<1024; i+=cacheLineSize) -#endif - u &= *(const word32 *)(((const byte *)Td)+i); - u &= Td[255]; - s0 |= u; s1 |= u; s2 |= u; s3 |= u; - - QUARTER_ROUND_FD(s3, t2, t1, t0, t3) - QUARTER_ROUND_FD(s2, t1, t0, t3, t2) - QUARTER_ROUND_FD(s1, t0, t3, t2, t1) - QUARTER_ROUND_FD(s0, t3, t2, t1, t0) - - // Nr - 2 full rounds: - unsigned int r = m_rounds/2 - 1; - do - { - s0 = rk[0]; s1 = rk[1]; s2 = rk[2]; s3 = rk[3]; - - QUARTER_ROUND_D(t3, s2, s1, s0, s3) - QUARTER_ROUND_D(t2, s1, s0, s3, s2) - QUARTER_ROUND_D(t1, s0, s3, s2, s1) - QUARTER_ROUND_D(t0, s3, s2, s1, s0) - - t0 = rk[4]; t1 = rk[5]; t2 = rk[6]; t3 = rk[7]; - - QUARTER_ROUND_D(s3, t2, t1, t0, t3) - QUARTER_ROUND_D(s2, t1, t0, t3, t2) - QUARTER_ROUND_D(s1, t0, t3, t2, t1) - QUARTER_ROUND_D(s0, t3, t2, t1, t0) - - rk += 8; - } while (--r); - -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - // timing attack countermeasure. see comments at top for more details - // If CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is defined, - // QUARTER_ROUND_LD will use Td, which is already preloaded. - u = 0; - for (i=0; i<256; i+=cacheLineSize) - u &= *(const word32 *)(Sd+i); - u &= *(const word32 *)(Sd+252); - t0 |= u; t1 |= u; t2 |= u; t3 |= u; -#endif - - word32 tbw[4]; - byte *const tempBlock = (byte *)tbw; - - QUARTER_ROUND_LD(t2, 7, 2, 13, 8) - QUARTER_ROUND_LD(t1, 3, 14, 9, 4) - QUARTER_ROUND_LD(t0, 15, 10, 5, 0) - QUARTER_ROUND_LD(t3, 11, 6, 1, 12) - - Block::Put(xorBlock, outBlock)(tbw[0]^rk[0])(tbw[1]^rk[1])(tbw[2]^rk[2])(tbw[3]^rk[3]); -} - -// ************************* Assembly Code ************************************ - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - -CRYPTOPP_NAKED void CRYPTOPP_FASTCALL Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k) -{ -#if CRYPTOPP_BOOL_X86 - -#define L_REG esp -#define L_INDEX(i) (L_REG+512+i) -#define L_INXORBLOCKS L_INBLOCKS+4 -#define L_OUTXORBLOCKS L_INBLOCKS+8 -#define L_OUTBLOCKS L_INBLOCKS+12 -#define L_INCREMENTS L_INDEX(16*15) -#define L_SP L_INDEX(16*16) -#define L_LENGTH L_INDEX(16*16+4) -#define L_KEYS_BEGIN L_INDEX(16*16+8) - -#define MOVD movd -#define MM(i) mm##i - -#define MXOR(a,b,c) \ - AS2( movzx esi, b)\ - AS2( movd mm7, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - AS2( pxor MM(a), mm7)\ - -#define MMOV(a,b,c) \ - AS2( movzx esi, b)\ - AS2( movd MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - -#else - -#define L_REG r8 -#define L_INDEX(i) (L_REG+i) -#define L_INXORBLOCKS L_INBLOCKS+8 -#define L_OUTXORBLOCKS L_INBLOCKS+16 -#define L_OUTBLOCKS L_INBLOCKS+24 -#define L_INCREMENTS L_INDEX(16*16) -#define L_LENGTH L_INDEX(16*18+8) -#define L_KEYS_BEGIN L_INDEX(16*19) - -#define MOVD mov -#define MM_0 r9d -#define MM_1 r12d -#ifdef __GNUC__ -#define MM_2 r11d -#else -#define MM_2 r10d -#endif -#define MM(i) MM_##i - -#define MXOR(a,b,c) \ - AS2( movzx esi, b)\ - AS2( xor MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - -#define MMOV(a,b,c) \ - AS2( movzx esi, b)\ - AS2( mov MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - -#endif - -#define L_SUBKEYS L_INDEX(0) -#define L_SAVED_X L_SUBKEYS -#define L_KEY12 L_INDEX(16*12) -#define L_LASTROUND L_INDEX(16*13) -#define L_INBLOCKS L_INDEX(16*14) -#define MAP0TO4(i) (ASM_MOD(i+3,4)+1) - -#define XOR(a,b,c) \ - AS2( movzx esi, b)\ - AS2( xor a, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - -#define MOV(a,b,c) \ - AS2( movzx esi, b)\ - AS2( mov a, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\ - -#ifdef CRYPTOPP_GENERATE_X64_MASM - ALIGN 8 - Rijndael_Enc_AdvancedProcessBlocks PROC FRAME - rex_push_reg rsi - push_reg rdi - push_reg rbx - push_reg r12 - .endprolog - mov L_REG, rcx - mov AS_REG_7, ?Te@rdtable@CryptoPP@@3PA_KA - mov edi, DWORD PTR [?g_cacheLineSize@CryptoPP@@3IA] -#elif defined(__GNUC__) - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - #if CRYPTOPP_BOOL_X64 - AS2( mov L_REG, rcx) - #endif - AS_PUSH_IF86(bx) - AS_PUSH_IF86(bp) - AS2( mov AS_REG_7, WORD_REG(si)) -#else - AS_PUSH_IF86(si) - AS_PUSH_IF86(di) - AS_PUSH_IF86(bx) - AS_PUSH_IF86(bp) - AS2( lea AS_REG_7, [Te]) - AS2( mov edi, [g_cacheLineSize]) -#endif - -#if CRYPTOPP_BOOL_X86 - AS2( mov [ecx+16*12+16*4], esp) // save esp to L_SP - AS2( lea esp, [ecx-512]) -#endif - - // copy subkeys to stack - AS2( mov WORD_REG(si), [L_KEYS_BEGIN]) - AS2( mov WORD_REG(ax), 16) - AS2( and WORD_REG(ax), WORD_REG(si)) - AS2( movdqa xmm3, XMMWORD_PTR [WORD_REG(dx)+16+WORD_REG(ax)]) // subkey 1 (non-counter) or 2 (counter) - AS2( movdqa [L_KEY12], xmm3) - AS2( lea WORD_REG(ax), [WORD_REG(dx)+WORD_REG(ax)+2*16]) - AS2( sub WORD_REG(ax), WORD_REG(si)) - ASL(0) - AS2( movdqa xmm0, [WORD_REG(ax)+WORD_REG(si)]) - AS2( movdqa XMMWORD_PTR [L_SUBKEYS+WORD_REG(si)], xmm0) - AS2( add WORD_REG(si), 16) - AS2( cmp WORD_REG(si), 16*12) - ASJ( jl, 0, b) - - // read subkeys 0, 1 and last - AS2( movdqa xmm4, [WORD_REG(ax)+WORD_REG(si)]) // last subkey - AS2( movdqa xmm1, [WORD_REG(dx)]) // subkey 0 - AS2( MOVD MM(1), [WORD_REG(dx)+4*4]) // 0,1,2,3 - AS2( mov ebx, [WORD_REG(dx)+5*4]) // 4,5,6,7 - AS2( mov ecx, [WORD_REG(dx)+6*4]) // 8,9,10,11 - AS2( mov edx, [WORD_REG(dx)+7*4]) // 12,13,14,15 - - // load table into cache - AS2( xor WORD_REG(ax), WORD_REG(ax)) - ASL(9) - AS2( mov esi, [AS_REG_7+WORD_REG(ax)]) - AS2( add WORD_REG(ax), WORD_REG(di)) - AS2( mov esi, [AS_REG_7+WORD_REG(ax)]) - AS2( add WORD_REG(ax), WORD_REG(di)) - AS2( mov esi, [AS_REG_7+WORD_REG(ax)]) - AS2( add WORD_REG(ax), WORD_REG(di)) - AS2( mov esi, [AS_REG_7+WORD_REG(ax)]) - AS2( add WORD_REG(ax), WORD_REG(di)) - AS2( cmp WORD_REG(ax), 2048) - ASJ( jl, 9, b) - AS1( lfence) - - AS2( test DWORD PTR [L_LENGTH], 1) - ASJ( jz, 8, f) - - // counter mode one-time setup - AS2( mov WORD_REG(si), [L_INBLOCKS]) - AS2( movdqu xmm2, [WORD_REG(si)]) // counter - AS2( pxor xmm2, xmm1) - AS2( psrldq xmm1, 14) - AS2( movd eax, xmm1) - AS2( mov al, BYTE PTR [WORD_REG(si)+15]) - AS2( MOVD MM(2), eax) -#if CRYPTOPP_BOOL_X86 - AS2( mov eax, 1) - AS2( movd mm3, eax) -#endif - - // partial first round, in: xmm2(15,14,13,12;11,10,9,8;7,6,5,4;3,2,1,0), out: mm1, ebx, ecx, edx - AS2( movd eax, xmm2) - AS2( psrldq xmm2, 4) - AS2( movd edi, xmm2) - AS2( psrldq xmm2, 4) - MXOR( 1, al, 0) // 0 - XOR( edx, ah, 1) // 1 - AS2( shr eax, 16) - XOR( ecx, al, 2) // 2 - XOR( ebx, ah, 3) // 3 - AS2( mov eax, edi) - AS2( movd edi, xmm2) - AS2( psrldq xmm2, 4) - XOR( ebx, al, 0) // 4 - MXOR( 1, ah, 1) // 5 - AS2( shr eax, 16) - XOR( edx, al, 2) // 6 - XOR( ecx, ah, 3) // 7 - AS2( mov eax, edi) - AS2( movd edi, xmm2) - XOR( ecx, al, 0) // 8 - XOR( ebx, ah, 1) // 9 - AS2( shr eax, 16) - MXOR( 1, al, 2) // 10 - XOR( edx, ah, 3) // 11 - AS2( mov eax, edi) - XOR( edx, al, 0) // 12 - XOR( ecx, ah, 1) // 13 - AS2( shr eax, 16) - XOR( ebx, al, 2) // 14 - AS2( psrldq xmm2, 3) - - // partial second round, in: ebx(4,5,6,7), ecx(8,9,10,11), edx(12,13,14,15), out: eax, ebx, edi, mm0 - AS2( mov eax, [L_KEY12+0*4]) - AS2( mov edi, [L_KEY12+2*4]) - AS2( MOVD MM(0), [L_KEY12+3*4]) - MXOR( 0, cl, 3) /* 11 */ - XOR( edi, bl, 3) /* 7 */ - MXOR( 0, bh, 2) /* 6 */ - AS2( shr ebx, 16) /* 4,5 */ - XOR( eax, bl, 1) /* 5 */ - MOV( ebx, bh, 0) /* 4 */ - AS2( xor ebx, [L_KEY12+1*4]) - XOR( eax, ch, 2) /* 10 */ - AS2( shr ecx, 16) /* 8,9 */ - XOR( eax, dl, 3) /* 15 */ - XOR( ebx, dh, 2) /* 14 */ - AS2( shr edx, 16) /* 12,13 */ - XOR( edi, ch, 0) /* 8 */ - XOR( ebx, cl, 1) /* 9 */ - XOR( edi, dl, 1) /* 13 */ - MXOR( 0, dh, 0) /* 12 */ - - AS2( movd ecx, xmm2) - AS2( MOVD edx, MM(1)) - AS2( MOVD [L_SAVED_X+3*4], MM(0)) - AS2( mov [L_SAVED_X+0*4], eax) - AS2( mov [L_SAVED_X+1*4], ebx) - AS2( mov [L_SAVED_X+2*4], edi) - ASJ( jmp, 5, f) - - ASL(3) - // non-counter mode per-block setup - AS2( MOVD MM(1), [L_KEY12+0*4]) // 0,1,2,3 - AS2( mov ebx, [L_KEY12+1*4]) // 4,5,6,7 - AS2( mov ecx, [L_KEY12+2*4]) // 8,9,10,11 - AS2( mov edx, [L_KEY12+3*4]) // 12,13,14,15 - ASL(8) - AS2( mov WORD_REG(ax), [L_INBLOCKS]) - AS2( movdqu xmm2, [WORD_REG(ax)]) - AS2( mov WORD_REG(si), [L_INXORBLOCKS]) - AS2( movdqu xmm5, [WORD_REG(si)]) - AS2( pxor xmm2, xmm1) - AS2( pxor xmm2, xmm5) - - // first round, in: xmm2(15,14,13,12;11,10,9,8;7,6,5,4;3,2,1,0), out: eax, ebx, ecx, edx - AS2( movd eax, xmm2) - AS2( psrldq xmm2, 4) - AS2( movd edi, xmm2) - AS2( psrldq xmm2, 4) - MXOR( 1, al, 0) // 0 - XOR( edx, ah, 1) // 1 - AS2( shr eax, 16) - XOR( ecx, al, 2) // 2 - XOR( ebx, ah, 3) // 3 - AS2( mov eax, edi) - AS2( movd edi, xmm2) - AS2( psrldq xmm2, 4) - XOR( ebx, al, 0) // 4 - MXOR( 1, ah, 1) // 5 - AS2( shr eax, 16) - XOR( edx, al, 2) // 6 - XOR( ecx, ah, 3) // 7 - AS2( mov eax, edi) - AS2( movd edi, xmm2) - XOR( ecx, al, 0) // 8 - XOR( ebx, ah, 1) // 9 - AS2( shr eax, 16) - MXOR( 1, al, 2) // 10 - XOR( edx, ah, 3) // 11 - AS2( mov eax, edi) - XOR( edx, al, 0) // 12 - XOR( ecx, ah, 1) // 13 - AS2( shr eax, 16) - XOR( ebx, al, 2) // 14 - MXOR( 1, ah, 3) // 15 - AS2( MOVD eax, MM(1)) - - AS2( add L_REG, [L_KEYS_BEGIN]) - AS2( add L_REG, 4*16) - ASJ( jmp, 2, f) - - ASL(1) - // counter-mode per-block setup - AS2( MOVD ecx, MM(2)) - AS2( MOVD edx, MM(1)) - AS2( mov eax, [L_SAVED_X+0*4]) - AS2( mov ebx, [L_SAVED_X+1*4]) - AS2( xor cl, ch) - AS2( and WORD_REG(cx), 255) - ASL(5) -#if CRYPTOPP_BOOL_X86 - AS2( paddb MM(2), mm3) -#else - AS2( add MM(2), 1) -#endif - // remaining part of second round, in: edx(previous round),esi(keyed counter byte) eax,ebx,[L_SAVED_X+2*4],[L_SAVED_X+3*4], out: eax,ebx,ecx,edx - AS2( xor edx, DWORD PTR [AS_REG_7+WORD_REG(cx)*8+3]) - XOR( ebx, dl, 3) - MOV( ecx, dh, 2) - AS2( shr edx, 16) - AS2( xor ecx, [L_SAVED_X+2*4]) - XOR( eax, dh, 0) - MOV( edx, dl, 1) - AS2( xor edx, [L_SAVED_X+3*4]) - - AS2( add L_REG, [L_KEYS_BEGIN]) - AS2( add L_REG, 3*16) - ASJ( jmp, 4, f) - -// in: eax(0,1,2,3), ebx(4,5,6,7), ecx(8,9,10,11), edx(12,13,14,15) -// out: eax, ebx, edi, mm0 -#define ROUND() \ - MXOR( 0, cl, 3) /* 11 */\ - AS2( mov cl, al) /* 8,9,10,3 */\ - XOR( edi, ah, 2) /* 2 */\ - AS2( shr eax, 16) /* 0,1 */\ - XOR( edi, bl, 3) /* 7 */\ - MXOR( 0, bh, 2) /* 6 */\ - AS2( shr ebx, 16) /* 4,5 */\ - MXOR( 0, al, 1) /* 1 */\ - MOV( eax, ah, 0) /* 0 */\ - XOR( eax, bl, 1) /* 5 */\ - MOV( ebx, bh, 0) /* 4 */\ - XOR( eax, ch, 2) /* 10 */\ - XOR( ebx, cl, 3) /* 3 */\ - AS2( shr ecx, 16) /* 8,9 */\ - XOR( eax, dl, 3) /* 15 */\ - XOR( ebx, dh, 2) /* 14 */\ - AS2( shr edx, 16) /* 12,13 */\ - XOR( edi, ch, 0) /* 8 */\ - XOR( ebx, cl, 1) /* 9 */\ - XOR( edi, dl, 1) /* 13 */\ - MXOR( 0, dh, 0) /* 12 */\ - - ASL(2) // 2-round loop - AS2( MOVD MM(0), [L_SUBKEYS-4*16+3*4]) - AS2( mov edi, [L_SUBKEYS-4*16+2*4]) - ROUND() - AS2( mov ecx, edi) - AS2( xor eax, [L_SUBKEYS-4*16+0*4]) - AS2( xor ebx, [L_SUBKEYS-4*16+1*4]) - AS2( MOVD edx, MM(0)) - - ASL(4) - AS2( MOVD MM(0), [L_SUBKEYS-4*16+7*4]) - AS2( mov edi, [L_SUBKEYS-4*16+6*4]) - ROUND() - AS2( mov ecx, edi) - AS2( xor eax, [L_SUBKEYS-4*16+4*4]) - AS2( xor ebx, [L_SUBKEYS-4*16+5*4]) - AS2( MOVD edx, MM(0)) - - AS2( add L_REG, 32) - AS2( test L_REG, 255) - ASJ( jnz, 2, b) - AS2( sub L_REG, 16*16) - -#define LAST(a, b, c) \ - AS2( movzx esi, a )\ - AS2( movzx edi, BYTE PTR [AS_REG_7+WORD_REG(si)*8+1] )\ - AS2( movzx esi, b )\ - AS2( xor edi, DWORD PTR [AS_REG_7+WORD_REG(si)*8+0] )\ - AS2( mov WORD PTR [L_LASTROUND+c], di )\ - - // last round - LAST(ch, dl, 2) - LAST(dh, al, 6) - AS2( shr edx, 16) - LAST(ah, bl, 10) - AS2( shr eax, 16) - LAST(bh, cl, 14) - AS2( shr ebx, 16) - LAST(dh, al, 12) - AS2( shr ecx, 16) - LAST(ah, bl, 0) - LAST(bh, cl, 4) - LAST(ch, dl, 8) - - AS2( mov WORD_REG(ax), [L_OUTXORBLOCKS]) - AS2( mov WORD_REG(bx), [L_OUTBLOCKS]) - - AS2( mov WORD_REG(cx), [L_LENGTH]) - AS2( sub WORD_REG(cx), 16) - - AS2( movdqu xmm2, [WORD_REG(ax)]) - AS2( pxor xmm2, xmm4) - -#if CRYPTOPP_BOOL_X86 - AS2( movdqa xmm0, [L_INCREMENTS]) - AS2( paddd xmm0, [L_INBLOCKS]) - AS2( movdqa [L_INBLOCKS], xmm0) -#else - AS2( movdqa xmm0, [L_INCREMENTS+16]) - AS2( paddq xmm0, [L_INBLOCKS+16]) - AS2( movdqa [L_INBLOCKS+16], xmm0) -#endif - - AS2( pxor xmm2, [L_LASTROUND]) - AS2( movdqu [WORD_REG(bx)], xmm2) - - ASJ( jle, 7, f) - AS2( mov [L_LENGTH], WORD_REG(cx)) - AS2( test WORD_REG(cx), 1) - ASJ( jnz, 1, b) -#if CRYPTOPP_BOOL_X64 - AS2( movdqa xmm0, [L_INCREMENTS]) - AS2( paddq xmm0, [L_INBLOCKS]) - AS2( movdqa [L_INBLOCKS], xmm0) -#endif - ASJ( jmp, 3, b) - - ASL(7) - // erase keys on stack - AS2( xorps xmm0, xmm0) - AS2( lea WORD_REG(ax), [L_SUBKEYS+7*16]) - AS2( movaps [WORD_REG(ax)-7*16], xmm0) - AS2( movaps [WORD_REG(ax)-6*16], xmm0) - AS2( movaps [WORD_REG(ax)-5*16], xmm0) - AS2( movaps [WORD_REG(ax)-4*16], xmm0) - AS2( movaps [WORD_REG(ax)-3*16], xmm0) - AS2( movaps [WORD_REG(ax)-2*16], xmm0) - AS2( movaps [WORD_REG(ax)-1*16], xmm0) - AS2( movaps [WORD_REG(ax)+0*16], xmm0) - AS2( movaps [WORD_REG(ax)+1*16], xmm0) - AS2( movaps [WORD_REG(ax)+2*16], xmm0) - AS2( movaps [WORD_REG(ax)+3*16], xmm0) - AS2( movaps [WORD_REG(ax)+4*16], xmm0) - AS2( movaps [WORD_REG(ax)+5*16], xmm0) - AS2( movaps [WORD_REG(ax)+6*16], xmm0) -#if CRYPTOPP_BOOL_X86 - AS2( mov esp, [L_SP]) - AS1( emms) -#endif - AS_POP_IF86(bp) - AS_POP_IF86(bx) -#if defined(_MSC_VER) && CRYPTOPP_BOOL_X86 - AS_POP_IF86(di) - AS_POP_IF86(si) - AS1(ret) -#endif -#ifdef CRYPTOPP_GENERATE_X64_MASM - pop r12 - pop rbx - pop rdi - pop rsi - ret - Rijndael_Enc_AdvancedProcessBlocks ENDP -#endif -#ifdef __GNUC__ - ".att_syntax prefix;" - : - : "c" (locals), "d" (k), "S" (Te), "D" (g_cacheLineSize) - : "memory", "cc", "%eax" - #if CRYPTOPP_BOOL_X64 - , "%rbx", "%r8", "%r9", "%r10", "%r11", "%r12" - #endif - ); -#endif -} - -#endif - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k); -} -#endif - -#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 - -static inline bool AliasedWithTable(const byte *begin, const byte *end) -{ - size_t s0 = size_t(begin)%4096, s1 = size_t(end)%4096; - size_t t0 = size_t(Te)%4096, t1 = (size_t(Te)+sizeof(Te))%4096; - if (t1 > t0) - return (s0 >= t0 && s0 < t1) || (s1 > t0 && s1 <= t1); - else - return (s0 < t1 || s1 <= t1) || (s0 >= t0 || s1 > t0); -} - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - -inline void AESNI_Enc_Block(__m128i &block, const __m128i *subkeys, unsigned int rounds) -{ - block = _mm_xor_si128(block, subkeys[0]); - for (unsigned int i=1; i -inline size_t AESNI_AdvancedProcessBlocks(F1 func1, F4 func4, const __m128i *subkeys, unsigned int rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) -{ - size_t blockSize = 16; - size_t inIncrement = (flags & (BlockTransformation::BT_InBlockIsCounter|BlockTransformation::BT_DontIncrementInOutPointers)) ? 0 : blockSize; - size_t xorIncrement = xorBlocks ? blockSize : 0; - size_t outIncrement = (flags & BlockTransformation::BT_DontIncrementInOutPointers) ? 0 : blockSize; - - if (flags & BlockTransformation::BT_ReverseDirection) - { - assert(length % blockSize == 0); - inBlocks += length - blockSize; - xorBlocks += length - blockSize; - outBlocks += length - blockSize; - inIncrement = 0-inIncrement; - xorIncrement = 0-xorIncrement; - outIncrement = 0-outIncrement; - } - - if (flags & BlockTransformation::BT_AllowParallel) - { - while (length >= 4*blockSize) - { - __m128i block0 = _mm_loadu_si128((const __m128i *)inBlocks), block1, block2, block3; - if (flags & BlockTransformation::BT_InBlockIsCounter) - { - const __m128i be1 = *(const __m128i *)s_one; - block1 = _mm_add_epi32(block0, be1); - block2 = _mm_add_epi32(block1, be1); - block3 = _mm_add_epi32(block2, be1); - _mm_storeu_si128((__m128i *)inBlocks, _mm_add_epi32(block3, be1)); - } - else - { - inBlocks += inIncrement; - block1 = _mm_loadu_si128((const __m128i *)inBlocks); - inBlocks += inIncrement; - block2 = _mm_loadu_si128((const __m128i *)inBlocks); - inBlocks += inIncrement; - block3 = _mm_loadu_si128((const __m128i *)inBlocks); - inBlocks += inIncrement; - } - - if (flags & BlockTransformation::BT_XorInput) - { - block0 = _mm_xor_si128(block0, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block1 = _mm_xor_si128(block1, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block2 = _mm_xor_si128(block2, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block3 = _mm_xor_si128(block3, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - } - - func4(block0, block1, block2, block3, subkeys, rounds); - - if (xorBlocks && !(flags & BlockTransformation::BT_XorInput)) - { - block0 = _mm_xor_si128(block0, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block1 = _mm_xor_si128(block1, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block2 = _mm_xor_si128(block2, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - block3 = _mm_xor_si128(block3, _mm_loadu_si128((const __m128i *)xorBlocks)); - xorBlocks += xorIncrement; - } - - _mm_storeu_si128((__m128i *)outBlocks, block0); - outBlocks += outIncrement; - _mm_storeu_si128((__m128i *)outBlocks, block1); - outBlocks += outIncrement; - _mm_storeu_si128((__m128i *)outBlocks, block2); - outBlocks += outIncrement; - _mm_storeu_si128((__m128i *)outBlocks, block3); - outBlocks += outIncrement; - - length -= 4*blockSize; - } - } - - while (length >= blockSize) - { - __m128i block = _mm_loadu_si128((const __m128i *)inBlocks); - - if (flags & BlockTransformation::BT_XorInput) - block = _mm_xor_si128(block, _mm_loadu_si128((const __m128i *)xorBlocks)); - - if (flags & BlockTransformation::BT_InBlockIsCounter) - const_cast(inBlocks)[15]++; - - func1(block, subkeys, rounds); - - if (xorBlocks && !(flags & BlockTransformation::BT_XorInput)) - block = _mm_xor_si128(block, _mm_loadu_si128((const __m128i *)xorBlocks)); - - _mm_storeu_si128((__m128i *)outBlocks, block); - - inBlocks += inIncrement; - outBlocks += outIncrement; - xorBlocks += xorIncrement; - length -= blockSize; - } - - return length; -} -#endif - -size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const -{ -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - if (HasAESNI()) - return AESNI_AdvancedProcessBlocks(AESNI_Enc_Block, AESNI_Enc_4_Blocks, (const __m128i *)m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - if (HasSSE2()) - { - if (length < BLOCKSIZE) - return length; - - struct Locals - { - word32 subkeys[4*12], workspace[8]; - const byte *inBlocks, *inXorBlocks, *outXorBlocks; - byte *outBlocks; - size_t inIncrement, inXorIncrement, outXorIncrement, outIncrement; - size_t regSpill, lengthAndCounterFlag, keysBegin; - }; - - size_t increment = BLOCKSIZE; - const byte* zeros = (byte *)(Te+256); - byte *space; - - do { - space = (byte *)alloca(255+sizeof(Locals)); - space += (256-(size_t)space%256)%256; - } - while (AliasedWithTable(space, space+sizeof(Locals))); - - if (flags & BT_ReverseDirection) - { - assert(length % BLOCKSIZE == 0); - inBlocks += length - BLOCKSIZE; - xorBlocks += length - BLOCKSIZE; - outBlocks += length - BLOCKSIZE; - increment = 0-increment; - } - - Locals &locals = *(Locals *)space; - - locals.inBlocks = inBlocks; - locals.inXorBlocks = (flags & BT_XorInput) && xorBlocks ? xorBlocks : zeros; - locals.outXorBlocks = (flags & BT_XorInput) || !xorBlocks ? zeros : xorBlocks; - locals.outBlocks = outBlocks; - - locals.inIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : increment; - locals.inXorIncrement = (flags & BT_XorInput) && xorBlocks ? increment : 0; - locals.outXorIncrement = (flags & BT_XorInput) || !xorBlocks ? 0 : increment; - locals.outIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : increment; - - locals.lengthAndCounterFlag = length - (length%16) - bool(flags & BT_InBlockIsCounter); - int keysToCopy = m_rounds - (flags & BT_InBlockIsCounter ? 3 : 2); - locals.keysBegin = (12-keysToCopy)*16; - - Rijndael_Enc_AdvancedProcessBlocks(&locals, m_key); - return length % BLOCKSIZE; - } -#endif - - return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags); -} - -#endif - -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - -size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const -{ - if (HasAESNI()) - return AESNI_AdvancedProcessBlocks(AESNI_Dec_Block, AESNI_Dec_4_Blocks, (const __m128i *)m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); - - return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags); -} - -#endif // #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - -NAMESPACE_END - -#endif -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.h deleted file mode 100644 index 64c784b0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rijndael.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef CRYPTOPP_RIJNDAEL_H -#define CRYPTOPP_RIJNDAEL_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct Rijndael_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8> -{ - CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return CRYPTOPP_RIJNDAEL_NAME;} -}; - -/// Rijndael -class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - static void FillEncTable(); - static void FillDecTable(); - - // VS2005 workaround: have to put these on seperate lines, or error C2487 is triggered in DLL build - static const byte Se[256]; - static const byte Sd[256]; - - static const word32 rcon[]; - - unsigned int m_rounds; - FixedSizeAlignedSecBlock m_key; - }; - - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; -#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 - size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const; -#endif - }; - - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; -#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE - size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const; -#endif - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Rijndael::Encryption RijndaelEncryption; -typedef Rijndael::Decryption RijndaelDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.cpp deleted file mode 100644 index 3476aa8b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.cpp +++ /dev/null @@ -1,803 +0,0 @@ -// ripemd.cpp -// RIPEMD-160 written and placed in the public domain by Wei Dai -// RIPEMD-320, RIPEMD-128, RIPEMD-256 written by Kevin Springle -// and also placed in the public domain - -#include "pch.h" -#include "ripemd.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -#define F(x, y, z) (x ^ y ^ z) -#define G(x, y, z) (z ^ (x & (y^z))) -#define H(x, y, z) (z ^ (x | ~y)) -#define I(x, y, z) (y ^ (z & (x^y))) -#define J(x, y, z) (x ^ (y | ~z)) - -#define k0 0 -#define k1 0x5a827999UL -#define k2 0x6ed9eba1UL -#define k3 0x8f1bbcdcUL -#define k4 0xa953fd4eUL -#define k5 0x50a28be6UL -#define k6 0x5c4dd124UL -#define k7 0x6d703ef3UL -#define k8 0x7a6d76e9UL -#define k9 0 - -// ************************************************************* - -// for 160 and 320 -#define Subround(f, a, b, c, d, e, x, s, k) \ - a += f(b, c, d) + x + k;\ - a = rotlFixed((word32)a, s) + e;\ - c = rotlFixed((word32)c, 10U) - -void RIPEMD160::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; - state[4] = 0xc3d2e1f0L; -} - -void RIPEMD160::Transform (word32 *digest, const word32 *X) -{ - unsigned long a1, b1, c1, d1, e1, a2, b2, c2, d2, e2; - a1 = a2 = digest[0]; - b1 = b2 = digest[1]; - c1 = c2 = digest[2]; - d1 = d2 = digest[3]; - e1 = e2 = digest[4]; - - Subround(F, a1, b1, c1, d1, e1, X[ 0], 11, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 1], 14, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 2], 15, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 3], 12, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 4], 5, k0); - Subround(F, a1, b1, c1, d1, e1, X[ 5], 8, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 6], 7, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 7], 9, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 8], 11, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 9], 13, k0); - Subround(F, a1, b1, c1, d1, e1, X[10], 14, k0); - Subround(F, e1, a1, b1, c1, d1, X[11], 15, k0); - Subround(F, d1, e1, a1, b1, c1, X[12], 6, k0); - Subround(F, c1, d1, e1, a1, b1, X[13], 7, k0); - Subround(F, b1, c1, d1, e1, a1, X[14], 9, k0); - Subround(F, a1, b1, c1, d1, e1, X[15], 8, k0); - - Subround(G, e1, a1, b1, c1, d1, X[ 7], 7, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 4], 6, k1); - Subround(G, c1, d1, e1, a1, b1, X[13], 8, k1); - Subround(G, b1, c1, d1, e1, a1, X[ 1], 13, k1); - Subround(G, a1, b1, c1, d1, e1, X[10], 11, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 6], 9, k1); - Subround(G, d1, e1, a1, b1, c1, X[15], 7, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 3], 15, k1); - Subround(G, b1, c1, d1, e1, a1, X[12], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[ 0], 12, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 9], 15, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 5], 9, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 2], 11, k1); - Subround(G, b1, c1, d1, e1, a1, X[14], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[11], 13, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 8], 12, k1); - - Subround(H, d1, e1, a1, b1, c1, X[ 3], 11, k2); - Subround(H, c1, d1, e1, a1, b1, X[10], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[14], 6, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 4], 7, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 9], 14, k2); - Subround(H, d1, e1, a1, b1, c1, X[15], 9, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 8], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[ 1], 15, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 2], 14, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 7], 8, k2); - Subround(H, d1, e1, a1, b1, c1, X[ 0], 13, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 6], 6, k2); - Subround(H, b1, c1, d1, e1, a1, X[13], 5, k2); - Subround(H, a1, b1, c1, d1, e1, X[11], 12, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 5], 7, k2); - Subround(H, d1, e1, a1, b1, c1, X[12], 5, k2); - - Subround(I, c1, d1, e1, a1, b1, X[ 1], 11, k3); - Subround(I, b1, c1, d1, e1, a1, X[ 9], 12, k3); - Subround(I, a1, b1, c1, d1, e1, X[11], 14, k3); - Subround(I, e1, a1, b1, c1, d1, X[10], 15, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 0], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 8], 15, k3); - Subround(I, b1, c1, d1, e1, a1, X[12], 9, k3); - Subround(I, a1, b1, c1, d1, e1, X[ 4], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[13], 9, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 3], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 7], 5, k3); - Subround(I, b1, c1, d1, e1, a1, X[15], 6, k3); - Subround(I, a1, b1, c1, d1, e1, X[14], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[ 5], 6, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 6], 5, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 2], 12, k3); - - Subround(J, b1, c1, d1, e1, a1, X[ 4], 9, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 0], 15, k4); - Subround(J, e1, a1, b1, c1, d1, X[ 5], 5, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 9], 11, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 7], 6, k4); - Subround(J, b1, c1, d1, e1, a1, X[12], 8, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 2], 13, k4); - Subround(J, e1, a1, b1, c1, d1, X[10], 12, k4); - Subround(J, d1, e1, a1, b1, c1, X[14], 5, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 1], 12, k4); - Subround(J, b1, c1, d1, e1, a1, X[ 3], 13, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 8], 14, k4); - Subround(J, e1, a1, b1, c1, d1, X[11], 11, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 6], 8, k4); - Subround(J, c1, d1, e1, a1, b1, X[15], 5, k4); - Subround(J, b1, c1, d1, e1, a1, X[13], 6, k4); - - Subround(J, a2, b2, c2, d2, e2, X[ 5], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[14], 9, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 7], 9, k5); - Subround(J, c2, d2, e2, a2, b2, X[ 0], 11, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 9], 13, k5); - Subround(J, a2, b2, c2, d2, e2, X[ 2], 15, k5); - Subround(J, e2, a2, b2, c2, d2, X[11], 15, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 4], 5, k5); - Subround(J, c2, d2, e2, a2, b2, X[13], 7, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 6], 7, k5); - Subround(J, a2, b2, c2, d2, e2, X[15], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[ 8], 11, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 1], 14, k5); - Subround(J, c2, d2, e2, a2, b2, X[10], 14, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 3], 12, k5); - Subround(J, a2, b2, c2, d2, e2, X[12], 6, k5); - - Subround(I, e2, a2, b2, c2, d2, X[ 6], 9, k6); - Subround(I, d2, e2, a2, b2, c2, X[11], 13, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 3], 15, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 7], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 0], 12, k6); - Subround(I, e2, a2, b2, c2, d2, X[13], 8, k6); - Subround(I, d2, e2, a2, b2, c2, X[ 5], 9, k6); - Subround(I, c2, d2, e2, a2, b2, X[10], 11, k6); - Subround(I, b2, c2, d2, e2, a2, X[14], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[15], 7, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 8], 12, k6); - Subround(I, d2, e2, a2, b2, c2, X[12], 7, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 4], 6, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 9], 15, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 1], 13, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 2], 11, k6); - - Subround(H, d2, e2, a2, b2, c2, X[15], 9, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 5], 7, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 1], 15, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 3], 11, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 7], 8, k7); - Subround(H, d2, e2, a2, b2, c2, X[14], 6, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 6], 6, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 9], 14, k7); - Subround(H, a2, b2, c2, d2, e2, X[11], 12, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 8], 13, k7); - Subround(H, d2, e2, a2, b2, c2, X[12], 5, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 2], 14, k7); - Subround(H, b2, c2, d2, e2, a2, X[10], 13, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 0], 13, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 4], 7, k7); - Subround(H, d2, e2, a2, b2, c2, X[13], 5, k7); - - Subround(G, c2, d2, e2, a2, b2, X[ 8], 15, k8); - Subround(G, b2, c2, d2, e2, a2, X[ 6], 5, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 4], 8, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 1], 11, k8); - Subround(G, d2, e2, a2, b2, c2, X[ 3], 14, k8); - Subround(G, c2, d2, e2, a2, b2, X[11], 14, k8); - Subround(G, b2, c2, d2, e2, a2, X[15], 6, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 0], 14, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 5], 6, k8); - Subround(G, d2, e2, a2, b2, c2, X[12], 9, k8); - Subround(G, c2, d2, e2, a2, b2, X[ 2], 12, k8); - Subround(G, b2, c2, d2, e2, a2, X[13], 9, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 9], 12, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 7], 5, k8); - Subround(G, d2, e2, a2, b2, c2, X[10], 15, k8); - Subround(G, c2, d2, e2, a2, b2, X[14], 8, k8); - - Subround(F, b2, c2, d2, e2, a2, X[12], 8, k9); - Subround(F, a2, b2, c2, d2, e2, X[15], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[10], 12, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 4], 9, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 1], 12, k9); - Subround(F, b2, c2, d2, e2, a2, X[ 5], 5, k9); - Subround(F, a2, b2, c2, d2, e2, X[ 8], 14, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 7], 6, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 6], 8, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 2], 13, k9); - Subround(F, b2, c2, d2, e2, a2, X[13], 6, k9); - Subround(F, a2, b2, c2, d2, e2, X[14], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 0], 15, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 3], 13, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 9], 11, k9); - Subround(F, b2, c2, d2, e2, a2, X[11], 11, k9); - - c1 = digest[1] + c1 + d2; - digest[1] = digest[2] + d1 + e2; - digest[2] = digest[3] + e1 + a2; - digest[3] = digest[4] + a1 + b2; - digest[4] = digest[0] + b1 + c2; - digest[0] = c1; -} - -// ************************************************************* - -void RIPEMD320::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; - state[4] = 0xc3d2e1f0L; - state[5] = 0x76543210L; - state[6] = 0xfedcba98L; - state[7] = 0x89abcdefL; - state[8] = 0x01234567L; - state[9] = 0x3c2d1e0fL; -} - -void RIPEMD320::Transform (word32 *digest, const word32 *X) -{ - unsigned long a1, b1, c1, d1, e1, a2, b2, c2, d2, e2, t; - a1 = digest[0]; - b1 = digest[1]; - c1 = digest[2]; - d1 = digest[3]; - e1 = digest[4]; - a2 = digest[5]; - b2 = digest[6]; - c2 = digest[7]; - d2 = digest[8]; - e2 = digest[9]; - - Subround(F, a1, b1, c1, d1, e1, X[ 0], 11, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 1], 14, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 2], 15, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 3], 12, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 4], 5, k0); - Subround(F, a1, b1, c1, d1, e1, X[ 5], 8, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 6], 7, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 7], 9, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 8], 11, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 9], 13, k0); - Subround(F, a1, b1, c1, d1, e1, X[10], 14, k0); - Subround(F, e1, a1, b1, c1, d1, X[11], 15, k0); - Subround(F, d1, e1, a1, b1, c1, X[12], 6, k0); - Subround(F, c1, d1, e1, a1, b1, X[13], 7, k0); - Subround(F, b1, c1, d1, e1, a1, X[14], 9, k0); - Subround(F, a1, b1, c1, d1, e1, X[15], 8, k0); - - Subround(J, a2, b2, c2, d2, e2, X[ 5], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[14], 9, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 7], 9, k5); - Subround(J, c2, d2, e2, a2, b2, X[ 0], 11, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 9], 13, k5); - Subround(J, a2, b2, c2, d2, e2, X[ 2], 15, k5); - Subround(J, e2, a2, b2, c2, d2, X[11], 15, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 4], 5, k5); - Subround(J, c2, d2, e2, a2, b2, X[13], 7, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 6], 7, k5); - Subround(J, a2, b2, c2, d2, e2, X[15], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[ 8], 11, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 1], 14, k5); - Subround(J, c2, d2, e2, a2, b2, X[10], 14, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 3], 12, k5); - Subround(J, a2, b2, c2, d2, e2, X[12], 6, k5); - - t = a1; a1 = a2; a2 = t; - - Subround(G, e1, a1, b1, c1, d1, X[ 7], 7, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 4], 6, k1); - Subround(G, c1, d1, e1, a1, b1, X[13], 8, k1); - Subround(G, b1, c1, d1, e1, a1, X[ 1], 13, k1); - Subround(G, a1, b1, c1, d1, e1, X[10], 11, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 6], 9, k1); - Subround(G, d1, e1, a1, b1, c1, X[15], 7, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 3], 15, k1); - Subround(G, b1, c1, d1, e1, a1, X[12], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[ 0], 12, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 9], 15, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 5], 9, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 2], 11, k1); - Subround(G, b1, c1, d1, e1, a1, X[14], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[11], 13, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 8], 12, k1); - - Subround(I, e2, a2, b2, c2, d2, X[ 6], 9, k6); - Subround(I, d2, e2, a2, b2, c2, X[11], 13, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 3], 15, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 7], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 0], 12, k6); - Subround(I, e2, a2, b2, c2, d2, X[13], 8, k6); - Subround(I, d2, e2, a2, b2, c2, X[ 5], 9, k6); - Subround(I, c2, d2, e2, a2, b2, X[10], 11, k6); - Subround(I, b2, c2, d2, e2, a2, X[14], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[15], 7, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 8], 12, k6); - Subround(I, d2, e2, a2, b2, c2, X[12], 7, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 4], 6, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 9], 15, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 1], 13, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 2], 11, k6); - - t = b1; b1 = b2; b2 = t; - - Subround(H, d1, e1, a1, b1, c1, X[ 3], 11, k2); - Subround(H, c1, d1, e1, a1, b1, X[10], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[14], 6, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 4], 7, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 9], 14, k2); - Subround(H, d1, e1, a1, b1, c1, X[15], 9, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 8], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[ 1], 15, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 2], 14, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 7], 8, k2); - Subround(H, d1, e1, a1, b1, c1, X[ 0], 13, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 6], 6, k2); - Subround(H, b1, c1, d1, e1, a1, X[13], 5, k2); - Subround(H, a1, b1, c1, d1, e1, X[11], 12, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 5], 7, k2); - Subround(H, d1, e1, a1, b1, c1, X[12], 5, k2); - - Subround(H, d2, e2, a2, b2, c2, X[15], 9, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 5], 7, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 1], 15, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 3], 11, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 7], 8, k7); - Subround(H, d2, e2, a2, b2, c2, X[14], 6, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 6], 6, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 9], 14, k7); - Subround(H, a2, b2, c2, d2, e2, X[11], 12, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 8], 13, k7); - Subround(H, d2, e2, a2, b2, c2, X[12], 5, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 2], 14, k7); - Subround(H, b2, c2, d2, e2, a2, X[10], 13, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 0], 13, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 4], 7, k7); - Subround(H, d2, e2, a2, b2, c2, X[13], 5, k7); - - t = c1; c1 = c2; c2 = t; - - Subround(I, c1, d1, e1, a1, b1, X[ 1], 11, k3); - Subround(I, b1, c1, d1, e1, a1, X[ 9], 12, k3); - Subround(I, a1, b1, c1, d1, e1, X[11], 14, k3); - Subround(I, e1, a1, b1, c1, d1, X[10], 15, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 0], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 8], 15, k3); - Subround(I, b1, c1, d1, e1, a1, X[12], 9, k3); - Subround(I, a1, b1, c1, d1, e1, X[ 4], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[13], 9, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 3], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 7], 5, k3); - Subround(I, b1, c1, d1, e1, a1, X[15], 6, k3); - Subround(I, a1, b1, c1, d1, e1, X[14], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[ 5], 6, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 6], 5, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 2], 12, k3); - - Subround(G, c2, d2, e2, a2, b2, X[ 8], 15, k8); - Subround(G, b2, c2, d2, e2, a2, X[ 6], 5, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 4], 8, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 1], 11, k8); - Subround(G, d2, e2, a2, b2, c2, X[ 3], 14, k8); - Subround(G, c2, d2, e2, a2, b2, X[11], 14, k8); - Subround(G, b2, c2, d2, e2, a2, X[15], 6, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 0], 14, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 5], 6, k8); - Subround(G, d2, e2, a2, b2, c2, X[12], 9, k8); - Subround(G, c2, d2, e2, a2, b2, X[ 2], 12, k8); - Subround(G, b2, c2, d2, e2, a2, X[13], 9, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 9], 12, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 7], 5, k8); - Subround(G, d2, e2, a2, b2, c2, X[10], 15, k8); - Subround(G, c2, d2, e2, a2, b2, X[14], 8, k8); - - t = d1; d1 = d2; d2 = t; - - Subround(J, b1, c1, d1, e1, a1, X[ 4], 9, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 0], 15, k4); - Subround(J, e1, a1, b1, c1, d1, X[ 5], 5, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 9], 11, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 7], 6, k4); - Subround(J, b1, c1, d1, e1, a1, X[12], 8, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 2], 13, k4); - Subround(J, e1, a1, b1, c1, d1, X[10], 12, k4); - Subround(J, d1, e1, a1, b1, c1, X[14], 5, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 1], 12, k4); - Subround(J, b1, c1, d1, e1, a1, X[ 3], 13, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 8], 14, k4); - Subround(J, e1, a1, b1, c1, d1, X[11], 11, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 6], 8, k4); - Subround(J, c1, d1, e1, a1, b1, X[15], 5, k4); - Subround(J, b1, c1, d1, e1, a1, X[13], 6, k4); - - Subround(F, b2, c2, d2, e2, a2, X[12], 8, k9); - Subround(F, a2, b2, c2, d2, e2, X[15], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[10], 12, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 4], 9, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 1], 12, k9); - Subround(F, b2, c2, d2, e2, a2, X[ 5], 5, k9); - Subround(F, a2, b2, c2, d2, e2, X[ 8], 14, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 7], 6, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 6], 8, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 2], 13, k9); - Subround(F, b2, c2, d2, e2, a2, X[13], 6, k9); - Subround(F, a2, b2, c2, d2, e2, X[14], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 0], 15, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 3], 13, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 9], 11, k9); - Subround(F, b2, c2, d2, e2, a2, X[11], 11, k9); - - t = e1; e1 = e2; e2 = t; - - digest[0] += a1; - digest[1] += b1; - digest[2] += c1; - digest[3] += d1; - digest[4] += e1; - digest[5] += a2; - digest[6] += b2; - digest[7] += c2; - digest[8] += d2; - digest[9] += e2; -} - -#undef Subround - -// ************************************************************* - -// for 128 and 256 -#define Subround(f, a, b, c, d, x, s, k) \ - a += f(b, c, d) + x + k;\ - a = rotlFixed((word32)a, s); - -void RIPEMD128::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; -} - -void RIPEMD128::Transform (word32 *digest, const word32 *X) -{ - unsigned long a1, b1, c1, d1, a2, b2, c2, d2; - a1 = a2 = digest[0]; - b1 = b2 = digest[1]; - c1 = c2 = digest[2]; - d1 = d2 = digest[3]; - - Subround(F, a1, b1, c1, d1, X[ 0], 11, k0); - Subround(F, d1, a1, b1, c1, X[ 1], 14, k0); - Subround(F, c1, d1, a1, b1, X[ 2], 15, k0); - Subround(F, b1, c1, d1, a1, X[ 3], 12, k0); - Subround(F, a1, b1, c1, d1, X[ 4], 5, k0); - Subround(F, d1, a1, b1, c1, X[ 5], 8, k0); - Subround(F, c1, d1, a1, b1, X[ 6], 7, k0); - Subround(F, b1, c1, d1, a1, X[ 7], 9, k0); - Subround(F, a1, b1, c1, d1, X[ 8], 11, k0); - Subround(F, d1, a1, b1, c1, X[ 9], 13, k0); - Subround(F, c1, d1, a1, b1, X[10], 14, k0); - Subround(F, b1, c1, d1, a1, X[11], 15, k0); - Subround(F, a1, b1, c1, d1, X[12], 6, k0); - Subround(F, d1, a1, b1, c1, X[13], 7, k0); - Subround(F, c1, d1, a1, b1, X[14], 9, k0); - Subround(F, b1, c1, d1, a1, X[15], 8, k0); - - Subround(G, a1, b1, c1, d1, X[ 7], 7, k1); - Subround(G, d1, a1, b1, c1, X[ 4], 6, k1); - Subround(G, c1, d1, a1, b1, X[13], 8, k1); - Subround(G, b1, c1, d1, a1, X[ 1], 13, k1); - Subround(G, a1, b1, c1, d1, X[10], 11, k1); - Subround(G, d1, a1, b1, c1, X[ 6], 9, k1); - Subround(G, c1, d1, a1, b1, X[15], 7, k1); - Subround(G, b1, c1, d1, a1, X[ 3], 15, k1); - Subround(G, a1, b1, c1, d1, X[12], 7, k1); - Subround(G, d1, a1, b1, c1, X[ 0], 12, k1); - Subround(G, c1, d1, a1, b1, X[ 9], 15, k1); - Subround(G, b1, c1, d1, a1, X[ 5], 9, k1); - Subround(G, a1, b1, c1, d1, X[ 2], 11, k1); - Subround(G, d1, a1, b1, c1, X[14], 7, k1); - Subround(G, c1, d1, a1, b1, X[11], 13, k1); - Subround(G, b1, c1, d1, a1, X[ 8], 12, k1); - - Subround(H, a1, b1, c1, d1, X[ 3], 11, k2); - Subround(H, d1, a1, b1, c1, X[10], 13, k2); - Subround(H, c1, d1, a1, b1, X[14], 6, k2); - Subround(H, b1, c1, d1, a1, X[ 4], 7, k2); - Subround(H, a1, b1, c1, d1, X[ 9], 14, k2); - Subround(H, d1, a1, b1, c1, X[15], 9, k2); - Subround(H, c1, d1, a1, b1, X[ 8], 13, k2); - Subround(H, b1, c1, d1, a1, X[ 1], 15, k2); - Subround(H, a1, b1, c1, d1, X[ 2], 14, k2); - Subround(H, d1, a1, b1, c1, X[ 7], 8, k2); - Subround(H, c1, d1, a1, b1, X[ 0], 13, k2); - Subround(H, b1, c1, d1, a1, X[ 6], 6, k2); - Subround(H, a1, b1, c1, d1, X[13], 5, k2); - Subround(H, d1, a1, b1, c1, X[11], 12, k2); - Subround(H, c1, d1, a1, b1, X[ 5], 7, k2); - Subround(H, b1, c1, d1, a1, X[12], 5, k2); - - Subround(I, a1, b1, c1, d1, X[ 1], 11, k3); - Subround(I, d1, a1, b1, c1, X[ 9], 12, k3); - Subround(I, c1, d1, a1, b1, X[11], 14, k3); - Subround(I, b1, c1, d1, a1, X[10], 15, k3); - Subround(I, a1, b1, c1, d1, X[ 0], 14, k3); - Subround(I, d1, a1, b1, c1, X[ 8], 15, k3); - Subround(I, c1, d1, a1, b1, X[12], 9, k3); - Subround(I, b1, c1, d1, a1, X[ 4], 8, k3); - Subround(I, a1, b1, c1, d1, X[13], 9, k3); - Subround(I, d1, a1, b1, c1, X[ 3], 14, k3); - Subround(I, c1, d1, a1, b1, X[ 7], 5, k3); - Subround(I, b1, c1, d1, a1, X[15], 6, k3); - Subround(I, a1, b1, c1, d1, X[14], 8, k3); - Subround(I, d1, a1, b1, c1, X[ 5], 6, k3); - Subround(I, c1, d1, a1, b1, X[ 6], 5, k3); - Subround(I, b1, c1, d1, a1, X[ 2], 12, k3); - - Subround(I, a2, b2, c2, d2, X[ 5], 8, k5); - Subround(I, d2, a2, b2, c2, X[14], 9, k5); - Subround(I, c2, d2, a2, b2, X[ 7], 9, k5); - Subround(I, b2, c2, d2, a2, X[ 0], 11, k5); - Subround(I, a2, b2, c2, d2, X[ 9], 13, k5); - Subround(I, d2, a2, b2, c2, X[ 2], 15, k5); - Subround(I, c2, d2, a2, b2, X[11], 15, k5); - Subround(I, b2, c2, d2, a2, X[ 4], 5, k5); - Subround(I, a2, b2, c2, d2, X[13], 7, k5); - Subround(I, d2, a2, b2, c2, X[ 6], 7, k5); - Subround(I, c2, d2, a2, b2, X[15], 8, k5); - Subround(I, b2, c2, d2, a2, X[ 8], 11, k5); - Subround(I, a2, b2, c2, d2, X[ 1], 14, k5); - Subround(I, d2, a2, b2, c2, X[10], 14, k5); - Subround(I, c2, d2, a2, b2, X[ 3], 12, k5); - Subround(I, b2, c2, d2, a2, X[12], 6, k5); - - Subround(H, a2, b2, c2, d2, X[ 6], 9, k6); - Subround(H, d2, a2, b2, c2, X[11], 13, k6); - Subround(H, c2, d2, a2, b2, X[ 3], 15, k6); - Subround(H, b2, c2, d2, a2, X[ 7], 7, k6); - Subround(H, a2, b2, c2, d2, X[ 0], 12, k6); - Subround(H, d2, a2, b2, c2, X[13], 8, k6); - Subround(H, c2, d2, a2, b2, X[ 5], 9, k6); - Subround(H, b2, c2, d2, a2, X[10], 11, k6); - Subround(H, a2, b2, c2, d2, X[14], 7, k6); - Subround(H, d2, a2, b2, c2, X[15], 7, k6); - Subround(H, c2, d2, a2, b2, X[ 8], 12, k6); - Subround(H, b2, c2, d2, a2, X[12], 7, k6); - Subround(H, a2, b2, c2, d2, X[ 4], 6, k6); - Subround(H, d2, a2, b2, c2, X[ 9], 15, k6); - Subround(H, c2, d2, a2, b2, X[ 1], 13, k6); - Subround(H, b2, c2, d2, a2, X[ 2], 11, k6); - - Subround(G, a2, b2, c2, d2, X[15], 9, k7); - Subround(G, d2, a2, b2, c2, X[ 5], 7, k7); - Subround(G, c2, d2, a2, b2, X[ 1], 15, k7); - Subround(G, b2, c2, d2, a2, X[ 3], 11, k7); - Subround(G, a2, b2, c2, d2, X[ 7], 8, k7); - Subround(G, d2, a2, b2, c2, X[14], 6, k7); - Subround(G, c2, d2, a2, b2, X[ 6], 6, k7); - Subround(G, b2, c2, d2, a2, X[ 9], 14, k7); - Subround(G, a2, b2, c2, d2, X[11], 12, k7); - Subround(G, d2, a2, b2, c2, X[ 8], 13, k7); - Subround(G, c2, d2, a2, b2, X[12], 5, k7); - Subround(G, b2, c2, d2, a2, X[ 2], 14, k7); - Subround(G, a2, b2, c2, d2, X[10], 13, k7); - Subround(G, d2, a2, b2, c2, X[ 0], 13, k7); - Subround(G, c2, d2, a2, b2, X[ 4], 7, k7); - Subround(G, b2, c2, d2, a2, X[13], 5, k7); - - Subround(F, a2, b2, c2, d2, X[ 8], 15, k9); - Subround(F, d2, a2, b2, c2, X[ 6], 5, k9); - Subround(F, c2, d2, a2, b2, X[ 4], 8, k9); - Subround(F, b2, c2, d2, a2, X[ 1], 11, k9); - Subround(F, a2, b2, c2, d2, X[ 3], 14, k9); - Subround(F, d2, a2, b2, c2, X[11], 14, k9); - Subround(F, c2, d2, a2, b2, X[15], 6, k9); - Subround(F, b2, c2, d2, a2, X[ 0], 14, k9); - Subround(F, a2, b2, c2, d2, X[ 5], 6, k9); - Subround(F, d2, a2, b2, c2, X[12], 9, k9); - Subround(F, c2, d2, a2, b2, X[ 2], 12, k9); - Subround(F, b2, c2, d2, a2, X[13], 9, k9); - Subround(F, a2, b2, c2, d2, X[ 9], 12, k9); - Subround(F, d2, a2, b2, c2, X[ 7], 5, k9); - Subround(F, c2, d2, a2, b2, X[10], 15, k9); - Subround(F, b2, c2, d2, a2, X[14], 8, k9); - - c1 = digest[1] + c1 + d2; - digest[1] = digest[2] + d1 + a2; - digest[2] = digest[3] + a1 + b2; - digest[3] = digest[0] + b1 + c2; - digest[0] = c1; -} - -// ************************************************************* - -void RIPEMD256::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xefcdab89L; - state[2] = 0x98badcfeL; - state[3] = 0x10325476L; - state[4] = 0x76543210L; - state[5] = 0xfedcba98L; - state[6] = 0x89abcdefL; - state[7] = 0x01234567L; -} - -void RIPEMD256::Transform (word32 *digest, const word32 *X) -{ - unsigned long a1, b1, c1, d1, a2, b2, c2, d2, t; - a1 = digest[0]; - b1 = digest[1]; - c1 = digest[2]; - d1 = digest[3]; - a2 = digest[4]; - b2 = digest[5]; - c2 = digest[6]; - d2 = digest[7]; - - Subround(F, a1, b1, c1, d1, X[ 0], 11, k0); - Subround(F, d1, a1, b1, c1, X[ 1], 14, k0); - Subround(F, c1, d1, a1, b1, X[ 2], 15, k0); - Subround(F, b1, c1, d1, a1, X[ 3], 12, k0); - Subround(F, a1, b1, c1, d1, X[ 4], 5, k0); - Subround(F, d1, a1, b1, c1, X[ 5], 8, k0); - Subround(F, c1, d1, a1, b1, X[ 6], 7, k0); - Subround(F, b1, c1, d1, a1, X[ 7], 9, k0); - Subround(F, a1, b1, c1, d1, X[ 8], 11, k0); - Subround(F, d1, a1, b1, c1, X[ 9], 13, k0); - Subround(F, c1, d1, a1, b1, X[10], 14, k0); - Subround(F, b1, c1, d1, a1, X[11], 15, k0); - Subround(F, a1, b1, c1, d1, X[12], 6, k0); - Subround(F, d1, a1, b1, c1, X[13], 7, k0); - Subround(F, c1, d1, a1, b1, X[14], 9, k0); - Subround(F, b1, c1, d1, a1, X[15], 8, k0); - - Subround(I, a2, b2, c2, d2, X[ 5], 8, k5); - Subround(I, d2, a2, b2, c2, X[14], 9, k5); - Subround(I, c2, d2, a2, b2, X[ 7], 9, k5); - Subround(I, b2, c2, d2, a2, X[ 0], 11, k5); - Subround(I, a2, b2, c2, d2, X[ 9], 13, k5); - Subround(I, d2, a2, b2, c2, X[ 2], 15, k5); - Subround(I, c2, d2, a2, b2, X[11], 15, k5); - Subround(I, b2, c2, d2, a2, X[ 4], 5, k5); - Subround(I, a2, b2, c2, d2, X[13], 7, k5); - Subround(I, d2, a2, b2, c2, X[ 6], 7, k5); - Subround(I, c2, d2, a2, b2, X[15], 8, k5); - Subround(I, b2, c2, d2, a2, X[ 8], 11, k5); - Subround(I, a2, b2, c2, d2, X[ 1], 14, k5); - Subround(I, d2, a2, b2, c2, X[10], 14, k5); - Subround(I, c2, d2, a2, b2, X[ 3], 12, k5); - Subround(I, b2, c2, d2, a2, X[12], 6, k5); - - t = a1; a1 = a2; a2 = t; - - Subround(G, a1, b1, c1, d1, X[ 7], 7, k1); - Subround(G, d1, a1, b1, c1, X[ 4], 6, k1); - Subround(G, c1, d1, a1, b1, X[13], 8, k1); - Subround(G, b1, c1, d1, a1, X[ 1], 13, k1); - Subround(G, a1, b1, c1, d1, X[10], 11, k1); - Subround(G, d1, a1, b1, c1, X[ 6], 9, k1); - Subround(G, c1, d1, a1, b1, X[15], 7, k1); - Subround(G, b1, c1, d1, a1, X[ 3], 15, k1); - Subround(G, a1, b1, c1, d1, X[12], 7, k1); - Subround(G, d1, a1, b1, c1, X[ 0], 12, k1); - Subround(G, c1, d1, a1, b1, X[ 9], 15, k1); - Subround(G, b1, c1, d1, a1, X[ 5], 9, k1); - Subround(G, a1, b1, c1, d1, X[ 2], 11, k1); - Subround(G, d1, a1, b1, c1, X[14], 7, k1); - Subround(G, c1, d1, a1, b1, X[11], 13, k1); - Subround(G, b1, c1, d1, a1, X[ 8], 12, k1); - - Subround(H, a2, b2, c2, d2, X[ 6], 9, k6); - Subround(H, d2, a2, b2, c2, X[11], 13, k6); - Subround(H, c2, d2, a2, b2, X[ 3], 15, k6); - Subround(H, b2, c2, d2, a2, X[ 7], 7, k6); - Subround(H, a2, b2, c2, d2, X[ 0], 12, k6); - Subround(H, d2, a2, b2, c2, X[13], 8, k6); - Subround(H, c2, d2, a2, b2, X[ 5], 9, k6); - Subround(H, b2, c2, d2, a2, X[10], 11, k6); - Subround(H, a2, b2, c2, d2, X[14], 7, k6); - Subround(H, d2, a2, b2, c2, X[15], 7, k6); - Subround(H, c2, d2, a2, b2, X[ 8], 12, k6); - Subround(H, b2, c2, d2, a2, X[12], 7, k6); - Subround(H, a2, b2, c2, d2, X[ 4], 6, k6); - Subround(H, d2, a2, b2, c2, X[ 9], 15, k6); - Subround(H, c2, d2, a2, b2, X[ 1], 13, k6); - Subround(H, b2, c2, d2, a2, X[ 2], 11, k6); - - t = b1; b1 = b2; b2 = t; - - Subround(H, a1, b1, c1, d1, X[ 3], 11, k2); - Subround(H, d1, a1, b1, c1, X[10], 13, k2); - Subround(H, c1, d1, a1, b1, X[14], 6, k2); - Subround(H, b1, c1, d1, a1, X[ 4], 7, k2); - Subround(H, a1, b1, c1, d1, X[ 9], 14, k2); - Subround(H, d1, a1, b1, c1, X[15], 9, k2); - Subround(H, c1, d1, a1, b1, X[ 8], 13, k2); - Subround(H, b1, c1, d1, a1, X[ 1], 15, k2); - Subround(H, a1, b1, c1, d1, X[ 2], 14, k2); - Subround(H, d1, a1, b1, c1, X[ 7], 8, k2); - Subround(H, c1, d1, a1, b1, X[ 0], 13, k2); - Subround(H, b1, c1, d1, a1, X[ 6], 6, k2); - Subround(H, a1, b1, c1, d1, X[13], 5, k2); - Subround(H, d1, a1, b1, c1, X[11], 12, k2); - Subround(H, c1, d1, a1, b1, X[ 5], 7, k2); - Subround(H, b1, c1, d1, a1, X[12], 5, k2); - - Subround(G, a2, b2, c2, d2, X[15], 9, k7); - Subround(G, d2, a2, b2, c2, X[ 5], 7, k7); - Subround(G, c2, d2, a2, b2, X[ 1], 15, k7); - Subround(G, b2, c2, d2, a2, X[ 3], 11, k7); - Subround(G, a2, b2, c2, d2, X[ 7], 8, k7); - Subround(G, d2, a2, b2, c2, X[14], 6, k7); - Subround(G, c2, d2, a2, b2, X[ 6], 6, k7); - Subround(G, b2, c2, d2, a2, X[ 9], 14, k7); - Subround(G, a2, b2, c2, d2, X[11], 12, k7); - Subround(G, d2, a2, b2, c2, X[ 8], 13, k7); - Subround(G, c2, d2, a2, b2, X[12], 5, k7); - Subround(G, b2, c2, d2, a2, X[ 2], 14, k7); - Subround(G, a2, b2, c2, d2, X[10], 13, k7); - Subround(G, d2, a2, b2, c2, X[ 0], 13, k7); - Subround(G, c2, d2, a2, b2, X[ 4], 7, k7); - Subround(G, b2, c2, d2, a2, X[13], 5, k7); - - t = c1; c1 = c2; c2 = t; - - Subround(I, a1, b1, c1, d1, X[ 1], 11, k3); - Subround(I, d1, a1, b1, c1, X[ 9], 12, k3); - Subround(I, c1, d1, a1, b1, X[11], 14, k3); - Subround(I, b1, c1, d1, a1, X[10], 15, k3); - Subround(I, a1, b1, c1, d1, X[ 0], 14, k3); - Subround(I, d1, a1, b1, c1, X[ 8], 15, k3); - Subround(I, c1, d1, a1, b1, X[12], 9, k3); - Subround(I, b1, c1, d1, a1, X[ 4], 8, k3); - Subround(I, a1, b1, c1, d1, X[13], 9, k3); - Subround(I, d1, a1, b1, c1, X[ 3], 14, k3); - Subround(I, c1, d1, a1, b1, X[ 7], 5, k3); - Subround(I, b1, c1, d1, a1, X[15], 6, k3); - Subround(I, a1, b1, c1, d1, X[14], 8, k3); - Subround(I, d1, a1, b1, c1, X[ 5], 6, k3); - Subround(I, c1, d1, a1, b1, X[ 6], 5, k3); - Subround(I, b1, c1, d1, a1, X[ 2], 12, k3); - - Subround(F, a2, b2, c2, d2, X[ 8], 15, k9); - Subround(F, d2, a2, b2, c2, X[ 6], 5, k9); - Subround(F, c2, d2, a2, b2, X[ 4], 8, k9); - Subround(F, b2, c2, d2, a2, X[ 1], 11, k9); - Subround(F, a2, b2, c2, d2, X[ 3], 14, k9); - Subround(F, d2, a2, b2, c2, X[11], 14, k9); - Subround(F, c2, d2, a2, b2, X[15], 6, k9); - Subround(F, b2, c2, d2, a2, X[ 0], 14, k9); - Subround(F, a2, b2, c2, d2, X[ 5], 6, k9); - Subround(F, d2, a2, b2, c2, X[12], 9, k9); - Subround(F, c2, d2, a2, b2, X[ 2], 12, k9); - Subround(F, b2, c2, d2, a2, X[13], 9, k9); - Subround(F, a2, b2, c2, d2, X[ 9], 12, k9); - Subround(F, d2, a2, b2, c2, X[ 7], 5, k9); - Subround(F, c2, d2, a2, b2, X[10], 15, k9); - Subround(F, b2, c2, d2, a2, X[14], 8, k9); - - t = d1; d1 = d2; d2 = t; - - digest[0] += a1; - digest[1] += b1; - digest[2] += c1; - digest[3] += d1; - digest[4] += a2; - digest[5] += b2; - digest[6] += c2; - digest[7] += d2; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.h deleted file mode 100644 index 56871a91..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ripemd.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef CRYPTOPP_RIPEMD_H -#define CRYPTOPP_RIPEMD_H - -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! RIPEMD-160 -/*! Digest Length = 160 bits */ -class RIPEMD160 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char * StaticAlgorithmName() {return "RIPEMD-160";} -}; - -/*! Digest Length = 320 bits, Security is similar to RIPEMD-160 */ -class RIPEMD320 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char * StaticAlgorithmName() {return "RIPEMD-320";} -}; - -/*! \warning RIPEMD-128 is considered insecure, and should not be used - unless you absolutely need it for compatibility. */ -class RIPEMD128 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char * StaticAlgorithmName() {return "RIPEMD-128";} -}; - -/*! \warning RIPEMD-256 is considered insecure, and should not be used - unless you absolutely need it for compatibility. */ -class RIPEMD256 : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word32 *digest, const word32 *data); - static const char * StaticAlgorithmName() {return "RIPEMD-256";} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.cpp deleted file mode 100644 index 9866cd83..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// rng.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#include "rng.h" -#include "fips140.h" - -#include -#include - -NAMESPACE_BEGIN(CryptoPP) - -// linear congruential generator -// originally by William S. England - -// do not use for cryptographic purposes - -/* -** Original_numbers are the original published m and q in the -** ACM article above. John Burton has furnished numbers for -** a reportedly better generator. The new numbers are now -** used in this program by default. -*/ - -#ifndef LCRNG_ORIGINAL_NUMBERS -const word32 LC_RNG::m=2147483647L; -const word32 LC_RNG::q=44488L; - -const word16 LC_RNG::a=(unsigned int)48271L; -const word16 LC_RNG::r=3399; -#else -const word32 LC_RNG::m=2147483647L; -const word32 LC_RNG::q=127773L; - -const word16 LC_RNG::a=16807; -const word16 LC_RNG::r=2836; -#endif - -void LC_RNG::GenerateBlock(byte *output, size_t size) -{ - while (size--) - { - word32 hi = seed/q; - word32 lo = seed%q; - - long test = a*lo - r*hi; - - if (test > 0) - seed = test; - else - seed = test+ m; - - *output++ = (GETBYTE(seed, 0) ^ GETBYTE(seed, 1) ^ GETBYTE(seed, 2) ^ GETBYTE(seed, 3)); - } -} - -// ******************************************************** - -#ifndef CRYPTOPP_IMPORTS - -X917RNG::X917RNG(BlockTransformation *c, const byte *seed, const byte *deterministicTimeVector) - : cipher(c), - S(cipher->BlockSize()), - dtbuf(S), - randseed(seed, S), - m_lastBlock(S), - m_deterministicTimeVector(deterministicTimeVector, deterministicTimeVector ? S : 0) -{ - if (!deterministicTimeVector) - { - time_t tstamp1 = time(0); - xorbuf(dtbuf, (byte *)&tstamp1, UnsignedMin(sizeof(tstamp1), S)); - cipher->ProcessBlock(dtbuf); - clock_t tstamp2 = clock(); - xorbuf(dtbuf, (byte *)&tstamp2, UnsignedMin(sizeof(tstamp2), S)); - cipher->ProcessBlock(dtbuf); - } - - // for FIPS 140-2 - GenerateBlock(m_lastBlock, S); -} - -void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size) -{ - while (size > 0) - { - // calculate new enciphered timestamp - if (m_deterministicTimeVector.size()) - { - cipher->ProcessBlock(m_deterministicTimeVector, dtbuf); - IncrementCounterByOne(m_deterministicTimeVector, S); - } - else - { - clock_t c = clock(); - xorbuf(dtbuf, (byte *)&c, UnsignedMin(sizeof(c), S)); - time_t t = time(NULL); - xorbuf(dtbuf+S-UnsignedMin(sizeof(t), S), (byte *)&t, UnsignedMin(sizeof(t), S)); - cipher->ProcessBlock(dtbuf); - } - - // combine enciphered timestamp with seed - xorbuf(randseed, dtbuf, S); - - // generate a new block of random bytes - cipher->ProcessBlock(randseed); - if (memcmp(m_lastBlock, randseed, S) == 0) - throw SelfTestFailure("X917RNG: Continuous random number generator test failed."); - - // output random bytes - size_t len = UnsignedMin(S, size); - target.ChannelPut(channel, randseed, len); - size -= len; - - // compute new seed vector - memcpy(m_lastBlock, randseed, S); - xorbuf(randseed, dtbuf, S); - cipher->ProcessBlock(randseed); - } -} - -#endif - -MaurerRandomnessTest::MaurerRandomnessTest() - : sum(0.0), n(0) -{ - for (unsigned i=0; i= Q) - sum += log(double(n - tab[inByte])); - tab[inByte] = n; - n++; - } - return 0; -} - -double MaurerRandomnessTest::GetTestValue() const -{ - if (BytesNeeded() > 0) - throw Exception(Exception::OTHER_ERROR, "MaurerRandomnessTest: " + IntToString(BytesNeeded()) + " more bytes of input needed"); - - double fTu = (sum/(n-Q))/log(2.0); // this is the test value defined by Maurer - - double value = fTu * 0.1392; // arbitrarily normalize it to - return value > 1.0 ? 1.0 : value; // a number between 0 and 1 -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.h deleted file mode 100644 index 2439dee6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rng.h +++ /dev/null @@ -1,77 +0,0 @@ -// rng.h - misc RNG related classes, see also osrng.h, randpool.h - -#ifndef CRYPTOPP_RNG_H -#define CRYPTOPP_RNG_H - -#include "cryptlib.h" -#include "filters.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! linear congruential generator -/*! originally by William S. England, do not use for cryptographic purposes */ -class LC_RNG : public RandomNumberGenerator -{ -public: - LC_RNG(word32 init_seed) - : seed(init_seed) {} - - void GenerateBlock(byte *output, size_t size); - - word32 GetSeed() {return seed;} - -private: - word32 seed; - - static const word32 m; - static const word32 q; - static const word16 a; - static const word16 r; -}; - -//! RNG derived from ANSI X9.17 Appendix C - -class CRYPTOPP_DLL X917RNG : public RandomNumberGenerator, public NotCopyable -{ -public: - // cipher will be deleted by destructor, deterministicTimeVector = 0 means obtain time vector from system - X917RNG(BlockTransformation *cipher, const byte *seed, const byte *deterministicTimeVector = 0); - - void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size); - -private: - member_ptr cipher; - unsigned int S; // blocksize of cipher - SecByteBlock dtbuf; // buffer for enciphered timestamp - SecByteBlock randseed, m_lastBlock, m_deterministicTimeVector; -}; - -/** This class implements Maurer's Universal Statistical Test for Random Bit Generators - it is intended for measuring the randomness of *PHYSICAL* RNGs. - For more details see his paper in Journal of Cryptology, 1992. */ - -class MaurerRandomnessTest : public Bufferless -{ -public: - MaurerRandomnessTest(); - - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - - // BytesNeeded() returns how many more bytes of input is needed by the test - // GetTestValue() should not be called before BytesNeeded()==0 - unsigned int BytesNeeded() const {return n >= (Q+K) ? 0 : Q+K-n;} - - // returns a number between 0.0 and 1.0, describing the quality of the - // random numbers entered - double GetTestValue() const; - -private: - enum {L=8, V=256, Q=2000, K=2000}; - double sum; - unsigned int n; - unsigned int tab[V]; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.cpp deleted file mode 100644 index 59449c40..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.cpp +++ /dev/null @@ -1,304 +0,0 @@ -// rsa.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "rsa.h" -#include "asn.h" -#include "oids.h" -#include "modarith.h" -#include "nbtheory.h" -#include "sha.h" -#include "algparam.h" -#include "fips140.h" - -#if !defined(NDEBUG) && !defined(CRYPTOPP_IS_DLL) -#include "pssr.h" -NAMESPACE_BEGIN(CryptoPP) -void RSA_TestInstantiations() -{ - RSASS::Verifier x1(1, 1); - RSASS::Signer x2(NullRNG(), 1); - RSASS::Verifier x3(x2); - RSASS::Verifier x4(x2.GetKey()); - RSASS::Verifier x5(x3); -#ifndef __MWERKS__ - RSASS::Signer x6 = x2; - x3 = x2; - x6 = x2; -#endif - RSAES::Encryptor x7(x2); -#ifndef __GNUC__ - RSAES::Encryptor x8(x3); -#endif - RSAES >::Encryptor x9(x2); - - x4 = x2.GetKey(); -} -NAMESPACE_END -#endif - -#ifndef CRYPTOPP_IMPORTS - -NAMESPACE_BEGIN(CryptoPP) - -OID RSAFunction::GetAlgorithmID() const -{ - return ASN1::rsaEncryption(); -} - -void RSAFunction::BERDecodePublicKey(BufferedTransformation &bt, bool, size_t) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - m_e.BERDecode(seq); - seq.MessageEnd(); -} - -void RSAFunction::DEREncodePublicKey(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - m_e.DEREncode(seq); - seq.MessageEnd(); -} - -Integer RSAFunction::ApplyFunction(const Integer &x) const -{ - DoQuickSanityCheck(); - return a_exp_b_mod_c(x, m_e, m_n); -} - -bool RSAFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = true; - pass = pass && m_n > Integer::One() && m_n.IsOdd(); - pass = pass && m_e > Integer::One() && m_e.IsOdd() && m_e < m_n; - return pass; -} - -bool RSAFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_GET_FUNCTION_ENTRY(PublicExponent) - ; -} - -void RSAFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_SET_FUNCTION_ENTRY(PublicExponent) - ; -} - -// ***************************************************************************** - -class RSAPrimeSelector : public PrimeSelector -{ -public: - RSAPrimeSelector(const Integer &e) : m_e(e) {} - bool IsAcceptable(const Integer &candidate) const {return RelativelyPrime(m_e, candidate-Integer::One());} - Integer m_e; -}; - -void InvertibleRSAFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - int modulusSize = 2048; - alg.GetIntValue(Name::ModulusSize(), modulusSize) || alg.GetIntValue(Name::KeySize(), modulusSize); - - if (modulusSize < 16) - throw InvalidArgument("InvertibleRSAFunction: specified modulus size is too small"); - - m_e = alg.GetValueWithDefault(Name::PublicExponent(), Integer(17)); - - if (m_e < 3 || m_e.IsEven()) - throw InvalidArgument("InvertibleRSAFunction: invalid public exponent"); - - RSAPrimeSelector selector(m_e); - AlgorithmParameters primeParam = MakeParametersForTwoPrimesOfEqualSize(modulusSize) - (Name::PointerToPrimeSelector(), selector.GetSelectorPointer()); - m_p.GenerateRandom(rng, primeParam); - m_q.GenerateRandom(rng, primeParam); - - m_d = m_e.InverseMod(LCM(m_p-1, m_q-1)); - assert(m_d.IsPositive()); - - m_dp = m_d % (m_p-1); - m_dq = m_d % (m_q-1); - m_n = m_p * m_q; - m_u = m_q.InverseMod(m_p); - - if (FIPS_140_2_ComplianceEnabled()) - { - RSASS::Signer signer(*this); - RSASS::Verifier verifier(signer); - SignaturePairwiseConsistencyTest_FIPS_140_Only(signer, verifier); - - RSAES >::Decryptor decryptor(*this); - RSAES >::Encryptor encryptor(decryptor); - EncryptionPairwiseConsistencyTest_FIPS_140_Only(encryptor, decryptor); - } -} - -void InvertibleRSAFunction::Initialize(RandomNumberGenerator &rng, unsigned int keybits, const Integer &e) -{ - GenerateRandom(rng, MakeParameters(Name::ModulusSize(), (int)keybits)(Name::PublicExponent(), e+e.IsEven())); -} - -void InvertibleRSAFunction::Initialize(const Integer &n, const Integer &e, const Integer &d) -{ - if (n.IsEven() || e.IsEven() | d.IsEven()) - throw InvalidArgument("InvertibleRSAFunction: input is not a valid RSA private key"); - - m_n = n; - m_e = e; - m_d = d; - - Integer r = --(d*e); - unsigned int s = 0; - while (r.IsEven()) - { - r >>= 1; - s++; - } - - ModularArithmetic modn(n); - for (Integer i = 2; ; ++i) - { - Integer a = modn.Exponentiate(i, r); - if (a == 1) - continue; - Integer b; - unsigned int j = 0; - while (a != n-1) - { - b = modn.Square(a); - if (b == 1) - { - m_p = GCD(a-1, n); - m_q = n/m_p; - m_dp = m_d % (m_p-1); - m_dq = m_d % (m_q-1); - m_u = m_q.InverseMod(m_p); - return; - } - if (++j == s) - throw InvalidArgument("InvertibleRSAFunction: input is not a valid RSA private key"); - a = b; - } - } -} - -void InvertibleRSAFunction::BERDecodePrivateKey(BufferedTransformation &bt, bool, size_t) -{ - BERSequenceDecoder privateKey(bt); - word32 version; - BERDecodeUnsigned(privateKey, version, INTEGER, 0, 0); // check version - m_n.BERDecode(privateKey); - m_e.BERDecode(privateKey); - m_d.BERDecode(privateKey); - m_p.BERDecode(privateKey); - m_q.BERDecode(privateKey); - m_dp.BERDecode(privateKey); - m_dq.BERDecode(privateKey); - m_u.BERDecode(privateKey); - privateKey.MessageEnd(); -} - -void InvertibleRSAFunction::DEREncodePrivateKey(BufferedTransformation &bt) const -{ - DERSequenceEncoder privateKey(bt); - DEREncodeUnsigned(privateKey, 0); // version - m_n.DEREncode(privateKey); - m_e.DEREncode(privateKey); - m_d.DEREncode(privateKey); - m_p.DEREncode(privateKey); - m_q.DEREncode(privateKey); - m_dp.DEREncode(privateKey); - m_dq.DEREncode(privateKey); - m_u.DEREncode(privateKey); - privateKey.MessageEnd(); -} - -Integer InvertibleRSAFunction::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const -{ - DoQuickSanityCheck(); - ModularArithmetic modn(m_n); - Integer r, rInv; - do { // do this in a loop for people using small numbers for testing - r.Randomize(rng, Integer::One(), m_n - Integer::One()); - rInv = modn.MultiplicativeInverse(r); - } while (rInv.IsZero()); - Integer re = modn.Exponentiate(r, m_e); - re = modn.Multiply(re, x); // blind - // here we follow the notation of PKCS #1 and let u=q inverse mod p - // but in ModRoot, u=p inverse mod q, so we reverse the order of p and q - Integer y = ModularRoot(re, m_dq, m_dp, m_q, m_p, m_u); - y = modn.Multiply(y, rInv); // unblind - if (modn.Exponentiate(y, m_e) != x) // check - throw Exception(Exception::OTHER_ERROR, "InvertibleRSAFunction: computational error during private key operation"); - return y; -} - -bool InvertibleRSAFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = RSAFunction::Validate(rng, level); - pass = pass && m_p > Integer::One() && m_p.IsOdd() && m_p < m_n; - pass = pass && m_q > Integer::One() && m_q.IsOdd() && m_q < m_n; - pass = pass && m_d > Integer::One() && m_d.IsOdd() && m_d < m_n; - pass = pass && m_dp > Integer::One() && m_dp.IsOdd() && m_dp < m_p; - pass = pass && m_dq > Integer::One() && m_dq.IsOdd() && m_dq < m_q; - pass = pass && m_u.IsPositive() && m_u < m_p; - if (level >= 1) - { - pass = pass && m_p * m_q == m_n; - pass = pass && m_e*m_d % LCM(m_p-1, m_q-1) == 1; - pass = pass && m_dp == m_d%(m_p-1) && m_dq == m_d%(m_q-1); - pass = pass && m_u * m_q % m_p == 1; - } - if (level >= 2) - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - return pass; -} - -bool InvertibleRSAFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_GET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_GET_FUNCTION_ENTRY(PrivateExponent) - CRYPTOPP_GET_FUNCTION_ENTRY(ModPrime1PrivateExponent) - CRYPTOPP_GET_FUNCTION_ENTRY(ModPrime2PrivateExponent) - CRYPTOPP_GET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -void InvertibleRSAFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_SET_FUNCTION_ENTRY(PrivateExponent) - CRYPTOPP_SET_FUNCTION_ENTRY(ModPrime1PrivateExponent) - CRYPTOPP_SET_FUNCTION_ENTRY(ModPrime2PrivateExponent) - CRYPTOPP_SET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -// ***************************************************************************** - -Integer RSAFunction_ISO::ApplyFunction(const Integer &x) const -{ - Integer t = RSAFunction::ApplyFunction(x); - return t % 16 == 12 ? t : m_n - t; -} - -Integer InvertibleRSAFunction_ISO::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const -{ - Integer t = InvertibleRSAFunction::CalculateInverse(rng, x); - return STDMIN(t, m_n-t); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.h deleted file mode 100644 index 6a8b1852..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rsa.h +++ /dev/null @@ -1,174 +0,0 @@ -#ifndef CRYPTOPP_RSA_H -#define CRYPTOPP_RSA_H - -/** \file - This file contains classes that implement the RSA - ciphers and signature schemes as defined in PKCS #1 v2.0. -*/ - -#include "pubkey.h" -#include "asn.h" -#include "pkcspad.h" -#include "oaep.h" -#include "emsa2.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL RSAFunction : public TrapdoorFunction, public X509PublicKey -{ - typedef RSAFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &e) - {m_n = n; m_e = e;} - - // X509PublicKey - OID GetAlgorithmID() const; - void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); - void DEREncodePublicKey(BufferedTransformation &bt) const; - - // CryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // TrapdoorFunction - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return m_n;} - Integer ImageBound() const {return m_n;} - - // non-derived - const Integer & GetModulus() const {return m_n;} - const Integer & GetPublicExponent() const {return m_e;} - - void SetModulus(const Integer &n) {m_n = n;} - void SetPublicExponent(const Integer &e) {m_e = e;} - -protected: - Integer m_n, m_e; -}; - -//! _ -class CRYPTOPP_DLL InvertibleRSAFunction : public RSAFunction, public TrapdoorFunctionInverse, public PKCS8PrivateKey -{ - typedef InvertibleRSAFunction ThisClass; - -public: - void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits, const Integer &e = 17); - void Initialize(const Integer &n, const Integer &e, const Integer &d, const Integer &p, const Integer &q, const Integer &dp, const Integer &dq, const Integer &u) - {m_n = n; m_e = e; m_d = d; m_p = p; m_q = q; m_dp = dp; m_dq = dq; m_u = u;} - //! factor n given private exponent - void Initialize(const Integer &n, const Integer &e, const Integer &d); - - // PKCS8PrivateKey - void BERDecode(BufferedTransformation &bt) - {PKCS8PrivateKey::BERDecode(bt);} - void DEREncode(BufferedTransformation &bt) const - {PKCS8PrivateKey::DEREncode(bt);} - void Load(BufferedTransformation &bt) - {PKCS8PrivateKey::BERDecode(bt);} - void Save(BufferedTransformation &bt) const - {PKCS8PrivateKey::DEREncode(bt);} - OID GetAlgorithmID() const {return RSAFunction::GetAlgorithmID();} - void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); - void DEREncodePrivateKey(BufferedTransformation &bt) const; - - // TrapdoorFunctionInverse - Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const; - - // GeneratableCryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - /*! parameters: (ModulusSize, PublicExponent (default 17)) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - // non-derived interface - const Integer& GetPrime1() const {return m_p;} - const Integer& GetPrime2() const {return m_q;} - const Integer& GetPrivateExponent() const {return m_d;} - const Integer& GetModPrime1PrivateExponent() const {return m_dp;} - const Integer& GetModPrime2PrivateExponent() const {return m_dq;} - const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;} - - void SetPrime1(const Integer &p) {m_p = p;} - void SetPrime2(const Integer &q) {m_q = q;} - void SetPrivateExponent(const Integer &d) {m_d = d;} - void SetModPrime1PrivateExponent(const Integer &dp) {m_dp = dp;} - void SetModPrime2PrivateExponent(const Integer &dq) {m_dq = dq;} - void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;} - -protected: - Integer m_d, m_p, m_q, m_dp, m_dq, m_u; -}; - -class CRYPTOPP_DLL RSAFunction_ISO : public RSAFunction -{ -public: - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return ++(m_n>>1);} -}; - -class CRYPTOPP_DLL InvertibleRSAFunction_ISO : public InvertibleRSAFunction -{ -public: - Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const; - Integer PreimageBound() const {return ++(m_n>>1);} -}; - -//! RSA -struct CRYPTOPP_DLL RSA -{ - static const char * CRYPTOPP_API StaticAlgorithmName() {return "RSA";} - typedef RSAFunction PublicKey; - typedef InvertibleRSAFunction PrivateKey; -}; - -//! RSA cryptosystem -template -struct RSAES : public TF_ES -{ -}; - -//! RSA signature scheme with appendix -/*! See documentation of PKCS1v15 for a list of hash functions that can be used with it. */ -template -struct RSASS : public TF_SS -{ -}; - -struct CRYPTOPP_DLL RSA_ISO -{ - static const char * CRYPTOPP_API StaticAlgorithmName() {return "RSA-ISO";} - typedef RSAFunction_ISO PublicKey; - typedef InvertibleRSAFunction_ISO PrivateKey; -}; - -template -struct RSASS_ISO : public TF_SS -{ -}; - -// The two RSA encryption schemes defined in PKCS #1 v2.0 -typedef RSAES::Decryptor RSAES_PKCS1v15_Decryptor; -typedef RSAES::Encryptor RSAES_PKCS1v15_Encryptor; - -typedef RSAES >::Decryptor RSAES_OAEP_SHA_Decryptor; -typedef RSAES >::Encryptor RSAES_OAEP_SHA_Encryptor; - -// The three RSA signature schemes defined in PKCS #1 v2.0 -typedef RSASS::Signer RSASSA_PKCS1v15_SHA_Signer; -typedef RSASS::Verifier RSASSA_PKCS1v15_SHA_Verifier; - -namespace Weak { -typedef RSASS::Signer RSASSA_PKCS1v15_MD2_Signer; -typedef RSASS::Verifier RSASSA_PKCS1v15_MD2_Verifier; - -typedef RSASS::Signer RSASSA_PKCS1v15_MD5_Signer; -typedef RSASS::Verifier RSASSA_PKCS1v15_MD5_Verifier; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.cpp deleted file mode 100644 index cdd9f2d2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.cpp +++ /dev/null @@ -1,196 +0,0 @@ -// rw.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "rw.h" -#include "nbtheory.h" -#include "asn.h" - -#ifndef CRYPTOPP_IMPORTS - -NAMESPACE_BEGIN(CryptoPP) - -void RWFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - seq.MessageEnd(); -} - -void RWFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - seq.MessageEnd(); -} - -Integer RWFunction::ApplyFunction(const Integer &in) const -{ - DoQuickSanityCheck(); - - Integer out = in.Squared()%m_n; - const word r = 12; - // this code was written to handle both r = 6 and r = 12, - // but now only r = 12 is used in P1363 - const word r2 = r/2; - const word r3a = (16 + 5 - r) % 16; // n%16 could be 5 or 13 - const word r3b = (16 + 13 - r) % 16; - const word r4 = (8 + 5 - r/2) % 8; // n%8 == 5 - switch (out % 16) - { - case r: - break; - case r2: - case r2+8: - out <<= 1; - break; - case r3a: - case r3b: - out.Negate(); - out += m_n; - break; - case r4: - case r4+8: - out.Negate(); - out += m_n; - out <<= 1; - break; - default: - out = Integer::Zero(); - } - return out; -} - -bool RWFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = true; - pass = pass && m_n > Integer::One() && m_n%8 == 5; - return pass; -} - -bool RWFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - ; -} - -void RWFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - ; -} - -// ***************************************************************************** -// private key operations: - -// generate a random private key -void InvertibleRWFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg) -{ - int modulusSize = 2048; - alg.GetIntValue("ModulusSize", modulusSize) || alg.GetIntValue("KeySize", modulusSize); - - if (modulusSize < 16) - throw InvalidArgument("InvertibleRWFunction: specified modulus length is too small"); - - AlgorithmParameters primeParam = MakeParametersForTwoPrimesOfEqualSize(modulusSize); - m_p.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("EquivalentTo", 3)("Mod", 8))); - m_q.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("EquivalentTo", 7)("Mod", 8))); - - m_n = m_p * m_q; - m_u = m_q.InverseMod(m_p); -} - -void InvertibleRWFunction::BERDecode(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_n.BERDecode(seq); - m_p.BERDecode(seq); - m_q.BERDecode(seq); - m_u.BERDecode(seq); - seq.MessageEnd(); -} - -void InvertibleRWFunction::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_n.DEREncode(seq); - m_p.DEREncode(seq); - m_q.DEREncode(seq); - m_u.DEREncode(seq); - seq.MessageEnd(); -} - -Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const -{ - DoQuickSanityCheck(); - ModularArithmetic modn(m_n); - Integer r, rInv; - do { // do this in a loop for people using small numbers for testing - r.Randomize(rng, Integer::One(), m_n - Integer::One()); - rInv = modn.MultiplicativeInverse(r); - } while (rInv.IsZero()); - Integer re = modn.Square(r); - re = modn.Multiply(re, x); // blind - - Integer cp=re%m_p, cq=re%m_q; - if (Jacobi(cp, m_p) * Jacobi(cq, m_q) != 1) - { - cp = cp.IsOdd() ? (cp+m_p) >> 1 : cp >> 1; - cq = cq.IsOdd() ? (cq+m_q) >> 1 : cq >> 1; - } - - #pragma omp parallel - #pragma omp sections - { - #pragma omp section - cp = ModularSquareRoot(cp, m_p); - #pragma omp section - cq = ModularSquareRoot(cq, m_q); - } - - Integer y = CRT(cq, m_q, cp, m_p, m_u); - y = modn.Multiply(y, rInv); // unblind - y = STDMIN(y, m_n-y); - if (ApplyFunction(y) != x) // check - throw Exception(Exception::OTHER_ERROR, "InvertibleRWFunction: computational error during private key operation"); - return y; -} - -bool InvertibleRWFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = RWFunction::Validate(rng, level); - pass = pass && m_p > Integer::One() && m_p%8 == 3 && m_p < m_n; - pass = pass && m_q > Integer::One() && m_q%8 == 7 && m_q < m_n; - pass = pass && m_u.IsPositive() && m_u < m_p; - if (level >= 1) - { - pass = pass && m_p * m_q == m_n; - pass = pass && m_u * m_q % m_p == 1; - } - if (level >= 2) - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - return pass; -} - -bool InvertibleRWFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_GET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_GET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -void InvertibleRWFunction::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime1) - CRYPTOPP_SET_FUNCTION_ENTRY(Prime2) - CRYPTOPP_SET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1) - ; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.h deleted file mode 100644 index ec8b8507..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/rw.h +++ /dev/null @@ -1,92 +0,0 @@ -#ifndef CRYPTOPP_RW_H -#define CRYPTOPP_RW_H - -/** \file - This file contains classes that implement the - Rabin-Williams signature schemes as defined in IEEE P1363. -*/ - -#include "pubkey.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_DLL RWFunction : public TrapdoorFunction, public PublicKey -{ - typedef RWFunction ThisClass; - -public: - void Initialize(const Integer &n) - {m_n = n;} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer ApplyFunction(const Integer &x) const; - Integer PreimageBound() const {return ++(m_n>>1);} - Integer ImageBound() const {return m_n;} - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - - const Integer& GetModulus() const {return m_n;} - void SetModulus(const Integer &n) {m_n = n;} - -protected: - Integer m_n; -}; - -//! _ -class CRYPTOPP_DLL InvertibleRWFunction : public RWFunction, public TrapdoorFunctionInverse, public PrivateKey -{ - typedef InvertibleRWFunction ThisClass; - -public: - void Initialize(const Integer &n, const Integer &p, const Integer &q, const Integer &u) - {m_n = n; m_p = p; m_q = q; m_u = u;} - // generate a random private key - void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits) - {GenerateRandomWithKeySize(rng, modulusBits);} - - void BERDecode(BufferedTransformation &bt); - void DEREncode(BufferedTransformation &bt) const; - - Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const; - - // GeneratibleCryptoMaterial - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - /*! parameters: (ModulusSize) */ - void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg); - - const Integer& GetPrime1() const {return m_p;} - const Integer& GetPrime2() const {return m_q;} - const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;} - - void SetPrime1(const Integer &p) {m_p = p;} - void SetPrime2(const Integer &q) {m_q = q;} - void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;} - -protected: - Integer m_p, m_q, m_u; -}; - -//! RW -struct RW -{ - static std::string StaticAlgorithmName() {return "RW";} - typedef RWFunction PublicKey; - typedef InvertibleRWFunction PrivateKey; -}; - -//! RWSS -template -struct RWSS : public TF_SS -{ -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.cpp deleted file mode 100644 index d46ca641..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// safer.cpp - modified by by Wei Dai from Richard De Moliner's safer.c - -#include "pch.h" -#include "safer.h" -#include "misc.h" -#include "argnames.h" - -NAMESPACE_BEGIN(CryptoPP) - -const byte SAFER::Base::exp_tab[256] = - {1, 45, 226, 147, 190, 69, 21, 174, 120, 3, 135, 164, 184, 56, 207, 63, - 8, 103, 9, 148, 235, 38, 168, 107, 189, 24, 52, 27, 187, 191, 114, 247, - 64, 53, 72, 156, 81, 47, 59, 85, 227, 192, 159, 216, 211, 243, 141, 177, - 255, 167, 62, 220, 134, 119, 215, 166, 17, 251, 244, 186, 146, 145, 100, 131, - 241, 51, 239, 218, 44, 181, 178, 43, 136, 209, 153, 203, 140, 132, 29, 20, - 129, 151, 113, 202, 95, 163, 139, 87, 60, 130, 196, 82, 92, 28, 232, 160, - 4, 180, 133, 74, 246, 19, 84, 182, 223, 12, 26, 142, 222, 224, 57, 252, - 32, 155, 36, 78, 169, 152, 158, 171, 242, 96, 208, 108, 234, 250, 199, 217, - 0, 212, 31, 110, 67, 188, 236, 83, 137, 254, 122, 93, 73, 201, 50, 194, - 249, 154, 248, 109, 22, 219, 89, 150, 68, 233, 205, 230, 70, 66, 143, 10, - 193, 204, 185, 101, 176, 210, 198, 172, 30, 65, 98, 41, 46, 14, 116, 80, - 2, 90, 195, 37, 123, 138, 42, 91, 240, 6, 13, 71, 111, 112, 157, 126, - 16, 206, 18, 39, 213, 76, 79, 214, 121, 48, 104, 54, 117, 125, 228, 237, - 128, 106, 144, 55, 162, 94, 118, 170, 197, 127, 61, 175, 165, 229, 25, 97, - 253, 77, 124, 183, 11, 238, 173, 75, 34, 245, 231, 115, 35, 33, 200, 5, - 225, 102, 221, 179, 88, 105, 99, 86, 15, 161, 49, 149, 23, 7, 58, 40}; - -const byte SAFER::Base::log_tab[256] = - {128, 0, 176, 9, 96, 239, 185, 253, 16, 18, 159, 228, 105, 186, 173, 248, - 192, 56, 194, 101, 79, 6, 148, 252, 25, 222, 106, 27, 93, 78, 168, 130, - 112, 237, 232, 236, 114, 179, 21, 195, 255, 171, 182, 71, 68, 1, 172, 37, - 201, 250, 142, 65, 26, 33, 203, 211, 13, 110, 254, 38, 88, 218, 50, 15, - 32, 169, 157, 132, 152, 5, 156, 187, 34, 140, 99, 231, 197, 225, 115, 198, - 175, 36, 91, 135, 102, 39, 247, 87, 244, 150, 177, 183, 92, 139, 213, 84, - 121, 223, 170, 246, 62, 163, 241, 17, 202, 245, 209, 23, 123, 147, 131, 188, - 189, 82, 30, 235, 174, 204, 214, 53, 8, 200, 138, 180, 226, 205, 191, 217, - 208, 80, 89, 63, 77, 98, 52, 10, 72, 136, 181, 86, 76, 46, 107, 158, - 210, 61, 60, 3, 19, 251, 151, 81, 117, 74, 145, 113, 35, 190, 118, 42, - 95, 249, 212, 85, 11, 220, 55, 49, 22, 116, 215, 119, 167, 230, 7, 219, - 164, 47, 70, 243, 97, 69, 103, 227, 12, 162, 59, 28, 133, 24, 4, 29, - 41, 160, 143, 178, 90, 216, 166, 126, 238, 141, 83, 75, 161, 154, 193, 14, - 122, 73, 165, 44, 129, 196, 199, 54, 43, 127, 67, 149, 51, 242, 108, 104, - 109, 240, 2, 40, 206, 221, 155, 234, 94, 153, 124, 20, 134, 207, 229, 66, - 184, 64, 120, 45, 58, 233, 100, 31, 146, 144, 125, 57, 111, 224, 137, 48}; - -#define EXP(x) exp_tab[(x)] -#define LOG(x) log_tab[(x)] -#define PHT(x, y) { y += x; x += y; } -#define IPHT(x, y) { x -= y; y -= x; } - -static const unsigned int BLOCKSIZE = 8; -static const unsigned int MAX_ROUNDS = 13; - -void SAFER::Base::UncheckedSetKey(const byte *userkey_1, unsigned int length, const NameValuePairs ¶ms) -{ - bool strengthened = Strengthened(); - unsigned int nof_rounds = params.GetIntValueWithDefault(Name::Rounds(), length == 8 ? (strengthened ? 8 : 6) : 10); - - const byte *userkey_2 = length == 8 ? userkey_1 : userkey_1 + 8; - keySchedule.New(1 + BLOCKSIZE * (1 + 2 * nof_rounds)); - - unsigned int i, j; - byte *key = keySchedule; - SecByteBlock ka(BLOCKSIZE + 1), kb(BLOCKSIZE + 1); - - if (MAX_ROUNDS < nof_rounds) - nof_rounds = MAX_ROUNDS; - *key++ = (unsigned char)nof_rounds; - ka[BLOCKSIZE] = 0; - kb[BLOCKSIZE] = 0; - for (j = 0; j < BLOCKSIZE; j++) - { - ka[BLOCKSIZE] ^= ka[j] = rotlFixed(userkey_1[j], 5U); - kb[BLOCKSIZE] ^= kb[j] = *key++ = userkey_2[j]; - } - - for (i = 1; i <= nof_rounds; i++) - { - for (j = 0; j < BLOCKSIZE + 1; j++) - { - ka[j] = rotlFixed(ka[j], 6U); - kb[j] = rotlFixed(kb[j], 6U); - } - for (j = 0; j < BLOCKSIZE; j++) - if (strengthened) - *key++ = (ka[(j + 2 * i - 1) % (BLOCKSIZE + 1)] - + exp_tab[exp_tab[18 * i + j + 1]]) & 0xFF; - else - *key++ = (ka[j] + exp_tab[exp_tab[18 * i + j + 1]]) & 0xFF; - for (j = 0; j < BLOCKSIZE; j++) - if (strengthened) - *key++ = (kb[(j + 2 * i) % (BLOCKSIZE + 1)] - + exp_tab[exp_tab[18 * i + j + 10]]) & 0xFF; - else - *key++ = (kb[j] + exp_tab[exp_tab[18 * i + j + 10]]) & 0xFF; - } -} - -typedef BlockGetAndPut Block; - -void SAFER::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - byte a, b, c, d, e, f, g, h, t; - const byte *key = keySchedule+1; - unsigned int round = keySchedule[0]; - - Block::Get(inBlock)(a)(b)(c)(d)(e)(f)(g)(h); - while(round--) - { - a ^= key[0]; b += key[1]; c += key[2]; d ^= key[3]; - e ^= key[4]; f += key[5]; g += key[6]; h ^= key[7]; - a = EXP(a) + key[ 8]; b = LOG(b) ^ key[ 9]; - c = LOG(c) ^ key[10]; d = EXP(d) + key[11]; - e = EXP(e) + key[12]; f = LOG(f) ^ key[13]; - g = LOG(g) ^ key[14]; h = EXP(h) + key[15]; - key += 16; - PHT(a, b); PHT(c, d); PHT(e, f); PHT(g, h); - PHT(a, c); PHT(e, g); PHT(b, d); PHT(f, h); - PHT(a, e); PHT(b, f); PHT(c, g); PHT(d, h); - t = b; b = e; e = c; c = t; t = d; d = f; f = g; g = t; - } - a ^= key[0]; b += key[1]; c += key[2]; d ^= key[3]; - e ^= key[4]; f += key[5]; g += key[6]; h ^= key[7]; - Block::Put(xorBlock, outBlock)(a)(b)(c)(d)(e)(f)(g)(h); -} - -void SAFER::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - byte a, b, c, d, e, f, g, h, t; - unsigned int round = keySchedule[0]; - const byte *key = keySchedule + BLOCKSIZE * (1 + 2 * round) - 7; - - Block::Get(inBlock)(a)(b)(c)(d)(e)(f)(g)(h); - h ^= key[7]; g -= key[6]; f -= key[5]; e ^= key[4]; - d ^= key[3]; c -= key[2]; b -= key[1]; a ^= key[0]; - while (round--) - { - key -= 16; - t = e; e = b; b = c; c = t; t = f; f = d; d = g; g = t; - IPHT(a, e); IPHT(b, f); IPHT(c, g); IPHT(d, h); - IPHT(a, c); IPHT(e, g); IPHT(b, d); IPHT(f, h); - IPHT(a, b); IPHT(c, d); IPHT(e, f); IPHT(g, h); - h -= key[15]; g ^= key[14]; f ^= key[13]; e -= key[12]; - d -= key[11]; c ^= key[10]; b ^= key[9]; a -= key[8]; - h = LOG(h) ^ key[7]; g = EXP(g) - key[6]; - f = EXP(f) - key[5]; e = LOG(e) ^ key[4]; - d = LOG(d) ^ key[3]; c = EXP(c) - key[2]; - b = EXP(b) - key[1]; a = LOG(a) ^ key[0]; - } - Block::Put(xorBlock, outBlock)(a)(b)(c)(d)(e)(f)(g)(h); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.h deleted file mode 100644 index f9a3c9e1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/safer.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef CRYPTOPP_SAFER_H -#define CRYPTOPP_SAFER_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// base class, do not use directly -class SAFER -{ -public: - class CRYPTOPP_NO_VTABLE Base : public BlockCipher - { - public: - unsigned int OptimalDataAlignment() const {return 1;} - void UncheckedSetKey(const byte *userkey, unsigned int length, const NameValuePairs ¶ms); - - protected: - virtual bool Strengthened() const =0; - - SecByteBlock keySchedule; - static const byte exp_tab[256]; - static const byte log_tab[256]; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; -}; - -template -class CRYPTOPP_NO_VTABLE SAFER_Impl : public BlockCipherImpl -{ -protected: - bool Strengthened() const {return STR;} -}; - -//! _ -struct SAFER_K_Info : public FixedBlockSize<8>, public VariableKeyLength<16, 8, 16, 8>, public VariableRounds<10, 1, 13> -{ - static const char *StaticAlgorithmName() {return "SAFER-K";} -}; - -/// SAFER-K -class SAFER_K : public SAFER_K_Info, public SAFER, public BlockCipherDocumentation -{ -public: - typedef BlockCipherFinal > Encryption; - typedef BlockCipherFinal > Decryption; -}; - -//! _ -struct SAFER_SK_Info : public FixedBlockSize<8>, public VariableKeyLength<16, 8, 16, 8>, public VariableRounds<10, 1, 13> -{ - static const char *StaticAlgorithmName() {return "SAFER-SK";} -}; - -/// SAFER-SK -class SAFER_SK : public SAFER_SK_Info, public SAFER, public BlockCipherDocumentation -{ -public: - typedef BlockCipherFinal > Encryption; - typedef BlockCipherFinal > Decryption; -}; - -typedef SAFER_K::Encryption SAFER_K_Encryption; -typedef SAFER_K::Decryption SAFER_K_Decryption; - -typedef SAFER_SK::Encryption SAFER_SK_Encryption; -typedef SAFER_SK::Decryption SAFER_SK_Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.cpp deleted file mode 100644 index bd216eec..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.cpp +++ /dev/null @@ -1,598 +0,0 @@ -// salsa.cpp - written and placed in the public domain by Wei Dai - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM salsa.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "salsa.h" -#include "misc.h" -#include "argnames.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Salsa20_TestInstantiations() -{ - Salsa20::Encryption x; -} - -void Salsa20_Policy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - m_rounds = params.GetIntValueWithDefault(Name::Rounds(), 20); - - if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20)) - throw InvalidRounds(Salsa20::StaticAlgorithmName(), m_rounds); - - // m_state is reordered for SSE2 - GetBlock get1(key); - get1(m_state[13])(m_state[10])(m_state[7])(m_state[4]); - GetBlock get2(key + length - 16); - get2(m_state[15])(m_state[12])(m_state[9])(m_state[6]); - - // "expand 16-byte k" or "expand 32-byte k" - m_state[0] = 0x61707865; - m_state[1] = (length == 16) ? 0x3120646e : 0x3320646e; - m_state[2] = (length == 16) ? 0x79622d36 : 0x79622d32; - m_state[3] = 0x6b206574; -} - -void Salsa20_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length) -{ - assert(length==8); - GetBlock get(IV); - get(m_state[14])(m_state[11]); - m_state[8] = m_state[5] = 0; -} - -void Salsa20_Policy::SeekToIteration(lword iterationCount) -{ - m_state[8] = (word32)iterationCount; - m_state[5] = (word32)SafeRightShift<32>(iterationCount); -} - -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 -unsigned int Salsa20_Policy::GetAlignment() const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - if (HasSSE2()) - return 16; - else -#endif - return GetAlignmentOf(); -} - -unsigned int Salsa20_Policy::GetOptimalBlockSize() const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - if (HasSSE2()) - return 4*BYTES_PER_ITERATION; - else -#endif - return BYTES_PER_ITERATION; -} -#endif - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void Salsa20_OperateKeystream(byte *output, const byte *input, size_t iterationCount, int rounds, void *state); -} -#endif - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ -#endif // #ifdef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE - Salsa20_OperateKeystream(output, input, iterationCount, m_rounds, m_state.data()); - return; -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#ifdef CRYPTOPP_GENERATE_X64_MASM - ALIGN 8 - Salsa20_OperateKeystream PROC FRAME - mov r10, [rsp + 5*8] ; state - alloc_stack(10*16 + 32*16 + 8) - save_xmm128 xmm6, 0200h - save_xmm128 xmm7, 0210h - save_xmm128 xmm8, 0220h - save_xmm128 xmm9, 0230h - save_xmm128 xmm10, 0240h - save_xmm128 xmm11, 0250h - save_xmm128 xmm12, 0260h - save_xmm128 xmm13, 0270h - save_xmm128 xmm14, 0280h - save_xmm128 xmm15, 0290h - .endprolog - - #define REG_output rcx - #define REG_input rdx - #define REG_iterationCount r8 - #define REG_state r10 - #define REG_rounds e9d - #define REG_roundsLeft eax - #define REG_temp32 r11d - #define REG_temp r11 - #define SSE2_WORKSPACE rsp -#else - if (HasSSE2()) - { - #if CRYPTOPP_BOOL_X64 - #define REG_output %4 - #define REG_input %1 - #define REG_iterationCount %2 - #define REG_state %3 - #define REG_rounds %0 - #define REG_roundsLeft eax - #define REG_temp32 edx - #define REG_temp rdx - #define SSE2_WORKSPACE %5 - - FixedSizeAlignedSecBlock workspace; - #else - #define REG_output edi - #define REG_input eax - #define REG_iterationCount ecx - #define REG_state esi - #define REG_rounds edx - #define REG_roundsLeft ebx - #define REG_temp32 ebp - #define REG_temp ebp - #define SSE2_WORKSPACE esp + WORD_SZ - #endif - - #ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS_PUSH_IF86( bx) - #else - void *s = m_state.data(); - word32 r = m_rounds; - - AS2( mov REG_iterationCount, iterationCount) - AS2( mov REG_input, input) - AS2( mov REG_output, output) - AS2( mov REG_state, s) - AS2( mov REG_rounds, r) - #endif -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - - AS_PUSH_IF86( bp) - AS2( cmp REG_iterationCount, 4) - ASJ( jl, 5, f) - -#if CRYPTOPP_BOOL_X86 - AS2( mov ebx, esp) - AS2( and esp, -16) - AS2( sub esp, 32*16) - AS1( push ebx) -#endif - -#define SSE2_EXPAND_S(i, j) \ - ASS( pshufd xmm4, xmm##i, j, j, j, j) \ - AS2( movdqa [SSE2_WORKSPACE + (i*4+j)*16 + 256], xmm4) - - AS2( movdqa xmm0, [REG_state + 0*16]) - AS2( movdqa xmm1, [REG_state + 1*16]) - AS2( movdqa xmm2, [REG_state + 2*16]) - AS2( movdqa xmm3, [REG_state + 3*16]) - SSE2_EXPAND_S(0, 0) - SSE2_EXPAND_S(0, 1) - SSE2_EXPAND_S(0, 2) - SSE2_EXPAND_S(0, 3) - SSE2_EXPAND_S(1, 0) - SSE2_EXPAND_S(1, 2) - SSE2_EXPAND_S(1, 3) - SSE2_EXPAND_S(2, 1) - SSE2_EXPAND_S(2, 2) - SSE2_EXPAND_S(2, 3) - SSE2_EXPAND_S(3, 0) - SSE2_EXPAND_S(3, 1) - SSE2_EXPAND_S(3, 2) - SSE2_EXPAND_S(3, 3) - -#define SSE2_EXPAND_S85(i) \ - AS2( mov dword ptr [SSE2_WORKSPACE + 8*16 + i*4 + 256], REG_roundsLeft) \ - AS2( mov dword ptr [SSE2_WORKSPACE + 5*16 + i*4 + 256], REG_temp32) \ - AS2( add REG_roundsLeft, 1) \ - AS2( adc REG_temp32, 0) - - ASL(1) - AS2( mov REG_roundsLeft, dword ptr [REG_state + 8*4]) - AS2( mov REG_temp32, dword ptr [REG_state + 5*4]) - SSE2_EXPAND_S85(0) - SSE2_EXPAND_S85(1) - SSE2_EXPAND_S85(2) - SSE2_EXPAND_S85(3) - AS2( mov dword ptr [REG_state + 8*4], REG_roundsLeft) - AS2( mov dword ptr [REG_state + 5*4], REG_temp32) - -#define SSE2_QUARTER_ROUND(a, b, d, i) \ - AS2( movdqa xmm4, xmm##d) \ - AS2( paddd xmm4, xmm##a) \ - AS2( movdqa xmm5, xmm4) \ - AS2( pslld xmm4, i) \ - AS2( psrld xmm5, 32-i) \ - AS2( pxor xmm##b, xmm4) \ - AS2( pxor xmm##b, xmm5) - -#define L01(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##A, [SSE2_WORKSPACE + d*16 + i*256]) /* y3 */ -#define L02(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##C, [SSE2_WORKSPACE + a*16 + i*256]) /* y0 */ -#define L03(A,B,C,D,a,b,c,d,i) AS2( paddd xmm##A, xmm##C) /* y0+y3 */ -#define L04(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##B, xmm##A) -#define L05(A,B,C,D,a,b,c,d,i) AS2( pslld xmm##A, 7) -#define L06(A,B,C,D,a,b,c,d,i) AS2( psrld xmm##B, 32-7) -#define L07(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, [SSE2_WORKSPACE + b*16 + i*256]) -#define L08(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, xmm##B) /* z1 */ -#define L09(A,B,C,D,a,b,c,d,i) AS2( movdqa [SSE2_WORKSPACE + b*16], xmm##A) -#define L10(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##B, xmm##A) -#define L11(A,B,C,D,a,b,c,d,i) AS2( paddd xmm##A, xmm##C) /* z1+y0 */ -#define L12(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##D, xmm##A) -#define L13(A,B,C,D,a,b,c,d,i) AS2( pslld xmm##A, 9) -#define L14(A,B,C,D,a,b,c,d,i) AS2( psrld xmm##D, 32-9) -#define L15(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, [SSE2_WORKSPACE + c*16 + i*256]) -#define L16(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, xmm##D) /* z2 */ -#define L17(A,B,C,D,a,b,c,d,i) AS2( movdqa [SSE2_WORKSPACE + c*16], xmm##A) -#define L18(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##D, xmm##A) -#define L19(A,B,C,D,a,b,c,d,i) AS2( paddd xmm##A, xmm##B) /* z2+z1 */ -#define L20(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##B, xmm##A) -#define L21(A,B,C,D,a,b,c,d,i) AS2( pslld xmm##A, 13) -#define L22(A,B,C,D,a,b,c,d,i) AS2( psrld xmm##B, 32-13) -#define L23(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, [SSE2_WORKSPACE + d*16 + i*256]) -#define L24(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, xmm##B) /* z3 */ -#define L25(A,B,C,D,a,b,c,d,i) AS2( movdqa [SSE2_WORKSPACE + d*16], xmm##A) -#define L26(A,B,C,D,a,b,c,d,i) AS2( paddd xmm##A, xmm##D) /* z3+z2 */ -#define L27(A,B,C,D,a,b,c,d,i) AS2( movdqa xmm##D, xmm##A) -#define L28(A,B,C,D,a,b,c,d,i) AS2( pslld xmm##A, 18) -#define L29(A,B,C,D,a,b,c,d,i) AS2( psrld xmm##D, 32-18) -#define L30(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, xmm##C) /* xor y0 */ -#define L31(A,B,C,D,a,b,c,d,i) AS2( pxor xmm##A, xmm##D) /* z0 */ -#define L32(A,B,C,D,a,b,c,d,i) AS2( movdqa [SSE2_WORKSPACE + a*16], xmm##A) - -#define SSE2_QUARTER_ROUND_X8(i, a, b, c, d, e, f, g, h) \ - L01(0,1,2,3, a,b,c,d, i) L01(4,5,6,7, e,f,g,h, i) \ - L02(0,1,2,3, a,b,c,d, i) L02(4,5,6,7, e,f,g,h, i) \ - L03(0,1,2,3, a,b,c,d, i) L03(4,5,6,7, e,f,g,h, i) \ - L04(0,1,2,3, a,b,c,d, i) L04(4,5,6,7, e,f,g,h, i) \ - L05(0,1,2,3, a,b,c,d, i) L05(4,5,6,7, e,f,g,h, i) \ - L06(0,1,2,3, a,b,c,d, i) L06(4,5,6,7, e,f,g,h, i) \ - L07(0,1,2,3, a,b,c,d, i) L07(4,5,6,7, e,f,g,h, i) \ - L08(0,1,2,3, a,b,c,d, i) L08(4,5,6,7, e,f,g,h, i) \ - L09(0,1,2,3, a,b,c,d, i) L09(4,5,6,7, e,f,g,h, i) \ - L10(0,1,2,3, a,b,c,d, i) L10(4,5,6,7, e,f,g,h, i) \ - L11(0,1,2,3, a,b,c,d, i) L11(4,5,6,7, e,f,g,h, i) \ - L12(0,1,2,3, a,b,c,d, i) L12(4,5,6,7, e,f,g,h, i) \ - L13(0,1,2,3, a,b,c,d, i) L13(4,5,6,7, e,f,g,h, i) \ - L14(0,1,2,3, a,b,c,d, i) L14(4,5,6,7, e,f,g,h, i) \ - L15(0,1,2,3, a,b,c,d, i) L15(4,5,6,7, e,f,g,h, i) \ - L16(0,1,2,3, a,b,c,d, i) L16(4,5,6,7, e,f,g,h, i) \ - L17(0,1,2,3, a,b,c,d, i) L17(4,5,6,7, e,f,g,h, i) \ - L18(0,1,2,3, a,b,c,d, i) L18(4,5,6,7, e,f,g,h, i) \ - L19(0,1,2,3, a,b,c,d, i) L19(4,5,6,7, e,f,g,h, i) \ - L20(0,1,2,3, a,b,c,d, i) L20(4,5,6,7, e,f,g,h, i) \ - L21(0,1,2,3, a,b,c,d, i) L21(4,5,6,7, e,f,g,h, i) \ - L22(0,1,2,3, a,b,c,d, i) L22(4,5,6,7, e,f,g,h, i) \ - L23(0,1,2,3, a,b,c,d, i) L23(4,5,6,7, e,f,g,h, i) \ - L24(0,1,2,3, a,b,c,d, i) L24(4,5,6,7, e,f,g,h, i) \ - L25(0,1,2,3, a,b,c,d, i) L25(4,5,6,7, e,f,g,h, i) \ - L26(0,1,2,3, a,b,c,d, i) L26(4,5,6,7, e,f,g,h, i) \ - L27(0,1,2,3, a,b,c,d, i) L27(4,5,6,7, e,f,g,h, i) \ - L28(0,1,2,3, a,b,c,d, i) L28(4,5,6,7, e,f,g,h, i) \ - L29(0,1,2,3, a,b,c,d, i) L29(4,5,6,7, e,f,g,h, i) \ - L30(0,1,2,3, a,b,c,d, i) L30(4,5,6,7, e,f,g,h, i) \ - L31(0,1,2,3, a,b,c,d, i) L31(4,5,6,7, e,f,g,h, i) \ - L32(0,1,2,3, a,b,c,d, i) L32(4,5,6,7, e,f,g,h, i) - -#define SSE2_QUARTER_ROUND_X16(i, a, b, c, d, e, f, g, h, A, B, C, D, E, F, G, H) \ - L01(0,1,2,3, a,b,c,d, i) L01(4,5,6,7, e,f,g,h, i) L01(8,9,10,11, A,B,C,D, i) L01(12,13,14,15, E,F,G,H, i) \ - L02(0,1,2,3, a,b,c,d, i) L02(4,5,6,7, e,f,g,h, i) L02(8,9,10,11, A,B,C,D, i) L02(12,13,14,15, E,F,G,H, i) \ - L03(0,1,2,3, a,b,c,d, i) L03(4,5,6,7, e,f,g,h, i) L03(8,9,10,11, A,B,C,D, i) L03(12,13,14,15, E,F,G,H, i) \ - L04(0,1,2,3, a,b,c,d, i) L04(4,5,6,7, e,f,g,h, i) L04(8,9,10,11, A,B,C,D, i) L04(12,13,14,15, E,F,G,H, i) \ - L05(0,1,2,3, a,b,c,d, i) L05(4,5,6,7, e,f,g,h, i) L05(8,9,10,11, A,B,C,D, i) L05(12,13,14,15, E,F,G,H, i) \ - L06(0,1,2,3, a,b,c,d, i) L06(4,5,6,7, e,f,g,h, i) L06(8,9,10,11, A,B,C,D, i) L06(12,13,14,15, E,F,G,H, i) \ - L07(0,1,2,3, a,b,c,d, i) L07(4,5,6,7, e,f,g,h, i) L07(8,9,10,11, A,B,C,D, i) L07(12,13,14,15, E,F,G,H, i) \ - L08(0,1,2,3, a,b,c,d, i) L08(4,5,6,7, e,f,g,h, i) L08(8,9,10,11, A,B,C,D, i) L08(12,13,14,15, E,F,G,H, i) \ - L09(0,1,2,3, a,b,c,d, i) L09(4,5,6,7, e,f,g,h, i) L09(8,9,10,11, A,B,C,D, i) L09(12,13,14,15, E,F,G,H, i) \ - L10(0,1,2,3, a,b,c,d, i) L10(4,5,6,7, e,f,g,h, i) L10(8,9,10,11, A,B,C,D, i) L10(12,13,14,15, E,F,G,H, i) \ - L11(0,1,2,3, a,b,c,d, i) L11(4,5,6,7, e,f,g,h, i) L11(8,9,10,11, A,B,C,D, i) L11(12,13,14,15, E,F,G,H, i) \ - L12(0,1,2,3, a,b,c,d, i) L12(4,5,6,7, e,f,g,h, i) L12(8,9,10,11, A,B,C,D, i) L12(12,13,14,15, E,F,G,H, i) \ - L13(0,1,2,3, a,b,c,d, i) L13(4,5,6,7, e,f,g,h, i) L13(8,9,10,11, A,B,C,D, i) L13(12,13,14,15, E,F,G,H, i) \ - L14(0,1,2,3, a,b,c,d, i) L14(4,5,6,7, e,f,g,h, i) L14(8,9,10,11, A,B,C,D, i) L14(12,13,14,15, E,F,G,H, i) \ - L15(0,1,2,3, a,b,c,d, i) L15(4,5,6,7, e,f,g,h, i) L15(8,9,10,11, A,B,C,D, i) L15(12,13,14,15, E,F,G,H, i) \ - L16(0,1,2,3, a,b,c,d, i) L16(4,5,6,7, e,f,g,h, i) L16(8,9,10,11, A,B,C,D, i) L16(12,13,14,15, E,F,G,H, i) \ - L17(0,1,2,3, a,b,c,d, i) L17(4,5,6,7, e,f,g,h, i) L17(8,9,10,11, A,B,C,D, i) L17(12,13,14,15, E,F,G,H, i) \ - L18(0,1,2,3, a,b,c,d, i) L18(4,5,6,7, e,f,g,h, i) L18(8,9,10,11, A,B,C,D, i) L18(12,13,14,15, E,F,G,H, i) \ - L19(0,1,2,3, a,b,c,d, i) L19(4,5,6,7, e,f,g,h, i) L19(8,9,10,11, A,B,C,D, i) L19(12,13,14,15, E,F,G,H, i) \ - L20(0,1,2,3, a,b,c,d, i) L20(4,5,6,7, e,f,g,h, i) L20(8,9,10,11, A,B,C,D, i) L20(12,13,14,15, E,F,G,H, i) \ - L21(0,1,2,3, a,b,c,d, i) L21(4,5,6,7, e,f,g,h, i) L21(8,9,10,11, A,B,C,D, i) L21(12,13,14,15, E,F,G,H, i) \ - L22(0,1,2,3, a,b,c,d, i) L22(4,5,6,7, e,f,g,h, i) L22(8,9,10,11, A,B,C,D, i) L22(12,13,14,15, E,F,G,H, i) \ - L23(0,1,2,3, a,b,c,d, i) L23(4,5,6,7, e,f,g,h, i) L23(8,9,10,11, A,B,C,D, i) L23(12,13,14,15, E,F,G,H, i) \ - L24(0,1,2,3, a,b,c,d, i) L24(4,5,6,7, e,f,g,h, i) L24(8,9,10,11, A,B,C,D, i) L24(12,13,14,15, E,F,G,H, i) \ - L25(0,1,2,3, a,b,c,d, i) L25(4,5,6,7, e,f,g,h, i) L25(8,9,10,11, A,B,C,D, i) L25(12,13,14,15, E,F,G,H, i) \ - L26(0,1,2,3, a,b,c,d, i) L26(4,5,6,7, e,f,g,h, i) L26(8,9,10,11, A,B,C,D, i) L26(12,13,14,15, E,F,G,H, i) \ - L27(0,1,2,3, a,b,c,d, i) L27(4,5,6,7, e,f,g,h, i) L27(8,9,10,11, A,B,C,D, i) L27(12,13,14,15, E,F,G,H, i) \ - L28(0,1,2,3, a,b,c,d, i) L28(4,5,6,7, e,f,g,h, i) L28(8,9,10,11, A,B,C,D, i) L28(12,13,14,15, E,F,G,H, i) \ - L29(0,1,2,3, a,b,c,d, i) L29(4,5,6,7, e,f,g,h, i) L29(8,9,10,11, A,B,C,D, i) L29(12,13,14,15, E,F,G,H, i) \ - L30(0,1,2,3, a,b,c,d, i) L30(4,5,6,7, e,f,g,h, i) L30(8,9,10,11, A,B,C,D, i) L30(12,13,14,15, E,F,G,H, i) \ - L31(0,1,2,3, a,b,c,d, i) L31(4,5,6,7, e,f,g,h, i) L31(8,9,10,11, A,B,C,D, i) L31(12,13,14,15, E,F,G,H, i) \ - L32(0,1,2,3, a,b,c,d, i) L32(4,5,6,7, e,f,g,h, i) L32(8,9,10,11, A,B,C,D, i) L32(12,13,14,15, E,F,G,H, i) - -#if CRYPTOPP_BOOL_X64 - SSE2_QUARTER_ROUND_X16(1, 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15) -#else - SSE2_QUARTER_ROUND_X8(1, 2, 6, 10, 14, 3, 7, 11, 15) - SSE2_QUARTER_ROUND_X8(1, 0, 4, 8, 12, 1, 5, 9, 13) -#endif - AS2( mov REG_roundsLeft, REG_rounds) - ASJ( jmp, 2, f) - - ASL(SSE2_Salsa_Output) - AS2( movdqa xmm0, xmm4) - AS2( punpckldq xmm4, xmm5) - AS2( movdqa xmm1, xmm6) - AS2( punpckldq xmm6, xmm7) - AS2( movdqa xmm2, xmm4) - AS2( punpcklqdq xmm4, xmm6) // e - AS2( punpckhqdq xmm2, xmm6) // f - AS2( punpckhdq xmm0, xmm5) - AS2( punpckhdq xmm1, xmm7) - AS2( movdqa xmm6, xmm0) - AS2( punpcklqdq xmm0, xmm1) // g - AS2( punpckhqdq xmm6, xmm1) // h - AS_XMM_OUTPUT4(SSE2_Salsa_Output_A, REG_input, REG_output, 4, 2, 0, 6, 1, 0, 4, 8, 12, 1) - AS1( ret) - - ASL(6) -#if CRYPTOPP_BOOL_X64 - SSE2_QUARTER_ROUND_X16(0, 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15) - ASL(2) - SSE2_QUARTER_ROUND_X16(0, 0, 13, 10, 7, 1, 14, 11, 4, 2, 15, 8, 5, 3, 12, 9, 6) -#else - SSE2_QUARTER_ROUND_X8(0, 2, 6, 10, 14, 3, 7, 11, 15) - SSE2_QUARTER_ROUND_X8(0, 0, 4, 8, 12, 1, 5, 9, 13) - ASL(2) - SSE2_QUARTER_ROUND_X8(0, 2, 15, 8, 5, 3, 12, 9, 6) - SSE2_QUARTER_ROUND_X8(0, 0, 13, 10, 7, 1, 14, 11, 4) -#endif - AS2( sub REG_roundsLeft, 2) - ASJ( jnz, 6, b) - -#define SSE2_OUTPUT_4(a, b, c, d) \ - AS2( movdqa xmm4, [SSE2_WORKSPACE + a*16 + 256])\ - AS2( paddd xmm4, [SSE2_WORKSPACE + a*16])\ - AS2( movdqa xmm5, [SSE2_WORKSPACE + b*16 + 256])\ - AS2( paddd xmm5, [SSE2_WORKSPACE + b*16])\ - AS2( movdqa xmm6, [SSE2_WORKSPACE + c*16 + 256])\ - AS2( paddd xmm6, [SSE2_WORKSPACE + c*16])\ - AS2( movdqa xmm7, [SSE2_WORKSPACE + d*16 + 256])\ - AS2( paddd xmm7, [SSE2_WORKSPACE + d*16])\ - ASC( call, SSE2_Salsa_Output) - - SSE2_OUTPUT_4(0, 13, 10, 7) - SSE2_OUTPUT_4(4, 1, 14, 11) - SSE2_OUTPUT_4(8, 5, 2, 15) - SSE2_OUTPUT_4(12, 9, 6, 3) - AS2( test REG_input, REG_input) - ASJ( jz, 9, f) - AS2( add REG_input, 12*16) - ASL(9) - AS2( add REG_output, 12*16) - AS2( sub REG_iterationCount, 4) - AS2( cmp REG_iterationCount, 4) - ASJ( jge, 1, b) - AS_POP_IF86( sp) - - ASL(5) - AS2( sub REG_iterationCount, 1) - ASJ( jl, 4, f) - AS2( movdqa xmm0, [REG_state + 0*16]) - AS2( movdqa xmm1, [REG_state + 1*16]) - AS2( movdqa xmm2, [REG_state + 2*16]) - AS2( movdqa xmm3, [REG_state + 3*16]) - AS2( mov REG_roundsLeft, REG_rounds) - - ASL(0) - SSE2_QUARTER_ROUND(0, 1, 3, 7) - SSE2_QUARTER_ROUND(1, 2, 0, 9) - SSE2_QUARTER_ROUND(2, 3, 1, 13) - SSE2_QUARTER_ROUND(3, 0, 2, 18) - ASS( pshufd xmm1, xmm1, 2, 1, 0, 3) - ASS( pshufd xmm2, xmm2, 1, 0, 3, 2) - ASS( pshufd xmm3, xmm3, 0, 3, 2, 1) - SSE2_QUARTER_ROUND(0, 3, 1, 7) - SSE2_QUARTER_ROUND(3, 2, 0, 9) - SSE2_QUARTER_ROUND(2, 1, 3, 13) - SSE2_QUARTER_ROUND(1, 0, 2, 18) - ASS( pshufd xmm1, xmm1, 0, 3, 2, 1) - ASS( pshufd xmm2, xmm2, 1, 0, 3, 2) - ASS( pshufd xmm3, xmm3, 2, 1, 0, 3) - AS2( sub REG_roundsLeft, 2) - ASJ( jnz, 0, b) - - AS2( paddd xmm0, [REG_state + 0*16]) - AS2( paddd xmm1, [REG_state + 1*16]) - AS2( paddd xmm2, [REG_state + 2*16]) - AS2( paddd xmm3, [REG_state + 3*16]) - - AS2( add dword ptr [REG_state + 8*4], 1) - AS2( adc dword ptr [REG_state + 5*4], 0) - - AS2( pcmpeqb xmm6, xmm6) // all ones - AS2( psrlq xmm6, 32) // lo32 mask - ASS( pshufd xmm7, xmm6, 0, 1, 2, 3) // hi32 mask - AS2( movdqa xmm4, xmm0) - AS2( movdqa xmm5, xmm3) - AS2( pand xmm0, xmm7) - AS2( pand xmm4, xmm6) - AS2( pand xmm3, xmm6) - AS2( pand xmm5, xmm7) - AS2( por xmm4, xmm5) // 0,13,2,15 - AS2( movdqa xmm5, xmm1) - AS2( pand xmm1, xmm7) - AS2( pand xmm5, xmm6) - AS2( por xmm0, xmm5) // 4,1,6,3 - AS2( pand xmm6, xmm2) - AS2( pand xmm2, xmm7) - AS2( por xmm1, xmm6) // 8,5,10,7 - AS2( por xmm2, xmm3) // 12,9,14,11 - - AS2( movdqa xmm5, xmm4) - AS2( movdqa xmm6, xmm0) - AS3( shufpd xmm4, xmm1, 2) // 0,13,10,7 - AS3( shufpd xmm0, xmm2, 2) // 4,1,14,11 - AS3( shufpd xmm1, xmm5, 2) // 8,5,2,15 - AS3( shufpd xmm2, xmm6, 2) // 12,9,6,3 - - // output keystream - AS_XMM_OUTPUT4(SSE2_Salsa_Output_B, REG_input, REG_output, 4, 0, 1, 2, 3, 0, 1, 2, 3, 4) - ASJ( jmp, 5, b) - ASL(4) - - AS_POP_IF86( bp) -#ifdef __GNUC__ - AS_POP_IF86( bx) - ".att_syntax prefix;" - : - #if CRYPTOPP_BOOL_X64 - : "r" (m_rounds), "r" (input), "r" (iterationCount), "r" (m_state.data()), "r" (output), "r" (workspace.m_ptr) - : "%eax", "%edx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" - #else - : "d" (m_rounds), "a" (input), "c" (iterationCount), "S" (m_state.data()), "D" (output) - : "memory", "cc" - #endif - ); -#endif -#ifdef CRYPTOPP_GENERATE_X64_MASM - movdqa xmm6, [rsp + 0200h] - movdqa xmm7, [rsp + 0210h] - movdqa xmm8, [rsp + 0220h] - movdqa xmm9, [rsp + 0230h] - movdqa xmm10, [rsp + 0240h] - movdqa xmm11, [rsp + 0250h] - movdqa xmm12, [rsp + 0260h] - movdqa xmm13, [rsp + 0270h] - movdqa xmm14, [rsp + 0280h] - movdqa xmm15, [rsp + 0290h] - add rsp, 10*16 + 32*16 + 8 - ret -Salsa20_OperateKeystream ENDP -#else - } - else -#endif -#endif -#ifndef CRYPTOPP_GENERATE_X64_MASM - { - word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; - - while (iterationCount--) - { - x0 = m_state[0]; x1 = m_state[1]; x2 = m_state[2]; x3 = m_state[3]; - x4 = m_state[4]; x5 = m_state[5]; x6 = m_state[6]; x7 = m_state[7]; - x8 = m_state[8]; x9 = m_state[9]; x10 = m_state[10]; x11 = m_state[11]; - x12 = m_state[12]; x13 = m_state[13]; x14 = m_state[14]; x15 = m_state[15]; - - for (int i=m_rounds; i>0; i-=2) - { - #define QUARTER_ROUND(a, b, c, d) \ - b = b ^ rotlFixed(a + d, 7); \ - c = c ^ rotlFixed(b + a, 9); \ - d = d ^ rotlFixed(c + b, 13); \ - a = a ^ rotlFixed(d + c, 18); - - QUARTER_ROUND(x0, x4, x8, x12) - QUARTER_ROUND(x1, x5, x9, x13) - QUARTER_ROUND(x2, x6, x10, x14) - QUARTER_ROUND(x3, x7, x11, x15) - - QUARTER_ROUND(x0, x13, x10, x7) - QUARTER_ROUND(x1, x14, x11, x4) - QUARTER_ROUND(x2, x15, x8, x5) - QUARTER_ROUND(x3, x12, x9, x6) - } - - #define SALSA_OUTPUT(x) {\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 0, x0 + m_state[0]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 1, x13 + m_state[13]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 2, x10 + m_state[10]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 3, x7 + m_state[7]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 4, x4 + m_state[4]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 5, x1 + m_state[1]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 6, x14 + m_state[14]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 7, x11 + m_state[11]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 8, x8 + m_state[8]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 9, x5 + m_state[5]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 10, x2 + m_state[2]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 11, x15 + m_state[15]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 12, x12 + m_state[12]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 13, x9 + m_state[9]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 14, x6 + m_state[6]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 15, x3 + m_state[3]);} - -#ifndef CRYPTOPP_DOXYGEN_PROCESSING - CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(SALSA_OUTPUT, BYTES_PER_ITERATION); -#endif - - if (++m_state[8] == 0) - ++m_state[5]; - } - } -} // see comment above if an internal compiler error occurs here - -void XSalsa20_Policy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - m_rounds = params.GetIntValueWithDefault(Name::Rounds(), 20); - - if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20)) - throw InvalidRounds(XSalsa20::StaticAlgorithmName(), m_rounds); - - GetUserKey(LITTLE_ENDIAN_ORDER, m_key.begin(), m_key.size(), key, length); - if (length == 16) - memcpy(m_key.begin()+4, m_key.begin(), 16); - - // "expand 32-byte k" - m_state[0] = 0x61707865; - m_state[1] = 0x3320646e; - m_state[2] = 0x79622d32; - m_state[3] = 0x6b206574; -} - -void XSalsa20_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length) -{ - assert(length==24); - - word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; - - GetBlock get(IV); - get(x14)(x11)(x8)(x5)(m_state[14])(m_state[11]); - - x13 = m_key[0]; x10 = m_key[1]; x7 = m_key[2]; x4 = m_key[3]; - x15 = m_key[4]; x12 = m_key[5]; x9 = m_key[6]; x6 = m_key[7]; - x0 = m_state[0]; x1 = m_state[1]; x2 = m_state[2]; x3 = m_state[3]; - - for (int i=m_rounds; i>0; i-=2) - { - QUARTER_ROUND(x0, x4, x8, x12) - QUARTER_ROUND(x1, x5, x9, x13) - QUARTER_ROUND(x2, x6, x10, x14) - QUARTER_ROUND(x3, x7, x11, x15) - - QUARTER_ROUND(x0, x13, x10, x7) - QUARTER_ROUND(x1, x14, x11, x4) - QUARTER_ROUND(x2, x15, x8, x5) - QUARTER_ROUND(x3, x12, x9, x6) - } - - m_state[13] = x0; m_state[10] = x1; m_state[7] = x2; m_state[4] = x3; - m_state[15] = x14; m_state[12] = x11; m_state[9] = x8; m_state[6] = x5; - m_state[8] = m_state[5] = 0; -} - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.h deleted file mode 100644 index 49af8854..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/salsa.h +++ /dev/null @@ -1,65 +0,0 @@ -// salsa.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_SALSA_H -#define CRYPTOPP_SALSA_H - -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::UNIQUE_IV, 8> -{ - static const char *StaticAlgorithmName() {return "Salsa20";} -}; - -class CRYPTOPP_NO_VTABLE Salsa20_Policy : public AdditiveCipherConcretePolicy -{ -protected: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length); - bool CipherIsRandomAccess() const {return true;} - void SeekToIteration(lword iterationCount); -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 - unsigned int GetAlignment() const; - unsigned int GetOptimalBlockSize() const; -#endif - - FixedSizeAlignedSecBlock m_state; - int m_rounds; -}; - -/// Salsa20, variable rounds: 8, 12 or 20 (default 20) -struct Salsa20 : public Salsa20_Info, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal >, Salsa20_Info> Encryption; - typedef Encryption Decryption; -}; - -//! _ -struct XSalsa20_Info : public FixedKeyLength<32, SimpleKeyingInterface::UNIQUE_IV, 24> -{ - static const char *StaticAlgorithmName() {return "XSalsa20";} -}; - -class CRYPTOPP_NO_VTABLE XSalsa20_Policy : public Salsa20_Policy -{ -public: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length); - -protected: - FixedSizeSecBlock m_key; -}; - -/// XSalsa20, variable rounds: 8, 12 or 20 (default 20) -struct XSalsa20 : public XSalsa20_Info, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal >, XSalsa20_Info> Encryption; - typedef Encryption Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.cpp deleted file mode 100644 index f49b5220..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.cpp +++ /dev/null @@ -1,213 +0,0 @@ -// seal.cpp - written and placed in the public domain by Wei Dai -// updated to SEAL 3.0 by Leonard Janke - -#include "pch.h" - -#include "seal.h" -#include "sha.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void SEAL_TestInstantiations() -{ - SEAL<>::Encryption x; -} - -struct SEAL_Gamma -{ - SEAL_Gamma(const byte *key) - : H(5), Z(5), D(16), lastIndex(0xffffffff) - { - GetUserKey(BIG_ENDIAN_ORDER, H.begin(), 5, key, 20); - memset(D, 0, 64); - } - - word32 Apply(word32 i); - - SecBlock H, Z, D; - word32 lastIndex; -}; - -word32 SEAL_Gamma::Apply(word32 i) -{ - word32 shaIndex = i/5; - if (shaIndex != lastIndex) - { - memcpy(Z, H, 20); - D[0] = shaIndex; - SHA::Transform(Z, D); - lastIndex = shaIndex; - } - return Z[i%5]; -} - -template -void SEAL_Policy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - m_insideCounter = m_outsideCounter = m_startCount = 0; - - unsigned int L = params.GetIntValueWithDefault("NumberOfOutputBitsPerPositionIndex", 32*1024); - m_iterationsPerCount = L / 8192; - - SEAL_Gamma gamma(key); - unsigned int i; - - for (i=0; i<512; i++) - m_T[i] = gamma.Apply(i); - - for (i=0; i<256; i++) - m_S[i] = gamma.Apply(0x1000+i); - - m_R.New(4*(L/8192)); - - for (i=0; i -void SEAL_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length) -{ - assert(length==4); - m_outsideCounter = IV ? GetWord(false, BIG_ENDIAN_ORDER, IV) : 0; - m_startCount = m_outsideCounter; - m_insideCounter = 0; -} - -template -void SEAL_Policy::SeekToIteration(lword iterationCount) -{ - m_outsideCounter = m_startCount + (unsigned int)(iterationCount / m_iterationsPerCount); - m_insideCounter = (unsigned int)(iterationCount % m_iterationsPerCount); -} - -template -void SEAL_Policy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ - word32 a, b, c, d, n1, n2, n3, n4; - unsigned int p, q; - - for (size_t iteration = 0; iteration < iterationCount; ++iteration) - { -#define Ttab(x) *(word32 *)((byte *)m_T.begin()+x) - - a = m_outsideCounter ^ m_R[4*m_insideCounter]; - b = rotrFixed(m_outsideCounter, 8U) ^ m_R[4*m_insideCounter+1]; - c = rotrFixed(m_outsideCounter, 16U) ^ m_R[4*m_insideCounter+2]; - d = rotrFixed(m_outsideCounter, 24U) ^ m_R[4*m_insideCounter+3]; - - for (unsigned int j=0; j<2; j++) - { - p = a & 0x7fc; - b += Ttab(p); - a = rotrFixed(a, 9U); - - p = b & 0x7fc; - c += Ttab(p); - b = rotrFixed(b, 9U); - - p = c & 0x7fc; - d += Ttab(p); - c = rotrFixed(c, 9U); - - p = d & 0x7fc; - a += Ttab(p); - d = rotrFixed(d, 9U); - } - - n1 = d, n2 = b, n3 = a, n4 = c; - - p = a & 0x7fc; - b += Ttab(p); - a = rotrFixed(a, 9U); - - p = b & 0x7fc; - c += Ttab(p); - b = rotrFixed(b, 9U); - - p = c & 0x7fc; - d += Ttab(p); - c = rotrFixed(c, 9U); - - p = d & 0x7fc; - a += Ttab(p); - d = rotrFixed(d, 9U); - - // generate 8192 bits - for (unsigned int i=0; i<64; i++) - { - p = a & 0x7fc; - a = rotrFixed(a, 9U); - b += Ttab(p); - b ^= a; - - q = b & 0x7fc; - b = rotrFixed(b, 9U); - c ^= Ttab(q); - c += b; - - p = (p+c) & 0x7fc; - c = rotrFixed(c, 9U); - d += Ttab(p); - d ^= c; - - q = (q+d) & 0x7fc; - d = rotrFixed(d, 9U); - a ^= Ttab(q); - a += d; - - p = (p+a) & 0x7fc; - b ^= Ttab(p); - a = rotrFixed(a, 9U); - - q = (q+b) & 0x7fc; - c += Ttab(q); - b = rotrFixed(b, 9U); - - p = (p+c) & 0x7fc; - d ^= Ttab(p); - c = rotrFixed(c, 9U); - - q = (q+d) & 0x7fc; - d = rotrFixed(d, 9U); - a += Ttab(q); - -#define SEAL_OUTPUT(x) \ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, B::ToEnum(), 0, b + m_S[4*i+0]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, B::ToEnum(), 1, c ^ m_S[4*i+1]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, B::ToEnum(), 2, d + m_S[4*i+2]);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, B::ToEnum(), 3, a ^ m_S[4*i+3]); - - CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(SEAL_OUTPUT, 4*4); - - if (i & 1) - { - a += n3; - b += n4; - c ^= n3; - d ^= n4; - } - else - { - a += n1; - b += n2; - c ^= n1; - d ^= n2; - } - } - - if (++m_insideCounter == m_iterationsPerCount) - { - ++m_outsideCounter; - m_insideCounter = 0; - } - } - - a = b = c = d = n1 = n2 = n3 = n4 = 0; - p = q = 0; -} - -template class SEAL_Policy; -template class SEAL_Policy; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.h deleted file mode 100644 index e14ae1ca..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/seal.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef CRYPTOPP_SEAL_H -#define CRYPTOPP_SEAL_H - -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -struct SEAL_Info : public FixedKeyLength<20, SimpleKeyingInterface::INTERNALLY_GENERATED_IV, 4> -{ - static const char *StaticAlgorithmName() {return B::ToEnum() == LITTLE_ENDIAN_ORDER ? "SEAL-3.0-LE" : "SEAL-3.0-BE";} -}; - -template -class CRYPTOPP_NO_VTABLE SEAL_Policy : public AdditiveCipherConcretePolicy, public SEAL_Info -{ -protected: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length); - bool CipherIsRandomAccess() const {return true;} - void SeekToIteration(lword iterationCount); - -private: - FixedSizeSecBlock m_T; - FixedSizeSecBlock m_S; - SecBlock m_R; - - word32 m_startCount, m_iterationsPerCount; - word32 m_outsideCounter, m_insideCounter; -}; - -//! SEAL -template -struct SEAL : public SEAL_Info, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal, AdditiveCipherTemplate<> >, SEAL_Info > Encryption; - typedef Encryption Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/secblock.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/secblock.h deleted file mode 100644 index 24b9fc09..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/secblock.h +++ /dev/null @@ -1,467 +0,0 @@ -// secblock.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_SECBLOCK_H -#define CRYPTOPP_SECBLOCK_H - -#include "config.h" -#include "misc.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -// ************** secure memory allocation *************** - -template -class AllocatorBase -{ -public: - typedef T value_type; - typedef size_t size_type; -#ifdef CRYPTOPP_MSVCRT6 - typedef ptrdiff_t difference_type; -#else - typedef std::ptrdiff_t difference_type; -#endif - typedef T * pointer; - typedef const T * const_pointer; - typedef T & reference; - typedef const T & const_reference; - - pointer address(reference r) const {return (&r);} - const_pointer address(const_reference r) const {return (&r); } - void construct(pointer p, const T& val) {new (p) T(val);} - void destroy(pointer p) {p->~T();} - size_type max_size() const {return ~size_type(0)/sizeof(T);} // switch to std::numeric_limits::max later - -protected: - static void CheckSize(size_t n) - { - if (n > ~size_t(0) / sizeof(T)) - throw InvalidArgument("AllocatorBase: requested size would cause integer overflow"); - } -}; - -#define CRYPTOPP_INHERIT_ALLOCATOR_TYPES \ -typedef typename AllocatorBase::value_type value_type;\ -typedef typename AllocatorBase::size_type size_type;\ -typedef typename AllocatorBase::difference_type difference_type;\ -typedef typename AllocatorBase::pointer pointer;\ -typedef typename AllocatorBase::const_pointer const_pointer;\ -typedef typename AllocatorBase::reference reference;\ -typedef typename AllocatorBase::const_reference const_reference; - -#if defined(_MSC_VER) && (_MSC_VER < 1300) -// this pragma causes an internal compiler error if placed immediately before std::swap(a, b) -#pragma warning(push) -#pragma warning(disable: 4700) // VC60 workaround: don't know how to get rid of this warning -#endif - -template -typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize, typename A::size_type newSize, bool preserve) -{ - if (oldSize == newSize) - return p; - - if (preserve) - { - typename A::pointer newPointer = a.allocate(newSize, NULL); - memcpy_s(newPointer, sizeof(T)*newSize, p, sizeof(T)*STDMIN(oldSize, newSize)); - a.deallocate(p, oldSize); - return newPointer; - } - else - { - a.deallocate(p, oldSize); - return a.allocate(newSize, NULL); - } -} - -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#pragma warning(pop) -#endif - -template -class AllocatorWithCleanup : public AllocatorBase -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - pointer allocate(size_type n, const void * = NULL) - { - CheckSize(n); - if (n == 0) - return NULL; - -#if CRYPTOPP_BOOL_ALIGN16_ENABLED - if (T_Align16 && n*sizeof(T) >= 16) - return (pointer)AlignedAllocate(n*sizeof(T)); -#endif - - return (pointer)UnalignedAllocate(n*sizeof(T)); - } - - void deallocate(void *p, size_type n) - { - SecureWipeArray((pointer)p, n); - -#if CRYPTOPP_BOOL_ALIGN16_ENABLED - if (T_Align16 && n*sizeof(T) >= 16) - return AlignedDeallocate(p); -#endif - - UnalignedDeallocate(p); - } - - pointer reallocate(T *p, size_type oldSize, size_type newSize, bool preserve) - { - return StandardReallocate(*this, p, oldSize, newSize, preserve); - } - - // VS.NET STL enforces the policy of "All STL-compliant allocators have to provide a - // template class member called rebind". - template struct rebind { typedef AllocatorWithCleanup other; }; -#if _MSC_VER >= 1500 - AllocatorWithCleanup() {} - template AllocatorWithCleanup(const AllocatorWithCleanup &) {} -#endif -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup; -#if CRYPTOPP_BOOL_X86 -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup; // for Integer -#endif - -template -class NullAllocator : public AllocatorBase -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - pointer allocate(size_type n, const void * = NULL) - { - assert(false); - return NULL; - } - - void deallocate(void *p, size_type n) - { - assert(false); - } - - size_type max_size() const {return 0;} -}; - -// This allocator can't be used with standard collections because -// they require that all objects of the same allocator type are equivalent. -// So this is for use with SecBlock only. -template , bool T_Align16 = false> -class FixedSizeAllocatorWithCleanup : public AllocatorBase -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - FixedSizeAllocatorWithCleanup() : m_allocated(false) {} - - pointer allocate(size_type n) - { - assert(IsAlignedOn(m_array, 8)); - - if (n <= S && !m_allocated) - { - m_allocated = true; - return GetAlignedArray(); - } - else - return m_fallbackAllocator.allocate(n); - } - - pointer allocate(size_type n, const void *hint) - { - if (n <= S && !m_allocated) - { - m_allocated = true; - return GetAlignedArray(); - } - else - return m_fallbackAllocator.allocate(n, hint); - } - - void deallocate(void *p, size_type n) - { - if (p == GetAlignedArray()) - { - assert(n <= S); - assert(m_allocated); - m_allocated = false; - SecureWipeArray((pointer)p, n); - } - else - m_fallbackAllocator.deallocate(p, n); - } - - pointer reallocate(pointer p, size_type oldSize, size_type newSize, bool preserve) - { - if (p == GetAlignedArray() && newSize <= S) - { - assert(oldSize <= S); - if (oldSize > newSize) - SecureWipeArray(p+newSize, oldSize-newSize); - return p; - } - - pointer newPointer = allocate(newSize, NULL); - if (preserve) - memcpy(newPointer, p, sizeof(T)*STDMIN(oldSize, newSize)); - deallocate(p, oldSize); - return newPointer; - } - - size_type max_size() const {return STDMAX(m_fallbackAllocator.max_size(), S);} - -private: -#ifdef __BORLANDC__ - T* GetAlignedArray() {return m_array;} - T m_array[S]; -#else - T* GetAlignedArray() {return (CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16) ? (T*)(((byte *)m_array) + (0-(size_t)m_array)%16) : m_array;} - CRYPTOPP_ALIGN_DATA(8) T m_array[(CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16) ? S+8/sizeof(T) : S]; -#endif - A m_fallbackAllocator; - bool m_allocated; -}; - -//! a block of memory allocated using A -template > -class SecBlock -{ -public: - typedef typename A::value_type value_type; - typedef typename A::pointer iterator; - typedef typename A::const_pointer const_iterator; - typedef typename A::size_type size_type; - - explicit SecBlock(size_type size=0) - : m_size(size) {m_ptr = m_alloc.allocate(size, NULL);} - SecBlock(const SecBlock &t) - : m_size(t.m_size) {m_ptr = m_alloc.allocate(m_size, NULL); memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));} - SecBlock(const T *t, size_type len) - : m_size(len) - { - m_ptr = m_alloc.allocate(len, NULL); - if (t == NULL) - memset_z(m_ptr, 0, len*sizeof(T)); - else - memcpy(m_ptr, t, len*sizeof(T)); - } - - ~SecBlock() - {m_alloc.deallocate(m_ptr, m_size);} - -#ifdef __BORLANDC__ - operator T *() const - {return (T*)m_ptr;} -#else - operator const void *() const - {return m_ptr;} - operator void *() - {return m_ptr;} - - operator const T *() const - {return m_ptr;} - operator T *() - {return m_ptr;} -#endif - -// T *operator +(size_type offset) -// {return m_ptr+offset;} - -// const T *operator +(size_type offset) const -// {return m_ptr+offset;} - -// T& operator[](size_type index) -// {assert(index >= 0 && index < m_size); return m_ptr[index];} - -// const T& operator[](size_type index) const -// {assert(index >= 0 && index < m_size); return m_ptr[index];} - - iterator begin() - {return m_ptr;} - const_iterator begin() const - {return m_ptr;} - iterator end() - {return m_ptr+m_size;} - const_iterator end() const - {return m_ptr+m_size;} - - typename A::pointer data() {return m_ptr;} - typename A::const_pointer data() const {return m_ptr;} - - size_type size() const {return m_size;} - bool empty() const {return m_size == 0;} - - byte * BytePtr() {return (byte *)m_ptr;} - const byte * BytePtr() const {return (const byte *)m_ptr;} - size_type SizeInBytes() const {return m_size*sizeof(T);} - - //! set contents and size - void Assign(const T *t, size_type len) - { - New(len); - memcpy_s(m_ptr, m_size*sizeof(T), t, len*sizeof(T)); - } - - //! copy contents and size from another SecBlock - void Assign(const SecBlock &t) - { - if (this != &t) - { - New(t.m_size); - memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T)); - } - } - - SecBlock& operator=(const SecBlock &t) - { - Assign(t); - return *this; - } - - // append to this object - SecBlock& operator+=(const SecBlock &t) - { - size_type oldSize = m_size; - Grow(m_size+t.m_size); - memcpy_s(m_ptr+oldSize, m_size*sizeof(T), t.m_ptr, t.m_size*sizeof(T)); - return *this; - } - - // append operator - SecBlock operator+(const SecBlock &t) - { - SecBlock result(m_size+t.m_size); - memcpy_s(result.m_ptr, result.m_size*sizeof(T), m_ptr, m_size*sizeof(T)); - memcpy_s(result.m_ptr+m_size, t.m_size*sizeof(T), t.m_ptr, t.m_size*sizeof(T)); - return result; - } - - bool operator==(const SecBlock &t) const - { - return m_size == t.m_size && VerifyBufsEqual(m_ptr, t.m_ptr, m_size*sizeof(T)); - } - - bool operator!=(const SecBlock &t) const - { - return !operator==(t); - } - - //! change size, without preserving contents - void New(size_type newSize) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, false); - m_size = newSize; - } - - //! change size and set contents to 0 - void CleanNew(size_type newSize) - { - New(newSize); - memset_z(m_ptr, 0, m_size*sizeof(T)); - } - - //! change size only if newSize > current size. contents are preserved - void Grow(size_type newSize) - { - if (newSize > m_size) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - m_size = newSize; - } - } - - //! change size only if newSize > current size. contents are preserved and additional area is set to 0 - void CleanGrow(size_type newSize) - { - if (newSize > m_size) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - memset(m_ptr+m_size, 0, (newSize-m_size)*sizeof(T)); - m_size = newSize; - } - } - - //! change size and preserve contents - void resize(size_type newSize) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - m_size = newSize; - } - - //! swap contents and size with another SecBlock - void swap(SecBlock &b) - { - std::swap(m_alloc, b.m_alloc); - std::swap(m_size, b.m_size); - std::swap(m_ptr, b.m_ptr); - } - -//private: - A m_alloc; - size_type m_size; - T *m_ptr; -}; - -typedef SecBlock SecByteBlock; -typedef SecBlock > AlignedSecByteBlock; -typedef SecBlock SecWordBlock; - -//! a SecBlock with fixed size, allocated statically -template > -class FixedSizeSecBlock : public SecBlock -{ -public: - explicit FixedSizeSecBlock() : SecBlock(S) {} -}; - -template -class FixedSizeAlignedSecBlock : public FixedSizeSecBlock, T_Align16> > -{ -}; - -//! a SecBlock that preallocates size S statically, and uses the heap when this size is exceeded -template > > -class SecBlockWithHint : public SecBlock -{ -public: - explicit SecBlockWithHint(size_t size) : SecBlock(size) {} -}; - -template -inline bool operator==(const CryptoPP::AllocatorWithCleanup&, const CryptoPP::AllocatorWithCleanup&) {return (true);} -template -inline bool operator!=(const CryptoPP::AllocatorWithCleanup&, const CryptoPP::AllocatorWithCleanup&) {return (false);} - -NAMESPACE_END - -NAMESPACE_BEGIN(std) -template -inline void swap(CryptoPP::SecBlock &a, CryptoPP::SecBlock &b) -{ - a.swap(b); -} - -#if defined(_STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE) || (defined(_STLPORT_VERSION) && !defined(_STLP_MEMBER_TEMPLATE_CLASSES)) -// working for STLport 5.1.3 and MSVC 6 SP5 -template -inline CryptoPP::AllocatorWithCleanup<_Tp2>& -__stl_alloc_rebind(CryptoPP::AllocatorWithCleanup<_Tp1>& __a, const _Tp2*) -{ - return (CryptoPP::AllocatorWithCleanup<_Tp2>&)(__a); -} -#endif - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/seckey.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/seckey.h deleted file mode 100644 index 35046a61..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/seckey.h +++ /dev/null @@ -1,221 +0,0 @@ -// seckey.h - written and placed in the public domain by Wei Dai - -// This file contains helper classes/functions for implementing secret key algorithms. - -#ifndef CRYPTOPP_SECKEY_H -#define CRYPTOPP_SECKEY_H - -#include "cryptlib.h" -#include "misc.h" -#include "simple.h" - -NAMESPACE_BEGIN(CryptoPP) - -inline CipherDir ReverseCipherDir(CipherDir dir) -{ - return (dir == ENCRYPTION) ? DECRYPTION : ENCRYPTION; -} - -//! to be inherited by block ciphers with fixed block size -template -class FixedBlockSize -{ -public: - CRYPTOPP_CONSTANT(BLOCKSIZE = N) -}; - -// ************** rounds *************** - -//! to be inherited by ciphers with fixed number of rounds -template -class FixedRounds -{ -public: - CRYPTOPP_CONSTANT(ROUNDS = R) -}; - -//! to be inherited by ciphers with variable number of rounds -template // use INT_MAX here because enums are treated as signed ints -class VariableRounds -{ -public: - CRYPTOPP_CONSTANT(DEFAULT_ROUNDS = D) - CRYPTOPP_CONSTANT(MIN_ROUNDS = N) - CRYPTOPP_CONSTANT(MAX_ROUNDS = M) - static unsigned int StaticGetDefaultRounds(size_t keylength) {return DEFAULT_ROUNDS;} - -protected: - inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg) - { - if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS) - throw InvalidRounds(alg->AlgorithmName(), rounds); - } - - inline unsigned int GetRoundsAndThrowIfInvalid(const NameValuePairs ¶m, const Algorithm *alg) - { - int rounds = param.GetIntValueWithDefault("Rounds", DEFAULT_ROUNDS); - ThrowIfInvalidRounds(rounds, alg); - return (unsigned int)rounds; - } -}; - -// ************** key length *************** - -//! to be inherited by keyed algorithms with fixed key length -template -class FixedKeyLength -{ -public: - CRYPTOPP_CONSTANT(KEYLENGTH=N) - CRYPTOPP_CONSTANT(MIN_KEYLENGTH=N) - CRYPTOPP_CONSTANT(MAX_KEYLENGTH=N) - CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=N) - CRYPTOPP_CONSTANT(IV_REQUIREMENT = IV_REQ) - CRYPTOPP_CONSTANT(IV_LENGTH = IV_L) - static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t) {return KEYLENGTH;} -}; - -/// support query of variable key length, template parameters are default, min, max, multiple (default multiple 1) -template -class VariableKeyLength -{ - // make these private to avoid Doxygen documenting them in all derived classes - CRYPTOPP_COMPILE_ASSERT(Q > 0); - CRYPTOPP_COMPILE_ASSERT(N % Q == 0); - CRYPTOPP_COMPILE_ASSERT(M % Q == 0); - CRYPTOPP_COMPILE_ASSERT(N < M); - CRYPTOPP_COMPILE_ASSERT(D >= N); - CRYPTOPP_COMPILE_ASSERT(M >= D); - -public: - CRYPTOPP_CONSTANT(MIN_KEYLENGTH=N) - CRYPTOPP_CONSTANT(MAX_KEYLENGTH=M) - CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=D) - CRYPTOPP_CONSTANT(KEYLENGTH_MULTIPLE=Q) - CRYPTOPP_CONSTANT(IV_REQUIREMENT=IV_REQ) - CRYPTOPP_CONSTANT(IV_LENGTH=IV_L) - - static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t n) - { - if (n < (size_t)MIN_KEYLENGTH) - return MIN_KEYLENGTH; - else if (n > (size_t)MAX_KEYLENGTH) - return (size_t)MAX_KEYLENGTH; - else - { - n += KEYLENGTH_MULTIPLE-1; - return n - n%KEYLENGTH_MULTIPLE; - } - } -}; - -/// support query of key length that's the same as another class -template -class SameKeyLengthAs -{ -public: - CRYPTOPP_CONSTANT(MIN_KEYLENGTH=T::MIN_KEYLENGTH) - CRYPTOPP_CONSTANT(MAX_KEYLENGTH=T::MAX_KEYLENGTH) - CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=T::DEFAULT_KEYLENGTH) - CRYPTOPP_CONSTANT(IV_REQUIREMENT=IV_REQ) - CRYPTOPP_CONSTANT(IV_LENGTH=IV_L) - - static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength) - {return T::StaticGetValidKeyLength(keylength);} -}; - -// ************** implementation helper for SimpleKeyed *************** - -//! _ -template -class CRYPTOPP_NO_VTABLE SimpleKeyingInterfaceImpl : public BASE -{ -public: - size_t MinKeyLength() const {return INFO::MIN_KEYLENGTH;} - size_t MaxKeyLength() const {return (size_t)INFO::MAX_KEYLENGTH;} - size_t DefaultKeyLength() const {return INFO::DEFAULT_KEYLENGTH;} - size_t GetValidKeyLength(size_t n) const {return INFO::StaticGetValidKeyLength(n);} - SimpleKeyingInterface::IV_Requirement IVRequirement() const {return (SimpleKeyingInterface::IV_Requirement)INFO::IV_REQUIREMENT;} - unsigned int IVSize() const {return INFO::IV_LENGTH;} -}; - -template -class CRYPTOPP_NO_VTABLE BlockCipherImpl : public AlgorithmImpl > > -{ -public: - unsigned int BlockSize() const {return this->BLOCKSIZE;} -}; - -//! _ -template -class BlockCipherFinal : public ClonableImpl, BASE> -{ -public: - BlockCipherFinal() {} - BlockCipherFinal(const byte *key) - {this->SetKey(key, this->DEFAULT_KEYLENGTH);} - BlockCipherFinal(const byte *key, size_t length) - {this->SetKey(key, length);} - BlockCipherFinal(const byte *key, size_t length, unsigned int rounds) - {this->SetKeyWithRounds(key, length, rounds);} - - bool IsForwardTransformation() const {return DIR == ENCRYPTION;} -}; - -//! _ -template -class MessageAuthenticationCodeImpl : public AlgorithmImpl, INFO> -{ -}; - -//! _ -template -class MessageAuthenticationCodeFinal : public ClonableImpl, MessageAuthenticationCodeImpl > -{ -public: - MessageAuthenticationCodeFinal() {} - MessageAuthenticationCodeFinal(const byte *key) - {this->SetKey(key, this->DEFAULT_KEYLENGTH);} - MessageAuthenticationCodeFinal(const byte *key, size_t length) - {this->SetKey(key, length);} -}; - -// ************** documentation *************** - -//! These objects usually should not be used directly. See CipherModeDocumentation instead. -/*! Each class derived from this one defines two types, Encryption and Decryption, - both of which implement the BlockCipher interface. */ -struct BlockCipherDocumentation -{ - //! implements the BlockCipher interface - typedef BlockCipher Encryption; - //! implements the BlockCipher interface - typedef BlockCipher Decryption; -}; - -/*! \brief Each class derived from this one defines two types, Encryption and Decryption, - both of which implement the SymmetricCipher interface. Two types of classes derive - from this class: stream ciphers and block cipher modes. Stream ciphers can be used - alone, cipher mode classes need to be used with a block cipher. See CipherModeDocumentation - for more for information about using cipher modes and block ciphers. */ -struct SymmetricCipherDocumentation -{ - //! implements the SymmetricCipher interface - typedef SymmetricCipher Encryption; - //! implements the SymmetricCipher interface - typedef SymmetricCipher Decryption; -}; - -/*! \brief Each class derived from this one defines two types, Encryption and Decryption, - both of which implement the AuthenticatedSymmetricCipher interface. */ -struct AuthenticatedSymmetricCipherDocumentation -{ - //! implements the AuthenticatedSymmetricCipher interface - typedef AuthenticatedSymmetricCipher Encryption; - //! implements the AuthenticatedSymmetricCipher interface - typedef AuthenticatedSymmetricCipher Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/seed.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/seed.cpp deleted file mode 100644 index 6c739b47..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/seed.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// seed.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "seed.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const word32 s_kc[16] = { - 0x9e3779b9, 0x3c6ef373, 0x78dde6e6, 0xf1bbcdcc, 0xe3779b99, 0xc6ef3733, 0x8dde6e67, 0x1bbcdccf, - 0x3779b99e, 0x6ef3733c, 0xdde6e678, 0xbbcdccf1, 0x779b99e3, 0xef3733c6, 0xde6e678d, 0xbcdccf1b}; - -static const byte s_s0[256] = { - 0xA9, 0x85, 0xD6, 0xD3, 0x54, 0x1D, 0xAC, 0x25, 0x5D, 0x43, 0x18, 0x1E, 0x51, 0xFC, 0xCA, 0x63, 0x28, - 0x44, 0x20, 0x9D, 0xE0, 0xE2, 0xC8, 0x17, 0xA5, 0x8F, 0x03, 0x7B, 0xBB, 0x13, 0xD2, 0xEE, 0x70, 0x8C, - 0x3F, 0xA8, 0x32, 0xDD, 0xF6, 0x74, 0xEC, 0x95, 0x0B, 0x57, 0x5C, 0x5B, 0xBD, 0x01, 0x24, 0x1C, 0x73, - 0x98, 0x10, 0xCC, 0xF2, 0xD9, 0x2C, 0xE7, 0x72, 0x83, 0x9B, 0xD1, 0x86, 0xC9, 0x60, 0x50, 0xA3, 0xEB, - 0x0D, 0xB6, 0x9E, 0x4F, 0xB7, 0x5A, 0xC6, 0x78, 0xA6, 0x12, 0xAF, 0xD5, 0x61, 0xC3, 0xB4, 0x41, 0x52, - 0x7D, 0x8D, 0x08, 0x1F, 0x99, 0x00, 0x19, 0x04, 0x53, 0xF7, 0xE1, 0xFD, 0x76, 0x2F, 0x27, 0xB0, 0x8B, - 0x0E, 0xAB, 0xA2, 0x6E, 0x93, 0x4D, 0x69, 0x7C, 0x09, 0x0A, 0xBF, 0xEF, 0xF3, 0xC5, 0x87, 0x14, 0xFE, - 0x64, 0xDE, 0x2E, 0x4B, 0x1A, 0x06, 0x21, 0x6B, 0x66, 0x02, 0xF5, 0x92, 0x8A, 0x0C, 0xB3, 0x7E, 0xD0, - 0x7A, 0x47, 0x96, 0xE5, 0x26, 0x80, 0xAD, 0xDF, 0xA1, 0x30, 0x37, 0xAE, 0x36, 0x15, 0x22, 0x38, 0xF4, - 0xA7, 0x45, 0x4C, 0x81, 0xE9, 0x84, 0x97, 0x35, 0xCB, 0xCE, 0x3C, 0x71, 0x11, 0xC7, 0x89, 0x75, 0xFB, - 0xDA, 0xF8, 0x94, 0x59, 0x82, 0xC4, 0xFF, 0x49, 0x39, 0x67, 0xC0, 0xCF, 0xD7, 0xB8, 0x0F, 0x8E, 0x42, - 0x23, 0x91, 0x6C, 0xDB, 0xA4, 0x34, 0xF1, 0x48, 0xC2, 0x6F, 0x3D, 0x2D, 0x40, 0xBE, 0x3E, 0xBC, 0xC1, - 0xAA, 0xBA, 0x4E, 0x55, 0x3B, 0xDC, 0x68, 0x7F, 0x9C, 0xD8, 0x4A, 0x56, 0x77, 0xA0, 0xED, 0x46, 0xB5, - 0x2B, 0x65, 0xFA, 0xE3, 0xB9, 0xB1, 0x9F, 0x5E, 0xF9, 0xE6, 0xB2, 0x31, 0xEA, 0x6D, 0x5F, 0xE4, 0xF0, - 0xCD, 0x88, 0x16, 0x3A, 0x58, 0xD4, 0x62, 0x29, 0x07, 0x33, 0xE8, 0x1B, 0x05, 0x79, 0x90, 0x6A, 0x2A, - 0x9A}; - -static const byte s_s1[256] = { - 0x38, 0xE8, 0x2D, 0xA6, 0xCF, 0xDE, 0xB3, 0xB8, 0xAF, 0x60, 0x55, 0xC7, 0x44, 0x6F, 0x6B, 0x5B, 0xC3, - 0x62, 0x33, 0xB5, 0x29, 0xA0, 0xE2, 0xA7, 0xD3, 0x91, 0x11, 0x06, 0x1C, 0xBC, 0x36, 0x4B, 0xEF, 0x88, - 0x6C, 0xA8, 0x17, 0xC4, 0x16, 0xF4, 0xC2, 0x45, 0xE1, 0xD6, 0x3F, 0x3D, 0x8E, 0x98, 0x28, 0x4E, 0xF6, - 0x3E, 0xA5, 0xF9, 0x0D, 0xDF, 0xD8, 0x2B, 0x66, 0x7A, 0x27, 0x2F, 0xF1, 0x72, 0x42, 0xD4, 0x41, 0xC0, - 0x73, 0x67, 0xAC, 0x8B, 0xF7, 0xAD, 0x80, 0x1F, 0xCA, 0x2C, 0xAA, 0x34, 0xD2, 0x0B, 0xEE, 0xE9, 0x5D, - 0x94, 0x18, 0xF8, 0x57, 0xAE, 0x08, 0xC5, 0x13, 0xCD, 0x86, 0xB9, 0xFF, 0x7D, 0xC1, 0x31, 0xF5, 0x8A, - 0x6A, 0xB1, 0xD1, 0x20, 0xD7, 0x02, 0x22, 0x04, 0x68, 0x71, 0x07, 0xDB, 0x9D, 0x99, 0x61, 0xBE, 0xE6, - 0x59, 0xDD, 0x51, 0x90, 0xDC, 0x9A, 0xA3, 0xAB, 0xD0, 0x81, 0x0F, 0x47, 0x1A, 0xE3, 0xEC, 0x8D, 0xBF, - 0x96, 0x7B, 0x5C, 0xA2, 0xA1, 0x63, 0x23, 0x4D, 0xC8, 0x9E, 0x9C, 0x3A, 0x0C, 0x2E, 0xBA, 0x6E, 0x9F, - 0x5A, 0xF2, 0x92, 0xF3, 0x49, 0x78, 0xCC, 0x15, 0xFB, 0x70, 0x75, 0x7F, 0x35, 0x10, 0x03, 0x64, 0x6D, - 0xC6, 0x74, 0xD5, 0xB4, 0xEA, 0x09, 0x76, 0x19, 0xFE, 0x40, 0x12, 0xE0, 0xBD, 0x05, 0xFA, 0x01, 0xF0, - 0x2A, 0x5E, 0xA9, 0x56, 0x43, 0x85, 0x14, 0x89, 0x9B, 0xB0, 0xE5, 0x48, 0x79, 0x97, 0xFC, 0x1E, 0x82, - 0x21, 0x8C, 0x1B, 0x5F, 0x77, 0x54, 0xB2, 0x1D, 0x25, 0x4F, 0x00, 0x46, 0xED, 0x58, 0x52, 0xEB, 0x7E, - 0xDA, 0xC9, 0xFD, 0x30, 0x95, 0x65, 0x3C, 0xB6, 0xE4, 0xBB, 0x7C, 0x0E, 0x50, 0x39, 0x26, 0x32, 0x84, - 0x69, 0x93, 0x37, 0xE7, 0x24, 0xA4, 0xCB, 0x53, 0x0A, 0x87, 0xD9, 0x4C, 0x83, 0x8F, 0xCE, 0x3B, 0x4A, - 0xB7}; - -#define SS0(x) ((s_s0[x]*0x01010101UL) & 0x3FCFF3FC) -#define SS1(x) ((s_s1[x]*0x01010101UL) & 0xFC3FCFF3) -#define SS2(x) ((s_s0[x]*0x01010101UL) & 0xF3FC3FCF) -#define SS3(x) ((s_s1[x]*0x01010101UL) & 0xCFF3FC3F) -#define G(x) (SS0(GETBYTE(x, 0)) ^ SS1(GETBYTE(x, 1)) ^ SS2(GETBYTE(x, 2)) ^ SS3(GETBYTE(x, 3))) - -void SEED::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(length); - - word64 key01, key23; - GetBlock get(userKey); - get(key01)(key23); - word32 *k = m_k; - size_t kInc = 2; - if (!IsForwardTransformation()) - { - k = k+30; - kInc = 0-kInc; - } - - for (int i=0; i>32) + word32(key23>>32) - s_kc[i]; - word32 t1 = word32(key01) - word32(key23) + s_kc[i]; - k[0] = G(t0); - k[1] = G(t1); - k+=kInc; - if (i&1) - key23 = rotlFixed(key23, 8); - else - key01 = rotrFixed(key01, 8); - } -} - -void SEED::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - typedef BlockGetAndPut Block; - word32 a0, a1, b0, b1, t0, t1; - Block::Get(inBlock)(a0)(a1)(b0)(b1); - - for (int i=0; i, public FixedKeyLength<16>, public FixedRounds<16> -{ - static const char *StaticAlgorithmName() {return "SEED";} -}; - -/// SEED -class SEED : public SEED_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - protected: - FixedSizeSecBlock m_k; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.cpp deleted file mode 100644 index 40fab23d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// serpent.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "serpent.h" -#include "misc.h" - -#include "serpentp.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Serpent_KeySchedule(word32 *k, unsigned int rounds, const byte *userKey, size_t keylen) -{ - FixedSizeSecBlock k0; - GetUserKey(LITTLE_ENDIAN_ORDER, k0.begin(), 8, userKey, keylen); - if (keylen < 32) - k0[keylen/4] |= word32(1) << ((keylen%4)*8); - - word32 t = k0[7]; - unsigned int i; - for (i = 0; i < 8; ++i) - k[i] = k0[i] = t = rotlFixed(k0[i] ^ k0[(i+3)%8] ^ k0[(i+5)%8] ^ t ^ 0x9e3779b9 ^ i, 11); - for (i = 8; i < 4*(rounds+1); ++i) - k[i] = t = rotlFixed(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11); - k -= 20; - - word32 a,b,c,d,e; - for (i=0; i Block; - -void Serpent::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 a, b, c, d, e; - - Block::Get(inBlock)(a)(b)(c)(d); - - const word32 *k = m_key; - unsigned int i=1; - - do - { - beforeS0(KX); beforeS0(S0); afterS0(LT); - afterS0(KX); afterS0(S1); afterS1(LT); - afterS1(KX); afterS1(S2); afterS2(LT); - afterS2(KX); afterS2(S3); afterS3(LT); - afterS3(KX); afterS3(S4); afterS4(LT); - afterS4(KX); afterS4(S5); afterS5(LT); - afterS5(KX); afterS5(S6); afterS6(LT); - afterS6(KX); afterS6(S7); - - if (i == 4) - break; - - ++i; - c = b; - b = e; - e = d; - d = a; - a = e; - k += 32; - beforeS0(LT); - } - while (true); - - afterS7(KX); - - Block::Put(xorBlock, outBlock)(d)(e)(b)(a); -} - -void Serpent::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 a, b, c, d, e; - - Block::Get(inBlock)(a)(b)(c)(d); - - const word32 *k = m_key + 96; - unsigned int i=4; - - beforeI7(KX); - goto start; - - do - { - c = b; - b = d; - d = e; - k -= 32; - beforeI7(ILT); -start: - beforeI7(I7); afterI7(KX); - afterI7(ILT); afterI7(I6); afterI6(KX); - afterI6(ILT); afterI6(I5); afterI5(KX); - afterI5(ILT); afterI5(I4); afterI4(KX); - afterI4(ILT); afterI4(I3); afterI3(KX); - afterI3(ILT); afterI3(I2); afterI2(KX); - afterI2(ILT); afterI2(I1); afterI1(KX); - afterI1(ILT); afterI1(I0); afterI0(KX); - } - while (--i != 0); - - Block::Put(xorBlock, outBlock)(a)(d)(b)(e); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.h deleted file mode 100644 index f7ee8d61..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpent.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef CRYPTOPP_SERPENT_H -#define CRYPTOPP_SERPENT_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct Serpent_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 0, 32>, public FixedRounds<32> -{ - static const char *StaticAlgorithmName() {return "Serpent";} -}; - -/// Serpent -class Serpent : public Serpent_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - FixedSizeSecBlock m_key; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Serpent::Encryption SerpentEncryption; -typedef Serpent::Decryption SerpentDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpentp.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/serpentp.h deleted file mode 100644 index 7869a3fc..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/serpentp.h +++ /dev/null @@ -1,434 +0,0 @@ -// private header for Serpent and Sosemanuk - -NAMESPACE_BEGIN(CryptoPP) - -// linear transformation -#define LT(i,a,b,c,d,e) {\ - a = rotlFixed(a, 13); \ - c = rotlFixed(c, 3); \ - d = rotlFixed(d ^ c ^ (a << 3), 7); \ - b = rotlFixed(b ^ a ^ c, 1); \ - a = rotlFixed(a ^ b ^ d, 5); \ - c = rotlFixed(c ^ d ^ (b << 7), 22);} - -// inverse linear transformation -#define ILT(i,a,b,c,d,e) {\ - c = rotrFixed(c, 22); \ - a = rotrFixed(a, 5); \ - c ^= d ^ (b << 7); \ - a ^= b ^ d; \ - b = rotrFixed(b, 1); \ - d = rotrFixed(d, 7) ^ c ^ (a << 3); \ - b ^= a ^ c; \ - c = rotrFixed(c, 3); \ - a = rotrFixed(a, 13);} - -// order of output from S-box functions -#define beforeS0(f) f(0,a,b,c,d,e) -#define afterS0(f) f(1,b,e,c,a,d) -#define afterS1(f) f(2,c,b,a,e,d) -#define afterS2(f) f(3,a,e,b,d,c) -#define afterS3(f) f(4,e,b,d,c,a) -#define afterS4(f) f(5,b,a,e,c,d) -#define afterS5(f) f(6,a,c,b,e,d) -#define afterS6(f) f(7,a,c,d,b,e) -#define afterS7(f) f(8,d,e,b,a,c) - -// order of output from inverse S-box functions -#define beforeI7(f) f(8,a,b,c,d,e) -#define afterI7(f) f(7,d,a,b,e,c) -#define afterI6(f) f(6,a,b,c,e,d) -#define afterI5(f) f(5,b,d,e,c,a) -#define afterI4(f) f(4,b,c,e,a,d) -#define afterI3(f) f(3,a,b,e,c,d) -#define afterI2(f) f(2,b,d,e,c,a) -#define afterI1(f) f(1,a,b,c,e,d) -#define afterI0(f) f(0,a,d,b,e,c) - -// The instruction sequences for the S-box functions -// come from Dag Arne Osvik's paper "Speeding up Serpent". - -#define S0(i, r0, r1, r2, r3, r4) \ - { \ - r3 ^= r0; \ - r4 = r1; \ - r1 &= r3; \ - r4 ^= r2; \ - r1 ^= r0; \ - r0 |= r3; \ - r0 ^= r4; \ - r4 ^= r3; \ - r3 ^= r2; \ - r2 |= r1; \ - r2 ^= r4; \ - r4 = ~r4; \ - r4 |= r1; \ - r1 ^= r3; \ - r1 ^= r4; \ - r3 |= r0; \ - r1 ^= r3; \ - r4 ^= r3; \ - } - -#define I0(i, r0, r1, r2, r3, r4) \ - { \ - r2 = ~r2; \ - r4 = r1; \ - r1 |= r0; \ - r4 = ~r4; \ - r1 ^= r2; \ - r2 |= r4; \ - r1 ^= r3; \ - r0 ^= r4; \ - r2 ^= r0; \ - r0 &= r3; \ - r4 ^= r0; \ - r0 |= r1; \ - r0 ^= r2; \ - r3 ^= r4; \ - r2 ^= r1; \ - r3 ^= r0; \ - r3 ^= r1; \ - r2 &= r3; \ - r4 ^= r2; \ - } - -#define S1(i, r0, r1, r2, r3, r4) \ - { \ - r0 = ~r0; \ - r2 = ~r2; \ - r4 = r0; \ - r0 &= r1; \ - r2 ^= r0; \ - r0 |= r3; \ - r3 ^= r2; \ - r1 ^= r0; \ - r0 ^= r4; \ - r4 |= r1; \ - r1 ^= r3; \ - r2 |= r0; \ - r2 &= r4; \ - r0 ^= r1; \ - r1 &= r2; \ - r1 ^= r0; \ - r0 &= r2; \ - r0 ^= r4; \ - } - -#define I1(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r1; \ - r1 ^= r3; \ - r3 &= r1; \ - r4 ^= r2; \ - r3 ^= r0; \ - r0 |= r1; \ - r2 ^= r3; \ - r0 ^= r4; \ - r0 |= r2; \ - r1 ^= r3; \ - r0 ^= r1; \ - r1 |= r3; \ - r1 ^= r0; \ - r4 = ~r4; \ - r4 ^= r1; \ - r1 |= r0; \ - r1 ^= r0; \ - r1 |= r4; \ - r3 ^= r1; \ - } - -#define S2(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r0; \ - r0 &= r2; \ - r0 ^= r3; \ - r2 ^= r1; \ - r2 ^= r0; \ - r3 |= r4; \ - r3 ^= r1; \ - r4 ^= r2; \ - r1 = r3; \ - r3 |= r4; \ - r3 ^= r0; \ - r0 &= r1; \ - r4 ^= r0; \ - r1 ^= r3; \ - r1 ^= r4; \ - r4 = ~r4; \ - } - -#define I2(i, r0, r1, r2, r3, r4) \ - { \ - r2 ^= r3; \ - r3 ^= r0; \ - r4 = r3; \ - r3 &= r2; \ - r3 ^= r1; \ - r1 |= r2; \ - r1 ^= r4; \ - r4 &= r3; \ - r2 ^= r3; \ - r4 &= r0; \ - r4 ^= r2; \ - r2 &= r1; \ - r2 |= r0; \ - r3 = ~r3; \ - r2 ^= r3; \ - r0 ^= r3; \ - r0 &= r1; \ - r3 ^= r4; \ - r3 ^= r0; \ - } - -#define S3(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r0; \ - r0 |= r3; \ - r3 ^= r1; \ - r1 &= r4; \ - r4 ^= r2; \ - r2 ^= r3; \ - r3 &= r0; \ - r4 |= r1; \ - r3 ^= r4; \ - r0 ^= r1; \ - r4 &= r0; \ - r1 ^= r3; \ - r4 ^= r2; \ - r1 |= r0; \ - r1 ^= r2; \ - r0 ^= r3; \ - r2 = r1; \ - r1 |= r3; \ - r1 ^= r0; \ - } - -#define I3(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r2; \ - r2 ^= r1; \ - r1 &= r2; \ - r1 ^= r0; \ - r0 &= r4; \ - r4 ^= r3; \ - r3 |= r1; \ - r3 ^= r2; \ - r0 ^= r4; \ - r2 ^= r0; \ - r0 |= r3; \ - r0 ^= r1; \ - r4 ^= r2; \ - r2 &= r3; \ - r1 |= r3; \ - r1 ^= r2; \ - r4 ^= r0; \ - r2 ^= r4; \ - } - -#define S4(i, r0, r1, r2, r3, r4) \ - { \ - r1 ^= r3; \ - r3 = ~r3; \ - r2 ^= r3; \ - r3 ^= r0; \ - r4 = r1; \ - r1 &= r3; \ - r1 ^= r2; \ - r4 ^= r3; \ - r0 ^= r4; \ - r2 &= r4; \ - r2 ^= r0; \ - r0 &= r1; \ - r3 ^= r0; \ - r4 |= r1; \ - r4 ^= r0; \ - r0 |= r3; \ - r0 ^= r2; \ - r2 &= r3; \ - r0 = ~r0; \ - r4 ^= r2; \ - } - -#define I4(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r2; \ - r2 &= r3; \ - r2 ^= r1; \ - r1 |= r3; \ - r1 &= r0; \ - r4 ^= r2; \ - r4 ^= r1; \ - r1 &= r2; \ - r0 = ~r0; \ - r3 ^= r4; \ - r1 ^= r3; \ - r3 &= r0; \ - r3 ^= r2; \ - r0 ^= r1; \ - r2 &= r0; \ - r3 ^= r0; \ - r2 ^= r4; \ - r2 |= r3; \ - r3 ^= r0; \ - r2 ^= r1; \ - } - -#define S5(i, r0, r1, r2, r3, r4) \ - { \ - r0 ^= r1; \ - r1 ^= r3; \ - r3 = ~r3; \ - r4 = r1; \ - r1 &= r0; \ - r2 ^= r3; \ - r1 ^= r2; \ - r2 |= r4; \ - r4 ^= r3; \ - r3 &= r1; \ - r3 ^= r0; \ - r4 ^= r1; \ - r4 ^= r2; \ - r2 ^= r0; \ - r0 &= r3; \ - r2 = ~r2; \ - r0 ^= r4; \ - r4 |= r3; \ - r2 ^= r4; \ - } - -#define I5(i, r0, r1, r2, r3, r4) \ - { \ - r1 = ~r1; \ - r4 = r3; \ - r2 ^= r1; \ - r3 |= r0; \ - r3 ^= r2; \ - r2 |= r1; \ - r2 &= r0; \ - r4 ^= r3; \ - r2 ^= r4; \ - r4 |= r0; \ - r4 ^= r1; \ - r1 &= r2; \ - r1 ^= r3; \ - r4 ^= r2; \ - r3 &= r4; \ - r4 ^= r1; \ - r3 ^= r0; \ - r3 ^= r4; \ - r4 = ~r4; \ - } - -#define S6(i, r0, r1, r2, r3, r4) \ - { \ - r2 = ~r2; \ - r4 = r3; \ - r3 &= r0; \ - r0 ^= r4; \ - r3 ^= r2; \ - r2 |= r4; \ - r1 ^= r3; \ - r2 ^= r0; \ - r0 |= r1; \ - r2 ^= r1; \ - r4 ^= r0; \ - r0 |= r3; \ - r0 ^= r2; \ - r4 ^= r3; \ - r4 ^= r0; \ - r3 = ~r3; \ - r2 &= r4; \ - r2 ^= r3; \ - } - -#define I6(i, r0, r1, r2, r3, r4) \ - { \ - r0 ^= r2; \ - r4 = r2; \ - r2 &= r0; \ - r4 ^= r3; \ - r2 = ~r2; \ - r3 ^= r1; \ - r2 ^= r3; \ - r4 |= r0; \ - r0 ^= r2; \ - r3 ^= r4; \ - r4 ^= r1; \ - r1 &= r3; \ - r1 ^= r0; \ - r0 ^= r3; \ - r0 |= r2; \ - r3 ^= r1; \ - r4 ^= r0; \ - } - -#define S7(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r2; \ - r2 &= r1; \ - r2 ^= r3; \ - r3 &= r1; \ - r4 ^= r2; \ - r2 ^= r1; \ - r1 ^= r0; \ - r0 |= r4; \ - r0 ^= r2; \ - r3 ^= r1; \ - r2 ^= r3; \ - r3 &= r0; \ - r3 ^= r4; \ - r4 ^= r2; \ - r2 &= r0; \ - r4 = ~r4; \ - r2 ^= r4; \ - r4 &= r0; \ - r1 ^= r3; \ - r4 ^= r1; \ - } - -#define I7(i, r0, r1, r2, r3, r4) \ - { \ - r4 = r2; \ - r2 ^= r0; \ - r0 &= r3; \ - r2 = ~r2; \ - r4 |= r3; \ - r3 ^= r1; \ - r1 |= r0; \ - r0 ^= r2; \ - r2 &= r4; \ - r1 ^= r2; \ - r2 ^= r0; \ - r0 |= r2; \ - r3 &= r4; \ - r0 ^= r3; \ - r4 ^= r1; \ - r3 ^= r4; \ - r4 |= r0; \ - r3 ^= r2; \ - r4 ^= r2; \ - } - -// key xor -#define KX(r, a, b, c, d, e) {\ - a ^= k[4 * r + 0]; \ - b ^= k[4 * r + 1]; \ - c ^= k[4 * r + 2]; \ - d ^= k[4 * r + 3];} - -#define LK(r, a, b, c, d, e) {\ - a = k[(8-r)*4 + 0]; \ - b = k[(8-r)*4 + 1]; \ - c = k[(8-r)*4 + 2]; \ - d = k[(8-r)*4 + 3];} - -#define SK(r, a, b, c, d, e) {\ - k[(8-r)*4 + 4] = a; \ - k[(8-r)*4 + 5] = b; \ - k[(8-r)*4 + 6] = c; \ - k[(8-r)*4 + 7] = d;} - -void Serpent_KeySchedule(word32 *k, unsigned int rounds, const byte *userKey, size_t keylen); - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.cpp deleted file mode 100644 index df947ad1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.cpp +++ /dev/null @@ -1,900 +0,0 @@ -// sha.cpp - modified by Wei Dai from Steve Reid's public domain sha1.c - -// Steve Reid implemented SHA-1. Wei Dai implemented SHA-2. -// Both are in the public domain. - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sha.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "sha.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -// start of Steve Reid's code - -#define blk0(i) (W[i] = data[i]) -#define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1)) - -void SHA1::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xEFCDAB89L; - state[2] = 0x98BADCFEL; - state[3] = 0x10325476L; - state[4] = 0xC3D2E1F0L; -} - -#define f1(x,y,z) (z^(x&(y^z))) -#define f2(x,y,z) (x^y^z) -#define f3(x,y,z) ((x&y)|(z&(x|y))) -#define f4(x,y,z) (x^y^z) - -/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30); -#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30); -#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rotlFixed(v,5);w=rotlFixed(w,30); -#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rotlFixed(v,5);w=rotlFixed(w,30); -#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rotlFixed(v,5);w=rotlFixed(w,30); - -void SHA1::Transform(word32 *state, const word32 *data) -{ - word32 W[16]; - /* Copy context->state[] to working vars */ - word32 a = state[0]; - word32 b = state[1]; - word32 c = state[2]; - word32 d = state[3]; - word32 e = state[4]; - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; -} - -// end of Steve Reid's code - -// ************************************************************* - -void SHA224::InitState(HashWordType *state) -{ - static const word32 s[8] = {0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4}; - memcpy(state, s, sizeof(s)); -} - -void SHA256::InitState(HashWordType *state) -{ - static const word32 s[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; - memcpy(state, s, sizeof(s)); -} - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -CRYPTOPP_ALIGN_DATA(16) extern const word32 SHA256_K[64] CRYPTOPP_SECTION_ALIGN16 = { -#else -extern const word32 SHA256_K[64] = { -#endif - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, - 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, - 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, - 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, - 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, - 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, - 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, - 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, - 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, - 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, - 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, - 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, - 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, - 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 -}; - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM) - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -static void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len -#if defined(_MSC_VER) && (_MSC_VER == 1200) - , ... // VC60 workaround: prevent VC 6 from inlining this function -#endif - ) -{ -#if defined(_MSC_VER) && (_MSC_VER == 1200) - AS2(mov ecx, [state]) - AS2(mov edx, [data]) -#endif - - #define LOCALS_SIZE 8*4 + 16*4 + 4*WORD_SZ - #define H(i) [BASE+ASM_MOD(1024+7-(i),8)*4] - #define G(i) H(i+1) - #define F(i) H(i+2) - #define E(i) H(i+3) - #define D(i) H(i+4) - #define C(i) H(i+5) - #define B(i) H(i+6) - #define A(i) H(i+7) - #define Wt(i) BASE+8*4+ASM_MOD(1024+15-(i),16)*4 - #define Wt_2(i) Wt((i)-2) - #define Wt_15(i) Wt((i)-15) - #define Wt_7(i) Wt((i)-7) - #define K_END [BASE+8*4+16*4+0*WORD_SZ] - #define STATE_SAVE [BASE+8*4+16*4+1*WORD_SZ] - #define DATA_SAVE [BASE+8*4+16*4+2*WORD_SZ] - #define DATA_END [BASE+8*4+16*4+3*WORD_SZ] - #define Kt(i) WORD_REG(si)+(i)*4 -#if CRYPTOPP_BOOL_X86 - #define BASE esp+4 -#elif defined(__GNUC__) - #define BASE r8 -#else - #define BASE rsp -#endif - -#define RA0(i, edx, edi) \ - AS2( add edx, [Kt(i)] )\ - AS2( add edx, [Wt(i)] )\ - AS2( add edx, H(i) )\ - -#define RA1(i, edx, edi) - -#define RB0(i, edx, edi) - -#define RB1(i, edx, edi) \ - AS2( mov AS_REG_7d, [Wt_2(i)] )\ - AS2( mov edi, [Wt_15(i)])\ - AS2( mov ebx, AS_REG_7d )\ - AS2( shr AS_REG_7d, 10 )\ - AS2( ror ebx, 17 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( ror ebx, 2 )\ - AS2( xor ebx, AS_REG_7d )/* s1(W_t-2) */\ - AS2( add ebx, [Wt_7(i)])\ - AS2( mov AS_REG_7d, edi )\ - AS2( shr AS_REG_7d, 3 )\ - AS2( ror edi, 7 )\ - AS2( add ebx, [Wt(i)])/* s1(W_t-2) + W_t-7 + W_t-16 */\ - AS2( xor AS_REG_7d, edi )\ - AS2( add edx, [Kt(i)])\ - AS2( ror edi, 11 )\ - AS2( add edx, H(i) )\ - AS2( xor AS_REG_7d, edi )/* s0(W_t-15) */\ - AS2( add AS_REG_7d, ebx )/* W_t = s1(W_t-2) + W_t-7 + s0(W_t-15) W_t-16*/\ - AS2( mov [Wt(i)], AS_REG_7d)\ - AS2( add edx, AS_REG_7d )\ - -#define ROUND(i, r, eax, ecx, edi, edx)\ - /* in: edi = E */\ - /* unused: eax, ecx, temp: ebx, AS_REG_7d, out: edx = T1 */\ - AS2( mov edx, F(i) )\ - AS2( xor edx, G(i) )\ - AS2( and edx, edi )\ - AS2( xor edx, G(i) )/* Ch(E,F,G) = (G^(E&(F^G))) */\ - AS2( mov AS_REG_7d, edi )\ - AS2( ror edi, 6 )\ - AS2( ror AS_REG_7d, 25 )\ - RA##r(i, edx, edi )/* H + Wt + Kt + Ch(E,F,G) */\ - AS2( xor AS_REG_7d, edi )\ - AS2( ror edi, 5 )\ - AS2( xor AS_REG_7d, edi )/* S1(E) */\ - AS2( add edx, AS_REG_7d )/* T1 = S1(E) + Ch(E,F,G) + H + Wt + Kt */\ - RB##r(i, edx, edi )/* H + Wt + Kt + Ch(E,F,G) */\ - /* in: ecx = A, eax = B^C, edx = T1 */\ - /* unused: edx, temp: ebx, AS_REG_7d, out: eax = A, ecx = B^C, edx = E */\ - AS2( mov ebx, ecx )\ - AS2( xor ecx, B(i) )/* A^B */\ - AS2( and eax, ecx )\ - AS2( xor eax, B(i) )/* Maj(A,B,C) = B^((A^B)&(B^C) */\ - AS2( mov AS_REG_7d, ebx )\ - AS2( ror ebx, 2 )\ - AS2( add eax, edx )/* T1 + Maj(A,B,C) */\ - AS2( add edx, D(i) )\ - AS2( mov D(i), edx )\ - AS2( ror AS_REG_7d, 22 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( ror ebx, 11 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( add eax, AS_REG_7d )/* T1 + S0(A) + Maj(A,B,C) */\ - AS2( mov H(i), eax )\ - -#define SWAP_COPY(i) \ - AS2( mov WORD_REG(bx), [WORD_REG(dx)+i*WORD_SZ])\ - AS1( bswap WORD_REG(bx))\ - AS2( mov [Wt(i*(1+CRYPTOPP_BOOL_X64)+CRYPTOPP_BOOL_X64)], WORD_REG(bx)) - -#if defined(__GNUC__) - #if CRYPTOPP_BOOL_X64 - FixedSizeAlignedSecBlock workspace; - #endif - __asm__ __volatile__ - ( - #if CRYPTOPP_BOOL_X64 - "lea %4, %%r8;" - #endif - ".intel_syntax noprefix;" -#elif defined(CRYPTOPP_GENERATE_X64_MASM) - ALIGN 8 - X86_SHA256_HashBlocks PROC FRAME - rex_push_reg rsi - push_reg rdi - push_reg rbx - push_reg rbp - alloc_stack(LOCALS_SIZE+8) - .endprolog - mov rdi, r8 - lea rsi, [?SHA256_K@CryptoPP@@3QBIB + 48*4] -#endif - -#if CRYPTOPP_BOOL_X86 - #ifndef __GNUC__ - AS2( mov edi, [len]) - AS2( lea WORD_REG(si), [SHA256_K+48*4]) - #endif - #if !defined(_MSC_VER) || (_MSC_VER < 1400) - AS_PUSH_IF86(bx) - #endif - - AS_PUSH_IF86(bp) - AS2( mov ebx, esp) - AS2( and esp, -16) - AS2( sub WORD_REG(sp), LOCALS_SIZE) - AS_PUSH_IF86(bx) -#endif - AS2( mov STATE_SAVE, WORD_REG(cx)) - AS2( mov DATA_SAVE, WORD_REG(dx)) - AS2( lea WORD_REG(ax), [WORD_REG(di) + WORD_REG(dx)]) - AS2( mov DATA_END, WORD_REG(ax)) - AS2( mov K_END, WORD_REG(si)) - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#if CRYPTOPP_BOOL_X86 - AS2( test edi, 1) - ASJ( jnz, 2, f) - AS1( dec DWORD PTR K_END) -#endif - AS2( movdqa xmm0, XMMWORD_PTR [WORD_REG(cx)+0*16]) - AS2( movdqa xmm1, XMMWORD_PTR [WORD_REG(cx)+1*16]) -#endif - -#if CRYPTOPP_BOOL_X86 -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASJ( jmp, 0, f) -#endif - ASL(2) // non-SSE2 - AS2( mov esi, ecx) - AS2( lea edi, A(0)) - AS2( mov ecx, 8) - AS1( rep movsd) - AS2( mov esi, K_END) - ASJ( jmp, 3, f) -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASL(0) - AS2( movdqa E(0), xmm1) - AS2( movdqa A(0), xmm0) -#endif -#if CRYPTOPP_BOOL_X86 - ASL(3) -#endif - AS2( sub WORD_REG(si), 48*4) - SWAP_COPY(0) SWAP_COPY(1) SWAP_COPY(2) SWAP_COPY(3) - SWAP_COPY(4) SWAP_COPY(5) SWAP_COPY(6) SWAP_COPY(7) -#if CRYPTOPP_BOOL_X86 - SWAP_COPY(8) SWAP_COPY(9) SWAP_COPY(10) SWAP_COPY(11) - SWAP_COPY(12) SWAP_COPY(13) SWAP_COPY(14) SWAP_COPY(15) -#endif - AS2( mov edi, E(0)) // E - AS2( mov eax, B(0)) // B - AS2( xor eax, C(0)) // B^C - AS2( mov ecx, A(0)) // A - - ROUND(0, 0, eax, ecx, edi, edx) - ROUND(1, 0, ecx, eax, edx, edi) - ROUND(2, 0, eax, ecx, edi, edx) - ROUND(3, 0, ecx, eax, edx, edi) - ROUND(4, 0, eax, ecx, edi, edx) - ROUND(5, 0, ecx, eax, edx, edi) - ROUND(6, 0, eax, ecx, edi, edx) - ROUND(7, 0, ecx, eax, edx, edi) - ROUND(8, 0, eax, ecx, edi, edx) - ROUND(9, 0, ecx, eax, edx, edi) - ROUND(10, 0, eax, ecx, edi, edx) - ROUND(11, 0, ecx, eax, edx, edi) - ROUND(12, 0, eax, ecx, edi, edx) - ROUND(13, 0, ecx, eax, edx, edi) - ROUND(14, 0, eax, ecx, edi, edx) - ROUND(15, 0, ecx, eax, edx, edi) - - ASL(1) - AS2(add WORD_REG(si), 4*16) - ROUND(0, 1, eax, ecx, edi, edx) - ROUND(1, 1, ecx, eax, edx, edi) - ROUND(2, 1, eax, ecx, edi, edx) - ROUND(3, 1, ecx, eax, edx, edi) - ROUND(4, 1, eax, ecx, edi, edx) - ROUND(5, 1, ecx, eax, edx, edi) - ROUND(6, 1, eax, ecx, edi, edx) - ROUND(7, 1, ecx, eax, edx, edi) - ROUND(8, 1, eax, ecx, edi, edx) - ROUND(9, 1, ecx, eax, edx, edi) - ROUND(10, 1, eax, ecx, edi, edx) - ROUND(11, 1, ecx, eax, edx, edi) - ROUND(12, 1, eax, ecx, edi, edx) - ROUND(13, 1, ecx, eax, edx, edi) - ROUND(14, 1, eax, ecx, edi, edx) - ROUND(15, 1, ecx, eax, edx, edi) - AS2( cmp WORD_REG(si), K_END) - ASJ( jb, 1, b) - - AS2( mov WORD_REG(dx), DATA_SAVE) - AS2( add WORD_REG(dx), 64) - AS2( mov AS_REG_7, STATE_SAVE) - AS2( mov DATA_SAVE, WORD_REG(dx)) - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#if CRYPTOPP_BOOL_X86 - AS2( test DWORD PTR K_END, 1) - ASJ( jz, 4, f) -#endif - AS2( movdqa xmm1, XMMWORD_PTR [AS_REG_7+1*16]) - AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_7+0*16]) - AS2( paddd xmm1, E(0)) - AS2( paddd xmm0, A(0)) - AS2( movdqa [AS_REG_7+1*16], xmm1) - AS2( movdqa [AS_REG_7+0*16], xmm0) - AS2( cmp WORD_REG(dx), DATA_END) - ASJ( jb, 0, b) -#endif - -#if CRYPTOPP_BOOL_X86 -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASJ( jmp, 5, f) - ASL(4) // non-SSE2 -#endif - AS2( add [AS_REG_7+0*4], ecx) // A - AS2( add [AS_REG_7+4*4], edi) // E - AS2( mov eax, B(0)) - AS2( mov ebx, C(0)) - AS2( mov ecx, D(0)) - AS2( add [AS_REG_7+1*4], eax) - AS2( add [AS_REG_7+2*4], ebx) - AS2( add [AS_REG_7+3*4], ecx) - AS2( mov eax, F(0)) - AS2( mov ebx, G(0)) - AS2( mov ecx, H(0)) - AS2( add [AS_REG_7+5*4], eax) - AS2( add [AS_REG_7+6*4], ebx) - AS2( add [AS_REG_7+7*4], ecx) - AS2( mov ecx, AS_REG_7d) - AS2( cmp WORD_REG(dx), DATA_END) - ASJ( jb, 2, b) -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASL(5) -#endif -#endif - - AS_POP_IF86(sp) - AS_POP_IF86(bp) - #if !defined(_MSC_VER) || (_MSC_VER < 1400) - AS_POP_IF86(bx) - #endif - -#ifdef CRYPTOPP_GENERATE_X64_MASM - add rsp, LOCALS_SIZE+8 - pop rbp - pop rbx - pop rdi - pop rsi - ret - X86_SHA256_HashBlocks ENDP -#endif - -#ifdef __GNUC__ - ".att_syntax prefix;" - : - : "c" (state), "d" (data), "S" (SHA256_K+48), "D" (len) - #if CRYPTOPP_BOOL_X64 - , "m" (workspace[0]) - #endif - : "memory", "cc", "%eax" - #if CRYPTOPP_BOOL_X64 - , "%rbx", "%r8", "%r10" - #endif - ); -#endif -} - -#endif // #if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM) - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len); -} -#endif - -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - -size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length) -{ - X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2()); - return length % BLOCKSIZE; -} - -size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length) -{ - X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2()); - return length % BLOCKSIZE; -} - -#endif - -#define blk2(i) (W[i&15]+=s1(W[(i-2)&15])+W[(i-7)&15]+s0(W[(i-15)&15])) - -#define Ch(x,y,z) (z^(x&(y^z))) -#define Maj(x,y,z) (y^((x^y)&(y^z))) - -#define a(i) T[(0-i)&7] -#define b(i) T[(1-i)&7] -#define c(i) T[(2-i)&7] -#define d(i) T[(3-i)&7] -#define e(i) T[(4-i)&7] -#define f(i) T[(5-i)&7] -#define g(i) T[(6-i)&7] -#define h(i) T[(7-i)&7] - -#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA256_K[i+j]+(j?blk2(i):blk0(i));\ - d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i)) - -// for SHA256 -#define S0(x) (rotrFixed(x,2)^rotrFixed(x,13)^rotrFixed(x,22)) -#define S1(x) (rotrFixed(x,6)^rotrFixed(x,11)^rotrFixed(x,25)) -#define s0(x) (rotrFixed(x,7)^rotrFixed(x,18)^(x>>3)) -#define s1(x) (rotrFixed(x,17)^rotrFixed(x,19)^(x>>10)) - -void SHA256::Transform(word32 *state, const word32 *data) -{ - word32 W[16]; -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - // this byte reverse is a waste of time, but this function is only called by MDC - ByteReverse(W, data, BLOCKSIZE); - X86_SHA256_HashBlocks(state, W, BLOCKSIZE - !HasSSE2()); -#else - word32 T[8]; - /* Copy context->state[] to working vars */ - memcpy(T, state, sizeof(T)); - /* 64 operations, partially loop unrolled */ - for (unsigned int j=0; j<64; j+=16) - { - R( 0); R( 1); R( 2); R( 3); - R( 4); R( 5); R( 6); R( 7); - R( 8); R( 9); R(10); R(11); - R(12); R(13); R(14); R(15); - } - /* Add the working vars back into context.state[] */ - state[0] += a(0); - state[1] += b(0); - state[2] += c(0); - state[3] += d(0); - state[4] += e(0); - state[5] += f(0); - state[6] += g(0); - state[7] += h(0); -#endif -} - -/* -// smaller but slower -void SHA256::Transform(word32 *state, const word32 *data) -{ - word32 T[20]; - word32 W[32]; - unsigned int i = 0, j = 0; - word32 *t = T+8; - - memcpy(t, state, 8*4); - word32 e = t[4], a = t[0]; - - do - { - word32 w = data[j]; - W[j] = w; - w += SHA256_K[j]; - w += t[7]; - w += S1(e); - w += Ch(e, t[5], t[6]); - e = t[3] + w; - t[3] = t[3+8] = e; - w += S0(t[0]); - a = w + Maj(a, t[1], t[2]); - t[-1] = t[7] = a; - --t; - ++j; - if (j%8 == 0) - t += 8; - } while (j<16); - - do - { - i = j&0xf; - word32 w = s1(W[i+16-2]) + s0(W[i+16-15]) + W[i] + W[i+16-7]; - W[i+16] = W[i] = w; - w += SHA256_K[j]; - w += t[7]; - w += S1(e); - w += Ch(e, t[5], t[6]); - e = t[3] + w; - t[3] = t[3+8] = e; - w += S0(t[0]); - a = w + Maj(a, t[1], t[2]); - t[-1] = t[7] = a; - - w = s1(W[(i+1)+16-2]) + s0(W[(i+1)+16-15]) + W[(i+1)] + W[(i+1)+16-7]; - W[(i+1)+16] = W[(i+1)] = w; - w += SHA256_K[j+1]; - w += (t-1)[7]; - w += S1(e); - w += Ch(e, (t-1)[5], (t-1)[6]); - e = (t-1)[3] + w; - (t-1)[3] = (t-1)[3+8] = e; - w += S0((t-1)[0]); - a = w + Maj(a, (t-1)[1], (t-1)[2]); - (t-1)[-1] = (t-1)[7] = a; - - t-=2; - j+=2; - if (j%8 == 0) - t += 8; - } while (j<64); - - state[0] += a; - state[1] += t[1]; - state[2] += t[2]; - state[3] += t[3]; - state[4] += e; - state[5] += t[5]; - state[6] += t[6]; - state[7] += t[7]; -} -*/ - -#undef S0 -#undef S1 -#undef s0 -#undef s1 -#undef R - -// ************************************************************* - -void SHA384::InitState(HashWordType *state) -{ - static const word64 s[8] = { - W64LIT(0xcbbb9d5dc1059ed8), W64LIT(0x629a292a367cd507), - W64LIT(0x9159015a3070dd17), W64LIT(0x152fecd8f70e5939), - W64LIT(0x67332667ffc00b31), W64LIT(0x8eb44a8768581511), - W64LIT(0xdb0c2e0d64f98fa7), W64LIT(0x47b5481dbefa4fa4)}; - memcpy(state, s, sizeof(s)); -} - -void SHA512::InitState(HashWordType *state) -{ - static const word64 s[8] = { - W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b), - W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1), - W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f), - W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)}; - memcpy(state, s, sizeof(s)); -} - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 -CRYPTOPP_ALIGN_DATA(16) static const word64 SHA512_K[80] CRYPTOPP_SECTION_ALIGN16 = { -#else -static const word64 SHA512_K[80] = { -#endif - W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd), - W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc), - W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019), - W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118), - W64LIT(0xd807aa98a3030242), W64LIT(0x12835b0145706fbe), - W64LIT(0x243185be4ee4b28c), W64LIT(0x550c7dc3d5ffb4e2), - W64LIT(0x72be5d74f27b896f), W64LIT(0x80deb1fe3b1696b1), - W64LIT(0x9bdc06a725c71235), W64LIT(0xc19bf174cf692694), - W64LIT(0xe49b69c19ef14ad2), W64LIT(0xefbe4786384f25e3), - W64LIT(0x0fc19dc68b8cd5b5), W64LIT(0x240ca1cc77ac9c65), - W64LIT(0x2de92c6f592b0275), W64LIT(0x4a7484aa6ea6e483), - W64LIT(0x5cb0a9dcbd41fbd4), W64LIT(0x76f988da831153b5), - W64LIT(0x983e5152ee66dfab), W64LIT(0xa831c66d2db43210), - W64LIT(0xb00327c898fb213f), W64LIT(0xbf597fc7beef0ee4), - W64LIT(0xc6e00bf33da88fc2), W64LIT(0xd5a79147930aa725), - W64LIT(0x06ca6351e003826f), W64LIT(0x142929670a0e6e70), - W64LIT(0x27b70a8546d22ffc), W64LIT(0x2e1b21385c26c926), - W64LIT(0x4d2c6dfc5ac42aed), W64LIT(0x53380d139d95b3df), - W64LIT(0x650a73548baf63de), W64LIT(0x766a0abb3c77b2a8), - W64LIT(0x81c2c92e47edaee6), W64LIT(0x92722c851482353b), - W64LIT(0xa2bfe8a14cf10364), W64LIT(0xa81a664bbc423001), - W64LIT(0xc24b8b70d0f89791), W64LIT(0xc76c51a30654be30), - W64LIT(0xd192e819d6ef5218), W64LIT(0xd69906245565a910), - W64LIT(0xf40e35855771202a), W64LIT(0x106aa07032bbd1b8), - W64LIT(0x19a4c116b8d2d0c8), W64LIT(0x1e376c085141ab53), - W64LIT(0x2748774cdf8eeb99), W64LIT(0x34b0bcb5e19b48a8), - W64LIT(0x391c0cb3c5c95a63), W64LIT(0x4ed8aa4ae3418acb), - W64LIT(0x5b9cca4f7763e373), W64LIT(0x682e6ff3d6b2b8a3), - W64LIT(0x748f82ee5defb2fc), W64LIT(0x78a5636f43172f60), - W64LIT(0x84c87814a1f0ab72), W64LIT(0x8cc702081a6439ec), - W64LIT(0x90befffa23631e28), W64LIT(0xa4506cebde82bde9), - W64LIT(0xbef9a3f7b2c67915), W64LIT(0xc67178f2e372532b), - W64LIT(0xca273eceea26619c), W64LIT(0xd186b8c721c0c207), - W64LIT(0xeada7dd6cde0eb1e), W64LIT(0xf57d4f7fee6ed178), - W64LIT(0x06f067aa72176fba), W64LIT(0x0a637dc5a2c898a6), - W64LIT(0x113f9804bef90dae), W64LIT(0x1b710b35131c471b), - W64LIT(0x28db77f523047d84), W64LIT(0x32caab7b40c72493), - W64LIT(0x3c9ebe0a15c9bebc), W64LIT(0x431d67c49c100d4c), - W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a), - W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817) -}; - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 -// put assembly version in separate function, otherwise MSVC 2005 SP1 doesn't generate correct code for the non-assembly version -CRYPTOPP_NAKED static void CRYPTOPP_FASTCALL SHA512_SSE2_Transform(word64 *state, const word64 *data) -{ -#ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS1( push ebx) - AS2( mov ebx, eax) -#else - AS1( push ebx) - AS1( push esi) - AS1( push edi) - AS2( lea ebx, SHA512_K) -#endif - - AS2( mov eax, esp) - AS2( and esp, 0xfffffff0) - AS2( sub esp, 27*16) // 17*16 for expanded data, 20*8 for state - AS1( push eax) - AS2( xor eax, eax) - AS2( lea edi, [esp+4+8*8]) // start at middle of state buffer. will decrement pointer each round to avoid copying - AS2( lea esi, [esp+4+20*8+8]) // 16-byte alignment, then add 8 - - AS2( movdqa xmm0, [ecx+0*16]) - AS2( movdq2q mm4, xmm0) - AS2( movdqa [edi+0*16], xmm0) - AS2( movdqa xmm0, [ecx+1*16]) - AS2( movdqa [edi+1*16], xmm0) - AS2( movdqa xmm0, [ecx+2*16]) - AS2( movdq2q mm5, xmm0) - AS2( movdqa [edi+2*16], xmm0) - AS2( movdqa xmm0, [ecx+3*16]) - AS2( movdqa [edi+3*16], xmm0) - ASJ( jmp, 0, f) - -#define SSE2_S0_S1(r, a, b, c) \ - AS2( movq mm6, r)\ - AS2( psrlq r, a)\ - AS2( movq mm7, r)\ - AS2( psllq mm6, 64-c)\ - AS2( pxor mm7, mm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor mm7, r)\ - AS2( psllq mm6, c-b)\ - AS2( pxor mm7, mm6)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, mm7)\ - AS2( psllq mm6, b-a)\ - AS2( pxor r, mm6) - -#define SSE2_s0(r, a, b, c) \ - AS2( movdqa xmm6, r)\ - AS2( psrlq r, a)\ - AS2( movdqa xmm7, r)\ - AS2( psllq xmm6, 64-c)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor xmm7, r)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, xmm7)\ - AS2( psllq xmm6, c-a)\ - AS2( pxor r, xmm6) - -#define SSE2_s1(r, a, b, c) \ - AS2( movdqa xmm6, r)\ - AS2( psrlq r, a)\ - AS2( movdqa xmm7, r)\ - AS2( psllq xmm6, 64-c)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor xmm7, r)\ - AS2( psllq xmm6, c-b)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, xmm7) - - ASL(SHA512_Round) - // k + w is in mm0, a is in mm4, e is in mm5 - AS2( paddq mm0, [edi+7*8]) // h - AS2( movq mm2, [edi+5*8]) // f - AS2( movq mm3, [edi+6*8]) // g - AS2( pxor mm2, mm3) - AS2( pand mm2, mm5) - SSE2_S0_S1(mm5,14,18,41) - AS2( pxor mm2, mm3) - AS2( paddq mm0, mm2) // h += Ch(e,f,g) - AS2( paddq mm5, mm0) // h += S1(e) - AS2( movq mm2, [edi+1*8]) // b - AS2( movq mm1, mm2) - AS2( por mm2, mm4) - AS2( pand mm2, [edi+2*8]) // c - AS2( pand mm1, mm4) - AS2( por mm1, mm2) - AS2( paddq mm1, mm5) // temp = h + Maj(a,b,c) - AS2( paddq mm5, [edi+3*8]) // e = d + h - AS2( movq [edi+3*8], mm5) - AS2( movq [edi+11*8], mm5) - SSE2_S0_S1(mm4,28,34,39) // S0(a) - AS2( paddq mm4, mm1) // a = temp + S0(a) - AS2( movq [edi-8], mm4) - AS2( movq [edi+7*8], mm4) - AS1( ret) - - // first 16 rounds - ASL(0) - AS2( movq mm0, [edx+eax*8]) - AS2( movq [esi+eax*8], mm0) - AS2( movq [esi+eax*8+16*8], mm0) - AS2( paddq mm0, [ebx+eax*8]) - ASC( call, SHA512_Round) - AS1( inc eax) - AS2( sub edi, 8) - AS2( test eax, 7) - ASJ( jnz, 0, b) - AS2( add edi, 8*8) - AS2( cmp eax, 16) - ASJ( jne, 0, b) - - // rest of the rounds - AS2( movdqu xmm0, [esi+(16-2)*8]) - ASL(1) - // data expansion, W[i-2] already in xmm0 - AS2( movdqu xmm3, [esi]) - AS2( paddq xmm3, [esi+(16-7)*8]) - AS2( movdqa xmm2, [esi+(16-15)*8]) - SSE2_s1(xmm0, 6, 19, 61) - AS2( paddq xmm0, xmm3) - SSE2_s0(xmm2, 1, 7, 8) - AS2( paddq xmm0, xmm2) - AS2( movdq2q mm0, xmm0) - AS2( movhlps xmm1, xmm0) - AS2( paddq mm0, [ebx+eax*8]) - AS2( movlps [esi], xmm0) - AS2( movlps [esi+8], xmm1) - AS2( movlps [esi+8*16], xmm0) - AS2( movlps [esi+8*17], xmm1) - // 2 rounds - ASC( call, SHA512_Round) - AS2( sub edi, 8) - AS2( movdq2q mm0, xmm1) - AS2( paddq mm0, [ebx+eax*8+8]) - ASC( call, SHA512_Round) - // update indices and loop - AS2( add esi, 16) - AS2( add eax, 2) - AS2( sub edi, 8) - AS2( test eax, 7) - ASJ( jnz, 1, b) - // do housekeeping every 8 rounds - AS2( mov esi, 0xf) - AS2( and esi, eax) - AS2( lea esi, [esp+4+20*8+8+esi*8]) - AS2( add edi, 8*8) - AS2( cmp eax, 80) - ASJ( jne, 1, b) - -#define SSE2_CombineState(i) \ - AS2( movdqa xmm0, [edi+i*16])\ - AS2( paddq xmm0, [ecx+i*16])\ - AS2( movdqa [ecx+i*16], xmm0) - - SSE2_CombineState(0) - SSE2_CombineState(1) - SSE2_CombineState(2) - SSE2_CombineState(3) - - AS1( pop esp) - AS1( emms) - -#if defined(__GNUC__) - AS1( pop ebx) - ".att_syntax prefix;" - : - : "a" (SHA512_K), "c" (state), "d" (data) - : "%esi", "%edi", "memory", "cc" - ); -#else - AS1( pop edi) - AS1( pop esi) - AS1( pop ebx) - AS1( ret) -#endif -} -#endif // #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - -void SHA512::Transform(word64 *state, const word64 *data) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 - if (HasSSE2()) - { - SHA512_SSE2_Transform(state, data); - return; - } -#endif - -#define S0(x) (rotrFixed(x,28)^rotrFixed(x,34)^rotrFixed(x,39)) -#define S1(x) (rotrFixed(x,14)^rotrFixed(x,18)^rotrFixed(x,41)) -#define s0(x) (rotrFixed(x,1)^rotrFixed(x,8)^(x>>7)) -#define s1(x) (rotrFixed(x,19)^rotrFixed(x,61)^(x>>6)) - -#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA512_K[i+j]+(j?blk2(i):blk0(i));\ - d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i)) - - word64 W[16]; - word64 T[8]; - /* Copy context->state[] to working vars */ - memcpy(T, state, sizeof(T)); - /* 80 operations, partially loop unrolled */ - for (unsigned int j=0; j<80; j+=16) - { - R( 0); R( 1); R( 2); R( 3); - R( 4); R( 5); R( 6); R( 7); - R( 8); R( 9); R(10); R(11); - R(12); R(13); R(14); R(15); - } - /* Add the working vars back into context.state[] */ - state[0] += a(0); - state[1] += b(0); - state[2] += c(0); - state[3] += d(0); - state[4] += e(0); - state[5] += f(0); - state[6] += g(0); - state[7] += h(0); -} - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM -#endif // #ifndef CRYPTOPP_IMPORTS diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.h deleted file mode 100644 index 679081e8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/sha.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef CRYPTOPP_SHA_H -#define CRYPTOPP_SHA_H - -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// SHA-1 -class CRYPTOPP_DLL SHA1 : public IteratedHashWithStaticTransform -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-1";} -}; - -typedef SHA1 SHA; // for backwards compatibility - -//! implements the SHA-256 standard -class CRYPTOPP_DLL SHA256 : public IteratedHashWithStaticTransform -{ -public: -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - size_t HashMultipleBlocks(const word32 *input, size_t length); -#endif - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-256";} -}; - -//! implements the SHA-224 standard -class CRYPTOPP_DLL SHA224 : public IteratedHashWithStaticTransform -{ -public: -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - size_t HashMultipleBlocks(const word32 *input, size_t length); -#endif - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data) {SHA256::Transform(digest, data);} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-224";} -}; - -//! implements the SHA-512 standard -class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word64 *digest, const word64 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-512";} -}; - -//! implements the SHA-384 standard -class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word64 *digest, const word64 *data) {SHA512::Transform(digest, data);} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-384";} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.cpp deleted file mode 100644 index b0360e40..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// shacal2.cpp - by Kevin Springle, 2003 -// -// Portions of this code were derived from -// Wei Dai's implementation of SHA-2 -// -// The original code and all modifications are in the public domain. - -#include "pch.h" -#include "shacal2.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -// SHACAL-2 function and round definitions - -#define S0(x) (rotrFixed(x,2)^rotrFixed(x,13)^rotrFixed(x,22)) -#define S1(x) (rotrFixed(x,6)^rotrFixed(x,11)^rotrFixed(x,25)) -#define s0(x) (rotrFixed(x,7)^rotrFixed(x,18)^(x>>3)) -#define s1(x) (rotrFixed(x,17)^rotrFixed(x,19)^(x>>10)) - -#define Ch(x,y,z) (z^(x&(y^z))) -#define Maj(x,y,z) ((x&y)|(z&(x|y))) - -/* R is the SHA-256 round function. */ -/* This macro increments the k argument as a side effect. */ -#define R(a,b,c,d,e,f,g,h,k) \ - h+=S1(e)+Ch(e,f,g)+*k++;d+=h;h+=S0(a)+Maj(a,b,c); - -/* P is the inverse of the SHA-256 round function. */ -/* This macro decrements the k argument as a side effect. */ -#define P(a,b,c,d,e,f,g,h,k) \ - h-=S0(a)+Maj(a,b,c);d-=h;h-=S1(e)+Ch(e,f,g)+*--k; - -void SHACAL2::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &) -{ - AssertValidKeyLength(keylen); - - word32 *rk = m_key; - unsigned int i; - - GetUserKey(BIG_ENDIAN_ORDER, rk, m_key.size(), userKey, keylen); - for (i = 0; i < 48; i++, rk++) - { - rk[16] = rk[0] + s0(rk[1]) + rk[9] + s1(rk[14]); - rk[0] += K[i]; - } - for (i = 48; i < 64; i++, rk++) - { - rk[0] += K[i]; - } -} - -typedef BlockGetAndPut Block; - -void SHACAL2::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 a, b, c, d, e, f, g, h; - const word32 *rk = m_key; - - /* - * map byte array block to cipher state: - */ - Block::Get(inBlock)(a)(b)(c)(d)(e)(f)(g)(h); - - // Perform SHA-256 transformation. - - /* 64 operations, partially loop unrolled */ - for (unsigned int j=0; j<64; j+=8) - { - R(a,b,c,d,e,f,g,h,rk); - R(h,a,b,c,d,e,f,g,rk); - R(g,h,a,b,c,d,e,f,rk); - R(f,g,h,a,b,c,d,e,rk); - R(e,f,g,h,a,b,c,d,rk); - R(d,e,f,g,h,a,b,c,rk); - R(c,d,e,f,g,h,a,b,rk); - R(b,c,d,e,f,g,h,a,rk); - } - - /* - * map cipher state to byte array block: - */ - - Block::Put(xorBlock, outBlock)(a)(b)(c)(d)(e)(f)(g)(h); -} - -void SHACAL2::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 a, b, c, d, e, f, g, h; - const word32 *rk = m_key + 64; - - /* - * map byte array block to cipher state: - */ - Block::Get(inBlock)(a)(b)(c)(d)(e)(f)(g)(h); - - // Perform inverse SHA-256 transformation. - - /* 64 operations, partially loop unrolled */ - for (unsigned int j=0; j<64; j+=8) - { - P(b,c,d,e,f,g,h,a,rk); - P(c,d,e,f,g,h,a,b,rk); - P(d,e,f,g,h,a,b,c,rk); - P(e,f,g,h,a,b,c,d,rk); - P(f,g,h,a,b,c,d,e,rk); - P(g,h,a,b,c,d,e,f,rk); - P(h,a,b,c,d,e,f,g,rk); - P(a,b,c,d,e,f,g,h,rk); - } - - /* - * map cipher state to byte array block: - */ - - Block::Put(xorBlock, outBlock)(a)(b)(c)(d)(e)(f)(g)(h); -} - -// The SHACAL-2 round constants are identical to the SHA-256 round constants. -const word32 SHACAL2::Base::K[64] = -{ - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, - 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, - 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, - 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, - 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, - 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, - 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, - 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, - 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, - 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, - 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, - 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, - 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, - 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 -}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.h deleted file mode 100644 index 66c987fd..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/shacal2.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef CRYPTOPP_SHACAL2_H -#define CRYPTOPP_SHACAL2_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct SHACAL2_Info : public FixedBlockSize<32>, public VariableKeyLength<16, 16, 64> -{ - static const char *StaticAlgorithmName() {return "SHACAL-2";} -}; - -/// SHACAL-2 -class SHACAL2 : public SHACAL2_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - FixedSizeSecBlock m_key; - - static const word32 K[64]; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef SHACAL2::Encryption SHACAL2Encryption; -typedef SHACAL2::Decryption SHACAL2Decryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.cpp deleted file mode 100644 index 361147e2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// shark.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "shark.h" -#include "misc.h" -#include "modes.h" -#include "gf256.h" - -NAMESPACE_BEGIN(CryptoPP) - -static word64 SHARKTransform(word64 a) -{ - static const byte iG[8][8] = { - 0xe7, 0x30, 0x90, 0x85, 0xd0, 0x4b, 0x91, 0x41, - 0x53, 0x95, 0x9b, 0xa5, 0x96, 0xbc, 0xa1, 0x68, - 0x02, 0x45, 0xf7, 0x65, 0x5c, 0x1f, 0xb6, 0x52, - 0xa2, 0xca, 0x22, 0x94, 0x44, 0x63, 0x2a, 0xa2, - 0xfc, 0x67, 0x8e, 0x10, 0x29, 0x75, 0x85, 0x71, - 0x24, 0x45, 0xa2, 0xcf, 0x2f, 0x22, 0xc1, 0x0e, - 0xa1, 0xf1, 0x71, 0x40, 0x91, 0x27, 0x18, 0xa5, - 0x56, 0xf4, 0xaf, 0x32, 0xd2, 0xa4, 0xdc, 0x71, - }; - - word64 result=0; - GF256 gf256(0xf5); - for (unsigned int i=0; i<8; i++) - for(unsigned int j=0; j<8; j++) - result ^= word64(gf256.Multiply(iG[i][j], GF256::Element(a>>(56-8*j)))) << (56-8*i); - return result; -} - -void SHARK::Base::UncheckedSetKey(const byte *key, unsigned int keyLen, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(keyLen); - - m_rounds = GetRoundsAndThrowIfInvalid(params, this); - m_roundKeys.New(m_rounds+1); - - // concatenate key enought times to fill a - for (unsigned int i=0; i<(m_rounds+1)*8; i++) - ((byte *)m_roundKeys.begin())[i] = key[i%keyLen]; - - SHARK::Encryption e; - e.InitForKeySetup(); - byte IV[8] = {0,0,0,0,0,0,0,0}; - CFB_Mode_ExternalCipher::Encryption cfb(e, IV); - - cfb.ProcessString((byte *)m_roundKeys.begin(), (m_rounds+1)*8); - - ConditionalByteReverse(BIG_ENDIAN_ORDER, m_roundKeys.begin(), m_roundKeys.begin(), (m_rounds+1)*8); - - m_roundKeys[m_rounds] = SHARKTransform(m_roundKeys[m_rounds]); - - if (!IsForwardTransformation()) - { - unsigned int i; - - // transform encryption round keys into decryption round keys - for (i=0; i -struct SharkProcessAndXorBlock{ // VC60 workaround: problem with template functions -inline SharkProcessAndXorBlock(const word64 *roundKeys, unsigned int rounds, const byte *inBlock, const byte *xorBlock, byte *outBlock) -{ - word64 tmp = *(word64 *)inBlock ^ roundKeys[0]; - - ByteOrder order = GetNativeByteOrder(); - tmp = cbox[0][GetByte(order, tmp, 0)] ^ cbox[1][GetByte(order, tmp, 1)] - ^ cbox[2][GetByte(order, tmp, 2)] ^ cbox[3][GetByte(order, tmp, 3)] - ^ cbox[4][GetByte(order, tmp, 4)] ^ cbox[5][GetByte(order, tmp, 5)] - ^ cbox[6][GetByte(order, tmp, 6)] ^ cbox[7][GetByte(order, tmp, 7)] - ^ roundKeys[1]; - - for(unsigned int i=2; i(xorBlock, outBlock) - (sbox[GETBYTE(tmp, 7)]) - (sbox[GETBYTE(tmp, 6)]) - (sbox[GETBYTE(tmp, 5)]) - (sbox[GETBYTE(tmp, 4)]) - (sbox[GETBYTE(tmp, 3)]) - (sbox[GETBYTE(tmp, 2)]) - (sbox[GETBYTE(tmp, 1)]) - (sbox[GETBYTE(tmp, 0)]); - - *(word64 *)outBlock ^= roundKeys[rounds]; -}}; - -void SHARK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - SharkProcessAndXorBlock(m_roundKeys, m_rounds, inBlock, xorBlock, outBlock); -} - -void SHARK::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - SharkProcessAndXorBlock(m_roundKeys, m_rounds, inBlock, xorBlock, outBlock); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.h deleted file mode 100644 index 8d5ce9ba..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/shark.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef CRYPTOPP_SHARK_H -#define CRYPTOPP_SHARK_H - -/** \file -*/ - -#include "config.h" -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct SHARK_Info : public FixedBlockSize<8>, public VariableKeyLength<16, 1, 16>, public VariableRounds<6, 2> -{ - static const char *StaticAlgorithmName() {return "SHARK-E";} -}; - -/// SHARK-E -class SHARK : public SHARK_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶m); - - protected: - unsigned int m_rounds; - SecBlock m_roundKeys; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - // used by Base to do key setup - void InitForKeySetup(); - - private: - static const byte sbox[256]; - static const word64 cbox[8][256]; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - - private: - static const byte sbox[256]; - static const word64 cbox[8][256]; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef SHARK::Encryption SHARKEncryption; -typedef SHARK::Decryption SHARKDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/sharkbox.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/sharkbox.cpp deleted file mode 100644 index a0ff31f8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/sharkbox.cpp +++ /dev/null @@ -1,4162 +0,0 @@ -#include "pch.h" -#include "shark.h" - -NAMESPACE_BEGIN(CryptoPP) - -const byte SHARK::Enc::sbox[256] = { -177, 206, 195, 149, 90, 173, 231, 2, 77, 68, 251, 145, 12, 135, 161, 80, -203, 103, 84, 221, 70, 143, 225, 78, 240, 253, 252, 235, 249, 196, 26, 110, - 94, 245, 204, 141, 28, 86, 67, 254, 7, 97, 248, 117, 89, 255, 3, 34, -138, 209, 19, 238, 136, 0, 14, 52, 21, 128, 148, 227, 237, 181, 83, 35, - 75, 71, 23, 167, 144, 53, 171, 216, 184, 223, 79, 87, 154, 146, 219, 27, - 60, 200, 153, 4, 142, 224, 215, 125, 133, 187, 64, 44, 58, 69, 241, 66, -101, 32, 65, 24, 114, 37, 147, 112, 54, 5, 242, 11, 163, 121, 236, 8, - 39, 49, 50, 182, 124, 176, 10, 115, 91, 123, 183, 129, 210, 13, 106, 38, -158, 88, 156, 131, 116, 179, 172, 48, 122, 105, 119, 15, 174, 33, 222, 208, - 46, 151, 16, 164, 152, 168, 212, 104, 45, 98, 41, 109, 22, 73, 118, 199, -232, 193, 150, 55, 229, 202, 244, 233, 99, 18, 194, 166, 20, 188, 211, 40, -175, 47, 230, 36, 82, 198, 160, 9, 189, 140, 207, 93, 17, 95, 1, 197, -159, 61, 162, 155, 201, 59, 190, 81, 25, 31, 63, 92, 178, 239, 74, 205, -191, 186, 111, 100, 217, 243, 62, 180, 170, 220, 213, 6, 192, 126, 246, 102, -108, 132, 113, 56, 185, 29, 127, 157, 72, 139, 42, 218, 165, 51, 130, 57, -214, 120, 134, 250, 228, 43, 169, 30, 137, 96, 107, 234, 85, 76, 247, 226, -}; - -const byte SHARK::Dec::sbox[256] = { - 53, 190, 7, 46, 83, 105, 219, 40, 111, 183, 118, 107, 12, 125, 54, 139, -146, 188, 169, 50, 172, 56, 156, 66, 99, 200, 30, 79, 36, 229, 247, 201, - 97, 141, 47, 63, 179, 101, 127, 112, 175, 154, 234, 245, 91, 152, 144, 177, -135, 113, 114, 237, 55, 69, 104, 163, 227, 239, 92, 197, 80, 193, 214, 202, - 90, 98, 95, 38, 9, 93, 20, 65, 232, 157, 206, 64, 253, 8, 23, 74, - 15, 199, 180, 62, 18, 252, 37, 75, 129, 44, 4, 120, 203, 187, 32, 189, -249, 41, 153, 168, 211, 96, 223, 17, 151, 137, 126, 250, 224, 155, 31, 210, -103, 226, 100, 119, 132, 43, 158, 138, 241, 109, 136, 121, 116, 87, 221, 230, - 57, 123, 238, 131, 225, 88, 242, 13, 52, 248, 48, 233, 185, 35, 84, 21, - 68, 11, 77, 102, 58, 3, 162, 145, 148, 82, 76, 195, 130, 231, 128, 192, -182, 14, 194, 108, 147, 236, 171, 67, 149, 246, 216, 70, 134, 5, 140, 176, -117, 0, 204, 133, 215, 61, 115, 122, 72, 228, 209, 89, 173, 184, 198, 208, -220, 161, 170, 2, 29, 191, 181, 159, 81, 196, 165, 16, 34, 207, 1, 186, -143, 49, 124, 174, 150, 218, 240, 86, 71, 212, 235, 78, 217, 19, 142, 73, - 85, 22, 255, 59, 244, 164, 178, 6, 160, 167, 251, 27, 110, 60, 51, 205, - 24, 94, 106, 213, 166, 33, 222, 254, 42, 28, 243, 10, 26, 25, 39, 45, -}; - -const word64 SHARK::Enc::cbox[8][256] = { -/* box 0 */ -W64LIT(0x060d838f16f3a365), -W64LIT(0xa68857ee5cae56f6), -W64LIT(0xebf516353c2c4d89), -W64LIT(0x652174be88e85bdc), -W64LIT(0x0d4e9a8086c17921), -W64LIT(0x27ba7d33cffa58a1), -W64LIT(0x88d9e104a237b530), -W64LIT(0x693b8755a4fbe816), -W64LIT(0xdac9591826b254a0), -W64LIT(0x45c2e369fb336af3), -W64LIT(0xa96e1fb87b3e4ef4), -W64LIT(0xb7578f1435eb7ef0), -W64LIT(0x839af80b32056f74), -W64LIT(0xae37f55cc71f277a), -W64LIT(0xa4208538fdff37d5), -W64LIT(0x35991e74ad3cdb6f), -W64LIT(0xba191594b32a07d1), -W64LIT(0x5344d1772e572b7b), -W64LIT(0xe7efe5de103ffe43), -W64LIT(0xa3796fdc41de5e5b), -W64LIT(0x2cf9643c5fc882e5), -W64LIT(0xffdbf6fd48196d22), -W64LIT(0x33949dfbbbcf780a), -W64LIT(0x7d15679dd0cec8bd), -W64LIT(0x5f5e229c024498b1), -W64LIT(0x1223634762c683ce), -W64LIT(0xdcc4da973041f7c5), -W64LIT(0x0b43190f9032da44), -W64LIT(0xc05598eddfc5a6e2), -W64LIT(0x9e5fd31a7753f4b8), -W64LIT(0x9afa8243c0f136fe), -W64LIT(0xcc4f6b06f3d61528), -W64LIT(0xdf38612a3bc25c0d), -W64LIT(0x43cf60e6edc0c996), -W64LIT(0xcfb3d0bbf855bee0), -W64LIT(0x96e071a8ece28534), -W64LIT(0x21b7febcd909fbc4), -W64LIT(0x8ed4628bb4c41655), -W64LIT(0x30682646b04cd3c2), -W64LIT(0xb5ff5dc294ba1fd3), -W64LIT(0x75aac52f4b7fb931), -W64LIT(0xe809ad8837afe641), -W64LIT(0x0eb2213d8d42d2e9), -W64LIT(0x9852509561a057dd), -W64LIT(0xaa92a40570bde53c), -W64LIT(0x7b18e412c63d6bd8), -W64LIT(0xa7dc3e85f67c9c1d), -W64LIT(0xd8618bce87e33583), -W64LIT(0xe34ab487a79d3c05), -W64LIT(0x20e397d773db312f), -W64LIT(0x05f138321d7008ad), -W64LIT(0x17d25b757fb68b63), -W64LIT(0x8a7133d20366d413), -W64LIT(0x0000000000000000), -W64LIT(0xeaa17f5e96fe8762), -W64LIT(0xc101f18675176c09), -W64LIT(0xbebc44cd0488c597), -W64LIT(0xdb9d30738c609e4b), -W64LIT(0xabc6cd6eda6f2fd7), -W64LIT(0x5aaf1aae1f34901c), -W64LIT(0xb00e65f089ca177e), -W64LIT(0xd47b7825abf08649), -W64LIT(0x924520f15b404772), -W64LIT(0x1686321ed5644188), -W64LIT(0x618425e73f4a999a), -W64LIT(0xe21eddec0d4ff6ee), -W64LIT(0xd787c398a0732d81), -W64LIT(0x1f6df9c7e407faef), -W64LIT(0x79b036c4676c0afb), -W64LIT(0x0fe6485627901802), -W64LIT(0x9cf701ccd602959b), -W64LIT(0xbfe82da6ae5a0f7c), -W64LIT(0x990639fecb729d36), -W64LIT(0xca42e889e525b64d), -W64LIT(0xb3f2de4d8249bcb6), -W64LIT(0x4033db5be643625e), -W64LIT(0x4167b2304c91a8b5), -W64LIT(0x108bb191c397e2ed), -W64LIT(0x1834132358269361), -W64LIT(0x541d3b93927642f5), -W64LIT(0x90edf227fa112651), -W64LIT(0x1dc52b1145569bcc), -W64LIT(0xe6bb8cb5baed34a8), -W64LIT(0xd276fbaabd03252c), -W64LIT(0x313c4f2d1a9e1929), -W64LIT(0xfd73242be9480c01), -W64LIT(0x9baeeb286a23fc15), -W64LIT(0xc9be5334eea61d85), -W64LIT(0xc70c720963e4cf6c), -W64LIT(0x3eda077b3d0e012b), -W64LIT(0x97b418c346304fdf), -W64LIT(0x32c0f490111db2e1), -W64LIT(0x2ba08ed8e3e9eb6b), -W64LIT(0x8b255ab9a9b41ef8), -W64LIT(0x91b99b4c50c3ecba), -W64LIT(0xfe8f9f96e2cba7c9), -W64LIT(0x3a7f56228aacc36d), -W64LIT(0xb15a0c9b2318dd95), -W64LIT(0x5953a11314b73bd4), -W64LIT(0xf3c10516640adee8), -W64LIT(0xedf895ba2adfeeec), -W64LIT(0xadcb4ee1cc9c8cb2), -W64LIT(0xde6c0841911096e6), -W64LIT(0x84c312ef8e2406fa), -W64LIT(0xa83a76d3d1ec841f), -W64LIT(0x1c91427aef845127), -W64LIT(0x3665a5c9a6bf70a7), -W64LIT(0xf6303d24797ad645), -W64LIT(0xcd1b026d5904dfc3), -W64LIT(0x1bc8a89e53a538a9), -W64LIT(0x7ee9dc20db4d6375), -W64LIT(0x51ec03a18f064a58), -W64LIT(0xc4f0c9b4686764a4), -W64LIT(0xdd90b3fc9a933d2e), -W64LIT(0x7a4c8d796cefa133), -W64LIT(0x73a746a05d8c1a54), -W64LIT(0x0759eae4bc21698e), -W64LIT(0xc8ea3a5f4474d76e), -W64LIT(0x38d784f42bfda24e), -W64LIT(0x231f2c6a78589ae7), -W64LIT(0xc3a92350d4460d2a), -W64LIT(0x72f32fcbf75ed0bf), -W64LIT(0xbd40ff700f0b6e5f), -W64LIT(0x157a89a3dee7ea40), -W64LIT(0x873fa95285a7ad32), -W64LIT(0x4d7d41db60821b7f), -W64LIT(0x1e3990ac4ed53004), -W64LIT(0x0a1770643ae010af), -W64LIT(0x9311499af1928d99), -W64LIT(0x64751dd5223a9137), -W64LIT(0xfa2acecf5569658f), -W64LIT(0x7c410ef67a1c0256), -W64LIT(0x56b5e945332723d6), -W64LIT(0x6f3604dab2084b73), -W64LIT(0xe95dc4e39d7d2caa), -W64LIT(0x13770a2cc8144925), -W64LIT(0xbc14961ba5d9a4b4), -W64LIT(0xb9e5ae29b8a9ac19), -W64LIT(0xf169d7c0c55bbfcb), -W64LIT(0x2446c68ec479f369), -W64LIT(0x806643b63986c4bc), -W64LIT(0x7fbdb54b719fa99e), -W64LIT(0x04a55159b7a2c246), -W64LIT(0xee042e07215c4524), -W64LIT(0x5bfb73c5b5e65af7), -W64LIT(0x0c1af3eb2c13b3ca), -W64LIT(0xa22d06b7eb0c94b0), -W64LIT(0xb8b1c742127b66f2), -W64LIT(0x285c3565e86a40a3), -W64LIT(0x3b2b3f49207e0986), -W64LIT(0x3c72d5ad9c5f6008), -W64LIT(0x770217f9ea2ed812), -W64LIT(0xfc274d40439ac6ea), -W64LIT(0x4fd5930dc1d37a5c), -W64LIT(0x2e51b6eafe99e3c6), -W64LIT(0x6b93558305aa8935), -W64LIT(0x19607a48f2f4598a), -W64LIT(0x08bfa2b29bb1718c), -W64LIT(0x3f8e6e1097dccbc0), -W64LIT(0x3983ed9f812f68a5), -W64LIT(0xac9f278a664e4659), -W64LIT(0x82ce916098d7a59f), -W64LIT(0xc2fd4a3b7e94c7c1), -W64LIT(0x66ddcf03836bf014), -W64LIT(0xe1e2665106cc5d26), -W64LIT(0x74feac44e1ad73da), -W64LIT(0x8d28d936bf47bd9d), -W64LIT(0x62789e5a34c93252), -W64LIT(0x81322add93540e57), -W64LIT(0xcb1681e24ff77ca6), -W64LIT(0x2512afe56eab3982), -W64LIT(0xd18a4017b6808ee4), -W64LIT(0x705bfd1d560fb19c), -W64LIT(0x4b70c2547671b81a), -W64LIT(0x49d81082d720d939), -W64LIT(0xe0b60f3aac1e97cd), -W64LIT(0x4e81fa666b01b0b7), -W64LIT(0x951cca15e7612efc), -W64LIT(0x463e58d4f0b0c13b), -W64LIT(0x632cf7319e1bf8b9), -W64LIT(0x5ca2992109c73379), -W64LIT(0xf764544fd3a81cae), -W64LIT(0x6ac73ce8af7843de), -W64LIT(0x9f0bba71dd813e53), -W64LIT(0x85977b8424f6cc11), -W64LIT(0x5807c878be65f13f), -W64LIT(0x686fee3e0e2922fd), -W64LIT(0x78e45fafcdbec010), -W64LIT(0x6ccabf67b98be0bb), -W64LIT(0x11dfd8fa69452806), -W64LIT(0xcee7b9d05287740b), -W64LIT(0x50b86aca25d480b3), -W64LIT(0x5df6f04aa315f992), -W64LIT(0x5e0a4bf7a896525a), -W64LIT(0x03fcbbbd0b83abc8), -W64LIT(0x8f800be01e16dcbe), -W64LIT(0xd32292c117d1efc7), -W64LIT(0xe5473708b16e9f60), -W64LIT(0x224b4501d28a500c), -W64LIT(0xfb7ea7a4ffbbaf64), -W64LIT(0x3d26bcc6368daae3), -W64LIT(0x866bc0392f7567d9), -W64LIT(0x3731cca20c6dba4c), -W64LIT(0xb603e67f9f39b41b), -W64LIT(0xa1d1bd0ae08f3f78), -W64LIT(0xd935e2a52d31ff68), -W64LIT(0xaf639c376dcded91), -W64LIT(0x0154696baad2caeb), -W64LIT(0xecacfcd1800d2407), -W64LIT(0xf03dbeab6f897520), -W64LIT(0x02a8d2d6a1516123), -W64LIT(0xf498eff2d82bb766), -W64LIT(0x710f9476fcdd7b77), -W64LIT(0xf8821c19f43804ac), -W64LIT(0xf9d675725eeace47), -W64LIT(0x1a9cc1f5f977f242), -W64LIT(0x5210b81c8485e190), -W64LIT(0x6d9ed60c13592a50), -W64LIT(0xf2956c7dced81403), -W64LIT(0xbb4d7cff19f8cd3a), -W64LIT(0x4c2928b0ca50d194), -W64LIT(0x6e626db118da8198), -W64LIT(0xe4135e631bbc558b), -W64LIT(0x9da368a77cd05f70), -W64LIT(0xa574ec53572dfd3e), -W64LIT(0x09ebcbd93163bb67), -W64LIT(0x4a24ab3fdca372f1), -W64LIT(0x429b098d4712037d), -W64LIT(0x57e1802e99f5e93d), -W64LIT(0xef50476c8b8e8fcf), -W64LIT(0xa085d4614a5df593), -W64LIT(0x34cd771f07ee1184), -W64LIT(0xc6581b62c9360587), -W64LIT(0x2dad0d57f51a480e), -W64LIT(0x898d886f08e57fdb), -W64LIT(0xd6d3aaf30aa1e76a), -W64LIT(0x76567e9240fc12f9), -W64LIT(0xb4ab34a93e68d538), -W64LIT(0xb2a6b726289b765d), -W64LIT(0x8c7cb05d15957776), -W64LIT(0x554952f838a4881e), -W64LIT(0xd52f114e01224ca2), -W64LIT(0x60d04c8c95985371), -W64LIT(0x6789a66829b93aff), -W64LIT(0x2f05df81544b292d), -W64LIT(0x476a31bf5a620bd0), -W64LIT(0xf5cc869972f97d8d), -W64LIT(0x488c79e97df213d2), -W64LIT(0x44968a0251e1a018), -W64LIT(0x26ee14586528924a), -W64LIT(0xd0de297c1c52440f), -W64LIT(0xc5a4a0dfc2b5ae4f), -W64LIT(0x29085c0e42b88a48), -W64LIT(0x142ee0c8743520ab), -W64LIT(0x2af4e7b3493b2180), -W64LIT(0x9448a37e4db3e417), -/* box 1 */ -W64LIT(0xe2795ba105ba30ce), -W64LIT(0x65b5d634f5e0fbdd), -W64LIT(0x2d7d7f1464dd8c55), -W64LIT(0xeefbf778add1c20b), -W64LIT(0x1eb0fbd1f11968e7), -W64LIT(0xe6073f45ce30cd8d), -W64LIT(0x21ffd3cdccb67e90), -W64LIT(0xdf0941cfa750a262), -W64LIT(0xc61df5b1b75ef18a), -W64LIT(0xc5c7defa9dc337c6), -W64LIT(0x2581b729073c83d3), -W64LIT(0xa5e97513167173cf), -W64LIT(0xdd3673bd381526b9), -W64LIT(0xe8baa1eef91ebb93), -W64LIT(0x3b314cf8f625eb34), -W64LIT(0x579d4bc8d5fc5df8), -W64LIT(0xbb598ec2e7681b28), -W64LIT(0xc8a06b1a80708794), -W64LIT(0x1c8fc9a36e5cec3c), -W64LIT(0xf60a5a3f0807d374), -W64LIT(0x1ace9f353a9395a4), -W64LIT(0x7e9e50387aab2cee), -W64LIT(0xb5e41069d0466d36), -W64LIT(0x8cea6ee3b92602d9), -W64LIT(0xf952ddad8af1e7fd), -W64LIT(0xb19a748d1bcc9075), -W64LIT(0x2464ae10b2e4c144), -W64LIT(0xfcc9a070f4a35829), -W64LIT(0xfa88f6e6a06c21b1), -W64LIT(0x2c98662dd105cec2), -W64LIT(0x9065a740d77aeee5), -W64LIT(0xcb7a4051aaed41d8), -W64LIT(0x55a279ba4ab9d923), -W64LIT(0x27be855b98790708), -W64LIT(0xbabc97fb52b059bf), -W64LIT(0xa19711f7ddfb8e8c), -W64LIT(0x047e64e4cb8afd43), -W64LIT(0xc386886cc90c4e5e), -W64LIT(0xc422c7c3281b7551), -W64LIT(0xfb6defdf15b46326), -W64LIT(0x01e51939b5d84297), -W64LIT(0x5cbba8be9c809432), -W64LIT(0x6f762c7b09447080), -W64LIT(0xcee13d8cd4bffe0c), -W64LIT(0x54476083ff619bb4), -W64LIT(0x6e933542bc9c3217), -W64LIT(0x4af79b520e78f353), -W64LIT(0x98996f7db49be163), -W64LIT(0xa07208ce6823cc1b), -W64LIT(0x2b3c29823012f5cd), -W64LIT(0x93bf8c0bfde728a9), -W64LIT(0x2225f886e62bb8dc), -W64LIT(0x7f7b4901cf736e79), -W64LIT(0x0000000000000000), -W64LIT(0x023f32729f4584db), -W64LIT(0xd5cabb805bf4293f), -W64LIT(0x07a44fafe1173b0f), -W64LIT(0xe95fb8d74cc6f904), -W64LIT(0x7b052de504f9933a), -W64LIT(0x6aed51a67716cf54), -W64LIT(0x68d263d4e8534b8f), -W64LIT(0xa96bd9cabe1a810a), -W64LIT(0x1d6ad09adb84aeab), -W64LIT(0x0d67b5e01db3b052), -W64LIT(0x52063615abaee22c), -W64LIT(0x8f3045a893bbc495), -W64LIT(0xd8ad0e604647996d), -W64LIT(0xaf2a8f5cead5f892), -W64LIT(0x3017af8ebf5922fe), -W64LIT(0x4034611df2dc780e), -W64LIT(0x721cfce1d2c0de2b), -W64LIT(0x28e602c91a8f3381), -W64LIT(0xe1a370ea2f27f682), -W64LIT(0x29031bf0af577116), -W64LIT(0x1914b47e100e53e8), -W64LIT(0x567852f160241f6f), -W64LIT(0x793a1f979bbc17e1), -W64LIT(0xef1eee411809809c), -W64LIT(0x6211999b14f7c0d2), -W64LIT(0x059b7ddd7e52bfd4), -W64LIT(0x43ee4a56d841be42), -W64LIT(0xf1ae1590e910e87b), -W64LIT(0x33cd84c595c4e4b2), -W64LIT(0x4b12826bbba0b1c4), -W64LIT(0xeb608aa5d3837ddf), -W64LIT(0x201acaf4796e3c07), -W64LIT(0xbf27ea262ce2e66b), -W64LIT(0x58c5cc5a570a6971), -W64LIT(0x37b3e0215e4e19f1), -W64LIT(0xab54ebb8215f05d1), -W64LIT(0x8ed55c9126638602), -W64LIT(0x9aa65d0f2bde65b8), -W64LIT(0xd7f589f2c4b1ade4), -W64LIT(0x5039046734eb66f7), -W64LIT(0x6cac073023d9b6cc), -W64LIT(0x51dc1d5e81332460), -W64LIT(0x17a92ad5272025f6), -W64LIT(0x47902eb213cb4301), -W64LIT(0x1b2b860c8f4bd733), -W64LIT(0x4f6ce68f702a4c87), -W64LIT(0xcf0424b56167bc9b), -W64LIT(0x997c76440143a3f4), -W64LIT(0x7ae034dcb121d1ad), -W64LIT(0x100d657ac6371ef9), -W64LIT(0x0ac3fa4ffca48b5d), -W64LIT(0xdeec58f61288e0f5), -W64LIT(0x265b9c622da1459f), -W64LIT(0xdcd36a848dcd642e), -W64LIT(0xe4380d3751754956), -W64LIT(0x13d74e31ecaad8b5), -W64LIT(0xfd2cb949417b1abe), -W64LIT(0x9624f1d683b5977d), -W64LIT(0x4675378ba6130196), -W64LIT(0x0b26e376497cc9ca), -W64LIT(0x41d1782447043a99), -W64LIT(0xe39c4298b0627259), -W64LIT(0xcd3b16c7fe223840), -W64LIT(0x7787813cac9261ff), -W64LIT(0x492db01924e5351f), -W64LIT(0x5afafe28c84fedaa), -W64LIT(0x8b4e214c583139d6), -W64LIT(0xccde0ffe4bfa7ad7), -W64LIT(0x76629805194a2368), -W64LIT(0x7ca1624ae5eea835), -W64LIT(0x61cbb2d03e6a069e), -W64LIT(0x48c8a920913d7788), -W64LIT(0x8068c23a114df01c), -W64LIT(0xd38bed160f3b50a7), -W64LIT(0x32289dfc201ca625), -W64LIT(0xc1b9ba1e5649ca85), -W64LIT(0xed21dc33874c0447), -W64LIT(0xa3a8238542be0a57), -W64LIT(0x5b1fe7117d97af3d), -W64LIT(0x3d701a6ea2ea92ac), -W64LIT(0x73f9e5d867189cbc), -W64LIT(0x9ed839ebe05498fb), -W64LIT(0x5920d563e2d22be6), -W64LIT(0xca9f59681f35034f), -W64LIT(0x11e87c4373ef5c6e), -W64LIT(0x97c1e8ef366dd5ea), -W64LIT(0xacf0a417c0483ede), -W64LIT(0xd26ef42fbae31230), -W64LIT(0xbcfdc16d067f2027), -W64LIT(0xbec2f31f993aa4fc), -W64LIT(0x45af1cc08c8ec7da), -W64LIT(0x31f2b6b70a816069), -W64LIT(0xd9481759f39fdbfa), -W64LIT(0xe5dd140ee4ad0bc1), -W64LIT(0xa6335e583cecb583), -W64LIT(0x38eb67b3dcb82d78), -W64LIT(0xf5d07174229a1538), -W64LIT(0x5f6183f5b61d527e), -W64LIT(0x0f58879282f63489), -W64LIT(0x164c33ec92f86761), -W64LIT(0x444a05f93956854d), -W64LIT(0x818ddb03a495b28b), -W64LIT(0x4d53d4fdef6fc85c), -W64LIT(0x8d0f77da0cfe404e), -W64LIT(0x8416a6dedac70d5f), -W64LIT(0x666ffd7fdf7d3d91), -W64LIT(0xb63e3b22fadbab7a), -W64LIT(0xf2743edbc38d2e37), -W64LIT(0xa40c6c2aa3a93158), -W64LIT(0x9f3d20d2558cda6c), -W64LIT(0xfef692026be6dcf2), -W64LIT(0x2ea7545f4e404a19), -W64LIT(0xb2405fc631515639), -W64LIT(0x23c0e1bf53f3fa4b), -W64LIT(0x83b2e9713bd03650), -W64LIT(0x0641569654cf7998), -W64LIT(0xb883a589cdf5dd64), -W64LIT(0x3ad455c143fda9a3), -W64LIT(0x925a9532483f6a3e), -W64LIT(0xaab1f28194874746), -W64LIT(0xf435684d974257af), -W64LIT(0xd1b4df64907ed47c), -W64LIT(0x390e7e8a69606fef), -W64LIT(0xd051c65d25a696eb), -W64LIT(0xb4010950659e2fa1), -W64LIT(0x0c82acd9a86bf2c5), -W64LIT(0x88940a0772acff9a), -W64LIT(0xf39127e276556ca0), -W64LIT(0xaecf96655f0dba05), -W64LIT(0x03da2b4b2a9dc64c), -W64LIT(0x3f4f281c3daf1677), -W64LIT(0x3469cb6a74d3dfbd), -W64LIT(0xf04b0ca95cc8aaec), -W64LIT(0x1f55e2e844c12a70), -W64LIT(0x4cb6cdc45ab78acb), -W64LIT(0xc05ca327e3918812), -W64LIT(0x95feda9da9285131), -W64LIT(0xb966bcb0782d9ff3), -W64LIT(0xa7d647618934f714), -W64LIT(0xd61090cb7169ef73), -W64LIT(0x71c6d7aaf85d1867), -W64LIT(0xecc4c50a329446d0), -W64LIT(0x6450cf0d4038b94a), -W64LIT(0x420b536f6d99fcd5), -W64LIT(0x75b8b34e33d7e524), -W64LIT(0xc26391557cd40cc9), -W64LIT(0xda923c12d9021db6), -W64LIT(0x4e89ffb6c5f20e10), -W64LIT(0x0919d104d6394d11), -W64LIT(0x8aab3875ede97b41), -W64LIT(0xa88ec0f30bc2c39d), -W64LIT(0xb7db221b4f03e9ed), -W64LIT(0xc7f8ec880286b31d), -W64LIT(0x2f424d66fb98088e), -W64LIT(0xe04669d39affb415), -W64LIT(0x3eaa3125887754e0), -W64LIT(0x5e849acc03c510e9), -W64LIT(0x8257f0488e0874c7), -W64LIT(0xbd18d854b3a762b0), -W64LIT(0xb3a546ff848914ae), -W64LIT(0x9ce70b997f111c20), -W64LIT(0x3c9503571732d03b), -W64LIT(0xe7e2267c7be88f1a), -W64LIT(0x63f480a2a12f8245), -W64LIT(0x602eabe98bb24409), -W64LIT(0x941bc3a41cf013a6), -W64LIT(0x678ae4466aa57f06), -W64LIT(0x1232570859729a22), -W64LIT(0x6d491e099601f45b), -W64LIT(0x5d5eb1872958d6a5), -W64LIT(0x1473019e0dbde3ba), -W64LIT(0xa24d3abcf76648c0), -W64LIT(0x85f3bfe76f1f4fc8), -W64LIT(0x08fcc83d63e10f86), -W64LIT(0x745daa77860fa7b3), -W64LIT(0x9180be7962a2ac72), -W64LIT(0x87cc8d95f05acb13), -W64LIT(0x78df06ae2e645576), -W64LIT(0x18f1ad47a5d6117f), -W64LIT(0x358cd253c10b9d2a), -W64LIT(0x0ebd9eab372e761e), -W64LIT(0xf7ef4306bddf91e3), -W64LIT(0x7023ce934d855af0), -W64LIT(0xd42fa2b9ee2c6ba8), -W64LIT(0x3656f918eb965b66), -W64LIT(0x9d0212a0cac95eb7), -W64LIT(0x2ad930bb85cab75a), -W64LIT(0x862994ac45828984), -W64LIT(0x7d447b735036eaa2), -W64LIT(0xb07f6db4ae14d2e2), -W64LIT(0x6b08489fc2ce8dc3), -W64LIT(0x9b4344369e06272f), -W64LIT(0xad15bd2e75907c49), -W64LIT(0xdb77252b6cda5f21), -W64LIT(0xea85939c665b3f48), -W64LIT(0xc945722335a8c503), -W64LIT(0x159618a7b865a12d), -W64LIT(0x69377aed5d8b0918), -W64LIT(0x8971133ec774bd0d), -W64LIT(0x53e32f2c1e76a0bb), -W64LIT(0xf8b7c4943f29a56a), -W64LIT(0xff138b3bde3e9e65), -/* box 2 */ -W64LIT(0x7c6a2eb5fdabecc6), -W64LIT(0x401cda0a752bbea0), -W64LIT(0x1925217156dc57c4), -W64LIT(0x56dec6d301d70787), -W64LIT(0x41c751ff73c6ac58), -W64LIT(0xc9067697a92cb5f9), -W64LIT(0x3391c917aaa0bc85), -W64LIT(0xae0a9a4c0e742afe), -W64LIT(0xaa8ca972162a62f4), -W64LIT(0x5aa193912935df99), -W64LIT(0x86fd9135fe27e5ba), -W64LIT(0xffca074b1d3f538e), -W64LIT(0x0e3cb65d24cdfc1b), -W64LIT(0x4384b2e07fe9885d), -W64LIT(0xc73ac0ca8de149e2), -W64LIT(0x48e5bc7645972eb4), -W64LIT(0xbe0d56b46ef9ffd6), -W64LIT(0x200e6d05c0ef5f50), -W64LIT(0xe1f17dee597f7abd), -W64LIT(0x0243e31f0c2f2405), -W64LIT(0xf4ab09dd2741f567), -W64LIT(0xe4acc52547cc204f), -W64LIT(0x348f92c3b83cc272), -W64LIT(0x53837e181f645d75), -W64LIT(0xd8da319acf4c7229), -W64LIT(0x81e3cae1ecbb9b4d), -W64LIT(0xd6e687c7eb818e32), -W64LIT(0x3dad7f4a8e6d409e), -W64LIT(0x28f70b79f053cf44), -W64LIT(0x493e3783437a3c4c), -W64LIT(0xb27203f6461b27c8), -W64LIT(0xd02357e6fff0e23d), -W64LIT(0xe8d390676f2ef851), -W64LIT(0x26cbbd24d49e335f), -W64LIT(0xee1640467b5f945e), -W64LIT(0x4aa65f6949b80ab1), -W64LIT(0xb56c58225487593f), -W64LIT(0x4ffbe7a2570b5043), -W64LIT(0x0aba85633c93b411), -W64LIT(0x78ec1d8be5f5a4cc), -W64LIT(0x501b16f215a66b88), -W64LIT(0x271036d1d27321a7), -W64LIT(0x7ff2465ff769da3b), -W64LIT(0x35541936bed1d08a), -W64LIT(0xb8c886957a8893d9), -W64LIT(0x2fe950ade2cfb1b3), -W64LIT(0xf90fd76a094e3f81), -W64LIT(0x2daab3b2eee095b6), -W64LIT(0x1abd499b5c1e6139), -W64LIT(0x0c7f554228e2d81e), -W64LIT(0x425f391579049aa5), -W64LIT(0xc3bcf3f495bf01e8), -W64LIT(0xb4b7d3d7526a4bc7), -W64LIT(0x0000000000000000), -W64LIT(0xa0362c112ab9d6e5), -W64LIT(0x91e406198c364e65), -W64LIT(0x454162c16b98e452), -W64LIT(0x139fa4126a4fe3d5), -W64LIT(0x01db8bf506ed12f8), -W64LIT(0x9a85088fb648e88c), -W64LIT(0x3ab3249e9cf13e69), -W64LIT(0xd57eef2de143b8cf), -W64LIT(0xb1ea6b1c4cd91135), -W64LIT(0x7aaffe94e9da80c9), -W64LIT(0xad92f2a604b61c03), -W64LIT(0xa3ae44fb207be018), -W64LIT(0xeb4bf88d65ecceac), -W64LIT(0xc0249b1e9f7d3715), -W64LIT(0xa8cf4a6d1a0546f1), -W64LIT(0xc6e14b3f8b0c5b1a), -W64LIT(0xce182d43bbb0cb0e), -W64LIT(0xfc526fa117fd6573), -W64LIT(0x8c471456c2b451ab), -W64LIT(0xac497953025b0efb), -W64LIT(0x0486333e185e480a), -W64LIT(0x18feaa845031453c), -W64LIT(0xa1eda7e42c54c41d), -W64LIT(0x06c5d02114716c0f), -W64LIT(0x055db8cb1eb35af2), -W64LIT(0xe5774ed0412132b7), -W64LIT(0x36cc71dcb413e677), -W64LIT(0x470281de67b7c057), -W64LIT(0x58e2708e251afb9c), -W64LIT(0xa914c1981ce85409), -W64LIT(0xb3a9880340f63530), -W64LIT(0x638adfe5bf06d70d), -W64LIT(0x0b610e963a7ea6e9), -W64LIT(0x927c6ef386f47898), -W64LIT(0xed8e28ac719da2a3), -W64LIT(0x7548c33ccbfa6e2a), -W64LIT(0xf3b5520935dd8b90), -W64LIT(0x8d9c9fa3c4594353), -W64LIT(0x31d22a08a68f9880), -W64LIT(0x0da4deb72e0fcae6), -W64LIT(0x8fdf7cbcc8766756), -W64LIT(0x5dbfc8453ba9a16e), -W64LIT(0x8e04f749ce9b75ae), -W64LIT(0x83a029fee094bf48), -W64LIT(0xa4b01f2f32e79eef), -W64LIT(0x1c7899ba486f0d36), -W64LIT(0x654f0fc4ab77bb02), -W64LIT(0x7db1a540fb46fe3e), -W64LIT(0x51c09d07134b7970), -W64LIT(0xcb459588a50391fc), -W64LIT(0x3fee9c558242649b), -W64LIT(0xfe118cbe1bd24176), -W64LIT(0x76d0abd6c13858d7), -W64LIT(0x5e27a0af316b9793), -W64LIT(0x69305a868395631c), -W64LIT(0x3b68af6b9a1c2c91), -W64LIT(0x6db669b89bcb2b16), -W64LIT(0xa72877c53825a812), -W64LIT(0xd3bb3f0cf532d4c0), -W64LIT(0x6ff58aa797e40f13), -W64LIT(0x96fa5dcd9eaa3092), -W64LIT(0x2c713847e80d874e), -W64LIT(0xc57923d581ce6de7), -W64LIT(0x2b6f6393fa91f9b9), -W64LIT(0x0922ed89365182ec), -W64LIT(0x324a42e2ac4dae7d), -W64LIT(0x16c21cd974fcb927), -W64LIT(0x956235279468066f), -W64LIT(0x7b747561ef379231), -W64LIT(0x449ae9346d75f6aa), -W64LIT(0xf570822821ace79f), -W64LIT(0x5939fb7b23f7e964), -W64LIT(0x7937967ee318b634), -W64LIT(0x84be722af208c1bf), -W64LIT(0x08f9667c30bc9014), -W64LIT(0xefcdcbb37db286a6), -W64LIT(0xa6f3fc303ec8baea), -W64LIT(0xea9073786301dc54), -W64LIT(0x62515410b9ebc5f5), -W64LIT(0xd260b4f9f3dfc638), -W64LIT(0x9e033bb1ae16a086), -W64LIT(0x38f0c78190de1a6c), -W64LIT(0xc267780193521310), -W64LIT(0x80384114ea5689b5), -W64LIT(0x9b5e837ab0a5fa74), -W64LIT(0xf73361372d83c39a), -W64LIT(0x3009a1fda0628a78), -W64LIT(0xd4a564d8e7aeaa37), -W64LIT(0xfb4c347505611b84), -W64LIT(0x5b7a18642fd8cd61), -W64LIT(0x239605efca2d69ad), -W64LIT(0xf8d45c9f0fa32d79), -W64LIT(0xbb50ee7f704aa524), -W64LIT(0x392b4c7496330894), -W64LIT(0x0fe73da82220eee3), -W64LIT(0x3717fa29b2fef48f), -W64LIT(0xf26ed9fc33309968), -W64LIT(0xd73d0c32ed6c9cca), -W64LIT(0xda99d285c363562c), -W64LIT(0xde1fe1bbdb3d1e26), -W64LIT(0x738d131ddf8b0225), -W64LIT(0x292c808cf6beddbc), -W64LIT(0xbc4eb5ab62d6dbd3), -W64LIT(0x039868ea0ac236fd), -W64LIT(0xcc5bce5cb79fef0b), -W64LIT(0xb031e0e94a3403cd), -W64LIT(0xc4a2a82087237f1f), -W64LIT(0xb72fbb3d58a87d3a), -W64LIT(0xafd111b908993806), -W64LIT(0x68ebd173857871e4), -W64LIT(0x9d9b535ba4d4967b), -W64LIT(0xe9081b9269c3eaa9), -W64LIT(0x71cef002d3a42620), -W64LIT(0x93a7e50680196a60), -W64LIT(0x891aac9ddc070b59), -W64LIT(0x155a74337e3e8fda), -W64LIT(0x4e206c5751e642bb), -W64LIT(0x9721d6389847226a), -W64LIT(0x12442fe76ca2f12d), -W64LIT(0x2553d5cede5c05a2), -W64LIT(0xa275cf0e2696f2e0), -W64LIT(0x24885e3bd8b1175a), -W64LIT(0x670cecdba7589f07), -W64LIT(0x749348c9cd177cd2), -W64LIT(0x64948431ad9aa9fa), -W64LIT(0x2ab4e866fc7ceb41), -W64LIT(0xe6ef263a4be3044a), -W64LIT(0xe734adcf4d0e16b2), -W64LIT(0x903f8dec8adb5c9d), -W64LIT(0xf02d3ae33f1fbd6d), -W64LIT(0x725698e8d96610dd), -W64LIT(0x1da3124f4e821fce), -W64LIT(0x1719972c7211abdf), -W64LIT(0x11dc470d6660c7d0), -W64LIT(0xec55a3597770b05b), -W64LIT(0xbfd6dd416814ed2e), -W64LIT(0x57054d26073a157f), -W64LIT(0x1e3b7aa544402933), -W64LIT(0x5ffc2b5a3786856b), -W64LIT(0x61c93cfab329f308), -W64LIT(0x3e3517a084af7663), -W64LIT(0xf6e8eac22b6ed162), -W64LIT(0x1007ccf8608dd528), -W64LIT(0x66d7672ea1b58dff), -W64LIT(0x8b594f82d0282f5c), -W64LIT(0x1fe0f15042ad3bcb), -W64LIT(0x4b7dd49c4f551849), -W64LIT(0x4c638f485dc966be), -W64LIT(0xcfc3a6b6bd5dd9f6), -W64LIT(0x46d90a2b615ad2af), -W64LIT(0x8565f9dff4e5d347), -W64LIT(0x94b9bed292851497), -W64LIT(0xfa97bf80038c097c), -W64LIT(0xb9130d607c658121), -W64LIT(0xdc5c02a4d7123a23), -W64LIT(0x224d8e1accc07b55), -W64LIT(0x87261ac0f8caf742), -W64LIT(0xd901ba6fc9a160d1), -W64LIT(0xab57228710c7700c), -W64LIT(0x21d5e6f0c6024da8), -W64LIT(0x98c6eb90ba67cc89), -W64LIT(0x827ba20be679adb0), -W64LIT(0x991d6065bc8ade71), -W64LIT(0x5546ae390b15317a), -W64LIT(0xa56b94da340a8c17), -W64LIT(0x071e5bd4129c7ef7), -W64LIT(0xe02af61b5f926845), -W64LIT(0x6b73b9998fba4719), -W64LIT(0xdfc46a4eddd00cde), -W64LIT(0x770b2023c7d54a2f), -W64LIT(0x7e29cdaaf184c8c3), -W64LIT(0xba8b658a76a7b7dc), -W64LIT(0x9c40d8aea2398483), -W64LIT(0x9fd8b044a8fbb27e), -W64LIT(0xdb425970c58e44d4), -W64LIT(0xe269150453bd4c40), -W64LIT(0x3c76f4bf88805266), -W64LIT(0xf1f6b11639f2af95), -W64LIT(0x549d25cc0df82382), -W64LIT(0x4db804bd5b247446), -W64LIT(0x8a82c477d6c53da4), -W64LIT(0x5258f5ed19894f8d), -W64LIT(0x6e2e015291091deb), -W64LIT(0xc1ff10eb999025ed), -W64LIT(0xbd953e5e643bc92b), -W64LIT(0xc8ddfd62afc1a701), -W64LIT(0x5c6443b03d44b396), -W64LIT(0x6c6de24d9d2639ee), -W64LIT(0x1481ffc678d39d22), -W64LIT(0xd1f8dc13f91df0c5), -W64LIT(0xca9e1e7da3ee8304), -W64LIT(0xdd878951d1ff28db), -W64LIT(0x6012b70fb5c4e1f0), -W64LIT(0x1b66c26e5af373c1), -W64LIT(0xe3b29ef155505eb8), -W64LIT(0x70157bf7d54934d8), -W64LIT(0x2e32db58e422a34b), -W64LIT(0x6aa8326c895755e1), -W64LIT(0xb6f430c85e456fc2), -W64LIT(0xfd89e4541110778b), -W64LIT(0x88c12768daea19a1), -W64LIT(0xcd8045a9b172fdf3), -/* box 3 */ -W64LIT(0x99183e616655b742), -W64LIT(0xb2872032a50d6860), -W64LIT(0x0946f63b060528ef), -W64LIT(0x36612b9a141ef07d), -W64LIT(0x0634da84dd49579b), -W64LIT(0xfc9c9e9b486c8a57), -W64LIT(0xa63fe3c0744e6fd0), -W64LIT(0xf1515758d8b46bf9), -W64LIT(0x3e82559fcd5197ff), -W64LIT(0x92e12d262bc40177), -W64LIT(0xc3bb433a5a7752c5), -W64LIT(0x21c3852a5183267a), -W64LIT(0x39130725cf528f09), -W64LIT(0x9ba7db1d2dc12998), -W64LIT(0xc58f99be873e055e), -W64LIT(0xd9d424498f32656c), -W64LIT(0x27f75fae8cca71e1), -W64LIT(0x59b91019a8fc3430), -W64LIT(0xce768af9caafb36b), -W64LIT(0x9d930199f0887e03), -W64LIT(0x63b07a7ef3706a8e), -W64LIT(0xb5167288a70e7096), -W64LIT(0x40cc1a28e967d22e), -W64LIT(0x4d01d3eb79bf3380), -W64LIT(0x9e896cdb6456afb4), -W64LIT(0x2548bad2c75eef3b), -W64LIT(0xa79a6bfeab0420bd), -W64LIT(0x9f2ce4e5bb1ce0d9), -W64LIT(0x32ea146282c3393c), -W64LIT(0x6d67defff7765a97), -W64LIT(0x83775912b31080eb), -W64LIT(0xf5da68a04e69a2b8), -W64LIT(0x1196743498d4819c), -W64LIT(0x0bf913474d91b635), -W64LIT(0x43d6776a7db90399), -W64LIT(0x444725d07fba1b6f), -W64LIT(0x6584a0fa2e393d15), -W64LIT(0x3f27dda1121bd892), -W64LIT(0xf6c005e2dab7730f), -W64LIT(0x56cb3ca673b04b44), -W64LIT(0x642128c4f1737278), -W64LIT(0xbf4ae9f135d589ce), -W64LIT(0xb038c54eee99f6ba), -W64LIT(0xf47fe09e9123edd5), -W64LIT(0x75b75cf069a7f3e4), -W64LIT(0xd419ed8a1fea84c2), -W64LIT(0x73838674b4eea47f), -W64LIT(0x498aec13ef62fac1), -W64LIT(0x20660d148ec96917), -W64LIT(0xa48006bc3fdaf10a), -W64LIT(0x2f1421ab55851663), -W64LIT(0x0a5c9b7992dbf958), -W64LIT(0xd1375a4c567d02ee), -W64LIT(0x0000000000000000), -W64LIT(0xc842507d17e6e4f0), -W64LIT(0xf3eeb2249320f523), -W64LIT(0xc9e7d843c8acab9d), -W64LIT(0xff86f3d9dcb25be0), -W64LIT(0xb4b3fab678443ffb), -W64LIT(0xb19d4d7031d3b9d7), -W64LIT(0x79df1d0d26355d27), -W64LIT(0x8eba90d123c86145), -W64LIT(0xaa57a23d3bdcc113), -W64LIT(0xcb583d3f83383547), -W64LIT(0xd871ac7750782a01), -W64LIT(0xe162ab529f2aa508), -W64LIT(0x38b68f1b1018c064), -W64LIT(0x237c60561a17b8a0), -W64LIT(0xa31154063dd9e9fc), -W64LIT(0x713c6308ff7a3aa5), -W64LIT(0x1a6f6773d54537a9), -W64LIT(0x08e37e05d94f6782), -W64LIT(0x357b46d880c021ca), -W64LIT(0x6cc256c1283c15fa), -W64LIT(0xcfd302c715e5fc06), -W64LIT(0xbdf50c8d7e411714), -W64LIT(0x7cf1aacb6fa2db0b), -W64LIT(0x5240035ee56d8205), -W64LIT(0x7b60f8716da1c3fd), -W64LIT(0x01a5883edf4a4f6d), -W64LIT(0xdd5f1bb119efac2d), -W64LIT(0x5474d9da3824d59e), -W64LIT(0x0f722cbfdb4c7f74), -W64LIT(0x17a2aeb0459dd607), -W64LIT(0x37c4a3a4cb54bf10), -W64LIT(0xc21ecb04853d1da8), -W64LIT(0x4273ff54a2f34cf4), -W64LIT(0xdace490b1becb4db), -W64LIT(0x6af68c45f5754261), -W64LIT(0x46f8c0ac342e85b5), -W64LIT(0x854383966e59d770), -W64LIT(0x81c8bc6ef8841e31), -W64LIT(0x3bace25984c611d3), -W64LIT(0x1033fc0a479ecef1), -W64LIT(0x1c5bbdf7080c6032), -W64LIT(0x7412d4ceb6edbc89), -W64LIT(0xa8e8474170485fc9), -W64LIT(0xb8dbbb4b37d69138), -W64LIT(0x079152ba020318f6), -W64LIT(0x72260e4a6ba4eb12), -W64LIT(0x905ec85a60509fad), -W64LIT(0x2dabc4d71e1188b9), -W64LIT(0xd092d27289374d83), -W64LIT(0x610f9f02b8e4f454), -W64LIT(0x02bfe57c4b949eda), -W64LIT(0x95707f9c29c71981), -W64LIT(0x6fd83b83bce2c44d), -W64LIT(0x5d322fe13e21fd71), -W64LIT(0x34decee65f8a6ea7), -W64LIT(0xcd6ce7bb5e7162dc), -W64LIT(0xfb0dcc214a6f92a1), -W64LIT(0x2eb1a9958acf590e), -W64LIT(0xdcfa938fc6a5e340), -W64LIT(0x669ecdb8bae7eca2), -W64LIT(0x151d4bcc0e0948dd), -W64LIT(0xfd3916a59726c53a), -W64LIT(0x581c982777b67b5d), -W64LIT(0x1bcaef4d0a0f78c4), -W64LIT(0xdfe0fecd527b32f7), -W64LIT(0x128c19760c0a502b), -W64LIT(0x84e60ba8b113981d), -W64LIT(0x3c3db0e386c50925), -W64LIT(0x7febc789fb7c0abc), -W64LIT(0x7d5422f5b0e89466), -W64LIT(0xd70380c88b345575), -W64LIT(0xbbc1d609a308408f), -W64LIT(0xe278c6100bf474bf), -W64LIT(0x5e2842a3aaff2cc6), -W64LIT(0x6b53047b2a3f0d0c), -W64LIT(0xf7658ddc05fd3c62), -W64LIT(0x9a025323f28b66f5), -W64LIT(0x8c0575ad685cff9f), -W64LIT(0x76ad31b2fd792253), -W64LIT(0x68496939bee1dcbb), -W64LIT(0x7e4e4fb7243645d1), -W64LIT(0xe44c1c94d6bd2324), -W64LIT(0xbeef61cfea9fc6a3), -W64LIT(0x91fb4064bf1ad0c0), -W64LIT(0x052eb7c64997862c), -W64LIT(0x4a9081517bbc2b76), -W64LIT(0x8f1f18effc822e28), -W64LIT(0x3a096a675b8c5ebe), -W64LIT(0xee1087ed4466da7c), -W64LIT(0x2652d79053803e8c), -W64LIT(0x7099eb36203075c8), -W64LIT(0xc7307cc2ccaa9b84), -W64LIT(0x5c97a7dfe16bb21c), -W64LIT(0x50ffe622aef91cdf), -W64LIT(0x8da0fd93b716b0f2), -W64LIT(0x69ece10761ab93d6), -W64LIT(0x31f07920161de88b), -W64LIT(0x13299148d3401f46), -W64LIT(0x031a6d4294ded1b7), -W64LIT(0xccc96f85813b2db1), -W64LIT(0x14b8c3f2d14307b0), -W64LIT(0x8659eed4fa8706c7), -W64LIT(0xba645e377c420fe2), -W64LIT(0x2920fb2f88cc41f8), -W64LIT(0x87fc66ea25cd49aa), -W64LIT(0x1ee4588b4398fee8), -W64LIT(0xecaf62910ff244a6), -W64LIT(0xf817a163deb14316), -W64LIT(0x45e2adeea0f05402), -W64LIT(0x806d345027ce515c), -W64LIT(0x576eb498acfa0429), -W64LIT(0xa5258e82e090be67), -W64LIT(0x892bc26b21cb79b3), -W64LIT(0x6e7db3bd63a88b20), -W64LIT(0x4e1bbea9ed61e237), -W64LIT(0xadc6f08739dfd9e5), -W64LIT(0x8b9427176a5fe769), -W64LIT(0xa1aeb17a764d7726), -W64LIT(0x4b35096fa4f6641b), -W64LIT(0x22d9e868c55df7cd), -W64LIT(0x55d151e4e76e9af3), -W64LIT(0x966a12debd19c836), -W64LIT(0x0dcdc9c390d8e1ae), -W64LIT(0xf24b3a1a4c6aba4e), -W64LIT(0x24ed32ec1814a056), -W64LIT(0xaf7915fb724b473f), -W64LIT(0x2885731157860e95), -W64LIT(0x9c3689a72fc2316e), -W64LIT(0x475d4892eb64cad8), -W64LIT(0xac6378b9e6959688), -W64LIT(0xa00b3944a907384b), -W64LIT(0xc695f4fc13e0d4e9), -W64LIT(0x3055f11ec957a7e6), -W64LIT(0x6215f2402c3a25e3), -W64LIT(0xde4576f38d317d9a), -W64LIT(0x9344a518f48e4e1a), -W64LIT(0x82d2d12c6c5acf86), -W64LIT(0xefb50fd39b2c9511), -W64LIT(0xe981d5574665c28a), -W64LIT(0x5f8dca9d75b563ab), -W64LIT(0xb60c1fca33d0a121), -W64LIT(0xfe237be703f8148d), -W64LIT(0xd6a608f6547e1a18), -W64LIT(0xb97e3375e89cde55), -W64LIT(0xd388bf301de99c34), -W64LIT(0x5b06f565e368aaea), -W64LIT(0xf0f4df6607fe2494), -W64LIT(0x1607268e9ad7996a), -W64LIT(0xaedc9dc5ad010852), -W64LIT(0xe0c7236c4060ea65), -W64LIT(0xea9bb815d2bb133d), -W64LIT(0x888e4a55fe8136de), -W64LIT(0x5aa37d5b3c22e587), -W64LIT(0xc104a64611e3cc1f), -W64LIT(0x515a6e1c71b353b2), -W64LIT(0xc42a118058744a33), -W64LIT(0x7708b98c22336d3e), -W64LIT(0x2a3a966d1c12904f), -W64LIT(0x8a31af29b515a804), -W64LIT(0xed0aeaafd0b80bcb), -W64LIT(0x2c0e4ce9c15bc7d4), -W64LIT(0x0c6841fd4f92aec3), -W64LIT(0x98bdb65fb91ff82f), -W64LIT(0x1f41d0b59cd2b185), -W64LIT(0xb322a80c7a47270d), -W64LIT(0xe6f3f9e89d29bdfe), -W64LIT(0x7ac5704fb2eb8c90), -W64LIT(0xa94dcf7faf0210a4), -W64LIT(0x787a9533f97f124a), -W64LIT(0xdb6bc135c4a6fbb6), -W64LIT(0x048b3ff896ddc941), -W64LIT(0xe8245d69992f8de7), -W64LIT(0xe3dd4e2ed4be3bd2), -W64LIT(0xcafdb5015c727a2a), -W64LIT(0xb7a997f4ec9aee4c), -W64LIT(0xe75671d64263f293), -W64LIT(0x2b9f1e53c358df22), -W64LIT(0x18d0820f9ed1a973), -W64LIT(0xabf22a03e4968e7e), -W64LIT(0xa2b4dc38e293a691), -W64LIT(0x673b458665ada3cf), -W64LIT(0xf9b2295d01fb0c7b), -W64LIT(0xd22d370ec2a3d359), -W64LIT(0x97cf9ae06253875b), -W64LIT(0x0ed7a48104063019), -W64LIT(0x482f642d3028b5ac), -W64LIT(0xc0a12e78cea98372), -W64LIT(0x4fbe3697322bad5a), -W64LIT(0x19750a31419be61e), -W64LIT(0x41699216362d9d43), -W64LIT(0xd5bc65b4c0a0cbaf), -W64LIT(0xe5e994aa09f76c49), -W64LIT(0xeb3e302b0df15c50), -W64LIT(0x94d5f7a2f68d56ec), -W64LIT(0x53e58b603a27cd68), -W64LIT(0x3d9838dd598f4648), -W64LIT(0x60aa173c67aebb39), -W64LIT(0x1dfe35c9d7462f5f), -W64LIT(0x4ca45bd5a6f57ced), -W64LIT(0xbc5084b3a10b5879), -W64LIT(0xfaa8441f9525ddcc), -W64LIT(0x334f9c5c5d897651), -/* box 4 */ -W64LIT(0xda1687a883adf27e), -W64LIT(0xe35c9378578d9f22), -W64LIT(0x303ca4531637fa40), -W64LIT(0xa088321f74b20375), -W64LIT(0xc9863f3a9acb95e9), -W64LIT(0x5fcf47c57d0b0ed4), -W64LIT(0x4aa211e4e1280b4b), -W64LIT(0xe1a4c9ba871d1289), -W64LIT(0x4926664759f03a4f), -W64LIT(0xadfb36ede3707bca), -W64LIT(0xcf7bd1891f8ef7e1), -W64LIT(0x9735559e8f882792), -W64LIT(0x5932a976f84e6cdc), -W64LIT(0x9dc792bef547818a), -W64LIT(0x06fdeeb385456208), -W64LIT(0x46ad38771ea2cf5b), -W64LIT(0x5eb36aa41543b27b), -W64LIT(0x8b2eb33cd1bcb511), -W64LIT(0x71105ff6e598ebbc), -W64LIT(0x5441ad846f8c1463), -W64LIT(0x4c5fff57646d6943), -W64LIT(0xf3485c49f633c9b1), -W64LIT(0x9cbbbfdf9d0f3d25), -W64LIT(0x22d031a067192178), -W64LIT(0xca0248992213a4ed), -W64LIT(0x19627fb263a9c18f), -W64LIT(0x9330e1efda5dc831), -W64LIT(0x1390b89219666797), -W64LIT(0x2edf18339893e568), -W64LIT(0x6c779435d3e4c590), -W64LIT(0x53c06e568281cac4), -W64LIT(0x6ff3e3966b3cf494), -W64LIT(0xfe3b58bb61f1b10e), -W64LIT(0x77edb14560dd89b4), -W64LIT(0x02f85ac2d0908dab), -W64LIT(0x12ec95f3712edb38), -W64LIT(0x85d9c06dfea6fcaa), -W64LIT(0x90b4964c6285f935), -W64LIT(0xf1b0068b26a3441a), -W64LIT(0x729428555d40dab8), -W64LIT(0x5c4b3066c5d33fd0), -W64LIT(0x5d371d07ad9b837f), -W64LIT(0xa48d866e2167ecd6), -W64LIT(0xb661139d504937ee), -W64LIT(0xa27068dda4228ede), -W64LIT(0xf8c6b608e4b4d306), -W64LIT(0x6bf657e73ee91b37), -W64LIT(0xac871b8c8b38c765), -W64LIT(0x4ea7a595b4fde4e8), -W64LIT(0x0d7304f297c278bf), -W64LIT(0xb71d3efc38018b41), -W64LIT(0xae7f414e5ba84ace), -W64LIT(0xaf036c2f33e0f661), -W64LIT(0x0000000000000000), -W64LIT(0xb89660cc7f537e55), -W64LIT(0xa675dcacf1f7617d), -W64LIT(0x610490c74426bd2f), -W64LIT(0xc18ca2d83094be5a), -W64LIT(0x2adaac42cd460acb), -W64LIT(0x7d1f76651a122fac), -W64LIT(0xc58916a9654151f9), -W64LIT(0xedabe0297897d699), -W64LIT(0x2d5b6f90204bd46c), -W64LIT(0x26d585d132cccedb), -W64LIT(0x9f3fc87c25d70c21), -W64LIT(0xc60d610add9960fd), -W64LIT(0x80a0597dc33bafa6), -W64LIT(0xd0e44088f9625466), -W64LIT(0x1d67cbc3367c2e2c), -W64LIT(0x2c2742f1480368c3), -W64LIT(0x89d6e9fe012c38ba), -W64LIT(0xe9ae54582d42393a), -W64LIT(0x3ecbd702392db3fb), -W64LIT(0xb5e5643ee89106ea), -W64LIT(0xa882affddeed28c6), -W64LIT(0x1ae60811db71f08b), -W64LIT(0x924ccc8eb215749e), -W64LIT(0xfcc30279b1613ca5), -W64LIT(0x825803bf13ab220d), -W64LIT(0xd992f00b3b75c37a), -W64LIT(0xc8fa125bf2832946), -W64LIT(0x35453d432baaa94c), -W64LIT(0xf9ba9b698cfc6fa9), -W64LIT(0x37bd6781fb3a24e7), -W64LIT(0x791ac2144fc7c00f), -W64LIT(0x16e9218224fb349b), -W64LIT(0xdb6aaac9ebe54ed1), -W64LIT(0xd8eedd6a533d7fd5), -W64LIT(0x7c635b04725a9303), -W64LIT(0x553d80e507c4a8cc), -W64LIT(0x9a46516c184a5f2d), -W64LIT(0x14117b40f46bb930), -W64LIT(0x1ee3bc608ea41f28), -W64LIT(0x27a9a8b05a847274), -W64LIT(0x4050d6c49be7ad53), -W64LIT(0x7be298d69f574da4), -W64LIT(0x6a8a7a8656a1a798), -W64LIT(0x4d23d2360c25d5ec), -W64LIT(0x1014cf31a1be5693), -W64LIT(0xb264a7ec059cd84d), -W64LIT(0xea2a23fb959a083e), -W64LIT(0xf0cc2bea4eebf8b5), -W64LIT(0x76919c240895351b), -W64LIT(0x0b8eea4112871ab7), -W64LIT(0x47d1151676ea73f4), -W64LIT(0xbdeff9dc42ce2d59), -W64LIT(0x2ba68123a50eb664), -W64LIT(0x057999103d9d530c), -W64LIT(0xe759270902587081), -W64LIT(0xef53baeba8075b32), -W64LIT(0x4fdb88f4dcb55847), -W64LIT(0x6e8fcef70374483b), -W64LIT(0x1168e250c9f6ea3c), -W64LIT(0x1b9a2570b3394c24), -W64LIT(0x706c72978dd05713), -W64LIT(0x865db7ce467ecdae), -W64LIT(0x52bc4337eac9766b), -W64LIT(0x504419f53a59fbc0), -W64LIT(0x8f2b074d84695ab2), -W64LIT(0x6078bda62c6e0180), -W64LIT(0x43d4a167233f9c57), -W64LIT(0x0ef773512f1a49bb), -W64LIT(0x0c0f2993ff8ac410), -W64LIT(0x4bde3c858960b7e4), -W64LIT(0x66855315a92b6388), -W64LIT(0xd360372b41ba6562), -W64LIT(0x584e84179006d073), -W64LIT(0x9b3a7c0d7002e382), -W64LIT(0xa5f1ab0f492f5079), -W64LIT(0x2822f6801dd68760), -W64LIT(0x445562b5ce3242f0), -W64LIT(0xaa7af53f0e7da56d), -W64LIT(0x3c338dc0e9bd3e50), -W64LIT(0x3bb24e1204b0e0f7), -W64LIT(0xd59dd998c4ff076a), -W64LIT(0x91c8bb2d0acd459a), -W64LIT(0x84a5ed0c96ee4005), -W64LIT(0x33b8d3f0aeefcb44), -W64LIT(0x57c5da27d7542567), -W64LIT(0x32c4fe91c6a777eb), -W64LIT(0x3439102243e215e3), -W64LIT(0xc7714c6bb5d1dc52), -W64LIT(0x3fb7fa6351650f54), -W64LIT(0x87219aaf2e367101), -W64LIT(0xf5b5b2fa7376abb9), -W64LIT(0x412cfba5f3af11fc), -W64LIT(0xdceb691b06e89076), -W64LIT(0xbb12176fc78b4f51), -W64LIT(0x73e8053435086617), -W64LIT(0xe220be193fc5238d), -W64LIT(0xb09cfd2ed50c55e6), -W64LIT(0xb9ea4dad171bc2fa), -W64LIT(0x9e43e51d4d9fb08e), -W64LIT(0x36c14ae093729848), -W64LIT(0xa9fe829cb6a59469), -W64LIT(0x0405b47155d5efa3), -W64LIT(0x0af2c7207acfa618), -W64LIT(0x7e9b01c6a2ca1ea8), -W64LIT(0xdd97447a6ea02cd9), -W64LIT(0x0781c3d2ed0ddea7), -W64LIT(0x7866ef75278f7ca0), -W64LIT(0xd1986de9912ae8c9), -W64LIT(0xcb7e65f84a5b1842), -W64LIT(0xcd838b4bcf1e7a4a), -W64LIT(0xab06d85e663519c2), -W64LIT(0xd4e1f4f9acb7bbc5), -W64LIT(0xfdbf2f18d929800a), -W64LIT(0xf23471289e7b751e), -W64LIT(0xbc93d4bd2a8691f6), -W64LIT(0x3d4fa0a181f582ff), -W64LIT(0xba6e3a0eafc3f3fe), -W64LIT(0x5ab6ded540965dd8), -W64LIT(0xeb560e9afdd2b491), -W64LIT(0x0976b083c217971c), -W64LIT(0xecd7cd4810df6a36), -W64LIT(0x23ac1cc10f519dd7), -W64LIT(0xbe6b8e7ffa161c5d), -W64LIT(0x7fe72ca7ca82a207), -W64LIT(0xc0f08fb958dc02f5), -W64LIT(0x7a9eb5b7f71ff10b), -W64LIT(0xa709f1cd99bfddd2), -W64LIT(0x8dd35d8f54f9d719), -W64LIT(0x8caf70ee3cb16bb6), -W64LIT(0xe4dd50aaba804185), -W64LIT(0x83242ede7be39ea2), -W64LIT(0x98be0baec8dad286), -W64LIT(0x690e0d25ee79969c), -W64LIT(0x95cd0f5c5f18aa39), -W64LIT(0x56b9f746bf1c99c8), -W64LIT(0x7469c6e6d805b8b0), -W64LIT(0x8a529e5db9f409be), -W64LIT(0xe6250a686a10cc2e), -W64LIT(0x2fa33552f0db59c7), -W64LIT(0x42a88c064b7720f8), -W64LIT(0x6d0bb954bbac793f), -W64LIT(0x181e52d30be17d20), -W64LIT(0xbf17a31e925ea0f2), -W64LIT(0x94b1223d37501696), -W64LIT(0xe8d27939450a8595), -W64LIT(0xccffa62aa756c6e5), -W64LIT(0x383639b1bc68d1f3), -W64LIT(0xee2f978ac04fe79d), -W64LIT(0xa30c45bccc6a3271), -W64LIT(0x1f9f9101e6eca387), -W64LIT(0xb1e0d04fbd44e949), -W64LIT(0x242ddf13e25c4370), -W64LIT(0x156d56219c23059f), -W64LIT(0x88aac49f69648415), -W64LIT(0x6280e764fcfe8c2b), -W64LIT(0xdf6f1eb8be30a172), -W64LIT(0xe5a17dcbd2c8fd2a), -W64LIT(0xe0d8e4dbef55ae26), -W64LIT(0x63fcca0594b63084), -W64LIT(0xa1f41f7e1cfabfda), -W64LIT(0x295edbe1759e3bcf), -W64LIT(0x67f97e74c163df27), -W64LIT(0x038477a3b8d83104), -W64LIT(0xde1333d9d6781ddd), -W64LIT(0x3ace63736cf85c58), -W64LIT(0xd619ae3b7c27366e), -W64LIT(0x5bcaf3b428dee177), -W64LIT(0xb3188a8d6dd464e2), -W64LIT(0x1c1be6a25e349283), -W64LIT(0x017c2d616848bcaf), -W64LIT(0x8e572a2cec21e61d), -W64LIT(0xf631c559cbae9abd), -W64LIT(0x81dc741cab731309), -W64LIT(0xff4775da09b90da1), -W64LIT(0xb499495f80d9ba45), -W64LIT(0x0f8b5e304752f514), -W64LIT(0x394a14d0d4206d5c), -W64LIT(0xce07fce877c64b4e), -W64LIT(0xf4c99f9b1b3e1716), -W64LIT(0xc4f53bc80d09ed56), -W64LIT(0xc208d57b884c8f5e), -W64LIT(0x080a9de2aa5f2bb3), -W64LIT(0x314089327e7f46ef), -W64LIT(0xfa3eecca34245ead), -W64LIT(0x20286b62b789acd3), -W64LIT(0x7515eb87b04d041f), -W64LIT(0x513834945211476f), -W64LIT(0x650124b611f3528c), -W64LIT(0x17950ce34cb38834), -W64LIT(0x45294fd4a67afe5f), -W64LIT(0x21544603dfc1107c), -W64LIT(0x485a4b2631b886e0), -W64LIT(0x6872204486312a33), -W64LIT(0x647d09d779bbee23), -W64LIT(0x2551f2728a14ffdf), -W64LIT(0xd765835a146f8ac1), -W64LIT(0xd21c1a4a29f2d9cd), -W64LIT(0x99c226cfa0926e29), -W64LIT(0xfb42c1ab5c6ce202), -W64LIT(0xc374f81ae00433f1), -W64LIT(0x964978ffe7c09b3d), -W64LIT(0xf74de838a3e62612), -/* box 5 */ -W64LIT(0x74b87b36b0592c6a), -W64LIT(0x3d82d75dffb4b81c), -W64LIT(0x8884246715267825), -W64LIT(0xdaf2d8a77ed4e5de), -W64LIT(0xfeb118650e53f9c7), -W64LIT(0xbd2d1aea59226b06), -W64LIT(0x26ce87f6dbabb191), -W64LIT(0x32772ecbeb66bd0a), -W64LIT(0xd4bbf82bc5104c8c), -W64LIT(0x055357720c4e03a1), -W64LIT(0xef5be62a32d0f6fd), -W64LIT(0xbe1c84c45d186aca), -W64LIT(0xacc7e4a565a1643c), -W64LIT(0x8dd7731519687b84), -W64LIT(0x11eafe4f3c830f3a), -W64LIT(0x04ef8e68a358afe5), -W64LIT(0x40ad9ca1534b930d), -W64LIT(0xe44191d4855a5c0e), -W64LIT(0x6001d20b809420f1), -W64LIT(0x73666b70173b8243), -W64LIT(0x372479b9e728beab), -W64LIT(0x45fecbd35f0590ac), -W64LIT(0x7057f55e1301838f), -W64LIT(0xff0dc17fa1455583), -W64LIT(0x0cc467b810e804da), -W64LIT(0xb9c29482fa7ac4e3), -W64LIT(0xa003831d754960e6), -W64LIT(0x8a096353be0ad5ad), -W64LIT(0xdd2cc8e1d9b64bf7), -W64LIT(0xc7dc415052bfee3e), -W64LIT(0x9f0c137421d17572), -W64LIT(0x35a93e8d4c041323), -W64LIT(0x9a5f44062d9f76d3), -W64LIT(0x71eb2c44bc172fcb), -W64LIT(0x0ff5f99614d20516), -W64LIT(0x7789e518b4632da6), -W64LIT(0xc99561dce97b476c), -W64LIT(0x5276fcc06bf29dfb), -W64LIT(0x4a0b32454bd795ba), -W64LIT(0x9274add69e2fddec), -W64LIT(0x4f5865374799961b), -W64LIT(0xb2d8e37c4df06e10), -W64LIT(0xc4eddf7e5685eff2), -W64LIT(0xb3643a66e2e6c254), -W64LIT(0xd50721316a06e0c8), -W64LIT(0x8bb5ba49111c79e9), -W64LIT(0x2bb639546455190f), -W64LIT(0xf8d3d1390627fbaa), -W64LIT(0x38d1802ff3fabbbd), -W64LIT(0xdfa18fd5729ae67f), -W64LIT(0x4ee4bc2de88f3a5f), -W64LIT(0xf72628af12f5febc), -W64LIT(0x0aa6aee4189c06b7), -W64LIT(0x0000000000000000), -W64LIT(0x9eb0ca6e8ec7d936), -W64LIT(0xcb1826e84257eae4), -W64LIT(0x187dce8520250841), -W64LIT(0xc28f16225ef1ed9f), -W64LIT(0xc333cf38f1e741db), -W64LIT(0x4220db95f8673e85), -W64LIT(0xdc9011fb76a0e7b3), -W64LIT(0x105627559395a37e), -W64LIT(0x2f59b73cc70db6ea), -W64LIT(0xe112c6a689145faf), -W64LIT(0x82228a830dba7e92), -W64LIT(0x2ee56e26681b1aae), -W64LIT(0x2a0ae04ecb43b54b), -W64LIT(0x47738ce7f4293d24), -W64LIT(0xa7dd935bd22bcecf), -W64LIT(0xd2d93177cd644ee1), -W64LIT(0xebb4684291885918), -W64LIT(0x0e49208cbbc4a952), -W64LIT(0xa550d46f79076347), -W64LIT(0x411145bbfc5d3f49), -W64LIT(0xe6ccd6e02e76f186), -W64LIT(0x4bb7eb5fe4c139fe), -W64LIT(0x5d8305567f2098ed), -W64LIT(0x95aabd90394d73c5), -W64LIT(0x25ff19d8df91b05d), -W64LIT(0x86cd04ebaee2d177), -W64LIT(0x03319e2e043a01cc), -W64LIT(0x6b1ba5f5371e8a02), -W64LIT(0x76353c021b7581e2), -W64LIT(0x64ee5c6323cc8f14), -W64LIT(0x5c3fdc4cd03634a9), -W64LIT(0x6996e2c19c32278a), -W64LIT(0x8938fd7dba30d461), -W64LIT(0x7b4d82a0a48b297c), -W64LIT(0xbfa05ddef20ec68e), -W64LIT(0x8ee6ed3b1d527a48), -W64LIT(0x61bd0b112f828cb5), -W64LIT(0x66631b5788e0229c), -W64LIT(0x55a8ec86cc9033d2), -W64LIT(0x1c9240ed837da7a4), -W64LIT(0x150570279fdba0df), -W64LIT(0x53ca25dac4e431bf), -W64LIT(0xd636bf1f6e3ce104), -W64LIT(0xcaa4fff2ed4146a0), -W64LIT(0x787c1c8ea0b128b0), -W64LIT(0xad7b3dbfcab7c878), -W64LIT(0xfc3c5f51a57f544f), -W64LIT(0xb78bb40e41be6db1), -W64LIT(0x8c6baa0fb67ed7c0), -W64LIT(0xce4b719a4e19e945), -W64LIT(0xf96f0823a93157ee), -W64LIT(0x7d2f4bfcacff2b11), -W64LIT(0x3eb34973fb8eb9d0), -W64LIT(0xe39f81922238f227), -W64LIT(0x239dd084d7e5b230), -W64LIT(0x1fa3dec38747a668), -W64LIT(0xc5510664f99343b6), -W64LIT(0xc829b8c6466deb28), -W64LIT(0x85fc9ac5aad8d0bb), -W64LIT(0xb6376d14eea8c1f5), -W64LIT(0x9d8154408afdd8fa), -W64LIT(0x3be01e01f7c0ba71), -W64LIT(0x628c953f2bb88d79), -W64LIT(0x6d796ca93f6a886f), -W64LIT(0xfa5e960dad0b5622), -W64LIT(0xe5fd48ce2a4cf04a), -W64LIT(0xe7700ffa81605dc2), -W64LIT(0x2dd4f0086c211b62), -W64LIT(0x2221099e78f31e74), -W64LIT(0xdb4e01bdd1c2499a), -W64LIT(0xf417b68116cfff70), -W64LIT(0xb506f33aea92c039), -W64LIT(0x514762ee6fc89c37), -W64LIT(0x9c3d8d5a25eb74be), -W64LIT(0x396d59355cec17f9), -W64LIT(0xccc636aee53544cd), -W64LIT(0x0b1a77feb78aaaf3), -W64LIT(0xe9392f763aa4f490), -W64LIT(0xaaa52df96dd56651), -W64LIT(0x46cf55fd5b3f9160), -W64LIT(0xa4ec0d75d611cf03), -W64LIT(0xaff67a8b619b65f0), -W64LIT(0x3415e797e312bf67), -W64LIT(0x7af15bba0b9d8538), -W64LIT(0x811314ad09807f5e), -W64LIT(0x8771ddf101f47d33), -W64LIT(0x969b23be3d777209), -W64LIT(0xd365e86d6272e2a5), -W64LIT(0x58d05224736e9b4c), -W64LIT(0xc660984afda9427a), -W64LIT(0x5414359c63869f96), -W64LIT(0xe885f66c95b258d4), -W64LIT(0x655285798cda2350), -W64LIT(0x6cc5b5b3907c242b), -W64LIT(0x6ff42b9d944625e7), -W64LIT(0xc0025116f5dd4017), -W64LIT(0xa28ec429de65cd6e), -W64LIT(0x63304c2584ae213d), -W64LIT(0x7fa20cc807d38699), -W64LIT(0x996eda2829a5771f), -W64LIT(0x1b4c50ab241f098d), -W64LIT(0x1e1f07d928510a2c), -W64LIT(0x33cbf7d14470114e), -W64LIT(0xb055a448e6dcc398), -W64LIT(0x98d2033286b3db5b), -W64LIT(0xec6a780436eaf731), -W64LIT(0xa1bf5a07da5fcca2), -W64LIT(0xbaf30aacfe40c52f), -W64LIT(0xf144e1f31a81fcd1), -W64LIT(0xe0ae1fbc2602f3eb), -W64LIT(0x14b9a93d30cd0c9b), -W64LIT(0x596c8b3edc783708), -W64LIT(0x682a3bdb33248bce), -W64LIT(0xb87e4d98556c68a7), -W64LIT(0x80afcdb7a696d31a), -W64LIT(0x5725abb267bc9e5a), -W64LIT(0x914533f89a15dc20), -W64LIT(0x5eb29b787b1a9921), -W64LIT(0x01bcd91aaf16ac44), -W64LIT(0xc1be880c5acbec53), -W64LIT(0xedd6a11e99fc5b75), -W64LIT(0x028d4734ab2cad88), -W64LIT(0x8f5a3421b244d60c), -W64LIT(0x4dd52203ecb53b93), -W64LIT(0x3f0f906954981594), -W64LIT(0xae4aa391ce8dc9b4), -W64LIT(0x3698a0a3483e12ef), -W64LIT(0xf5ab6f9bb9d95334), -W64LIT(0x082be9d0b3b0ab3f), -W64LIT(0xd1e8af59c95e4f2d), -W64LIT(0xd87f9f93d5f84856), -W64LIT(0x6e48f2873b5089a3), -W64LIT(0x2443c0c270871c19), -W64LIT(0xb1e97d5249ca6fdc), -W64LIT(0x7c9392e603e98755), -W64LIT(0x839e5399a2acd2d6), -W64LIT(0x19c1179f8f33a405), -W64LIT(0xde1d56cfdd8c4a3b), -W64LIT(0x20ac4eaad3dfb3fc), -W64LIT(0x1af089b18b09a5c9), -W64LIT(0x3a5cc71b58d61635), -W64LIT(0x444212c9f0133ce8), -W64LIT(0x72dab26ab82d2e07), -W64LIT(0x4c69fb1943a397d7), -W64LIT(0xf3c9a6c7b1ad5159), -W64LIT(0x1d2e99f72c6b0be0), -W64LIT(0xb4ba2a2045846c7d), -W64LIT(0xe22358888d2e5e63), -W64LIT(0x2887a77a606f18c3), -W64LIT(0xa8286acdc6f9cbd9), -W64LIT(0x5f0e4262d40c3565), -W64LIT(0xeee73f309dc65ab9), -W64LIT(0x9be39d1c8289da97), -W64LIT(0x1634ee099be1a113), -W64LIT(0xea08b1583e9ef55c), -W64LIT(0x9727faa49261de4d), -W64LIT(0x2c682912c337b726), -W64LIT(0xcff7a880e10f4501), -W64LIT(0x1788371334f70d57), -W64LIT(0x27725eec74bd1dd5), -W64LIT(0x3146b0e5ef5cbcc6), -W64LIT(0x099730ca1ca6077b), -W64LIT(0xf2757fdd1ebbfd1d), -W64LIT(0x6aa77cef98082646), -W64LIT(0xbb4fd3b65156696b), -W64LIT(0x569972a8c8aa321e), -W64LIT(0xa3321d337173612a), -W64LIT(0x50fbbbf4c0de3073), -W64LIT(0x5a5d1510d84236c4), -W64LIT(0xfd80864b0a69f80b), -W64LIT(0x07de1046a762ae29), -W64LIT(0xa6614a417d3d628b), -W64LIT(0xd78a6605c12a4d40), -W64LIT(0x67dfc24d27f68ed8), -W64LIT(0xbc91c3f0f634c742), -W64LIT(0xd05476436648e369), -W64LIT(0x493aac6b4fed9476), -W64LIT(0x12db606138b90ef6), -W64LIT(0xa994b3d769ef679d), -W64LIT(0x211097b07cc91fb8), -W64LIT(0x30fa69ff404a1082), -W64LIT(0x3c3e0e4750a21458), -W64LIT(0x7504a22c1f4f802e), -W64LIT(0x844043df05ce7cff), -W64LIT(0xf0f838e9b5975095), -W64LIT(0x7e1ed5d2a8c52add), -W64LIT(0x90f9eae235037064), -W64LIT(0x0662c95c0874026d), -W64LIT(0x9416648a965bdf81), -W64LIT(0xf69af1b5bde352f8), -W64LIT(0x0d78bea2bffea89e), -W64LIT(0x293b7e60cf79b487), -W64LIT(0xd9c346897aeee412), -W64LIT(0xfbe24f17021dfa66), -W64LIT(0x1367b97b97afa2b2), -W64LIT(0xab19f4e3c2c3ca15), -W64LIT(0x48867571e0fb3832), -W64LIT(0x93c874cc313971a8), -W64LIT(0x79c0c5940fa784f4), -W64LIT(0xcd7aefb44a23e889), -W64LIT(0x439c028f577192c1), -W64LIT(0x5be1cc0a77549a80), -/* box 6 */ -W64LIT(0x714d28d778656928), -W64LIT(0xc88a7c6b84f64f7c), -W64LIT(0xec43cac5ab89aaca), -W64LIT(0x777fa38110dc16a3), -W64LIT(0x0f7d5c87e4213b5c), -W64LIT(0x73f051e5f3a1ef51), -W64LIT(0xea714193c330d541), -W64LIT(0x95e5f3dae016c4f3), -W64LIT(0x63d3738095a0e173), -W64LIT(0x9825d66f8ff379d6), -W64LIT(0xe8cc38a148f45338), -W64LIT(0xa840b0c025f06bb0), -W64LIT(0x944135c35f748735), -W64LIT(0x74661caa247ad31c), -W64LIT(0xe7b16426acd56864), -W64LIT(0xd1e689df6e6f0589), -W64LIT(0xa73dec47c1d150ec), -W64LIT(0x64453ecf427bdd3e), -W64LIT(0x0ed99a9e5b43789a), -W64LIT(0x7b1b402dc05be840), -W64LIT(0x0dc025b56fe5bd25), -W64LIT(0x3f183a284e22293a), -W64LIT(0xa0aba108160a6ca1), -W64LIT(0x46be033705bd4703), -W64LIT(0x86df6e94b2b10f6e), -W64LIT(0xa216d83a9dceead8), -W64LIT(0x129e5b57edc5885b), -W64LIT(0x7e3074509c445274), -W64LIT(0x7d29cb7ba8e297cb), -W64LIT(0x1611a9330eb871a9), -W64LIT(0x486799a95efe3f99), -W64LIT(0x9fb39b205828459b), -W64LIT(0xd0424fc6d10d464f), -W64LIT(0xe968feb8f79610fe), -W64LIT(0x5d6f8fb164e08b8f), -W64LIT(0xaafdc9f2ae34edc9), -W64LIT(0x02bd79328bc48679), -W64LIT(0x9b3c6944bb55bc69), -W64LIT(0x6277b5992ac2a2b5), -W64LIT(0x877ba88d0dd34ca8), -W64LIT(0xfa5263f6a531db63), -W64LIT(0x2e9fde54974164de), -W64LIT(0xcda14816d8e9f548), -W64LIT(0x675c81e476dd1881), -W64LIT(0x2a102c30743c9d2c), -W64LIT(0x37f32be07dd82e2b), -W64LIT(0x256d70b7901da670), -W64LIT(0x4ce86bcdbd83c66b), -W64LIT(0x50afaa040b0536aa), -W64LIT(0xef5a75ee9f2f6f75), -W64LIT(0xb3913c4644ada73c), -W64LIT(0x1187e47cd9634de4), -W64LIT(0xc54a59deeb13f259), -W64LIT(0x0000000000000000), -W64LIT(0x01a4c619bf6243c6), -W64LIT(0x90cec7a7bc097ec7), -W64LIT(0xf94bdcdd91971edc), -W64LIT(0x8e347f5c814b087f), -W64LIT(0xc7f720ec60d77420), -W64LIT(0x354e52d2f61ca852), -W64LIT(0x34ea94cb497eeb94), -W64LIT(0xae723b964d49143b), -W64LIT(0xf48bf968fe72a3f9), -W64LIT(0xfc60e8a0cd88a4e8), -W64LIT(0x2909931b409a5893), -W64LIT(0xbd48a6d81feedfa6), -W64LIT(0x6cae2f077181da2f), -W64LIT(0xad6b84bd79efd184), -W64LIT(0x18c833ad55fb0933), -W64LIT(0x204644cacc021c44), -W64LIT(0x392ab17e269b56b1), -W64LIT(0x14acd001857cf7d0), -W64LIT(0x8abb8d386236f18d), -W64LIT(0xeefeb3f7204d2cb3), -W64LIT(0xf636805a75b62580), -W64LIT(0x2bb4ea29cb5edeea), -W64LIT(0xc653e6f5dfb537e6), -W64LIT(0x8d2dc077b5edcdc0), -W64LIT(0x31c1a0b6156151a0), -W64LIT(0xf8ef1ac42ef55d1a), -W64LIT(0xdbb0e125d65184e1), -W64LIT(0x82509cf051ccf69c), -W64LIT(0xe33e96424fa89196), -W64LIT(0xdf3f1341352c7d13), -W64LIT(0x8f90b9453e294bb9), -W64LIT(0x1023226566010e22), -W64LIT(0xa58095754a15d695), -W64LIT(0x2c22a7661c85e2a7), -W64LIT(0xe183ef70c46c17ef), -W64LIT(0xafd6fd8ff22b57fd), -W64LIT(0x471ac52ebadf04c5), -W64LIT(0x4d4cadd402e185ad), -W64LIT(0x916a01be036b3d01), -W64LIT(0x28ad5502fff81b55), -W64LIT(0x3657edf9c2ba6ded), -W64LIT(0xd2ff36f45ac9c036), -W64LIT(0xf1a0cd15a26d19cd), -W64LIT(0xd90d98175d950298), -W64LIT(0xf7924643cad46646), -W64LIT(0xdd826a73bee8fb6a), -W64LIT(0x9d0ee212d3ecc3e2), -W64LIT(0xb6ba083b18b21d08), -W64LIT(0x3da5431ac5e6af43), -W64LIT(0x08eb11c833fa0711), -W64LIT(0x052b347d5c1fba34), -W64LIT(0x6fb7902c45271f90), -W64LIT(0x133a9d4e52a7cb9d), -W64LIT(0x6e135635fa455c56), -W64LIT(0x725497fc4cc3ac97), -W64LIT(0xf31db42729a99fb4), -W64LIT(0x846217a639758917), -W64LIT(0x4b7e26826a58fa26), -W64LIT(0x235ffbe1f8a4d9fb), -W64LIT(0xff79578bf92e6157), -W64LIT(0xda14273c6933c727), -W64LIT(0x8b1f4b21dd54b24b), -W64LIT(0x9caa240b6c8e8024), -W64LIT(0xc1c5abba086e0bab), -W64LIT(0xde9bd5588a4e3ed5), -W64LIT(0x2d86617fa3e7a161), -W64LIT(0xbff5dfea942a59df), -W64LIT(0x66f847fdc9bf5b47), -W64LIT(0x3b97c84cad5fd0c8), -W64LIT(0x3ebcfc31f1406afc), -W64LIT(0xca3705590f32c905), -W64LIT(0x24c9b6ae2f7fe5b6), -W64LIT(0x408c88616d043888), -W64LIT(0x93d7788c88afbb78), -W64LIT(0x196cf5b4ea994af5), -W64LIT(0x9a98af5d0437ffaf), -W64LIT(0x8c89066e0a8f8e06), -W64LIT(0xab590feb1156ae0f), -W64LIT(0xd7d4028906d67a02), -W64LIT(0xe4a8db0d9873addb), -W64LIT(0xc378d28883aa8dd2), -W64LIT(0x4ff1d4e6892503d4), -W64LIT(0xd670c490b9b439c4), -W64LIT(0x65e1f8d6fd199ef8), -W64LIT(0xf2b9723e96cbdc72), -W64LIT(0xb12c4574cf692145), -W64LIT(0x569d215263bc4921), -W64LIT(0x69851b7a2d9e601b), -W64LIT(0x5e76309a50464e30), -W64LIT(0x5fd2f683ef240df6), -W64LIT(0xd8a95e0ee2f7415e), -W64LIT(0xe29a505bf0cad250), -W64LIT(0x96fc4cf1d4b0014c), -W64LIT(0x8806f40ae9f277f4), -W64LIT(0x53b6152f3fa3f315), -W64LIT(0x1c47c1c9b686f0c1), -W64LIT(0x80ede5c2da0870e5), -W64LIT(0xd5697bbb8d12fc7b), -W64LIT(0xfdc42eb972eae72e), -W64LIT(0x0bf2aee3075cc2ae), -W64LIT(0x22fb3df847c69a3d), -W64LIT(0xbadeeb97c835e3eb), -W64LIT(0xdc26ac6a018ab8ac), -W64LIT(0xbcec60c1a08c9c60), -W64LIT(0x4231f153e6c0bef1), -W64LIT(0x337cd9849ea5d7d9), -W64LIT(0x5b5d04e70c59f404), -W64LIT(0x79a6391f4b9f6e39), -W64LIT(0x5212d33680c1b0d3), -W64LIT(0xb5a3b7102c14d8b7), -W64LIT(0x7f94b249232611b2), -W64LIT(0x17b56f2ab1da326f), -W64LIT(0x59e07dd5879d727d), -W64LIT(0xebd5878a7c529687), -W64LIT(0xbb7a2d8e7757a02d), -W64LIT(0x0319bf2b34a6c5bf), -W64LIT(0x5ccb49a8db82c849), -W64LIT(0x1de307d009e4b307), -W64LIT(0x49c35fb0e19c7c5f), -W64LIT(0x55849e79571a8c9e), -W64LIT(0x7abf86347f39ab86), -W64LIT(0x9273be9537cdf8be), -W64LIT(0xe615a23f13b72ba2), -W64LIT(0x6821dd6392fc23dd), -W64LIT(0x5af9c2feb33bb7c2), -W64LIT(0x06328b5668b97f8b), -W64LIT(0x44037a058e79c17a), -W64LIT(0x83f45ae9eeaeb55a), -W64LIT(0x5739e74bdcde0ae7), -W64LIT(0xfbf6a5ef1a5398a5), -W64LIT(0xe50c1d142711ee1d), -W64LIT(0x1a754a9fde3f8f4a), -W64LIT(0x7802ff06f4fd2dff), -W64LIT(0xf52f3f714110e03f), -W64LIT(0x2674cf9ca4bb63cf), -W64LIT(0x60caccaba10624cc), -W64LIT(0xb088836d700b6283), -W64LIT(0xa6992a5e7eb3132a), -W64LIT(0xa9e476d99a922876), -W64LIT(0x6b386248a65ae662), -W64LIT(0xc2dc14913cc8ce14), -W64LIT(0x76db6598afbe5565), -W64LIT(0x32d81f9d21c7941f), -W64LIT(0x21e282d373605f82), -W64LIT(0xc0616da3b70c486d), -W64LIT(0x616e0ab21e64670a), -W64LIT(0x6d0ae91ecee399e9), -W64LIT(0x27d009851bd92009), -W64LIT(0xfedd9192464c2291), -W64LIT(0x45a7bc1c311b82bc), -W64LIT(0x54205860e878cf58), -W64LIT(0xa10f6711a9682f67), -W64LIT(0x9981107630913a10), -W64LIT(0xede70cdc14ebe90c), -W64LIT(0x70e9eecec7072aee), -W64LIT(0x1f5e7ee28220357e), -W64LIT(0x2f3b184d28232718), -W64LIT(0x41284e78d2667b4e), -W64LIT(0xa424536cf5779553), -W64LIT(0xa3b21e2322aca91e), -W64LIT(0x4e5512ff36474012), -W64LIT(0x1efab8fb3d4276b8), -W64LIT(0x89a2321356903432), -W64LIT(0xcb93c340b0508ac3), -W64LIT(0x306566afaa031266), -W64LIT(0x4adae09bd53ab9e0), -W64LIT(0xc92eba723b940cba), -W64LIT(0x094fd7d18c9844d7), -W64LIT(0xcc058e0f678bb68e), -W64LIT(0xd4cdbda23270bfbd), -W64LIT(0x0a5668fab83e8168), -W64LIT(0x510b6c1db467756c), -W64LIT(0xb86392a543f16592), -W64LIT(0x048ff264e37df9f2), -W64LIT(0x3a330e55123d930e), -W64LIT(0xb235fa5ffbcfe4fa), -W64LIT(0xb9c754bcfc932654), -W64LIT(0x3c0185037a84ec85), -W64LIT(0x0c64e3acd087fee3), -W64LIT(0xe02729697b0e5429), -W64LIT(0x07964d4fd7db3c4d), -W64LIT(0x814923db656a3323), -W64LIT(0x388e776799f91577), -W64LIT(0x6a9ca4511938a5a4), -W64LIT(0x1bd18c86615dcc8c), -W64LIT(0xb407710993769b71), -W64LIT(0x150816183a1eb416), -W64LIT(0x4395374a59a2fd37), -W64LIT(0xc4ee9fc75471b19f), -W64LIT(0x5844bbcc38ff31bb), -W64LIT(0xcf1c3124532d7331), -W64LIT(0xb71ece22a7d05ece), -W64LIT(0xaccf42a4c68d9242), -W64LIT(0x97588ae86bd2428a), -W64LIT(0x75c2dab39b1890da), -W64LIT(0x9e175d39e74a065d), -W64LIT(0xf0040b0c1d0f5a0b), -W64LIT(0xceb8f73dec4f30f7), -W64LIT(0xbe5119f32b481a19), -W64LIT(0xd35bf0ede5ab83f0), -W64LIT(0x7c8d0d621780d40d), -W64LIT(0x85c6d1bf8617cad1), -/* box 7 */ -W64LIT(0xb1c742127b66f2a4), -W64LIT(0xce916098d7a59fc1), -W64LIT(0xc312ef8e2406fa70), -W64LIT(0x956c7dced81403d5), -W64LIT(0x5a0c9b2318dd9520), -W64LIT(0xad0d57f51a480e8b), -W64LIT(0xe7b9d05287740b01), -W64LIT(0x0217f9ea2ed81268), -W64LIT(0x4d7cff19f8cd3a06), -W64LIT(0x44d1772e572b7b67), -W64LIT(0xfb73c5b5e65af72e), -W64LIT(0x91427aef84512705), -W64LIT(0x0c720963e4cf6c85), -W64LIT(0x87c398a0732d8117), -W64LIT(0xa17f5e96fe87620e), -W64LIT(0x50476c8b8e8fcf1d), -W64LIT(0xcb4ee1cc9c8cb225), -W64LIT(0x67b2304c91a8b59a), -W64LIT(0x54696baad2caebcd), -W64LIT(0xddcf03836bf01437), -W64LIT(0x46c68ec479f3690f), -W64LIT(0x8f9f96e2cba7c942), -W64LIT(0xe1802e99f5e93db9), -W64LIT(0x4e9a8086c179215a), -W64LIT(0xf0c9b4686764a427), -W64LIT(0xfd4a3b7e94c7c196), -W64LIT(0xfcbbbd0b83abc8a2), -W64LIT(0xebcbd93163bb6784), -W64LIT(0xf9643c5fc882e546), -W64LIT(0xc4da973041f7c5fc), -W64LIT(0x1af3eb2c13b3ca97), -W64LIT(0x6e1fb87b3e4ef4fb), -W64LIT(0x5e229c024498b1f0), -W64LIT(0xf516353c2c4d89c3), -W64LIT(0xcc869972f97d8da9), -W64LIT(0x8d886f08e57fdb2a), -W64LIT(0x1cca15e7612efc2f), -W64LIT(0x567e9240fc12f9a5), -W64LIT(0x43190f9032da44eb), -W64LIT(0xfeac44e1ad73daca), -W64LIT(0x07c878be65f13f8c), -W64LIT(0x618bce87e3358322), -W64LIT(0xf895ba2adfeeec72), -W64LIT(0x751dd5223a913758), -W64LIT(0x59eae4bc21698e7c), -W64LIT(0xff5dc294ba1fd3fe), -W64LIT(0x03e67f9f39b41b5c), -W64LIT(0x2292c117d1efc7c9), -W64LIT(0x8a4017b6808ee4a6), -W64LIT(0xd1bd0ae08f3f78b2), -W64LIT(0x135e631bbc558bf6), -W64LIT(0xee14586528924a60), -W64LIT(0x8857ee5cae56f6ce), -W64LIT(0x0000000000000000), -W64LIT(0x0e65f089ca177eed), -W64LIT(0x34132358269361db), -W64LIT(0x15679dd0cec8bd4e), -W64LIT(0x800be01e16dcbe9b), -W64LIT(0x949dfbbbcf780ae1), -W64LIT(0xe397d773db312fd1), -W64LIT(0xedf227fa1126513c), -W64LIT(0xb5e945332723d674), -W64LIT(0x53a11314b73bd441), -W64LIT(0x23634762c683cefd), -W64LIT(0x4b4501d28a500cbe), -W64LIT(0x473708b16e9f603b), -W64LIT(0x1770643ae010af26), -W64LIT(0xa746a05d8c1a54b6), -W64LIT(0x90b3fc9a933d2e31), -W64LIT(0x35e2a52d31ff68ef), -W64LIT(0xab34a93e68d53833), -W64LIT(0xd81082d720d939d3), -W64LIT(0xb86aca25d480b3c5), -W64LIT(0xdfd8fa694528065f), -W64LIT(0x4f6b06f3d615286e), -W64LIT(0x578f1435eb7ef091), -W64LIT(0x9af80b32056f740c), -W64LIT(0x92a40570bde53c59), -W64LIT(0xdbf6fd48196d228f), -W64LIT(0x1b026d5904dfc3a3), -W64LIT(0x3c4f2d1a9e19298e), -W64LIT(0xc8a89e53a538a979), -W64LIT(0x991e74ad3cdb6f50), -W64LIT(0x042e07215c4524d0), -W64LIT(0x8e6e1097dccbc076), -W64LIT(0xe071a8ece285348d), -W64LIT(0xd784f42bfda24e0a), -W64LIT(0x7d41db60821b7f0d), -W64LIT(0x85d4614a5df5937f), -W64LIT(0xbb8cb5baed34a899), -W64LIT(0x40ff700f0b6e5fb7), -W64LIT(0x2cf7319e1bf8b924), -W64LIT(0x3a76d3d1ec841f36), -W64LIT(0x4520f15b40477253), -W64LIT(0xf138321d7008ad13), -W64LIT(0x42e889e525b64ddf), -W64LIT(0x65a5c9a6bf70a7f2), -W64LIT(0x208538fdff37d5a1), -W64LIT(0x410ef67a1c025683), -W64LIT(0x18e412c63d6bd8ff), -W64LIT(0x72d5ad9c5f6008d4), -W64LIT(0x255ab9a9b41ef845), -W64LIT(0x93558305aa89356d), -W64LIT(0x70c2547671b81abc), -W64LIT(0x3604dab2084b73b3), -W64LIT(0x05df81544b292de4), -W64LIT(0xf2de4d8249bcb64f), -W64LIT(0x0bba71dd813e5309), -W64LIT(0xa368a77cd05f7066), -W64LIT(0x796fdc41de5e5bdd), -W64LIT(0xec03a18f064a5808), -W64LIT(0x085c0e42b88a4855), -W64LIT(0x274d40439ac6ea2d), -W64LIT(0x31cca20c6dba4c3f), -W64LIT(0x322add93540e5763), -W64LIT(0xb60f3aac1e97cd28), -W64LIT(0x7cb05d1595777639), -W64LIT(0xb036c4676c0afb90), -W64LIT(0x0a4bf7a896525a3d), -W64LIT(0x73242be9480c01e0), -W64LIT(0x5bfd1d560fb19c14), -W64LIT(0x7b7825abf08649b5), -W64LIT(0xb7febcd909fbc41c), -W64LIT(0x81fa666b01b0b7af), -W64LIT(0xd25b757fb68b63ee), -W64LIT(0x0d838f16f3a365b1), -W64LIT(0x6a31bf5a620bd02b), -W64LIT(0x26bcc6368daae319), -W64LIT(0x9ed60c13592a50dc), -W64LIT(0x581b62c936058748), -W64LIT(0x9cc1f5f977f242b4), -W64LIT(0x83ed9f812f68a5c7), -W64LIT(0x74ec53572dfd3e6c), -W64LIT(0xb3d0bbf855bee0cc), -W64LIT(0xacfcd1800d2407bf), -W64LIT(0x303d24797ad6450b), -W64LIT(0x7a89a3dee7ea4081), -W64LIT(0x69d7c0c55bbfcb77), -W64LIT(0x770a2cc814492530), -W64LIT(0x0f9476fcdd7b77d9), -W64LIT(0xaeeb286a23fc15d7), -W64LIT(0x2174be88e85bdc95), -W64LIT(0xde297c1c52440f6b), -W64LIT(0xd04c8c9598537186), -W64LIT(0x2ee0c8743520ab4c), -W64LIT(0x977b8424f6cc11bd), -W64LIT(0x10b81c8485e190aa), -W64LIT(0xa4a0dfc2b5ae4fea), -W64LIT(0x98eff2d82bb76664), -W64LIT(0xa8d2d6a15161236f), -W64LIT(0xd4628bb4c4165556), -W64LIT(0x682646b04cd3c243), -W64LIT(0x2d06b7eb0c94b010), -W64LIT(0x626db118da81987e), -W64LIT(0x2928b0ca50d194c0), -W64LIT(0x6df9c7e407faefa7), -W64LIT(0x1681e24ff77ca612), -W64LIT(0x4952f838a4881ed6), -W64LIT(0x76fbaabd03252c04), -W64LIT(0xc73ce8af7843dea0), -W64LIT(0xe82da6ae5a0f7cd8), -W64LIT(0xc10516640adee818), -W64LIT(0x968a0251e1a01889), -W64LIT(0x37f55cc71f277a87), -W64LIT(0xe5ae29b8a9ac1969), -W64LIT(0xcabf67b98be0bb11), -W64LIT(0xf4e7b3493b2180f7), -W64LIT(0xe9dc20db4d6375ec), -W64LIT(0x639c376dcded914a), -W64LIT(0x12afe56eab3982c2), -W64LIT(0xc2e369fb336af344), -W64LIT(0xa6b726289b765d82), -W64LIT(0x14961ba5d9a4b47a), -W64LIT(0xbc44cd0488c59715), -W64LIT(0xd3aaf30aa1e76ada), -W64LIT(0x28d936bf47bd9df4), -W64LIT(0xaf1aae1f34901ce3), -W64LIT(0x2f114e01224ca278), -W64LIT(0xe648562790180235), -W64LIT(0x24ab3fdca372f171), -W64LIT(0x52509561a057dd75), -W64LIT(0xc6cd6eda6f2fd794), -W64LIT(0xa08ed8e3e9eb6b3a), -W64LIT(0x09ad8837afe64161), -W64LIT(0xbdb54b719fa99e21), -W64LIT(0x8c79e97df213d21e), -W64LIT(0xcf60e6edc0c996f5), -W64LIT(0x5dc4e39d7d2caaac), -W64LIT(0x11499af1928d999e), -W64LIT(0x5fd31a7753f4b8c4), -W64LIT(0x01f18675176c0934), -W64LIT(0xc52b1145569bccc8), -W64LIT(0x9f278a664e4659e8), -W64LIT(0x3dbeab6f897520ba), -W64LIT(0xa2992109c7337952), -W64LIT(0x9b098d4712037d38), -W64LIT(0xc9591826b254a04d), -W64LIT(0x3b8755a4fbe81602), -W64LIT(0xbe5334eea61d857d), -W64LIT(0x51b6eafe99e3c629), -W64LIT(0x191594b32a07d1cb), -W64LIT(0x1f2c6a78589ae773), -W64LIT(0x3fa95285a7ad32d2), -W64LIT(0x5c3565e86a40a398), -W64LIT(0xb2213d8d42d2e9f8), -W64LIT(0xefe5de103ffe4354), -W64LIT(0x4ab487a79d3c058a), -W64LIT(0xcd771f07ee11849d), -W64LIT(0xbfa2b29bb1718c49), -W64LIT(0xba7d33cffa58a1ad), -W64LIT(0x6fee3e0e2922fdcf), -W64LIT(0x64544fd3a81caec6), -W64LIT(0xd9e104a237b530e7), -W64LIT(0xf32fcbf75ed0bf7b), -W64LIT(0x3e58d4f0b0c13be6), -W64LIT(0xb418c346304fdf40), -W64LIT(0xaac52f4b7fb93107), -W64LIT(0xdc3e85f67c9c1d03), -W64LIT(0xd5930dc1d37a5c62), -W64LIT(0x0639fecb729d36b8), -W64LIT(0xc0f490111db2e12c), -W64LIT(0x7ea7a4ffbbaf6451), -W64LIT(0xf6f04aa315f9929f), -W64LIT(0x6643b63986c4bcae), -W64LIT(0x6c0841911096e693), -W64LIT(0x8425e73f4a999a4b), -W64LIT(0x7133d20366d41388), -W64LIT(0x38612a3bc25c0d5e), -W64LIT(0xb99b4c50c3ecbaf1), -W64LIT(0x1d3b93927642f51b), -W64LIT(0x7f56228aacc36d65), -W64LIT(0x9d30738c609e4b80), -W64LIT(0x48a37e4db3e417e2), -W64LIT(0x8bb191c397e2ed92), -W64LIT(0x2acecf5569658f9c), -W64LIT(0xda077b3d0e012bbb), -W64LIT(0xa55159b7a2c246de), -W64LIT(0x33db5be643625e57), -W64LIT(0x821c19f43804acf3), -W64LIT(0x3990ac4ed530046a), -W64LIT(0xd675725eeace473e), -W64LIT(0x789e5a34c93252e9), -W64LIT(0x86321ed564418823), -W64LIT(0xfa8243c0f136fe1a), -W64LIT(0xe45fafcdbec0105d), -W64LIT(0x2b3f49207e0986a8), -W64LIT(0xa92350d4460d2a5b), -W64LIT(0x1eddec0d4ff6ee47), -W64LIT(0x89a66829b93afffa), -W64LIT(0x607a48f2f4598a16), -W64LIT(0x6bc0392f7567d91f), -W64LIT(0xea3a5f4474d76eb0), -W64LIT(0x5598eddfc5a6e2f9), -W64LIT(0x4c8d796cefa13332), -W64LIT(0xf701ccd602959bab), -W64LIT(0xe2665106cc5d26e5), -}; - -const word64 SHARK::Dec::cbox[8][256] = { -/* box 0 */ -W64LIT(0xe6126af05e55aff3), -W64LIT(0x4b6c893f310b0835), -W64LIT(0xaa4c0e84ebfc8d57), -W64LIT(0xfb9b5c7bf3b3090d), -W64LIT(0x4508a6a9ccba5ce2), -W64LIT(0xe5d1d2064dc6bde9), -W64LIT(0x348343755288edde), -W64LIT(0xb684505de46b250c), -W64LIT(0xa8cede205a1e91e8), -W64LIT(0x40b89b46f9fa6acc), -W64LIT(0x8ee1ec1afab080ba), -W64LIT(0xde77d6b7408e0a45), -W64LIT(0x9a3e184c2e455802), -W64LIT(0xbe93fad23f0955ef), -W64LIT(0x3ae76ce3af39b909), -W64LIT(0xad7ee3cf6f5ea7c6), -W64LIT(0x8b51d1f5cff0b694), -W64LIT(0x70ca8d8e3c43bf99), -W64LIT(0xccdba7f8b2a8f6c9), -W64LIT(0x4c5e6474b5a922a4), -W64LIT(0x5d31adcd541ccc32), -W64LIT(0x9b7f701e8c3456a7), -W64LIT(0x2ac9cd08ecfd593a), -W64LIT(0x8fa0844858c18e1f), -W64LIT(0x32f0c66c745bc9ea), -W64LIT(0xc58d6525cbbb888f), -W64LIT(0x8c633cbe4b529c05), -W64LIT(0xf2cd9ea68aa0774b), -W64LIT(0x2cba4811ca2e7d0e), -W64LIT(0xe2e33f4dc9649778), -W64LIT(0xf4be1bbfac73537f), -W64LIT(0x22de6787379f29d9), -W64LIT(0x0956c2dd79137e46), -W64LIT(0xe061efe978868bc7), -W64LIT(0x1cc85ed90f97a85b), -W64LIT(0x31337e9a67c8dbf0), -W64LIT(0x360193d1e36af161), -W64LIT(0x7fefca4a6383e5eb), -W64LIT(0x8535fe633241e243), -W64LIT(0xc3fee03ced68acbb), -W64LIT(0x81c4abdea570dac8), -W64LIT(0x67d6c12efb25753b), -W64LIT(0xa4282112164dd980), -W64LIT(0xcf181f0ea13be4d3), -W64LIT(0xa98fb672f86f9f4d), -W64LIT(0x5c70c59ff66dc297), -W64LIT(0xb0f7d544c2b80138), -W64LIT(0x0da79760ee2246cd), -W64LIT(0x3740fb83411bffc4), -W64LIT(0x24ade29e114c0ded), -W64LIT(0xf858e48de0201b17), -W64LIT(0x0e642f96fdb154d7), -W64LIT(0xddb46e41531d185f), -W64LIT(0x25ec8accb33d0348), -W64LIT(0x0282d0a4b1e21cbf), -W64LIT(0x1bfab3928b3582ca), -W64LIT(0xaffc336bdebcbb79), -W64LIT(0x35c22b27f0f9e37b), -W64LIT(0x03c3b8f61393121a), -W64LIT(0xb8e07fcb19da71db), -W64LIT(0x99fda0ba3dd64a18), -W64LIT(0xce59775c034aea76), -W64LIT(0x49ee599b80e9148a), -W64LIT(0xfe2b6194c6f33f23), -W64LIT(0x4edcb4d0044b3e1b), -W64LIT(0xd5a3c4ce887f68bc), -W64LIT(0xdf36bee5e2ff04e0), -W64LIT(0x171c4ca0c766caa2), -W64LIT(0x0bd41279c8f162f9), -W64LIT(0xe490ba54efb7b34c), -W64LIT(0x5b4228d472cfe806), -W64LIT(0x5355825ba9ad98e5), -W64LIT(0x9f8e25a31b056e2c), -W64LIT(0xcd9acfaa10d9f86c), -W64LIT(0x88926903dc63a48e), -W64LIT(0xb40680f9558939b3), -W64LIT(0x239f0fd595ee277c), -W64LIT(0xec8710db34d5c3af), -W64LIT(0x87b72ec783a3fefc), -W64LIT(0x632794936c144db0), -W64LIT(0x46cb1e5fdf294ef8), -W64LIT(0x83467b7a1492c677), -W64LIT(0x9c4d9d5508967c36), -W64LIT(0xd6607c389bec7aa6), -W64LIT(0x165d24f26517c407), -W64LIT(0xc4cc0d7769ca862a), -W64LIT(0xcbe94ab3360adc58), -W64LIT(0x847496319030ece6), -W64LIT(0x7a5ff7a556c3d3c5), -W64LIT(0xc03d58cafefbbea1), -W64LIT(0x76b908971a909bad), -W64LIT(0x2f79f0e7d9bd6f14), -W64LIT(0x197863363ad79e75), -W64LIT(0xda86830ad7bf32ce), -W64LIT(0x5a034086d0bee6a3), -W64LIT(0x97998f2cc0671ecf), -W64LIT(0x552607428f7ebcd1), -W64LIT(0x51d752ff184f845a), -W64LIT(0xbb23c73d0a4963c1), -W64LIT(0x2b88a55a4e8c579f), -W64LIT(0xd80453ae665d2e71), -W64LIT(0xee05c07f8537df10), -W64LIT(0x423a4be248187673), -W64LIT(0xcaa822e1947bd2fd), -W64LIT(0x1abbdbc029448c6f), -W64LIT(0x96d8e77e6216106a), -W64LIT(0x6266fcc1ce654315), -W64LIT(0x89d301517e12aa2b), -W64LIT(0x730935782fd0ad83), -W64LIT(0x8085c38c0701d46d), -W64LIT(0x6b303e1cb7763d53), -W64LIT(0x3f57510c9a798f27), -W64LIT(0x4449cefb6ecb5247), -W64LIT(0x48af31c922981a2f), -W64LIT(0x98bcc8e89fa744bd), -W64LIT(0x69b2eeb8069421ec), -W64LIT(0xebb5fd90b077e93e), -W64LIT(0x6a71564e150733f6), -W64LIT(0x116fc9b9e1b5ee96), -W64LIT(0x4a2de16d937a0690), -W64LIT(0xb9a11799bbab7f7e), -W64LIT(0x9368da9157562644), -W64LIT(0x718be5dc9e32b13c), -W64LIT(0xc82af2452599ce42), -W64LIT(0xb547e8abf7f83716), -W64LIT(0x33b1ae3ed62ac74f), -W64LIT(0x799c4f534550c1df), -W64LIT(0x3e16395e38088182), -W64LIT(0x7c2c72bc7010f7f1), -W64LIT(0xf38cf6f428d179ee), -W64LIT(0xd29129850cdd422d), -W64LIT(0x41f9f3145b8b6469), -W64LIT(0x945a37dad3f40cd5), -W64LIT(0x757ab061090389b7), -W64LIT(0x6554118a4ac76984), -W64LIT(0x7d6d1aeed261f954), -W64LIT(0x01416852a2710ea5), -W64LIT(0xb27505e0735a1d87), -W64LIT(0x77f860c5b8e19508), -W64LIT(0x78dd2701e721cf7a), -W64LIT(0xe12087bbdaf78562), -W64LIT(0x86f6469521d2f059), -W64LIT(0xef44a82d2746d1b5), -W64LIT(0xbc112a768eeb4950), -W64LIT(0xc2bf886e4f19a21e), -W64LIT(0x307216c8c5b9d555), -W64LIT(0xc96b9a1787e8c0e7), -W64LIT(0xa31acc5992eff311), -W64LIT(0xa0d974af817ce10b), -W64LIT(0xdcf50613f16c16fa), -W64LIT(0xfca9b1307711239c), -W64LIT(0x57a4d7e63e9ca06e), -W64LIT(0xc64eddd3d8289a95), -W64LIT(0xa25ba40b309efdb4), -W64LIT(0x2e3898b57bcc61b1), -W64LIT(0xf5ff73ed0e025dda), -W64LIT(0xa6aaf1b6a7afc53f), -W64LIT(0xd9453bfcc42c20d4), -W64LIT(0x9d0cf507aae77293), -W64LIT(0x290a75feff6e4b20), -W64LIT(0xa7eb99e405decb9a), -W64LIT(0xa1981cfd230defae), -W64LIT(0x12ac714ff226fc8c), -W64LIT(0x743bd833ab728712), -W64LIT(0x6c02d35733d417c2), -W64LIT(0xe9372d340195f581), -W64LIT(0xf77da349bfe04165), -W64LIT(0x68f386eaa4e52f49), -W64LIT(0x211ddf71240c3bc3), -W64LIT(0x13ed191d5057f229), -W64LIT(0xe8764566a3e4fb24), -W64LIT(0xf9198cdf425115b2), -W64LIT(0xd013f921bd3f5e92), -W64LIT(0x91ea0a35e6b43afb), -W64LIT(0x0732ed4b84a22a91), -W64LIT(0xeaf495c21206e79b), -W64LIT(0x5214ea090bdc9640), -W64LIT(0x0000000000000000), -W64LIT(0xb3346db2d12b1322), -W64LIT(0x0ce6ff324c534868), -W64LIT(0xaebd5b397ccdb5dc), -W64LIT(0x0a957a2b6a806c5c), -W64LIT(0x1f0be62f1c04ba41), -W64LIT(0x14dff456d4f5d8b8), -W64LIT(0x58819022615cfa1c), -W64LIT(0x05b03def3540362e), -W64LIT(0xe3a2571f6b1599dd), -W64LIT(0x9229b2c3f52728e1), -W64LIT(0xba62af6fa8386d64), -W64LIT(0x0673851926d32434), -W64LIT(0x641579d8e8b66721), -W64LIT(0x04f155bd9731388b), -W64LIT(0x9ecf4df1b9746089), -W64LIT(0x205cb723867d3566), -W64LIT(0x102ea1eb43c4e033), -W64LIT(0x3ba604b10d48b7ac), -W64LIT(0x50963aadba3e8aff), -W64LIT(0xac3f8b9dcd2fa963), -W64LIT(0x7b1e9ff7f4b2dd60), -W64LIT(0xf63ccb1b1d914fc0), -W64LIT(0x7eaea218c1f2eb4e), -W64LIT(0x5fb37d69e5fed08d), -W64LIT(0x56e5bfb49cedaecb), -W64LIT(0x2dfb2043685f73ab), -W64LIT(0x61a54437ddf6510f), -W64LIT(0x6fc16ba1204705d8), -W64LIT(0xe75302a2fc24a156), -W64LIT(0x3dd581a82b9b9398), -W64LIT(0xdbc7eb5875ce3c6b), -W64LIT(0x90ab626744c5345e), -W64LIT(0x59c0f870c32df4b9), -W64LIT(0x6697a97c59547b9e), -W64LIT(0xfde8d962d5602d39), -W64LIT(0xd3d041d7aeac4c88), -W64LIT(0x5ef2153b478fde28), -W64LIT(0xd4e2ac9c2a0e6619), -W64LIT(0x1e4a8e7dbe75b4e4), -W64LIT(0x72485d2a8da1a326), -W64LIT(0x437b23b0ea6978d6), -W64LIT(0x159e9c047684d61d), -W64LIT(0x0f2547c45fc05a72), -W64LIT(0xf10e265099336551), -W64LIT(0x3c94e9fa89ea9d3d), -W64LIT(0xbfd292809d785b4a), -W64LIT(0x0817aa8fdb6270e3), -W64LIT(0x60e42c657f875faa), -W64LIT(0x18390b6498a690d0), -W64LIT(0x478a760d7d58405d), -W64LIT(0x284b1dac5d1f4585), -W64LIT(0xb1b6bd1660c90f9d), -W64LIT(0xd15291731f4e5037), -W64LIT(0x4d1f0c2617d82c01), -W64LIT(0xc70fb5817a599430), -W64LIT(0x6d43bb0591a51967), -W64LIT(0x6e8003f382360b7d), -W64LIT(0x1d89368bade6a6fe), -W64LIT(0x4f9ddc82a63a30be), -W64LIT(0xedc6788996a4cd0a), -W64LIT(0xab0d66d6498d83f2), -W64LIT(0x54676f102d0fb274), -W64LIT(0xc17c30985c8ab004), -W64LIT(0x3865bc471edba5b6), -W64LIT(0x3924d415bcaaab13), -W64LIT(0x951b5f8871850270), -W64LIT(0x8a10b9a76d81b831), -W64LIT(0xbd5042242c9a47f5), -W64LIT(0xa5694940b43cd725), -W64LIT(0xff6a09c664823186), -W64LIT(0x8d2254ece92392a0), -W64LIT(0xb7c5380f461a2ba9), -W64LIT(0x82071328b6e3c8d2), -W64LIT(0xd721146a399d7403), -W64LIT(0xfada342951c207a8), -W64LIT(0x262f323aa0ae1152), -W64LIT(0xf04f4e023b426bf4), -W64LIT(0x276e5a6802df1ff7), -/* box 1 */ -W64LIT(0x3b4016dbfd16e203), -W64LIT(0x9a7574c51174530a), -W64LIT(0x90012e69c02ec8d3), -W64LIT(0xf44580e3d780e076), -W64LIT(0xf81dec2b49eca14b), -W64LIT(0x26cae3e8a6e3d7ef), -W64LIT(0x0962419e0c41f6ab), -W64LIT(0x54d1eb4070ebd951), -W64LIT(0x865e884b0188eec8), -W64LIT(0xdf76067ea406fe8a), -W64LIT(0x29849412e594fba0), -W64LIT(0x461569896869c0f2), -W64LIT(0xb5ddd6b3bbd6724e), -W64LIT(0x0c586cc89e6c413d), -W64LIT(0x6b0ad97054d904ea), -W64LIT(0xa135621eec62b109), -W64LIT(0x0eef7e47087ea461), -W64LIT(0xfaaafea4dffe4417), -W64LIT(0xe0ad344e80342331), -W64LIT(0xab4138b23d382ad0), -W64LIT(0x107390468e90fcff), -W64LIT(0xbe0885a2218561b9), -W64LIT(0xdbed22957d22c132), -W64LIT(0x2251c7037fc7e857), -W64LIT(0x33835ef8ba5e9c86), -W64LIT(0xb3f1e0d7f4e0a8aa), -W64LIT(0x3fdb32302432ddbb), -W64LIT(0xa719547aa3546bed), -W64LIT(0xe10c3df3cb3dab1f), -W64LIT(0x17feaf9f8aafae35), -W64LIT(0x9df84b1c154b01c0), -W64LIT(0x8364a51d93a5595e), -W64LIT(0x535cd49974d48b9b), -W64LIT(0x01a109bd4b09882e), -W64LIT(0xc4d0c529b0c51182), -W64LIT(0x2e09abcbe1aba96a), -W64LIT(0x1f3de7bccde7d0b0), -W64LIT(0x9317355b1d35a5a1), -W64LIT(0x6c87e6a950e65620), -W64LIT(0x8910ffb142ffc287), -W64LIT(0x40395fed275f1a16), -W64LIT(0x7b794936da49f815), -W64LIT(0xf269b68798b63a92), -W64LIT(0xfd27c17ddbc116dd), -W64LIT(0x8d8bdb5a9bdbfd3f), -W64LIT(0x1ba6c35714c3ef08), -W64LIT(0x6e30f426c6f4b37c), -W64LIT(0x7fe26ddd036dc7ad), -W64LIT(0x14e8b4ad57b4c347), -W64LIT(0xb985ba7b25ba3373), -W64LIT(0xe9cf75d08c75d59a), -W64LIT(0x626898ee5898f241), -W64LIT(0x5b9f9cba339cf51e), -W64LIT(0xb250e96abfe92084), -W64LIT(0x165fa622c1a6261b), -W64LIT(0xf5e4895e9c896858), -W64LIT(0xb76ac43c2dc49712), -W64LIT(0x02b7128f9612e55c), -W64LIT(0x1d8af5335bf535ec), -W64LIT(0x36b973ae28732b10), -W64LIT(0xa8572380e02347a2), -W64LIT(0xf6f2926c4192052a), -W64LIT(0x8c2ad2e7d0d27511), -W64LIT(0xd32e6ab63a6abfb7), -W64LIT(0xbd1e9e90fc9e0ccb), -W64LIT(0x03161b32dd1b6d72), -W64LIT(0x4dc03a98f23ad305), -W64LIT(0x81d3b79205b7bc02), -W64LIT(0x450372bbb572ad80), -W64LIT(0x2d1fb0f93cb0c418), -W64LIT(0x2a928f20388f96d2), -W64LIT(0x721b08a8d6080ebe), -W64LIT(0x92b63ce6563c2d8f), -W64LIT(0xeb78675f1a6730c6), -W64LIT(0x13658b74538b918d), -W64LIT(0x428e4d62b14dff4a), -W64LIT(0x88b1f60c09f64aa9), -W64LIT(0x75963771d2375c74), -W64LIT(0x7ad8408b9140703b), -W64LIT(0x57c7f072adf0b423), -W64LIT(0xe5971918121994a7), -W64LIT(0x5666f9cfe6f93c0d), -W64LIT(0x8f3cc9d50dc91863), -W64LIT(0x1e9cee0186ee589e), -W64LIT(0x8a06e4839fe4aff5), -W64LIT(0xb824b3c66eb3bb5d), -W64LIT(0xd1997839ac785aeb), -W64LIT(0x6752b5b8cab545d7), -W64LIT(0xb47cdf0ef0dffa60), -W64LIT(0x949a0a82190af76b), -W64LIT(0xc04be1c269e12e3a), -W64LIT(0xfc86c8c090c89ef3), -W64LIT(0xe3bb2f7c5d2f4e43), -W64LIT(0x6aabd0cd1fd08cc4), -W64LIT(0x2147dc31a2dc8525), -W64LIT(0xca3fbb6eb8bbb5e3), -W64LIT(0x48fa17ce60176493), -W64LIT(0x6444ae8a17ae28a5), -W64LIT(0x2b33869d73861efc), -W64LIT(0xd0387184e771d2c5), -W64LIT(0x7cf476efde76aadf), -W64LIT(0x63c9915313917a6f), -W64LIT(0xc929a05c65a0d891), -W64LIT(0xda4c2b28362b491c), -W64LIT(0xfe31da4f06da7baf), -W64LIT(0xc1eae87f22e8a614), -W64LIT(0x5c12a36337a3a7d4), -W64LIT(0x18b0d865c9d8827a), -W64LIT(0xe7200b97840b71fb), -W64LIT(0x4bec0cfcbd0c09e1), -W64LIT(0x0f4e77fa43772c4f), -W64LIT(0x4c613325b9335b2b), -W64LIT(0xf3c8bf3ad3bfb2bc), -W64LIT(0x87ff81f64a8166e6), -W64LIT(0xa38270917a705455), -W64LIT(0x1911d1d882d10a54), -W64LIT(0x44a27b06fe7b25ae), -W64LIT(0x049b24ebd9243fb8), -W64LIT(0xbb32a8f4b3a8d62f), -W64LIT(0x91a027d48b2740fd), -W64LIT(0x3d6c20bfb22038e7), -W64LIT(0xe681022acf02f9d5), -W64LIT(0xf17fadb545ad57e0), -W64LIT(0xcc138d0af78d6f07), -W64LIT(0x495b1e732b1eecbd), -W64LIT(0x38560de9200d8f71), -W64LIT(0xa9f62a3dab2acf8c), -W64LIT(0x47b46034236048dc), -W64LIT(0x8e9dc06846c0904d), -W64LIT(0xaccc076b3907781a), -W64LIT(0x32225745f15714a8), -W64LIT(0xd4a3556f3e55ed7d), -W64LIT(0xd7b54e5de34e800f), -W64LIT(0xddc114f132141bd6), -W64LIT(0x6d26ef141befde0e), -W64LIT(0x85489379dc9383ba), -W64LIT(0x0bd553119a5313f7), -W64LIT(0x786f520407529567), -W64LIT(0xcb9eb2d3f3b23dcd), -W64LIT(0xa223792c3179dc7b), -W64LIT(0x0a745aacd15a9bd9), -W64LIT(0x710d139a0b1363cc), -W64LIT(0x681cc24289c26998), -W64LIT(0x1a07caea5fca6726), -W64LIT(0x82c5aca0d8acd170), -W64LIT(0x25dcf8da7bf8ba9d), -W64LIT(0xc7c6de1b6dde7cf0), -W64LIT(0xc35dfaf0b4fa4348), -W64LIT(0xded70fc3ef0f76a4), -W64LIT(0x504acfaba9cfe6e9), -W64LIT(0xc571cc94fbcc99ac), -W64LIT(0x5ea5b1eca1b14288), -W64LIT(0xae7b15e4af159d46), -W64LIT(0xc888a9e12ea950bf), -W64LIT(0xf7539bd10a9b8d04), -W64LIT(0x962d180d8f181237), -W64LIT(0xe43610a559101c89), -W64LIT(0x772125fe4425b928), -W64LIT(0x84e99ac4979a0b94), -W64LIT(0xc667d7a626d7f4de), -W64LIT(0xefe343b4c3430f7e), -W64LIT(0xd5025cd2755c6553), -W64LIT(0xa6b85dc7e85de3c3), -W64LIT(0xd61447e0a8470821), -W64LIT(0x3e7a3b8d6f3b5595), -W64LIT(0x52fddd243fdd03b5), -W64LIT(0x8072be2f4ebe342c), -W64LIT(0x12c482c9188219a3), -W64LIT(0x9eee502ec8506cb2), -W64LIT(0xad6d0ed6720ef034), -W64LIT(0x59288e35a58e1042), -W64LIT(0xe21a26c11626c66d), -W64LIT(0x247df16730f132b3), -W64LIT(0xf0dea4080ea4dfce), -W64LIT(0x31344c772c4c79da), -W64LIT(0x4f77281764283659), -W64LIT(0x79ce5bb94c5b1d49), -W64LIT(0x0000000000000000), -W64LIT(0x73ba01159d018690), -W64LIT(0x74373ecc993ed45a), -W64LIT(0xbcbf972db79784e5), -W64LIT(0x4ed621aa2f21be77), -W64LIT(0xd95a301aeb30246e), -W64LIT(0x9c5942a15e4289ee), -W64LIT(0x37187a13637aa33e), -W64LIT(0x276bea55edea5fc1), -W64LIT(0x1c2bfc8e10fcbdc2), -W64LIT(0xed54513b5551ea22), -W64LIT(0x20e6d58ce9d50d0b), -W64LIT(0x3ae11f66b61f6a2d), -W64LIT(0x66f3bc0581bccdf9), -W64LIT(0x2cbeb94477b94c36), -W64LIT(0x99636ff7cc6f3e78), -W64LIT(0x953b033f52037f45), -W64LIT(0xb0e7fbe529fbc5d8), -W64LIT(0x60df8a61ce8a171d), -W64LIT(0x6f91fd9b8dfd3b52), -W64LIT(0xaae0310f7631a2fe), -W64LIT(0xbfa98c1f6a8ce997), -W64LIT(0x8ba7ed3ed4ed27db), -W64LIT(0x98c2664a8766b656), -W64LIT(0x062c36644f36dae4), -W64LIT(0x5570e2fd3be2517f), -W64LIT(0xead96ee2516eb8e8), -W64LIT(0x419856506c569238), -W64LIT(0x23f0cebe34ce6079), -W64LIT(0x309545ca6745f1f4), -W64LIT(0x5a3e950778957d30), -W64LIT(0x617e83dc85839f33), -W64LIT(0xfb0bf71994f7cc39), -W64LIT(0x3ccd2902f929b0c9), -W64LIT(0x70ac1a27401aebe2), -W64LIT(0xcea49f85619f8a5b), -W64LIT(0x39f704546b04075f), -W64LIT(0x0df96575d565c913), -W64LIT(0x08c3482347487e85), -W64LIT(0xd28f630b71633799), -W64LIT(0xecf558861e58620c), -W64LIT(0xc2fcf34dfff3cb66), -W64LIT(0x978c11b0c4119a19), -W64LIT(0x69bdcbffc2cbe1b6), -W64LIT(0xba93a149f8a15e01), -W64LIT(0x51ebc616e2c66ec7), -W64LIT(0x078d3fd9043f52ca), -W64LIT(0x58898788ee87986c), -W64LIT(0x4a4d0541f60581cf), -W64LIT(0xe86e7c6dc77c5db4), -W64LIT(0xee424a09884a8750), -W64LIT(0xcdb284b7bc84e729), -W64LIT(0x65e5a7375ca7a08b), -W64LIT(0x2fa8a276aaa22144), -W64LIT(0xa0946ba3a76b3927), -W64LIT(0xa5ae46f535468eb1), -W64LIT(0x35af689cf5684662), -W64LIT(0x28259dafae9d738e), -W64LIT(0xcf0596382a960275), -W64LIT(0xb6cbcd8166cd1f3c), -W64LIT(0x7e43646048644f83), -W64LIT(0x9bd47d785a7ddb24), -W64LIT(0x432f44dffa447764), -W64LIT(0x9f4f59938359e49c), -W64LIT(0x7d557f52957f22f1), -W64LIT(0x76802c430f2c3106), -W64LIT(0xdc601d4c791d93f8), -W64LIT(0x053a2d56922db796), -W64LIT(0x11d299fbc59974d1), -W64LIT(0xf9bce59602e52965), -W64LIT(0xd8fb39a7a039ac40), -W64LIT(0x340e6121be61ce4c), -W64LIT(0x5f04b851eab8caa6), -W64LIT(0x5db3aade7caa2ffa), -W64LIT(0x1549bd101cbd4b69), -W64LIT(0xff90d3f24dd3f381), -W64LIT(0xafda1c59e41c1568), -W64LIT(0xb146f25862f24df6), -W64LIT(0xa40f4f487e4f069f), -/* box 2 */ -W64LIT(0xa1a35cebf8f0f94c), -W64LIT(0x2c203d650f3f095d), -W64LIT(0x1a2bdaee4084a2a7), -W64LIT(0xd32404574d7bcc68), -W64LIT(0xf785bea594a9adc4), -W64LIT(0xf2eb54456206949c), -W64LIT(0x3f5e334d0475ced1), -W64LIT(0x5994299b835d1f60), -W64LIT(0x785b7989ac204794), -W64LIT(0x025da6a2cf461a41), -W64LIT(0xdf1f3a71f01a901b), -W64LIT(0x27284f018bb77637), -W64LIT(0xe1955a6d694c5310), -W64LIT(0x24a1baf2d9d261ac), -W64LIT(0xe4fbb08d9fe36a48), -W64LIT(0x8d83618ef7cff011), -W64LIT(0x2ac72276abf5279e), -W64LIT(0xf9e32621e68eebf6), -W64LIT(0xbf323fb4d3f86f69), -W64LIT(0xbb888605b8745beb), -W64LIT(0x70dafe1e7acd2f65), -W64LIT(0xd0adf1a41f1edbf3), -W64LIT(0x1e91635f2b089625), -W64LIT(0xee2791b8864818f8), -W64LIT(0x99ce23e4c56c1484), -W64LIT(0xf33f0714ff259946), -W64LIT(0xbd6f99161cbe7528), -W64LIT(0x9f293cf761a63a47), -W64LIT(0xb80173f6ea114c70), -W64LIT(0x6543ef25d54dc62a), -W64LIT(0x39b92c5ea0bfe012), -W64LIT(0x63a4f0367187e8e9), -W64LIT(0x4c0d38a02cddf62f), -W64LIT(0x07334c4239e92319), -W64LIT(0x43bff375c3d9bdc7), -W64LIT(0xca862b4a5f9a7954), -W64LIT(0x5d2e902ae8d12be2), -W64LIT(0x137e0e280b4ac78c), -W64LIT(0xf162a1b630638307), -W64LIT(0x55af17bd3e3c4313), -W64LIT(0x358212781ddebc61), -W64LIT(0x94214e93e52e452d), -W64LIT(0xc18e592edb12063e), -W64LIT(0xec7a371a490e02b9), -W64LIT(0x4963d240da72cf77), -W64LIT(0x41e255d70c9fa786), -W64LIT(0xff0439324244c535), -W64LIT(0x88ed8b6e0160c949), -W64LIT(0x6c163be39e83a301), -W64LIT(0xc534e09fb09e32bc), -W64LIT(0x806c0cf9d78da1b8), -W64LIT(0xdba583c09b96a499), -W64LIT(0x746047af11411be7), -W64LIT(0xf40c4b56c6ccba5f), -W64LIT(0x6270a367eca4e533), -W64LIT(0xd41748157492ef71), -W64LIT(0xeff3c2e91b6b1522), -W64LIT(0x0e66988472274632), -W64LIT(0x534808ae9af66dd0), -W64LIT(0x8231aa5b18cbbbf9), -W64LIT(0xb2dd52c3f3ba3ec0), -W64LIT(0xdd429cd33f5c8a5a), -W64LIT(0x4e509e02e39bec6e), -W64LIT(0x26fc1c5016947bed), -W64LIT(0xd9f8256254d0bed8), -W64LIT(0x0955d4c64bce652b), -W64LIT(0x1610e4c8fde5fed4), -W64LIT(0x6dc268b203a0aedb), -W64LIT(0x2e7d9bc7c079131c), -W64LIT(0xc3d3ff8c14541c7f), -W64LIT(0xd64aeeb7bbd4f530), -W64LIT(0xab7f7ddee15b8bfc), -W64LIT(0x144d426a32a3e495), -W64LIT(0x8e0a947da5aae78a), -W64LIT(0x798f2ad831034a4e), -W64LIT(0x3be48afc6ff9fa53), -W64LIT(0x529c5bff07d5600a), -W64LIT(0xbee66ce54edb62b3), -W64LIT(0x931202d1dcc76634), -W64LIT(0x50c1fd5dc8937a4b), -W64LIT(0xa4cdb60b0e5fc014), -W64LIT(0x57f2b11ff17a5952), -W64LIT(0x47054ac4a8558945), -W64LIT(0x5a1ddc68d13808fb), -W64LIT(0x5cfac37b75f22638), -W64LIT(0xc207acdd897711a5), -W64LIT(0x289a84d464b33ddf), -W64LIT(0xc05a0a7f46310be4), -W64LIT(0xe6a6162f50a57009), -W64LIT(0x06e71f13a4ca2ec3), -W64LIT(0x5f733688279731a3), -W64LIT(0xeb497b5870e721a0), -W64LIT(0xb667eb7298360a42), -W64LIT(0xe3c8fccfa60a4951), -W64LIT(0xe772457ecd867dd3), -W64LIT(0x6978d103682c9a59), -W64LIT(0x0def6d77204251a9), -W64LIT(0xc90fdeb90dff6ecf), -W64LIT(0xd179a2f5823dd629), -W64LIT(0x2fa9c8965d5a1ec6), -W64LIT(0x81b85fa84aaeac62), -W64LIT(0xdc96cf82a27f8780), -W64LIT(0x602d05c523e2ff72), -W64LIT(0x19a22f1d12e1b53c), -W64LIT(0xe52fe3dc02c06792), -W64LIT(0x58407aca1e7e12ba), -W64LIT(0x61f95694bec1f2a8), -W64LIT(0x48b781114751c2ad), -W64LIT(0xaaab2e8f7c788626), -W64LIT(0x04bab9b16b8c3482), -W64LIT(0x2df46e34921c0487), -W64LIT(0x1123a88ac40cddcd), -W64LIT(0xc6bd156ce2fb2527), -W64LIT(0x7f6835cb95c9648d), -W64LIT(0x83e5f90a85e8b623), -W64LIT(0x4f84cd537eb8e1b4), -W64LIT(0x294ed785f9903005), -W64LIT(0x1cccc5fde44e8c64), -W64LIT(0xcb52781bc2b9748e), -W64LIT(0x1d1896ac796d81be), -W64LIT(0xb30901926e99331a), -W64LIT(0xad9862cd4591a53f), -W64LIT(0xc8db8de890dc6315), -W64LIT(0x7bd28c7afe45500f), -W64LIT(0x0adc213519ab72b0), -W64LIT(0xa8f6882db33e9c67), -W64LIT(0xb5ee1e81ca531dd9), -W64LIT(0x201b0343b25e552e), -W64LIT(0x4036068691bcaa5c), -W64LIT(0xae11973e17f4b2a4), -W64LIT(0x9efd6fa6fc85379d), -W64LIT(0x33650d6bb91492a2), -W64LIT(0x3a30d9adf2daf789), -W64LIT(0x0c3b3e26bd615c73), -W64LIT(0xf651edf4098aa01e), -W64LIT(0x710ead4fe7ee22bf), -W64LIT(0x3138abc9765288e3), -W64LIT(0x9d749a55aee02006), -W64LIT(0x6e4b9d4151c5b940), -W64LIT(0x84d6b548bc01953a), -W64LIT(0x360be78b4fbbabfa), -W64LIT(0xa22aa918aa95eed7), -W64LIT(0xedae644bd42d0f63), -W64LIT(0x46d119953576849f), -W64LIT(0x6497bc74486ecbf0), -W64LIT(0xfbbe808329c8f1b7), -W64LIT(0x4aea27b38817d8ec), -W64LIT(0x5626e24e6c595488), -W64LIT(0x056eeae0f6af3958), -W64LIT(0x4558ec6667139304), -W64LIT(0x448cbf37fa309ede), -W64LIT(0x6f9fce10cce6b49a), -W64LIT(0xa0770fba65d3f496), -W64LIT(0x671e49871a0bdc6b), -W64LIT(0xda71d09106b5a943), -W64LIT(0x08818797d6ed68f1), -W64LIT(0xa3fefa4937b6e30d), -W64LIT(0xb080f4613cfc2481), -W64LIT(0x763de10dde0701a6), -W64LIT(0x4dd96bf1b1fefbf5), -W64LIT(0x92c6518041e46bee), -W64LIT(0x3456412980fdb1bb), -W64LIT(0x981a70b5584f195e), -W64LIT(0x3d0395efcb33d490), -W64LIT(0xba5cd55425575631), -W64LIT(0x4b3e74e21534d536), -W64LIT(0x6af124f03a498dc2), -W64LIT(0x7ebc669a08ea6957), -W64LIT(0x30ecf898eb718539), -W64LIT(0xa922db7c2e1d91bd), -W64LIT(0x7a06df2b63665dd5), -W64LIT(0xb154a730a1df295b), -W64LIT(0xfc8dccc11021d2ae), -W64LIT(0xcfe8c1aaa935400c), -W64LIT(0x97a8bb60b74b52b6), -W64LIT(0x18767c4c8fc2b8e6), -W64LIT(0x9a47d6179709031f), -W64LIT(0x0000000000000000), -W64LIT(0xac4c319cd8b2a8e5), -W64LIT(0xb9d520a7773241aa), -W64LIT(0xdecb69206d399dc1), -W64LIT(0x1f45300eb62b9bff), -W64LIT(0x10f7fbdb592fd017), -W64LIT(0x3e8a601c9956c30b), -W64LIT(0x8502e619212298e0), -W64LIT(0xf5d818075befb785), -W64LIT(0x547b44eca31f4ec9), -W64LIT(0x9ca0c90433c32ddc), -W64LIT(0xe041093cf46f5eca), -W64LIT(0xa69010a9c119da55), -W64LIT(0xc769463d7fd828fd), -W64LIT(0xc4e0b3ce2dbd3f66), -W64LIT(0x2575e9a344f16c76), -W64LIT(0x01d453519d230dda), -W64LIT(0xfa6ad3d2b4ebfc6d), -W64LIT(0xd5c31b44e9b1e2ab), -W64LIT(0xf83775707bade62c), -W64LIT(0xbcbbca47819d78f2), -W64LIT(0xd79ebde626f7f8ea), -W64LIT(0x5bc98f394c1b0521), -W64LIT(0x2246a5e17d184f6f), -W64LIT(0x12aa5d799669ca56), -W64LIT(0x5ea765d9bab43c79), -W64LIT(0x8939d83f9c43c493), -W64LIT(0x32b15e3a24379f78), -W64LIT(0xe914ddfabfa13be1), -W64LIT(0x909bf7228ea271af), -W64LIT(0x73530bed28a838fe), -W64LIT(0xd2f05706d058c1b2), -W64LIT(0xfed06a63df67c8ef), -W64LIT(0xb43a4dd057701003), -W64LIT(0xa519e55a937ccdce), -W64LIT(0x75b414fe8c62163d), -W64LIT(0xafc5c46f8ad7bf7e), -W64LIT(0x2392f6b0e03b42b5), -W64LIT(0x386d7f0f3d9cedc8), -W64LIT(0x21cf50122f7d58f4), -W64LIT(0x9b9385460a2a0ec5), -W64LIT(0x5115ae0c55b07791), -W64LIT(0x0fb2cbd5ef044be8), -W64LIT(0xea9d2809edc42c7a), -W64LIT(0xcc613459fb505797), -W64LIT(0x426ba0245efab01d), -W64LIT(0x1599113baf80e94f), -W64LIT(0x7d3593695a8f7ecc), -W64LIT(0x0389f5f35265179b), -W64LIT(0x875f40bbee6482a1), -W64LIT(0x95f51dc2780d48f7), -W64LIT(0x7ce1c038c7ac7316), -W64LIT(0xce3c92fb34164dd6), -W64LIT(0xcdb5670866735a4d), -W64LIT(0x8ab02dccce26d308), -W64LIT(0x914fa47313817c75), -W64LIT(0x8b647e9d5305ded2), -W64LIT(0xd82c7633c9f3b302), -W64LIT(0x728758bcb58b3524), -W64LIT(0xe8c08eab2282363b), -W64LIT(0x8fdec72c3889ea50), -W64LIT(0x2b13712736d62a44), -W64LIT(0x3cd7c6be5610d94a), -W64LIT(0x37dfb4dad298a620), -W64LIT(0x868b13ea73478f7b), -W64LIT(0xb7b3b82305150798), -W64LIT(0x0b08726484887f6a), -W64LIT(0x1bff89bfdda7af7d), -W64LIT(0x77e9b25c43240c7c), -W64LIT(0xf0b6f2e7ad408edd), -W64LIT(0x17c4b79960c6f30e), -W64LIT(0x8c5732df6aecfdcb), -W64LIT(0x68ac8252f50f9783), -W64LIT(0x66ca1ad68728d1b1), -W64LIT(0x6b2577a1a76a8018), -W64LIT(0xe21caf9e3b29448b), -W64LIT(0xa74443f85c3ad78f), -W64LIT(0xfd599f908d02df74), -W64LIT(0x967ce8312a685f6c), -/* box 3 */ -W64LIT(0xfa7b9775ba3af751), -W64LIT(0x03ef98cb769c2d13), -W64LIT(0x7191ce067072359e), -W64LIT(0xbab18b6bff7516a8), -W64LIT(0xe6e5ef4efbc1065e), -W64LIT(0x7bec74a3b1d0dbf4), -W64LIT(0x656b4fb907c31c4a), -W64LIT(0x4e8520f99fc86304), -W64LIT(0x8fd8df31d16dae58), -W64LIT(0x90a93fc1e60a7244), -W64LIT(0x30ad09f2b449cfc5), -W64LIT(0x8453be7e91bb5b90), -W64LIT(0x1d68a3d1c08feaad), -W64LIT(0x5c54642504b410f6), -W64LIT(0x8061383c8a9e3707), -W64LIT(0xf9940fbecca6da42), -W64LIT(0x46e1d97da982bbdf), -W64LIT(0xfc50521656f7ad77), -W64LIT(0x5e4d2704f35c2647), -W64LIT(0x8bea5973ca48c2cf), -W64LIT(0xd06323dfa34593bd), -W64LIT(0x62b651306a7a5dce), -W64LIT(0xa436b0714966d116), -W64LIT(0x4f73fb131ebc78a6), -W64LIT(0x92b07ce011e244f5), -W64LIT(0x33429139c2d5e2d6), -W64LIT(0xcee418c515565403), -W64LIT(0xd7be3d56cefcd239), -W64LIT(0x53ed83285f4789a9), -W64LIT(0xf3e9b51b0d043428), -W64LIT(0x20650e0fd8dd8a86), -W64LIT(0xb6e7f4add21aa2e4), -W64LIT(0x6d0fb63d3189c491), -W64LIT(0x0da0a42cac1bafee), -W64LIT(0x3f14eeffefba569a), -W64LIT(0x13279f361a086850), -W64LIT(0x9b225e8ea6dc878c), -W64LIT(0x6684d772715f3159), -W64LIT(0xa3ebaef824df9092), -W64LIT(0xc499a260d4f4ba69), -W64LIT(0xaa798c9693e153eb), -W64LIT(0x50021be329dba4ba), -W64LIT(0x949bb983fd2f1ed3), -W64LIT(0xdfdac4d2f8b60ae2), -W64LIT(0xf0062dd07b98193b), -W64LIT(0xafbdd13e09b024de), -W64LIT(0xb95e13a089e93bbb), -W64LIT(0x649d945386b707e8), -W64LIT(0xe4fcac6f0c2930ef), -W64LIT(0x413cc7f4c43bfa5b), -W64LIT(0x3b2668bdf49f3a0d), -W64LIT(0xe50a77858d5d2b4d), -W64LIT(0x05c45da89a517735), -W64LIT(0x3ee235156ece4d38), -W64LIT(0xfe491137a11f9bc6), -W64LIT(0xb7112f47536eb946), -W64LIT(0x07dd1e896db94184), -W64LIT(0x1ab5bd58ad36ab29), -W64LIT(0x8197e3d60bea2ca5), -W64LIT(0xab8f577c12954849), -W64LIT(0x9cff4007cb65c608), -W64LIT(0xa00436335243bd81), -W64LIT(0xfda689fcd783b6d5), -W64LIT(0xccfd5be4e2be62b2), -W64LIT(0x75a348446b575909), -W64LIT(0x17151974012d04c7), -W64LIT(0xfb8d4c9f3b4eecf3), -W64LIT(0xac5249f57f2c09cd), -W64LIT(0x9346a70a90965f57), -W64LIT(0x043286421b256c97), -W64LIT(0x27b81086b564cb02), -W64LIT(0x3569545a2e18b8f0), -W64LIT(0x6b24735edd449eb7), -W64LIT(0x2193d5e559a99124), -W64LIT(0xc7763aaba268977a), -W64LIT(0xb0cc31ce3ed7f8c2), -W64LIT(0xc939064c78ef1587), -W64LIT(0x16e3c29e80591f65), -W64LIT(0x5da2bfcf85c00b54), -W64LIT(0x5990398d9ee567c3), -W64LIT(0x67720c98f02b2afb), -W64LIT(0x54309da132fec82d), -W64LIT(0xeab39088d6aeb212), -W64LIT(0x9682faa20ac72862), -W64LIT(0xd38cbb14d5d9beae), -W64LIT(0x4c9c63d8682055b5), -W64LIT(0xd648e6bc4f88c99b), -W64LIT(0xdc355c198e2a27f1), -W64LIT(0x10c807fd6c944543), -W64LIT(0x450e41b6df1e96cc), -W64LIT(0x0b8b614f40d6f5c8), -W64LIT(0xd27a60fe54ada50c), -W64LIT(0x49583e70f2712280), -W64LIT(0x8dc19c10268598e9), -W64LIT(0x5866e2671f917c61), -W64LIT(0x79f537824638ed45), -W64LIT(0xc2b267033839e04f), -W64LIT(0xcb20456d8f072336), -W64LIT(0x2a18b4aa197f64ec), -W64LIT(0xdbe84290e3936675), -W64LIT(0x73888d27879a032f), -W64LIT(0xe8aad3a9214684a3), -W64LIT(0x6ee02ef64715e982), -W64LIT(0xa996145de57d7ef8), -W64LIT(0xc8cfdda6f99b0e25), -W64LIT(0x062bc563eccd5a26), -W64LIT(0x264ecb6c3410d0a0), -W64LIT(0xb8a8c84a089d2019), -W64LIT(0x7dc7b1c05d1d81d2), -W64LIT(0xd5a77e773914e488), -W64LIT(0x4b417d5105991431), -W64LIT(0xf62de8b39755431d), -W64LIT(0x993b1daf5134b13d), -W64LIT(0x82787b1d7d7601b6), -W64LIT(0xe321b2e66190716b), -W64LIT(0xb5086c66a4868ff7), -W64LIT(0x9ee603263c8df0b9), -W64LIT(0x349f8fb0af6ca352), -W64LIT(0x5b897aac690d5172), -W64LIT(0x7c316a2adc699a70), -W64LIT(0xd451a59db860ff2a), -W64LIT(0x706715ecf1062e3c), -W64LIT(0x838ea0f7fc021a14), -W64LIT(0x57df056a4462e53e), -W64LIT(0xcf12c32f94224fa1), -W64LIT(0xed6e8e01bb17f396), -W64LIT(0x915fe42b677e69e6), -W64LIT(0x89f31a523da0f47e), -W64LIT(0xe71334a47ab51dfc), -W64LIT(0xa860cfb76409655a), -W64LIT(0x9f10d8ccbdf9eb1b), -W64LIT(0xef77cd204cffc527), -W64LIT(0xf862d4544dd2c1e0), -W64LIT(0x8a1c82994b3cd96d), -W64LIT(0xae4b0ad488c43f7c), -W64LIT(0x98cdc645d040aa9f), -W64LIT(0x7fdef2e1aaf5b763), -W64LIT(0x4717029728f6a07d), -W64LIT(0x745593aeea2342ab), -W64LIT(0xee8116cacd8bde85), -W64LIT(0x727e56cd06ee188d), -W64LIT(0x227c4d2e2f35bc37), -W64LIT(0x977421488bb333c0), -W64LIT(0xa21d7512a5ab8b30), -W64LIT(0xbb4750817e010d0a), -W64LIT(0x6cf96dd7b0fddf33), -W64LIT(0x2801f78bee97525d), -W64LIT(0x1c9e783b41fbf10f), -W64LIT(0x9d099bed4a11ddaa), -W64LIT(0x7a1aaf4930a4c056), -W64LIT(0x32b44ad343a1f974), -W64LIT(0x3cfb763499267b89), -W64LIT(0xb2d572efc93fce73), -W64LIT(0x63408adaeb0e466c), -W64LIT(0xada4921ffe58126f), -W64LIT(0x5fbbfcee72283de5), -W64LIT(0x6ad2a8b45c308515), -W64LIT(0x0c567fc62d6fb44c), -W64LIT(0x956d62697c5b0571), -W64LIT(0x25a153a7428cfdb3), -W64LIT(0x150c5a55f6c53276), -W64LIT(0xe2d7690ce0e46ac9), -W64LIT(0xda1e997a62e77dd7), -W64LIT(0xf5c27078e1c96e0e), -W64LIT(0xc344bce9b94dfbed), -W64LIT(0x60af12119d926b7f), -W64LIT(0xa1f2edd9d337a623), -W64LIT(0xcad69e870e733894), -W64LIT(0x3770177bd9f08e41), -W64LIT(0xa5c06b9bc812cab4), -W64LIT(0x1f71e0f03767dc1c), -W64LIT(0x44f89a5c5e6a8d6e), -W64LIT(0x6159c9fb1ce670dd), -W64LIT(0x8e2e04db5019b5fa), -W64LIT(0x8805c1b8bcd4efdc), -W64LIT(0xe138f1c7967847da), -W64LIT(0x4ab7a6bb84ed0f93), -W64LIT(0x0000000000000000), -W64LIT(0x38c9f0768203171e), -W64LIT(0x1b4366b22c42b08b), -W64LIT(0x7803ec68c74cf6e7), -W64LIT(0xec9855eb3a63e834), -W64LIT(0xbe830d29e4507a3f), -W64LIT(0x2dc5aa2374c62568), -W64LIT(0xa62ff350be8ee7a7), -W64LIT(0x764cd08f1dcb741a), -W64LIT(0x8c3747faa7f1834b), -W64LIT(0x0fb9e70d5bf3995f), -W64LIT(0x55c6464bb38ad38f), -W64LIT(0xf7db3359162158bf), -W64LIT(0xd195f8352231881f), -W64LIT(0x0992226eb73ec379), -W64LIT(0x14fa81bf77b129d4), -W64LIT(0x48aee59a73053922), -W64LIT(0x2457884dc3f8e611), -W64LIT(0xffbfcadd206b8064), -W64LIT(0xb4feb78c25f29455), -W64LIT(0x864afd5f66536d21), -W64LIT(0x6f16f51cc661f220), -W64LIT(0xde2c1f3879c21140), -W64LIT(0x195a2593dbaa863a), -W64LIT(0x2e2a32e8025a087b), -W64LIT(0x432584d533d3ccea), -W64LIT(0x2c3371c9f5b23eca), -W64LIT(0xa7d928ba3ffafc05), -W64LIT(0x42d35f3fb2a7d748), -W64LIT(0x85a5659410cf4032), -W64LIT(0x0864f984364ad8db), -W64LIT(0xf21f6ef18c702f8a), -W64LIT(0xf1f0f63afaec0299), -W64LIT(0xd9f101b1147b50c4), -W64LIT(0x2fdce902832e13d9), -W64LIT(0x4d6ab832e9544e17), -W64LIT(0xe0ce2a2d170c5c78), -W64LIT(0x51f4c009a8afbf18), -W64LIT(0x68cbeb95abd8b3a4), -W64LIT(0xc15dffc84ea5cd5c), -W64LIT(0x02194321f7e836b1), -W64LIT(0x113edc17ede05ee1), -W64LIT(0x521b58c2de33920b), -W64LIT(0x9ad4856427a89c2e), -W64LIT(0x5629de80c516fe9c), -W64LIT(0x77ba0b659cbf6fb8), -W64LIT(0x238a96c4ae41a795), -W64LIT(0x12d144dc9b7c73f2), -W64LIT(0xd807da5b950f4b66), -W64LIT(0x3686cc91588495e3), -W64LIT(0x18acfe795ade9d98), -W64LIT(0x5a7fa146e8794ad0), -W64LIT(0xc680e141231c8cd8), -W64LIT(0x1e873b1ab613c7be), -W64LIT(0xf434ab9260bd75ac), -W64LIT(0xcd0b800e63ca7910), -W64LIT(0xbc9a4e0813b84c8e), -W64LIT(0x3d0dadde1852602b), -W64LIT(0x40ca1c1e454fe1f9), -W64LIT(0x0a7dbaa5c1a2ee6a), -W64LIT(0x693d307f2aaca806), -W64LIT(0x0e4f3ce7da8782fd), -W64LIT(0xbd6c95e292cc572c), -W64LIT(0x3ad0b35775eb21af), -W64LIT(0x7e28290b2b81acc1), -W64LIT(0x01f6dbea81741ba2), -W64LIT(0x87bc26b5e7277683), -W64LIT(0x393f2b9c03770cbc), -W64LIT(0xddc387f30f5e3c53), -W64LIT(0xeb454b6257daa9b0), -W64LIT(0xb323a905484bd5d1), -W64LIT(0xb13aea24bfa3e360), -W64LIT(0x315bd218353dd467), -W64LIT(0x2bee6f40980b7f4e), -W64LIT(0xe95c0843a0329f01), -W64LIT(0xc56f798a5580a1cb), -W64LIT(0xbf75d6c36524619d), -W64LIT(0x29f72c616fe349ff), -W64LIT(0xc0ab2422cfd1d6fe), -/* box 4 */ -W64LIT(0x561fc423e957943c), -W64LIT(0x014287ca69079288), -W64LIT(0x2f086129dfcd1d21), -W64LIT(0xc537d4aea044fd99), -W64LIT(0xf1e8c3bfd7c8a457), -W64LIT(0x2971998a5cdf9bfb), -W64LIT(0x23fa649a2ce9e460), -W64LIT(0x3aa9e9c356a6716a), -W64LIT(0xd6efa4e7aa3d1708), -W64LIT(0x705a24b1fda5b5eb), -W64LIT(0x101e0ce2b170a9fc), -W64LIT(0x7ca821020e814caa), -W64LIT(0x0bc97ada1931ed13), -W64LIT(0x34df1711778c59ce), -W64LIT(0xd35020ef9226d2bf), -W64LIT(0x575d43e9805006b4), -W64LIT(0x91acebec9b1db840), -W64LIT(0x549b3f423b5945d9), -W64LIT(0x99a3ed9d3925163e), -W64LIT(0x7917a50a369a891d), -W64LIT(0xe372343cb4b6dc4e), -W64LIT(0x8d40e2bdd949e8fd), -W64LIT(0xcfbc29bed0728202), -W64LIT(0x969794857108ac12), -W64LIT(0xdd26de3db30cfa1b), -W64LIT(0x115c8b28d8773b74), -W64LIT(0xe9f9c92cc480a3d5), -W64LIT(0x4dc8b21b4116d0d3), -W64LIT(0x316093194f979c79), -W64LIT(0x5124bb4a0342806e), -W64LIT(0xb31408bcdef3cea8), -W64LIT(0xc1cad76cf158aaa6), -W64LIT(0x88ff66b5e1522d4a), -W64LIT(0xa8c37e8476b28a47), -W64LIT(0x15a188ea896b6c4b), -W64LIT(0xa24883940684f5dc), -W64LIT(0xda1da1545919ee49), -W64LIT(0x22b8e35045ee76e8), -W64LIT(0x6106af9925d28e9f), -W64LIT(0xef80318f4792250f), -W64LIT(0x663dd0f0cfc79acd), -W64LIT(0x302214d326900ef1), -W64LIT(0xdfa2255c61022bfe), -W64LIT(0xe6cdb0348cad19f9), -W64LIT(0x50663c806a4512e6), -W64LIT(0x65fbac5b74ced9a0), -W64LIT(0xc4755364c9436f11), -W64LIT(0x8fc419dc0b473918), -W64LIT(0x5c9439339961eba7), -W64LIT(0x3f166dcb6ebdb4dd), -W64LIT(0xba59890715ccf25e), -W64LIT(0xf0aa4475becf36df), -W64LIT(0x03c67cabbb09436d), -W64LIT(0xb99ff5acaec5b133), -W64LIT(0xf9e7c5ce75f00a29), -W64LIT(0x6df4aa2ad6f677de), -W64LIT(0xaeba8627f5a00c9d), -W64LIT(0xa573fcfdec91e18e), -W64LIT(0x7f6e5da9b5880fc7), -W64LIT(0xca03adb6e86947b5), -W64LIT(0x74a72773acb9e2d4), -W64LIT(0x604428534cd51c17), -W64LIT(0xf8a542041cf798a1), -W64LIT(0x448533a08a29ec25), -W64LIT(0x80f060c4436a8334), -W64LIT(0x0db082799a236bc9), -W64LIT(0xfa21b965cef94944), -W64LIT(0x64b92b911dc94b28), -W64LIT(0x7118a37b94a22763), -W64LIT(0xaff801ed9ca79e15), -W64LIT(0x1dae8e9b2b53c235), -W64LIT(0x13d870490a79ea91), -W64LIT(0x8a7b9dd4335cfcaf), -W64LIT(0x1f2a75faf95d13d0), -W64LIT(0xeec2b6452e95b787), -W64LIT(0xc34e2c0d23567b43), -W64LIT(0x47434f0b3120af48), -W64LIT(0xa18eff3fbd8db6b1), -W64LIT(0x98e16a57502284b6), -W64LIT(0x37196bbacc851aa3), -W64LIT(0x8e869e166240ab90), -W64LIT(0x9fda153eba3790e4), -W64LIT(0xf515c07d86d4f368), -W64LIT(0x72dedfd02fab640e), -W64LIT(0xe230b3f6ddb14ec6), -W64LIT(0x97d5134f180f3e9a), -W64LIT(0xe1f6cf5d66b80dab), -W64LIT(0xe78f37fee5aa8b71), -W64LIT(0xa30a045e6f836754), -W64LIT(0x90ee6c26f21a2ac8), -W64LIT(0xaa4785e5a4bc5ba2), -W64LIT(0x4e0eceb0fa1f93be), -W64LIT(0x94136fe4a3067df7), -W64LIT(0x7b935e6be49458f8), -W64LIT(0x9b2716fceb2bc7db), -W64LIT(0x840d63061276d40b), -W64LIT(0xed04caee959cf4ea), -W64LIT(0xea3fb5877f89e0b8), -W64LIT(0xb56df01f5de14872), -W64LIT(0x4935b1d9100a87ec), -W64LIT(0x82749ba5916452d1), -W64LIT(0x58693af1c87dbc98), -W64LIT(0x89bde17f8855bfc2), -W64LIT(0x677f573aa6c00845), -W64LIT(0xeb7d324d168e7230), -W64LIT(0x0284fb61d20ed1e5), -W64LIT(0xb190f3dd0cfd1f4d), -W64LIT(0x684b2e22eeedb269), -W64LIT(0x2bf562eb8ed14a1e), -W64LIT(0xe0b448970fbf9f23), -W64LIT(0x396f9568edaf3207), -W64LIT(0x52e2c7e1b84bc303), -W64LIT(0x77615bd817b0a1b9), -W64LIT(0x7e2cda63dc8f9d4f), -W64LIT(0xf22ebf146cc1e73a), -W64LIT(0xc08850a6985f382e), -W64LIT(0xd9dbddffe210ad24), -W64LIT(0xbfe60d0f2dd737e9), -W64LIT(0x9a659136822c5553), -W64LIT(0x87cb1fada97f9766), -W64LIT(0x4c8a35d12811425b), -W64LIT(0x83361c6ff863c059), -W64LIT(0xd212a725fb214037), -W64LIT(0x9e9892f4d330026c), -W64LIT(0x45c7b46ae32e7ead), -W64LIT(0x5baf465a7374fff5), -W64LIT(0xdc6459f7da0b6893), -W64LIT(0xd46b5f867833c6ed), -W64LIT(0x5dd6bef9f066792f), -W64LIT(0xcb412a7c816ed53d), -W64LIT(0x75e5a0b9c5be705c), -W64LIT(0xf6d3bcd63dddb005), -W64LIT(0xfb633eafa7fedbcc), -W64LIT(0xd529d84c11345465), -W64LIT(0xc9c5d11d536004d8), -W64LIT(0xdb5f269e301e7cc1), -W64LIT(0x86899867c07805ee), -W64LIT(0x3d9296aabcb36538), -W64LIT(0x2cce1d8264c45e4c), -W64LIT(0x5aedc1901a736d7d), -W64LIT(0x2e4ae6e3b6ca8fa9), -W64LIT(0x1e68f230905a8158), -W64LIT(0xdee0a2960805b976), -W64LIT(0xcd38d2df027c53e7), -W64LIT(0x6909a9e887ea20e1), -W64LIT(0x24c11bf3c6fcf032), -W64LIT(0x18110a9313480782), -W64LIT(0xa7f7079c3e9f306b), -W64LIT(0xd8995a358b173fac), -W64LIT(0x854fe4cc7b714683), -W64LIT(0xbd62f66effd9e60c), -W64LIT(0x14e30f20e06cfec3), -W64LIT(0x6e32d6816dff34b3), -W64LIT(0x217e9ffbfee73585), -W64LIT(0xc88756d73a679650), -W64LIT(0x359d90db1e8bcb46), -W64LIT(0x2645e09214f221d7), -W64LIT(0x04fd03c2511c573f), -W64LIT(0x739c581a46acf686), -W64LIT(0xb0d2741765fa8dc5), -W64LIT(0xa0cc78f5d48a2439), -W64LIT(0x5e10c2524b6f3a42), -W64LIT(0xe50bcc9f37a45a94), -W64LIT(0x53a0402bd14c518b), -W64LIT(0x413ab7a8b2322992), -W64LIT(0x203c183197e0a70d), -W64LIT(0xcc7a55156b7bc16f), -W64LIT(0x4601c8c158273dc0), -W64LIT(0xbea48ac544d0a561), -W64LIT(0x638254f8f7dc5f7a), -W64LIT(0xa6b580565798a2e3), -W64LIT(0x3cd01160d5b4f7b0), -W64LIT(0x8c026577b04e7a75), -W64LIT(0x7ad1d9a18d93ca70), -W64LIT(0x785522c05f9d1b95), -W64LIT(0x5f5245982268a8ca), -W64LIT(0x9551e82eca01ef7f), -W64LIT(0x0000000000000000), -W64LIT(0xbb1b0ecd7ccb60d6), -W64LIT(0x094d81bbcb3f3cf6), -W64LIT(0x28331e4035d80973), -W64LIT(0xf7913b1c54da228d), -W64LIT(0x6acfd5433ce3638c), -W64LIT(0x1bd77638a84144ef), -W64LIT(0x62c0d3329edbcdf2), -W64LIT(0x81b2e70e2a6d11bc), -W64LIT(0xd7ad232dc33a8580), -W64LIT(0x05bf8408381bc5b7), -W64LIT(0x33e468789d994d9c), -W64LIT(0xfedcbaa79fe51e7b), -W64LIT(0x4f4c497a93180136), -W64LIT(0x073b7f69ea151452), -W64LIT(0x0cf205b3f324f941), -W64LIT(0x382d12a284a8a08f), -W64LIT(0x1cec0951425450bd), -W64LIT(0x55d9b888525ed751), -W64LIT(0x6cb62de0bff1e556), -W64LIT(0xd1d4db8e4028035a), -W64LIT(0x25839c39affb62ba), -W64LIT(0x4af3cd72ab03c481), -W64LIT(0xa4317b3785967306), -W64LIT(0x1a95f1f2c146d667), -W64LIT(0x926a97472014fb2d), -W64LIT(0xb7e90b7e8fef9997), -W64LIT(0xcefeae74b975108a), -W64LIT(0x3e54ea0107ba2655), -W64LIT(0xd0965c44292f91d2), -W64LIT(0xab05022fcdbbc92a), -W64LIT(0xfd1ac60c24ec5d16), -W64LIT(0xfc5841c64debcf9e), -W64LIT(0xe4494b555ea3c81c), -W64LIT(0xb6ab8cb4e6e80b1f), -W64LIT(0x3beb6e093fa1e3e2), -W64LIT(0xf36c38de05c675b2), -W64LIT(0x9c1c6995013ed389), -W64LIT(0x8b391a1e5a5b6e27), -W64LIT(0xec464d24fc9b6662), -W64LIT(0xad7cfa8c4ea94ff0), -W64LIT(0x0f347918482dba2c), -W64LIT(0x9d5eee5f68394101), -W64LIT(0x7623dc127eb73331), -W64LIT(0x32a6efb2f49edf14), -W64LIT(0x2d8c9a480dc3ccc4), -W64LIT(0xb2568f76b7f45c20), -W64LIT(0x0e76fed2212a28a4), -W64LIT(0x48773613790d1564), -W64LIT(0x129af783637e7819), -W64LIT(0x080f0671a238ae7e), -W64LIT(0x365bec70a582882b), -W64LIT(0x42fccb03093b6aff), -W64LIT(0x0a8bfd1070367f9b), -W64LIT(0xff9e3d6df6e28cf3), -W64LIT(0xe8bb4ee6ad87315d), -W64LIT(0xc7b32fcf724a2c7c), -W64LIT(0xb8dd7266c7c223bb), -W64LIT(0x9328108d491369a5), -W64LIT(0x0679f8a3831286da), -W64LIT(0x270767587df5b35f), -W64LIT(0xa981f94e1fb518cf), -W64LIT(0x6b8d528955e4f104), -W64LIT(0x1667f44132622f26), -W64LIT(0x2ab7e521e7d6d896), -W64LIT(0xac3e7d4627aedd78), -W64LIT(0x7deaa6c86786de22), -W64LIT(0x1725738b5b65bdae), -W64LIT(0x4bb14ab8c2045609), -W64LIT(0x592bbd3ba17a2e10), -W64LIT(0xc20cabc74a51e9cb), -W64LIT(0x6f70514b04f8a63b), -W64LIT(0xbc2071a496de7484), -W64LIT(0x19538d597a4f950a), -W64LIT(0xf45747b7efd361e0), -W64LIT(0x43be4cc9603cf877), -W64LIT(0xc6f1a8051b4dbef4), -W64LIT(0xb42f77d534e6dafa), -W64LIT(0x40783062db35bb1a), -/* box 5 */ -W64LIT(0xf5a96c292deb0a4e), -W64LIT(0x211c9df6ee653c51), -W64LIT(0x04de5ddcbeeef596), -W64LIT(0xe1e5b06f7457c19f), -W64LIT(0x74ca30f014a54fb6), -W64LIT(0xc296f9f7c5457d85), -W64LIT(0x7d4ee08a484d10b0), -W64LIT(0xae87f2d0bf9b13ad), -W64LIT(0x8df4bb480e89afb7), -W64LIT(0x2d8b7a67d9a2d61e), -W64LIT(0x0f3559c8bd712adb), -W64LIT(0x541bc7312f013338), -W64LIT(0x9ec4848b636d5164), -W64LIT(0x952f809f60f28e29), -W64LIT(0x28984d8cb28d6357), -W64LIT(0xd4b5f1dfc38e361f), -W64LIT(0x5674135f7076b373), -W64LIT(0xb791a330042172ec), -W64LIT(0xab94c53bd4b4a6e4), -W64LIT(0xf17731f59305ffd8), -W64LIT(0x39c7a621801e1dcf), -W64LIT(0x20d1f7c13ba47c8e), -W64LIT(0x5e3da912f95facaa), -W64LIT(0xb1202a82e5b80731), -W64LIT(0x13303fc36de4fed3), -W64LIT(0x2e29c43e5314168a), -W64LIT(0x861fbf5c0d1670fa), -W64LIT(0x6458b16af3f771f1), -W64LIT(0x3043765bdcf642c9), -W64LIT(0x12fd55f4b825be0c), -W64LIT(0x0a266e23d65e9f92), -W64LIT(0x6595db5d2636312e), -W64LIT(0x85bd010587a0b06e), -W64LIT(0x9bd7b3600842e42d), -W64LIT(0xaa59af0c0175e63b), -W64LIT(0x240faa1d854a8918), -W64LIT(0xf464061ef82a4a91), -W64LIT(0x5c527d7ca6282ce1), -W64LIT(0x03a2be598ab6c094), -W64LIT(0x40571b7776bdf8e9), -W64LIT(0xe4f687841f7874d6), -W64LIT(0x115febad32937e98), -W64LIT(0x5108f0da442e8671), -W64LIT(0x9cab50e53c1ad12f), -W64LIT(0x33e1c8025640825d), -W64LIT(0x87d2d56bd8d73025), -W64LIT(0xc0f92d999a32fdce), -W64LIT(0x62e938d8126e042c), -W64LIT(0x4a717554a0e3677b), -W64LIT(0x0beb0414039fdf4d), -W64LIT(0xd6da25b19cf9b654), -W64LIT(0x55d6ad06fac073e7), -W64LIT(0x632452efc7af44f3), -W64LIT(0xb5fe775e5b56f2a7), -W64LIT(0x892ae694b0675a21), -W64LIT(0x7a32030f7c1525b2), -W64LIT(0x5d9f174b73e96c3e), -W64LIT(0xc35b93c010843d5a), -W64LIT(0x373f95dee8ae77cb), -W64LIT(0xfb515fd6455b604a), -W64LIT(0xa9fb11558bc326af), -W64LIT(0x22be23af64d3fcc5), -W64LIT(0xa8367b625e026670), -W64LIT(0xb8a4faf8b9505837), -W64LIT(0x785dd7612362a5f9), -W64LIT(0x588c20a018c6d977), -W64LIT(0xea0eb47b77c81ed2), -W64LIT(0xa6ce489d36b20c74), -W64LIT(0x0c97e79137c7ea4f), -W64LIT(0x7c838abd9d8c506f), -W64LIT(0x57b97968a5b7f3ac), -W64LIT(0x6c110b277ade6e28), -W64LIT(0xc785ce1cae6ac8cc), -W64LIT(0x1581b6718c7d8b0e), -W64LIT(0x614b868198d8c4b8), -W64LIT(0x27ad14440ffc498c), -W64LIT(0xdb80a8177eff1cc4), -W64LIT(0x472bf8f242e5cdeb), -W64LIT(0x8a8858cd3ad19ab5), -W64LIT(0xf60bd270a75dcada), -W64LIT(0x43f5a52efc0b387d), -W64LIT(0x6ddc6110af1f2ef7), -W64LIT(0xf0ba5bc246c4bf07), -W64LIT(0x6fb3b57ef068aebc), -W64LIT(0x18db3bd76e7b219e), -W64LIT(0x903cb7740bdd3b60), -W64LIT(0x7bff6938a9d4656d), -W64LIT(0xbdb7cd13d27fed7e), -W64LIT(0x051337eb6b2fb549), -W64LIT(0x77688ea99e138f22), -W64LIT(0xd9ef7c7921889c8f), -W64LIT(0x077ce38534583502), -W64LIT(0xf318e59bcc727f93), -W64LIT(0xb34ffeecbacf877a), -W64LIT(0xe9ac0a22fd7ede46), -W64LIT(0xfc2dbc5371035548), -W64LIT(0x026fd46e5f77804b), -W64LIT(0xe53bedb3cab93409), -W64LIT(0xcc6eca08adf51781), -W64LIT(0xe028da58a1968140), -W64LIT(0x3a6518780aa8dd5b), -W64LIT(0xce011e66f28297ca), -W64LIT(0xa4a19cf369c58c3f), -W64LIT(0xc5ea1a72f11d4887), -W64LIT(0xc427704524dc0858), -W64LIT(0x4238cf1929ca78a2), -W64LIT(0x481ea13aff94e730), -W64LIT(0xdf5ef5cbc011e952), -W64LIT(0x80ae36eeec8f0527), -W64LIT(0x5ae3f4ce47b1593c), -W64LIT(0xcda3a03f7834575e), -W64LIT(0x71d9071b7f8afaff), -W64LIT(0xcadf43ba4c6c625c), -W64LIT(0x1623082806cb4b9a), -W64LIT(0x17ee621fd30a0b45), -W64LIT(0x448946abc8530d7f), -W64LIT(0x974054f13f850e62), -W64LIT(0x73b6d37520fd7ab4), -W64LIT(0xc8b097d4131be217), -W64LIT(0x9f09eebcb6ac11bb), -W64LIT(0x45442c9c1d924da0), -W64LIT(0x1b79858ee4cde10a), -W64LIT(0x0984d07a5ce85f06), -W64LIT(0x4cc0fce6417a12a6), -W64LIT(0x99b8670e57356466), -W64LIT(0xad254c89352dd339), -W64LIT(0x322ca2358381c282), -W64LIT(0xcfcc74512743d715), -W64LIT(0x6b6de8a24e865b2a), -W64LIT(0xda4dc220ab3e5c1b), -W64LIT(0x88e78ca365a61afe), -W64LIT(0x939e092d816bfbf4), -W64LIT(0xcb12298d99ad2283), -W64LIT(0xeed0e9a7c926eb44), -W64LIT(0x98750d3982f424b9), -W64LIT(0xd5789be8164f76c0), -W64LIT(0xbe15734a58c92dea), -W64LIT(0x49d3cb0d2a55a7ef), -W64LIT(0x67fa0f337941b165), -W64LIT(0x8c39d17fdb48ef68), -W64LIT(0x25c2c02a508bc9c7), -W64LIT(0x349d2b876218b75f), -W64LIT(0x70146d2caa4bba20), -W64LIT(0x1c05660bd095d408), -W64LIT(0xfe42683d2e74d503), -W64LIT(0x9a1ad957dd83a4f2), -W64LIT(0xf2d58fac19b33f4c), -W64LIT(0x81635cd9394e45f8), -W64LIT(0xb65cc907d1e03233), -W64LIT(0xdd3121a59f666919), -W64LIT(0x318e1c6c09370216), -W64LIT(0x8b4532faef10da6a), -W64LIT(0x191651e0bbba6141), -W64LIT(0x3f762f9361876812), -W64LIT(0xb96990cf6c9118e8), -W64LIT(0xb4331d698e97b278), -W64LIT(0xd822164ef449dc50), -W64LIT(0x84706b325261f0b1), -W64LIT(0x4eaf28881e0d92ed), -W64LIT(0x69023ccc11f1db61), -W64LIT(0x66376504ac80f1ba), -W64LIT(0x0849ba4d89291fd9), -W64LIT(0xff8f020afbb595dc), -W64LIT(0x50c59aed91efc6ae), -W64LIT(0x1dc80c3c055494d7), -W64LIT(0x1e6ab2658fe25443), -W64LIT(0x3d19fbfd3ef0e859), -W64LIT(0xfa9c35e1909a2095), -W64LIT(0x52aa4e83ce9846e5), -W64LIT(0x419a7140a37cb836), -W64LIT(0xa07fc12fd72b79a9), -W64LIT(0x68cf56fbc4309bbe), -W64LIT(0x01cd6a37d5c140df), -W64LIT(0x9253631a54aabb2b), -W64LIT(0xd06bac037d60c389), -W64LIT(0x295527bb674c2388), -W64LIT(0xd204786d221743c2), -W64LIT(0x0000000000000000), -W64LIT(0xf7c6b847729c8a05), -W64LIT(0xdcfc4b924aa729c6), -W64LIT(0xe38a64012b2041d4), -W64LIT(0xb28294db6f0ec7a5), -W64LIT(0x9d663ad2e9db91f0), -W64LIT(0x91f1dd43de1c7bbf), -W64LIT(0x6086ecb64d198467), -W64LIT(0x59414a97cd0799a8), -W64LIT(0xace826bee0ec93e6), -W64LIT(0xa56cf6c4bc04cce0), -W64LIT(0x727bb942f53c3a6b), -W64LIT(0x6e7edf4925a9ee63), -W64LIT(0x26607e73da3d0953), -W64LIT(0xe75439dd95ceb442), -W64LIT(0x7990bd56f6a3e526), -W64LIT(0xecbf3dc996516b0f), -W64LIT(0x76a5e49e4bd2cffd), -W64LIT(0x968d3ec6ea444ebd), -W64LIT(0x5b2e9ef9927019e3), -W64LIT(0x6aa082959b471bf5), -W64LIT(0xbb0644a133e698a3), -W64LIT(0x830c88b76639c5b3), -W64LIT(0xe2470e36fee1010b), -W64LIT(0xb0ed40b5307947ee), -W64LIT(0x355041b0b7d9f780), -W64LIT(0x8e560511843f6f23), -W64LIT(0x7f2134e4173a90fb), -W64LIT(0x2af799e2edfae31c), -W64LIT(0x4bbc1f63752227a4), -W64LIT(0xf8f3e18fcfeda0de), -W64LIT(0x0d5a8da6e206aa90), -W64LIT(0x2c4610500c6396c1), -W64LIT(0xde939ffc15d0a98d), -W64LIT(0xaf4a98e76a5a5372), -W64LIT(0x8f9b6f2651fe2ffc), -W64LIT(0x36f2ffe93d6f3714), -W64LIT(0x0ef833ff68b06a04), -W64LIT(0xe69953ea400ff49d), -W64LIT(0x23734998b112bc1a), -W64LIT(0x3ebb45a4b44628cd), -W64LIT(0x1ab4efb9310ca1d5), -W64LIT(0x2fe4ae0986d55655), -W64LIT(0xebc3de4ca2095e0d), -W64LIT(0x536724b41b59063a), -W64LIT(0x46e692c597248d34), -W64LIT(0x2b3af3d5383ba3c3), -W64LIT(0x3ba8724fdf699d84), -W64LIT(0xc13447ae4ff3bd11), -W64LIT(0x4d0d96d194bb5279), -W64LIT(0xfde0d664a4c21597), -W64LIT(0xd7174f864938f68b), -W64LIT(0x7eec5ed3c2fbd024), -W64LIT(0xbfd8197d8d086d35), -W64LIT(0x4f6242bfcbccd232), -W64LIT(0xa70322aae3734cab), -W64LIT(0xa3dd7f765d9db93d), -W64LIT(0x94e2eaa8b533cef6), -W64LIT(0x144cdc4659bccbd1), -W64LIT(0xc648a42b7bab8813), -W64LIT(0xf93e8bb81a2ce001), -W64LIT(0xbacb2e96e627d87c), -W64LIT(0xbc7aa72407beada1), -W64LIT(0xc97dfde3c6daa2c8), -W64LIT(0xa1b2ab1802ea3976), -W64LIT(0x1fa7d8525a23149c), -W64LIT(0x75075ac7c1640f69), -W64LIT(0xe861601528bf9e99), -W64LIT(0xa2101541885cf9e2), -W64LIT(0xef1d83901ce7ab9b), -W64LIT(0x06b189b2e19975dd), -W64LIT(0x380acc1655df5d10), -W64LIT(0x1092819ae7523e47), -W64LIT(0xd3c9125af7d6031d), -W64LIT(0xd1a6c634a8a18356), -W64LIT(0x5ff0c3252c9eec75), -W64LIT(0x82c1e280b3f8856c), -W64LIT(0xed7257fe43902bd0), -W64LIT(0x3cd491caeb31a886), -/* box 6 */ -W64LIT(0x94af9eb6fad9e7df), -W64LIT(0x9208ae5e03c94ddd), -W64LIT(0x1d8de8d67158480b), -W64LIT(0xfd093cd2ba147af8), -W64LIT(0xa45ceb22e6597ccf), -W64LIT(0x9bbde6e77bf113da), -W64LIT(0xe4edf4b465fffe5c), -W64LIT(0x7125622e4e8d2a2f), -W64LIT(0x1791b81b8f68430d), -W64LIT(0xb56a63d1902195c0), -W64LIT(0xa980832b30d2ee67), -W64LIT(0x4c0a7fb384862397), -W64LIT(0xed58bc0d1dc7a05b), -W64LIT(0x5955d7f05c4d0637), -W64LIT(0xd2b9b1c8806fcf4e), -W64LIT(0x06a730e8f910aa02), -W64LIT(0xb8b60bd846aa0768), -W64LIT(0x45bf370afcbe7d90), -W64LIT(0x16f6b0375ec370a1), -W64LIT(0x892276608b81afd4), -W64LIT(0xdcccc1b5d0ec08e7), -W64LIT(0xe856949162df5f58), -W64LIT(0x82592e81a41a977e), -W64LIT(0xac8eabb74fca1164), -W64LIT(0xfac9041692afe356), -W64LIT(0x3b882d75331ba3ba), -W64LIT(0xa39cd3e6cee2e561), -W64LIT(0xd077a190d7cca9e3), -W64LIT(0x9c7dde23534a8a74), -W64LIT(0x80973ed9f3b9f1d3), -W64LIT(0xce535132209cb4e9), -W64LIT(0xaa299b5fb6dabb66), -W64LIT(0x2d7e9d426dd8d31b), -W64LIT(0x8a8b6e140d89fad5), -W64LIT(0x6ca88af83fd56224), -W64LIT(0xf5db7c4713871753), -W64LIT(0xeef1a4799bcff55a), -W64LIT(0x76e55aea6636b381), -W64LIT(0x8ee24ea4a33a367a), -W64LIT(0x25acddd7c44bbeb0), -W64LIT(0x9adaeecbaa5a2076), -W64LIT(0x0e75707d5083c7a9), -W64LIT(0x2bd9adaa94c87919), -W64LIT(0x19e4c866dfeb84a4), -W64LIT(0x129f9087f070bc0e), -W64LIT(0xd9c2e929aff4f7e4), -W64LIT(0x6f01928cb9dd3725), -W64LIT(0x39463d2d64b8c517), -W64LIT(0xebff8ce5e4d70a59), -W64LIT(0xb40d6bfd418aa66c), -W64LIT(0xf21b44833b3c8efd), -W64LIT(0x3654457ce5903112), -W64LIT(0x431807e205aed792), -W64LIT(0xb10343613e92596f), -W64LIT(0x0a1c50cdfe300b06), -W64LIT(0x778252c6b79d802d), -W64LIT(0x0cbb60250720a104), -W64LIT(0xe1e3dc281ae7015f), -W64LIT(0x0f1278518128f405), -W64LIT(0x47712752ab1d1b3d), -W64LIT(0xe24ac45c9cef545e), -W64LIT(0x1ceae0faa0f37ba7), -W64LIT(0x9814fe93fdf946db), -W64LIT(0xec3fb421cc6c93f7), -W64LIT(0x833e26ad75b1a4d2), -W64LIT(0x6b68b23c176efb8a), -W64LIT(0x4904572ffb9edc94), -W64LIT(0x4bca4777ac3dba39), -W64LIT(0x2762cd8f93e8d81d), -W64LIT(0x9eb3ce7b04e9ecd9), -W64LIT(0xc2e8311727bc15ed), -W64LIT(0xea9884c9357c39f5), -W64LIT(0xfc6e34fe6bbf4954), -W64LIT(0x13f898ab21db8fa2), -W64LIT(0xb7a47389c782f36d), -W64LIT(0x7b3932e3b0bd2129), -W64LIT(0xaf27b3c3c9c24465), -W64LIT(0xb6c37ba51629c0c1), -W64LIT(0x84fe1e695d0a3d7c), -W64LIT(0x1a4dd01259e3d1a5), -W64LIT(0xab4e9373677188ca), -W64LIT(0x90c6be06546a2b70), -W64LIT(0xf37c4cafea97bd51), -W64LIT(0x647aca6d96460f8f), -W64LIT(0x4ec46febd325453a), -W64LIT(0x3e8605e94c035cb9), -W64LIT(0x0ddc6809d68b92a8), -W64LIT(0x8bec6638dc22c979), -W64LIT(0x67d3d219104e5a8e), -W64LIT(0x2abea58645634ab5), -W64LIT(0x5b9bc7a80bee609a), -W64LIT(0x936fa672d2627e71), -W64LIT(0x7d9e020b49ad8b2b), -W64LIT(0x5832dfdc8de6359b), -W64LIT(0xc7e6198b58a4eaee), -W64LIT(0xd41e8120797f654c), -W64LIT(0xf4bc746bc22c24ff), -W64LIT(0xe084d404cb4c32f3), -W64LIT(0x48635f032a35ef38), -W64LIT(0x8757061ddb02687d), -W64LIT(0x522e8f1173d63e9d), -W64LIT(0xbcdf2b68e819cbc7), -W64LIT(0xbf76331c6e119ec6), -W64LIT(0x08d24095a9936dab), -W64LIT(0x728c7a5ac8857f2e), -W64LIT(0xd110a9bc06679a4f), -W64LIT(0x1f43f88e26fb2ea6), -W64LIT(0xb2aa5b15b89a0c6e), -W64LIT(0x4aad4f5b7d968995), -W64LIT(0x9fd4c657d542df75), -W64LIT(0x323d65cc4b23fdbd), -W64LIT(0xc38f393bf6172641), -W64LIT(0xa152c3be994183cc), -W64LIT(0x9d1ad60f82e1b9d8), -W64LIT(0xe744ecc0e3f7ab5d), -W64LIT(0x38213501b513f6bb), -W64LIT(0xade9a39b9e6122c8), -W64LIT(0x37334d50343b02be), -W64LIT(0x55eeb7d55b6da733), -W64LIT(0x970686c27cd1b2de), -W64LIT(0x427f0fced405e43e), -W64LIT(0xc026214f701f7340), -W64LIT(0x40b11f9683a68293), -W64LIT(0x02ce105857a366ad), -W64LIT(0x7e371a7fcfa5de2a), -W64LIT(0xffc72c8aedb71c55), -W64LIT(0x68c1aa489166ae8b), -W64LIT(0xc68111a7890fd942), -W64LIT(0x79f722bbe71e4784), -W64LIT(0xd579890ca8d456e0), -W64LIT(0x70426a029f261983), -W64LIT(0xb0644b4def396ac3), -W64LIT(0xdb0cf971f8579149), -W64LIT(0x5489bff98ac6949f), -W64LIT(0x046920b0aeb3ccaf), -W64LIT(0x7cf90a279806b887), -W64LIT(0x050e289c7f18ff03), -W64LIT(0x651dc24147ed3c23), -W64LIT(0x5e95ef3474f69f99), -W64LIT(0x6dcf82d4ee7e5188), -W64LIT(0x8f854688729105d6), -W64LIT(0x81f036f52212c27f), -W64LIT(0xb9d103f4970134c4), -W64LIT(0x5349873da27d0d31), -W64LIT(0x20a2f54bbb5341b3), -W64LIT(0xf0d554db6c9fe850), -W64LIT(0x07c038c428bb99ae), -W64LIT(0x30f375941c809b10), -W64LIT(0x3fe10dc59da86f15), -W64LIT(0x46162f7e7ab62891), -W64LIT(0xe623e4ec325c98f1), -W64LIT(0xfea024a63c1c2ff9), -W64LIT(0x349a5524b23357bf), -W64LIT(0x35fd5d0863986413), -W64LIT(0x96618eeead7a8172), -W64LIT(0xcb5d79ae5f844bea), -W64LIT(0x21c5fd676af8721f), -W64LIT(0x5720a78d0ccec19e), -W64LIT(0xf6726433958f4252), -W64LIT(0x8d4b56d02532637b), -W64LIT(0x24cbd5fb15e08d1c), -W64LIT(0x3aef2559e2b09016), -W64LIT(0x5afccf84da455336), -W64LIT(0x51879765f5de6b9c), -W64LIT(0x2917bdf2c36b1fb4), -W64LIT(0xa7f5f356605129ce), -W64LIT(0xc1412963a1b440ec), -W64LIT(0x3d2f1d9dca0b09b8), -W64LIT(0xa53be30e37f24f63), -W64LIT(0x5ff2e718a55dac35), -W64LIT(0xa2fbdbca1f49d6cd), -W64LIT(0xf7156c1f442471fe), -W64LIT(0x7a5e3acf61161285), -W64LIT(0xca3a71828e2f7846), -W64LIT(0x1b2ad83e8848e209), -W64LIT(0xa8e78b07e179ddcb), -W64LIT(0xef96ac554a64c6f6), -W64LIT(0x0000000000000000), -W64LIT(0x6013eadd38f5c320), -W64LIT(0x3c4815b11ba03a14), -W64LIT(0x09b548b978385e07), -W64LIT(0x226ce513ecf0271e), -W64LIT(0x63baf2a9befd9621), -W64LIT(0x44d83f262d154e3c), -W64LIT(0xcdfa4946a694e1e8), -W64LIT(0x113688f37678e90f), -W64LIT(0x859916458ca10ed0), -W64LIT(0xc52809d30f078c43), -W64LIT(0x4d6d779f552d103b), -W64LIT(0x1e24f0a2f7501d0a), -W64LIT(0x0167082cd1ab33ac), -W64LIT(0x1438a06f0960160c), -W64LIT(0xf9601c6214a7b657), -W64LIT(0xa035cb9248eab060), -W64LIT(0x50e09f4924755830), -W64LIT(0xd7b79954ff77304d), -W64LIT(0xe58afc98b454cdf0), -W64LIT(0x03a9187486085501), -W64LIT(0x62ddfa856f56a58d), -W64LIT(0xc44f01ffdeacbfef), -W64LIT(0x73eb7276192e4c82), -W64LIT(0xd6d091782edc03e1), -W64LIT(0xfbae0c3a4304d0fa), -W64LIT(0x9973f6bf2c527577), -W64LIT(0x105180dfa7d3daa3), -W64LIT(0x2605c5a34243ebb1), -W64LIT(0x91a1b62a85c118dc), -W64LIT(0xc99369f608272d47), -W64LIT(0x5d3cf740f2feca98), -W64LIT(0xcf34591ef1378745), -W64LIT(0xc8f461dad98c1eeb), -W64LIT(0x0b7b58e12f9b38aa), -W64LIT(0xe32dcc704d4467f2), -W64LIT(0x754c429ee03ee680), -W64LIT(0xd3deb9e451c4fce2), -W64LIT(0x6e669aa068760489), -W64LIT(0x66b4da35c1e56922), -W64LIT(0x4fa367c7028e7696), -W64LIT(0xba781b80110961c5), -W64LIT(0x41d617ba520db13f), -W64LIT(0x335a6de09a88ce11), -W64LIT(0xdf65d9c156e45de6), -W64LIT(0xcc9d416a773fd244), -W64LIT(0x5c5bff6c2355f934), -W64LIT(0x2870b5de12c02c18), -W64LIT(0x155fa843d8cb25a0), -W64LIT(0x78902a9736b57428), -W64LIT(0xae40bbef186977c9), -W64LIT(0x88457e4c5a2a9c78), -W64LIT(0x6a0fba10c6c5c826), -W64LIT(0x7f5012531e0eed86), -W64LIT(0x8c2c5efcf49950d7), -W64LIT(0x31947db8cd2ba8bc), -W64LIT(0x2c19956ebc73e0b7), -W64LIT(0x230bed3f3d5b14b2), -W64LIT(0x69a6a26440cd9d27), -W64LIT(0x86300e310aa95bd1), -W64LIT(0xb3cd533969313fc2), -W64LIT(0x1883c04a0e40b708), -W64LIT(0xf1b25cf7bd34dbfc), -W64LIT(0x2fb08d1a3a7bb5b6), -W64LIT(0xd8a5e1057e5fc448), -W64LIT(0xddabc99901473b4b), -W64LIT(0xde02d1ed874f6e4a), -W64LIT(0xbdb8234439b2f86b), -W64LIT(0x5647afa1dd65f232), -W64LIT(0x2ed78536ebd0861a), -W64LIT(0xe9319cbdb3746cf4), -W64LIT(0xa692fb7ab1fa1a62), -W64LIT(0x742b4ab23195d52c), -W64LIT(0x95c8969a2b72d473), -W64LIT(0x6174e2f1e95ef08c), -W64LIT(0xf807144ec50c85fb), -W64LIT(0xbe113b30bfbaad6a), -W64LIT(0xda6bf15d29fca2e5), -W64LIT(0xbb1f13acc0a25269), -/* box 7 */ -W64LIT(0xc22b27f0f9e37bf9), -W64LIT(0x93fad23f0955ef09), -W64LIT(0x32ed4b84a22a91a2), -W64LIT(0x3898b57bcc61b1cc), -W64LIT(0x55825ba9ad98e5ad), -W64LIT(0xb2eeb8069421ec94), -W64LIT(0xc7eb5875ce3c6bce), -W64LIT(0x4b1dac5d1f45851f), -W64LIT(0xc16ba1204705d847), -W64LIT(0xc5380f461a2ba91a), -W64LIT(0xb908971a909bad90), -W64LIT(0x303e1cb7763d5376), -W64LIT(0xe6ff324c53486853), -W64LIT(0x6d1aeed261f95461), -W64LIT(0x0193d1e36af1616a), -W64LIT(0x51d1f5cff0b694f0), -W64LIT(0x29b2c3f52728e127), -W64LIT(0x112a768eeb4950eb), -W64LIT(0x8fb672f86f9f4d6f), -W64LIT(0xf0c66c745bc9ea5b), -W64LIT(0x3f8b9dcd2fa9632f), -W64LIT(0x65bc471edba5b6db), -W64LIT(0x4d9d5508967c3696), -W64LIT(0x3a4be24818767318), -W64LIT(0x2794936c144db014), -W64LIT(0x2af2452599ce4299), -W64LIT(0x4a8e7dbe75b4e475), -W64LIT(0x9ddc82a63a30be3a), -W64LIT(0xade29e114c0ded4c), -W64LIT(0xd1d2064dc6bde9c6), -W64LIT(0x7da349bfe04165e0), -W64LIT(0x6b9a1787e8c0e7e8), -W64LIT(0xa54437ddf6510ff6), -W64LIT(0x2254ece92392a023), -W64LIT(0x79f0e7d9bd6f14bd), -W64LIT(0x57510c9a798f2779), -W64LIT(0x346db2d12b13222b), -W64LIT(0x54118a4ac76984c7), -W64LIT(0xefca4a6383e5eb83), -W64LIT(0xca8d8e3c43bf9943), -W64LIT(0xfc336bdebcbb79bc), -W64LIT(0x3e184c2e45580245), -W64LIT(0xf495c21206e79b06), -W64LIT(0xff73ed0e025dda02), -W64LIT(0x4228d472cfe806cf), -W64LIT(0xbcc8e89fa744bda7), -W64LIT(0xab626744c5345ec5), -W64LIT(0xb6bd1660c90f9dc9), -W64LIT(0xb72ec783a3fefca3), -W64LIT(0x8be5dc9e32b13c32), -W64LIT(0x485d2a8da1a326a1), -W64LIT(0xc6788996a4cd0aa4), -W64LIT(0x40fb83411bffc41b), -W64LIT(0x08a6a9ccba5ce2ba), -W64LIT(0xf386eaa4e52f49e5), -W64LIT(0x1acc5992eff311ef), -W64LIT(0xa2571f6b1599dd15), -W64LIT(0x44a82d2746d1b546), -W64LIT(0x70c59ff66dc2976d), -W64LIT(0x8d6525cbbb888fbb), -W64LIT(0x963aadba3e8aff3e), -W64LIT(0x7c30985c8ab0048a), -W64LIT(0x607c389bec7aa6ec), -W64LIT(0xa822e1947bd2fd7b), -W64LIT(0x034086d0bee6a3be), -W64LIT(0x66fcc1ce65431565), -W64LIT(0xb37d69e5fed08dfe), -W64LIT(0x2f323aa0ae1152ae), -W64LIT(0x56c2dd79137e4613), -W64LIT(0x31adcd541ccc321c), -W64LIT(0xdff456d4f5d8b8f5), -W64LIT(0xf9f3145b8b64698b), -W64LIT(0x764566a3e4fb24e4), -W64LIT(0x0cf507aae77293e7), -W64LIT(0x59775c034aea764a), -W64LIT(0xb89b46f9fa6accfa), -W64LIT(0xe8d962d5602d3960), -W64LIT(0x17aa8fdb6270e362), -W64LIT(0x1c4ca0c766caa266), -W64LIT(0x2de16d937a06907a), -W64LIT(0x2547c45fc05a72c0), -W64LIT(0x0fb5817a59943059), -W64LIT(0x0680f9558939b389), -W64LIT(0x16395e3808818208), -W64LIT(0xac714ff226fc8c26), -W64LIT(0xa9b1307711239c11), -W64LIT(0xec8accb33d03483d), -W64LIT(0x6c893f310b08350b), -W64LIT(0xc4abdea570dac870), -W64LIT(0xba4811ca2e7d0e2e), -W64LIT(0xf155bd9731388b31), -W64LIT(0xdd2701e721cf7a21), -W64LIT(0xe94ab3360adc580a), -W64LIT(0x23c73d0a4963c149), -W64LIT(0x5cb723867d35667d), -W64LIT(0x5042242c9a47f59a), -W64LIT(0x198cdf425115b251), -W64LIT(0x0a75feff6e4b206e), -W64LIT(0xfda0ba3dd64a18d6), -W64LIT(0xcede205a1e91e81e), -W64LIT(0xd041d7aeac4c88ac), -W64LIT(0xe42c657f875faa87), -W64LIT(0x36bee5e2ff04e0ff), -W64LIT(0x6fc9b9e1b5ee96b5), -W64LIT(0x998f2cc0671ecf67), -W64LIT(0xd301517e12aa2b12), -W64LIT(0xaea218c1f2eb4ef2), -W64LIT(0xda342951c207a8c2), -W64LIT(0x61efe978868bc786), -W64LIT(0x7f701e8c3456a734), -W64LIT(0x0be62f1c04ba4104), -W64LIT(0x9129850cdd422ddd), -W64LIT(0xd6c12efb25753b25), -W64LIT(0xe33f4dc964977864), -W64LIT(0x1579d8e8b66721b6), -W64LIT(0xf860c5b8e19508e1), -W64LIT(0x7496319030ece630), -W64LIT(0x88a55a4e8c579f8c), -W64LIT(0xcf4df1b974608974), -W64LIT(0x10b9a76d81b83181), -W64LIT(0x0e26509933655133), -W64LIT(0x43bb0591a51967a5), -W64LIT(0x926903dc63a48e63), -W64LIT(0x9c4f534550c1df50), -W64LIT(0x3bd833ab72871272), -W64LIT(0xa4d7e63e9ca06e9c), -W64LIT(0xb46e41531d185f1d), -W64LIT(0x126af05e55aff355), -W64LIT(0x24d415bcaaab13aa), -W64LIT(0x1e9ff7f4b2dd60b2), -W64LIT(0x05c07f8537df1037), -W64LIT(0x467b7a1492c67792), -W64LIT(0x2087bbdaf78562f7), -W64LIT(0x819022615cfa1c5c), -W64LIT(0xcd9ea68aa0774ba0), -W64LIT(0xa79760ee2246cd22), -W64LIT(0x8343755288edde88), -W64LIT(0x58e48de0201b1720), -W64LIT(0x7216c8c5b9d555b9), -W64LIT(0x372d340195f58195), -W64LIT(0xa11799bbab7f7eab), -W64LIT(0x9f0fd595ee277cee), -W64LIT(0x676f102d0fb2740f), -W64LIT(0x9e9c047684d61d84), -W64LIT(0x49cefb6ecb5247cb), -W64LIT(0xd41279c8f162f9f1), -W64LIT(0x1f0c2617d82c01d8), -W64LIT(0x97a97c59547b9e54), -W64LIT(0xe76ce3af39b90939), -W64LIT(0xc3b8f61393121a93), -W64LIT(0x5ba40b309efdb49e), -W64LIT(0xea0a35e6b43afbb4), -W64LIT(0x5a37dad3f40cd5f4), -W64LIT(0x14ea090bdc9640dc), -W64LIT(0x5e6474b5a922a4a9), -W64LIT(0xfee03ced68acbb68), -W64LIT(0x071328b6e3c8d2e3), -W64LIT(0x5302a2fc24a15624), -W64LIT(0x85c38c0701d46d01), -W64LIT(0x3d58cafefbbea1fb), -W64LIT(0x84505de46b250c6b), -W64LIT(0x642f96fdb154d7b1), -W64LIT(0xbf886e4f19a21e19), -W64LIT(0x02d35733d417c2d4), -W64LIT(0x68da915756264456), -W64LIT(0x8710db34d5c3afd5), -W64LIT(0x0d66d6498d83f28d), -W64LIT(0x7b23b0ea6978d669), -W64LIT(0x1b5f887185027085), -W64LIT(0x3ccb1b1d914fc091), -W64LIT(0x0453ae665d2e715d), -W64LIT(0xcb1e5fdf294ef829), -W64LIT(0xf6469521d2f059d2), -W64LIT(0xb03def3540362e40), -W64LIT(0x633cbe4b529c0552), -W64LIT(0xf7d544c2b80138b8), -W64LIT(0x7ab061090389b703), -W64LIT(0x0000000000000000), -W64LIT(0xdba7f8b2a8f6c9a8), -W64LIT(0x35fe633241e24341), -W64LIT(0x21146a399d74039d), -W64LIT(0xd581a82b9b93989b), -W64LIT(0x0935782fd0ad83d0), -W64LIT(0x5ff7a556c3d3c5c3), -W64LIT(0xaf31c922981a2f98), -W64LIT(0x90ba54efb7b34cb7), -W64LIT(0x5291731f4e50374e), -W64LIT(0xc0f870c32df4b92d), -W64LIT(0x7ee3cf6f5ea7c65e), -W64LIT(0xe07fcb19da71dbda), -W64LIT(0x4eddd3d8289a9528), -W64LIT(0x13f921bd3f5e923f), -W64LIT(0xf50613f16c16fa6c), -W64LIT(0x981cfd230defae0d), -W64LIT(0x4c0e84ebfc8d57fc), -W64LIT(0x82d0a4b1e21cbfe2), -W64LIT(0x89368bade6a6fee6), -W64LIT(0xd292809d785b4a78), -W64LIT(0x47e8abf7f83716f8), -W64LIT(0x8e25a31b056e2c05), -W64LIT(0xd752ff184f845a4f), -W64LIT(0xcc0d7769ca862aca), -W64LIT(0x694940b43cd7253c), -W64LIT(0x2ea1eb43c4e033c4), -W64LIT(0xde6787379f29d99f), -W64LIT(0x181f0ea13be4d33b), -W64LIT(0x416852a2710ea571), -W64LIT(0x62af6fa8386d6438), -W64LIT(0xa0844858c18e1fc1), -W64LIT(0x337e9a67c8dbf0c8), -W64LIT(0x2c72bc7010f7f110), -W64LIT(0xbd5b397ccdb5dccd), -W64LIT(0xd8e77e6216106a16), -W64LIT(0x86830ad7bf32cebf), -W64LIT(0x4f4e023b426bf442), -W64LIT(0xe5bfb49cedaecbed), -W64LIT(0x8a760d7d58405d58), -W64LIT(0xe2ac9c2a0e66190e), -W64LIT(0xb5fd90b077e93e77), -W64LIT(0xdcb4d0044b3e1b4b), -W64LIT(0x453bfcc42c20d42c), -W64LIT(0xed191d5057f22957), -W64LIT(0xe1ec1afab080bab0), -W64LIT(0xee599b80e9148ae9), -W64LIT(0x2607428f7ebcd17e), -W64LIT(0x5d24f26517c40717), -W64LIT(0x6a09c66482318682), -W64LIT(0xa604b10d48b7ac48), -W64LIT(0xbe1bbfac73537f73), -W64LIT(0x282112164dd9804d), -W64LIT(0x7505e0735a1d875a), -W64LIT(0x73851926d32434d3), -W64LIT(0xd974af817ce10b7c), -W64LIT(0xeb99e405decb9ade), -W64LIT(0x9b5c7bf3b3090db3), -W64LIT(0xfab3928b3582ca35), -W64LIT(0x8003f382360b7d36), -W64LIT(0x94e9fa89ea9d3dea), -W64LIT(0xb1ae3ed62ac74f2a), -W64LIT(0x9acfaa10d9f86cd9), -W64LIT(0x390b6498a690d0a6), -W64LIT(0xf2153b478fde288f), -W64LIT(0x71564e150733f607), -W64LIT(0xa3c4ce887f68bc7f), -W64LIT(0xaaf1b6a7afc53faf), -W64LIT(0x1ddf71240c3bc30c), -W64LIT(0x77d6b7408e0a458e), -W64LIT(0x2b6194c6f33f23f3), -W64LIT(0xc9cd08ecfd593afd), -W64LIT(0xc85ed90f97a85b97), -W64LIT(0x8cf6f428d179eed1), -W64LIT(0x957a2b6a806c5c80), -W64LIT(0xbbdbc029448c6f44), -W64LIT(0x7863363ad79e75d7), -W64LIT(0x6e5a6802df1ff7df), -W64LIT(0xfb2043685f73ab5f), -}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.cpp deleted file mode 100644 index 96f256b4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// simple.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "simple.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.h deleted file mode 100644 index 35fd65ae..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/simple.h +++ /dev/null @@ -1,209 +0,0 @@ -// simple.h - written and placed in the public domain by Wei Dai -/*! \file - Simple non-interface classes derived from classes in cryptlib.h. -*/ - -#ifndef CRYPTOPP_SIMPLE_H -#define CRYPTOPP_SIMPLE_H - -#include "cryptlib.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -class CRYPTOPP_NO_VTABLE ClonableImpl : public BASE -{ -public: - Clonable * Clone() const {return new DERIVED(*static_cast(this));} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE AlgorithmImpl : public BASE -{ -public: - static std::string CRYPTOPP_API StaticAlgorithmName() {return ALGORITHM_INFO::StaticAlgorithmName();} - std::string AlgorithmName() const {return ALGORITHM_INFO::StaticAlgorithmName();} -}; - -//! _ -class CRYPTOPP_DLL InvalidKeyLength : public InvalidArgument -{ -public: - explicit InvalidKeyLength(const std::string &algorithm, size_t length) : InvalidArgument(algorithm + ": " + IntToString(length) + " is not a valid key length") {} -}; - -//! _ -class CRYPTOPP_DLL InvalidRounds : public InvalidArgument -{ -public: - explicit InvalidRounds(const std::string &algorithm, unsigned int rounds) : InvalidArgument(algorithm + ": " + IntToString(rounds) + " is not a valid number of rounds") {} -}; - -// ***************************** - -//! _ -template -class CRYPTOPP_NO_VTABLE Bufferless : public T -{ -public: - bool IsolatedFlush(bool hardFlush, bool blocking) {return false;} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE Unflushable : public T -{ -public: - bool Flush(bool completeFlush, int propagation=-1, bool blocking=true) - {return ChannelFlush(DEFAULT_CHANNEL, completeFlush, propagation, blocking);} - bool IsolatedFlush(bool hardFlush, bool blocking) - {assert(false); return false;} - bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true) - { - if (hardFlush && !InputBufferIsEmpty()) - throw CannotFlush("Unflushable: this object has buffered input that cannot be flushed"); - else - { - BufferedTransformation *attached = this->AttachedTransformation(); - return attached && propagation ? attached->ChannelFlush(channel, hardFlush, propagation-1, blocking) : false; - } - } - -protected: - virtual bool InputBufferIsEmpty() const {return false;} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE InputRejecting : public T -{ -public: - struct InputRejected : public NotImplemented - {InputRejected() : NotImplemented("BufferedTransformation: this object doesn't allow input") {}}; - - // shouldn't be calling these functions on this class - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - {throw InputRejected();} - bool IsolatedFlush(bool, bool) {return false;} - bool IsolatedMessageSeriesEnd(bool) {throw InputRejected();} - - size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) - {throw InputRejected();} - bool ChannelMessageSeriesEnd(const std::string &, int, bool) {throw InputRejected();} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE CustomFlushPropagation : public T -{ -public: - virtual bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) =0; - -private: - bool IsolatedFlush(bool hardFlush, bool blocking) {assert(false); return false;} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE CustomSignalPropagation : public CustomFlushPropagation -{ -public: - virtual void Initialize(const NameValuePairs ¶meters=g_nullNameValuePairs, int propagation=-1) =0; - -private: - void IsolatedInitialize(const NameValuePairs ¶meters) {assert(false);} -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE Multichannel : public CustomFlushPropagation -{ -public: - bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) - {return this->ChannelFlush(DEFAULT_CHANNEL, hardFlush, propagation, blocking);} - bool MessageSeriesEnd(int propagation=-1, bool blocking=true) - {return this->ChannelMessageSeriesEnd(DEFAULT_CHANNEL, propagation, blocking);} - byte * CreatePutSpace(size_t &size) - {return this->ChannelCreatePutSpace(DEFAULT_CHANNEL, size);} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - {return this->ChannelPut2(DEFAULT_CHANNEL, begin, length, messageEnd, blocking);} - size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking) - {return this->ChannelPutModifiable2(DEFAULT_CHANNEL, inString, length, messageEnd, blocking);} - -// void ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1) -// {PropagateMessageSeriesEnd(propagation, channel);} - byte * ChannelCreatePutSpace(const std::string &channel, size_t &size) - {size = 0; return NULL;} - bool ChannelPutModifiable(const std::string &channel, byte *inString, size_t length) - {this->ChannelPut(channel, inString, length); return false;} - - virtual size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) =0; - size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking) - {return ChannelPut2(channel, begin, length, messageEnd, blocking);} - - virtual bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true) =0; -}; - -//! _ -template -class CRYPTOPP_NO_VTABLE AutoSignaling : public T -{ -public: - AutoSignaling(int propagation=-1) : m_autoSignalPropagation(propagation) {} - - void SetAutoSignalPropagation(int propagation) - {m_autoSignalPropagation = propagation;} - int GetAutoSignalPropagation() const - {return m_autoSignalPropagation;} - -private: - int m_autoSignalPropagation; -}; - -//! A BufferedTransformation that only contains pre-existing data as "output" -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Store : public AutoSignaling > -{ -public: - Store() : m_messageEnd(false) {} - - void IsolatedInitialize(const NameValuePairs ¶meters) - { - m_messageEnd = false; - StoreInitialize(parameters); - } - - unsigned int NumberOfMessages() const {return m_messageEnd ? 0 : 1;} - bool GetNextMessage(); - unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const; - -protected: - virtual void StoreInitialize(const NameValuePairs ¶meters) =0; - - bool m_messageEnd; -}; - -//! A BufferedTransformation that doesn't produce any retrievable output -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Sink : public BufferedTransformation -{ -public: - size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) - {transferBytes = 0; return 0;} - size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const - {return 0;} -}; - -class CRYPTOPP_DLL BitBucket : public Bufferless -{ -public: - std::string AlgorithmName() const {return "BitBucket";} - void IsolatedInitialize(const NameValuePairs ¶meters) {} - size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking) - {return 0;} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.cpp deleted file mode 100644 index dad14bd7..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.cpp +++ /dev/null @@ -1,202 +0,0 @@ -// skipjack.cpp - modified by Wei Dai from Paulo Barreto's skipjack32.c, -// which is public domain according to his web site. - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "skipjack.h" - -/* - * Optimized implementation of SKIPJACK algorithm - * - * originally written by Panu Rissanen 1998.06.24 - * optimized by Mark Tillotson 1998.06.25 - * optimized by Paulo Barreto 1998.06.30 - */ - -NAMESPACE_BEGIN(CryptoPP) - -/** - * The F-table byte permutation (see description of the G-box permutation) - */ -const byte SKIPJACK::Base::fTable[256] = { - 0xa3,0xd7,0x09,0x83,0xf8,0x48,0xf6,0xf4,0xb3,0x21,0x15,0x78,0x99,0xb1,0xaf,0xf9, - 0xe7,0x2d,0x4d,0x8a,0xce,0x4c,0xca,0x2e,0x52,0x95,0xd9,0x1e,0x4e,0x38,0x44,0x28, - 0x0a,0xdf,0x02,0xa0,0x17,0xf1,0x60,0x68,0x12,0xb7,0x7a,0xc3,0xe9,0xfa,0x3d,0x53, - 0x96,0x84,0x6b,0xba,0xf2,0x63,0x9a,0x19,0x7c,0xae,0xe5,0xf5,0xf7,0x16,0x6a,0xa2, - 0x39,0xb6,0x7b,0x0f,0xc1,0x93,0x81,0x1b,0xee,0xb4,0x1a,0xea,0xd0,0x91,0x2f,0xb8, - 0x55,0xb9,0xda,0x85,0x3f,0x41,0xbf,0xe0,0x5a,0x58,0x80,0x5f,0x66,0x0b,0xd8,0x90, - 0x35,0xd5,0xc0,0xa7,0x33,0x06,0x65,0x69,0x45,0x00,0x94,0x56,0x6d,0x98,0x9b,0x76, - 0x97,0xfc,0xb2,0xc2,0xb0,0xfe,0xdb,0x20,0xe1,0xeb,0xd6,0xe4,0xdd,0x47,0x4a,0x1d, - 0x42,0xed,0x9e,0x6e,0x49,0x3c,0xcd,0x43,0x27,0xd2,0x07,0xd4,0xde,0xc7,0x67,0x18, - 0x89,0xcb,0x30,0x1f,0x8d,0xc6,0x8f,0xaa,0xc8,0x74,0xdc,0xc9,0x5d,0x5c,0x31,0xa4, - 0x70,0x88,0x61,0x2c,0x9f,0x0d,0x2b,0x87,0x50,0x82,0x54,0x64,0x26,0x7d,0x03,0x40, - 0x34,0x4b,0x1c,0x73,0xd1,0xc4,0xfd,0x3b,0xcc,0xfb,0x7f,0xab,0xe6,0x3e,0x5b,0xa5, - 0xad,0x04,0x23,0x9c,0x14,0x51,0x22,0xf0,0x29,0x79,0x71,0x7e,0xff,0x8c,0x0e,0xe2, - 0x0c,0xef,0xbc,0x72,0x75,0x6f,0x37,0xa1,0xec,0xd3,0x8e,0x62,0x8b,0x86,0x10,0xe8, - 0x08,0x77,0x11,0xbe,0x92,0x4f,0x24,0xc5,0x32,0x36,0x9d,0xcf,0xf3,0xa6,0xbb,0xac, - 0x5e,0x6c,0xa9,0x13,0x57,0x25,0xb5,0xe3,0xbd,0xa8,0x3a,0x01,0x05,0x59,0x2a,0x46 -}; - -/** - * The key-dependent permutation G on V^16 is a four-round Feistel network. - * The round function is a fixed byte-substitution table (permutation on V^8), - * the F-table. Each round of G incorporates a single byte from the key. - */ -#define g(tab, w, i, j, k, l) \ -{ \ - w ^= (word)tab[i*256 + (w & 0xff)] << 8; \ - w ^= (word)tab[j*256 + (w >> 8)]; \ - w ^= (word)tab[k*256 + (w & 0xff)] << 8; \ - w ^= (word)tab[l*256 + (w >> 8)]; \ -} - -#define g0(tab, w) g(tab, w, 0, 1, 2, 3) -#define g1(tab, w) g(tab, w, 4, 5, 6, 7) -#define g2(tab, w) g(tab, w, 8, 9, 0, 1) -#define g3(tab, w) g(tab, w, 2, 3, 4, 5) -#define g4(tab, w) g(tab, w, 6, 7, 8, 9) - -/** - * The inverse of the G permutation. - */ -#define h(tab, w, i, j, k, l) \ -{ \ - w ^= (word)tab[l*256 + (w >> 8)]; \ - w ^= (word)tab[k*256 + (w & 0xff)] << 8; \ - w ^= (word)tab[j*256 + (w >> 8)]; \ - w ^= (word)tab[i*256 + (w & 0xff)] << 8; \ -} - -#define h0(tab, w) h(tab, w, 0, 1, 2, 3) -#define h1(tab, w) h(tab, w, 4, 5, 6, 7) -#define h2(tab, w) h(tab, w, 8, 9, 0, 1) -#define h3(tab, w) h(tab, w, 2, 3, 4, 5) -#define h4(tab, w) h(tab, w, 6, 7, 8, 9) - -/** - * Preprocess a user key into a table to save an XOR at each F-table access. - */ -void SKIPJACK::Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - /* tab[i][c] = fTable[c ^ key[i]] */ - int i; - for (i = 0; i < 10; i++) { - byte *t = tab+i*256, k = key[9-i]; - int c; - for (c = 0; c < 256; c++) { - t[c] = fTable[c ^ k]; - } - } -} - -typedef BlockGetAndPut Block; - -/** - * Encrypt a single block of data. - */ -void SKIPJACK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word16 w1, w2, w3, w4; - Block::Get(inBlock)(w4)(w3)(w2)(w1); - - /* stepping rule A: */ - g0(tab, w1); w4 ^= w1 ^ 1; - g1(tab, w4); w3 ^= w4 ^ 2; - g2(tab, w3); w2 ^= w3 ^ 3; - g3(tab, w2); w1 ^= w2 ^ 4; - g4(tab, w1); w4 ^= w1 ^ 5; - g0(tab, w4); w3 ^= w4 ^ 6; - g1(tab, w3); w2 ^= w3 ^ 7; - g2(tab, w2); w1 ^= w2 ^ 8; - - /* stepping rule B: */ - w2 ^= w1 ^ 9; g3(tab, w1); - w1 ^= w4 ^ 10; g4(tab, w4); - w4 ^= w3 ^ 11; g0(tab, w3); - w3 ^= w2 ^ 12; g1(tab, w2); - w2 ^= w1 ^ 13; g2(tab, w1); - w1 ^= w4 ^ 14; g3(tab, w4); - w4 ^= w3 ^ 15; g4(tab, w3); - w3 ^= w2 ^ 16; g0(tab, w2); - - /* stepping rule A: */ - g1(tab, w1); w4 ^= w1 ^ 17; - g2(tab, w4); w3 ^= w4 ^ 18; - g3(tab, w3); w2 ^= w3 ^ 19; - g4(tab, w2); w1 ^= w2 ^ 20; - g0(tab, w1); w4 ^= w1 ^ 21; - g1(tab, w4); w3 ^= w4 ^ 22; - g2(tab, w3); w2 ^= w3 ^ 23; - g3(tab, w2); w1 ^= w2 ^ 24; - - /* stepping rule B: */ - w2 ^= w1 ^ 25; g4(tab, w1); - w1 ^= w4 ^ 26; g0(tab, w4); - w4 ^= w3 ^ 27; g1(tab, w3); - w3 ^= w2 ^ 28; g2(tab, w2); - w2 ^= w1 ^ 29; g3(tab, w1); - w1 ^= w4 ^ 30; g4(tab, w4); - w4 ^= w3 ^ 31; g0(tab, w3); - w3 ^= w2 ^ 32; g1(tab, w2); - - Block::Put(xorBlock, outBlock)(w4)(w3)(w2)(w1); -} - -/** - * Decrypt a single block of data. - */ -void SKIPJACK::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word16 w1, w2, w3, w4; - Block::Get(inBlock)(w4)(w3)(w2)(w1); - - /* stepping rule A: */ - h1(tab, w2); w3 ^= w2 ^ 32; - h0(tab, w3); w4 ^= w3 ^ 31; - h4(tab, w4); w1 ^= w4 ^ 30; - h3(tab, w1); w2 ^= w1 ^ 29; - h2(tab, w2); w3 ^= w2 ^ 28; - h1(tab, w3); w4 ^= w3 ^ 27; - h0(tab, w4); w1 ^= w4 ^ 26; - h4(tab, w1); w2 ^= w1 ^ 25; - - /* stepping rule B: */ - w1 ^= w2 ^ 24; h3(tab, w2); - w2 ^= w3 ^ 23; h2(tab, w3); - w3 ^= w4 ^ 22; h1(tab, w4); - w4 ^= w1 ^ 21; h0(tab, w1); - w1 ^= w2 ^ 20; h4(tab, w2); - w2 ^= w3 ^ 19; h3(tab, w3); - w3 ^= w4 ^ 18; h2(tab, w4); - w4 ^= w1 ^ 17; h1(tab, w1); - - /* stepping rule A: */ - h0(tab, w2); w3 ^= w2 ^ 16; - h4(tab, w3); w4 ^= w3 ^ 15; - h3(tab, w4); w1 ^= w4 ^ 14; - h2(tab, w1); w2 ^= w1 ^ 13; - h1(tab, w2); w3 ^= w2 ^ 12; - h0(tab, w3); w4 ^= w3 ^ 11; - h4(tab, w4); w1 ^= w4 ^ 10; - h3(tab, w1); w2 ^= w1 ^ 9; - - /* stepping rule B: */ - w1 ^= w2 ^ 8; h2(tab, w2); - w2 ^= w3 ^ 7; h1(tab, w3); - w3 ^= w4 ^ 6; h0(tab, w4); - w4 ^= w1 ^ 5; h4(tab, w1); - w1 ^= w2 ^ 4; h3(tab, w2); - w2 ^= w3 ^ 3; h2(tab, w3); - w3 ^= w4 ^ 2; h1(tab, w4); - w4 ^= w1 ^ 1; h0(tab, w1); - - Block::Put(xorBlock, outBlock)(w4)(w3)(w2)(w1); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.h deleted file mode 100644 index 6b126473..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/skipjack.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef CRYPTOPP_SKIPJACK_H -#define CRYPTOPP_SKIPJACK_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct SKIPJACK_Info : public FixedBlockSize<8>, public FixedKeyLength<10> -{ - CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "SKIPJACK";} -}; - -/// SKIPJACK -class SKIPJACK : public SKIPJACK_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - unsigned int OptimalDataAlignment() const {return GetAlignmentOf();} - - protected: - static const byte fTable[256]; - - FixedSizeSecBlock tab; - }; - - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - private: - static const byte Se[256]; - static const word32 Te[4][256]; - }; - - class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - private: - static const byte Sd[256]; - static const word32 Td[4][256]; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef SKIPJACK::Encryption SKIPJACKEncryption; -typedef SKIPJACK::Decryption SKIPJACKDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/smartptr.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/smartptr.h deleted file mode 100644 index a0a727ed..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/smartptr.h +++ /dev/null @@ -1,223 +0,0 @@ -#ifndef CRYPTOPP_SMARTPTR_H -#define CRYPTOPP_SMARTPTR_H - -#include "config.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -template class simple_ptr -{ -public: - simple_ptr(T *p = NULL) : m_p(p) {} - ~simple_ptr() {delete m_p; m_p = NULL;} // set m_p to NULL so double destruction (which might occur in Singleton) will be harmless - T *m_p; -}; - -template class member_ptr -{ -public: - explicit member_ptr(T *p = NULL) : m_p(p) {} - - ~member_ptr(); - - const T& operator*() const { return *m_p; } - T& operator*() { return *m_p; } - - const T* operator->() const { return m_p; } - T* operator->() { return m_p; } - - const T* get() const { return m_p; } - T* get() { return m_p; } - - T* release() - { - T *old_p = m_p; - m_p = 0; - return old_p; - } - - void reset(T *p = 0); - -protected: - member_ptr(const member_ptr& rhs); // copy not allowed - void operator=(const member_ptr& rhs); // assignment not allowed - - T *m_p; -}; - -template member_ptr::~member_ptr() {delete m_p;} -template void member_ptr::reset(T *p) {delete m_p; m_p = p;} - -// ******************************************************** - -template class value_ptr : public member_ptr -{ -public: - value_ptr(const T &obj) : member_ptr(new T(obj)) {} - value_ptr(T *p = NULL) : member_ptr(p) {} - value_ptr(const value_ptr& rhs) - : member_ptr(rhs.m_p ? new T(*rhs.m_p) : NULL) {} - - value_ptr& operator=(const value_ptr& rhs); - bool operator==(const value_ptr& rhs) - { - return (!this->m_p && !rhs.m_p) || (this->m_p && rhs.m_p && *this->m_p == *rhs.m_p); - } -}; - -template value_ptr& value_ptr::operator=(const value_ptr& rhs) -{ - T *old_p = this->m_p; - this->m_p = rhs.m_p ? new T(*rhs.m_p) : NULL; - delete old_p; - return *this; -} - -// ******************************************************** - -template class clonable_ptr : public member_ptr -{ -public: - clonable_ptr(const T &obj) : member_ptr(obj.Clone()) {} - clonable_ptr(T *p = NULL) : member_ptr(p) {} - clonable_ptr(const clonable_ptr& rhs) - : member_ptr(rhs.m_p ? rhs.m_p->Clone() : NULL) {} - - clonable_ptr& operator=(const clonable_ptr& rhs); -}; - -template clonable_ptr& clonable_ptr::operator=(const clonable_ptr& rhs) -{ - T *old_p = this->m_p; - this->m_p = rhs.m_p ? rhs.m_p->Clone() : NULL; - delete old_p; - return *this; -} - -// ******************************************************** - -template class counted_ptr -{ -public: - explicit counted_ptr(T *p = 0); - counted_ptr(const T &r) : m_p(0) {attach(r);} - counted_ptr(const counted_ptr& rhs); - - ~counted_ptr(); - - const T& operator*() const { return *m_p; } - T& operator*() { return *m_p; } - - const T* operator->() const { return m_p; } - T* operator->() { return get(); } - - const T* get() const { return m_p; } - T* get(); - - void attach(const T &p); - - counted_ptr & operator=(const counted_ptr& rhs); - -private: - T *m_p; -}; - -template counted_ptr::counted_ptr(T *p) - : m_p(p) -{ - if (m_p) - m_p->m_referenceCount = 1; -} - -template counted_ptr::counted_ptr(const counted_ptr& rhs) - : m_p(rhs.m_p) -{ - if (m_p) - m_p->m_referenceCount++; -} - -template counted_ptr::~counted_ptr() -{ - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; -} - -template void counted_ptr::attach(const T &r) -{ - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; - if (r.m_referenceCount == 0) - { - m_p = r.clone(); - m_p->m_referenceCount = 1; - } - else - { - m_p = const_cast(&r); - m_p->m_referenceCount++; - } -} - -template T* counted_ptr::get() -{ - if (m_p && m_p->m_referenceCount > 1) - { - T *temp = m_p->clone(); - m_p->m_referenceCount--; - m_p = temp; - m_p->m_referenceCount = 1; - } - return m_p; -} - -template counted_ptr & counted_ptr::operator=(const counted_ptr& rhs) -{ - if (m_p != rhs.m_p) - { - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; - m_p = rhs.m_p; - if (m_p) - m_p->m_referenceCount++; - } - return *this; -} - -// ******************************************************** - -template class vector_member_ptrs -{ -public: - vector_member_ptrs(size_t size=0) - : m_size(size), m_ptr(new member_ptr[size]) {} - ~vector_member_ptrs() - {delete [] this->m_ptr;} - - member_ptr& operator[](size_t index) - {assert(indexm_size); return this->m_ptr[index];} - const member_ptr& operator[](size_t index) const - {assert(indexm_size); return this->m_ptr[index];} - - size_t size() const {return this->m_size;} - void resize(size_t newSize) - { - member_ptr *newPtr = new member_ptr[newSize]; - for (size_t i=0; im_size && im_ptr[i].release()); - delete [] this->m_ptr; - this->m_size = newSize; - this->m_ptr = newPtr; - } - -private: - vector_member_ptrs(const vector_member_ptrs &c); // copy not allowed - void operator=(const vector_member_ptrs &x); // assignment not allowed - - size_t m_size; - member_ptr *m_ptr; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.cpp deleted file mode 100644 index 6c5a8ff9..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.cpp +++ /dev/null @@ -1,531 +0,0 @@ -// socketft.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "socketft.h" - -#ifdef SOCKETS_AVAILABLE - -#include "wait.h" - -#ifdef USE_BERKELEY_STYLE_SOCKETS -#include -#include -#include -#include -#include -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef USE_WINDOWS_STYLE_SOCKETS -const int SOCKET_EINVAL = WSAEINVAL; -const int SOCKET_EWOULDBLOCK = WSAEWOULDBLOCK; -typedef int socklen_t; -#else -const int SOCKET_EINVAL = EINVAL; -const int SOCKET_EWOULDBLOCK = EWOULDBLOCK; -#endif - -Socket::Err::Err(socket_t s, const std::string& operation, int error) - : OS_Error(IO_ERROR, "Socket: " + operation + " operation failed with error " + IntToString(error), operation, error) - , m_s(s) -{ -} - -Socket::~Socket() -{ - if (m_own) - { - try - { - CloseSocket(); - } - catch (...) - { - } - } -} - -void Socket::AttachSocket(socket_t s, bool own) -{ - if (m_own) - CloseSocket(); - - m_s = s; - m_own = own; - SocketChanged(); -} - -socket_t Socket::DetachSocket() -{ - socket_t s = m_s; - m_s = INVALID_SOCKET; - SocketChanged(); - return s; -} - -void Socket::Create(int nType) -{ - assert(m_s == INVALID_SOCKET); - m_s = socket(AF_INET, nType, 0); - CheckAndHandleError("socket", m_s); - m_own = true; - SocketChanged(); -} - -void Socket::CloseSocket() -{ - if (m_s != INVALID_SOCKET) - { -#ifdef USE_WINDOWS_STYLE_SOCKETS - CancelIo((HANDLE) m_s); - CheckAndHandleError_int("closesocket", closesocket(m_s)); -#else - CheckAndHandleError_int("close", close(m_s)); -#endif - m_s = INVALID_SOCKET; - SocketChanged(); - } -} - -void Socket::Bind(unsigned int port, const char *addr) -{ - sockaddr_in sa; - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - - if (addr == NULL) - sa.sin_addr.s_addr = htonl(INADDR_ANY); - else - { - unsigned long result = inet_addr(addr); - if (result == -1) // Solaris doesn't have INADDR_NONE - { - SetLastError(SOCKET_EINVAL); - CheckAndHandleError_int("inet_addr", SOCKET_ERROR); - } - sa.sin_addr.s_addr = result; - } - - sa.sin_port = htons((u_short)port); - - Bind((sockaddr *)&sa, sizeof(sa)); -} - -void Socket::Bind(const sockaddr *psa, socklen_t saLen) -{ - assert(m_s != INVALID_SOCKET); - // cygwin workaround: needs const_cast - CheckAndHandleError_int("bind", bind(m_s, const_cast(psa), saLen)); -} - -void Socket::Listen(int backlog) -{ - assert(m_s != INVALID_SOCKET); - CheckAndHandleError_int("listen", listen(m_s, backlog)); -} - -bool Socket::Connect(const char *addr, unsigned int port) -{ - assert(addr != NULL); - - sockaddr_in sa; - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_addr.s_addr = inet_addr(addr); - - if (sa.sin_addr.s_addr == -1) // Solaris doesn't have INADDR_NONE - { - hostent *lphost = gethostbyname(addr); - if (lphost == NULL) - { - SetLastError(SOCKET_EINVAL); - CheckAndHandleError_int("gethostbyname", SOCKET_ERROR); - } - - sa.sin_addr.s_addr = ((in_addr *)lphost->h_addr)->s_addr; - } - - sa.sin_port = htons((u_short)port); - - return Connect((const sockaddr *)&sa, sizeof(sa)); -} - -bool Socket::Connect(const sockaddr* psa, socklen_t saLen) -{ - assert(m_s != INVALID_SOCKET); - int result = connect(m_s, const_cast(psa), saLen); - if (result == SOCKET_ERROR && GetLastError() == SOCKET_EWOULDBLOCK) - return false; - CheckAndHandleError_int("connect", result); - return true; -} - -bool Socket::Accept(Socket& target, sockaddr *psa, socklen_t *psaLen) -{ - assert(m_s != INVALID_SOCKET); - socket_t s = accept(m_s, psa, psaLen); - if (s == INVALID_SOCKET && GetLastError() == SOCKET_EWOULDBLOCK) - return false; - CheckAndHandleError("accept", s); - target.AttachSocket(s, true); - return true; -} - -void Socket::GetSockName(sockaddr *psa, socklen_t *psaLen) -{ - assert(m_s != INVALID_SOCKET); - CheckAndHandleError_int("getsockname", getsockname(m_s, psa, psaLen)); -} - -void Socket::GetPeerName(sockaddr *psa, socklen_t *psaLen) -{ - assert(m_s != INVALID_SOCKET); - CheckAndHandleError_int("getpeername", getpeername(m_s, psa, psaLen)); -} - -unsigned int Socket::Send(const byte* buf, size_t bufLen, int flags) -{ - assert(m_s != INVALID_SOCKET); - int result = send(m_s, (const char *)buf, UnsignedMin(INT_MAX, bufLen), flags); - CheckAndHandleError_int("send", result); - return result; -} - -unsigned int Socket::Receive(byte* buf, size_t bufLen, int flags) -{ - assert(m_s != INVALID_SOCKET); - int result = recv(m_s, (char *)buf, UnsignedMin(INT_MAX, bufLen), flags); - CheckAndHandleError_int("recv", result); - return result; -} - -void Socket::ShutDown(int how) -{ - assert(m_s != INVALID_SOCKET); - int result = shutdown(m_s, how); - CheckAndHandleError_int("shutdown", result); -} - -void Socket::IOCtl(long cmd, unsigned long *argp) -{ - assert(m_s != INVALID_SOCKET); -#ifdef USE_WINDOWS_STYLE_SOCKETS - CheckAndHandleError_int("ioctlsocket", ioctlsocket(m_s, cmd, argp)); -#else - CheckAndHandleError_int("ioctl", ioctl(m_s, cmd, argp)); -#endif -} - -bool Socket::SendReady(const timeval *timeout) -{ - fd_set fds; - FD_ZERO(&fds); - FD_SET(m_s, &fds); - int ready; - if (timeout == NULL) - ready = select((int)m_s+1, NULL, &fds, NULL, NULL); - else - { - timeval timeoutCopy = *timeout; // select() modified timeout on Linux - ready = select((int)m_s+1, NULL, &fds, NULL, &timeoutCopy); - } - CheckAndHandleError_int("select", ready); - return ready > 0; -} - -bool Socket::ReceiveReady(const timeval *timeout) -{ - fd_set fds; - FD_ZERO(&fds); - FD_SET(m_s, &fds); - int ready; - if (timeout == NULL) - ready = select((int)m_s+1, &fds, NULL, NULL, NULL); - else - { - timeval timeoutCopy = *timeout; // select() modified timeout on Linux - ready = select((int)m_s+1, &fds, NULL, NULL, &timeoutCopy); - } - CheckAndHandleError_int("select", ready); - return ready > 0; -} - -unsigned int Socket::PortNameToNumber(const char *name, const char *protocol) -{ - int port = atoi(name); - if (IntToString(port) == name) - return port; - - servent *se = getservbyname(name, protocol); - if (!se) - throw Err(INVALID_SOCKET, "getservbyname", SOCKET_EINVAL); - return ntohs(se->s_port); -} - -void Socket::StartSockets() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - WSADATA wsd; - int result = WSAStartup(0x0202, &wsd); - if (result != 0) - throw Err(INVALID_SOCKET, "WSAStartup", result); -#endif -} - -void Socket::ShutdownSockets() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - int result = WSACleanup(); - if (result != 0) - throw Err(INVALID_SOCKET, "WSACleanup", result); -#endif -} - -int Socket::GetLastError() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - return WSAGetLastError(); -#else - return errno; -#endif -} - -void Socket::SetLastError(int errorCode) -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - WSASetLastError(errorCode); -#else - errno = errorCode; -#endif -} - -void Socket::HandleError(const char *operation) const -{ - int err = GetLastError(); - throw Err(m_s, operation, err); -} - -#ifdef USE_WINDOWS_STYLE_SOCKETS - -SocketReceiver::SocketReceiver(Socket &s) - : m_s(s), m_resultPending(false), m_eofReceived(false) -{ - m_event.AttachHandle(CreateEvent(NULL, true, false, NULL), true); - m_s.CheckAndHandleError("CreateEvent", m_event.HandleValid()); - memset(&m_overlapped, 0, sizeof(m_overlapped)); - m_overlapped.hEvent = m_event; -} - -SocketReceiver::~SocketReceiver() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - CancelIo((HANDLE) m_s.GetSocket()); -#endif -} - -bool SocketReceiver::Receive(byte* buf, size_t bufLen) -{ - assert(!m_resultPending && !m_eofReceived); - - DWORD flags = 0; - // don't queue too much at once, or we might use up non-paged memory - WSABUF wsabuf = {UnsignedMin((u_long)128*1024, bufLen), (char *)buf}; - if (WSARecv(m_s, &wsabuf, 1, &m_lastResult, &flags, &m_overlapped, NULL) == 0) - { - if (m_lastResult == 0) - m_eofReceived = true; - } - else - { - switch (WSAGetLastError()) - { - default: - m_s.CheckAndHandleError_int("WSARecv", SOCKET_ERROR); - case WSAEDISCON: - m_lastResult = 0; - m_eofReceived = true; - break; - case WSA_IO_PENDING: - m_resultPending = true; - } - } - return !m_resultPending; -} - -void SocketReceiver::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (m_resultPending) - container.AddHandle(m_event, CallStack("SocketReceiver::GetWaitObjects() - result pending", &callStack)); - else if (!m_eofReceived) - container.SetNoWait(CallStack("SocketReceiver::GetWaitObjects() - result ready", &callStack)); -} - -unsigned int SocketReceiver::GetReceiveResult() -{ - if (m_resultPending) - { - DWORD flags = 0; - if (WSAGetOverlappedResult(m_s, &m_overlapped, &m_lastResult, false, &flags)) - { - if (m_lastResult == 0) - m_eofReceived = true; - } - else - { - switch (WSAGetLastError()) - { - default: - m_s.CheckAndHandleError("WSAGetOverlappedResult", FALSE); - case WSAEDISCON: - m_lastResult = 0; - m_eofReceived = true; - } - } - m_resultPending = false; - } - return m_lastResult; -} - -// ************************************************************* - -SocketSender::SocketSender(Socket &s) - : m_s(s), m_resultPending(false), m_lastResult(0) -{ - m_event.AttachHandle(CreateEvent(NULL, true, false, NULL), true); - m_s.CheckAndHandleError("CreateEvent", m_event.HandleValid()); - memset(&m_overlapped, 0, sizeof(m_overlapped)); - m_overlapped.hEvent = m_event; -} - - -SocketSender::~SocketSender() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - CancelIo((HANDLE) m_s.GetSocket()); -#endif -} - -void SocketSender::Send(const byte* buf, size_t bufLen) -{ - assert(!m_resultPending); - DWORD written = 0; - // don't queue too much at once, or we might use up non-paged memory - WSABUF wsabuf = {UnsignedMin((u_long)128*1024, bufLen), (char *)buf}; - if (WSASend(m_s, &wsabuf, 1, &written, 0, &m_overlapped, NULL) == 0) - { - m_resultPending = false; - m_lastResult = written; - } - else - { - if (WSAGetLastError() != WSA_IO_PENDING) - m_s.CheckAndHandleError_int("WSASend", SOCKET_ERROR); - - m_resultPending = true; - } -} - -void SocketSender::SendEof() -{ - assert(!m_resultPending); - m_s.ShutDown(SD_SEND); - m_s.CheckAndHandleError("ResetEvent", ResetEvent(m_event)); - m_s.CheckAndHandleError_int("WSAEventSelect", WSAEventSelect(m_s, m_event, FD_CLOSE)); - m_resultPending = true; -} - -bool SocketSender::EofSent() -{ - if (m_resultPending) - { - WSANETWORKEVENTS events; - m_s.CheckAndHandleError_int("WSAEnumNetworkEvents", WSAEnumNetworkEvents(m_s, m_event, &events)); - if ((events.lNetworkEvents & FD_CLOSE) != FD_CLOSE) - throw Socket::Err(m_s, "WSAEnumNetworkEvents (FD_CLOSE not present)", E_FAIL); - if (events.iErrorCode[FD_CLOSE_BIT] != 0) - throw Socket::Err(m_s, "FD_CLOSE (via WSAEnumNetworkEvents)", events.iErrorCode[FD_CLOSE_BIT]); - m_resultPending = false; - } - return m_lastResult != 0; -} - -void SocketSender::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (m_resultPending) - container.AddHandle(m_event, CallStack("SocketSender::GetWaitObjects() - result pending", &callStack)); - else - container.SetNoWait(CallStack("SocketSender::GetWaitObjects() - result ready", &callStack)); -} - -unsigned int SocketSender::GetSendResult() -{ - if (m_resultPending) - { - DWORD flags = 0; - BOOL result = WSAGetOverlappedResult(m_s, &m_overlapped, &m_lastResult, false, &flags); - m_s.CheckAndHandleError("WSAGetOverlappedResult", result); - m_resultPending = false; - } - return m_lastResult; -} - -#endif - -#ifdef USE_BERKELEY_STYLE_SOCKETS - -SocketReceiver::SocketReceiver(Socket &s) - : m_s(s), m_lastResult(0), m_eofReceived(false) -{ -} - -void SocketReceiver::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (!m_eofReceived) - container.AddReadFd(m_s, CallStack("SocketReceiver::GetWaitObjects()", &callStack)); -} - -bool SocketReceiver::Receive(byte* buf, size_t bufLen) -{ - m_lastResult = m_s.Receive(buf, bufLen); - if (bufLen > 0 && m_lastResult == 0) - m_eofReceived = true; - return true; -} - -unsigned int SocketReceiver::GetReceiveResult() -{ - return m_lastResult; -} - -SocketSender::SocketSender(Socket &s) - : m_s(s), m_lastResult(0) -{ -} - -void SocketSender::Send(const byte* buf, size_t bufLen) -{ - m_lastResult = m_s.Send(buf, bufLen); -} - -void SocketSender::SendEof() -{ - m_s.ShutDown(SD_SEND); -} - -unsigned int SocketSender::GetSendResult() -{ - return m_lastResult; -} - -void SocketSender::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - container.AddWriteFd(m_s, CallStack("SocketSender::GetWaitObjects()", &callStack)); -} - -#endif - -NAMESPACE_END - -#endif // #ifdef SOCKETS_AVAILABLE diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.h deleted file mode 100644 index e414aa68..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/socketft.h +++ /dev/null @@ -1,224 +0,0 @@ -#ifndef CRYPTOPP_SOCKETFT_H -#define CRYPTOPP_SOCKETFT_H - -#include "config.h" - -#ifdef SOCKETS_AVAILABLE - -#include "network.h" -#include "queue.h" - -#ifdef USE_WINDOWS_STYLE_SOCKETS -# if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) -# error Winsock 1 is not supported by this library. Please include this file or winsock2.h before windows.h. -# endif -#include -#include "winpipes.h" -#else -#include -#include -#include -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef USE_WINDOWS_STYLE_SOCKETS -typedef ::SOCKET socket_t; -#else -typedef int socket_t; -const socket_t INVALID_SOCKET = -1; -// cygwin 1.1.4 doesn't have SHUT_RD -const int SD_RECEIVE = 0; -const int SD_SEND = 1; -const int SD_BOTH = 2; -const int SOCKET_ERROR = -1; -#endif - -#ifndef socklen_t -typedef TYPE_OF_SOCKLEN_T socklen_t; // see config.h -#endif - -//! wrapper for Windows or Berkeley Sockets -class Socket -{ -public: - //! exception thrown by Socket class - class Err : public OS_Error - { - public: - Err(socket_t s, const std::string& operation, int error); - socket_t GetSocket() const {return m_s;} - - private: - socket_t m_s; - }; - - Socket(socket_t s = INVALID_SOCKET, bool own=false) : m_s(s), m_own(own) {} - Socket(const Socket &s) : m_s(s.m_s), m_own(false) {} - virtual ~Socket(); - - bool GetOwnership() const {return m_own;} - void SetOwnership(bool own) {m_own = own;} - - operator socket_t() {return m_s;} - socket_t GetSocket() const {return m_s;} - void AttachSocket(socket_t s, bool own=false); - socket_t DetachSocket(); - void CloseSocket(); - - void Create(int nType = SOCK_STREAM); - void Bind(unsigned int port, const char *addr=NULL); - void Bind(const sockaddr* psa, socklen_t saLen); - void Listen(int backlog=5); - // the next three functions return false if the socket is in nonblocking mode - // and the operation cannot be completed immediately - bool Connect(const char *addr, unsigned int port); - bool Connect(const sockaddr* psa, socklen_t saLen); - bool Accept(Socket& s, sockaddr *psa=NULL, socklen_t *psaLen=NULL); - void GetSockName(sockaddr *psa, socklen_t *psaLen); - void GetPeerName(sockaddr *psa, socklen_t *psaLen); - unsigned int Send(const byte* buf, size_t bufLen, int flags=0); - unsigned int Receive(byte* buf, size_t bufLen, int flags=0); - void ShutDown(int how = SD_SEND); - - void IOCtl(long cmd, unsigned long *argp); - bool SendReady(const timeval *timeout); - bool ReceiveReady(const timeval *timeout); - - virtual void HandleError(const char *operation) const; - void CheckAndHandleError_int(const char *operation, int result) const - {if (result == SOCKET_ERROR) HandleError(operation);} - void CheckAndHandleError(const char *operation, socket_t result) const - {if (result == SOCKET_ERROR) HandleError(operation);} -#ifdef USE_WINDOWS_STYLE_SOCKETS - void CheckAndHandleError(const char *operation, BOOL result) const - {assert(result==TRUE || result==FALSE); if (!result) HandleError(operation);} - void CheckAndHandleError(const char *operation, bool result) const - {if (!result) HandleError(operation);} -#endif - - //! look up the port number given its name, returns 0 if not found - static unsigned int PortNameToNumber(const char *name, const char *protocol="tcp"); - //! start Windows Sockets 2 - static void StartSockets(); - //! calls WSACleanup for Windows Sockets - static void ShutdownSockets(); - //! returns errno or WSAGetLastError - static int GetLastError(); - //! sets errno or calls WSASetLastError - static void SetLastError(int errorCode); - -protected: - virtual void SocketChanged() {} - - socket_t m_s; - bool m_own; -}; - -class SocketsInitializer -{ -public: - SocketsInitializer() {Socket::StartSockets();} - ~SocketsInitializer() {try {Socket::ShutdownSockets();} catch (...) {}} -}; - -class SocketReceiver : public NetworkReceiver -{ -public: - SocketReceiver(Socket &s); - -#ifdef USE_BERKELEY_STYLE_SOCKETS - bool MustWaitToReceive() {return true;} -#else - ~SocketReceiver(); - bool MustWaitForResult() {return true;} -#endif - bool Receive(byte* buf, size_t bufLen); - unsigned int GetReceiveResult(); - bool EofReceived() const {return m_eofReceived;} - - unsigned int GetMaxWaitObjectCount() const {return 1;} - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - -private: - Socket &m_s; - bool m_eofReceived; - -#ifdef USE_WINDOWS_STYLE_SOCKETS - WindowsHandle m_event; - OVERLAPPED m_overlapped; - bool m_resultPending; - DWORD m_lastResult; -#else - unsigned int m_lastResult; -#endif -}; - -class SocketSender : public NetworkSender -{ -public: - SocketSender(Socket &s); - -#ifdef USE_BERKELEY_STYLE_SOCKETS - bool MustWaitToSend() {return true;} -#else - ~SocketSender(); - bool MustWaitForResult() {return true;} - bool MustWaitForEof() { return true; } - bool EofSent(); -#endif - void Send(const byte* buf, size_t bufLen); - unsigned int GetSendResult(); - void SendEof(); - - unsigned int GetMaxWaitObjectCount() const {return 1;} - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - -private: - Socket &m_s; -#ifdef USE_WINDOWS_STYLE_SOCKETS - WindowsHandle m_event; - OVERLAPPED m_overlapped; - bool m_resultPending; - DWORD m_lastResult; -#else - unsigned int m_lastResult; -#endif -}; - -//! socket-based implementation of NetworkSource -class SocketSource : public NetworkSource, public Socket -{ -public: - SocketSource(socket_t s = INVALID_SOCKET, bool pumpAll = false, BufferedTransformation *attachment = NULL) - : NetworkSource(attachment), Socket(s), m_receiver(*this) - { - if (pumpAll) - PumpAll(); - } - -private: - NetworkReceiver & AccessReceiver() {return m_receiver;} - SocketReceiver m_receiver; -}; - -//! socket-based implementation of NetworkSink -class SocketSink : public NetworkSink, public Socket -{ -public: - SocketSink(socket_t s=INVALID_SOCKET, unsigned int maxBufferSize=0, unsigned int autoFlushBound=16*1024) - : NetworkSink(maxBufferSize, autoFlushBound), Socket(s), m_sender(*this) {} - - void SendEof() {ShutDown(SD_SEND);} - -private: - NetworkSender & AccessSender() {return m_sender;} - SocketSender m_sender; -}; - -NAMESPACE_END - -#endif // #ifdef SOCKETS_AVAILABLE - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.cpp deleted file mode 100644 index 08636755..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.cpp +++ /dev/null @@ -1,711 +0,0 @@ -// sosemanuk.cpp - written and placed in the public domain by Wei Dai - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sosemanuk.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "sosemanuk.h" -#include "misc.h" -#include "cpu.h" - -#include "serpentp.h" - -NAMESPACE_BEGIN(CryptoPP) - -void SosemanukPolicy::CipherSetKey(const NameValuePairs ¶ms, const byte *userKey, size_t keylen) -{ - Serpent_KeySchedule(m_key, 24, userKey, keylen); -} - -void SosemanukPolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) -{ - assert(length==16); - - word32 a, b, c, d, e; - - typedef BlockGetAndPut Block; - Block::Get(iv)(a)(b)(c)(d); - - const word32 *k = m_key; - unsigned int i=1; - - do - { - beforeS0(KX); beforeS0(S0); afterS0(LT); - afterS0(KX); afterS0(S1); afterS1(LT); - if (i == 3) // after 18th round - { - m_state[4] = b; - m_state[5] = e; - m_state[10] = c; - m_state[11] = a; - } - afterS1(KX); afterS1(S2); afterS2(LT); - afterS2(KX); afterS2(S3); afterS3(LT); - if (i == 2) // after 12th round - { - m_state[6] = c; - m_state[7] = d; - m_state[8] = b; - m_state[9] = e; - } - afterS3(KX); afterS3(S4); afterS4(LT); - afterS4(KX); afterS4(S5); afterS5(LT); - afterS5(KX); afterS5(S6); afterS6(LT); - afterS6(KX); afterS6(S7); afterS7(LT); - - if (i == 3) - break; - - ++i; - c = b; - b = e; - e = d; - d = a; - a = e; - k += 32; - } - while (true); - - afterS7(KX); - - m_state[0] = a; - m_state[1] = b; - m_state[2] = e; - m_state[3] = d; - -#define XMUX(c, x, y) (x ^ (y & (0 - (c & 1)))) - m_state[11] += XMUX(m_state[10], m_state[1], m_state[8]); - m_state[10] = rotlFixed(m_state[10] * 0x54655307, 7); -} - -extern "C" { -word32 s_sosemanukMulTables[512] = { -#if CRYPTOPP_BOOL_X86 | CRYPTOPP_BOOL_X64 - 0x00000000, 0xE19FCF12, 0x6B973724, 0x8A08F836, - 0xD6876E48, 0x3718A15A, 0xBD10596C, 0x5C8F967E, - 0x05A7DC90, 0xE4381382, 0x6E30EBB4, 0x8FAF24A6, - 0xD320B2D8, 0x32BF7DCA, 0xB8B785FC, 0x59284AEE, - 0x0AE71189, 0xEB78DE9B, 0x617026AD, 0x80EFE9BF, - 0xDC607FC1, 0x3DFFB0D3, 0xB7F748E5, 0x566887F7, - 0x0F40CD19, 0xEEDF020B, 0x64D7FA3D, 0x8548352F, - 0xD9C7A351, 0x38586C43, 0xB2509475, 0x53CF5B67, - 0x146722BB, 0xF5F8EDA9, 0x7FF0159F, 0x9E6FDA8D, - 0xC2E04CF3, 0x237F83E1, 0xA9777BD7, 0x48E8B4C5, - 0x11C0FE2B, 0xF05F3139, 0x7A57C90F, 0x9BC8061D, - 0xC7479063, 0x26D85F71, 0xACD0A747, 0x4D4F6855, - 0x1E803332, 0xFF1FFC20, 0x75170416, 0x9488CB04, - 0xC8075D7A, 0x29989268, 0xA3906A5E, 0x420FA54C, - 0x1B27EFA2, 0xFAB820B0, 0x70B0D886, 0x912F1794, - 0xCDA081EA, 0x2C3F4EF8, 0xA637B6CE, 0x47A879DC, - 0x28CE44DF, 0xC9518BCD, 0x435973FB, 0xA2C6BCE9, - 0xFE492A97, 0x1FD6E585, 0x95DE1DB3, 0x7441D2A1, - 0x2D69984F, 0xCCF6575D, 0x46FEAF6B, 0xA7616079, - 0xFBEEF607, 0x1A713915, 0x9079C123, 0x71E60E31, - 0x22295556, 0xC3B69A44, 0x49BE6272, 0xA821AD60, - 0xF4AE3B1E, 0x1531F40C, 0x9F390C3A, 0x7EA6C328, - 0x278E89C6, 0xC61146D4, 0x4C19BEE2, 0xAD8671F0, - 0xF109E78E, 0x1096289C, 0x9A9ED0AA, 0x7B011FB8, - 0x3CA96664, 0xDD36A976, 0x573E5140, 0xB6A19E52, - 0xEA2E082C, 0x0BB1C73E, 0x81B93F08, 0x6026F01A, - 0x390EBAF4, 0xD89175E6, 0x52998DD0, 0xB30642C2, - 0xEF89D4BC, 0x0E161BAE, 0x841EE398, 0x65812C8A, - 0x364E77ED, 0xD7D1B8FF, 0x5DD940C9, 0xBC468FDB, - 0xE0C919A5, 0x0156D6B7, 0x8B5E2E81, 0x6AC1E193, - 0x33E9AB7D, 0xD276646F, 0x587E9C59, 0xB9E1534B, - 0xE56EC535, 0x04F10A27, 0x8EF9F211, 0x6F663D03, - 0x50358817, 0xB1AA4705, 0x3BA2BF33, 0xDA3D7021, - 0x86B2E65F, 0x672D294D, 0xED25D17B, 0x0CBA1E69, - 0x55925487, 0xB40D9B95, 0x3E0563A3, 0xDF9AACB1, - 0x83153ACF, 0x628AF5DD, 0xE8820DEB, 0x091DC2F9, - 0x5AD2999E, 0xBB4D568C, 0x3145AEBA, 0xD0DA61A8, - 0x8C55F7D6, 0x6DCA38C4, 0xE7C2C0F2, 0x065D0FE0, - 0x5F75450E, 0xBEEA8A1C, 0x34E2722A, 0xD57DBD38, - 0x89F22B46, 0x686DE454, 0xE2651C62, 0x03FAD370, - 0x4452AAAC, 0xA5CD65BE, 0x2FC59D88, 0xCE5A529A, - 0x92D5C4E4, 0x734A0BF6, 0xF942F3C0, 0x18DD3CD2, - 0x41F5763C, 0xA06AB92E, 0x2A624118, 0xCBFD8E0A, - 0x97721874, 0x76EDD766, 0xFCE52F50, 0x1D7AE042, - 0x4EB5BB25, 0xAF2A7437, 0x25228C01, 0xC4BD4313, - 0x9832D56D, 0x79AD1A7F, 0xF3A5E249, 0x123A2D5B, - 0x4B1267B5, 0xAA8DA8A7, 0x20855091, 0xC11A9F83, - 0x9D9509FD, 0x7C0AC6EF, 0xF6023ED9, 0x179DF1CB, - 0x78FBCCC8, 0x996403DA, 0x136CFBEC, 0xF2F334FE, - 0xAE7CA280, 0x4FE36D92, 0xC5EB95A4, 0x24745AB6, - 0x7D5C1058, 0x9CC3DF4A, 0x16CB277C, 0xF754E86E, - 0xABDB7E10, 0x4A44B102, 0xC04C4934, 0x21D38626, - 0x721CDD41, 0x93831253, 0x198BEA65, 0xF8142577, - 0xA49BB309, 0x45047C1B, 0xCF0C842D, 0x2E934B3F, - 0x77BB01D1, 0x9624CEC3, 0x1C2C36F5, 0xFDB3F9E7, - 0xA13C6F99, 0x40A3A08B, 0xCAAB58BD, 0x2B3497AF, - 0x6C9CEE73, 0x8D032161, 0x070BD957, 0xE6941645, - 0xBA1B803B, 0x5B844F29, 0xD18CB71F, 0x3013780D, - 0x693B32E3, 0x88A4FDF1, 0x02AC05C7, 0xE333CAD5, - 0xBFBC5CAB, 0x5E2393B9, 0xD42B6B8F, 0x35B4A49D, - 0x667BFFFA, 0x87E430E8, 0x0DECC8DE, 0xEC7307CC, - 0xB0FC91B2, 0x51635EA0, 0xDB6BA696, 0x3AF46984, - 0x63DC236A, 0x8243EC78, 0x084B144E, 0xE9D4DB5C, - 0xB55B4D22, 0x54C48230, 0xDECC7A06, 0x3F53B514, -#else - 0x00000000, 0xE19FCF13, 0x6B973726, 0x8A08F835, - 0xD6876E4C, 0x3718A15F, 0xBD10596A, 0x5C8F9679, - 0x05A7DC98, 0xE438138B, 0x6E30EBBE, 0x8FAF24AD, - 0xD320B2D4, 0x32BF7DC7, 0xB8B785F2, 0x59284AE1, - 0x0AE71199, 0xEB78DE8A, 0x617026BF, 0x80EFE9AC, - 0xDC607FD5, 0x3DFFB0C6, 0xB7F748F3, 0x566887E0, - 0x0F40CD01, 0xEEDF0212, 0x64D7FA27, 0x85483534, - 0xD9C7A34D, 0x38586C5E, 0xB250946B, 0x53CF5B78, - 0x1467229B, 0xF5F8ED88, 0x7FF015BD, 0x9E6FDAAE, - 0xC2E04CD7, 0x237F83C4, 0xA9777BF1, 0x48E8B4E2, - 0x11C0FE03, 0xF05F3110, 0x7A57C925, 0x9BC80636, - 0xC747904F, 0x26D85F5C, 0xACD0A769, 0x4D4F687A, - 0x1E803302, 0xFF1FFC11, 0x75170424, 0x9488CB37, - 0xC8075D4E, 0x2998925D, 0xA3906A68, 0x420FA57B, - 0x1B27EF9A, 0xFAB82089, 0x70B0D8BC, 0x912F17AF, - 0xCDA081D6, 0x2C3F4EC5, 0xA637B6F0, 0x47A879E3, - 0x28CE449F, 0xC9518B8C, 0x435973B9, 0xA2C6BCAA, - 0xFE492AD3, 0x1FD6E5C0, 0x95DE1DF5, 0x7441D2E6, - 0x2D699807, 0xCCF65714, 0x46FEAF21, 0xA7616032, - 0xFBEEF64B, 0x1A713958, 0x9079C16D, 0x71E60E7E, - 0x22295506, 0xC3B69A15, 0x49BE6220, 0xA821AD33, - 0xF4AE3B4A, 0x1531F459, 0x9F390C6C, 0x7EA6C37F, - 0x278E899E, 0xC611468D, 0x4C19BEB8, 0xAD8671AB, - 0xF109E7D2, 0x109628C1, 0x9A9ED0F4, 0x7B011FE7, - 0x3CA96604, 0xDD36A917, 0x573E5122, 0xB6A19E31, - 0xEA2E0848, 0x0BB1C75B, 0x81B93F6E, 0x6026F07D, - 0x390EBA9C, 0xD891758F, 0x52998DBA, 0xB30642A9, - 0xEF89D4D0, 0x0E161BC3, 0x841EE3F6, 0x65812CE5, - 0x364E779D, 0xD7D1B88E, 0x5DD940BB, 0xBC468FA8, - 0xE0C919D1, 0x0156D6C2, 0x8B5E2EF7, 0x6AC1E1E4, - 0x33E9AB05, 0xD2766416, 0x587E9C23, 0xB9E15330, - 0xE56EC549, 0x04F10A5A, 0x8EF9F26F, 0x6F663D7C, - 0x50358897, 0xB1AA4784, 0x3BA2BFB1, 0xDA3D70A2, - 0x86B2E6DB, 0x672D29C8, 0xED25D1FD, 0x0CBA1EEE, - 0x5592540F, 0xB40D9B1C, 0x3E056329, 0xDF9AAC3A, - 0x83153A43, 0x628AF550, 0xE8820D65, 0x091DC276, - 0x5AD2990E, 0xBB4D561D, 0x3145AE28, 0xD0DA613B, - 0x8C55F742, 0x6DCA3851, 0xE7C2C064, 0x065D0F77, - 0x5F754596, 0xBEEA8A85, 0x34E272B0, 0xD57DBDA3, - 0x89F22BDA, 0x686DE4C9, 0xE2651CFC, 0x03FAD3EF, - 0x4452AA0C, 0xA5CD651F, 0x2FC59D2A, 0xCE5A5239, - 0x92D5C440, 0x734A0B53, 0xF942F366, 0x18DD3C75, - 0x41F57694, 0xA06AB987, 0x2A6241B2, 0xCBFD8EA1, - 0x977218D8, 0x76EDD7CB, 0xFCE52FFE, 0x1D7AE0ED, - 0x4EB5BB95, 0xAF2A7486, 0x25228CB3, 0xC4BD43A0, - 0x9832D5D9, 0x79AD1ACA, 0xF3A5E2FF, 0x123A2DEC, - 0x4B12670D, 0xAA8DA81E, 0x2085502B, 0xC11A9F38, - 0x9D950941, 0x7C0AC652, 0xF6023E67, 0x179DF174, - 0x78FBCC08, 0x9964031B, 0x136CFB2E, 0xF2F3343D, - 0xAE7CA244, 0x4FE36D57, 0xC5EB9562, 0x24745A71, - 0x7D5C1090, 0x9CC3DF83, 0x16CB27B6, 0xF754E8A5, - 0xABDB7EDC, 0x4A44B1CF, 0xC04C49FA, 0x21D386E9, - 0x721CDD91, 0x93831282, 0x198BEAB7, 0xF81425A4, - 0xA49BB3DD, 0x45047CCE, 0xCF0C84FB, 0x2E934BE8, - 0x77BB0109, 0x9624CE1A, 0x1C2C362F, 0xFDB3F93C, - 0xA13C6F45, 0x40A3A056, 0xCAAB5863, 0x2B349770, - 0x6C9CEE93, 0x8D032180, 0x070BD9B5, 0xE69416A6, - 0xBA1B80DF, 0x5B844FCC, 0xD18CB7F9, 0x301378EA, - 0x693B320B, 0x88A4FD18, 0x02AC052D, 0xE333CA3E, - 0xBFBC5C47, 0x5E239354, 0xD42B6B61, 0x35B4A472, - 0x667BFF0A, 0x87E43019, 0x0DECC82C, 0xEC73073F, - 0xB0FC9146, 0x51635E55, 0xDB6BA660, 0x3AF46973, - 0x63DC2392, 0x8243EC81, 0x084B14B4, 0xE9D4DBA7, - 0xB55B4DDE, 0x54C482CD, 0xDECC7AF8, 0x3F53B5EB, -#endif - 0x00000000, 0x180F40CD, 0x301E8033, 0x2811C0FE, - 0x603CA966, 0x7833E9AB, 0x50222955, 0x482D6998, - 0xC078FBCC, 0xD877BB01, 0xF0667BFF, 0xE8693B32, - 0xA04452AA, 0xB84B1267, 0x905AD299, 0x88559254, - 0x29F05F31, 0x31FF1FFC, 0x19EEDF02, 0x01E19FCF, - 0x49CCF657, 0x51C3B69A, 0x79D27664, 0x61DD36A9, - 0xE988A4FD, 0xF187E430, 0xD99624CE, 0xC1996403, - 0x89B40D9B, 0x91BB4D56, 0xB9AA8DA8, 0xA1A5CD65, - 0x5249BE62, 0x4A46FEAF, 0x62573E51, 0x7A587E9C, - 0x32751704, 0x2A7A57C9, 0x026B9737, 0x1A64D7FA, - 0x923145AE, 0x8A3E0563, 0xA22FC59D, 0xBA208550, - 0xF20DECC8, 0xEA02AC05, 0xC2136CFB, 0xDA1C2C36, - 0x7BB9E153, 0x63B6A19E, 0x4BA76160, 0x53A821AD, - 0x1B854835, 0x038A08F8, 0x2B9BC806, 0x339488CB, - 0xBBC11A9F, 0xA3CE5A52, 0x8BDF9AAC, 0x93D0DA61, - 0xDBFDB3F9, 0xC3F2F334, 0xEBE333CA, 0xF3EC7307, - 0xA492D5C4, 0xBC9D9509, 0x948C55F7, 0x8C83153A, - 0xC4AE7CA2, 0xDCA13C6F, 0xF4B0FC91, 0xECBFBC5C, - 0x64EA2E08, 0x7CE56EC5, 0x54F4AE3B, 0x4CFBEEF6, - 0x04D6876E, 0x1CD9C7A3, 0x34C8075D, 0x2CC74790, - 0x8D628AF5, 0x956DCA38, 0xBD7C0AC6, 0xA5734A0B, - 0xED5E2393, 0xF551635E, 0xDD40A3A0, 0xC54FE36D, - 0x4D1A7139, 0x551531F4, 0x7D04F10A, 0x650BB1C7, - 0x2D26D85F, 0x35299892, 0x1D38586C, 0x053718A1, - 0xF6DB6BA6, 0xEED42B6B, 0xC6C5EB95, 0xDECAAB58, - 0x96E7C2C0, 0x8EE8820D, 0xA6F942F3, 0xBEF6023E, - 0x36A3906A, 0x2EACD0A7, 0x06BD1059, 0x1EB25094, - 0x569F390C, 0x4E9079C1, 0x6681B93F, 0x7E8EF9F2, - 0xDF2B3497, 0xC724745A, 0xEF35B4A4, 0xF73AF469, - 0xBF179DF1, 0xA718DD3C, 0x8F091DC2, 0x97065D0F, - 0x1F53CF5B, 0x075C8F96, 0x2F4D4F68, 0x37420FA5, - 0x7F6F663D, 0x676026F0, 0x4F71E60E, 0x577EA6C3, - 0xE18D0321, 0xF98243EC, 0xD1938312, 0xC99CC3DF, - 0x81B1AA47, 0x99BEEA8A, 0xB1AF2A74, 0xA9A06AB9, - 0x21F5F8ED, 0x39FAB820, 0x11EB78DE, 0x09E43813, - 0x41C9518B, 0x59C61146, 0x71D7D1B8, 0x69D89175, - 0xC87D5C10, 0xD0721CDD, 0xF863DC23, 0xE06C9CEE, - 0xA841F576, 0xB04EB5BB, 0x985F7545, 0x80503588, - 0x0805A7DC, 0x100AE711, 0x381B27EF, 0x20146722, - 0x68390EBA, 0x70364E77, 0x58278E89, 0x4028CE44, - 0xB3C4BD43, 0xABCBFD8E, 0x83DA3D70, 0x9BD57DBD, - 0xD3F81425, 0xCBF754E8, 0xE3E69416, 0xFBE9D4DB, - 0x73BC468F, 0x6BB30642, 0x43A2C6BC, 0x5BAD8671, - 0x1380EFE9, 0x0B8FAF24, 0x239E6FDA, 0x3B912F17, - 0x9A34E272, 0x823BA2BF, 0xAA2A6241, 0xB225228C, - 0xFA084B14, 0xE2070BD9, 0xCA16CB27, 0xD2198BEA, - 0x5A4C19BE, 0x42435973, 0x6A52998D, 0x725DD940, - 0x3A70B0D8, 0x227FF015, 0x0A6E30EB, 0x12617026, - 0x451FD6E5, 0x5D109628, 0x750156D6, 0x6D0E161B, - 0x25237F83, 0x3D2C3F4E, 0x153DFFB0, 0x0D32BF7D, - 0x85672D29, 0x9D686DE4, 0xB579AD1A, 0xAD76EDD7, - 0xE55B844F, 0xFD54C482, 0xD545047C, 0xCD4A44B1, - 0x6CEF89D4, 0x74E0C919, 0x5CF109E7, 0x44FE492A, - 0x0CD320B2, 0x14DC607F, 0x3CCDA081, 0x24C2E04C, - 0xAC977218, 0xB49832D5, 0x9C89F22B, 0x8486B2E6, - 0xCCABDB7E, 0xD4A49BB3, 0xFCB55B4D, 0xE4BA1B80, - 0x17566887, 0x0F59284A, 0x2748E8B4, 0x3F47A879, - 0x776AC1E1, 0x6F65812C, 0x477441D2, 0x5F7B011F, - 0xD72E934B, 0xCF21D386, 0xE7301378, 0xFF3F53B5, - 0xB7123A2D, 0xAF1D7AE0, 0x870CBA1E, 0x9F03FAD3, - 0x3EA637B6, 0x26A9777B, 0x0EB8B785, 0x16B7F748, - 0x5E9A9ED0, 0x4695DE1D, 0x6E841EE3, 0x768B5E2E, - 0xFEDECC7A, 0xE6D18CB7, 0xCEC04C49, 0xD6CF0C84, - 0x9EE2651C, 0x86ED25D1, 0xAEFCE52F, 0xB6F3A5E2 -}; -} - -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 -unsigned int SosemanukPolicy::GetAlignment() const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#ifdef __INTEL_COMPILER - if (HasSSE2() && !IsP4()) // Intel compiler produces faster code for this algorithm on the P4 -#else - if (HasSSE2()) -#endif - return 16; - else -#endif - return GetAlignmentOf(); -} - -unsigned int SosemanukPolicy::GetOptimalBlockSize() const -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#ifdef __INTEL_COMPILER - if (HasSSE2() && !IsP4()) // Intel compiler produces faster code for this algorithm on the P4 -#else - if (HasSSE2()) -#endif - return 4*BYTES_PER_ITERATION; - else -#endif - return BYTES_PER_ITERATION; -} -#endif - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void Sosemanuk_OperateKeystream(size_t iterationCount, const byte *input, byte *output, word32 *state); -} -#endif - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -void SosemanukPolicy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ -#endif // #ifdef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE - Sosemanuk_OperateKeystream(iterationCount, input, output, m_state.data()); - return; -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#ifdef CRYPTOPP_GENERATE_X64_MASM - ALIGN 8 - Sosemanuk_OperateKeystream PROC FRAME - rex_push_reg rsi - push_reg rdi - alloc_stack(80*4*2+12*4+8*WORD_SZ + 2*16+8) - save_xmm128 xmm6, 02f0h - save_xmm128 xmm7, 0300h - .endprolog - mov rdi, r8 - mov rax, r9 -#else -#ifdef __INTEL_COMPILER - if (HasSSE2() && !IsP4()) // Intel compiler produces faster code for this algorithm on the P4 -#else - if (HasSSE2()) -#endif - { -#ifdef __GNUC__ - #if CRYPTOPP_BOOL_X64 - FixedSizeAlignedSecBlock workspace; - #endif - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS_PUSH_IF86( bx) -#else - word32 *state = m_state; - AS2( mov WORD_REG(ax), state) - AS2( mov WORD_REG(di), output) - AS2( mov WORD_REG(dx), input) - AS2( mov WORD_REG(cx), iterationCount) -#endif -#endif // #ifdef CRYPTOPP_GENERATE_X64_MASM - -#if defined(__GNUC__) && CRYPTOPP_BOOL_X64 - #define SSE2_workspace %5 -#else - #define SSE2_workspace WORD_REG(sp) -#endif - -#define SSE2_output WORD_PTR [SSE2_workspace+1*WORD_SZ] -#define SSE2_input WORD_PTR [SSE2_workspace+2*WORD_SZ] -#define SSE2_wordsLeft WORD_PTR [SSE2_workspace+3*WORD_SZ] -#define SSE2_diEnd WORD_PTR [SSE2_workspace+4*WORD_SZ] -#define SSE2_pMulTables WORD_PTR [SSE2_workspace+5*WORD_SZ] -#define SSE2_state WORD_PTR [SSE2_workspace+6*WORD_SZ] -#define SSE2_wordsLeft2 WORD_PTR [SSE2_workspace+7*WORD_SZ] -#define SSE2_stateCopy SSE2_workspace + 8*WORD_SZ -#define SSE2_uvStart SSE2_stateCopy + 12*4 - -#if CRYPTOPP_BOOL_X86 - AS_PUSH_IF86( bp) - AS2( mov AS_REG_6, esp) - AS2( and esp, -16) - AS2( sub esp, 80*4*2+12*4+8*WORD_SZ) // 80 v's, 80 u's, 12 state, 8 locals - AS2( mov [esp], AS_REG_6) -#endif - AS2( mov SSE2_output, WORD_REG(di)) - AS2( mov SSE2_input, WORD_REG(dx)) - AS2( mov SSE2_state, WORD_REG(ax)) -#ifndef _MSC_VER - AS2( mov SSE2_pMulTables, WORD_REG(si)) -#endif - AS2( lea WORD_REG(cx), [4*WORD_REG(cx)+WORD_REG(cx)]) - AS2( lea WORD_REG(si), [4*WORD_REG(cx)]) - AS2( mov SSE2_wordsLeft, WORD_REG(si)) - AS2( movdqa xmm0, [WORD_REG(ax)+0*16]) // copy state to stack to save a register - AS2( movdqa [SSE2_stateCopy+0*16], xmm0) - AS2( movdqa xmm0, [WORD_REG(ax)+1*16]) - AS2( movdqa [SSE2_stateCopy+1*16], xmm0) - AS2( movq xmm0, QWORD PTR [WORD_REG(ax)+2*16]) - AS2( movq QWORD PTR [SSE2_stateCopy+2*16], xmm0) - AS2( psrlq xmm0, 32) - AS2( movd AS_REG_6d, xmm0) // s(9) - AS2( mov ecx, [WORD_REG(ax)+10*4]) - AS2( mov edx, [WORD_REG(ax)+11*4]) - AS2( pcmpeqb xmm7, xmm7) // all ones - -#define s(i) SSE2_stateCopy + ASM_MOD(i,10)*4 -#define u(j) WORD_REG(di) + (ASM_MOD(j,4)*20 + (j/4)) * 4 -#define v(j) WORD_REG(di) + (ASM_MOD(j,4)*20 + (j/4)) * 4 + 80*4 - -#define R10 ecx -#define R11 edx -#define R20 edx -#define R21 ecx -// workaround bug in GAS 2.15 -#define R20r WORD_REG(dx) -#define R21r WORD_REG(cx) - -#define SSE2_STEP(i, j) \ - AS2( mov eax, [s(i+0)])\ - AS2( mov [v(i)], eax)\ - AS2( rol eax, 8)\ - AS2( lea AS_REG_7, [AS_REG_6 + R2##j##r])\ - AS2( xor AS_REG_7d, R1##j)\ - AS2( mov [u(i)], AS_REG_7d)\ - AS2( mov AS_REG_7d, 1)\ - AS2( and AS_REG_7d, R2##j)\ - AS1( neg AS_REG_7d)\ - AS2( and AS_REG_7d, AS_REG_6d)\ - AS2( xor AS_REG_6d, eax)\ - AS2( movzx eax, al)\ - AS2( xor AS_REG_6d, [WORD_REG(si)+WORD_REG(ax)*4])\ - AS2( mov eax, [s(i+3)])\ - AS2( xor AS_REG_7d, [s(i+2)])\ - AS2( add R1##j, AS_REG_7d)\ - AS2( movzx AS_REG_7d, al)\ - AS2( shr eax, 8)\ - AS2( xor AS_REG_6d, [WORD_REG(si)+1024+AS_REG_7*4])\ - AS2( xor AS_REG_6d, eax)\ - AS2( imul R2##j, AS_HEX(54655307))\ - AS2( rol R2##j, 7)\ - AS2( mov [s(i+0)], AS_REG_6d)\ - - ASL(2) // outer loop, each iteration of this processes 80 words - AS2( lea WORD_REG(di), [SSE2_uvStart]) // start of v and u - AS2( mov WORD_REG(ax), 80) - AS2( cmp WORD_REG(si), 80) - AS2( cmovg WORD_REG(si), WORD_REG(ax)) - AS2( mov SSE2_wordsLeft2, WORD_REG(si)) - AS2( lea WORD_REG(si), [WORD_REG(di)+WORD_REG(si)]) // use to end first inner loop - AS2( mov SSE2_diEnd, WORD_REG(si)) -#ifdef _MSC_VER - AS2( lea WORD_REG(si), s_sosemanukMulTables) -#else - AS2( mov WORD_REG(si), SSE2_pMulTables) -#endif - - ASL(0) // first inner loop, 20 words each, 4 iterations - SSE2_STEP(0, 0) - SSE2_STEP(1, 1) - SSE2_STEP(2, 0) - SSE2_STEP(3, 1) - SSE2_STEP(4, 0) - SSE2_STEP(5, 1) - SSE2_STEP(6, 0) - SSE2_STEP(7, 1) - SSE2_STEP(8, 0) - SSE2_STEP(9, 1) - SSE2_STEP(10, 0) - SSE2_STEP(11, 1) - SSE2_STEP(12, 0) - SSE2_STEP(13, 1) - SSE2_STEP(14, 0) - SSE2_STEP(15, 1) - SSE2_STEP(16, 0) - SSE2_STEP(17, 1) - SSE2_STEP(18, 0) - SSE2_STEP(19, 1) - // loop - AS2( add WORD_REG(di), 5*4) - AS2( cmp WORD_REG(di), SSE2_diEnd) - ASJ( jne, 0, b) - - AS2( mov WORD_REG(ax), SSE2_input) - AS2( mov AS_REG_7, SSE2_output) - AS2( lea WORD_REG(di), [SSE2_uvStart]) // start of v and u - AS2( mov WORD_REG(si), SSE2_wordsLeft2) - - ASL(1) // second inner loop, 16 words each, 5 iterations - AS2( movdqa xmm0, [WORD_REG(di)+0*20*4]) - AS2( movdqa xmm2, [WORD_REG(di)+2*20*4]) - AS2( movdqa xmm3, [WORD_REG(di)+3*20*4]) - AS2( movdqa xmm1, [WORD_REG(di)+1*20*4]) - // S2 - AS2( movdqa xmm4, xmm0) - AS2( pand xmm0, xmm2) - AS2( pxor xmm0, xmm3) - AS2( pxor xmm2, xmm1) - AS2( pxor xmm2, xmm0) - AS2( por xmm3, xmm4) - AS2( pxor xmm3, xmm1) - AS2( pxor xmm4, xmm2) - AS2( movdqa xmm1, xmm3) - AS2( por xmm3, xmm4) - AS2( pxor xmm3, xmm0) - AS2( pand xmm0, xmm1) - AS2( pxor xmm4, xmm0) - AS2( pxor xmm1, xmm3) - AS2( pxor xmm1, xmm4) - AS2( pxor xmm4, xmm7) - // xor with v - AS2( pxor xmm2, [WORD_REG(di)+80*4]) - AS2( pxor xmm3, [WORD_REG(di)+80*5]) - AS2( pxor xmm1, [WORD_REG(di)+80*6]) - AS2( pxor xmm4, [WORD_REG(di)+80*7]) - // exit loop early if less than 16 words left to output - // this is necessary because block size is 20 words, and we output 16 words in each iteration of this loop - AS2( cmp WORD_REG(si), 16) - ASJ( jl, 4, f) - // unpack - AS2( movdqa xmm6, xmm2) - AS2( punpckldq xmm2, xmm3) - AS2( movdqa xmm5, xmm1) - AS2( punpckldq xmm1, xmm4) - AS2( movdqa xmm0, xmm2) - AS2( punpcklqdq xmm2, xmm1) - AS2( punpckhqdq xmm0, xmm1) - AS2( punpckhdq xmm6, xmm3) - AS2( punpckhdq xmm5, xmm4) - AS2( movdqa xmm3, xmm6) - AS2( punpcklqdq xmm6, xmm5) - AS2( punpckhqdq xmm3, xmm5) - // output keystream - AS_XMM_OUTPUT4(SSE2_Sosemanuk_Output, WORD_REG(ax), AS_REG_7, 2,0,6,3, 1, 0,1,2,3, 4) - - // loop - AS2( add WORD_REG(di), 4*4) - AS2( sub WORD_REG(si), 16) - ASJ( jnz, 1, b) - - // outer loop - AS2( mov WORD_REG(si), SSE2_wordsLeft) - AS2( sub WORD_REG(si), 80) - ASJ( jz, 6, f) - AS2( mov SSE2_wordsLeft, WORD_REG(si)) - AS2( mov SSE2_input, WORD_REG(ax)) - AS2( mov SSE2_output, AS_REG_7) - ASJ( jmp, 2, b) - - ASL(4) // final output of less than 16 words - AS2( test WORD_REG(ax), WORD_REG(ax)) - ASJ( jz, 5, f) - AS2( movd xmm0, dword ptr [WORD_REG(ax)+0*4]) - AS2( pxor xmm2, xmm0) - AS2( movd xmm0, dword ptr [WORD_REG(ax)+1*4]) - AS2( pxor xmm3, xmm0) - AS2( movd xmm0, dword ptr [WORD_REG(ax)+2*4]) - AS2( pxor xmm1, xmm0) - AS2( movd xmm0, dword ptr [WORD_REG(ax)+3*4]) - AS2( pxor xmm4, xmm0) - AS2( add WORD_REG(ax), 16) - ASL(5) - AS2( movd dword ptr [AS_REG_7+0*4], xmm2) - AS2( movd dword ptr [AS_REG_7+1*4], xmm3) - AS2( movd dword ptr [AS_REG_7+2*4], xmm1) - AS2( movd dword ptr [AS_REG_7+3*4], xmm4) - AS2( sub WORD_REG(si), 4) - ASJ( jz, 6, f) - AS2( add AS_REG_7, 16) - AS2( psrldq xmm2, 4) - AS2( psrldq xmm3, 4) - AS2( psrldq xmm1, 4) - AS2( psrldq xmm4, 4) - ASJ( jmp, 4, b) - - ASL(6) // save state - AS2( mov AS_REG_6, SSE2_state) - AS2( movdqa xmm0, [SSE2_stateCopy+0*16]) - AS2( movdqa [AS_REG_6+0*16], xmm0) - AS2( movdqa xmm0, [SSE2_stateCopy+1*16]) - AS2( movdqa [AS_REG_6+1*16], xmm0) - AS2( movq xmm0, QWORD PTR [SSE2_stateCopy+2*16]) - AS2( movq QWORD PTR [AS_REG_6+2*16], xmm0) - AS2( mov [AS_REG_6+10*4], ecx) - AS2( mov [AS_REG_6+11*4], edx) - - AS_POP_IF86( sp) - AS_POP_IF86( bp) - -#ifdef __GNUC__ - AS_POP_IF86( bx) - ".att_syntax prefix;" - : - : "a" (m_state.m_ptr), "c" (iterationCount), "S" (s_sosemanukMulTables), "D" (output), "d" (input) - #if CRYPTOPP_BOOL_X64 - , "r" (workspace.m_ptr) - : "memory", "cc", "%r9", "%r10", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7" - #else - : "memory", "cc" - #endif - ); -#endif -#ifdef CRYPTOPP_GENERATE_X64_MASM - movdqa xmm6, [rsp + 02f0h] - movdqa xmm7, [rsp + 0300h] - add rsp, 80*4*2+12*4+8*WORD_SZ + 2*16+8 - pop rdi - pop rsi - ret - Sosemanuk_OperateKeystream ENDP -#else - } - else -#endif -#endif -#ifndef CRYPTOPP_GENERATE_X64_MASM - { -#if CRYPTOPP_BOOL_X86 | CRYPTOPP_BOOL_X64 -#define MUL_A(x) (x = rotlFixed(x, 8), x ^ s_sosemanukMulTables[byte(x)]) -#else -#define MUL_A(x) (((x) << 8) ^ s_sosemanukMulTables[(x) >> 24]) -#endif - -#define DIV_A(x) (((x) >> 8) ^ s_sosemanukMulTables[256 + byte(x)]) - -#define r1(i) ((i%2) ? reg2 : reg1) -#define r2(i) ((i%2) ? reg1 : reg2) - -#define STEP(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, v, u) \ - u = (s##x9 + r2(x0)) ^ r1(x0);\ - v = s##x0;\ - s##x0 = MUL_A(s##x0) ^ DIV_A(s##x3) ^ s##x9;\ - r1(x0) += XMUX(r2(x0), s##x2, s##x9);\ - r2(x0) = rotlFixed(r2(x0) * 0x54655307, 7);\ - -#define SOSEMANUK_OUTPUT(x) \ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 0, u2 ^ v0);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 1, u3 ^ v1);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 2, u1 ^ v2);\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 3, u4 ^ v3); - -#define OUTPUT4 \ - S2(0, u0, u1, u2, u3, u4);\ - CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(SOSEMANUK_OUTPUT, 4*4); - - word32 s0 = m_state[0]; - word32 s1 = m_state[1]; - word32 s2 = m_state[2]; - word32 s3 = m_state[3]; - word32 s4 = m_state[4]; - word32 s5 = m_state[5]; - word32 s6 = m_state[6]; - word32 s7 = m_state[7]; - word32 s8 = m_state[8]; - word32 s9 = m_state[9]; - word32 reg1 = m_state[10]; - word32 reg2 = m_state[11]; - word32 u0, u1, u2, u3, u4, v0, v1, v2, v3; - - do - { - STEP(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, v0, u0) - STEP(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, v1, u1) - STEP(2, 3, 4, 5, 6, 7, 8, 9, 0, 1, v2, u2) - STEP(3, 4, 5, 6, 7, 8, 9, 0, 1, 2, v3, u3) - OUTPUT4 - STEP(4, 5, 6, 7, 8, 9, 0, 1, 2, 3, v0, u0) - STEP(5, 6, 7, 8, 9, 0, 1, 2, 3, 4, v1, u1) - STEP(6, 7, 8, 9, 0, 1, 2, 3, 4, 5, v2, u2) - STEP(7, 8, 9, 0, 1, 2, 3, 4, 5, 6, v3, u3) - OUTPUT4 - STEP(8, 9, 0, 1, 2, 3, 4, 5, 6, 7, v0, u0) - STEP(9, 0, 1, 2, 3, 4, 5, 6, 7, 8, v1, u1) - STEP(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, v2, u2) - STEP(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, v3, u3) - OUTPUT4 - STEP(2, 3, 4, 5, 6, 7, 8, 9, 0, 1, v0, u0) - STEP(3, 4, 5, 6, 7, 8, 9, 0, 1, 2, v1, u1) - STEP(4, 5, 6, 7, 8, 9, 0, 1, 2, 3, v2, u2) - STEP(5, 6, 7, 8, 9, 0, 1, 2, 3, 4, v3, u3) - OUTPUT4 - STEP(6, 7, 8, 9, 0, 1, 2, 3, 4, 5, v0, u0) - STEP(7, 8, 9, 0, 1, 2, 3, 4, 5, 6, v1, u1) - STEP(8, 9, 0, 1, 2, 3, 4, 5, 6, 7, v2, u2) - STEP(9, 0, 1, 2, 3, 4, 5, 6, 7, 8, v3, u3) - OUTPUT4 - } - while (--iterationCount); - - m_state[0] = s0; - m_state[1] = s1; - m_state[2] = s2; - m_state[3] = s3; - m_state[4] = s4; - m_state[5] = s5; - m_state[6] = s6; - m_state[7] = s7; - m_state[8] = s8; - m_state[9] = s9; - m_state[10] = reg1; - m_state[11] = reg2; - } -} - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.h deleted file mode 100644 index ff1d820d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/sosemanuk.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef CRYPTOPP_SOSEMANUK_H -#define CRYPTOPP_SOSEMANUK_H - -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! algorithm info -struct SosemanukInfo : public VariableKeyLength<16, 1, 32, 1, SimpleKeyingInterface::UNIQUE_IV, 16> -{ - static const char * StaticAlgorithmName() {return "Sosemanuk";} -}; - -//! _ -class SosemanukPolicy : public AdditiveCipherConcretePolicy, public SosemanukInfo -{ -protected: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length); - bool CipherIsRandomAccess() const {return false;} -#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64 - unsigned int GetAlignment() const; - unsigned int GetOptimalBlockSize() const; -#endif - - FixedSizeSecBlock m_key; - FixedSizeAlignedSecBlock m_state; -}; - -//! Sosemanuk -struct Sosemanuk : public SosemanukInfo, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal >, SosemanukInfo> Encryption; - typedef Encryption Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/square.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/square.cpp deleted file mode 100644 index 00e6bddb..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/square.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// square.cpp - written and placed in the public domain by Wei Dai -// Based on Paulo S.L.M. Barreto's public domain implementation - -#include "pch.h" -#include "square.h" -#include "misc.h" -#include "gf256.h" - -NAMESPACE_BEGIN(CryptoPP) - -// apply theta to a roundkey -static void SquareTransform (word32 in[4], word32 out[4]) -{ - static const byte G[4][4] = - { - 0x02U, 0x01U, 0x01U, 0x03U, - 0x03U, 0x02U, 0x01U, 0x01U, - 0x01U, 0x03U, 0x02U, 0x01U, - 0x01U, 0x01U, 0x03U, 0x02U - }; - - GF256 gf256(0xf5); - - for (int i = 0; i < 4; i++) - { - word32 temp = 0; - for (int j = 0; j < 4; j++) - for (int k = 0; k < 4; k++) - temp ^= (word32)gf256.Multiply(GETBYTE(in[i], 3-k), G[k][j]) << ((3-j)*8); - out[i] = temp; - } -} - -#define roundkeys(i, j) m_roundkeys[(i)*4+(j)] -#define roundkeys4(i) (m_roundkeys+(i)*4) - -void Square::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &) -{ - AssertValidKeyLength(length); - - static const word32 offset[ROUNDS] = { - 0x01000000UL, 0x02000000UL, 0x04000000UL, 0x08000000UL, - 0x10000000UL, 0x20000000UL, 0x40000000UL, 0x80000000UL, - }; - - GetUserKey(BIG_ENDIAN_ORDER, m_roundkeys.data(), KEYLENGTH/4, userKey, KEYLENGTH); - - /* apply the key evolution function */ - for (int i = 1; i < ROUNDS+1; i++) - { - roundkeys(i, 0) = roundkeys(i-1, 0) ^ rotlFixed(roundkeys(i-1, 3), 8U) ^ offset[i-1]; - roundkeys(i, 1) = roundkeys(i-1, 1) ^ roundkeys(i, 0); - roundkeys(i, 2) = roundkeys(i-1, 2) ^ roundkeys(i, 1); - roundkeys(i, 3) = roundkeys(i-1, 3) ^ roundkeys(i, 2); - } - - /* produce the round keys */ - if (IsForwardTransformation()) - { - for (int i = 0; i < ROUNDS; i++) - SquareTransform (roundkeys4(i), roundkeys4(i)); - } - else - { - for (int i = 0; i < ROUNDS/2; i++) - for (int j = 0; j < 4; j++) - std::swap(roundkeys(i, j), roundkeys(ROUNDS-i, j)); - SquareTransform (roundkeys4(ROUNDS), roundkeys4(ROUNDS)); - } -} - -#define MSB(x) (((x) >> 24) & 0xffU) /* most significant byte */ -#define SSB(x) (((x) >> 16) & 0xffU) /* second in significance */ -#define TSB(x) (((x) >> 8) & 0xffU) /* third in significance */ -#define LSB(x) (((x) ) & 0xffU) /* least significant byte */ - -#define squareRound(text, temp, T0, T1, T2, T3, roundkey) \ -{ \ - temp[0] = T0[MSB (text[0])] \ - ^ T1[MSB (text[1])] \ - ^ T2[MSB (text[2])] \ - ^ T3[MSB (text[3])] \ - ^ roundkey[0]; \ - temp[1] = T0[SSB (text[0])] \ - ^ T1[SSB (text[1])] \ - ^ T2[SSB (text[2])] \ - ^ T3[SSB (text[3])] \ - ^ roundkey[1]; \ - temp[2] = T0[TSB (text[0])] \ - ^ T1[TSB (text[1])] \ - ^ T2[TSB (text[2])] \ - ^ T3[TSB (text[3])] \ - ^ roundkey[2]; \ - temp[3] = T0[LSB (text[0])] \ - ^ T1[LSB (text[1])] \ - ^ T2[LSB (text[2])] \ - ^ T3[LSB (text[3])] \ - ^ roundkey[3]; \ -} /* squareRound */ - -#define squareFinal(text, temp, S, roundkey) \ -{ \ - text[0] = ((word32) (S[MSB (temp[0])]) << 24) \ - ^ ((word32) (S[MSB (temp[1])]) << 16) \ - ^ ((word32) (S[MSB (temp[2])]) << 8) \ - ^ (word32) (S[MSB (temp[3])]) \ - ^ roundkey[0]; \ - text[1] = ((word32) (S[SSB (temp[0])]) << 24) \ - ^ ((word32) (S[SSB (temp[1])]) << 16) \ - ^ ((word32) (S[SSB (temp[2])]) << 8) \ - ^ (word32) (S[SSB (temp[3])]) \ - ^ roundkey[1]; \ - text[2] = ((word32) (S[TSB (temp[0])]) << 24) \ - ^ ((word32) (S[TSB (temp[1])]) << 16) \ - ^ ((word32) (S[TSB (temp[2])]) << 8) \ - ^ (word32) (S[TSB (temp[3])]) \ - ^ roundkey[2]; \ - text[3] = ((word32) (S[LSB (temp[0])]) << 24) \ - ^ ((word32) (S[LSB (temp[1])]) << 16) \ - ^ ((word32) (S[LSB (temp[2])]) << 8) \ - ^ (word32) (S[LSB (temp[3])]) \ - ^ roundkey[3]; \ -} /* squareFinal */ - -typedef BlockGetAndPut Block; - -void Square::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 text[4], temp[4]; - Block::Get(inBlock)(text[0])(text[1])(text[2])(text[3]); - - /* initial key addition */ - text[0] ^= roundkeys(0, 0); - text[1] ^= roundkeys(0, 1); - text[2] ^= roundkeys(0, 2); - text[3] ^= roundkeys(0, 3); - - /* ROUNDS - 1 full rounds */ - for (int i=1; i+1, public FixedKeyLength<16>, FixedRounds<8> -{ - static const char *StaticAlgorithmName() {return "Square";} -}; - -/// Square -class Square : public Square_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - FixedSizeSecBlock m_roundkeys; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - private: - static const byte Se[256]; - static const word32 Te[4][256]; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - private: - static const byte Sd[256]; - static const word32 Td[4][256]; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Square::Encryption SquareEncryption; -typedef Square::Decryption SquareDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/squaretb.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/squaretb.cpp deleted file mode 100644 index bc3bee7d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/squaretb.cpp +++ /dev/null @@ -1,582 +0,0 @@ -#include "pch.h" -#include "square.h" - -NAMESPACE_BEGIN(CryptoPP) - -const byte Square::Enc::Se[256] = { -177, 206, 195, 149, 90, 173, 231, 2, 77, 68, 251, 145, 12, 135, 161, 80, -203, 103, 84, 221, 70, 143, 225, 78, 240, 253, 252, 235, 249, 196, 26, 110, - 94, 245, 204, 141, 28, 86, 67, 254, 7, 97, 248, 117, 89, 255, 3, 34, -138, 209, 19, 238, 136, 0, 14, 52, 21, 128, 148, 227, 237, 181, 83, 35, - 75, 71, 23, 167, 144, 53, 171, 216, 184, 223, 79, 87, 154, 146, 219, 27, - 60, 200, 153, 4, 142, 224, 215, 125, 133, 187, 64, 44, 58, 69, 241, 66, -101, 32, 65, 24, 114, 37, 147, 112, 54, 5, 242, 11, 163, 121, 236, 8, - 39, 49, 50, 182, 124, 176, 10, 115, 91, 123, 183, 129, 210, 13, 106, 38, -158, 88, 156, 131, 116, 179, 172, 48, 122, 105, 119, 15, 174, 33, 222, 208, - 46, 151, 16, 164, 152, 168, 212, 104, 45, 98, 41, 109, 22, 73, 118, 199, -232, 193, 150, 55, 229, 202, 244, 233, 99, 18, 194, 166, 20, 188, 211, 40, -175, 47, 230, 36, 82, 198, 160, 9, 189, 140, 207, 93, 17, 95, 1, 197, -159, 61, 162, 155, 201, 59, 190, 81, 25, 31, 63, 92, 178, 239, 74, 205, -191, 186, 111, 100, 217, 243, 62, 180, 170, 220, 213, 6, 192, 126, 246, 102, -108, 132, 113, 56, 185, 29, 127, 157, 72, 139, 42, 218, 165, 51, 130, 57, -214, 120, 134, 250, 228, 43, 169, 30, 137, 96, 107, 234, 85, 76, 247, 226, -}; - -const byte Square::Dec::Sd[256] = { - 53, 190, 7, 46, 83, 105, 219, 40, 111, 183, 118, 107, 12, 125, 54, 139, -146, 188, 169, 50, 172, 56, 156, 66, 99, 200, 30, 79, 36, 229, 247, 201, - 97, 141, 47, 63, 179, 101, 127, 112, 175, 154, 234, 245, 91, 152, 144, 177, -135, 113, 114, 237, 55, 69, 104, 163, 227, 239, 92, 197, 80, 193, 214, 202, - 90, 98, 95, 38, 9, 93, 20, 65, 232, 157, 206, 64, 253, 8, 23, 74, - 15, 199, 180, 62, 18, 252, 37, 75, 129, 44, 4, 120, 203, 187, 32, 189, -249, 41, 153, 168, 211, 96, 223, 17, 151, 137, 126, 250, 224, 155, 31, 210, -103, 226, 100, 119, 132, 43, 158, 138, 241, 109, 136, 121, 116, 87, 221, 230, - 57, 123, 238, 131, 225, 88, 242, 13, 52, 248, 48, 233, 185, 35, 84, 21, - 68, 11, 77, 102, 58, 3, 162, 145, 148, 82, 76, 195, 130, 231, 128, 192, -182, 14, 194, 108, 147, 236, 171, 67, 149, 246, 216, 70, 134, 5, 140, 176, -117, 0, 204, 133, 215, 61, 115, 122, 72, 228, 209, 89, 173, 184, 198, 208, -220, 161, 170, 2, 29, 191, 181, 159, 81, 196, 165, 16, 34, 207, 1, 186, -143, 49, 124, 174, 150, 218, 240, 86, 71, 212, 235, 78, 217, 19, 142, 73, - 85, 22, 255, 59, 244, 164, 178, 6, 160, 167, 251, 27, 110, 60, 51, 205, - 24, 94, 106, 213, 166, 33, 222, 254, 42, 28, 243, 10, 26, 25, 39, 45, -}; - -const word32 Square::Enc::Te[4][256] = { -{ -0x97b1b126UL, 0x69cecea7UL, 0x73c3c3b0UL, 0xdf95954aUL, -0xb45a5aeeUL, 0xafadad02UL, 0x3be7e7dcUL, 0x04020206UL, -0x9a4d4dd7UL, 0x884444ccUL, 0x03fbfbf8UL, 0xd7919146UL, -0x180c0c14UL, 0xfb87877cUL, 0xb7a1a116UL, 0xa05050f0UL, -0x63cbcba8UL, 0xce6767a9UL, 0xa85454fcUL, 0x4fdddd92UL, -0x8c4646caUL, 0xeb8f8f64UL, 0x37e1e1d6UL, 0x9c4e4ed2UL, -0x15f0f0e5UL, 0x0ffdfdf2UL, 0x0dfcfcf1UL, 0x23ebebc8UL, -0x07f9f9feUL, 0x7dc4c4b9UL, 0x341a1a2eUL, 0xdc6e6eb2UL, -0xbc5e5ee2UL, 0x1ff5f5eaUL, 0x6dcccca1UL, 0xef8d8d62UL, -0x381c1c24UL, 0xac5656faUL, 0x864343c5UL, 0x09fefef7UL, -0x0e070709UL, 0xc26161a3UL, 0x05f8f8fdUL, 0xea75759fUL, -0xb25959ebUL, 0x0bfffff4UL, 0x06030305UL, 0x44222266UL, -0xe18a8a6bUL, 0x57d1d186UL, 0x26131335UL, 0x29eeeec7UL, -0xe588886dUL, 0x00000000UL, 0x1c0e0e12UL, 0x6834345cUL, -0x2a15153fUL, 0xf5808075UL, 0xdd949449UL, 0x33e3e3d0UL, -0x2fededc2UL, 0x9fb5b52aUL, 0xa65353f5UL, 0x46232365UL, -0x964b4bddUL, 0x8e4747c9UL, 0x2e171739UL, 0xbba7a71cUL, -0xd5909045UL, 0x6a35355fUL, 0xa3abab08UL, 0x45d8d89dUL, -0x85b8b83dUL, 0x4bdfdf94UL, 0x9e4f4fd1UL, 0xae5757f9UL, -0xc19a9a5bUL, 0xd1929243UL, 0x43dbdb98UL, 0x361b1b2dUL, -0x783c3c44UL, 0x65c8c8adUL, 0xc799995eUL, 0x0804040cUL, -0xe98e8e67UL, 0x35e0e0d5UL, 0x5bd7d78cUL, 0xfa7d7d87UL, -0xff85857aUL, 0x83bbbb38UL, 0x804040c0UL, 0x582c2c74UL, -0x743a3a4eUL, 0x8a4545cfUL, 0x17f1f1e6UL, 0x844242c6UL, -0xca6565afUL, 0x40202060UL, 0x824141c3UL, 0x30181828UL, -0xe4727296UL, 0x4a25256fUL, 0xd3939340UL, 0xe0707090UL, -0x6c36365aUL, 0x0a05050fUL, 0x11f2f2e3UL, 0x160b0b1dUL, -0xb3a3a310UL, 0xf279798bUL, 0x2dececc1UL, 0x10080818UL, -0x4e272769UL, 0x62313153UL, 0x64323256UL, 0x99b6b62fUL, -0xf87c7c84UL, 0x95b0b025UL, 0x140a0a1eUL, 0xe6737395UL, -0xb65b5bedUL, 0xf67b7b8dUL, 0x9bb7b72cUL, 0xf7818176UL, -0x51d2d283UL, 0x1a0d0d17UL, 0xd46a6abeUL, 0x4c26266aUL, -0xc99e9e57UL, 0xb05858e8UL, 0xcd9c9c51UL, 0xf3838370UL, -0xe874749cUL, 0x93b3b320UL, 0xadacac01UL, 0x60303050UL, -0xf47a7a8eUL, 0xd26969bbUL, 0xee777799UL, 0x1e0f0f11UL, -0xa9aeae07UL, 0x42212163UL, 0x49dede97UL, 0x55d0d085UL, -0x5c2e2e72UL, 0xdb97974cUL, 0x20101030UL, 0xbda4a419UL, -0xc598985dUL, 0xa5a8a80dUL, 0x5dd4d489UL, 0xd06868b8UL, -0x5a2d2d77UL, 0xc46262a6UL, 0x5229297bUL, 0xda6d6db7UL, -0x2c16163aUL, 0x924949dbUL, 0xec76769aUL, 0x7bc7c7bcUL, -0x25e8e8cdUL, 0x77c1c1b6UL, 0xd996964fUL, 0x6e373759UL, -0x3fe5e5daUL, 0x61cacaabUL, 0x1df4f4e9UL, 0x27e9e9ceUL, -0xc66363a5UL, 0x24121236UL, 0x71c2c2b3UL, 0xb9a6a61fUL, -0x2814143cUL, 0x8dbcbc31UL, 0x53d3d380UL, 0x50282878UL, -0xabafaf04UL, 0x5e2f2f71UL, 0x39e6e6dfUL, 0x4824246cUL, -0xa45252f6UL, 0x79c6c6bfUL, 0xb5a0a015UL, 0x1209091bUL, -0x8fbdbd32UL, 0xed8c8c61UL, 0x6bcfcfa4UL, 0xba5d5de7UL, -0x22111133UL, 0xbe5f5fe1UL, 0x02010103UL, 0x7fc5c5baUL, -0xcb9f9f54UL, 0x7a3d3d47UL, 0xb1a2a213UL, 0xc39b9b58UL, -0x67c9c9aeUL, 0x763b3b4dUL, 0x89bebe37UL, 0xa25151f3UL, -0x3219192bUL, 0x3e1f1f21UL, 0x7e3f3f41UL, 0xb85c5ce4UL, -0x91b2b223UL, 0x2befefc4UL, 0x944a4adeUL, 0x6fcdcda2UL, -0x8bbfbf34UL, 0x81baba3bUL, 0xde6f6fb1UL, 0xc86464acUL, -0x47d9d99eUL, 0x13f3f3e0UL, 0x7c3e3e42UL, 0x9db4b429UL, -0xa1aaaa0bUL, 0x4ddcdc91UL, 0x5fd5d58aUL, 0x0c06060aUL, -0x75c0c0b5UL, 0xfc7e7e82UL, 0x19f6f6efUL, 0xcc6666aaUL, -0xd86c6cb4UL, 0xfd848479UL, 0xe2717193UL, 0x70383848UL, -0x87b9b93eUL, 0x3a1d1d27UL, 0xfe7f7f81UL, 0xcf9d9d52UL, -0x904848d8UL, 0xe38b8b68UL, 0x542a2a7eUL, 0x41dada9bUL, -0xbfa5a51aUL, 0x66333355UL, 0xf1828273UL, 0x7239394bUL, -0x59d6d68fUL, 0xf0787888UL, 0xf986867fUL, 0x01fafafbUL, -0x3de4e4d9UL, 0x562b2b7dUL, 0xa7a9a90eUL, 0x3c1e1e22UL, -0xe789896eUL, 0xc06060a0UL, 0xd66b6bbdUL, 0x21eaeacbUL, -0xaa5555ffUL, 0x984c4cd4UL, 0x1bf7f7ecUL, 0x31e2e2d3UL, -}, - -{ -0x2697b1b1UL, 0xa769ceceUL, 0xb073c3c3UL, 0x4adf9595UL, -0xeeb45a5aUL, 0x02afadadUL, 0xdc3be7e7UL, 0x06040202UL, -0xd79a4d4dUL, 0xcc884444UL, 0xf803fbfbUL, 0x46d79191UL, -0x14180c0cUL, 0x7cfb8787UL, 0x16b7a1a1UL, 0xf0a05050UL, -0xa863cbcbUL, 0xa9ce6767UL, 0xfca85454UL, 0x924fddddUL, -0xca8c4646UL, 0x64eb8f8fUL, 0xd637e1e1UL, 0xd29c4e4eUL, -0xe515f0f0UL, 0xf20ffdfdUL, 0xf10dfcfcUL, 0xc823ebebUL, -0xfe07f9f9UL, 0xb97dc4c4UL, 0x2e341a1aUL, 0xb2dc6e6eUL, -0xe2bc5e5eUL, 0xea1ff5f5UL, 0xa16dccccUL, 0x62ef8d8dUL, -0x24381c1cUL, 0xfaac5656UL, 0xc5864343UL, 0xf709fefeUL, -0x090e0707UL, 0xa3c26161UL, 0xfd05f8f8UL, 0x9fea7575UL, -0xebb25959UL, 0xf40bffffUL, 0x05060303UL, 0x66442222UL, -0x6be18a8aUL, 0x8657d1d1UL, 0x35261313UL, 0xc729eeeeUL, -0x6de58888UL, 0x00000000UL, 0x121c0e0eUL, 0x5c683434UL, -0x3f2a1515UL, 0x75f58080UL, 0x49dd9494UL, 0xd033e3e3UL, -0xc22fededUL, 0x2a9fb5b5UL, 0xf5a65353UL, 0x65462323UL, -0xdd964b4bUL, 0xc98e4747UL, 0x392e1717UL, 0x1cbba7a7UL, -0x45d59090UL, 0x5f6a3535UL, 0x08a3ababUL, 0x9d45d8d8UL, -0x3d85b8b8UL, 0x944bdfdfUL, 0xd19e4f4fUL, 0xf9ae5757UL, -0x5bc19a9aUL, 0x43d19292UL, 0x9843dbdbUL, 0x2d361b1bUL, -0x44783c3cUL, 0xad65c8c8UL, 0x5ec79999UL, 0x0c080404UL, -0x67e98e8eUL, 0xd535e0e0UL, 0x8c5bd7d7UL, 0x87fa7d7dUL, -0x7aff8585UL, 0x3883bbbbUL, 0xc0804040UL, 0x74582c2cUL, -0x4e743a3aUL, 0xcf8a4545UL, 0xe617f1f1UL, 0xc6844242UL, -0xafca6565UL, 0x60402020UL, 0xc3824141UL, 0x28301818UL, -0x96e47272UL, 0x6f4a2525UL, 0x40d39393UL, 0x90e07070UL, -0x5a6c3636UL, 0x0f0a0505UL, 0xe311f2f2UL, 0x1d160b0bUL, -0x10b3a3a3UL, 0x8bf27979UL, 0xc12dececUL, 0x18100808UL, -0x694e2727UL, 0x53623131UL, 0x56643232UL, 0x2f99b6b6UL, -0x84f87c7cUL, 0x2595b0b0UL, 0x1e140a0aUL, 0x95e67373UL, -0xedb65b5bUL, 0x8df67b7bUL, 0x2c9bb7b7UL, 0x76f78181UL, -0x8351d2d2UL, 0x171a0d0dUL, 0xbed46a6aUL, 0x6a4c2626UL, -0x57c99e9eUL, 0xe8b05858UL, 0x51cd9c9cUL, 0x70f38383UL, -0x9ce87474UL, 0x2093b3b3UL, 0x01adacacUL, 0x50603030UL, -0x8ef47a7aUL, 0xbbd26969UL, 0x99ee7777UL, 0x111e0f0fUL, -0x07a9aeaeUL, 0x63422121UL, 0x9749dedeUL, 0x8555d0d0UL, -0x725c2e2eUL, 0x4cdb9797UL, 0x30201010UL, 0x19bda4a4UL, -0x5dc59898UL, 0x0da5a8a8UL, 0x895dd4d4UL, 0xb8d06868UL, -0x775a2d2dUL, 0xa6c46262UL, 0x7b522929UL, 0xb7da6d6dUL, -0x3a2c1616UL, 0xdb924949UL, 0x9aec7676UL, 0xbc7bc7c7UL, -0xcd25e8e8UL, 0xb677c1c1UL, 0x4fd99696UL, 0x596e3737UL, -0xda3fe5e5UL, 0xab61cacaUL, 0xe91df4f4UL, 0xce27e9e9UL, -0xa5c66363UL, 0x36241212UL, 0xb371c2c2UL, 0x1fb9a6a6UL, -0x3c281414UL, 0x318dbcbcUL, 0x8053d3d3UL, 0x78502828UL, -0x04abafafUL, 0x715e2f2fUL, 0xdf39e6e6UL, 0x6c482424UL, -0xf6a45252UL, 0xbf79c6c6UL, 0x15b5a0a0UL, 0x1b120909UL, -0x328fbdbdUL, 0x61ed8c8cUL, 0xa46bcfcfUL, 0xe7ba5d5dUL, -0x33221111UL, 0xe1be5f5fUL, 0x03020101UL, 0xba7fc5c5UL, -0x54cb9f9fUL, 0x477a3d3dUL, 0x13b1a2a2UL, 0x58c39b9bUL, -0xae67c9c9UL, 0x4d763b3bUL, 0x3789bebeUL, 0xf3a25151UL, -0x2b321919UL, 0x213e1f1fUL, 0x417e3f3fUL, 0xe4b85c5cUL, -0x2391b2b2UL, 0xc42befefUL, 0xde944a4aUL, 0xa26fcdcdUL, -0x348bbfbfUL, 0x3b81babaUL, 0xb1de6f6fUL, 0xacc86464UL, -0x9e47d9d9UL, 0xe013f3f3UL, 0x427c3e3eUL, 0x299db4b4UL, -0x0ba1aaaaUL, 0x914ddcdcUL, 0x8a5fd5d5UL, 0x0a0c0606UL, -0xb575c0c0UL, 0x82fc7e7eUL, 0xef19f6f6UL, 0xaacc6666UL, -0xb4d86c6cUL, 0x79fd8484UL, 0x93e27171UL, 0x48703838UL, -0x3e87b9b9UL, 0x273a1d1dUL, 0x81fe7f7fUL, 0x52cf9d9dUL, -0xd8904848UL, 0x68e38b8bUL, 0x7e542a2aUL, 0x9b41dadaUL, -0x1abfa5a5UL, 0x55663333UL, 0x73f18282UL, 0x4b723939UL, -0x8f59d6d6UL, 0x88f07878UL, 0x7ff98686UL, 0xfb01fafaUL, -0xd93de4e4UL, 0x7d562b2bUL, 0x0ea7a9a9UL, 0x223c1e1eUL, -0x6ee78989UL, 0xa0c06060UL, 0xbdd66b6bUL, 0xcb21eaeaUL, -0xffaa5555UL, 0xd4984c4cUL, 0xec1bf7f7UL, 0xd331e2e2UL, -}, - -{ -0xb12697b1UL, 0xcea769ceUL, 0xc3b073c3UL, 0x954adf95UL, -0x5aeeb45aUL, 0xad02afadUL, 0xe7dc3be7UL, 0x02060402UL, -0x4dd79a4dUL, 0x44cc8844UL, 0xfbf803fbUL, 0x9146d791UL, -0x0c14180cUL, 0x877cfb87UL, 0xa116b7a1UL, 0x50f0a050UL, -0xcba863cbUL, 0x67a9ce67UL, 0x54fca854UL, 0xdd924fddUL, -0x46ca8c46UL, 0x8f64eb8fUL, 0xe1d637e1UL, 0x4ed29c4eUL, -0xf0e515f0UL, 0xfdf20ffdUL, 0xfcf10dfcUL, 0xebc823ebUL, -0xf9fe07f9UL, 0xc4b97dc4UL, 0x1a2e341aUL, 0x6eb2dc6eUL, -0x5ee2bc5eUL, 0xf5ea1ff5UL, 0xcca16dccUL, 0x8d62ef8dUL, -0x1c24381cUL, 0x56faac56UL, 0x43c58643UL, 0xfef709feUL, -0x07090e07UL, 0x61a3c261UL, 0xf8fd05f8UL, 0x759fea75UL, -0x59ebb259UL, 0xfff40bffUL, 0x03050603UL, 0x22664422UL, -0x8a6be18aUL, 0xd18657d1UL, 0x13352613UL, 0xeec729eeUL, -0x886de588UL, 0x00000000UL, 0x0e121c0eUL, 0x345c6834UL, -0x153f2a15UL, 0x8075f580UL, 0x9449dd94UL, 0xe3d033e3UL, -0xedc22fedUL, 0xb52a9fb5UL, 0x53f5a653UL, 0x23654623UL, -0x4bdd964bUL, 0x47c98e47UL, 0x17392e17UL, 0xa71cbba7UL, -0x9045d590UL, 0x355f6a35UL, 0xab08a3abUL, 0xd89d45d8UL, -0xb83d85b8UL, 0xdf944bdfUL, 0x4fd19e4fUL, 0x57f9ae57UL, -0x9a5bc19aUL, 0x9243d192UL, 0xdb9843dbUL, 0x1b2d361bUL, -0x3c44783cUL, 0xc8ad65c8UL, 0x995ec799UL, 0x040c0804UL, -0x8e67e98eUL, 0xe0d535e0UL, 0xd78c5bd7UL, 0x7d87fa7dUL, -0x857aff85UL, 0xbb3883bbUL, 0x40c08040UL, 0x2c74582cUL, -0x3a4e743aUL, 0x45cf8a45UL, 0xf1e617f1UL, 0x42c68442UL, -0x65afca65UL, 0x20604020UL, 0x41c38241UL, 0x18283018UL, -0x7296e472UL, 0x256f4a25UL, 0x9340d393UL, 0x7090e070UL, -0x365a6c36UL, 0x050f0a05UL, 0xf2e311f2UL, 0x0b1d160bUL, -0xa310b3a3UL, 0x798bf279UL, 0xecc12decUL, 0x08181008UL, -0x27694e27UL, 0x31536231UL, 0x32566432UL, 0xb62f99b6UL, -0x7c84f87cUL, 0xb02595b0UL, 0x0a1e140aUL, 0x7395e673UL, -0x5bedb65bUL, 0x7b8df67bUL, 0xb72c9bb7UL, 0x8176f781UL, -0xd28351d2UL, 0x0d171a0dUL, 0x6abed46aUL, 0x266a4c26UL, -0x9e57c99eUL, 0x58e8b058UL, 0x9c51cd9cUL, 0x8370f383UL, -0x749ce874UL, 0xb32093b3UL, 0xac01adacUL, 0x30506030UL, -0x7a8ef47aUL, 0x69bbd269UL, 0x7799ee77UL, 0x0f111e0fUL, -0xae07a9aeUL, 0x21634221UL, 0xde9749deUL, 0xd08555d0UL, -0x2e725c2eUL, 0x974cdb97UL, 0x10302010UL, 0xa419bda4UL, -0x985dc598UL, 0xa80da5a8UL, 0xd4895dd4UL, 0x68b8d068UL, -0x2d775a2dUL, 0x62a6c462UL, 0x297b5229UL, 0x6db7da6dUL, -0x163a2c16UL, 0x49db9249UL, 0x769aec76UL, 0xc7bc7bc7UL, -0xe8cd25e8UL, 0xc1b677c1UL, 0x964fd996UL, 0x37596e37UL, -0xe5da3fe5UL, 0xcaab61caUL, 0xf4e91df4UL, 0xe9ce27e9UL, -0x63a5c663UL, 0x12362412UL, 0xc2b371c2UL, 0xa61fb9a6UL, -0x143c2814UL, 0xbc318dbcUL, 0xd38053d3UL, 0x28785028UL, -0xaf04abafUL, 0x2f715e2fUL, 0xe6df39e6UL, 0x246c4824UL, -0x52f6a452UL, 0xc6bf79c6UL, 0xa015b5a0UL, 0x091b1209UL, -0xbd328fbdUL, 0x8c61ed8cUL, 0xcfa46bcfUL, 0x5de7ba5dUL, -0x11332211UL, 0x5fe1be5fUL, 0x01030201UL, 0xc5ba7fc5UL, -0x9f54cb9fUL, 0x3d477a3dUL, 0xa213b1a2UL, 0x9b58c39bUL, -0xc9ae67c9UL, 0x3b4d763bUL, 0xbe3789beUL, 0x51f3a251UL, -0x192b3219UL, 0x1f213e1fUL, 0x3f417e3fUL, 0x5ce4b85cUL, -0xb22391b2UL, 0xefc42befUL, 0x4ade944aUL, 0xcda26fcdUL, -0xbf348bbfUL, 0xba3b81baUL, 0x6fb1de6fUL, 0x64acc864UL, -0xd99e47d9UL, 0xf3e013f3UL, 0x3e427c3eUL, 0xb4299db4UL, -0xaa0ba1aaUL, 0xdc914ddcUL, 0xd58a5fd5UL, 0x060a0c06UL, -0xc0b575c0UL, 0x7e82fc7eUL, 0xf6ef19f6UL, 0x66aacc66UL, -0x6cb4d86cUL, 0x8479fd84UL, 0x7193e271UL, 0x38487038UL, -0xb93e87b9UL, 0x1d273a1dUL, 0x7f81fe7fUL, 0x9d52cf9dUL, -0x48d89048UL, 0x8b68e38bUL, 0x2a7e542aUL, 0xda9b41daUL, -0xa51abfa5UL, 0x33556633UL, 0x8273f182UL, 0x394b7239UL, -0xd68f59d6UL, 0x7888f078UL, 0x867ff986UL, 0xfafb01faUL, -0xe4d93de4UL, 0x2b7d562bUL, 0xa90ea7a9UL, 0x1e223c1eUL, -0x896ee789UL, 0x60a0c060UL, 0x6bbdd66bUL, 0xeacb21eaUL, -0x55ffaa55UL, 0x4cd4984cUL, 0xf7ec1bf7UL, 0xe2d331e2UL, -}, - -{ -0xb1b12697UL, 0xcecea769UL, 0xc3c3b073UL, 0x95954adfUL, -0x5a5aeeb4UL, 0xadad02afUL, 0xe7e7dc3bUL, 0x02020604UL, -0x4d4dd79aUL, 0x4444cc88UL, 0xfbfbf803UL, 0x919146d7UL, -0x0c0c1418UL, 0x87877cfbUL, 0xa1a116b7UL, 0x5050f0a0UL, -0xcbcba863UL, 0x6767a9ceUL, 0x5454fca8UL, 0xdddd924fUL, -0x4646ca8cUL, 0x8f8f64ebUL, 0xe1e1d637UL, 0x4e4ed29cUL, -0xf0f0e515UL, 0xfdfdf20fUL, 0xfcfcf10dUL, 0xebebc823UL, -0xf9f9fe07UL, 0xc4c4b97dUL, 0x1a1a2e34UL, 0x6e6eb2dcUL, -0x5e5ee2bcUL, 0xf5f5ea1fUL, 0xcccca16dUL, 0x8d8d62efUL, -0x1c1c2438UL, 0x5656faacUL, 0x4343c586UL, 0xfefef709UL, -0x0707090eUL, 0x6161a3c2UL, 0xf8f8fd05UL, 0x75759feaUL, -0x5959ebb2UL, 0xfffff40bUL, 0x03030506UL, 0x22226644UL, -0x8a8a6be1UL, 0xd1d18657UL, 0x13133526UL, 0xeeeec729UL, -0x88886de5UL, 0x00000000UL, 0x0e0e121cUL, 0x34345c68UL, -0x15153f2aUL, 0x808075f5UL, 0x949449ddUL, 0xe3e3d033UL, -0xededc22fUL, 0xb5b52a9fUL, 0x5353f5a6UL, 0x23236546UL, -0x4b4bdd96UL, 0x4747c98eUL, 0x1717392eUL, 0xa7a71cbbUL, -0x909045d5UL, 0x35355f6aUL, 0xabab08a3UL, 0xd8d89d45UL, -0xb8b83d85UL, 0xdfdf944bUL, 0x4f4fd19eUL, 0x5757f9aeUL, -0x9a9a5bc1UL, 0x929243d1UL, 0xdbdb9843UL, 0x1b1b2d36UL, -0x3c3c4478UL, 0xc8c8ad65UL, 0x99995ec7UL, 0x04040c08UL, -0x8e8e67e9UL, 0xe0e0d535UL, 0xd7d78c5bUL, 0x7d7d87faUL, -0x85857affUL, 0xbbbb3883UL, 0x4040c080UL, 0x2c2c7458UL, -0x3a3a4e74UL, 0x4545cf8aUL, 0xf1f1e617UL, 0x4242c684UL, -0x6565afcaUL, 0x20206040UL, 0x4141c382UL, 0x18182830UL, -0x727296e4UL, 0x25256f4aUL, 0x939340d3UL, 0x707090e0UL, -0x36365a6cUL, 0x05050f0aUL, 0xf2f2e311UL, 0x0b0b1d16UL, -0xa3a310b3UL, 0x79798bf2UL, 0xececc12dUL, 0x08081810UL, -0x2727694eUL, 0x31315362UL, 0x32325664UL, 0xb6b62f99UL, -0x7c7c84f8UL, 0xb0b02595UL, 0x0a0a1e14UL, 0x737395e6UL, -0x5b5bedb6UL, 0x7b7b8df6UL, 0xb7b72c9bUL, 0x818176f7UL, -0xd2d28351UL, 0x0d0d171aUL, 0x6a6abed4UL, 0x26266a4cUL, -0x9e9e57c9UL, 0x5858e8b0UL, 0x9c9c51cdUL, 0x838370f3UL, -0x74749ce8UL, 0xb3b32093UL, 0xacac01adUL, 0x30305060UL, -0x7a7a8ef4UL, 0x6969bbd2UL, 0x777799eeUL, 0x0f0f111eUL, -0xaeae07a9UL, 0x21216342UL, 0xdede9749UL, 0xd0d08555UL, -0x2e2e725cUL, 0x97974cdbUL, 0x10103020UL, 0xa4a419bdUL, -0x98985dc5UL, 0xa8a80da5UL, 0xd4d4895dUL, 0x6868b8d0UL, -0x2d2d775aUL, 0x6262a6c4UL, 0x29297b52UL, 0x6d6db7daUL, -0x16163a2cUL, 0x4949db92UL, 0x76769aecUL, 0xc7c7bc7bUL, -0xe8e8cd25UL, 0xc1c1b677UL, 0x96964fd9UL, 0x3737596eUL, -0xe5e5da3fUL, 0xcacaab61UL, 0xf4f4e91dUL, 0xe9e9ce27UL, -0x6363a5c6UL, 0x12123624UL, 0xc2c2b371UL, 0xa6a61fb9UL, -0x14143c28UL, 0xbcbc318dUL, 0xd3d38053UL, 0x28287850UL, -0xafaf04abUL, 0x2f2f715eUL, 0xe6e6df39UL, 0x24246c48UL, -0x5252f6a4UL, 0xc6c6bf79UL, 0xa0a015b5UL, 0x09091b12UL, -0xbdbd328fUL, 0x8c8c61edUL, 0xcfcfa46bUL, 0x5d5de7baUL, -0x11113322UL, 0x5f5fe1beUL, 0x01010302UL, 0xc5c5ba7fUL, -0x9f9f54cbUL, 0x3d3d477aUL, 0xa2a213b1UL, 0x9b9b58c3UL, -0xc9c9ae67UL, 0x3b3b4d76UL, 0xbebe3789UL, 0x5151f3a2UL, -0x19192b32UL, 0x1f1f213eUL, 0x3f3f417eUL, 0x5c5ce4b8UL, -0xb2b22391UL, 0xefefc42bUL, 0x4a4ade94UL, 0xcdcda26fUL, -0xbfbf348bUL, 0xbaba3b81UL, 0x6f6fb1deUL, 0x6464acc8UL, -0xd9d99e47UL, 0xf3f3e013UL, 0x3e3e427cUL, 0xb4b4299dUL, -0xaaaa0ba1UL, 0xdcdc914dUL, 0xd5d58a5fUL, 0x06060a0cUL, -0xc0c0b575UL, 0x7e7e82fcUL, 0xf6f6ef19UL, 0x6666aaccUL, -0x6c6cb4d8UL, 0x848479fdUL, 0x717193e2UL, 0x38384870UL, -0xb9b93e87UL, 0x1d1d273aUL, 0x7f7f81feUL, 0x9d9d52cfUL, -0x4848d890UL, 0x8b8b68e3UL, 0x2a2a7e54UL, 0xdada9b41UL, -0xa5a51abfUL, 0x33335566UL, 0x828273f1UL, 0x39394b72UL, -0xd6d68f59UL, 0x787888f0UL, 0x86867ff9UL, 0xfafafb01UL, -0xe4e4d93dUL, 0x2b2b7d56UL, 0xa9a90ea7UL, 0x1e1e223cUL, -0x89896ee7UL, 0x6060a0c0UL, 0x6b6bbdd6UL, 0xeaeacb21UL, -0x5555ffaaUL, 0x4c4cd498UL, 0xf7f7ec1bUL, 0xe2e2d331UL, -}}; - -const word32 Square::Dec::Td[4][256] = { -{ -0xe368bc02UL, 0x5585620cUL, 0x2a3f2331UL, 0x61ab13f7UL, -0x98d46d72UL, 0x21cb9a19UL, 0x3c22a461UL, 0x459d3dcdUL, -0x05fdb423UL, 0x2bc4075fUL, 0x9b2c01c0UL, 0x3dd9800fUL, -0x486c5c74UL, 0xf97f7e85UL, 0xf173ab1fUL, 0xb6edde0eUL, -0x283c6bedUL, 0x4997781aUL, 0x9f2a918dUL, 0xc9579f33UL, -0xa907a8aaUL, 0xa50ded7dUL, 0x7c422d8fUL, 0x764db0c9UL, -0x4d91e857UL, 0xcea963ccUL, 0xb4ee96d2UL, 0x3028e1b6UL, -0x0df161b9UL, 0xbd196726UL, 0x419bad80UL, 0xc0a06ec7UL, -0x5183f241UL, 0x92dbf034UL, 0x6fa21efcUL, 0x8f32ce4cUL, -0x13e03373UL, 0x69a7c66dUL, 0xe56d6493UL, 0xbf1a2ffaUL, -0xbb1cbfb7UL, 0x587403b5UL, 0xe76e2c4fUL, 0x5d89b796UL, -0xe89c052aUL, 0x446619a3UL, 0x342e71fbUL, 0x0ff22965UL, -0xfe81827aUL, 0xb11322f1UL, 0xa30835ecUL, 0xcd510f7eUL, -0xff7aa614UL, 0x5c7293f8UL, 0x2fc29712UL, 0xf370e3c3UL, -0x992f491cUL, 0xd1431568UL, 0xc2a3261bUL, 0x88cc32b3UL, -0x8acf7a6fUL, 0xb0e8069fUL, 0x7a47f51eUL, 0xd2bb79daUL, -0xe6950821UL, 0x4398e55cUL, 0xd0b83106UL, 0x11e37bafUL, -0x7e416553UL, 0xccaa2b10UL, 0xd8b4e49cUL, 0x6456a7d4UL, -0xfb7c3659UL, 0x724b2084UL, 0xea9f4df6UL, 0x6a5faadfUL, -0x2dc1dfceUL, 0x70486858UL, 0xcaaff381UL, 0x0605d891UL, -0x5a774b69UL, 0x94de28a5UL, 0x39df1042UL, 0x813bc347UL, -0xfc82caa6UL, 0x23c8d2c5UL, 0x03f86cb2UL, 0x080cd59aUL, -0xdab7ac40UL, 0x7db909e1UL, 0x3824342cUL, 0xcf5247a2UL, -0xdcb274d1UL, 0x63a85b2bUL, 0x35d55595UL, 0x479e7511UL, -0x15e5ebe2UL, 0x4b9430c6UL, 0x4a6f14a8UL, 0x91239c86UL, -0x4c6acc39UL, 0x5f8aff4aUL, 0x0406904dUL, 0xee99ddbbUL, -0x1e1152caUL, 0xaaffc418UL, 0xeb646998UL, 0x07fefcffUL, -0x8b345e01UL, 0x567d0ebeUL, 0xbae79bd9UL, 0x4263c132UL, -0x75b5dc7bUL, 0x97264417UL, 0x67aecb66UL, 0x95250ccbUL, -0xec9a9567UL, 0x57862ad0UL, 0x60503799UL, 0xb8e4d305UL, -0x65ad83baUL, 0x19efae35UL, 0xa4f6c913UL, 0xc15b4aa9UL, -0x873e1bd6UL, 0xa0f0595eUL, 0x18148a5bUL, 0xaf02703bUL, -0xab04e076UL, 0xdd4950bfUL, 0xdf4a1863UL, 0xc6a5b656UL, -0x853d530aUL, 0xfa871237UL, 0x77b694a7UL, 0x4665517fUL, -0xed61b109UL, 0x1bece6e9UL, 0xd5458525UL, 0xf5753b52UL, -0x7fba413dUL, 0x27ce4288UL, 0xb2eb4e43UL, 0xd6bde997UL, -0x527b9ef3UL, 0x62537f45UL, 0x2c3afba0UL, 0x7bbcd170UL, -0xb91ff76bUL, 0x121b171dUL, 0xfd79eec8UL, 0x3a277cf0UL, -0x0c0a45d7UL, 0x96dd6079UL, 0x2233f6abUL, 0xacfa1c89UL, -0xc8acbb5dUL, 0xa10b7d30UL, 0xd4bea14bUL, 0xbee10b94UL, -0x25cd0a54UL, 0x547e4662UL, 0xa2f31182UL, 0x17e6a33eUL, -0x263566e6UL, 0xc3580275UL, 0x83388b9bUL, 0x7844bdc2UL, -0x020348dcUL, 0x4f92a08bUL, 0x2e39b37cUL, 0x4e6984e5UL, -0xf0888f71UL, 0x362d3927UL, 0x9cd2fd3fUL, 0x01fb246eUL, -0x893716ddUL, 0x00000000UL, 0xf68d57e0UL, 0xe293986cUL, -0x744ef815UL, 0x9320d45aUL, 0xad0138e7UL, 0xd3405db4UL, -0x1a17c287UL, 0xb3106a2dUL, 0x5078d62fUL, 0xf48e1f3cUL, -0xa70ea5a1UL, 0x71b34c36UL, 0x9ad725aeUL, 0x5e71db24UL, -0x161d8750UL, 0xef62f9d5UL, 0x8d318690UL, 0x1c121a16UL, -0xa6f581cfUL, 0x5b8c6f07UL, 0x37d61d49UL, 0x6e593a92UL, -0x84c67764UL, 0x86c53fb8UL, 0xd746cdf9UL, 0xe090d0b0UL, -0x29c74f83UL, 0xe49640fdUL, 0x0e090d0bUL, 0x6da15620UL, -0x8ec9ea22UL, 0xdb4c882eUL, 0xf776738eUL, 0xb515b2bcUL, -0x10185fc1UL, 0x322ba96aUL, 0x6ba48eb1UL, 0xaef95455UL, -0x406089eeUL, 0x6655ef08UL, 0xe9672144UL, 0x3e21ecbdUL, -0x2030be77UL, 0xf28bc7adUL, 0x80c0e729UL, 0x141ecf8cUL, -0xbce24348UL, 0xc4a6fe8aUL, 0x31d3c5d8UL, 0xb716fa60UL, -0x5380ba9dUL, 0xd94fc0f2UL, 0x1de93e78UL, 0x24362e3aUL, -0xe16bf4deUL, 0xcb54d7efUL, 0x09f7f1f4UL, 0x82c3aff5UL, -0x0bf4b928UL, 0x9d29d951UL, 0xc75e9238UL, 0xf8845aebUL, -0x90d8b8e8UL, 0xdeb13c0dUL, 0x33d08d04UL, 0x685ce203UL, -0xc55ddae4UL, 0x3bdc589eUL, 0x0a0f9d46UL, 0x3fdac8d3UL, -0x598f27dbUL, 0xa8fc8cc4UL, 0x79bf99acUL, 0x6c5a724eUL, -0x8ccaa2feUL, 0x9ed1b5e3UL, 0x1fea76a4UL, 0x73b004eaUL, -}, - -{ -0x02e368bcUL, 0x0c558562UL, 0x312a3f23UL, 0xf761ab13UL, -0x7298d46dUL, 0x1921cb9aUL, 0x613c22a4UL, 0xcd459d3dUL, -0x2305fdb4UL, 0x5f2bc407UL, 0xc09b2c01UL, 0x0f3dd980UL, -0x74486c5cUL, 0x85f97f7eUL, 0x1ff173abUL, 0x0eb6eddeUL, -0xed283c6bUL, 0x1a499778UL, 0x8d9f2a91UL, 0x33c9579fUL, -0xaaa907a8UL, 0x7da50dedUL, 0x8f7c422dUL, 0xc9764db0UL, -0x574d91e8UL, 0xcccea963UL, 0xd2b4ee96UL, 0xb63028e1UL, -0xb90df161UL, 0x26bd1967UL, 0x80419badUL, 0xc7c0a06eUL, -0x415183f2UL, 0x3492dbf0UL, 0xfc6fa21eUL, 0x4c8f32ceUL, -0x7313e033UL, 0x6d69a7c6UL, 0x93e56d64UL, 0xfabf1a2fUL, -0xb7bb1cbfUL, 0xb5587403UL, 0x4fe76e2cUL, 0x965d89b7UL, -0x2ae89c05UL, 0xa3446619UL, 0xfb342e71UL, 0x650ff229UL, -0x7afe8182UL, 0xf1b11322UL, 0xeca30835UL, 0x7ecd510fUL, -0x14ff7aa6UL, 0xf85c7293UL, 0x122fc297UL, 0xc3f370e3UL, -0x1c992f49UL, 0x68d14315UL, 0x1bc2a326UL, 0xb388cc32UL, -0x6f8acf7aUL, 0x9fb0e806UL, 0x1e7a47f5UL, 0xdad2bb79UL, -0x21e69508UL, 0x5c4398e5UL, 0x06d0b831UL, 0xaf11e37bUL, -0x537e4165UL, 0x10ccaa2bUL, 0x9cd8b4e4UL, 0xd46456a7UL, -0x59fb7c36UL, 0x84724b20UL, 0xf6ea9f4dUL, 0xdf6a5faaUL, -0xce2dc1dfUL, 0x58704868UL, 0x81caaff3UL, 0x910605d8UL, -0x695a774bUL, 0xa594de28UL, 0x4239df10UL, 0x47813bc3UL, -0xa6fc82caUL, 0xc523c8d2UL, 0xb203f86cUL, 0x9a080cd5UL, -0x40dab7acUL, 0xe17db909UL, 0x2c382434UL, 0xa2cf5247UL, -0xd1dcb274UL, 0x2b63a85bUL, 0x9535d555UL, 0x11479e75UL, -0xe215e5ebUL, 0xc64b9430UL, 0xa84a6f14UL, 0x8691239cUL, -0x394c6accUL, 0x4a5f8affUL, 0x4d040690UL, 0xbbee99ddUL, -0xca1e1152UL, 0x18aaffc4UL, 0x98eb6469UL, 0xff07fefcUL, -0x018b345eUL, 0xbe567d0eUL, 0xd9bae79bUL, 0x324263c1UL, -0x7b75b5dcUL, 0x17972644UL, 0x6667aecbUL, 0xcb95250cUL, -0x67ec9a95UL, 0xd057862aUL, 0x99605037UL, 0x05b8e4d3UL, -0xba65ad83UL, 0x3519efaeUL, 0x13a4f6c9UL, 0xa9c15b4aUL, -0xd6873e1bUL, 0x5ea0f059UL, 0x5b18148aUL, 0x3baf0270UL, -0x76ab04e0UL, 0xbfdd4950UL, 0x63df4a18UL, 0x56c6a5b6UL, -0x0a853d53UL, 0x37fa8712UL, 0xa777b694UL, 0x7f466551UL, -0x09ed61b1UL, 0xe91bece6UL, 0x25d54585UL, 0x52f5753bUL, -0x3d7fba41UL, 0x8827ce42UL, 0x43b2eb4eUL, 0x97d6bde9UL, -0xf3527b9eUL, 0x4562537fUL, 0xa02c3afbUL, 0x707bbcd1UL, -0x6bb91ff7UL, 0x1d121b17UL, 0xc8fd79eeUL, 0xf03a277cUL, -0xd70c0a45UL, 0x7996dd60UL, 0xab2233f6UL, 0x89acfa1cUL, -0x5dc8acbbUL, 0x30a10b7dUL, 0x4bd4bea1UL, 0x94bee10bUL, -0x5425cd0aUL, 0x62547e46UL, 0x82a2f311UL, 0x3e17e6a3UL, -0xe6263566UL, 0x75c35802UL, 0x9b83388bUL, 0xc27844bdUL, -0xdc020348UL, 0x8b4f92a0UL, 0x7c2e39b3UL, 0xe54e6984UL, -0x71f0888fUL, 0x27362d39UL, 0x3f9cd2fdUL, 0x6e01fb24UL, -0xdd893716UL, 0x00000000UL, 0xe0f68d57UL, 0x6ce29398UL, -0x15744ef8UL, 0x5a9320d4UL, 0xe7ad0138UL, 0xb4d3405dUL, -0x871a17c2UL, 0x2db3106aUL, 0x2f5078d6UL, 0x3cf48e1fUL, -0xa1a70ea5UL, 0x3671b34cUL, 0xae9ad725UL, 0x245e71dbUL, -0x50161d87UL, 0xd5ef62f9UL, 0x908d3186UL, 0x161c121aUL, -0xcfa6f581UL, 0x075b8c6fUL, 0x4937d61dUL, 0x926e593aUL, -0x6484c677UL, 0xb886c53fUL, 0xf9d746cdUL, 0xb0e090d0UL, -0x8329c74fUL, 0xfde49640UL, 0x0b0e090dUL, 0x206da156UL, -0x228ec9eaUL, 0x2edb4c88UL, 0x8ef77673UL, 0xbcb515b2UL, -0xc110185fUL, 0x6a322ba9UL, 0xb16ba48eUL, 0x55aef954UL, -0xee406089UL, 0x086655efUL, 0x44e96721UL, 0xbd3e21ecUL, -0x772030beUL, 0xadf28bc7UL, 0x2980c0e7UL, 0x8c141ecfUL, -0x48bce243UL, 0x8ac4a6feUL, 0xd831d3c5UL, 0x60b716faUL, -0x9d5380baUL, 0xf2d94fc0UL, 0x781de93eUL, 0x3a24362eUL, -0xdee16bf4UL, 0xefcb54d7UL, 0xf409f7f1UL, 0xf582c3afUL, -0x280bf4b9UL, 0x519d29d9UL, 0x38c75e92UL, 0xebf8845aUL, -0xe890d8b8UL, 0x0ddeb13cUL, 0x0433d08dUL, 0x03685ce2UL, -0xe4c55ddaUL, 0x9e3bdc58UL, 0x460a0f9dUL, 0xd33fdac8UL, -0xdb598f27UL, 0xc4a8fc8cUL, 0xac79bf99UL, 0x4e6c5a72UL, -0xfe8ccaa2UL, 0xe39ed1b5UL, 0xa41fea76UL, 0xea73b004UL, -}, - -{ -0xbc02e368UL, 0x620c5585UL, 0x23312a3fUL, 0x13f761abUL, -0x6d7298d4UL, 0x9a1921cbUL, 0xa4613c22UL, 0x3dcd459dUL, -0xb42305fdUL, 0x075f2bc4UL, 0x01c09b2cUL, 0x800f3dd9UL, -0x5c74486cUL, 0x7e85f97fUL, 0xab1ff173UL, 0xde0eb6edUL, -0x6bed283cUL, 0x781a4997UL, 0x918d9f2aUL, 0x9f33c957UL, -0xa8aaa907UL, 0xed7da50dUL, 0x2d8f7c42UL, 0xb0c9764dUL, -0xe8574d91UL, 0x63cccea9UL, 0x96d2b4eeUL, 0xe1b63028UL, -0x61b90df1UL, 0x6726bd19UL, 0xad80419bUL, 0x6ec7c0a0UL, -0xf2415183UL, 0xf03492dbUL, 0x1efc6fa2UL, 0xce4c8f32UL, -0x337313e0UL, 0xc66d69a7UL, 0x6493e56dUL, 0x2ffabf1aUL, -0xbfb7bb1cUL, 0x03b55874UL, 0x2c4fe76eUL, 0xb7965d89UL, -0x052ae89cUL, 0x19a34466UL, 0x71fb342eUL, 0x29650ff2UL, -0x827afe81UL, 0x22f1b113UL, 0x35eca308UL, 0x0f7ecd51UL, -0xa614ff7aUL, 0x93f85c72UL, 0x97122fc2UL, 0xe3c3f370UL, -0x491c992fUL, 0x1568d143UL, 0x261bc2a3UL, 0x32b388ccUL, -0x7a6f8acfUL, 0x069fb0e8UL, 0xf51e7a47UL, 0x79dad2bbUL, -0x0821e695UL, 0xe55c4398UL, 0x3106d0b8UL, 0x7baf11e3UL, -0x65537e41UL, 0x2b10ccaaUL, 0xe49cd8b4UL, 0xa7d46456UL, -0x3659fb7cUL, 0x2084724bUL, 0x4df6ea9fUL, 0xaadf6a5fUL, -0xdfce2dc1UL, 0x68587048UL, 0xf381caafUL, 0xd8910605UL, -0x4b695a77UL, 0x28a594deUL, 0x104239dfUL, 0xc347813bUL, -0xcaa6fc82UL, 0xd2c523c8UL, 0x6cb203f8UL, 0xd59a080cUL, -0xac40dab7UL, 0x09e17db9UL, 0x342c3824UL, 0x47a2cf52UL, -0x74d1dcb2UL, 0x5b2b63a8UL, 0x559535d5UL, 0x7511479eUL, -0xebe215e5UL, 0x30c64b94UL, 0x14a84a6fUL, 0x9c869123UL, -0xcc394c6aUL, 0xff4a5f8aUL, 0x904d0406UL, 0xddbbee99UL, -0x52ca1e11UL, 0xc418aaffUL, 0x6998eb64UL, 0xfcff07feUL, -0x5e018b34UL, 0x0ebe567dUL, 0x9bd9bae7UL, 0xc1324263UL, -0xdc7b75b5UL, 0x44179726UL, 0xcb6667aeUL, 0x0ccb9525UL, -0x9567ec9aUL, 0x2ad05786UL, 0x37996050UL, 0xd305b8e4UL, -0x83ba65adUL, 0xae3519efUL, 0xc913a4f6UL, 0x4aa9c15bUL, -0x1bd6873eUL, 0x595ea0f0UL, 0x8a5b1814UL, 0x703baf02UL, -0xe076ab04UL, 0x50bfdd49UL, 0x1863df4aUL, 0xb656c6a5UL, -0x530a853dUL, 0x1237fa87UL, 0x94a777b6UL, 0x517f4665UL, -0xb109ed61UL, 0xe6e91becUL, 0x8525d545UL, 0x3b52f575UL, -0x413d7fbaUL, 0x428827ceUL, 0x4e43b2ebUL, 0xe997d6bdUL, -0x9ef3527bUL, 0x7f456253UL, 0xfba02c3aUL, 0xd1707bbcUL, -0xf76bb91fUL, 0x171d121bUL, 0xeec8fd79UL, 0x7cf03a27UL, -0x45d70c0aUL, 0x607996ddUL, 0xf6ab2233UL, 0x1c89acfaUL, -0xbb5dc8acUL, 0x7d30a10bUL, 0xa14bd4beUL, 0x0b94bee1UL, -0x0a5425cdUL, 0x4662547eUL, 0x1182a2f3UL, 0xa33e17e6UL, -0x66e62635UL, 0x0275c358UL, 0x8b9b8338UL, 0xbdc27844UL, -0x48dc0203UL, 0xa08b4f92UL, 0xb37c2e39UL, 0x84e54e69UL, -0x8f71f088UL, 0x3927362dUL, 0xfd3f9cd2UL, 0x246e01fbUL, -0x16dd8937UL, 0x00000000UL, 0x57e0f68dUL, 0x986ce293UL, -0xf815744eUL, 0xd45a9320UL, 0x38e7ad01UL, 0x5db4d340UL, -0xc2871a17UL, 0x6a2db310UL, 0xd62f5078UL, 0x1f3cf48eUL, -0xa5a1a70eUL, 0x4c3671b3UL, 0x25ae9ad7UL, 0xdb245e71UL, -0x8750161dUL, 0xf9d5ef62UL, 0x86908d31UL, 0x1a161c12UL, -0x81cfa6f5UL, 0x6f075b8cUL, 0x1d4937d6UL, 0x3a926e59UL, -0x776484c6UL, 0x3fb886c5UL, 0xcdf9d746UL, 0xd0b0e090UL, -0x4f8329c7UL, 0x40fde496UL, 0x0d0b0e09UL, 0x56206da1UL, -0xea228ec9UL, 0x882edb4cUL, 0x738ef776UL, 0xb2bcb515UL, -0x5fc11018UL, 0xa96a322bUL, 0x8eb16ba4UL, 0x5455aef9UL, -0x89ee4060UL, 0xef086655UL, 0x2144e967UL, 0xecbd3e21UL, -0xbe772030UL, 0xc7adf28bUL, 0xe72980c0UL, 0xcf8c141eUL, -0x4348bce2UL, 0xfe8ac4a6UL, 0xc5d831d3UL, 0xfa60b716UL, -0xba9d5380UL, 0xc0f2d94fUL, 0x3e781de9UL, 0x2e3a2436UL, -0xf4dee16bUL, 0xd7efcb54UL, 0xf1f409f7UL, 0xaff582c3UL, -0xb9280bf4UL, 0xd9519d29UL, 0x9238c75eUL, 0x5aebf884UL, -0xb8e890d8UL, 0x3c0ddeb1UL, 0x8d0433d0UL, 0xe203685cUL, -0xdae4c55dUL, 0x589e3bdcUL, 0x9d460a0fUL, 0xc8d33fdaUL, -0x27db598fUL, 0x8cc4a8fcUL, 0x99ac79bfUL, 0x724e6c5aUL, -0xa2fe8ccaUL, 0xb5e39ed1UL, 0x76a41feaUL, 0x04ea73b0UL, -}, - -{ -0x68bc02e3UL, 0x85620c55UL, 0x3f23312aUL, 0xab13f761UL, -0xd46d7298UL, 0xcb9a1921UL, 0x22a4613cUL, 0x9d3dcd45UL, -0xfdb42305UL, 0xc4075f2bUL, 0x2c01c09bUL, 0xd9800f3dUL, -0x6c5c7448UL, 0x7f7e85f9UL, 0x73ab1ff1UL, 0xedde0eb6UL, -0x3c6bed28UL, 0x97781a49UL, 0x2a918d9fUL, 0x579f33c9UL, -0x07a8aaa9UL, 0x0ded7da5UL, 0x422d8f7cUL, 0x4db0c976UL, -0x91e8574dUL, 0xa963ccceUL, 0xee96d2b4UL, 0x28e1b630UL, -0xf161b90dUL, 0x196726bdUL, 0x9bad8041UL, 0xa06ec7c0UL, -0x83f24151UL, 0xdbf03492UL, 0xa21efc6fUL, 0x32ce4c8fUL, -0xe0337313UL, 0xa7c66d69UL, 0x6d6493e5UL, 0x1a2ffabfUL, -0x1cbfb7bbUL, 0x7403b558UL, 0x6e2c4fe7UL, 0x89b7965dUL, -0x9c052ae8UL, 0x6619a344UL, 0x2e71fb34UL, 0xf229650fUL, -0x81827afeUL, 0x1322f1b1UL, 0x0835eca3UL, 0x510f7ecdUL, -0x7aa614ffUL, 0x7293f85cUL, 0xc297122fUL, 0x70e3c3f3UL, -0x2f491c99UL, 0x431568d1UL, 0xa3261bc2UL, 0xcc32b388UL, -0xcf7a6f8aUL, 0xe8069fb0UL, 0x47f51e7aUL, 0xbb79dad2UL, -0x950821e6UL, 0x98e55c43UL, 0xb83106d0UL, 0xe37baf11UL, -0x4165537eUL, 0xaa2b10ccUL, 0xb4e49cd8UL, 0x56a7d464UL, -0x7c3659fbUL, 0x4b208472UL, 0x9f4df6eaUL, 0x5faadf6aUL, -0xc1dfce2dUL, 0x48685870UL, 0xaff381caUL, 0x05d89106UL, -0x774b695aUL, 0xde28a594UL, 0xdf104239UL, 0x3bc34781UL, -0x82caa6fcUL, 0xc8d2c523UL, 0xf86cb203UL, 0x0cd59a08UL, -0xb7ac40daUL, 0xb909e17dUL, 0x24342c38UL, 0x5247a2cfUL, -0xb274d1dcUL, 0xa85b2b63UL, 0xd5559535UL, 0x9e751147UL, -0xe5ebe215UL, 0x9430c64bUL, 0x6f14a84aUL, 0x239c8691UL, -0x6acc394cUL, 0x8aff4a5fUL, 0x06904d04UL, 0x99ddbbeeUL, -0x1152ca1eUL, 0xffc418aaUL, 0x646998ebUL, 0xfefcff07UL, -0x345e018bUL, 0x7d0ebe56UL, 0xe79bd9baUL, 0x63c13242UL, -0xb5dc7b75UL, 0x26441797UL, 0xaecb6667UL, 0x250ccb95UL, -0x9a9567ecUL, 0x862ad057UL, 0x50379960UL, 0xe4d305b8UL, -0xad83ba65UL, 0xefae3519UL, 0xf6c913a4UL, 0x5b4aa9c1UL, -0x3e1bd687UL, 0xf0595ea0UL, 0x148a5b18UL, 0x02703bafUL, -0x04e076abUL, 0x4950bfddUL, 0x4a1863dfUL, 0xa5b656c6UL, -0x3d530a85UL, 0x871237faUL, 0xb694a777UL, 0x65517f46UL, -0x61b109edUL, 0xece6e91bUL, 0x458525d5UL, 0x753b52f5UL, -0xba413d7fUL, 0xce428827UL, 0xeb4e43b2UL, 0xbde997d6UL, -0x7b9ef352UL, 0x537f4562UL, 0x3afba02cUL, 0xbcd1707bUL, -0x1ff76bb9UL, 0x1b171d12UL, 0x79eec8fdUL, 0x277cf03aUL, -0x0a45d70cUL, 0xdd607996UL, 0x33f6ab22UL, 0xfa1c89acUL, -0xacbb5dc8UL, 0x0b7d30a1UL, 0xbea14bd4UL, 0xe10b94beUL, -0xcd0a5425UL, 0x7e466254UL, 0xf31182a2UL, 0xe6a33e17UL, -0x3566e626UL, 0x580275c3UL, 0x388b9b83UL, 0x44bdc278UL, -0x0348dc02UL, 0x92a08b4fUL, 0x39b37c2eUL, 0x6984e54eUL, -0x888f71f0UL, 0x2d392736UL, 0xd2fd3f9cUL, 0xfb246e01UL, -0x3716dd89UL, 0x00000000UL, 0x8d57e0f6UL, 0x93986ce2UL, -0x4ef81574UL, 0x20d45a93UL, 0x0138e7adUL, 0x405db4d3UL, -0x17c2871aUL, 0x106a2db3UL, 0x78d62f50UL, 0x8e1f3cf4UL, -0x0ea5a1a7UL, 0xb34c3671UL, 0xd725ae9aUL, 0x71db245eUL, -0x1d875016UL, 0x62f9d5efUL, 0x3186908dUL, 0x121a161cUL, -0xf581cfa6UL, 0x8c6f075bUL, 0xd61d4937UL, 0x593a926eUL, -0xc6776484UL, 0xc53fb886UL, 0x46cdf9d7UL, 0x90d0b0e0UL, -0xc74f8329UL, 0x9640fde4UL, 0x090d0b0eUL, 0xa156206dUL, -0xc9ea228eUL, 0x4c882edbUL, 0x76738ef7UL, 0x15b2bcb5UL, -0x185fc110UL, 0x2ba96a32UL, 0xa48eb16bUL, 0xf95455aeUL, -0x6089ee40UL, 0x55ef0866UL, 0x672144e9UL, 0x21ecbd3eUL, -0x30be7720UL, 0x8bc7adf2UL, 0xc0e72980UL, 0x1ecf8c14UL, -0xe24348bcUL, 0xa6fe8ac4UL, 0xd3c5d831UL, 0x16fa60b7UL, -0x80ba9d53UL, 0x4fc0f2d9UL, 0xe93e781dUL, 0x362e3a24UL, -0x6bf4dee1UL, 0x54d7efcbUL, 0xf7f1f409UL, 0xc3aff582UL, -0xf4b9280bUL, 0x29d9519dUL, 0x5e9238c7UL, 0x845aebf8UL, -0xd8b8e890UL, 0xb13c0ddeUL, 0xd08d0433UL, 0x5ce20368UL, -0x5ddae4c5UL, 0xdc589e3bUL, 0x0f9d460aUL, 0xdac8d33fUL, -0x8f27db59UL, 0xfc8cc4a8UL, 0xbf99ac79UL, 0x5a724e6cUL, -0xcaa2fe8cUL, 0xd1b5e39eUL, 0xea76a41fUL, 0xb004ea73UL, -}}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/stdcpp.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/stdcpp.h deleted file mode 100644 index 6511c4fa..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/stdcpp.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef CRYPTOPP_STDCPP_H -#define CRYPTOPP_STDCPP_H - -#if _MSC_VER >= 1500 -#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CRYPTOPP_INCLUDE_VECTOR_CC -// workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 -#include -#endif - -// for alloca -#ifdef __sun -#include -#elif defined(__MINGW32__) || defined(__BORLANDC__) -#include -#endif - -#ifdef _MSC_VER -#pragma warning(disable: 4231) // re-disable this -#ifdef _CRTAPI1 -#define CRYPTOPP_MSVCRT6 -#endif -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/strciphr.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/strciphr.cpp deleted file mode 100644 index 53e00737..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/strciphr.cpp +++ /dev/null @@ -1,252 +0,0 @@ -// strciphr.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -template -void AdditiveCipherTemplate::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - PolicyInterface &policy = this->AccessPolicy(); - policy.CipherSetKey(params, key, length); - m_leftOver = 0; - unsigned int bufferByteSize = policy.CanOperateKeystream() ? GetBufferByteSize(policy) : RoundUpToMultipleOf(1024U, GetBufferByteSize(policy)); - m_buffer.New(bufferByteSize); - - if (this->IsResynchronizable()) - { - size_t ivLength; - const byte *iv = this->GetIVAndThrowIfInvalid(params, ivLength); - policy.CipherResynchronize(m_buffer, iv, ivLength); - } -} - -template -void AdditiveCipherTemplate::GenerateBlock(byte *outString, size_t length) -{ - if (m_leftOver > 0) - { - size_t len = STDMIN(m_leftOver, length); - memcpy(outString, KeystreamBufferEnd()-m_leftOver, len); - length -= len; - m_leftOver -= len; - outString += len; - - if (!length) - return; - } - assert(m_leftOver == 0); - - PolicyInterface &policy = this->AccessPolicy(); - unsigned int bytesPerIteration = policy.GetBytesPerIteration(); - - if (length >= bytesPerIteration) - { - size_t iterations = length / bytesPerIteration; - policy.WriteKeystream(outString, iterations); - outString += iterations * bytesPerIteration; - length -= iterations * bytesPerIteration; - } - - if (length > 0) - { - size_t bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration); - size_t bufferIterations = bufferByteSize / bytesPerIteration; - - policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations); - memcpy(outString, KeystreamBufferEnd()-bufferByteSize, length); - m_leftOver = bufferByteSize - length; - } -} - -template -void AdditiveCipherTemplate::ProcessData(byte *outString, const byte *inString, size_t length) -{ - if (m_leftOver > 0) - { - size_t len = STDMIN(m_leftOver, length); - xorbuf(outString, inString, KeystreamBufferEnd()-m_leftOver, len); - length -= len; - m_leftOver -= len; - inString += len; - outString += len; - - if (!length) - return; - } - assert(m_leftOver == 0); - - PolicyInterface &policy = this->AccessPolicy(); - unsigned int bytesPerIteration = policy.GetBytesPerIteration(); - - if (policy.CanOperateKeystream() && length >= bytesPerIteration) - { - size_t iterations = length / bytesPerIteration; - unsigned int alignment = policy.GetAlignment(); - KeystreamOperation operation = KeystreamOperation((IsAlignedOn(inString, alignment) * 2) | (int)IsAlignedOn(outString, alignment)); - - policy.OperateKeystream(operation, outString, inString, iterations); - - inString += iterations * bytesPerIteration; - outString += iterations * bytesPerIteration; - length -= iterations * bytesPerIteration; - - if (!length) - return; - } - - size_t bufferByteSize = m_buffer.size(); - size_t bufferIterations = bufferByteSize / bytesPerIteration; - - while (length >= bufferByteSize) - { - policy.WriteKeystream(m_buffer, bufferIterations); - xorbuf(outString, inString, KeystreamBufferBegin(), bufferByteSize); - length -= bufferByteSize; - inString += bufferByteSize; - outString += bufferByteSize; - } - - if (length > 0) - { - bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration); - bufferIterations = bufferByteSize / bytesPerIteration; - - policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations); - xorbuf(outString, inString, KeystreamBufferEnd()-bufferByteSize, length); - m_leftOver = bufferByteSize - length; - } -} - -template -void AdditiveCipherTemplate::Resynchronize(const byte *iv, int length) -{ - PolicyInterface &policy = this->AccessPolicy(); - m_leftOver = 0; - m_buffer.New(GetBufferByteSize(policy)); - policy.CipherResynchronize(m_buffer, iv, this->ThrowIfInvalidIVLength(length)); -} - -template -void AdditiveCipherTemplate::Seek(lword position) -{ - PolicyInterface &policy = this->AccessPolicy(); - unsigned int bytesPerIteration = policy.GetBytesPerIteration(); - - policy.SeekToIteration(position / bytesPerIteration); - position %= bytesPerIteration; - - if (position > 0) - { - policy.WriteKeystream(KeystreamBufferEnd()-bytesPerIteration, 1); - m_leftOver = bytesPerIteration - (unsigned int)position; - } - else - m_leftOver = 0; -} - -template -void CFB_CipherTemplate::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) -{ - PolicyInterface &policy = this->AccessPolicy(); - policy.CipherSetKey(params, key, length); - - if (this->IsResynchronizable()) - { - size_t ivLength; - const byte *iv = this->GetIVAndThrowIfInvalid(params, ivLength); - policy.CipherResynchronize(iv, ivLength); - } - - m_leftOver = policy.GetBytesPerIteration(); -} - -template -void CFB_CipherTemplate::Resynchronize(const byte *iv, int length) -{ - PolicyInterface &policy = this->AccessPolicy(); - policy.CipherResynchronize(iv, this->ThrowIfInvalidIVLength(length)); - m_leftOver = policy.GetBytesPerIteration(); -} - -template -void CFB_CipherTemplate::ProcessData(byte *outString, const byte *inString, size_t length) -{ - assert(length % this->MandatoryBlockSize() == 0); - - PolicyInterface &policy = this->AccessPolicy(); - unsigned int bytesPerIteration = policy.GetBytesPerIteration(); - unsigned int alignment = policy.GetAlignment(); - byte *reg = policy.GetRegisterBegin(); - - if (m_leftOver) - { - size_t len = STDMIN(m_leftOver, length); - CombineMessageAndShiftRegister(outString, reg + bytesPerIteration - m_leftOver, inString, len); - m_leftOver -= len; - length -= len; - inString += len; - outString += len; - } - - if (!length) - return; - - assert(m_leftOver == 0); - - if (policy.CanIterate() && length >= bytesPerIteration && IsAlignedOn(outString, alignment)) - { - if (IsAlignedOn(inString, alignment)) - policy.Iterate(outString, inString, GetCipherDir(*this), length / bytesPerIteration); - else - { - memcpy(outString, inString, length); - policy.Iterate(outString, outString, GetCipherDir(*this), length / bytesPerIteration); - } - inString += length - length % bytesPerIteration; - outString += length - length % bytesPerIteration; - length %= bytesPerIteration; - } - - while (length >= bytesPerIteration) - { - policy.TransformRegister(); - CombineMessageAndShiftRegister(outString, reg, inString, bytesPerIteration); - length -= bytesPerIteration; - inString += bytesPerIteration; - outString += bytesPerIteration; - } - - if (length > 0) - { - policy.TransformRegister(); - CombineMessageAndShiftRegister(outString, reg, inString, length); - m_leftOver = bytesPerIteration - length; - } -} - -template -void CFB_EncryptionTemplate::CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length) -{ - xorbuf(reg, message, length); - memcpy(output, reg, length); -} - -template -void CFB_DecryptionTemplate::CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length) -{ - for (unsigned int i=0; i, AdditiveCipherTemplate\<\> \> \> Encryption; - - AdditiveCipherTemplate and CFB_CipherTemplate are designed so that they don't need - to take a policy class as a template parameter (although this is allowed), so that - their code is not duplicated for each new cipher. Instead they each - get a reference to an abstract policy interface by calling AccessPolicy() on itself, so - AccessPolicy() must be overriden to return the actual policy reference. This is done - by the ConceretePolicyHolder class. Finally, SymmetricCipherFinal implements the constructors and - other functions that must be implemented by the most derived class. -*/ - -#ifndef CRYPTOPP_STRCIPHR_H -#define CRYPTOPP_STRCIPHR_H - -#include "seckey.h" -#include "secblock.h" -#include "argnames.h" - -NAMESPACE_BEGIN(CryptoPP) - -template -class CRYPTOPP_NO_VTABLE AbstractPolicyHolder : public BASE -{ -public: - typedef POLICY_INTERFACE PolicyInterface; - virtual ~AbstractPolicyHolder() {} - -protected: - virtual const POLICY_INTERFACE & GetPolicy() const =0; - virtual POLICY_INTERFACE & AccessPolicy() =0; -}; - -template -class ConcretePolicyHolder : public BASE, protected POLICY -{ -protected: - const POLICY_INTERFACE & GetPolicy() const {return *this;} - POLICY_INTERFACE & AccessPolicy() {return *this;} -}; - -enum KeystreamOperationFlags {OUTPUT_ALIGNED=1, INPUT_ALIGNED=2, INPUT_NULL = 4}; -enum KeystreamOperation { - WRITE_KEYSTREAM = INPUT_NULL, - WRITE_KEYSTREAM_ALIGNED = INPUT_NULL | OUTPUT_ALIGNED, - XOR_KEYSTREAM = 0, - XOR_KEYSTREAM_INPUT_ALIGNED = INPUT_ALIGNED, - XOR_KEYSTREAM_OUTPUT_ALIGNED= OUTPUT_ALIGNED, - XOR_KEYSTREAM_BOTH_ALIGNED = OUTPUT_ALIGNED | INPUT_ALIGNED}; - -struct CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AdditiveCipherAbstractPolicy -{ - virtual ~AdditiveCipherAbstractPolicy() {} - virtual unsigned int GetAlignment() const {return 1;} - virtual unsigned int GetBytesPerIteration() const =0; - virtual unsigned int GetOptimalBlockSize() const {return GetBytesPerIteration();} - virtual unsigned int GetIterationsToBuffer() const =0; - virtual void WriteKeystream(byte *keystream, size_t iterationCount) - {OperateKeystream(KeystreamOperation(INPUT_NULL | (KeystreamOperationFlags)IsAlignedOn(keystream, GetAlignment())), keystream, NULL, iterationCount);} - virtual bool CanOperateKeystream() const {return false;} - virtual void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) {assert(false);} - virtual void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) =0; - virtual void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) {throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");} - virtual bool CipherIsRandomAccess() const =0; - virtual void SeekToIteration(lword iterationCount) {assert(!CipherIsRandomAccess()); throw NotImplemented("StreamTransformation: this object doesn't support random access");} -}; - -template -struct CRYPTOPP_NO_VTABLE AdditiveCipherConcretePolicy : public BASE -{ - typedef WT WordType; - CRYPTOPP_CONSTANT(BYTES_PER_ITERATION = sizeof(WordType) * W) - -#if !(CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64) - unsigned int GetAlignment() const {return GetAlignmentOf();} -#endif - unsigned int GetBytesPerIteration() const {return BYTES_PER_ITERATION;} - unsigned int GetIterationsToBuffer() const {return X;} - bool CanOperateKeystream() const {return true;} - virtual void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) =0; -}; - -// use these to implement OperateKeystream -#define CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, b, i, a) \ - PutWord(bool(x & OUTPUT_ALIGNED), b, output+i*sizeof(WordType), (x & INPUT_NULL) ? a : a ^ GetWord(bool(x & INPUT_ALIGNED), b, input+i*sizeof(WordType))); -#define CRYPTOPP_KEYSTREAM_OUTPUT_XMM(x, i, a) {\ - __m128i t = (x & INPUT_NULL) ? a : _mm_xor_si128(a, (x & INPUT_ALIGNED) ? _mm_load_si128((__m128i *)input+i) : _mm_loadu_si128((__m128i *)input+i));\ - if (x & OUTPUT_ALIGNED) _mm_store_si128((__m128i *)output+i, t);\ - else _mm_storeu_si128((__m128i *)output+i, t);} -#define CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(x, y) \ - switch (operation) \ - { \ - case WRITE_KEYSTREAM: \ - x(WRITE_KEYSTREAM) \ - break; \ - case XOR_KEYSTREAM: \ - x(XOR_KEYSTREAM) \ - input += y; \ - break; \ - case XOR_KEYSTREAM_INPUT_ALIGNED: \ - x(XOR_KEYSTREAM_INPUT_ALIGNED) \ - input += y; \ - break; \ - case XOR_KEYSTREAM_OUTPUT_ALIGNED: \ - x(XOR_KEYSTREAM_OUTPUT_ALIGNED) \ - input += y; \ - break; \ - case WRITE_KEYSTREAM_ALIGNED: \ - x(WRITE_KEYSTREAM_ALIGNED) \ - break; \ - case XOR_KEYSTREAM_BOTH_ALIGNED: \ - x(XOR_KEYSTREAM_BOTH_ALIGNED) \ - input += y; \ - break; \ - } \ - output += y; - -template > -class CRYPTOPP_NO_VTABLE AdditiveCipherTemplate : public BASE, public RandomNumberGenerator -{ -public: - void GenerateBlock(byte *output, size_t size); - void ProcessData(byte *outString, const byte *inString, size_t length); - void Resynchronize(const byte *iv, int length=-1); - unsigned int OptimalBlockSize() const {return this->GetPolicy().GetOptimalBlockSize();} - unsigned int GetOptimalNextBlockSize() const {return (unsigned int)this->m_leftOver;} - unsigned int OptimalDataAlignment() const {return this->GetPolicy().GetAlignment();} - bool IsSelfInverting() const {return true;} - bool IsForwardTransformation() const {return true;} - bool IsRandomAccess() const {return this->GetPolicy().CipherIsRandomAccess();} - void Seek(lword position); - - typedef typename BASE::PolicyInterface PolicyInterface; - -protected: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - - unsigned int GetBufferByteSize(const PolicyInterface &policy) const {return policy.GetBytesPerIteration() * policy.GetIterationsToBuffer();} - - inline byte * KeystreamBufferBegin() {return this->m_buffer.data();} - inline byte * KeystreamBufferEnd() {return (this->m_buffer.data() + this->m_buffer.size());} - - SecByteBlock m_buffer; - size_t m_leftOver; -}; - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CFB_CipherAbstractPolicy -{ -public: - virtual ~CFB_CipherAbstractPolicy() {} - virtual unsigned int GetAlignment() const =0; - virtual unsigned int GetBytesPerIteration() const =0; - virtual byte * GetRegisterBegin() =0; - virtual void TransformRegister() =0; - virtual bool CanIterate() const {return false;} - virtual void Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount) {assert(false); throw 0;} - virtual void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) =0; - virtual void CipherResynchronize(const byte *iv, size_t length) {throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");} -}; - -template -struct CRYPTOPP_NO_VTABLE CFB_CipherConcretePolicy : public BASE -{ - typedef WT WordType; - - unsigned int GetAlignment() const {return sizeof(WordType);} - unsigned int GetBytesPerIteration() const {return sizeof(WordType) * W;} - bool CanIterate() const {return true;} - void TransformRegister() {this->Iterate(NULL, NULL, ENCRYPTION, 1);} - - template - struct RegisterOutput - { - RegisterOutput(byte *output, const byte *input, CipherDir dir) - : m_output(output), m_input(input), m_dir(dir) {} - - inline RegisterOutput& operator()(WordType ®isterWord) - { - assert(IsAligned(m_output)); - assert(IsAligned(m_input)); - - if (!NativeByteOrderIs(B::ToEnum())) - registerWord = ByteReverse(registerWord); - - if (m_dir == ENCRYPTION) - { - if (m_input == NULL) - assert(m_output == NULL); - else - { - WordType ct = *(const WordType *)m_input ^ registerWord; - registerWord = ct; - *(WordType*)m_output = ct; - m_input += sizeof(WordType); - m_output += sizeof(WordType); - } - } - else - { - WordType ct = *(const WordType *)m_input; - *(WordType*)m_output = registerWord ^ ct; - registerWord = ct; - m_input += sizeof(WordType); - m_output += sizeof(WordType); - } - - // registerWord is left unreversed so it can be xor-ed with further input - - return *this; - } - - byte *m_output; - const byte *m_input; - CipherDir m_dir; - }; -}; - -template -class CRYPTOPP_NO_VTABLE CFB_CipherTemplate : public BASE -{ -public: - void ProcessData(byte *outString, const byte *inString, size_t length); - void Resynchronize(const byte *iv, int length=-1); - unsigned int OptimalBlockSize() const {return this->GetPolicy().GetBytesPerIteration();} - unsigned int GetOptimalNextBlockSize() const {return (unsigned int)m_leftOver;} - unsigned int OptimalDataAlignment() const {return this->GetPolicy().GetAlignment();} - bool IsRandomAccess() const {return false;} - bool IsSelfInverting() const {return false;} - - typedef typename BASE::PolicyInterface PolicyInterface; - -protected: - virtual void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length) =0; - - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms); - - size_t m_leftOver; -}; - -template > -class CRYPTOPP_NO_VTABLE CFB_EncryptionTemplate : public CFB_CipherTemplate -{ - bool IsForwardTransformation() const {return true;} - void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length); -}; - -template > -class CRYPTOPP_NO_VTABLE CFB_DecryptionTemplate : public CFB_CipherTemplate -{ - bool IsForwardTransformation() const {return false;} - void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length); -}; - -template -class CFB_RequireFullDataBlocks : public BASE -{ -public: - unsigned int MandatoryBlockSize() const {return this->OptimalBlockSize();} -}; - -//! _ -template -class SymmetricCipherFinal : public AlgorithmImpl, INFO> -{ -public: - SymmetricCipherFinal() {} - SymmetricCipherFinal(const byte *key) - {this->SetKey(key, this->DEFAULT_KEYLENGTH);} - SymmetricCipherFinal(const byte *key, size_t length) - {this->SetKey(key, length);} - SymmetricCipherFinal(const byte *key, size_t length, const byte *iv) - {this->SetKeyWithIV(key, length, iv);} - - Clonable * Clone() const {return static_cast(new SymmetricCipherFinal(*this));} -}; - -NAMESPACE_END - -#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES -#include "strciphr.cpp" -#endif - -NAMESPACE_BEGIN(CryptoPP) -CRYPTOPP_DLL_TEMPLATE_CLASS AbstractPolicyHolder; -CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_CipherTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_EncryptionTemplate >; -CRYPTOPP_DLL_TEMPLATE_CLASS CFB_DecryptionTemplate >; -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.cpp deleted file mode 100644 index b1fb6f14..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.cpp +++ /dev/null @@ -1,159 +0,0 @@ -// tea.cpp - modified by Wei Dai from code in the original paper - -#include "pch.h" -#include "tea.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const word32 DELTA = 0x9e3779b9; -typedef BlockGetAndPut Block; - -void TEA::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(length); - - GetUserKey(BIG_ENDIAN_ORDER, m_k.begin(), 4, userKey, KEYLENGTH); - m_limit = GetRoundsAndThrowIfInvalid(params, this) * DELTA; -} - -void TEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 y, z; - Block::Get(inBlock)(y)(z); - - word32 sum = 0; - while (sum != m_limit) - { - sum += DELTA; - y += (z << 4) + m_k[0] ^ z + sum ^ (z >> 5) + m_k[1]; - z += (y << 4) + m_k[2] ^ y + sum ^ (y >> 5) + m_k[3]; - } - - Block::Put(xorBlock, outBlock)(y)(z); -} - -void TEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 y, z; - Block::Get(inBlock)(y)(z); - - word32 sum = m_limit; - while (sum != 0) - { - z -= (y << 4) + m_k[2] ^ y + sum ^ (y >> 5) + m_k[3]; - y -= (z << 4) + m_k[0] ^ z + sum ^ (z >> 5) + m_k[1]; - sum -= DELTA; - } - - Block::Put(xorBlock, outBlock)(y)(z); -} - -void XTEA::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms) -{ - AssertValidKeyLength(length); - - GetUserKey(BIG_ENDIAN_ORDER, m_k.begin(), 4, userKey, KEYLENGTH); - m_limit = GetRoundsAndThrowIfInvalid(params, this) * DELTA; -} - -void XTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 y, z; - Block::Get(inBlock)(y)(z); - -#ifdef __SUNPRO_CC - // workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 - size_t sum = 0; - while ((sum&0xffffffff) != m_limit) -#else - word32 sum = 0; - while (sum != m_limit) -#endif - { - y += (z<<4 ^ z>>5) + z ^ sum + m_k[sum&3]; - sum += DELTA; - z += (y<<4 ^ y>>5) + y ^ sum + m_k[sum>>11 & 3]; - } - - Block::Put(xorBlock, outBlock)(y)(z); -} - -void XTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 y, z; - Block::Get(inBlock)(y)(z); - -#ifdef __SUNPRO_CC - // workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 - size_t sum = m_limit; - while ((sum&0xffffffff) != 0) -#else - word32 sum = m_limit; - while (sum != 0) -#endif - { - z -= (y<<4 ^ y>>5) + y ^ sum + m_k[sum>>11 & 3]; - sum -= DELTA; - y -= (z<<4 ^ z>>5) + z ^ sum + m_k[sum&3]; - } - - Block::Put(xorBlock, outBlock)(y)(z); -} - -#define MX (z>>5^y<<2)+(y>>3^z<<4)^(sum^y)+(m_k[p&3^e]^z) - -void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - unsigned int n = m_blockSize / 4; - word32 *v = (word32*)outBlock; - ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)inBlock, m_blockSize); - - word32 y = v[0], z = v[n-1], e; - word32 p, q = 6+52/n; - word32 sum = 0; - - while (q-- > 0) - { - sum += DELTA; - e = sum>>2 & 3; - for (p = 0; p < n-1; p++) - { - y = v[p+1]; - z = v[p] += MX; - } - y = v[0]; - z = v[n-1] += MX; - } - - ConditionalByteReverse(BIG_ENDIAN_ORDER, v, v, m_blockSize); -} - -void BTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - unsigned int n = m_blockSize / 4; - word32 *v = (word32*)outBlock; - ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)inBlock, m_blockSize); - - word32 y = v[0], z = v[n-1], e; - word32 p, q = 6+52/n; - word32 sum = q * DELTA; - - while (sum != 0) - { - e = sum>>2 & 3; - for (p = n-1; p > 0; p--) - { - z = v[p-1]; - y = v[p] -= MX; - } - - z = v[n-1]; - y = v[0] -= MX; - sum -= DELTA; - } - - ConditionalByteReverse(BIG_ENDIAN_ORDER, v, v, m_blockSize); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.h deleted file mode 100644 index d8ddded8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tea.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef CRYPTOPP_TEA_H -#define CRYPTOPP_TEA_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct TEA_Info : public FixedBlockSize<8>, public FixedKeyLength<16>, public VariableRounds<32> -{ - static const char *StaticAlgorithmName() {return "TEA";} -}; - -/// TEA -class TEA : public TEA_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - FixedSizeSecBlock m_k; - word32 m_limit; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef TEA::Encryption TEAEncryption; -typedef TEA::Decryption TEADecryption; - -//! _ -struct XTEA_Info : public FixedBlockSize<8>, public FixedKeyLength<16>, public VariableRounds<32> -{ - static const char *StaticAlgorithmName() {return "XTEA";} -}; - -/// XTEA -class XTEA : public XTEA_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - FixedSizeSecBlock m_k; - word32 m_limit; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -//! _ -struct BTEA_Info : public FixedKeyLength<16> -{ - static const char *StaticAlgorithmName() {return "BTEA";} -}; - -//! corrected Block TEA (as described in "xxtea"). -/*! This class hasn't been tested yet. */ -class BTEA : public BTEA_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public AlgorithmImpl, BTEA_Info>, public BTEA_Info - { - public: - void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) - { - m_blockSize = params.GetIntValueWithDefault("BlockSize", 60*4); - GetUserKey(BIG_ENDIAN_ORDER, m_k.begin(), 4, key, KEYLENGTH); - } - - unsigned int BlockSize() const {return m_blockSize;} - - protected: - FixedSizeSecBlock m_k; - unsigned int m_blockSize; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/test.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/test.cpp deleted file mode 100644 index 6a5aab03..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/test.cpp +++ /dev/null @@ -1,852 +0,0 @@ -// test.cpp - written and placed in the public domain by Wei Dai - -#define _CRT_SECURE_NO_DEPRECATE -#define CRYPTOPP_DEFAULT_NO_DLL -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 - -#include "dll.h" -#include "md5.h" -#include "ripemd.h" -#include "rng.h" -#include "gzip.h" -#include "default.h" -#include "randpool.h" -#include "ida.h" -#include "base64.h" -#include "socketft.h" -#include "wait.h" -#include "factory.h" -#include "whrlpool.h" -#include "tiger.h" - -#include "validate.h" -#include "bench.h" - -#include -#include - -#ifdef CRYPTOPP_WIN32_AVAILABLE -#include -#endif - -#if defined(USE_BERKELEY_STYLE_SOCKETS) && !defined(macintosh) -#include -#include -#endif - -#if (_MSC_VER >= 1000) -#include // for the debug heap -#endif - -#if defined(__MWERKS__) && defined(macintosh) -#include -#endif - -#ifdef __BORLANDC__ -#pragma comment(lib, "cryptlib_bds.lib") -#pragma comment(lib, "ws2_32.lib") -#endif - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -const int MAX_PHRASE_LENGTH=250; - -void RegisterFactories(); - -void GenerateRSAKey(unsigned int keyLength, const char *privFilename, const char *pubFilename, const char *seed); -string RSAEncryptString(const char *pubFilename, const char *seed, const char *message); -string RSADecryptString(const char *privFilename, const char *ciphertext); -void RSASignFile(const char *privFilename, const char *messageFilename, const char *signatureFilename); -bool RSAVerifyFile(const char *pubFilename, const char *messageFilename, const char *signatureFilename); - -void DigestFile(const char *file); -void HmacFile(const char *hexKey, const char *file); - -void AES_CTR_Encrypt(const char *hexKey, const char *hexIV, const char *infile, const char *outfile); - -string EncryptString(const char *plaintext, const char *passPhrase); -string DecryptString(const char *ciphertext, const char *passPhrase); - -void EncryptFile(const char *in, const char *out, const char *passPhrase); -void DecryptFile(const char *in, const char *out, const char *passPhrase); - -void SecretShareFile(int threshold, int nShares, const char *filename, const char *seed); -void SecretRecoverFile(int threshold, const char *outFilename, char *const *inFilenames); - -void InformationDisperseFile(int threshold, int nShares, const char *filename); -void InformationRecoverFile(int threshold, const char *outFilename, char *const *inFilenames); - -void GzipFile(const char *in, const char *out, int deflate_level); -void GunzipFile(const char *in, const char *out); - -void Base64Encode(const char *infile, const char *outfile); -void Base64Decode(const char *infile, const char *outfile); -void HexEncode(const char *infile, const char *outfile); -void HexDecode(const char *infile, const char *outfile); - -void ForwardTcpPort(const char *sourcePort, const char *destinationHost, const char *destinationPort); - -void FIPS140_SampleApplication(); -void FIPS140_GenerateRandomFiles(); - -bool Validate(int, bool, const char *); - -int (*AdhocTest)(int argc, char *argv[]) = NULL; - -static OFB_Mode::Encryption s_globalRNG; - -RandomNumberGenerator & GlobalRNG() -{ - return s_globalRNG; -} - -int CRYPTOPP_API main(int argc, char *argv[]) -{ -#ifdef _CRTDBG_LEAK_CHECK_DF - // Turn on leak-checking - int tempflag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); - tempflag |= _CRTDBG_LEAK_CHECK_DF; - _CrtSetDbgFlag( tempflag ); -#endif - -#if defined(__MWERKS__) && defined(macintosh) - argc = ccommand(&argv); -#endif - - try - { - RegisterFactories(); - - std::string seed = IntToString(time(NULL)); - seed.resize(16); - s_globalRNG.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data()); - - std::string command, executableName, macFilename; - - if (argc < 2) - command = 'h'; - else - command = argv[1]; - - if (command == "g") - { - char seed[1024], privFilename[128], pubFilename[128]; - unsigned int keyLength; - - cout << "Key length in bits: "; - cin >> keyLength; - - cout << "\nSave private key to file: "; - cin >> privFilename; - - cout << "\nSave public key to file: "; - cin >> pubFilename; - - cout << "\nRandom Seed: "; - ws(cin); - cin.getline(seed, 1024); - - GenerateRSAKey(keyLength, privFilename, pubFilename, seed); - } - else if (command == "rs") - RSASignFile(argv[2], argv[3], argv[4]); - else if (command == "rv") - { - bool verified = RSAVerifyFile(argv[2], argv[3], argv[4]); - cout << (verified ? "valid signature" : "invalid signature") << endl; - } - else if (command == "r") - { - char privFilename[128], pubFilename[128]; - char seed[1024], message[1024]; - - cout << "Private key file: "; - cin >> privFilename; - - cout << "\nPublic key file: "; - cin >> pubFilename; - - cout << "\nRandom Seed: "; - ws(cin); - cin.getline(seed, 1024); - - cout << "\nMessage: "; - cin.getline(message, 1024); - - string ciphertext = RSAEncryptString(pubFilename, seed, message); - cout << "\nCiphertext: " << ciphertext << endl; - - string decrypted = RSADecryptString(privFilename, ciphertext.c_str()); - cout << "\nDecrypted: " << decrypted << endl; - } - else if (command == "mt") - { - MaurerRandomnessTest mt; - FileStore fs(argv[2]); - fs.TransferAllTo(mt); - cout << "Maurer Test Value: " << mt.GetTestValue() << endl; - } - else if (command == "mac_dll") - { - // sanity check on file size - std::fstream dllFile(argv[2], ios::in | ios::out | ios::binary); - std::ifstream::pos_type fileEnd = dllFile.seekg(0, std::ios_base::end).tellg(); - if (fileEnd > 20*1000*1000) - { - cerr << "Input file too large (more than 20 MB).\n"; - return 1; - } - - // read file into memory - unsigned int fileSize = (unsigned int)fileEnd; - SecByteBlock buf(fileSize); - dllFile.seekg(0, std::ios_base::beg); - dllFile.read((char *)buf.begin(), fileSize); - - // find positions of relevant sections in the file, based on version 8 of documentation from http://www.microsoft.com/whdc/system/platform/firmware/PECOFF.mspx - word32 coffPos = *(word16 *)(buf+0x3c); - word32 optionalHeaderPos = coffPos + 24; - word16 optionalHeaderMagic = *(word16 *)(buf+optionalHeaderPos); - if (optionalHeaderMagic != 0x10b && optionalHeaderMagic != 0x20b) - { - cerr << "Target file is not a PE32 or PE32+ image.\n"; - return 3; - } - word32 checksumPos = optionalHeaderPos + 64; - word32 certificateTableDirectoryPos = optionalHeaderPos + (optionalHeaderMagic == 0x10b ? 128 : 144); - word32 certificateTablePos = *(word32 *)(buf+certificateTableDirectoryPos); - word32 certificateTableSize = *(word32 *)(buf+certificateTableDirectoryPos+4); - if (certificateTableSize != 0) - cerr << "Warning: certificate table (IMAGE_DIRECTORY_ENTRY_SECURITY) of target image is not empty.\n"; - - // find where to place computed MAC - byte mac[] = CRYPTOPP_DUMMY_DLL_MAC; - byte *found = std::search(buf.begin(), buf.end(), mac+0, mac+sizeof(mac)); - if (found == buf.end()) - { - cerr << "MAC placeholder not found. Possibly the actual MAC was already placed.\n"; - return 2; - } - word32 macPos = (unsigned int)(found-buf.begin()); - - // compute MAC - member_ptr pMac(NewIntegrityCheckingMAC()); - assert(pMac->DigestSize() == sizeof(mac)); - MeterFilter f(new HashFilter(*pMac, new ArraySink(mac, sizeof(mac)))); - f.AddRangeToSkip(0, checksumPos, 4); - f.AddRangeToSkip(0, certificateTableDirectoryPos, 8); - f.AddRangeToSkip(0, macPos, sizeof(mac)); - f.AddRangeToSkip(0, certificateTablePos, certificateTableSize); - f.PutMessageEnd(buf.begin(), buf.size()); - - // place MAC - cout << "Placing MAC in file " << argv[2] << ", location " << macPos << ".\n"; - dllFile.seekg(macPos, std::ios_base::beg); - dllFile.write((char *)mac, sizeof(mac)); - } - else if (command == "m") - DigestFile(argv[2]); - else if (command == "tv") - { - std::string fname = argv[2]; - if (fname.find(".txt") == std::string::npos) - fname = "TestVectors/" + fname + ".txt"; - return !RunTestDataFile(fname.c_str()); - } - else if (command == "t") - { - // VC60 workaround: use char array instead of std::string to workaround MSVC's getline bug - char passPhrase[MAX_PHRASE_LENGTH], plaintext[1024]; - - cout << "Passphrase: "; - cin.getline(passPhrase, MAX_PHRASE_LENGTH); - - cout << "\nPlaintext: "; - cin.getline(plaintext, 1024); - - string ciphertext = EncryptString(plaintext, passPhrase); - cout << "\nCiphertext: " << ciphertext << endl; - - string decrypted = DecryptString(ciphertext.c_str(), passPhrase); - cout << "\nDecrypted: " << decrypted << endl; - - return 0; - } - else if (command == "e64") - Base64Encode(argv[2], argv[3]); - else if (command == "d64") - Base64Decode(argv[2], argv[3]); - else if (command == "e16") - HexEncode(argv[2], argv[3]); - else if (command == "d16") - HexDecode(argv[2], argv[3]); - else if (command == "e" || command == "d") - { - char passPhrase[MAX_PHRASE_LENGTH]; - cout << "Passphrase: "; - cin.getline(passPhrase, MAX_PHRASE_LENGTH); - if (command == "e") - EncryptFile(argv[2], argv[3], passPhrase); - else - DecryptFile(argv[2], argv[3], passPhrase); - } - else if (command == "ss") - { - char seed[1024]; - cout << "\nRandom Seed: "; - ws(cin); - cin.getline(seed, 1024); - SecretShareFile(atoi(argv[2]), atoi(argv[3]), argv[4], seed); - } - else if (command == "sr") - SecretRecoverFile(argc-3, argv[2], argv+3); - else if (command == "id") - InformationDisperseFile(atoi(argv[2]), atoi(argv[3]), argv[4]); - else if (command == "ir") - InformationRecoverFile(argc-3, argv[2], argv+3); - else if (command == "v" || command == "vv") - return !Validate(argc>2 ? atoi(argv[2]) : 0, argv[1][1] == 'v', argc>3 ? argv[3] : NULL); - else if (command == "b") - BenchmarkAll(argc<3 ? 1 : atof(argv[2]), argc<4 ? 0 : atof(argv[3])*1e9); - else if (command == "b2") - BenchmarkAll2(argc<3 ? 1 : atof(argv[2]), argc<4 ? 0 : atof(argv[3])*1e9); - else if (command == "z") - GzipFile(argv[3], argv[4], argv[2][0]-'0'); - else if (command == "u") - GunzipFile(argv[2], argv[3]); - else if (command == "fips") - FIPS140_SampleApplication(); - else if (command == "fips-rand") - FIPS140_GenerateRandomFiles(); - else if (command == "ft") - ForwardTcpPort(argv[2], argv[3], argv[4]); - else if (command == "a") - { - if (AdhocTest) - return (*AdhocTest)(argc, argv); - else - { - cerr << "AdhocTest not defined.\n"; - return 1; - } - } - else if (command == "hmac") - HmacFile(argv[2], argv[3]); - else if (command == "ae") - AES_CTR_Encrypt(argv[2], argv[3], argv[4], argv[5]); - else if (command == "h") - { - FileSource usage("TestData/usage.dat", true, new FileSink(cout)); - return 1; - } - else if (command == "V") - { - cout << CRYPTOPP_VERSION / 100 << '.' << (CRYPTOPP_VERSION % 100) / 10 << '.' << CRYPTOPP_VERSION % 10 << endl; - } - else - { - cerr << "Unrecognized command. Run \"cryptest h\" to obtain usage information.\n"; - return 1; - } - return 0; - } - catch(CryptoPP::Exception &e) - { - cout << "\nCryptoPP::Exception caught: " << e.what() << endl; - return -1; - } - catch(std::exception &e) - { - cout << "\nstd::exception caught: " << e.what() << endl; - return -2; - } -} - -void FIPS140_GenerateRandomFiles() -{ -#ifdef OS_RNG_AVAILABLE - DefaultAutoSeededRNG rng; - RandomNumberStore store(rng, ULONG_MAX); - - for (unsigned int i=0; i<100000; i++) - store.TransferTo(FileSink((IntToString(i) + ".rnd").c_str()).Ref(), 20000); -#else - cout << "OS provided RNG not available.\n"; - exit(-1); -#endif -} - -SecByteBlock HexDecodeString(const char *hex) -{ - StringSource ss(hex, true, new HexDecoder); - SecByteBlock result((size_t)ss.MaxRetrievable()); - ss.Get(result, result.size()); - return result; -} - -void GenerateRSAKey(unsigned int keyLength, const char *privFilename, const char *pubFilename, const char *seed) -{ - RandomPool randPool; - randPool.IncorporateEntropy((byte *)seed, strlen(seed)); - - RSAES_OAEP_SHA_Decryptor priv(randPool, keyLength); - HexEncoder privFile(new FileSink(privFilename)); - priv.DEREncode(privFile); - privFile.MessageEnd(); - - RSAES_OAEP_SHA_Encryptor pub(priv); - HexEncoder pubFile(new FileSink(pubFilename)); - pub.DEREncode(pubFile); - pubFile.MessageEnd(); -} - -string RSAEncryptString(const char *pubFilename, const char *seed, const char *message) -{ - FileSource pubFile(pubFilename, true, new HexDecoder); - RSAES_OAEP_SHA_Encryptor pub(pubFile); - - RandomPool randPool; - randPool.IncorporateEntropy((byte *)seed, strlen(seed)); - - string result; - StringSource(message, true, new PK_EncryptorFilter(randPool, pub, new HexEncoder(new StringSink(result)))); - return result; -} - -string RSADecryptString(const char *privFilename, const char *ciphertext) -{ - FileSource privFile(privFilename, true, new HexDecoder); - RSAES_OAEP_SHA_Decryptor priv(privFile); - - string result; - StringSource(ciphertext, true, new HexDecoder(new PK_DecryptorFilter(GlobalRNG(), priv, new StringSink(result)))); - return result; -} - -void RSASignFile(const char *privFilename, const char *messageFilename, const char *signatureFilename) -{ - FileSource privFile(privFilename, true, new HexDecoder); - RSASS::Signer priv(privFile); - FileSource f(messageFilename, true, new SignerFilter(GlobalRNG(), priv, new HexEncoder(new FileSink(signatureFilename)))); -} - -bool RSAVerifyFile(const char *pubFilename, const char *messageFilename, const char *signatureFilename) -{ - FileSource pubFile(pubFilename, true, new HexDecoder); - RSASS::Verifier pub(pubFile); - - FileSource signatureFile(signatureFilename, true, new HexDecoder); - if (signatureFile.MaxRetrievable() != pub.SignatureLength()) - return false; - SecByteBlock signature(pub.SignatureLength()); - signatureFile.Get(signature, signature.size()); - - VerifierFilter *verifierFilter = new VerifierFilter(pub); - verifierFilter->Put(signature, pub.SignatureLength()); - FileSource f(messageFilename, true, verifierFilter); - - return verifierFilter->GetLastResult(); -} - -void DigestFile(const char *filename) -{ - SHA1 sha; - RIPEMD160 ripemd; - SHA256 sha256; - Tiger tiger; - SHA512 sha512; - Whirlpool whirlpool; - vector_member_ptrs filters(6); - filters[0].reset(new HashFilter(sha)); - filters[1].reset(new HashFilter(ripemd)); - filters[2].reset(new HashFilter(tiger)); - filters[3].reset(new HashFilter(sha256)); - filters[4].reset(new HashFilter(sha512)); - filters[5].reset(new HashFilter(whirlpool)); - - auto_ptr channelSwitch(new ChannelSwitch); - size_t i; - for (i=0; iAddDefaultRoute(*filters[i]); - FileSource(filename, true, channelSwitch.release()); - - HexEncoder encoder(new FileSink(cout), false); - for (i=0; iAlgorithmName() << ": "; - filters[i]->TransferTo(encoder); - cout << "\n"; - } -} - -void HmacFile(const char *hexKey, const char *file) -{ - member_ptr mac; - if (strcmp(hexKey, "selftest") == 0) - { - cerr << "Computing HMAC/SHA1 value for self test.\n"; - mac.reset(NewIntegrityCheckingMAC()); - } - else - { - std::string decodedKey; - StringSource(hexKey, true, new HexDecoder(new StringSink(decodedKey))); - mac.reset(new HMAC((const byte *)decodedKey.data(), decodedKey.size())); - } - FileSource(file, true, new HashFilter(*mac, new HexEncoder(new FileSink(cout)))); -} - -void AES_CTR_Encrypt(const char *hexKey, const char *hexIV, const char *infile, const char *outfile) -{ - SecByteBlock key = HexDecodeString(hexKey); - SecByteBlock iv = HexDecodeString(hexIV); - CTR_Mode::Encryption aes(key, key.size(), iv); - FileSource(infile, true, new StreamTransformationFilter(aes, new FileSink(outfile))); -} - -string EncryptString(const char *instr, const char *passPhrase) -{ - string outstr; - - DefaultEncryptorWithMAC encryptor(passPhrase, new HexEncoder(new StringSink(outstr))); - encryptor.Put((byte *)instr, strlen(instr)); - encryptor.MessageEnd(); - - return outstr; -} - -string DecryptString(const char *instr, const char *passPhrase) -{ - string outstr; - - HexDecoder decryptor(new DefaultDecryptorWithMAC(passPhrase, new StringSink(outstr))); - decryptor.Put((byte *)instr, strlen(instr)); - decryptor.MessageEnd(); - - return outstr; -} - -void EncryptFile(const char *in, const char *out, const char *passPhrase) -{ - FileSource f(in, true, new DefaultEncryptorWithMAC(passPhrase, new FileSink(out))); -} - -void DecryptFile(const char *in, const char *out, const char *passPhrase) -{ - FileSource f(in, true, new DefaultDecryptorWithMAC(passPhrase, new FileSink(out))); -} - -void SecretShareFile(int threshold, int nShares, const char *filename, const char *seed) -{ - assert(nShares<=1000); - - RandomPool rng; - rng.IncorporateEntropy((byte *)seed, strlen(seed)); - - ChannelSwitch *channelSwitch; - FileSource source(filename, false, new SecretSharing(rng, threshold, nShares, channelSwitch = new ChannelSwitch)); - - vector_member_ptrs fileSinks(nShares); - string channel; - for (int i=0; i(i); - fileSinks[i]->Put((byte *)channel.data(), 4); - channelSwitch->AddRoute(channel, *fileSinks[i], DEFAULT_CHANNEL); - } - - source.PumpAll(); -} - -void SecretRecoverFile(int threshold, const char *outFilename, char *const *inFilenames) -{ - assert(threshold<=1000); - - SecretRecovery recovery(threshold, new FileSink(outFilename)); - - vector_member_ptrs fileSources(threshold); - SecByteBlock channel(4); - int i; - for (i=0; iPump(4); - fileSources[i]->Get(channel, 4); - fileSources[i]->Attach(new ChannelSwitch(recovery, string((char *)channel.begin(), 4))); - } - - while (fileSources[0]->Pump(256)) - for (i=1; iPump(256); - - for (i=0; iPumpAll(); -} - -void InformationDisperseFile(int threshold, int nShares, const char *filename) -{ - assert(nShares<=1000); - - ChannelSwitch *channelSwitch; - FileSource source(filename, false, new InformationDispersal(threshold, nShares, channelSwitch = new ChannelSwitch)); - - vector_member_ptrs fileSinks(nShares); - string channel; - for (int i=0; i(i); - fileSinks[i]->Put((byte *)channel.data(), 4); - channelSwitch->AddRoute(channel, *fileSinks[i], DEFAULT_CHANNEL); - } - - source.PumpAll(); -} - -void InformationRecoverFile(int threshold, const char *outFilename, char *const *inFilenames) -{ - assert(threshold<=1000); - - InformationRecovery recovery(threshold, new FileSink(outFilename)); - - vector_member_ptrs fileSources(threshold); - SecByteBlock channel(4); - int i; - for (i=0; iPump(4); - fileSources[i]->Get(channel, 4); - fileSources[i]->Attach(new ChannelSwitch(recovery, string((char *)channel.begin(), 4))); - } - - while (fileSources[0]->Pump(256)) - for (i=1; iPump(256); - - for (i=0; iPumpAll(); -} - -void GzipFile(const char *in, const char *out, int deflate_level) -{ -// FileSource(in, true, new Gzip(new FileSink(out), deflate_level)); - - // use a filter graph to compare decompressed data with original - // - // Source ----> Gzip ------> Sink - // \ | - // \ Gunzip - // \ | - // \ v - // > ComparisonFilter - - EqualityComparisonFilter comparison; - - Gunzip gunzip(new ChannelSwitch(comparison, "0")); - gunzip.SetAutoSignalPropagation(0); - - FileSink sink(out); - - ChannelSwitch *cs; - Gzip gzip(cs = new ChannelSwitch(sink), deflate_level); - cs->AddDefaultRoute(gunzip); - - cs = new ChannelSwitch(gzip); - cs->AddDefaultRoute(comparison, "1"); - FileSource source(in, true, cs); - - comparison.ChannelMessageSeriesEnd("0"); - comparison.ChannelMessageSeriesEnd("1"); -} - -void GunzipFile(const char *in, const char *out) -{ - FileSource(in, true, new Gunzip(new FileSink(out))); -} - -void Base64Encode(const char *in, const char *out) -{ - FileSource(in, true, new Base64Encoder(new FileSink(out))); -} - -void Base64Decode(const char *in, const char *out) -{ - FileSource(in, true, new Base64Decoder(new FileSink(out))); -} - -void HexEncode(const char *in, const char *out) -{ - FileSource(in, true, new HexEncoder(new FileSink(out))); -} - -void HexDecode(const char *in, const char *out) -{ - FileSource(in, true, new HexDecoder(new FileSink(out))); -} - -void ForwardTcpPort(const char *sourcePortName, const char *destinationHost, const char *destinationPortName) -{ -#ifdef SOCKETS_AVAILABLE - SocketsInitializer sockInit; - - Socket sockListen, sockSource, sockDestination; - - int sourcePort = Socket::PortNameToNumber(sourcePortName); - int destinationPort = Socket::PortNameToNumber(destinationPortName); - - sockListen.Create(); - sockListen.Bind(sourcePort); - setsockopt(sockListen, IPPROTO_TCP, TCP_NODELAY, "\x01", 1); - - cout << "Listing on port " << sourcePort << ".\n"; - sockListen.Listen(); - - sockListen.Accept(sockSource); - cout << "Connection accepted on port " << sourcePort << ".\n"; - sockListen.CloseSocket(); - - cout << "Making connection to " << destinationHost << ", port " << destinationPort << ".\n"; - sockDestination.Create(); - sockDestination.Connect(destinationHost, destinationPort); - - cout << "Connection made to " << destinationHost << ", starting to forward.\n"; - - SocketSource out(sockSource, false, new SocketSink(sockDestination)); - SocketSource in(sockDestination, false, new SocketSink(sockSource)); - - WaitObjectContainer waitObjects; - - while (!(in.SourceExhausted() && out.SourceExhausted())) - { - waitObjects.Clear(); - - out.GetWaitObjects(waitObjects, CallStack("ForwardTcpPort - out", NULL)); - in.GetWaitObjects(waitObjects, CallStack("ForwardTcpPort - in", NULL)); - - waitObjects.Wait(INFINITE_TIME); - - if (!out.SourceExhausted()) - { - cout << "o" << flush; - out.PumpAll2(false); - if (out.SourceExhausted()) - cout << "EOF received on source socket.\n"; - } - - if (!in.SourceExhausted()) - { - cout << "i" << flush; - in.PumpAll2(false); - if (in.SourceExhausted()) - cout << "EOF received on destination socket.\n"; - } - } -#else - cout << "Socket support was not enabled at compile time.\n"; - exit(-1); -#endif -} - -bool Validate(int alg, bool thorough, const char *seedInput) -{ - bool result; - - std::string seed = seedInput ? std::string(seedInput) : IntToString(time(NULL)); - seed.resize(16); - - cout << "Using seed: " << seed << endl << endl; - s_globalRNG.SetKeyWithIV((byte *)seed.data(), 16, (byte *)seed.data()); - - switch (alg) - { - case 0: result = ValidateAll(thorough); break; - case 1: result = TestSettings(); break; - case 2: result = TestOS_RNG(); break; - case 3: result = ValidateMD5(); break; - case 4: result = ValidateSHA(); break; - case 5: result = ValidateDES(); break; - case 6: result = ValidateIDEA(); break; - case 7: result = ValidateARC4(); break; - case 8: result = ValidateRC5(); break; - case 9: result = ValidateBlowfish(); break; -// case 10: result = ValidateDiamond2(); break; - case 11: result = ValidateThreeWay(); break; - case 12: result = ValidateBBS(); break; - case 13: result = ValidateDH(); break; - case 14: result = ValidateRSA(); break; - case 15: result = ValidateElGamal(); break; - case 16: result = ValidateDSA(thorough); break; -// case 17: result = ValidateHAVAL(); break; - case 18: result = ValidateSAFER(); break; - case 19: result = ValidateLUC(); break; - case 20: result = ValidateRabin(); break; -// case 21: result = ValidateBlumGoldwasser(); break; - case 22: result = ValidateECP(); break; - case 23: result = ValidateEC2N(); break; -// case 24: result = ValidateMD5MAC(); break; - case 25: result = ValidateGOST(); break; - case 26: result = ValidateTiger(); break; - case 27: result = ValidateRIPEMD(); break; - case 28: result = ValidateHMAC(); break; -// case 29: result = ValidateXMACC(); break; - case 30: result = ValidateSHARK(); break; - case 32: result = ValidateLUC_DH(); break; - case 33: result = ValidateLUC_DL(); break; - case 34: result = ValidateSEAL(); break; - case 35: result = ValidateCAST(); break; - case 36: result = ValidateSquare(); break; - case 37: result = ValidateRC2(); break; - case 38: result = ValidateRC6(); break; - case 39: result = ValidateMARS(); break; - case 40: result = ValidateRW(); break; - case 41: result = ValidateMD2(); break; - case 42: result = ValidateNR(); break; - case 43: result = ValidateMQV(); break; - case 44: result = ValidateRijndael(); break; - case 45: result = ValidateTwofish(); break; - case 46: result = ValidateSerpent(); break; - case 47: result = ValidateCipherModes(); break; - case 48: result = ValidateCRC32(); break; - case 49: result = ValidateECDSA(); break; - case 50: result = ValidateXTR_DH(); break; - case 51: result = ValidateSKIPJACK(); break; - case 52: result = ValidateSHA2(); break; - case 53: result = ValidatePanama(); break; - case 54: result = ValidateAdler32(); break; - case 55: result = ValidateMD4(); break; - case 56: result = ValidatePBKDF(); break; - case 57: result = ValidateESIGN(); break; - case 58: result = ValidateDLIES(); break; - case 59: result = ValidateBaseCode(); break; - case 60: result = ValidateSHACAL2(); break; - case 61: result = ValidateCamellia(); break; - case 62: result = ValidateWhirlpool(); break; - case 63: result = ValidateTTMAC(); break; - case 64: result = ValidateSalsa(); break; - case 65: result = ValidateSosemanuk(); break; - case 66: result = ValidateVMAC(); break; - case 67: result = ValidateCCM(); break; - case 68: result = ValidateGCM(); break; - case 69: result = ValidateCMAC(); break; - default: return false; - } - - time_t endTime = time(NULL); - cout << "\nTest ended at " << asctime(localtime(&endTime)); - cout << "Seed used was: " << seed << endl; - - return result; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tftables.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/tftables.cpp deleted file mode 100644 index dc654cf0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tftables.cpp +++ /dev/null @@ -1,317 +0,0 @@ -// Twofish tables - -#include "pch.h" -#include "twofish.h" - -NAMESPACE_BEGIN(CryptoPP) - -const byte Twofish::Base::q[2][256] = { - 0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76, 0x9A, 0x92, 0x80, 0x78, - 0xE4, 0xDD, 0xD1, 0x38, 0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C, - 0x43, 0x75, 0x37, 0x26, 0xFA, 0x13, 0x94, 0x48, 0xF2, 0xD0, 0x8B, 0x30, - 0x84, 0x54, 0xDF, 0x23, 0x19, 0x5B, 0x3D, 0x59, 0xF3, 0xAE, 0xA2, 0x82, - 0x63, 0x01, 0x83, 0x2E, 0xD9, 0x51, 0x9B, 0x7C, 0xA6, 0xEB, 0xA5, 0xBE, - 0x16, 0x0C, 0xE3, 0x61, 0xC0, 0x8C, 0x3A, 0xF5, 0x73, 0x2C, 0x25, 0x0B, - 0xBB, 0x4E, 0x89, 0x6B, 0x53, 0x6A, 0xB4, 0xF1, 0xE1, 0xE6, 0xBD, 0x45, - 0xE2, 0xF4, 0xB6, 0x66, 0xCC, 0x95, 0x03, 0x56, 0xD4, 0x1C, 0x1E, 0xD7, - 0xFB, 0xC3, 0x8E, 0xB5, 0xE9, 0xCF, 0xBF, 0xBA, 0xEA, 0x77, 0x39, 0xAF, - 0x33, 0xC9, 0x62, 0x71, 0x81, 0x79, 0x09, 0xAD, 0x24, 0xCD, 0xF9, 0xD8, - 0xE5, 0xC5, 0xB9, 0x4D, 0x44, 0x08, 0x86, 0xE7, 0xA1, 0x1D, 0xAA, 0xED, - 0x06, 0x70, 0xB2, 0xD2, 0x41, 0x7B, 0xA0, 0x11, 0x31, 0xC2, 0x27, 0x90, - 0x20, 0xF6, 0x60, 0xFF, 0x96, 0x5C, 0xB1, 0xAB, 0x9E, 0x9C, 0x52, 0x1B, - 0x5F, 0x93, 0x0A, 0xEF, 0x91, 0x85, 0x49, 0xEE, 0x2D, 0x4F, 0x8F, 0x3B, - 0x47, 0x87, 0x6D, 0x46, 0xD6, 0x3E, 0x69, 0x64, 0x2A, 0xCE, 0xCB, 0x2F, - 0xFC, 0x97, 0x05, 0x7A, 0xAC, 0x7F, 0xD5, 0x1A, 0x4B, 0x0E, 0xA7, 0x5A, - 0x28, 0x14, 0x3F, 0x29, 0x88, 0x3C, 0x4C, 0x02, 0xB8, 0xDA, 0xB0, 0x17, - 0x55, 0x1F, 0x8A, 0x7D, 0x57, 0xC7, 0x8D, 0x74, 0xB7, 0xC4, 0x9F, 0x72, - 0x7E, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34, 0x6E, 0x50, 0xDE, 0x68, - 0x65, 0xBC, 0xDB, 0xF8, 0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4, - 0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00, 0x6F, 0x9D, 0x36, 0x42, - 0x4A, 0x5E, 0xC1, 0xE0, - - 0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8, 0x4A, 0xD3, 0xE6, 0x6B, - 0x45, 0x7D, 0xE8, 0x4B, 0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1, - 0x30, 0x0F, 0xF8, 0x1B, 0x87, 0xFA, 0x06, 0x3F, 0x5E, 0xBA, 0xAE, 0x5B, - 0x8A, 0x00, 0xBC, 0x9D, 0x6D, 0xC1, 0xB1, 0x0E, 0x80, 0x5D, 0xD2, 0xD5, - 0xA0, 0x84, 0x07, 0x14, 0xB5, 0x90, 0x2C, 0xA3, 0xB2, 0x73, 0x4C, 0x54, - 0x92, 0x74, 0x36, 0x51, 0x38, 0xB0, 0xBD, 0x5A, 0xFC, 0x60, 0x62, 0x96, - 0x6C, 0x42, 0xF7, 0x10, 0x7C, 0x28, 0x27, 0x8C, 0x13, 0x95, 0x9C, 0xC7, - 0x24, 0x46, 0x3B, 0x70, 0xCA, 0xE3, 0x85, 0xCB, 0x11, 0xD0, 0x93, 0xB8, - 0xA6, 0x83, 0x20, 0xFF, 0x9F, 0x77, 0xC3, 0xCC, 0x03, 0x6F, 0x08, 0xBF, - 0x40, 0xE7, 0x2B, 0xE2, 0x79, 0x0C, 0xAA, 0x82, 0x41, 0x3A, 0xEA, 0xB9, - 0xE4, 0x9A, 0xA4, 0x97, 0x7E, 0xDA, 0x7A, 0x17, 0x66, 0x94, 0xA1, 0x1D, - 0x3D, 0xF0, 0xDE, 0xB3, 0x0B, 0x72, 0xA7, 0x1C, 0xEF, 0xD1, 0x53, 0x3E, - 0x8F, 0x33, 0x26, 0x5F, 0xEC, 0x76, 0x2A, 0x49, 0x81, 0x88, 0xEE, 0x21, - 0xC4, 0x1A, 0xEB, 0xD9, 0xC5, 0x39, 0x99, 0xCD, 0xAD, 0x31, 0x8B, 0x01, - 0x18, 0x23, 0xDD, 0x1F, 0x4E, 0x2D, 0xF9, 0x48, 0x4F, 0xF2, 0x65, 0x8E, - 0x78, 0x5C, 0x58, 0x19, 0x8D, 0xE5, 0x98, 0x57, 0x67, 0x7F, 0x05, 0x64, - 0xAF, 0x63, 0xB6, 0xFE, 0xF5, 0xB7, 0x3C, 0xA5, 0xCE, 0xE9, 0x68, 0x44, - 0xE0, 0x4D, 0x43, 0x69, 0x29, 0x2E, 0xAC, 0x15, 0x59, 0xA8, 0x0A, 0x9E, - 0x6E, 0x47, 0xDF, 0x34, 0x35, 0x6A, 0xCF, 0xDC, 0x22, 0xC9, 0xC0, 0x9B, - 0x89, 0xD4, 0xED, 0xAB, 0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9, - 0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2, 0x16, 0x25, 0x86, 0x56, - 0x55, 0x09, 0xBE, 0x91 -}; - -const word32 Twofish::Base::mds[4][256] = { - 0xbcbc3275, 0xecec21f3, 0x202043c6, 0xb3b3c9f4, - 0xdada03db, 0x02028b7b, 0xe2e22bfb, 0x9e9efac8, - 0xc9c9ec4a, 0xd4d409d3, 0x18186be6, 0x1e1e9f6b, - 0x98980e45, 0xb2b2387d, 0xa6a6d2e8, 0x2626b74b, - 0x3c3c57d6, 0x93938a32, 0x8282eed8, 0x525298fd, - 0x7b7bd437, 0xbbbb3771, 0x5b5b97f1, 0x474783e1, - 0x24243c30, 0x5151e20f, 0xbabac6f8, 0x4a4af31b, - 0xbfbf4887, 0x0d0d70fa, 0xb0b0b306, 0x7575de3f, - 0xd2d2fd5e, 0x7d7d20ba, 0x666631ae, 0x3a3aa35b, - 0x59591c8a, 0x00000000, 0xcdcd93bc, 0x1a1ae09d, - 0xaeae2c6d, 0x7f7fabc1, 0x2b2bc7b1, 0xbebeb90e, - 0xe0e0a080, 0x8a8a105d, 0x3b3b52d2, 0x6464bad5, - 0xd8d888a0, 0xe7e7a584, 0x5f5fe807, 0x1b1b1114, - 0x2c2cc2b5, 0xfcfcb490, 0x3131272c, 0x808065a3, - 0x73732ab2, 0x0c0c8173, 0x79795f4c, 0x6b6b4154, - 0x4b4b0292, 0x53536974, 0x94948f36, 0x83831f51, - 0x2a2a3638, 0xc4c49cb0, 0x2222c8bd, 0xd5d5f85a, - 0xbdbdc3fc, 0x48487860, 0xffffce62, 0x4c4c0796, - 0x4141776c, 0xc7c7e642, 0xebeb24f7, 0x1c1c1410, - 0x5d5d637c, 0x36362228, 0x6767c027, 0xe9e9af8c, - 0x4444f913, 0x1414ea95, 0xf5f5bb9c, 0xcfcf18c7, - 0x3f3f2d24, 0xc0c0e346, 0x7272db3b, 0x54546c70, - 0x29294cca, 0xf0f035e3, 0x0808fe85, 0xc6c617cb, - 0xf3f34f11, 0x8c8ce4d0, 0xa4a45993, 0xcaca96b8, - 0x68683ba6, 0xb8b84d83, 0x38382820, 0xe5e52eff, - 0xadad569f, 0x0b0b8477, 0xc8c81dc3, 0x9999ffcc, - 0x5858ed03, 0x19199a6f, 0x0e0e0a08, 0x95957ebf, - 0x70705040, 0xf7f730e7, 0x6e6ecf2b, 0x1f1f6ee2, - 0xb5b53d79, 0x09090f0c, 0x616134aa, 0x57571682, - 0x9f9f0b41, 0x9d9d803a, 0x111164ea, 0x2525cdb9, - 0xafafdde4, 0x4545089a, 0xdfdf8da4, 0xa3a35c97, - 0xeaead57e, 0x353558da, 0xededd07a, 0x4343fc17, - 0xf8f8cb66, 0xfbfbb194, 0x3737d3a1, 0xfafa401d, - 0xc2c2683d, 0xb4b4ccf0, 0x32325dde, 0x9c9c71b3, - 0x5656e70b, 0xe3e3da72, 0x878760a7, 0x15151b1c, - 0xf9f93aef, 0x6363bfd1, 0x3434a953, 0x9a9a853e, - 0xb1b1428f, 0x7c7cd133, 0x88889b26, 0x3d3da65f, - 0xa1a1d7ec, 0xe4e4df76, 0x8181942a, 0x91910149, - 0x0f0ffb81, 0xeeeeaa88, 0x161661ee, 0xd7d77321, - 0x9797f5c4, 0xa5a5a81a, 0xfefe3feb, 0x6d6db5d9, - 0x7878aec5, 0xc5c56d39, 0x1d1de599, 0x7676a4cd, - 0x3e3edcad, 0xcbcb6731, 0xb6b6478b, 0xefef5b01, - 0x12121e18, 0x6060c523, 0x6a6ab0dd, 0x4d4df61f, - 0xcecee94e, 0xdede7c2d, 0x55559df9, 0x7e7e5a48, - 0x2121b24f, 0x03037af2, 0xa0a02665, 0x5e5e198e, - 0x5a5a6678, 0x65654b5c, 0x62624e58, 0xfdfd4519, - 0x0606f48d, 0x404086e5, 0xf2f2be98, 0x3333ac57, - 0x17179067, 0x05058e7f, 0xe8e85e05, 0x4f4f7d64, - 0x89896aaf, 0x10109563, 0x74742fb6, 0x0a0a75fe, - 0x5c5c92f5, 0x9b9b74b7, 0x2d2d333c, 0x3030d6a5, - 0x2e2e49ce, 0x494989e9, 0x46467268, 0x77775544, - 0xa8a8d8e0, 0x9696044d, 0x2828bd43, 0xa9a92969, - 0xd9d97929, 0x8686912e, 0xd1d187ac, 0xf4f44a15, - 0x8d8d1559, 0xd6d682a8, 0xb9b9bc0a, 0x42420d9e, - 0xf6f6c16e, 0x2f2fb847, 0xdddd06df, 0x23233934, - 0xcccc6235, 0xf1f1c46a, 0xc1c112cf, 0x8585ebdc, - 0x8f8f9e22, 0x7171a1c9, 0x9090f0c0, 0xaaaa539b, - 0x0101f189, 0x8b8be1d4, 0x4e4e8ced, 0x8e8e6fab, - 0xababa212, 0x6f6f3ea2, 0xe6e6540d, 0xdbdbf252, - 0x92927bbb, 0xb7b7b602, 0x6969ca2f, 0x3939d9a9, - 0xd3d30cd7, 0xa7a72361, 0xa2a2ad1e, 0xc3c399b4, - 0x6c6c4450, 0x07070504, 0x04047ff6, 0x272746c2, - 0xacaca716, 0xd0d07625, 0x50501386, 0xdcdcf756, - 0x84841a55, 0xe1e15109, 0x7a7a25be, 0x1313ef91, - - 0xa9d93939, 0x67901717, 0xb3719c9c, 0xe8d2a6a6, - 0x04050707, 0xfd985252, 0xa3658080, 0x76dfe4e4, - 0x9a084545, 0x92024b4b, 0x80a0e0e0, 0x78665a5a, - 0xe4ddafaf, 0xddb06a6a, 0xd1bf6363, 0x38362a2a, - 0x0d54e6e6, 0xc6432020, 0x3562cccc, 0x98bef2f2, - 0x181e1212, 0xf724ebeb, 0xecd7a1a1, 0x6c774141, - 0x43bd2828, 0x7532bcbc, 0x37d47b7b, 0x269b8888, - 0xfa700d0d, 0x13f94444, 0x94b1fbfb, 0x485a7e7e, - 0xf27a0303, 0xd0e48c8c, 0x8b47b6b6, 0x303c2424, - 0x84a5e7e7, 0x54416b6b, 0xdf06dddd, 0x23c56060, - 0x1945fdfd, 0x5ba33a3a, 0x3d68c2c2, 0x59158d8d, - 0xf321ecec, 0xae316666, 0xa23e6f6f, 0x82165757, - 0x63951010, 0x015befef, 0x834db8b8, 0x2e918686, - 0xd9b56d6d, 0x511f8383, 0x9b53aaaa, 0x7c635d5d, - 0xa63b6868, 0xeb3ffefe, 0xa5d63030, 0xbe257a7a, - 0x16a7acac, 0x0c0f0909, 0xe335f0f0, 0x6123a7a7, - 0xc0f09090, 0x8cafe9e9, 0x3a809d9d, 0xf5925c5c, - 0x73810c0c, 0x2c273131, 0x2576d0d0, 0x0be75656, - 0xbb7b9292, 0x4ee9cece, 0x89f10101, 0x6b9f1e1e, - 0x53a93434, 0x6ac4f1f1, 0xb499c3c3, 0xf1975b5b, - 0xe1834747, 0xe66b1818, 0xbdc82222, 0x450e9898, - 0xe26e1f1f, 0xf4c9b3b3, 0xb62f7474, 0x66cbf8f8, - 0xccff9999, 0x95ea1414, 0x03ed5858, 0x56f7dcdc, - 0xd4e18b8b, 0x1c1b1515, 0x1eada2a2, 0xd70cd3d3, - 0xfb2be2e2, 0xc31dc8c8, 0x8e195e5e, 0xb5c22c2c, - 0xe9894949, 0xcf12c1c1, 0xbf7e9595, 0xba207d7d, - 0xea641111, 0x77840b0b, 0x396dc5c5, 0xaf6a8989, - 0x33d17c7c, 0xc9a17171, 0x62ceffff, 0x7137bbbb, - 0x81fb0f0f, 0x793db5b5, 0x0951e1e1, 0xaddc3e3e, - 0x242d3f3f, 0xcda47676, 0xf99d5555, 0xd8ee8282, - 0xe5864040, 0xc5ae7878, 0xb9cd2525, 0x4d049696, - 0x44557777, 0x080a0e0e, 0x86135050, 0xe730f7f7, - 0xa1d33737, 0x1d40fafa, 0xaa346161, 0xed8c4e4e, - 0x06b3b0b0, 0x706c5454, 0xb22a7373, 0xd2523b3b, - 0x410b9f9f, 0x7b8b0202, 0xa088d8d8, 0x114ff3f3, - 0x3167cbcb, 0xc2462727, 0x27c06767, 0x90b4fcfc, - 0x20283838, 0xf67f0404, 0x60784848, 0xff2ee5e5, - 0x96074c4c, 0x5c4b6565, 0xb1c72b2b, 0xab6f8e8e, - 0x9e0d4242, 0x9cbbf5f5, 0x52f2dbdb, 0x1bf34a4a, - 0x5fa63d3d, 0x9359a4a4, 0x0abcb9b9, 0xef3af9f9, - 0x91ef1313, 0x85fe0808, 0x49019191, 0xee611616, - 0x2d7cdede, 0x4fb22121, 0x8f42b1b1, 0x3bdb7272, - 0x47b82f2f, 0x8748bfbf, 0x6d2caeae, 0x46e3c0c0, - 0xd6573c3c, 0x3e859a9a, 0x6929a9a9, 0x647d4f4f, - 0x2a948181, 0xce492e2e, 0xcb17c6c6, 0x2fca6969, - 0xfcc3bdbd, 0x975ca3a3, 0x055ee8e8, 0x7ad0eded, - 0xac87d1d1, 0x7f8e0505, 0xd5ba6464, 0x1aa8a5a5, - 0x4bb72626, 0x0eb9bebe, 0xa7608787, 0x5af8d5d5, - 0x28223636, 0x14111b1b, 0x3fde7575, 0x2979d9d9, - 0x88aaeeee, 0x3c332d2d, 0x4c5f7979, 0x02b6b7b7, - 0xb896caca, 0xda583535, 0xb09cc4c4, 0x17fc4343, - 0x551a8484, 0x1ff64d4d, 0x8a1c5959, 0x7d38b2b2, - 0x57ac3333, 0xc718cfcf, 0x8df40606, 0x74695353, - 0xb7749b9b, 0xc4f59797, 0x9f56adad, 0x72dae3e3, - 0x7ed5eaea, 0x154af4f4, 0x229e8f8f, 0x12a2abab, - 0x584e6262, 0x07e85f5f, 0x99e51d1d, 0x34392323, - 0x6ec1f6f6, 0x50446c6c, 0xde5d3232, 0x68724646, - 0x6526a0a0, 0xbc93cdcd, 0xdb03dada, 0xf8c6baba, - 0xc8fa9e9e, 0xa882d6d6, 0x2bcf6e6e, 0x40507070, - 0xdceb8585, 0xfe750a0a, 0x328a9393, 0xa48ddfdf, - 0xca4c2929, 0x10141c1c, 0x2173d7d7, 0xf0ccb4b4, - 0xd309d4d4, 0x5d108a8a, 0x0fe25151, 0x00000000, - 0x6f9a1919, 0x9de01a1a, 0x368f9494, 0x42e6c7c7, - 0x4aecc9c9, 0x5efdd2d2, 0xc1ab7f7f, 0xe0d8a8a8, - - 0xbc75bc32, 0xecf3ec21, 0x20c62043, 0xb3f4b3c9, - 0xdadbda03, 0x027b028b, 0xe2fbe22b, 0x9ec89efa, - 0xc94ac9ec, 0xd4d3d409, 0x18e6186b, 0x1e6b1e9f, - 0x9845980e, 0xb27db238, 0xa6e8a6d2, 0x264b26b7, - 0x3cd63c57, 0x9332938a, 0x82d882ee, 0x52fd5298, - 0x7b377bd4, 0xbb71bb37, 0x5bf15b97, 0x47e14783, - 0x2430243c, 0x510f51e2, 0xbaf8bac6, 0x4a1b4af3, - 0xbf87bf48, 0x0dfa0d70, 0xb006b0b3, 0x753f75de, - 0xd25ed2fd, 0x7dba7d20, 0x66ae6631, 0x3a5b3aa3, - 0x598a591c, 0x00000000, 0xcdbccd93, 0x1a9d1ae0, - 0xae6dae2c, 0x7fc17fab, 0x2bb12bc7, 0xbe0ebeb9, - 0xe080e0a0, 0x8a5d8a10, 0x3bd23b52, 0x64d564ba, - 0xd8a0d888, 0xe784e7a5, 0x5f075fe8, 0x1b141b11, - 0x2cb52cc2, 0xfc90fcb4, 0x312c3127, 0x80a38065, - 0x73b2732a, 0x0c730c81, 0x794c795f, 0x6b546b41, - 0x4b924b02, 0x53745369, 0x9436948f, 0x8351831f, - 0x2a382a36, 0xc4b0c49c, 0x22bd22c8, 0xd55ad5f8, - 0xbdfcbdc3, 0x48604878, 0xff62ffce, 0x4c964c07, - 0x416c4177, 0xc742c7e6, 0xebf7eb24, 0x1c101c14, - 0x5d7c5d63, 0x36283622, 0x672767c0, 0xe98ce9af, - 0x441344f9, 0x149514ea, 0xf59cf5bb, 0xcfc7cf18, - 0x3f243f2d, 0xc046c0e3, 0x723b72db, 0x5470546c, - 0x29ca294c, 0xf0e3f035, 0x088508fe, 0xc6cbc617, - 0xf311f34f, 0x8cd08ce4, 0xa493a459, 0xcab8ca96, - 0x68a6683b, 0xb883b84d, 0x38203828, 0xe5ffe52e, - 0xad9fad56, 0x0b770b84, 0xc8c3c81d, 0x99cc99ff, - 0x580358ed, 0x196f199a, 0x0e080e0a, 0x95bf957e, - 0x70407050, 0xf7e7f730, 0x6e2b6ecf, 0x1fe21f6e, - 0xb579b53d, 0x090c090f, 0x61aa6134, 0x57825716, - 0x9f419f0b, 0x9d3a9d80, 0x11ea1164, 0x25b925cd, - 0xafe4afdd, 0x459a4508, 0xdfa4df8d, 0xa397a35c, - 0xea7eead5, 0x35da3558, 0xed7aedd0, 0x431743fc, - 0xf866f8cb, 0xfb94fbb1, 0x37a137d3, 0xfa1dfa40, - 0xc23dc268, 0xb4f0b4cc, 0x32de325d, 0x9cb39c71, - 0x560b56e7, 0xe372e3da, 0x87a78760, 0x151c151b, - 0xf9eff93a, 0x63d163bf, 0x345334a9, 0x9a3e9a85, - 0xb18fb142, 0x7c337cd1, 0x8826889b, 0x3d5f3da6, - 0xa1eca1d7, 0xe476e4df, 0x812a8194, 0x91499101, - 0x0f810ffb, 0xee88eeaa, 0x16ee1661, 0xd721d773, - 0x97c497f5, 0xa51aa5a8, 0xfeebfe3f, 0x6dd96db5, - 0x78c578ae, 0xc539c56d, 0x1d991de5, 0x76cd76a4, - 0x3ead3edc, 0xcb31cb67, 0xb68bb647, 0xef01ef5b, - 0x1218121e, 0x602360c5, 0x6add6ab0, 0x4d1f4df6, - 0xce4ecee9, 0xde2dde7c, 0x55f9559d, 0x7e487e5a, - 0x214f21b2, 0x03f2037a, 0xa065a026, 0x5e8e5e19, - 0x5a785a66, 0x655c654b, 0x6258624e, 0xfd19fd45, - 0x068d06f4, 0x40e54086, 0xf298f2be, 0x335733ac, - 0x17671790, 0x057f058e, 0xe805e85e, 0x4f644f7d, - 0x89af896a, 0x10631095, 0x74b6742f, 0x0afe0a75, - 0x5cf55c92, 0x9bb79b74, 0x2d3c2d33, 0x30a530d6, - 0x2ece2e49, 0x49e94989, 0x46684672, 0x77447755, - 0xa8e0a8d8, 0x964d9604, 0x284328bd, 0xa969a929, - 0xd929d979, 0x862e8691, 0xd1acd187, 0xf415f44a, - 0x8d598d15, 0xd6a8d682, 0xb90ab9bc, 0x429e420d, - 0xf66ef6c1, 0x2f472fb8, 0xdddfdd06, 0x23342339, - 0xcc35cc62, 0xf16af1c4, 0xc1cfc112, 0x85dc85eb, - 0x8f228f9e, 0x71c971a1, 0x90c090f0, 0xaa9baa53, - 0x018901f1, 0x8bd48be1, 0x4eed4e8c, 0x8eab8e6f, - 0xab12aba2, 0x6fa26f3e, 0xe60de654, 0xdb52dbf2, - 0x92bb927b, 0xb702b7b6, 0x692f69ca, 0x39a939d9, - 0xd3d7d30c, 0xa761a723, 0xa21ea2ad, 0xc3b4c399, - 0x6c506c44, 0x07040705, 0x04f6047f, 0x27c22746, - 0xac16aca7, 0xd025d076, 0x50865013, 0xdc56dcf7, - 0x8455841a, 0xe109e151, 0x7abe7a25, 0x139113ef, - - 0xd939a9d9, 0x90176790, 0x719cb371, 0xd2a6e8d2, - 0x05070405, 0x9852fd98, 0x6580a365, 0xdfe476df, - 0x08459a08, 0x024b9202, 0xa0e080a0, 0x665a7866, - 0xddafe4dd, 0xb06addb0, 0xbf63d1bf, 0x362a3836, - 0x54e60d54, 0x4320c643, 0x62cc3562, 0xbef298be, - 0x1e12181e, 0x24ebf724, 0xd7a1ecd7, 0x77416c77, - 0xbd2843bd, 0x32bc7532, 0xd47b37d4, 0x9b88269b, - 0x700dfa70, 0xf94413f9, 0xb1fb94b1, 0x5a7e485a, - 0x7a03f27a, 0xe48cd0e4, 0x47b68b47, 0x3c24303c, - 0xa5e784a5, 0x416b5441, 0x06dddf06, 0xc56023c5, - 0x45fd1945, 0xa33a5ba3, 0x68c23d68, 0x158d5915, - 0x21ecf321, 0x3166ae31, 0x3e6fa23e, 0x16578216, - 0x95106395, 0x5bef015b, 0x4db8834d, 0x91862e91, - 0xb56dd9b5, 0x1f83511f, 0x53aa9b53, 0x635d7c63, - 0x3b68a63b, 0x3ffeeb3f, 0xd630a5d6, 0x257abe25, - 0xa7ac16a7, 0x0f090c0f, 0x35f0e335, 0x23a76123, - 0xf090c0f0, 0xafe98caf, 0x809d3a80, 0x925cf592, - 0x810c7381, 0x27312c27, 0x76d02576, 0xe7560be7, - 0x7b92bb7b, 0xe9ce4ee9, 0xf10189f1, 0x9f1e6b9f, - 0xa93453a9, 0xc4f16ac4, 0x99c3b499, 0x975bf197, - 0x8347e183, 0x6b18e66b, 0xc822bdc8, 0x0e98450e, - 0x6e1fe26e, 0xc9b3f4c9, 0x2f74b62f, 0xcbf866cb, - 0xff99ccff, 0xea1495ea, 0xed5803ed, 0xf7dc56f7, - 0xe18bd4e1, 0x1b151c1b, 0xada21ead, 0x0cd3d70c, - 0x2be2fb2b, 0x1dc8c31d, 0x195e8e19, 0xc22cb5c2, - 0x8949e989, 0x12c1cf12, 0x7e95bf7e, 0x207dba20, - 0x6411ea64, 0x840b7784, 0x6dc5396d, 0x6a89af6a, - 0xd17c33d1, 0xa171c9a1, 0xceff62ce, 0x37bb7137, - 0xfb0f81fb, 0x3db5793d, 0x51e10951, 0xdc3eaddc, - 0x2d3f242d, 0xa476cda4, 0x9d55f99d, 0xee82d8ee, - 0x8640e586, 0xae78c5ae, 0xcd25b9cd, 0x04964d04, - 0x55774455, 0x0a0e080a, 0x13508613, 0x30f7e730, - 0xd337a1d3, 0x40fa1d40, 0x3461aa34, 0x8c4eed8c, - 0xb3b006b3, 0x6c54706c, 0x2a73b22a, 0x523bd252, - 0x0b9f410b, 0x8b027b8b, 0x88d8a088, 0x4ff3114f, - 0x67cb3167, 0x4627c246, 0xc06727c0, 0xb4fc90b4, - 0x28382028, 0x7f04f67f, 0x78486078, 0x2ee5ff2e, - 0x074c9607, 0x4b655c4b, 0xc72bb1c7, 0x6f8eab6f, - 0x0d429e0d, 0xbbf59cbb, 0xf2db52f2, 0xf34a1bf3, - 0xa63d5fa6, 0x59a49359, 0xbcb90abc, 0x3af9ef3a, - 0xef1391ef, 0xfe0885fe, 0x01914901, 0x6116ee61, - 0x7cde2d7c, 0xb2214fb2, 0x42b18f42, 0xdb723bdb, - 0xb82f47b8, 0x48bf8748, 0x2cae6d2c, 0xe3c046e3, - 0x573cd657, 0x859a3e85, 0x29a96929, 0x7d4f647d, - 0x94812a94, 0x492ece49, 0x17c6cb17, 0xca692fca, - 0xc3bdfcc3, 0x5ca3975c, 0x5ee8055e, 0xd0ed7ad0, - 0x87d1ac87, 0x8e057f8e, 0xba64d5ba, 0xa8a51aa8, - 0xb7264bb7, 0xb9be0eb9, 0x6087a760, 0xf8d55af8, - 0x22362822, 0x111b1411, 0xde753fde, 0x79d92979, - 0xaaee88aa, 0x332d3c33, 0x5f794c5f, 0xb6b702b6, - 0x96cab896, 0x5835da58, 0x9cc4b09c, 0xfc4317fc, - 0x1a84551a, 0xf64d1ff6, 0x1c598a1c, 0x38b27d38, - 0xac3357ac, 0x18cfc718, 0xf4068df4, 0x69537469, - 0x749bb774, 0xf597c4f5, 0x56ad9f56, 0xdae372da, - 0xd5ea7ed5, 0x4af4154a, 0x9e8f229e, 0xa2ab12a2, - 0x4e62584e, 0xe85f07e8, 0xe51d99e5, 0x39233439, - 0xc1f66ec1, 0x446c5044, 0x5d32de5d, 0x72466872, - 0x26a06526, 0x93cdbc93, 0x03dadb03, 0xc6baf8c6, - 0xfa9ec8fa, 0x82d6a882, 0xcf6e2bcf, 0x50704050, - 0xeb85dceb, 0x750afe75, 0x8a93328a, 0x8ddfa48d, - 0x4c29ca4c, 0x141c1014, 0x73d72173, 0xccb4f0cc, - 0x09d4d309, 0x108a5d10, 0xe2510fe2, 0x00000000, - 0x9a196f9a, 0xe01a9de0, 0x8f94368f, 0xe6c742e6, - 0xecc94aec, 0xfdd25efd, 0xab7fc1ab, 0xd8a8e0d8}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.cpp deleted file mode 100644 index c6c05cae..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// tiger.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "tiger.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Tiger::InitState(HashWordType *state) -{ - state[0] = W64LIT(0x0123456789ABCDEF); - state[1] = W64LIT(0xFEDCBA9876543210); - state[2] = W64LIT(0xF096A5B4C3B2E187); -} - -void Tiger::TruncatedFinal(byte *hash, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - PadLastBlock(56, 0x01); - CorrectEndianess(m_data, m_data, 56); - - m_data[7] = GetBitCountLo(); - - Transform(m_state, m_data); - CorrectEndianess(m_state, m_state, DigestSize()); - memcpy(hash, m_state, size); - - Restart(); // reinit for next use -} - -void Tiger::Transform (word64 *digest, const word64 *X) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 - if (HasSSE2()) - { -#ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS1( push ebx) -#else - #if _MSC_VER < 1300 - const word64 *t = table; - AS2( mov edx, t) - #else - AS2( lea edx, [table]) - #endif - AS2( mov eax, digest) - AS2( mov esi, X) -#endif - AS2( movq mm0, [eax]) - AS2( movq mm1, [eax+1*8]) - AS2( movq mm5, mm1) - AS2( movq mm2, [eax+2*8]) - AS2( movq mm7, [edx+4*2048+0*8]) - AS2( movq mm6, [edx+4*2048+1*8]) - AS2( mov ecx, esp) - AS2( and esp, 0xfffffff0) - AS2( sub esp, 8*8) - AS1( push ecx) - -#define SSE2_round(a,b,c,x,mul) \ - AS2( pxor c, [x])\ - AS2( movd ecx, c)\ - AS2( movzx edi, cl)\ - AS2( movq mm3, [edx+0*2048+edi*8])\ - AS2( movzx edi, ch)\ - AS2( movq mm4, [edx+3*2048+edi*8])\ - AS2( shr ecx, 16)\ - AS2( movzx edi, cl)\ - AS2( pxor mm3, [edx+1*2048+edi*8])\ - AS2( movzx edi, ch)\ - AS2( pxor mm4, [edx+2*2048+edi*8])\ - AS3( pextrw ecx, c, 2)\ - AS2( movzx edi, cl)\ - AS2( pxor mm3, [edx+2*2048+edi*8])\ - AS2( movzx edi, ch)\ - AS2( pxor mm4, [edx+1*2048+edi*8])\ - AS3( pextrw ecx, c, 3)\ - AS2( movzx edi, cl)\ - AS2( pxor mm3, [edx+3*2048+edi*8])\ - AS2( psubq a, mm3)\ - AS2( movzx edi, ch)\ - AS2( pxor mm4, [edx+0*2048+edi*8])\ - AS2( paddq b, mm4)\ - SSE2_mul_##mul(b) - -#define SSE2_mul_5(b) \ - AS2( movq mm3, b)\ - AS2( psllq b, 2)\ - AS2( paddq b, mm3) - -#define SSE2_mul_7(b) \ - AS2( movq mm3, b)\ - AS2( psllq b, 3)\ - AS2( psubq b, mm3) - -#define SSE2_mul_9(b) \ - AS2( movq mm3, b)\ - AS2( psllq b, 3)\ - AS2( paddq b, mm3) - -#define label2_5 1 -#define label2_7 2 -#define label2_9 3 - -#define SSE2_pass(A,B,C,mul,X) \ - AS2( xor ebx, ebx)\ - ASL(mul)\ - SSE2_round(A,B,C,X+0*8+ebx,mul)\ - SSE2_round(B,C,A,X+1*8+ebx,mul)\ - AS2( cmp ebx, 6*8)\ - ASJ( je, label2_##mul, f)\ - SSE2_round(C,A,B,X+2*8+ebx,mul)\ - AS2( add ebx, 3*8)\ - ASJ( jmp, mul, b)\ - ASL(label2_##mul) - -#define SSE2_key_schedule(Y,X) \ - AS2( movq mm3, [X+7*8])\ - AS2( pxor mm3, mm6)\ - AS2( movq mm4, [X+0*8])\ - AS2( psubq mm4, mm3)\ - AS2( movq [Y+0*8], mm4)\ - AS2( pxor mm4, [X+1*8])\ - AS2( movq mm3, mm4)\ - AS2( movq [Y+1*8], mm4)\ - AS2( paddq mm4, [X+2*8])\ - AS2( pxor mm3, mm7)\ - AS2( psllq mm3, 19)\ - AS2( movq [Y+2*8], mm4)\ - AS2( pxor mm3, mm4)\ - AS2( movq mm4, [X+3*8])\ - AS2( psubq mm4, mm3)\ - AS2( movq [Y+3*8], mm4)\ - AS2( pxor mm4, [X+4*8])\ - AS2( movq mm3, mm4)\ - AS2( movq [Y+4*8], mm4)\ - AS2( paddq mm4, [X+5*8])\ - AS2( pxor mm3, mm7)\ - AS2( psrlq mm3, 23)\ - AS2( movq [Y+5*8], mm4)\ - AS2( pxor mm3, mm4)\ - AS2( movq mm4, [X+6*8])\ - AS2( psubq mm4, mm3)\ - AS2( movq [Y+6*8], mm4)\ - AS2( pxor mm4, [X+7*8])\ - AS2( movq mm3, mm4)\ - AS2( movq [Y+7*8], mm4)\ - AS2( paddq mm4, [Y+0*8])\ - AS2( pxor mm3, mm7)\ - AS2( psllq mm3, 19)\ - AS2( movq [Y+0*8], mm4)\ - AS2( pxor mm3, mm4)\ - AS2( movq mm4, [Y+1*8])\ - AS2( psubq mm4, mm3)\ - AS2( movq [Y+1*8], mm4)\ - AS2( pxor mm4, [Y+2*8])\ - AS2( movq mm3, mm4)\ - AS2( movq [Y+2*8], mm4)\ - AS2( paddq mm4, [Y+3*8])\ - AS2( pxor mm3, mm7)\ - AS2( psrlq mm3, 23)\ - AS2( movq [Y+3*8], mm4)\ - AS2( pxor mm3, mm4)\ - AS2( movq mm4, [Y+4*8])\ - AS2( psubq mm4, mm3)\ - AS2( movq [Y+4*8], mm4)\ - AS2( pxor mm4, [Y+5*8])\ - AS2( movq [Y+5*8], mm4)\ - AS2( paddq mm4, [Y+6*8])\ - AS2( movq [Y+6*8], mm4)\ - AS2( pxor mm4, [edx+4*2048+2*8])\ - AS2( movq mm3, [Y+7*8])\ - AS2( psubq mm3, mm4)\ - AS2( movq [Y+7*8], mm3) - - SSE2_pass(mm0, mm1, mm2, 5, esi) - SSE2_key_schedule(esp+4, esi) - SSE2_pass(mm2, mm0, mm1, 7, esp+4) - SSE2_key_schedule(esp+4, esp+4) - SSE2_pass(mm1, mm2, mm0, 9, esp+4) - - AS2( pxor mm0, [eax+0*8]) - AS2( movq [eax+0*8], mm0) - AS2( psubq mm1, mm5) - AS2( movq [eax+1*8], mm1) - AS2( paddq mm2, [eax+2*8]) - AS2( movq [eax+2*8], mm2) - - AS1( pop esp) - AS1( emms) -#ifdef __GNUC__ - AS1( pop ebx) - ".att_syntax prefix;" - : - : "a" (digest), "S" (X), "d" (table) - : "%ecx", "%edi", "memory", "cc" - ); -#endif - } - else -#endif - { - word64 a = digest[0]; - word64 b = digest[1]; - word64 c = digest[2]; - word64 Y[8]; - -#define t1 (table) -#define t2 (table+256) -#define t3 (table+256*2) -#define t4 (table+256*3) - -#define round(a,b,c,x,mul) \ - c ^= x; \ - a -= t1[GETBYTE(c,0)] ^ t2[GETBYTE(c,2)] ^ t3[GETBYTE(c,4)] ^ t4[GETBYTE(c,6)]; \ - b += t4[GETBYTE(c,1)] ^ t3[GETBYTE(c,3)] ^ t2[GETBYTE(c,5)] ^ t1[GETBYTE(c,7)]; \ - b *= mul - -#define pass(a,b,c,mul,X) {\ - int i=0;\ - while (true)\ - {\ - round(a,b,c,X[i+0],mul); \ - round(b,c,a,X[i+1],mul); \ - if (i==6)\ - break;\ - round(c,a,b,X[i+2],mul); \ - i+=3;\ - }} - -#define key_schedule(Y,X) \ - Y[0] = X[0] - (X[7]^W64LIT(0xA5A5A5A5A5A5A5A5)); \ - Y[1] = X[1] ^ Y[0]; \ - Y[2] = X[2] + Y[1]; \ - Y[3] = X[3] - (Y[2] ^ ((~Y[1])<<19)); \ - Y[4] = X[4] ^ Y[3]; \ - Y[5] = X[5] + Y[4]; \ - Y[6] = X[6] - (Y[5] ^ ((~Y[4])>>23)); \ - Y[7] = X[7] ^ Y[6]; \ - Y[0] += Y[7]; \ - Y[1] -= Y[0] ^ ((~Y[7])<<19); \ - Y[2] ^= Y[1]; \ - Y[3] += Y[2]; \ - Y[4] -= Y[3] ^ ((~Y[2])>>23); \ - Y[5] ^= Y[4]; \ - Y[6] += Y[5]; \ - Y[7] -= Y[6] ^ W64LIT(0x0123456789ABCDEF) - - pass(a,b,c,5,X); - key_schedule(Y,X); - pass(c,a,b,7,Y); - key_schedule(Y,Y); - pass(b,c,a,9,Y); - - digest[0] = a ^ digest[0]; - digest[1] = b - digest[1]; - digest[2] = c + digest[2]; - } -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.h deleted file mode 100644 index 5f6e941a..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tiger.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CRYPTOPP_TIGER_H -#define CRYPTOPP_TIGER_H - -#include "config.h" -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// Tiger -class Tiger : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word64 *digest, const word64 *data); - void TruncatedFinal(byte *hash, size_t size); - static const char * StaticAlgorithmName() {return "Tiger";} - -protected: - static const word64 table[4*256+3]; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/tigertab.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/tigertab.cpp deleted file mode 100644 index 5c1595b5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/tigertab.cpp +++ /dev/null @@ -1,525 +0,0 @@ -#include "pch.h" -#include "tiger.h" - -NAMESPACE_BEGIN(CryptoPP) - -const word64 Tiger::table[4*256+3] = -{ - W64LIT(0x02AAB17CF7E90C5E) /* 0 */, W64LIT(0xAC424B03E243A8EC) /* 1 */, - W64LIT(0x72CD5BE30DD5FCD3) /* 2 */, W64LIT(0x6D019B93F6F97F3A) /* 3 */, - W64LIT(0xCD9978FFD21F9193) /* 4 */, W64LIT(0x7573A1C9708029E2) /* 5 */, - W64LIT(0xB164326B922A83C3) /* 6 */, W64LIT(0x46883EEE04915870) /* 7 */, - W64LIT(0xEAACE3057103ECE6) /* 8 */, W64LIT(0xC54169B808A3535C) /* 9 */, - W64LIT(0x4CE754918DDEC47C) /* 10 */, W64LIT(0x0AA2F4DFDC0DF40C) /* 11 */, - W64LIT(0x10B76F18A74DBEFA) /* 12 */, W64LIT(0xC6CCB6235AD1AB6A) /* 13 */, - W64LIT(0x13726121572FE2FF) /* 14 */, W64LIT(0x1A488C6F199D921E) /* 15 */, - W64LIT(0x4BC9F9F4DA0007CA) /* 16 */, W64LIT(0x26F5E6F6E85241C7) /* 17 */, - W64LIT(0x859079DBEA5947B6) /* 18 */, W64LIT(0x4F1885C5C99E8C92) /* 19 */, - W64LIT(0xD78E761EA96F864B) /* 20 */, W64LIT(0x8E36428C52B5C17D) /* 21 */, - W64LIT(0x69CF6827373063C1) /* 22 */, W64LIT(0xB607C93D9BB4C56E) /* 23 */, - W64LIT(0x7D820E760E76B5EA) /* 24 */, W64LIT(0x645C9CC6F07FDC42) /* 25 */, - W64LIT(0xBF38A078243342E0) /* 26 */, W64LIT(0x5F6B343C9D2E7D04) /* 27 */, - W64LIT(0xF2C28AEB600B0EC6) /* 28 */, W64LIT(0x6C0ED85F7254BCAC) /* 29 */, - W64LIT(0x71592281A4DB4FE5) /* 30 */, W64LIT(0x1967FA69CE0FED9F) /* 31 */, - W64LIT(0xFD5293F8B96545DB) /* 32 */, W64LIT(0xC879E9D7F2A7600B) /* 33 */, - W64LIT(0x860248920193194E) /* 34 */, W64LIT(0xA4F9533B2D9CC0B3) /* 35 */, - W64LIT(0x9053836C15957613) /* 36 */, W64LIT(0xDB6DCF8AFC357BF1) /* 37 */, - W64LIT(0x18BEEA7A7A370F57) /* 38 */, W64LIT(0x037117CA50B99066) /* 39 */, - W64LIT(0x6AB30A9774424A35) /* 40 */, W64LIT(0xF4E92F02E325249B) /* 41 */, - W64LIT(0x7739DB07061CCAE1) /* 42 */, W64LIT(0xD8F3B49CECA42A05) /* 43 */, - W64LIT(0xBD56BE3F51382F73) /* 44 */, W64LIT(0x45FAED5843B0BB28) /* 45 */, - W64LIT(0x1C813D5C11BF1F83) /* 46 */, W64LIT(0x8AF0E4B6D75FA169) /* 47 */, - W64LIT(0x33EE18A487AD9999) /* 48 */, W64LIT(0x3C26E8EAB1C94410) /* 49 */, - W64LIT(0xB510102BC0A822F9) /* 50 */, W64LIT(0x141EEF310CE6123B) /* 51 */, - W64LIT(0xFC65B90059DDB154) /* 52 */, W64LIT(0xE0158640C5E0E607) /* 53 */, - W64LIT(0x884E079826C3A3CF) /* 54 */, W64LIT(0x930D0D9523C535FD) /* 55 */, - W64LIT(0x35638D754E9A2B00) /* 56 */, W64LIT(0x4085FCCF40469DD5) /* 57 */, - W64LIT(0xC4B17AD28BE23A4C) /* 58 */, W64LIT(0xCAB2F0FC6A3E6A2E) /* 59 */, - W64LIT(0x2860971A6B943FCD) /* 60 */, W64LIT(0x3DDE6EE212E30446) /* 61 */, - W64LIT(0x6222F32AE01765AE) /* 62 */, W64LIT(0x5D550BB5478308FE) /* 63 */, - W64LIT(0xA9EFA98DA0EDA22A) /* 64 */, W64LIT(0xC351A71686C40DA7) /* 65 */, - W64LIT(0x1105586D9C867C84) /* 66 */, W64LIT(0xDCFFEE85FDA22853) /* 67 */, - W64LIT(0xCCFBD0262C5EEF76) /* 68 */, W64LIT(0xBAF294CB8990D201) /* 69 */, - W64LIT(0xE69464F52AFAD975) /* 70 */, W64LIT(0x94B013AFDF133E14) /* 71 */, - W64LIT(0x06A7D1A32823C958) /* 72 */, W64LIT(0x6F95FE5130F61119) /* 73 */, - W64LIT(0xD92AB34E462C06C0) /* 74 */, W64LIT(0xED7BDE33887C71D2) /* 75 */, - W64LIT(0x79746D6E6518393E) /* 76 */, W64LIT(0x5BA419385D713329) /* 77 */, - W64LIT(0x7C1BA6B948A97564) /* 78 */, W64LIT(0x31987C197BFDAC67) /* 79 */, - W64LIT(0xDE6C23C44B053D02) /* 80 */, W64LIT(0x581C49FED002D64D) /* 81 */, - W64LIT(0xDD474D6338261571) /* 82 */, W64LIT(0xAA4546C3E473D062) /* 83 */, - W64LIT(0x928FCE349455F860) /* 84 */, W64LIT(0x48161BBACAAB94D9) /* 85 */, - W64LIT(0x63912430770E6F68) /* 86 */, W64LIT(0x6EC8A5E602C6641C) /* 87 */, - W64LIT(0x87282515337DDD2B) /* 88 */, W64LIT(0x2CDA6B42034B701B) /* 89 */, - W64LIT(0xB03D37C181CB096D) /* 90 */, W64LIT(0xE108438266C71C6F) /* 91 */, - W64LIT(0x2B3180C7EB51B255) /* 92 */, W64LIT(0xDF92B82F96C08BBC) /* 93 */, - W64LIT(0x5C68C8C0A632F3BA) /* 94 */, W64LIT(0x5504CC861C3D0556) /* 95 */, - W64LIT(0xABBFA4E55FB26B8F) /* 96 */, W64LIT(0x41848B0AB3BACEB4) /* 97 */, - W64LIT(0xB334A273AA445D32) /* 98 */, W64LIT(0xBCA696F0A85AD881) /* 99 */, - W64LIT(0x24F6EC65B528D56C) /* 100 */, W64LIT(0x0CE1512E90F4524A) /* 101 */, - W64LIT(0x4E9DD79D5506D35A) /* 102 */, W64LIT(0x258905FAC6CE9779) /* 103 */, - W64LIT(0x2019295B3E109B33) /* 104 */, W64LIT(0xF8A9478B73A054CC) /* 105 */, - W64LIT(0x2924F2F934417EB0) /* 106 */, W64LIT(0x3993357D536D1BC4) /* 107 */, - W64LIT(0x38A81AC21DB6FF8B) /* 108 */, W64LIT(0x47C4FBF17D6016BF) /* 109 */, - W64LIT(0x1E0FAADD7667E3F5) /* 110 */, W64LIT(0x7ABCFF62938BEB96) /* 111 */, - W64LIT(0xA78DAD948FC179C9) /* 112 */, W64LIT(0x8F1F98B72911E50D) /* 113 */, - W64LIT(0x61E48EAE27121A91) /* 114 */, W64LIT(0x4D62F7AD31859808) /* 115 */, - W64LIT(0xECEBA345EF5CEAEB) /* 116 */, W64LIT(0xF5CEB25EBC9684CE) /* 117 */, - W64LIT(0xF633E20CB7F76221) /* 118 */, W64LIT(0xA32CDF06AB8293E4) /* 119 */, - W64LIT(0x985A202CA5EE2CA4) /* 120 */, W64LIT(0xCF0B8447CC8A8FB1) /* 121 */, - W64LIT(0x9F765244979859A3) /* 122 */, W64LIT(0xA8D516B1A1240017) /* 123 */, - W64LIT(0x0BD7BA3EBB5DC726) /* 124 */, W64LIT(0xE54BCA55B86ADB39) /* 125 */, - W64LIT(0x1D7A3AFD6C478063) /* 126 */, W64LIT(0x519EC608E7669EDD) /* 127 */, - W64LIT(0x0E5715A2D149AA23) /* 128 */, W64LIT(0x177D4571848FF194) /* 129 */, - W64LIT(0xEEB55F3241014C22) /* 130 */, W64LIT(0x0F5E5CA13A6E2EC2) /* 131 */, - W64LIT(0x8029927B75F5C361) /* 132 */, W64LIT(0xAD139FABC3D6E436) /* 133 */, - W64LIT(0x0D5DF1A94CCF402F) /* 134 */, W64LIT(0x3E8BD948BEA5DFC8) /* 135 */, - W64LIT(0xA5A0D357BD3FF77E) /* 136 */, W64LIT(0xA2D12E251F74F645) /* 137 */, - W64LIT(0x66FD9E525E81A082) /* 138 */, W64LIT(0x2E0C90CE7F687A49) /* 139 */, - W64LIT(0xC2E8BCBEBA973BC5) /* 140 */, W64LIT(0x000001BCE509745F) /* 141 */, - W64LIT(0x423777BBE6DAB3D6) /* 142 */, W64LIT(0xD1661C7EAEF06EB5) /* 143 */, - W64LIT(0xA1781F354DAACFD8) /* 144 */, W64LIT(0x2D11284A2B16AFFC) /* 145 */, - W64LIT(0xF1FC4F67FA891D1F) /* 146 */, W64LIT(0x73ECC25DCB920ADA) /* 147 */, - W64LIT(0xAE610C22C2A12651) /* 148 */, W64LIT(0x96E0A810D356B78A) /* 149 */, - W64LIT(0x5A9A381F2FE7870F) /* 150 */, W64LIT(0xD5AD62EDE94E5530) /* 151 */, - W64LIT(0xD225E5E8368D1427) /* 152 */, W64LIT(0x65977B70C7AF4631) /* 153 */, - W64LIT(0x99F889B2DE39D74F) /* 154 */, W64LIT(0x233F30BF54E1D143) /* 155 */, - W64LIT(0x9A9675D3D9A63C97) /* 156 */, W64LIT(0x5470554FF334F9A8) /* 157 */, - W64LIT(0x166ACB744A4F5688) /* 158 */, W64LIT(0x70C74CAAB2E4AEAD) /* 159 */, - W64LIT(0xF0D091646F294D12) /* 160 */, W64LIT(0x57B82A89684031D1) /* 161 */, - W64LIT(0xEFD95A5A61BE0B6B) /* 162 */, W64LIT(0x2FBD12E969F2F29A) /* 163 */, - W64LIT(0x9BD37013FEFF9FE8) /* 164 */, W64LIT(0x3F9B0404D6085A06) /* 165 */, - W64LIT(0x4940C1F3166CFE15) /* 166 */, W64LIT(0x09542C4DCDF3DEFB) /* 167 */, - W64LIT(0xB4C5218385CD5CE3) /* 168 */, W64LIT(0xC935B7DC4462A641) /* 169 */, - W64LIT(0x3417F8A68ED3B63F) /* 170 */, W64LIT(0xB80959295B215B40) /* 171 */, - W64LIT(0xF99CDAEF3B8C8572) /* 172 */, W64LIT(0x018C0614F8FCB95D) /* 173 */, - W64LIT(0x1B14ACCD1A3ACDF3) /* 174 */, W64LIT(0x84D471F200BB732D) /* 175 */, - W64LIT(0xC1A3110E95E8DA16) /* 176 */, W64LIT(0x430A7220BF1A82B8) /* 177 */, - W64LIT(0xB77E090D39DF210E) /* 178 */, W64LIT(0x5EF4BD9F3CD05E9D) /* 179 */, - W64LIT(0x9D4FF6DA7E57A444) /* 180 */, W64LIT(0xDA1D60E183D4A5F8) /* 181 */, - W64LIT(0xB287C38417998E47) /* 182 */, W64LIT(0xFE3EDC121BB31886) /* 183 */, - W64LIT(0xC7FE3CCC980CCBEF) /* 184 */, W64LIT(0xE46FB590189BFD03) /* 185 */, - W64LIT(0x3732FD469A4C57DC) /* 186 */, W64LIT(0x7EF700A07CF1AD65) /* 187 */, - W64LIT(0x59C64468A31D8859) /* 188 */, W64LIT(0x762FB0B4D45B61F6) /* 189 */, - W64LIT(0x155BAED099047718) /* 190 */, W64LIT(0x68755E4C3D50BAA6) /* 191 */, - W64LIT(0xE9214E7F22D8B4DF) /* 192 */, W64LIT(0x2ADDBF532EAC95F4) /* 193 */, - W64LIT(0x32AE3909B4BD0109) /* 194 */, W64LIT(0x834DF537B08E3450) /* 195 */, - W64LIT(0xFA209DA84220728D) /* 196 */, W64LIT(0x9E691D9B9EFE23F7) /* 197 */, - W64LIT(0x0446D288C4AE8D7F) /* 198 */, W64LIT(0x7B4CC524E169785B) /* 199 */, - W64LIT(0x21D87F0135CA1385) /* 200 */, W64LIT(0xCEBB400F137B8AA5) /* 201 */, - W64LIT(0x272E2B66580796BE) /* 202 */, W64LIT(0x3612264125C2B0DE) /* 203 */, - W64LIT(0x057702BDAD1EFBB2) /* 204 */, W64LIT(0xD4BABB8EACF84BE9) /* 205 */, - W64LIT(0x91583139641BC67B) /* 206 */, W64LIT(0x8BDC2DE08036E024) /* 207 */, - W64LIT(0x603C8156F49F68ED) /* 208 */, W64LIT(0xF7D236F7DBEF5111) /* 209 */, - W64LIT(0x9727C4598AD21E80) /* 210 */, W64LIT(0xA08A0896670A5FD7) /* 211 */, - W64LIT(0xCB4A8F4309EBA9CB) /* 212 */, W64LIT(0x81AF564B0F7036A1) /* 213 */, - W64LIT(0xC0B99AA778199ABD) /* 214 */, W64LIT(0x959F1EC83FC8E952) /* 215 */, - W64LIT(0x8C505077794A81B9) /* 216 */, W64LIT(0x3ACAAF8F056338F0) /* 217 */, - W64LIT(0x07B43F50627A6778) /* 218 */, W64LIT(0x4A44AB49F5ECCC77) /* 219 */, - W64LIT(0x3BC3D6E4B679EE98) /* 220 */, W64LIT(0x9CC0D4D1CF14108C) /* 221 */, - W64LIT(0x4406C00B206BC8A0) /* 222 */, W64LIT(0x82A18854C8D72D89) /* 223 */, - W64LIT(0x67E366B35C3C432C) /* 224 */, W64LIT(0xB923DD61102B37F2) /* 225 */, - W64LIT(0x56AB2779D884271D) /* 226 */, W64LIT(0xBE83E1B0FF1525AF) /* 227 */, - W64LIT(0xFB7C65D4217E49A9) /* 228 */, W64LIT(0x6BDBE0E76D48E7D4) /* 229 */, - W64LIT(0x08DF828745D9179E) /* 230 */, W64LIT(0x22EA6A9ADD53BD34) /* 231 */, - W64LIT(0xE36E141C5622200A) /* 232 */, W64LIT(0x7F805D1B8CB750EE) /* 233 */, - W64LIT(0xAFE5C7A59F58E837) /* 234 */, W64LIT(0xE27F996A4FB1C23C) /* 235 */, - W64LIT(0xD3867DFB0775F0D0) /* 236 */, W64LIT(0xD0E673DE6E88891A) /* 237 */, - W64LIT(0x123AEB9EAFB86C25) /* 238 */, W64LIT(0x30F1D5D5C145B895) /* 239 */, - W64LIT(0xBB434A2DEE7269E7) /* 240 */, W64LIT(0x78CB67ECF931FA38) /* 241 */, - W64LIT(0xF33B0372323BBF9C) /* 242 */, W64LIT(0x52D66336FB279C74) /* 243 */, - W64LIT(0x505F33AC0AFB4EAA) /* 244 */, W64LIT(0xE8A5CD99A2CCE187) /* 245 */, - W64LIT(0x534974801E2D30BB) /* 246 */, W64LIT(0x8D2D5711D5876D90) /* 247 */, - W64LIT(0x1F1A412891BC038E) /* 248 */, W64LIT(0xD6E2E71D82E56648) /* 249 */, - W64LIT(0x74036C3A497732B7) /* 250 */, W64LIT(0x89B67ED96361F5AB) /* 251 */, - W64LIT(0xFFED95D8F1EA02A2) /* 252 */, W64LIT(0xE72B3BD61464D43D) /* 253 */, - W64LIT(0xA6300F170BDC4820) /* 254 */, W64LIT(0xEBC18760ED78A77A) /* 255 */, - W64LIT(0xE6A6BE5A05A12138) /* 256 */, W64LIT(0xB5A122A5B4F87C98) /* 257 */, - W64LIT(0x563C6089140B6990) /* 258 */, W64LIT(0x4C46CB2E391F5DD5) /* 259 */, - W64LIT(0xD932ADDBC9B79434) /* 260 */, W64LIT(0x08EA70E42015AFF5) /* 261 */, - W64LIT(0xD765A6673E478CF1) /* 262 */, W64LIT(0xC4FB757EAB278D99) /* 263 */, - W64LIT(0xDF11C6862D6E0692) /* 264 */, W64LIT(0xDDEB84F10D7F3B16) /* 265 */, - W64LIT(0x6F2EF604A665EA04) /* 266 */, W64LIT(0x4A8E0F0FF0E0DFB3) /* 267 */, - W64LIT(0xA5EDEEF83DBCBA51) /* 268 */, W64LIT(0xFC4F0A2A0EA4371E) /* 269 */, - W64LIT(0xE83E1DA85CB38429) /* 270 */, W64LIT(0xDC8FF882BA1B1CE2) /* 271 */, - W64LIT(0xCD45505E8353E80D) /* 272 */, W64LIT(0x18D19A00D4DB0717) /* 273 */, - W64LIT(0x34A0CFEDA5F38101) /* 274 */, W64LIT(0x0BE77E518887CAF2) /* 275 */, - W64LIT(0x1E341438B3C45136) /* 276 */, W64LIT(0xE05797F49089CCF9) /* 277 */, - W64LIT(0xFFD23F9DF2591D14) /* 278 */, W64LIT(0x543DDA228595C5CD) /* 279 */, - W64LIT(0x661F81FD99052A33) /* 280 */, W64LIT(0x8736E641DB0F7B76) /* 281 */, - W64LIT(0x15227725418E5307) /* 282 */, W64LIT(0xE25F7F46162EB2FA) /* 283 */, - W64LIT(0x48A8B2126C13D9FE) /* 284 */, W64LIT(0xAFDC541792E76EEA) /* 285 */, - W64LIT(0x03D912BFC6D1898F) /* 286 */, W64LIT(0x31B1AAFA1B83F51B) /* 287 */, - W64LIT(0xF1AC2796E42AB7D9) /* 288 */, W64LIT(0x40A3A7D7FCD2EBAC) /* 289 */, - W64LIT(0x1056136D0AFBBCC5) /* 290 */, W64LIT(0x7889E1DD9A6D0C85) /* 291 */, - W64LIT(0xD33525782A7974AA) /* 292 */, W64LIT(0xA7E25D09078AC09B) /* 293 */, - W64LIT(0xBD4138B3EAC6EDD0) /* 294 */, W64LIT(0x920ABFBE71EB9E70) /* 295 */, - W64LIT(0xA2A5D0F54FC2625C) /* 296 */, W64LIT(0xC054E36B0B1290A3) /* 297 */, - W64LIT(0xF6DD59FF62FE932B) /* 298 */, W64LIT(0x3537354511A8AC7D) /* 299 */, - W64LIT(0xCA845E9172FADCD4) /* 300 */, W64LIT(0x84F82B60329D20DC) /* 301 */, - W64LIT(0x79C62CE1CD672F18) /* 302 */, W64LIT(0x8B09A2ADD124642C) /* 303 */, - W64LIT(0xD0C1E96A19D9E726) /* 304 */, W64LIT(0x5A786A9B4BA9500C) /* 305 */, - W64LIT(0x0E020336634C43F3) /* 306 */, W64LIT(0xC17B474AEB66D822) /* 307 */, - W64LIT(0x6A731AE3EC9BAAC2) /* 308 */, W64LIT(0x8226667AE0840258) /* 309 */, - W64LIT(0x67D4567691CAECA5) /* 310 */, W64LIT(0x1D94155C4875ADB5) /* 311 */, - W64LIT(0x6D00FD985B813FDF) /* 312 */, W64LIT(0x51286EFCB774CD06) /* 313 */, - W64LIT(0x5E8834471FA744AF) /* 314 */, W64LIT(0xF72CA0AEE761AE2E) /* 315 */, - W64LIT(0xBE40E4CDAEE8E09A) /* 316 */, W64LIT(0xE9970BBB5118F665) /* 317 */, - W64LIT(0x726E4BEB33DF1964) /* 318 */, W64LIT(0x703B000729199762) /* 319 */, - W64LIT(0x4631D816F5EF30A7) /* 320 */, W64LIT(0xB880B5B51504A6BE) /* 321 */, - W64LIT(0x641793C37ED84B6C) /* 322 */, W64LIT(0x7B21ED77F6E97D96) /* 323 */, - W64LIT(0x776306312EF96B73) /* 324 */, W64LIT(0xAE528948E86FF3F4) /* 325 */, - W64LIT(0x53DBD7F286A3F8F8) /* 326 */, W64LIT(0x16CADCE74CFC1063) /* 327 */, - W64LIT(0x005C19BDFA52C6DD) /* 328 */, W64LIT(0x68868F5D64D46AD3) /* 329 */, - W64LIT(0x3A9D512CCF1E186A) /* 330 */, W64LIT(0x367E62C2385660AE) /* 331 */, - W64LIT(0xE359E7EA77DCB1D7) /* 332 */, W64LIT(0x526C0773749ABE6E) /* 333 */, - W64LIT(0x735AE5F9D09F734B) /* 334 */, W64LIT(0x493FC7CC8A558BA8) /* 335 */, - W64LIT(0xB0B9C1533041AB45) /* 336 */, W64LIT(0x321958BA470A59BD) /* 337 */, - W64LIT(0x852DB00B5F46C393) /* 338 */, W64LIT(0x91209B2BD336B0E5) /* 339 */, - W64LIT(0x6E604F7D659EF19F) /* 340 */, W64LIT(0xB99A8AE2782CCB24) /* 341 */, - W64LIT(0xCCF52AB6C814C4C7) /* 342 */, W64LIT(0x4727D9AFBE11727B) /* 343 */, - W64LIT(0x7E950D0C0121B34D) /* 344 */, W64LIT(0x756F435670AD471F) /* 345 */, - W64LIT(0xF5ADD442615A6849) /* 346 */, W64LIT(0x4E87E09980B9957A) /* 347 */, - W64LIT(0x2ACFA1DF50AEE355) /* 348 */, W64LIT(0xD898263AFD2FD556) /* 349 */, - W64LIT(0xC8F4924DD80C8FD6) /* 350 */, W64LIT(0xCF99CA3D754A173A) /* 351 */, - W64LIT(0xFE477BACAF91BF3C) /* 352 */, W64LIT(0xED5371F6D690C12D) /* 353 */, - W64LIT(0x831A5C285E687094) /* 354 */, W64LIT(0xC5D3C90A3708A0A4) /* 355 */, - W64LIT(0x0F7F903717D06580) /* 356 */, W64LIT(0x19F9BB13B8FDF27F) /* 357 */, - W64LIT(0xB1BD6F1B4D502843) /* 358 */, W64LIT(0x1C761BA38FFF4012) /* 359 */, - W64LIT(0x0D1530C4E2E21F3B) /* 360 */, W64LIT(0x8943CE69A7372C8A) /* 361 */, - W64LIT(0xE5184E11FEB5CE66) /* 362 */, W64LIT(0x618BDB80BD736621) /* 363 */, - W64LIT(0x7D29BAD68B574D0B) /* 364 */, W64LIT(0x81BB613E25E6FE5B) /* 365 */, - W64LIT(0x071C9C10BC07913F) /* 366 */, W64LIT(0xC7BEEB7909AC2D97) /* 367 */, - W64LIT(0xC3E58D353BC5D757) /* 368 */, W64LIT(0xEB017892F38F61E8) /* 369 */, - W64LIT(0xD4EFFB9C9B1CC21A) /* 370 */, W64LIT(0x99727D26F494F7AB) /* 371 */, - W64LIT(0xA3E063A2956B3E03) /* 372 */, W64LIT(0x9D4A8B9A4AA09C30) /* 373 */, - W64LIT(0x3F6AB7D500090FB4) /* 374 */, W64LIT(0x9CC0F2A057268AC0) /* 375 */, - W64LIT(0x3DEE9D2DEDBF42D1) /* 376 */, W64LIT(0x330F49C87960A972) /* 377 */, - W64LIT(0xC6B2720287421B41) /* 378 */, W64LIT(0x0AC59EC07C00369C) /* 379 */, - W64LIT(0xEF4EAC49CB353425) /* 380 */, W64LIT(0xF450244EEF0129D8) /* 381 */, - W64LIT(0x8ACC46E5CAF4DEB6) /* 382 */, W64LIT(0x2FFEAB63989263F7) /* 383 */, - W64LIT(0x8F7CB9FE5D7A4578) /* 384 */, W64LIT(0x5BD8F7644E634635) /* 385 */, - W64LIT(0x427A7315BF2DC900) /* 386 */, W64LIT(0x17D0C4AA2125261C) /* 387 */, - W64LIT(0x3992486C93518E50) /* 388 */, W64LIT(0xB4CBFEE0A2D7D4C3) /* 389 */, - W64LIT(0x7C75D6202C5DDD8D) /* 390 */, W64LIT(0xDBC295D8E35B6C61) /* 391 */, - W64LIT(0x60B369D302032B19) /* 392 */, W64LIT(0xCE42685FDCE44132) /* 393 */, - W64LIT(0x06F3DDB9DDF65610) /* 394 */, W64LIT(0x8EA4D21DB5E148F0) /* 395 */, - W64LIT(0x20B0FCE62FCD496F) /* 396 */, W64LIT(0x2C1B912358B0EE31) /* 397 */, - W64LIT(0xB28317B818F5A308) /* 398 */, W64LIT(0xA89C1E189CA6D2CF) /* 399 */, - W64LIT(0x0C6B18576AAADBC8) /* 400 */, W64LIT(0xB65DEAA91299FAE3) /* 401 */, - W64LIT(0xFB2B794B7F1027E7) /* 402 */, W64LIT(0x04E4317F443B5BEB) /* 403 */, - W64LIT(0x4B852D325939D0A6) /* 404 */, W64LIT(0xD5AE6BEEFB207FFC) /* 405 */, - W64LIT(0x309682B281C7D374) /* 406 */, W64LIT(0xBAE309A194C3B475) /* 407 */, - W64LIT(0x8CC3F97B13B49F05) /* 408 */, W64LIT(0x98A9422FF8293967) /* 409 */, - W64LIT(0x244B16B01076FF7C) /* 410 */, W64LIT(0xF8BF571C663D67EE) /* 411 */, - W64LIT(0x1F0D6758EEE30DA1) /* 412 */, W64LIT(0xC9B611D97ADEB9B7) /* 413 */, - W64LIT(0xB7AFD5887B6C57A2) /* 414 */, W64LIT(0x6290AE846B984FE1) /* 415 */, - W64LIT(0x94DF4CDEACC1A5FD) /* 416 */, W64LIT(0x058A5BD1C5483AFF) /* 417 */, - W64LIT(0x63166CC142BA3C37) /* 418 */, W64LIT(0x8DB8526EB2F76F40) /* 419 */, - W64LIT(0xE10880036F0D6D4E) /* 420 */, W64LIT(0x9E0523C9971D311D) /* 421 */, - W64LIT(0x45EC2824CC7CD691) /* 422 */, W64LIT(0x575B8359E62382C9) /* 423 */, - W64LIT(0xFA9E400DC4889995) /* 424 */, W64LIT(0xD1823ECB45721568) /* 425 */, - W64LIT(0xDAFD983B8206082F) /* 426 */, W64LIT(0xAA7D29082386A8CB) /* 427 */, - W64LIT(0x269FCD4403B87588) /* 428 */, W64LIT(0x1B91F5F728BDD1E0) /* 429 */, - W64LIT(0xE4669F39040201F6) /* 430 */, W64LIT(0x7A1D7C218CF04ADE) /* 431 */, - W64LIT(0x65623C29D79CE5CE) /* 432 */, W64LIT(0x2368449096C00BB1) /* 433 */, - W64LIT(0xAB9BF1879DA503BA) /* 434 */, W64LIT(0xBC23ECB1A458058E) /* 435 */, - W64LIT(0x9A58DF01BB401ECC) /* 436 */, W64LIT(0xA070E868A85F143D) /* 437 */, - W64LIT(0x4FF188307DF2239E) /* 438 */, W64LIT(0x14D565B41A641183) /* 439 */, - W64LIT(0xEE13337452701602) /* 440 */, W64LIT(0x950E3DCF3F285E09) /* 441 */, - W64LIT(0x59930254B9C80953) /* 442 */, W64LIT(0x3BF299408930DA6D) /* 443 */, - W64LIT(0xA955943F53691387) /* 444 */, W64LIT(0xA15EDECAA9CB8784) /* 445 */, - W64LIT(0x29142127352BE9A0) /* 446 */, W64LIT(0x76F0371FFF4E7AFB) /* 447 */, - W64LIT(0x0239F450274F2228) /* 448 */, W64LIT(0xBB073AF01D5E868B) /* 449 */, - W64LIT(0xBFC80571C10E96C1) /* 450 */, W64LIT(0xD267088568222E23) /* 451 */, - W64LIT(0x9671A3D48E80B5B0) /* 452 */, W64LIT(0x55B5D38AE193BB81) /* 453 */, - W64LIT(0x693AE2D0A18B04B8) /* 454 */, W64LIT(0x5C48B4ECADD5335F) /* 455 */, - W64LIT(0xFD743B194916A1CA) /* 456 */, W64LIT(0x2577018134BE98C4) /* 457 */, - W64LIT(0xE77987E83C54A4AD) /* 458 */, W64LIT(0x28E11014DA33E1B9) /* 459 */, - W64LIT(0x270CC59E226AA213) /* 460 */, W64LIT(0x71495F756D1A5F60) /* 461 */, - W64LIT(0x9BE853FB60AFEF77) /* 462 */, W64LIT(0xADC786A7F7443DBF) /* 463 */, - W64LIT(0x0904456173B29A82) /* 464 */, W64LIT(0x58BC7A66C232BD5E) /* 465 */, - W64LIT(0xF306558C673AC8B2) /* 466 */, W64LIT(0x41F639C6B6C9772A) /* 467 */, - W64LIT(0x216DEFE99FDA35DA) /* 468 */, W64LIT(0x11640CC71C7BE615) /* 469 */, - W64LIT(0x93C43694565C5527) /* 470 */, W64LIT(0xEA038E6246777839) /* 471 */, - W64LIT(0xF9ABF3CE5A3E2469) /* 472 */, W64LIT(0x741E768D0FD312D2) /* 473 */, - W64LIT(0x0144B883CED652C6) /* 474 */, W64LIT(0xC20B5A5BA33F8552) /* 475 */, - W64LIT(0x1AE69633C3435A9D) /* 476 */, W64LIT(0x97A28CA4088CFDEC) /* 477 */, - W64LIT(0x8824A43C1E96F420) /* 478 */, W64LIT(0x37612FA66EEEA746) /* 479 */, - W64LIT(0x6B4CB165F9CF0E5A) /* 480 */, W64LIT(0x43AA1C06A0ABFB4A) /* 481 */, - W64LIT(0x7F4DC26FF162796B) /* 482 */, W64LIT(0x6CBACC8E54ED9B0F) /* 483 */, - W64LIT(0xA6B7FFEFD2BB253E) /* 484 */, W64LIT(0x2E25BC95B0A29D4F) /* 485 */, - W64LIT(0x86D6A58BDEF1388C) /* 486 */, W64LIT(0xDED74AC576B6F054) /* 487 */, - W64LIT(0x8030BDBC2B45805D) /* 488 */, W64LIT(0x3C81AF70E94D9289) /* 489 */, - W64LIT(0x3EFF6DDA9E3100DB) /* 490 */, W64LIT(0xB38DC39FDFCC8847) /* 491 */, - W64LIT(0x123885528D17B87E) /* 492 */, W64LIT(0xF2DA0ED240B1B642) /* 493 */, - W64LIT(0x44CEFADCD54BF9A9) /* 494 */, W64LIT(0x1312200E433C7EE6) /* 495 */, - W64LIT(0x9FFCC84F3A78C748) /* 496 */, W64LIT(0xF0CD1F72248576BB) /* 497 */, - W64LIT(0xEC6974053638CFE4) /* 498 */, W64LIT(0x2BA7B67C0CEC4E4C) /* 499 */, - W64LIT(0xAC2F4DF3E5CE32ED) /* 500 */, W64LIT(0xCB33D14326EA4C11) /* 501 */, - W64LIT(0xA4E9044CC77E58BC) /* 502 */, W64LIT(0x5F513293D934FCEF) /* 503 */, - W64LIT(0x5DC9645506E55444) /* 504 */, W64LIT(0x50DE418F317DE40A) /* 505 */, - W64LIT(0x388CB31A69DDE259) /* 506 */, W64LIT(0x2DB4A83455820A86) /* 507 */, - W64LIT(0x9010A91E84711AE9) /* 508 */, W64LIT(0x4DF7F0B7B1498371) /* 509 */, - W64LIT(0xD62A2EABC0977179) /* 510 */, W64LIT(0x22FAC097AA8D5C0E) /* 511 */, - W64LIT(0xF49FCC2FF1DAF39B) /* 512 */, W64LIT(0x487FD5C66FF29281) /* 513 */, - W64LIT(0xE8A30667FCDCA83F) /* 514 */, W64LIT(0x2C9B4BE3D2FCCE63) /* 515 */, - W64LIT(0xDA3FF74B93FBBBC2) /* 516 */, W64LIT(0x2FA165D2FE70BA66) /* 517 */, - W64LIT(0xA103E279970E93D4) /* 518 */, W64LIT(0xBECDEC77B0E45E71) /* 519 */, - W64LIT(0xCFB41E723985E497) /* 520 */, W64LIT(0xB70AAA025EF75017) /* 521 */, - W64LIT(0xD42309F03840B8E0) /* 522 */, W64LIT(0x8EFC1AD035898579) /* 523 */, - W64LIT(0x96C6920BE2B2ABC5) /* 524 */, W64LIT(0x66AF4163375A9172) /* 525 */, - W64LIT(0x2174ABDCCA7127FB) /* 526 */, W64LIT(0xB33CCEA64A72FF41) /* 527 */, - W64LIT(0xF04A4933083066A5) /* 528 */, W64LIT(0x8D970ACDD7289AF5) /* 529 */, - W64LIT(0x8F96E8E031C8C25E) /* 530 */, W64LIT(0xF3FEC02276875D47) /* 531 */, - W64LIT(0xEC7BF310056190DD) /* 532 */, W64LIT(0xF5ADB0AEBB0F1491) /* 533 */, - W64LIT(0x9B50F8850FD58892) /* 534 */, W64LIT(0x4975488358B74DE8) /* 535 */, - W64LIT(0xA3354FF691531C61) /* 536 */, W64LIT(0x0702BBE481D2C6EE) /* 537 */, - W64LIT(0x89FB24057DEDED98) /* 538 */, W64LIT(0xAC3075138596E902) /* 539 */, - W64LIT(0x1D2D3580172772ED) /* 540 */, W64LIT(0xEB738FC28E6BC30D) /* 541 */, - W64LIT(0x5854EF8F63044326) /* 542 */, W64LIT(0x9E5C52325ADD3BBE) /* 543 */, - W64LIT(0x90AA53CF325C4623) /* 544 */, W64LIT(0xC1D24D51349DD067) /* 545 */, - W64LIT(0x2051CFEEA69EA624) /* 546 */, W64LIT(0x13220F0A862E7E4F) /* 547 */, - W64LIT(0xCE39399404E04864) /* 548 */, W64LIT(0xD9C42CA47086FCB7) /* 549 */, - W64LIT(0x685AD2238A03E7CC) /* 550 */, W64LIT(0x066484B2AB2FF1DB) /* 551 */, - W64LIT(0xFE9D5D70EFBF79EC) /* 552 */, W64LIT(0x5B13B9DD9C481854) /* 553 */, - W64LIT(0x15F0D475ED1509AD) /* 554 */, W64LIT(0x0BEBCD060EC79851) /* 555 */, - W64LIT(0xD58C6791183AB7F8) /* 556 */, W64LIT(0xD1187C5052F3EEE4) /* 557 */, - W64LIT(0xC95D1192E54E82FF) /* 558 */, W64LIT(0x86EEA14CB9AC6CA2) /* 559 */, - W64LIT(0x3485BEB153677D5D) /* 560 */, W64LIT(0xDD191D781F8C492A) /* 561 */, - W64LIT(0xF60866BAA784EBF9) /* 562 */, W64LIT(0x518F643BA2D08C74) /* 563 */, - W64LIT(0x8852E956E1087C22) /* 564 */, W64LIT(0xA768CB8DC410AE8D) /* 565 */, - W64LIT(0x38047726BFEC8E1A) /* 566 */, W64LIT(0xA67738B4CD3B45AA) /* 567 */, - W64LIT(0xAD16691CEC0DDE19) /* 568 */, W64LIT(0xC6D4319380462E07) /* 569 */, - W64LIT(0xC5A5876D0BA61938) /* 570 */, W64LIT(0x16B9FA1FA58FD840) /* 571 */, - W64LIT(0x188AB1173CA74F18) /* 572 */, W64LIT(0xABDA2F98C99C021F) /* 573 */, - W64LIT(0x3E0580AB134AE816) /* 574 */, W64LIT(0x5F3B05B773645ABB) /* 575 */, - W64LIT(0x2501A2BE5575F2F6) /* 576 */, W64LIT(0x1B2F74004E7E8BA9) /* 577 */, - W64LIT(0x1CD7580371E8D953) /* 578 */, W64LIT(0x7F6ED89562764E30) /* 579 */, - W64LIT(0xB15926FF596F003D) /* 580 */, W64LIT(0x9F65293DA8C5D6B9) /* 581 */, - W64LIT(0x6ECEF04DD690F84C) /* 582 */, W64LIT(0x4782275FFF33AF88) /* 583 */, - W64LIT(0xE41433083F820801) /* 584 */, W64LIT(0xFD0DFE409A1AF9B5) /* 585 */, - W64LIT(0x4325A3342CDB396B) /* 586 */, W64LIT(0x8AE77E62B301B252) /* 587 */, - W64LIT(0xC36F9E9F6655615A) /* 588 */, W64LIT(0x85455A2D92D32C09) /* 589 */, - W64LIT(0xF2C7DEA949477485) /* 590 */, W64LIT(0x63CFB4C133A39EBA) /* 591 */, - W64LIT(0x83B040CC6EBC5462) /* 592 */, W64LIT(0x3B9454C8FDB326B0) /* 593 */, - W64LIT(0x56F56A9E87FFD78C) /* 594 */, W64LIT(0x2DC2940D99F42BC6) /* 595 */, - W64LIT(0x98F7DF096B096E2D) /* 596 */, W64LIT(0x19A6E01E3AD852BF) /* 597 */, - W64LIT(0x42A99CCBDBD4B40B) /* 598 */, W64LIT(0xA59998AF45E9C559) /* 599 */, - W64LIT(0x366295E807D93186) /* 600 */, W64LIT(0x6B48181BFAA1F773) /* 601 */, - W64LIT(0x1FEC57E2157A0A1D) /* 602 */, W64LIT(0x4667446AF6201AD5) /* 603 */, - W64LIT(0xE615EBCACFB0F075) /* 604 */, W64LIT(0xB8F31F4F68290778) /* 605 */, - W64LIT(0x22713ED6CE22D11E) /* 606 */, W64LIT(0x3057C1A72EC3C93B) /* 607 */, - W64LIT(0xCB46ACC37C3F1F2F) /* 608 */, W64LIT(0xDBB893FD02AAF50E) /* 609 */, - W64LIT(0x331FD92E600B9FCF) /* 610 */, W64LIT(0xA498F96148EA3AD6) /* 611 */, - W64LIT(0xA8D8426E8B6A83EA) /* 612 */, W64LIT(0xA089B274B7735CDC) /* 613 */, - W64LIT(0x87F6B3731E524A11) /* 614 */, W64LIT(0x118808E5CBC96749) /* 615 */, - W64LIT(0x9906E4C7B19BD394) /* 616 */, W64LIT(0xAFED7F7E9B24A20C) /* 617 */, - W64LIT(0x6509EADEEB3644A7) /* 618 */, W64LIT(0x6C1EF1D3E8EF0EDE) /* 619 */, - W64LIT(0xB9C97D43E9798FB4) /* 620 */, W64LIT(0xA2F2D784740C28A3) /* 621 */, - W64LIT(0x7B8496476197566F) /* 622 */, W64LIT(0x7A5BE3E6B65F069D) /* 623 */, - W64LIT(0xF96330ED78BE6F10) /* 624 */, W64LIT(0xEEE60DE77A076A15) /* 625 */, - W64LIT(0x2B4BEE4AA08B9BD0) /* 626 */, W64LIT(0x6A56A63EC7B8894E) /* 627 */, - W64LIT(0x02121359BA34FEF4) /* 628 */, W64LIT(0x4CBF99F8283703FC) /* 629 */, - W64LIT(0x398071350CAF30C8) /* 630 */, W64LIT(0xD0A77A89F017687A) /* 631 */, - W64LIT(0xF1C1A9EB9E423569) /* 632 */, W64LIT(0x8C7976282DEE8199) /* 633 */, - W64LIT(0x5D1737A5DD1F7ABD) /* 634 */, W64LIT(0x4F53433C09A9FA80) /* 635 */, - W64LIT(0xFA8B0C53DF7CA1D9) /* 636 */, W64LIT(0x3FD9DCBC886CCB77) /* 637 */, - W64LIT(0xC040917CA91B4720) /* 638 */, W64LIT(0x7DD00142F9D1DCDF) /* 639 */, - W64LIT(0x8476FC1D4F387B58) /* 640 */, W64LIT(0x23F8E7C5F3316503) /* 641 */, - W64LIT(0x032A2244E7E37339) /* 642 */, W64LIT(0x5C87A5D750F5A74B) /* 643 */, - W64LIT(0x082B4CC43698992E) /* 644 */, W64LIT(0xDF917BECB858F63C) /* 645 */, - W64LIT(0x3270B8FC5BF86DDA) /* 646 */, W64LIT(0x10AE72BB29B5DD76) /* 647 */, - W64LIT(0x576AC94E7700362B) /* 648 */, W64LIT(0x1AD112DAC61EFB8F) /* 649 */, - W64LIT(0x691BC30EC5FAA427) /* 650 */, W64LIT(0xFF246311CC327143) /* 651 */, - W64LIT(0x3142368E30E53206) /* 652 */, W64LIT(0x71380E31E02CA396) /* 653 */, - W64LIT(0x958D5C960AAD76F1) /* 654 */, W64LIT(0xF8D6F430C16DA536) /* 655 */, - W64LIT(0xC8FFD13F1BE7E1D2) /* 656 */, W64LIT(0x7578AE66004DDBE1) /* 657 */, - W64LIT(0x05833F01067BE646) /* 658 */, W64LIT(0xBB34B5AD3BFE586D) /* 659 */, - W64LIT(0x095F34C9A12B97F0) /* 660 */, W64LIT(0x247AB64525D60CA8) /* 661 */, - W64LIT(0xDCDBC6F3017477D1) /* 662 */, W64LIT(0x4A2E14D4DECAD24D) /* 663 */, - W64LIT(0xBDB5E6D9BE0A1EEB) /* 664 */, W64LIT(0x2A7E70F7794301AB) /* 665 */, - W64LIT(0xDEF42D8A270540FD) /* 666 */, W64LIT(0x01078EC0A34C22C1) /* 667 */, - W64LIT(0xE5DE511AF4C16387) /* 668 */, W64LIT(0x7EBB3A52BD9A330A) /* 669 */, - W64LIT(0x77697857AA7D6435) /* 670 */, W64LIT(0x004E831603AE4C32) /* 671 */, - W64LIT(0xE7A21020AD78E312) /* 672 */, W64LIT(0x9D41A70C6AB420F2) /* 673 */, - W64LIT(0x28E06C18EA1141E6) /* 674 */, W64LIT(0xD2B28CBD984F6B28) /* 675 */, - W64LIT(0x26B75F6C446E9D83) /* 676 */, W64LIT(0xBA47568C4D418D7F) /* 677 */, - W64LIT(0xD80BADBFE6183D8E) /* 678 */, W64LIT(0x0E206D7F5F166044) /* 679 */, - W64LIT(0xE258A43911CBCA3E) /* 680 */, W64LIT(0x723A1746B21DC0BC) /* 681 */, - W64LIT(0xC7CAA854F5D7CDD3) /* 682 */, W64LIT(0x7CAC32883D261D9C) /* 683 */, - W64LIT(0x7690C26423BA942C) /* 684 */, W64LIT(0x17E55524478042B8) /* 685 */, - W64LIT(0xE0BE477656A2389F) /* 686 */, W64LIT(0x4D289B5E67AB2DA0) /* 687 */, - W64LIT(0x44862B9C8FBBFD31) /* 688 */, W64LIT(0xB47CC8049D141365) /* 689 */, - W64LIT(0x822C1B362B91C793) /* 690 */, W64LIT(0x4EB14655FB13DFD8) /* 691 */, - W64LIT(0x1ECBBA0714E2A97B) /* 692 */, W64LIT(0x6143459D5CDE5F14) /* 693 */, - W64LIT(0x53A8FBF1D5F0AC89) /* 694 */, W64LIT(0x97EA04D81C5E5B00) /* 695 */, - W64LIT(0x622181A8D4FDB3F3) /* 696 */, W64LIT(0xE9BCD341572A1208) /* 697 */, - W64LIT(0x1411258643CCE58A) /* 698 */, W64LIT(0x9144C5FEA4C6E0A4) /* 699 */, - W64LIT(0x0D33D06565CF620F) /* 700 */, W64LIT(0x54A48D489F219CA1) /* 701 */, - W64LIT(0xC43E5EAC6D63C821) /* 702 */, W64LIT(0xA9728B3A72770DAF) /* 703 */, - W64LIT(0xD7934E7B20DF87EF) /* 704 */, W64LIT(0xE35503B61A3E86E5) /* 705 */, - W64LIT(0xCAE321FBC819D504) /* 706 */, W64LIT(0x129A50B3AC60BFA6) /* 707 */, - W64LIT(0xCD5E68EA7E9FB6C3) /* 708 */, W64LIT(0xB01C90199483B1C7) /* 709 */, - W64LIT(0x3DE93CD5C295376C) /* 710 */, W64LIT(0xAED52EDF2AB9AD13) /* 711 */, - W64LIT(0x2E60F512C0A07884) /* 712 */, W64LIT(0xBC3D86A3E36210C9) /* 713 */, - W64LIT(0x35269D9B163951CE) /* 714 */, W64LIT(0x0C7D6E2AD0CDB5FA) /* 715 */, - W64LIT(0x59E86297D87F5733) /* 716 */, W64LIT(0x298EF221898DB0E7) /* 717 */, - W64LIT(0x55000029D1A5AA7E) /* 718 */, W64LIT(0x8BC08AE1B5061B45) /* 719 */, - W64LIT(0xC2C31C2B6C92703A) /* 720 */, W64LIT(0x94CC596BAF25EF42) /* 721 */, - W64LIT(0x0A1D73DB22540456) /* 722 */, W64LIT(0x04B6A0F9D9C4179A) /* 723 */, - W64LIT(0xEFFDAFA2AE3D3C60) /* 724 */, W64LIT(0xF7C8075BB49496C4) /* 725 */, - W64LIT(0x9CC5C7141D1CD4E3) /* 726 */, W64LIT(0x78BD1638218E5534) /* 727 */, - W64LIT(0xB2F11568F850246A) /* 728 */, W64LIT(0xEDFABCFA9502BC29) /* 729 */, - W64LIT(0x796CE5F2DA23051B) /* 730 */, W64LIT(0xAAE128B0DC93537C) /* 731 */, - W64LIT(0x3A493DA0EE4B29AE) /* 732 */, W64LIT(0xB5DF6B2C416895D7) /* 733 */, - W64LIT(0xFCABBD25122D7F37) /* 734 */, W64LIT(0x70810B58105DC4B1) /* 735 */, - W64LIT(0xE10FDD37F7882A90) /* 736 */, W64LIT(0x524DCAB5518A3F5C) /* 737 */, - W64LIT(0x3C9E85878451255B) /* 738 */, W64LIT(0x4029828119BD34E2) /* 739 */, - W64LIT(0x74A05B6F5D3CECCB) /* 740 */, W64LIT(0xB610021542E13ECA) /* 741 */, - W64LIT(0x0FF979D12F59E2AC) /* 742 */, W64LIT(0x6037DA27E4F9CC50) /* 743 */, - W64LIT(0x5E92975A0DF1847D) /* 744 */, W64LIT(0xD66DE190D3E623FE) /* 745 */, - W64LIT(0x5032D6B87B568048) /* 746 */, W64LIT(0x9A36B7CE8235216E) /* 747 */, - W64LIT(0x80272A7A24F64B4A) /* 748 */, W64LIT(0x93EFED8B8C6916F7) /* 749 */, - W64LIT(0x37DDBFF44CCE1555) /* 750 */, W64LIT(0x4B95DB5D4B99BD25) /* 751 */, - W64LIT(0x92D3FDA169812FC0) /* 752 */, W64LIT(0xFB1A4A9A90660BB6) /* 753 */, - W64LIT(0x730C196946A4B9B2) /* 754 */, W64LIT(0x81E289AA7F49DA68) /* 755 */, - W64LIT(0x64669A0F83B1A05F) /* 756 */, W64LIT(0x27B3FF7D9644F48B) /* 757 */, - W64LIT(0xCC6B615C8DB675B3) /* 758 */, W64LIT(0x674F20B9BCEBBE95) /* 759 */, - W64LIT(0x6F31238275655982) /* 760 */, W64LIT(0x5AE488713E45CF05) /* 761 */, - W64LIT(0xBF619F9954C21157) /* 762 */, W64LIT(0xEABAC46040A8EAE9) /* 763 */, - W64LIT(0x454C6FE9F2C0C1CD) /* 764 */, W64LIT(0x419CF6496412691C) /* 765 */, - W64LIT(0xD3DC3BEF265B0F70) /* 766 */, W64LIT(0x6D0E60F5C3578A9E) /* 767 */, - W64LIT(0x5B0E608526323C55) /* 768 */, W64LIT(0x1A46C1A9FA1B59F5) /* 769 */, - W64LIT(0xA9E245A17C4C8FFA) /* 770 */, W64LIT(0x65CA5159DB2955D7) /* 771 */, - W64LIT(0x05DB0A76CE35AFC2) /* 772 */, W64LIT(0x81EAC77EA9113D45) /* 773 */, - W64LIT(0x528EF88AB6AC0A0D) /* 774 */, W64LIT(0xA09EA253597BE3FF) /* 775 */, - W64LIT(0x430DDFB3AC48CD56) /* 776 */, W64LIT(0xC4B3A67AF45CE46F) /* 777 */, - W64LIT(0x4ECECFD8FBE2D05E) /* 778 */, W64LIT(0x3EF56F10B39935F0) /* 779 */, - W64LIT(0x0B22D6829CD619C6) /* 780 */, W64LIT(0x17FD460A74DF2069) /* 781 */, - W64LIT(0x6CF8CC8E8510ED40) /* 782 */, W64LIT(0xD6C824BF3A6ECAA7) /* 783 */, - W64LIT(0x61243D581A817049) /* 784 */, W64LIT(0x048BACB6BBC163A2) /* 785 */, - W64LIT(0xD9A38AC27D44CC32) /* 786 */, W64LIT(0x7FDDFF5BAAF410AB) /* 787 */, - W64LIT(0xAD6D495AA804824B) /* 788 */, W64LIT(0xE1A6A74F2D8C9F94) /* 789 */, - W64LIT(0xD4F7851235DEE8E3) /* 790 */, W64LIT(0xFD4B7F886540D893) /* 791 */, - W64LIT(0x247C20042AA4BFDA) /* 792 */, W64LIT(0x096EA1C517D1327C) /* 793 */, - W64LIT(0xD56966B4361A6685) /* 794 */, W64LIT(0x277DA5C31221057D) /* 795 */, - W64LIT(0x94D59893A43ACFF7) /* 796 */, W64LIT(0x64F0C51CCDC02281) /* 797 */, - W64LIT(0x3D33BCC4FF6189DB) /* 798 */, W64LIT(0xE005CB184CE66AF1) /* 799 */, - W64LIT(0xFF5CCD1D1DB99BEA) /* 800 */, W64LIT(0xB0B854A7FE42980F) /* 801 */, - W64LIT(0x7BD46A6A718D4B9F) /* 802 */, W64LIT(0xD10FA8CC22A5FD8C) /* 803 */, - W64LIT(0xD31484952BE4BD31) /* 804 */, W64LIT(0xC7FA975FCB243847) /* 805 */, - W64LIT(0x4886ED1E5846C407) /* 806 */, W64LIT(0x28CDDB791EB70B04) /* 807 */, - W64LIT(0xC2B00BE2F573417F) /* 808 */, W64LIT(0x5C9590452180F877) /* 809 */, - W64LIT(0x7A6BDDFFF370EB00) /* 810 */, W64LIT(0xCE509E38D6D9D6A4) /* 811 */, - W64LIT(0xEBEB0F00647FA702) /* 812 */, W64LIT(0x1DCC06CF76606F06) /* 813 */, - W64LIT(0xE4D9F28BA286FF0A) /* 814 */, W64LIT(0xD85A305DC918C262) /* 815 */, - W64LIT(0x475B1D8732225F54) /* 816 */, W64LIT(0x2D4FB51668CCB5FE) /* 817 */, - W64LIT(0xA679B9D9D72BBA20) /* 818 */, W64LIT(0x53841C0D912D43A5) /* 819 */, - W64LIT(0x3B7EAA48BF12A4E8) /* 820 */, W64LIT(0x781E0E47F22F1DDF) /* 821 */, - W64LIT(0xEFF20CE60AB50973) /* 822 */, W64LIT(0x20D261D19DFFB742) /* 823 */, - W64LIT(0x16A12B03062A2E39) /* 824 */, W64LIT(0x1960EB2239650495) /* 825 */, - W64LIT(0x251C16FED50EB8B8) /* 826 */, W64LIT(0x9AC0C330F826016E) /* 827 */, - W64LIT(0xED152665953E7671) /* 828 */, W64LIT(0x02D63194A6369570) /* 829 */, - W64LIT(0x5074F08394B1C987) /* 830 */, W64LIT(0x70BA598C90B25CE1) /* 831 */, - W64LIT(0x794A15810B9742F6) /* 832 */, W64LIT(0x0D5925E9FCAF8C6C) /* 833 */, - W64LIT(0x3067716CD868744E) /* 834 */, W64LIT(0x910AB077E8D7731B) /* 835 */, - W64LIT(0x6A61BBDB5AC42F61) /* 836 */, W64LIT(0x93513EFBF0851567) /* 837 */, - W64LIT(0xF494724B9E83E9D5) /* 838 */, W64LIT(0xE887E1985C09648D) /* 839 */, - W64LIT(0x34B1D3C675370CFD) /* 840 */, W64LIT(0xDC35E433BC0D255D) /* 841 */, - W64LIT(0xD0AAB84234131BE0) /* 842 */, W64LIT(0x08042A50B48B7EAF) /* 843 */, - W64LIT(0x9997C4EE44A3AB35) /* 844 */, W64LIT(0x829A7B49201799D0) /* 845 */, - W64LIT(0x263B8307B7C54441) /* 846 */, W64LIT(0x752F95F4FD6A6CA6) /* 847 */, - W64LIT(0x927217402C08C6E5) /* 848 */, W64LIT(0x2A8AB754A795D9EE) /* 849 */, - W64LIT(0xA442F7552F72943D) /* 850 */, W64LIT(0x2C31334E19781208) /* 851 */, - W64LIT(0x4FA98D7CEAEE6291) /* 852 */, W64LIT(0x55C3862F665DB309) /* 853 */, - W64LIT(0xBD0610175D53B1F3) /* 854 */, W64LIT(0x46FE6CB840413F27) /* 855 */, - W64LIT(0x3FE03792DF0CFA59) /* 856 */, W64LIT(0xCFE700372EB85E8F) /* 857 */, - W64LIT(0xA7BE29E7ADBCE118) /* 858 */, W64LIT(0xE544EE5CDE8431DD) /* 859 */, - W64LIT(0x8A781B1B41F1873E) /* 860 */, W64LIT(0xA5C94C78A0D2F0E7) /* 861 */, - W64LIT(0x39412E2877B60728) /* 862 */, W64LIT(0xA1265EF3AFC9A62C) /* 863 */, - W64LIT(0xBCC2770C6A2506C5) /* 864 */, W64LIT(0x3AB66DD5DCE1CE12) /* 865 */, - W64LIT(0xE65499D04A675B37) /* 866 */, W64LIT(0x7D8F523481BFD216) /* 867 */, - W64LIT(0x0F6F64FCEC15F389) /* 868 */, W64LIT(0x74EFBE618B5B13C8) /* 869 */, - W64LIT(0xACDC82B714273E1D) /* 870 */, W64LIT(0xDD40BFE003199D17) /* 871 */, - W64LIT(0x37E99257E7E061F8) /* 872 */, W64LIT(0xFA52626904775AAA) /* 873 */, - W64LIT(0x8BBBF63A463D56F9) /* 874 */, W64LIT(0xF0013F1543A26E64) /* 875 */, - W64LIT(0xA8307E9F879EC898) /* 876 */, W64LIT(0xCC4C27A4150177CC) /* 877 */, - W64LIT(0x1B432F2CCA1D3348) /* 878 */, W64LIT(0xDE1D1F8F9F6FA013) /* 879 */, - W64LIT(0x606602A047A7DDD6) /* 880 */, W64LIT(0xD237AB64CC1CB2C7) /* 881 */, - W64LIT(0x9B938E7225FCD1D3) /* 882 */, W64LIT(0xEC4E03708E0FF476) /* 883 */, - W64LIT(0xFEB2FBDA3D03C12D) /* 884 */, W64LIT(0xAE0BCED2EE43889A) /* 885 */, - W64LIT(0x22CB8923EBFB4F43) /* 886 */, W64LIT(0x69360D013CF7396D) /* 887 */, - W64LIT(0x855E3602D2D4E022) /* 888 */, W64LIT(0x073805BAD01F784C) /* 889 */, - W64LIT(0x33E17A133852F546) /* 890 */, W64LIT(0xDF4874058AC7B638) /* 891 */, - W64LIT(0xBA92B29C678AA14A) /* 892 */, W64LIT(0x0CE89FC76CFAADCD) /* 893 */, - W64LIT(0x5F9D4E0908339E34) /* 894 */, W64LIT(0xF1AFE9291F5923B9) /* 895 */, - W64LIT(0x6E3480F60F4A265F) /* 896 */, W64LIT(0xEEBF3A2AB29B841C) /* 897 */, - W64LIT(0xE21938A88F91B4AD) /* 898 */, W64LIT(0x57DFEFF845C6D3C3) /* 899 */, - W64LIT(0x2F006B0BF62CAAF2) /* 900 */, W64LIT(0x62F479EF6F75EE78) /* 901 */, - W64LIT(0x11A55AD41C8916A9) /* 902 */, W64LIT(0xF229D29084FED453) /* 903 */, - W64LIT(0x42F1C27B16B000E6) /* 904 */, W64LIT(0x2B1F76749823C074) /* 905 */, - W64LIT(0x4B76ECA3C2745360) /* 906 */, W64LIT(0x8C98F463B91691BD) /* 907 */, - W64LIT(0x14BCC93CF1ADE66A) /* 908 */, W64LIT(0x8885213E6D458397) /* 909 */, - W64LIT(0x8E177DF0274D4711) /* 910 */, W64LIT(0xB49B73B5503F2951) /* 911 */, - W64LIT(0x10168168C3F96B6B) /* 912 */, W64LIT(0x0E3D963B63CAB0AE) /* 913 */, - W64LIT(0x8DFC4B5655A1DB14) /* 914 */, W64LIT(0xF789F1356E14DE5C) /* 915 */, - W64LIT(0x683E68AF4E51DAC1) /* 916 */, W64LIT(0xC9A84F9D8D4B0FD9) /* 917 */, - W64LIT(0x3691E03F52A0F9D1) /* 918 */, W64LIT(0x5ED86E46E1878E80) /* 919 */, - W64LIT(0x3C711A0E99D07150) /* 920 */, W64LIT(0x5A0865B20C4E9310) /* 921 */, - W64LIT(0x56FBFC1FE4F0682E) /* 922 */, W64LIT(0xEA8D5DE3105EDF9B) /* 923 */, - W64LIT(0x71ABFDB12379187A) /* 924 */, W64LIT(0x2EB99DE1BEE77B9C) /* 925 */, - W64LIT(0x21ECC0EA33CF4523) /* 926 */, W64LIT(0x59A4D7521805C7A1) /* 927 */, - W64LIT(0x3896F5EB56AE7C72) /* 928 */, W64LIT(0xAA638F3DB18F75DC) /* 929 */, - W64LIT(0x9F39358DABE9808E) /* 930 */, W64LIT(0xB7DEFA91C00B72AC) /* 931 */, - W64LIT(0x6B5541FD62492D92) /* 932 */, W64LIT(0x6DC6DEE8F92E4D5B) /* 933 */, - W64LIT(0x353F57ABC4BEEA7E) /* 934 */, W64LIT(0x735769D6DA5690CE) /* 935 */, - W64LIT(0x0A234AA642391484) /* 936 */, W64LIT(0xF6F9508028F80D9D) /* 937 */, - W64LIT(0xB8E319A27AB3F215) /* 938 */, W64LIT(0x31AD9C1151341A4D) /* 939 */, - W64LIT(0x773C22A57BEF5805) /* 940 */, W64LIT(0x45C7561A07968633) /* 941 */, - W64LIT(0xF913DA9E249DBE36) /* 942 */, W64LIT(0xDA652D9B78A64C68) /* 943 */, - W64LIT(0x4C27A97F3BC334EF) /* 944 */, W64LIT(0x76621220E66B17F4) /* 945 */, - W64LIT(0x967743899ACD7D0B) /* 946 */, W64LIT(0xF3EE5BCAE0ED6782) /* 947 */, - W64LIT(0x409F753600C879FC) /* 948 */, W64LIT(0x06D09A39B5926DB6) /* 949 */, - W64LIT(0x6F83AEB0317AC588) /* 950 */, W64LIT(0x01E6CA4A86381F21) /* 951 */, - W64LIT(0x66FF3462D19F3025) /* 952 */, W64LIT(0x72207C24DDFD3BFB) /* 953 */, - W64LIT(0x4AF6B6D3E2ECE2EB) /* 954 */, W64LIT(0x9C994DBEC7EA08DE) /* 955 */, - W64LIT(0x49ACE597B09A8BC4) /* 956 */, W64LIT(0xB38C4766CF0797BA) /* 957 */, - W64LIT(0x131B9373C57C2A75) /* 958 */, W64LIT(0xB1822CCE61931E58) /* 959 */, - W64LIT(0x9D7555B909BA1C0C) /* 960 */, W64LIT(0x127FAFDD937D11D2) /* 961 */, - W64LIT(0x29DA3BADC66D92E4) /* 962 */, W64LIT(0xA2C1D57154C2ECBC) /* 963 */, - W64LIT(0x58C5134D82F6FE24) /* 964 */, W64LIT(0x1C3AE3515B62274F) /* 965 */, - W64LIT(0xE907C82E01CB8126) /* 966 */, W64LIT(0xF8ED091913E37FCB) /* 967 */, - W64LIT(0x3249D8F9C80046C9) /* 968 */, W64LIT(0x80CF9BEDE388FB63) /* 969 */, - W64LIT(0x1881539A116CF19E) /* 970 */, W64LIT(0x5103F3F76BD52457) /* 971 */, - W64LIT(0x15B7E6F5AE47F7A8) /* 972 */, W64LIT(0xDBD7C6DED47E9CCF) /* 973 */, - W64LIT(0x44E55C410228BB1A) /* 974 */, W64LIT(0xB647D4255EDB4E99) /* 975 */, - W64LIT(0x5D11882BB8AAFC30) /* 976 */, W64LIT(0xF5098BBB29D3212A) /* 977 */, - W64LIT(0x8FB5EA14E90296B3) /* 978 */, W64LIT(0x677B942157DD025A) /* 979 */, - W64LIT(0xFB58E7C0A390ACB5) /* 980 */, W64LIT(0x89D3674C83BD4A01) /* 981 */, - W64LIT(0x9E2DA4DF4BF3B93B) /* 982 */, W64LIT(0xFCC41E328CAB4829) /* 983 */, - W64LIT(0x03F38C96BA582C52) /* 984 */, W64LIT(0xCAD1BDBD7FD85DB2) /* 985 */, - W64LIT(0xBBB442C16082AE83) /* 986 */, W64LIT(0xB95FE86BA5DA9AB0) /* 987 */, - W64LIT(0xB22E04673771A93F) /* 988 */, W64LIT(0x845358C9493152D8) /* 989 */, - W64LIT(0xBE2A488697B4541E) /* 990 */, W64LIT(0x95A2DC2DD38E6966) /* 991 */, - W64LIT(0xC02C11AC923C852B) /* 992 */, W64LIT(0x2388B1990DF2A87B) /* 993 */, - W64LIT(0x7C8008FA1B4F37BE) /* 994 */, W64LIT(0x1F70D0C84D54E503) /* 995 */, - W64LIT(0x5490ADEC7ECE57D4) /* 996 */, W64LIT(0x002B3C27D9063A3A) /* 997 */, - W64LIT(0x7EAEA3848030A2BF) /* 998 */, W64LIT(0xC602326DED2003C0) /* 999 */, - W64LIT(0x83A7287D69A94086) /* 1000 */, W64LIT(0xC57A5FCB30F57A8A) /* 1001 */, - W64LIT(0xB56844E479EBE779) /* 1002 */, W64LIT(0xA373B40F05DCBCE9) /* 1003 */, - W64LIT(0xD71A786E88570EE2) /* 1004 */, W64LIT(0x879CBACDBDE8F6A0) /* 1005 */, - W64LIT(0x976AD1BCC164A32F) /* 1006 */, W64LIT(0xAB21E25E9666D78B) /* 1007 */, - W64LIT(0x901063AAE5E5C33C) /* 1008 */, W64LIT(0x9818B34448698D90) /* 1009 */, - W64LIT(0xE36487AE3E1E8ABB) /* 1010 */, W64LIT(0xAFBDF931893BDCB4) /* 1011 */, - W64LIT(0x6345A0DC5FBBD519) /* 1012 */, W64LIT(0x8628FE269B9465CA) /* 1013 */, - W64LIT(0x1E5D01603F9C51EC) /* 1014 */, W64LIT(0x4DE44006A15049B7) /* 1015 */, - W64LIT(0xBF6C70E5F776CBB1) /* 1016 */, W64LIT(0x411218F2EF552BED) /* 1017 */, - W64LIT(0xCB0C0708705A36A3) /* 1018 */, W64LIT(0xE74D14754F986044) /* 1019 */, - W64LIT(0xCD56D9430EA8280E) /* 1020 */, W64LIT(0xC12591D7535F5065) /* 1021 */, - W64LIT(0xC83223F1720AEF96) /* 1022 */, W64LIT(0xC3A0396F7363A51F) /* 1023 */, - W64LIT(0xffffffffffffffff), - W64LIT(0xA5A5A5A5A5A5A5A5), - W64LIT(0x0123456789ABCDEF), -}; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.cpp deleted file mode 100644 index 6d6b822c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// trdlocal.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS -#ifdef THREADS_AVAILABLE - -#include "trdlocal.h" - -#ifdef HAS_WINTHREADS -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -ThreadLocalStorage::Err::Err(const std::string& operation, int error) - : OS_Error(OTHER_ERROR, "ThreadLocalStorage: " + operation + " operation failed with error 0x" + IntToString(error, 16), operation, error) -{ -} - -ThreadLocalStorage::ThreadLocalStorage() -{ -#ifdef HAS_WINTHREADS - m_index = TlsAlloc(); - if (m_index == TLS_OUT_OF_INDEXES) - throw Err("TlsAlloc", GetLastError()); -#else - int error = pthread_key_create(&m_index, NULL); - if (error) - throw Err("pthread_key_create", error); -#endif -} - -ThreadLocalStorage::~ThreadLocalStorage() -{ -#ifdef HAS_WINTHREADS - if (!TlsFree(m_index)) - throw Err("TlsFree", GetLastError()); -#else - int error = pthread_key_delete(m_index); - if (error) - throw Err("pthread_key_delete", error); -#endif -} - -void ThreadLocalStorage::SetValue(void *value) -{ -#ifdef HAS_WINTHREADS - if (!TlsSetValue(m_index, value)) - throw Err("TlsSetValue", GetLastError()); -#else - int error = pthread_setspecific(m_index, value); - if (error) - throw Err("pthread_key_getspecific", error); -#endif -} - -void *ThreadLocalStorage::GetValue() const -{ -#ifdef HAS_WINTHREADS - void *result = TlsGetValue(m_index); - if (!result && GetLastError() != NO_ERROR) - throw Err("TlsGetValue", GetLastError()); -#else - void *result = pthread_getspecific(m_index); -#endif - return result; -} - -NAMESPACE_END - -#endif // #ifdef THREADS_AVAILABLE -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.h deleted file mode 100644 index 92d244a0..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/trdlocal.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef CRYPTOPP_TRDLOCAL_H -#define CRYPTOPP_TRDLOCAL_H - -#include "config.h" - -#ifdef THREADS_AVAILABLE - -#include "misc.h" - -#ifdef HAS_WINTHREADS -typedef unsigned long ThreadLocalIndexType; -#else -#include -typedef pthread_key_t ThreadLocalIndexType; -#endif - -NAMESPACE_BEGIN(CryptoPP) - -//! thread local storage -class CRYPTOPP_DLL ThreadLocalStorage : public NotCopyable -{ -public: - //! exception thrown by ThreadLocalStorage class - class Err : public OS_Error - { - public: - Err(const std::string& operation, int error); - }; - - ThreadLocalStorage(); - ~ThreadLocalStorage(); - - void SetValue(void *value); - void *GetValue() const; - -private: - ThreadLocalIndexType m_index; -}; - -NAMESPACE_END - -#endif // #ifdef THREADS_AVAILABLE - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/trunhash.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/trunhash.h deleted file mode 100644 index c1c4e9b6..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/trunhash.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef CRYPTOPP_TRUNHASH_H -#define CRYPTOPP_TRUNHASH_H - -#include "cryptlib.h" - -NAMESPACE_BEGIN(CryptoPP) - -class NullHash : public HashTransformation -{ -public: - void Update(const byte *input, size_t length) {} - unsigned int DigestSize() const {return 0;} - void TruncatedFinal(byte *digest, size_t digestSize) {} - bool TruncatedVerify(const byte *digest, size_t digestLength) {return true;} -}; - -//! construct new HashModule with smaller DigestSize() from existing one -template -class TruncatedHashTemplate : public HashTransformation -{ -public: - TruncatedHashTemplate(T hm, unsigned int digestSize) - : m_hm(hm), m_digestSize(digestSize) {} - TruncatedHashTemplate(const byte *key, size_t keyLength, unsigned int digestSize) - : m_hm(key, keyLength), m_digestSize(digestSize) {} - TruncatedHashTemplate(size_t digestSize) - : m_digestSize(digestSize) {} - - void Restart() - {m_hm.Restart();} - void Update(const byte *input, size_t length) - {m_hm.Update(input, length);} - unsigned int DigestSize() const {return m_digestSize;} - void TruncatedFinal(byte *digest, size_t digestSize) - {m_hm.TruncatedFinal(digest, digestSize);} - bool TruncatedVerify(const byte *digest, size_t digestLength) - {return m_hm.TruncatedVerify(digest, digestLength);} - -private: - T m_hm; - unsigned int m_digestSize; -}; - -typedef TruncatedHashTemplate TruncatedHashModule; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.cpp deleted file mode 100644 index d4ff3810..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// ttmac.cpp - written and placed in the public domain by Kevin Springle - -#include "pch.h" -#include "ttmac.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -void TTMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - memcpy(m_key, userKey, KEYLENGTH); - CorrectEndianess(m_key, m_key, KEYLENGTH); - - Init(); -} - -void TTMAC_Base::Init() -{ - m_digest[0] = m_digest[5] = m_key[0]; - m_digest[1] = m_digest[6] = m_key[1]; - m_digest[2] = m_digest[7] = m_key[2]; - m_digest[3] = m_digest[8] = m_key[3]; - m_digest[4] = m_digest[9] = m_key[4]; -} - -void TTMAC_Base::TruncatedFinal(byte *hash, size_t size) -{ - PadLastBlock(BlockSize() - 2*sizeof(HashWordType)); - CorrectEndianess(m_data, m_data, BlockSize() - 2*sizeof(HashWordType)); - - m_data[m_data.size()-2] = GetBitCountLo(); - m_data[m_data.size()-1] = GetBitCountHi(); - - Transform(m_digest, m_data, true); - - word32 t2 = m_digest[2]; - word32 t3 = m_digest[3]; - if (size != DIGESTSIZE) - { - switch (size) - { - case 16: - m_digest[3] += m_digest[1] + m_digest[4]; - - case 12: - m_digest[2] += m_digest[0] + t3; - - case 8: - m_digest[0] += m_digest[1] + t3; - m_digest[1] += m_digest[4] + t2; - break; - - case 4: - m_digest[0] += - m_digest[1] + - m_digest[2] + - m_digest[3] + - m_digest[4]; - break; - - case 0: - // Used by HashTransformation::Restart() - break; - - default: - throw InvalidArgument("TTMAC_Base: can't truncate a Two-Track-MAC 20 byte digest to " + IntToString(size) + " bytes"); - break; - } - } - - CorrectEndianess(m_digest, m_digest, size); - memcpy(hash, m_digest, size); - - Restart(); // reinit for next use -} - -// RIPEMD-160 definitions used by Two-Track-MAC - -#define F(x, y, z) (x ^ y ^ z) -#define G(x, y, z) (z ^ (x & (y^z))) -#define H(x, y, z) (z ^ (x | ~y)) -#define I(x, y, z) (y ^ (z & (x^y))) -#define J(x, y, z) (x ^ (y | ~z)) - -#define k0 0 -#define k1 0x5a827999UL -#define k2 0x6ed9eba1UL -#define k3 0x8f1bbcdcUL -#define k4 0xa953fd4eUL -#define k5 0x50a28be6UL -#define k6 0x5c4dd124UL -#define k7 0x6d703ef3UL -#define k8 0x7a6d76e9UL -#define k9 0 - -void TTMAC_Base::Transform(word32 *digest, const word32 *X, bool last) -{ -#define Subround(f, a, b, c, d, e, x, s, k) \ - a += f(b, c, d) + x + k;\ - a = rotlFixed((word32)a, s) + e;\ - c = rotlFixed((word32)c, 10U) - - word32 a1, b1, c1, d1, e1, a2, b2, c2, d2, e2; - word32 *trackA, *trackB; - - if (!last) - { - trackA = digest; - trackB = digest+5; - } - else - { - trackB = digest; - trackA = digest+5; - } - a1 = trackA[0]; - b1 = trackA[1]; - c1 = trackA[2]; - d1 = trackA[3]; - e1 = trackA[4]; - a2 = trackB[0]; - b2 = trackB[1]; - c2 = trackB[2]; - d2 = trackB[3]; - e2 = trackB[4]; - - Subround(F, a1, b1, c1, d1, e1, X[ 0], 11, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 1], 14, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 2], 15, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 3], 12, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 4], 5, k0); - Subround(F, a1, b1, c1, d1, e1, X[ 5], 8, k0); - Subround(F, e1, a1, b1, c1, d1, X[ 6], 7, k0); - Subround(F, d1, e1, a1, b1, c1, X[ 7], 9, k0); - Subround(F, c1, d1, e1, a1, b1, X[ 8], 11, k0); - Subround(F, b1, c1, d1, e1, a1, X[ 9], 13, k0); - Subround(F, a1, b1, c1, d1, e1, X[10], 14, k0); - Subround(F, e1, a1, b1, c1, d1, X[11], 15, k0); - Subround(F, d1, e1, a1, b1, c1, X[12], 6, k0); - Subround(F, c1, d1, e1, a1, b1, X[13], 7, k0); - Subround(F, b1, c1, d1, e1, a1, X[14], 9, k0); - Subround(F, a1, b1, c1, d1, e1, X[15], 8, k0); - - Subround(G, e1, a1, b1, c1, d1, X[ 7], 7, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 4], 6, k1); - Subround(G, c1, d1, e1, a1, b1, X[13], 8, k1); - Subround(G, b1, c1, d1, e1, a1, X[ 1], 13, k1); - Subround(G, a1, b1, c1, d1, e1, X[10], 11, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 6], 9, k1); - Subround(G, d1, e1, a1, b1, c1, X[15], 7, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 3], 15, k1); - Subround(G, b1, c1, d1, e1, a1, X[12], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[ 0], 12, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 9], 15, k1); - Subround(G, d1, e1, a1, b1, c1, X[ 5], 9, k1); - Subround(G, c1, d1, e1, a1, b1, X[ 2], 11, k1); - Subround(G, b1, c1, d1, e1, a1, X[14], 7, k1); - Subround(G, a1, b1, c1, d1, e1, X[11], 13, k1); - Subround(G, e1, a1, b1, c1, d1, X[ 8], 12, k1); - - Subround(H, d1, e1, a1, b1, c1, X[ 3], 11, k2); - Subround(H, c1, d1, e1, a1, b1, X[10], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[14], 6, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 4], 7, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 9], 14, k2); - Subround(H, d1, e1, a1, b1, c1, X[15], 9, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 8], 13, k2); - Subround(H, b1, c1, d1, e1, a1, X[ 1], 15, k2); - Subround(H, a1, b1, c1, d1, e1, X[ 2], 14, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 7], 8, k2); - Subround(H, d1, e1, a1, b1, c1, X[ 0], 13, k2); - Subround(H, c1, d1, e1, a1, b1, X[ 6], 6, k2); - Subround(H, b1, c1, d1, e1, a1, X[13], 5, k2); - Subround(H, a1, b1, c1, d1, e1, X[11], 12, k2); - Subround(H, e1, a1, b1, c1, d1, X[ 5], 7, k2); - Subround(H, d1, e1, a1, b1, c1, X[12], 5, k2); - - Subround(I, c1, d1, e1, a1, b1, X[ 1], 11, k3); - Subround(I, b1, c1, d1, e1, a1, X[ 9], 12, k3); - Subround(I, a1, b1, c1, d1, e1, X[11], 14, k3); - Subround(I, e1, a1, b1, c1, d1, X[10], 15, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 0], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 8], 15, k3); - Subround(I, b1, c1, d1, e1, a1, X[12], 9, k3); - Subround(I, a1, b1, c1, d1, e1, X[ 4], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[13], 9, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 3], 14, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 7], 5, k3); - Subround(I, b1, c1, d1, e1, a1, X[15], 6, k3); - Subround(I, a1, b1, c1, d1, e1, X[14], 8, k3); - Subround(I, e1, a1, b1, c1, d1, X[ 5], 6, k3); - Subround(I, d1, e1, a1, b1, c1, X[ 6], 5, k3); - Subround(I, c1, d1, e1, a1, b1, X[ 2], 12, k3); - - Subround(J, b1, c1, d1, e1, a1, X[ 4], 9, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 0], 15, k4); - Subround(J, e1, a1, b1, c1, d1, X[ 5], 5, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 9], 11, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 7], 6, k4); - Subround(J, b1, c1, d1, e1, a1, X[12], 8, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 2], 13, k4); - Subround(J, e1, a1, b1, c1, d1, X[10], 12, k4); - Subround(J, d1, e1, a1, b1, c1, X[14], 5, k4); - Subround(J, c1, d1, e1, a1, b1, X[ 1], 12, k4); - Subround(J, b1, c1, d1, e1, a1, X[ 3], 13, k4); - Subround(J, a1, b1, c1, d1, e1, X[ 8], 14, k4); - Subround(J, e1, a1, b1, c1, d1, X[11], 11, k4); - Subround(J, d1, e1, a1, b1, c1, X[ 6], 8, k4); - Subround(J, c1, d1, e1, a1, b1, X[15], 5, k4); - Subround(J, b1, c1, d1, e1, a1, X[13], 6, k4); - - Subround(J, a2, b2, c2, d2, e2, X[ 5], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[14], 9, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 7], 9, k5); - Subround(J, c2, d2, e2, a2, b2, X[ 0], 11, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 9], 13, k5); - Subround(J, a2, b2, c2, d2, e2, X[ 2], 15, k5); - Subround(J, e2, a2, b2, c2, d2, X[11], 15, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 4], 5, k5); - Subround(J, c2, d2, e2, a2, b2, X[13], 7, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 6], 7, k5); - Subround(J, a2, b2, c2, d2, e2, X[15], 8, k5); - Subround(J, e2, a2, b2, c2, d2, X[ 8], 11, k5); - Subround(J, d2, e2, a2, b2, c2, X[ 1], 14, k5); - Subround(J, c2, d2, e2, a2, b2, X[10], 14, k5); - Subround(J, b2, c2, d2, e2, a2, X[ 3], 12, k5); - Subround(J, a2, b2, c2, d2, e2, X[12], 6, k5); - - Subround(I, e2, a2, b2, c2, d2, X[ 6], 9, k6); - Subround(I, d2, e2, a2, b2, c2, X[11], 13, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 3], 15, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 7], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 0], 12, k6); - Subround(I, e2, a2, b2, c2, d2, X[13], 8, k6); - Subround(I, d2, e2, a2, b2, c2, X[ 5], 9, k6); - Subround(I, c2, d2, e2, a2, b2, X[10], 11, k6); - Subround(I, b2, c2, d2, e2, a2, X[14], 7, k6); - Subround(I, a2, b2, c2, d2, e2, X[15], 7, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 8], 12, k6); - Subround(I, d2, e2, a2, b2, c2, X[12], 7, k6); - Subround(I, c2, d2, e2, a2, b2, X[ 4], 6, k6); - Subround(I, b2, c2, d2, e2, a2, X[ 9], 15, k6); - Subround(I, a2, b2, c2, d2, e2, X[ 1], 13, k6); - Subround(I, e2, a2, b2, c2, d2, X[ 2], 11, k6); - - Subround(H, d2, e2, a2, b2, c2, X[15], 9, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 5], 7, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 1], 15, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 3], 11, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 7], 8, k7); - Subround(H, d2, e2, a2, b2, c2, X[14], 6, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 6], 6, k7); - Subround(H, b2, c2, d2, e2, a2, X[ 9], 14, k7); - Subround(H, a2, b2, c2, d2, e2, X[11], 12, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 8], 13, k7); - Subround(H, d2, e2, a2, b2, c2, X[12], 5, k7); - Subround(H, c2, d2, e2, a2, b2, X[ 2], 14, k7); - Subround(H, b2, c2, d2, e2, a2, X[10], 13, k7); - Subround(H, a2, b2, c2, d2, e2, X[ 0], 13, k7); - Subround(H, e2, a2, b2, c2, d2, X[ 4], 7, k7); - Subround(H, d2, e2, a2, b2, c2, X[13], 5, k7); - - Subround(G, c2, d2, e2, a2, b2, X[ 8], 15, k8); - Subround(G, b2, c2, d2, e2, a2, X[ 6], 5, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 4], 8, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 1], 11, k8); - Subround(G, d2, e2, a2, b2, c2, X[ 3], 14, k8); - Subround(G, c2, d2, e2, a2, b2, X[11], 14, k8); - Subround(G, b2, c2, d2, e2, a2, X[15], 6, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 0], 14, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 5], 6, k8); - Subround(G, d2, e2, a2, b2, c2, X[12], 9, k8); - Subround(G, c2, d2, e2, a2, b2, X[ 2], 12, k8); - Subround(G, b2, c2, d2, e2, a2, X[13], 9, k8); - Subround(G, a2, b2, c2, d2, e2, X[ 9], 12, k8); - Subround(G, e2, a2, b2, c2, d2, X[ 7], 5, k8); - Subround(G, d2, e2, a2, b2, c2, X[10], 15, k8); - Subround(G, c2, d2, e2, a2, b2, X[14], 8, k8); - - Subround(F, b2, c2, d2, e2, a2, X[12], 8, k9); - Subround(F, a2, b2, c2, d2, e2, X[15], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[10], 12, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 4], 9, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 1], 12, k9); - Subround(F, b2, c2, d2, e2, a2, X[ 5], 5, k9); - Subround(F, a2, b2, c2, d2, e2, X[ 8], 14, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 7], 6, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 6], 8, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 2], 13, k9); - Subround(F, b2, c2, d2, e2, a2, X[13], 6, k9); - Subround(F, a2, b2, c2, d2, e2, X[14], 5, k9); - Subround(F, e2, a2, b2, c2, d2, X[ 0], 15, k9); - Subround(F, d2, e2, a2, b2, c2, X[ 3], 13, k9); - Subround(F, c2, d2, e2, a2, b2, X[ 9], 11, k9); - Subround(F, b2, c2, d2, e2, a2, X[11], 11, k9); - - a1 -= trackA[0]; - b1 -= trackA[1]; - c1 -= trackA[2]; - d1 -= trackA[3]; - e1 -= trackA[4]; - a2 -= trackB[0]; - b2 -= trackB[1]; - c2 -= trackB[2]; - d2 -= trackB[3]; - e2 -= trackB[4]; - - if (!last) - { - trackA[0] = (b1 + e1) - d2; - trackA[1] = c1 - e2; - trackA[2] = d1 - a2; - trackA[3] = e1 - b2; - trackA[4] = a1 - c2; - trackB[0] = d1 - e2; - trackB[1] = (e1 + c1) - a2; - trackB[2] = a1 - b2; - trackB[3] = b1 - c2; - trackB[4] = c1 - d2; - } - else - { - trackB[0] = a2 - a1; - trackB[1] = b2 - b1; - trackB[2] = c2 - c1; - trackB[3] = d2 - d1; - trackB[4] = e2 - e1; - trackA[0] = 0; - trackA[1] = 0; - trackA[2] = 0; - trackA[3] = 0; - trackA[4] = 0; - } -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.h deleted file mode 100644 index b4bf86e2..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/ttmac.h +++ /dev/null @@ -1,38 +0,0 @@ -// ttmac.h - written and placed in the public domain by Kevin Springle - -#ifndef CRYPTOPP_TTMAC_H -#define CRYPTOPP_TTMAC_H - -#include "seckey.h" -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class CRYPTOPP_NO_VTABLE TTMAC_Base : public FixedKeyLength<20>, public IteratedHash -{ -public: - static std::string StaticAlgorithmName() {return std::string("Two-Track-MAC");} - CRYPTOPP_CONSTANT(DIGESTSIZE=20) - - unsigned int DigestSize() const {return DIGESTSIZE;}; - void UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs ¶ms); - void TruncatedFinal(byte *mac, size_t size); - -protected: - static void Transform (word32 *digest, const word32 *X, bool last); - void HashEndianCorrectedBlock(const word32 *data) {Transform(m_digest, data, false);} - void Init(); - word32* StateBuf() {return m_digest;} - - FixedSizeSecBlock m_digest; - FixedSizeSecBlock m_key; -}; - -//! Two-Track-MAC -/*! 160 Bit MAC with 160 Bit Key */ -DOCUMENTED_TYPEDEF(MessageAuthenticationCodeFinal, TTMAC) - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.cpp deleted file mode 100644 index 064f16c4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// twofish.cpp - modified by Wei Dai from Matthew Skala's twofish.c -// The original code and all modifications are in the public domain. - -#include "pch.h" -#include "twofish.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -// compute (c * x^4) mod (x^4 + (a + 1/a) * x^3 + a * x^2 + (a + 1/a) * x + 1) -// over GF(256) -static inline unsigned int Mod(unsigned int c) -{ - static const unsigned int modulus = 0x14d; - unsigned int c2 = (c<<1) ^ ((c & 0x80) ? modulus : 0); - unsigned int c1 = c2 ^ (c>>1) ^ ((c & 1) ? (modulus>>1) : 0); - return c | (c1 << 8) | (c2 << 16) | (c1 << 24); -} - -// compute RS(12,8) code with the above polynomial as generator -// this is equivalent to multiplying by the RS matrix -static word32 ReedSolomon(word32 high, word32 low) -{ - for (unsigned int i=0; i<8; i++) - { - high = Mod(high>>24) ^ (high<<8) ^ (low>>24); - low <<= 8; - } - return high; -} - -inline word32 Twofish::Base::h0(word32 x, const word32 *key, unsigned int kLen) -{ - x = x | (x<<8) | (x<<16) | (x<<24); - switch(kLen) - { -#define Q(a, b, c, d, t) q[a][GETBYTE(t,0)] ^ (q[b][GETBYTE(t,1)] << 8) ^ (q[c][GETBYTE(t,2)] << 16) ^ (q[d][GETBYTE(t,3)] << 24) - case 4: x = Q(1, 0, 0, 1, x) ^ key[6]; - case 3: x = Q(1, 1, 0, 0, x) ^ key[4]; - case 2: x = Q(0, 1, 0, 1, x) ^ key[2]; - x = Q(0, 0, 1, 1, x) ^ key[0]; - } - return x; -} - -inline word32 Twofish::Base::h(word32 x, const word32 *key, unsigned int kLen) -{ - x = h0(x, key, kLen); - return mds[0][GETBYTE(x,0)] ^ mds[1][GETBYTE(x,1)] ^ mds[2][GETBYTE(x,2)] ^ mds[3][GETBYTE(x,3)]; -} - -void Twofish::Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &) -{ - AssertValidKeyLength(keylength); - - unsigned int len = (keylength <= 16 ? 2 : (keylength <= 24 ? 3 : 4)); - SecBlock key(len*2); - GetUserKey(LITTLE_ENDIAN_ORDER, key.begin(), len*2, userKey, keylength); - - unsigned int i; - for (i=0; i<40; i+=2) - { - word32 a = h(i, key, len); - word32 b = rotlFixed(h(i+1, key+1, len), 8); - m_k[i] = a+b; - m_k[i+1] = rotlFixed(a+2*b, 9); - } - - SecBlock svec(2*len); - for (i=0; i Block; - -void Twofish::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 x, y, a, b, c, d; - - Block::Get(inBlock)(a)(b)(c)(d); - - a ^= m_k[0]; - b ^= m_k[1]; - c ^= m_k[2]; - d ^= m_k[3]; - - const word32 *k = m_k+8; - ENCCYCLE (0); - ENCCYCLE (1); - ENCCYCLE (2); - ENCCYCLE (3); - ENCCYCLE (4); - ENCCYCLE (5); - ENCCYCLE (6); - ENCCYCLE (7); - - c ^= m_k[4]; - d ^= m_k[5]; - a ^= m_k[6]; - b ^= m_k[7]; - - Block::Put(xorBlock, outBlock)(c)(d)(a)(b); -} - -void Twofish::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const -{ - word32 x, y, a, b, c, d; - - Block::Get(inBlock)(c)(d)(a)(b); - - c ^= m_k[4]; - d ^= m_k[5]; - a ^= m_k[6]; - b ^= m_k[7]; - - const word32 *k = m_k+8; - DECCYCLE (7); - DECCYCLE (6); - DECCYCLE (5); - DECCYCLE (4); - DECCYCLE (3); - DECCYCLE (2); - DECCYCLE (1); - DECCYCLE (0); - - a ^= m_k[0]; - b ^= m_k[1]; - c ^= m_k[2]; - d ^= m_k[3]; - - Block::Put(xorBlock, outBlock)(a)(b)(c)(d); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.h deleted file mode 100644 index 9ba2903b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/twofish.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef CRYPTOPP_TWOFISH_H -#define CRYPTOPP_TWOFISH_H - -/** \file -*/ - -#include "seckey.h" -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -struct Twofish_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 0, 32>, FixedRounds<16> -{ - static const char *StaticAlgorithmName() {return "Twofish";} -}; - -/// Twofish -class Twofish : public Twofish_Info, public BlockCipherDocumentation -{ - class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl - { - public: - void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); - - protected: - static word32 h0(word32 x, const word32 *key, unsigned int kLen); - static word32 h(word32 x, const word32 *key, unsigned int kLen); - - static const byte q[2][256]; - static const word32 mds[4][256]; - - FixedSizeSecBlock m_k; - FixedSizeSecBlock m_s; - }; - - class CRYPTOPP_NO_VTABLE Enc : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - - class CRYPTOPP_NO_VTABLE Dec : public Base - { - public: - void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; - }; - -public: - typedef BlockCipherFinal Encryption; - typedef BlockCipherFinal Decryption; -}; - -typedef Twofish::Encryption TwofishEncryption; -typedef Twofish::Decryption TwofishDecryption; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat1.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/validat1.cpp deleted file mode 100644 index 5b82539c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat1.cpp +++ /dev/null @@ -1,1408 +0,0 @@ -// validat1.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "files.h" -#include "hex.h" -#include "base32.h" -#include "base64.h" -#include "modes.h" -#include "cbcmac.h" -#include "dmac.h" -#include "idea.h" -#include "des.h" -#include "rc2.h" -#include "arc4.h" -#include "rc5.h" -#include "blowfish.h" -#include "3way.h" -#include "safer.h" -#include "gost.h" -#include "shark.h" -#include "cast.h" -#include "square.h" -#include "seal.h" -#include "rc6.h" -#include "mars.h" -#include "rijndael.h" -#include "twofish.h" -#include "serpent.h" -#include "skipjack.h" -#include "shacal2.h" -#include "camellia.h" -#include "osrng.h" -#include "zdeflate.h" -#include "cpu.h" - -#include -#include -#include -#include - -#include "validate.h" - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -bool ValidateAll(bool thorough) -{ - bool pass=TestSettings(); - pass=TestOS_RNG() && pass; - - pass=ValidateCRC32() && pass; - pass=ValidateAdler32() && pass; - pass=ValidateMD2() && pass; - pass=ValidateMD5() && pass; - pass=ValidateSHA() && pass; - pass=ValidateTiger() && pass; - pass=ValidateRIPEMD() && pass; - pass=ValidatePanama() && pass; - pass=ValidateWhirlpool() && pass; - - pass=ValidateHMAC() && pass; - pass=ValidateTTMAC() && pass; - - pass=ValidatePBKDF() && pass; - - pass=ValidateDES() && pass; - pass=ValidateCipherModes() && pass; - pass=ValidateIDEA() && pass; - pass=ValidateSAFER() && pass; - pass=ValidateRC2() && pass; - pass=ValidateARC4() && pass; - pass=ValidateRC5() && pass; - pass=ValidateBlowfish() && pass; - pass=ValidateThreeWay() && pass; - pass=ValidateGOST() && pass; - pass=ValidateSHARK() && pass; - pass=ValidateCAST() && pass; - pass=ValidateSquare() && pass; - pass=ValidateSKIPJACK() && pass; - pass=ValidateSEAL() && pass; - pass=ValidateRC6() && pass; - pass=ValidateMARS() && pass; - pass=ValidateRijndael() && pass; - pass=ValidateTwofish() && pass; - pass=ValidateSerpent() && pass; - pass=ValidateSHACAL2() && pass; - pass=ValidateCamellia() && pass; - pass=ValidateSalsa() && pass; - pass=ValidateSosemanuk() && pass; - pass=ValidateVMAC() && pass; - pass=ValidateCCM() && pass; - pass=ValidateGCM() && pass; - pass=ValidateCMAC() && pass; - pass=RunTestDataFile("TestVectors/eax.txt") && pass; - pass=RunTestDataFile("TestVectors/seed.txt") && pass; - - pass=ValidateBBS() && pass; - pass=ValidateDH() && pass; - pass=ValidateMQV() && pass; - pass=ValidateRSA() && pass; - pass=ValidateElGamal() && pass; - pass=ValidateDLIES() && pass; - pass=ValidateNR() && pass; - pass=ValidateDSA(thorough) && pass; - pass=ValidateLUC() && pass; - pass=ValidateLUC_DH() && pass; - pass=ValidateLUC_DL() && pass; - pass=ValidateXTR_DH() && pass; - pass=ValidateRabin() && pass; - pass=ValidateRW() && pass; -// pass=ValidateBlumGoldwasser() && pass; - pass=ValidateECP() && pass; - pass=ValidateEC2N() && pass; - pass=ValidateECDSA() && pass; - pass=ValidateESIGN() && pass; - - if (pass) - cout << "\nAll tests passed!\n"; - else - cout << "\nOops! Not all tests passed.\n"; - - return pass; -} - -bool TestSettings() -{ - bool pass = true; - - cout << "\nTesting Settings...\n\n"; - - word32 w; - memcpy_s(&w, sizeof(w), "\x01\x02\x03\x04", 4); - - if (w == 0x04030201L) - { -#ifdef IS_LITTLE_ENDIAN - cout << "passed: "; -#else - cout << "FAILED: "; - pass = false; -#endif - cout << "Your machine is little endian.\n"; - } - else if (w == 0x01020304L) - { -#ifndef IS_LITTLE_ENDIAN - cout << "passed: "; -#else - cout << "FAILED: "; - pass = false; -#endif - cout << "Your machine is big endian.\n"; - } - else - { - cout << "FAILED: Your machine is neither big endian nor little endian.\n"; - pass = false; - } - -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - byte testvals[10] = {1,2,2,3,3,3,3,2,2,1}; - if (*(word32 *)(testvals+3) == 0x03030303 && *(word64 *)(testvals+1) == W64LIT(0x0202030303030202)) - cout << "passed: Your machine allows unaligned data access.\n"; - else - { - cout << "FAILED: Unaligned data access gave incorrect results.\n"; - pass = false; - } -#else - cout << "passed: CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is not defined. Will restrict to aligned data access.\n"; -#endif - - if (sizeof(byte) == 1) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(byte) == " << sizeof(byte) << endl; - - if (sizeof(word16) == 2) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(word16) == " << sizeof(word16) << endl; - - if (sizeof(word32) == 4) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(word32) == " << sizeof(word32) << endl; - - if (sizeof(word64) == 8) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(word64) == " << sizeof(word64) << endl; - -#ifdef CRYPTOPP_WORD128_AVAILABLE - if (sizeof(word128) == 16) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(word128) == " << sizeof(word128) << endl; -#endif - - if (sizeof(word) == 2*sizeof(hword) -#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - && sizeof(dword) == 2*sizeof(word) -#endif - ) - cout << "passed: "; - else - { - cout << "FAILED: "; - pass = false; - } - cout << "sizeof(hword) == " << sizeof(hword) << ", sizeof(word) == " << sizeof(word); -#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE - cout << ", sizeof(dword) == " << sizeof(dword); -#endif - cout << endl; - -#ifdef CRYPTOPP_CPUID_AVAILABLE - bool hasMMX = HasMMX(); - bool hasISSE = HasISSE(); - bool hasSSE2 = HasSSE2(); - bool hasSSSE3 = HasSSSE3(); - bool isP4 = IsP4(); - int cacheLineSize = GetCacheLineSize(); - - if ((isP4 && (!hasMMX || !hasSSE2)) || (hasSSE2 && !hasMMX) || (cacheLineSize < 16 || cacheLineSize > 256 || !IsPowerOf2(cacheLineSize))) - { - cout << "FAILED: "; - pass = false; - } - else - cout << "passed: "; - - cout << "hasMMX == " << hasMMX << ", hasISSE == " << hasISSE << ", hasSSE2 == " << hasSSE2 << ", hasSSSE3 == " << hasSSSE3 << ", hasAESNI == " << HasAESNI() << ", hasCLMUL == " << HasCLMUL() << ", isP4 == " << isP4 << ", cacheLineSize == " << cacheLineSize; - cout << ", AESNI_INTRINSICS == " << CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE << endl; -#endif - - if (!pass) - { - cout << "Some critical setting in config.h is in error. Please fix it and recompile." << endl; - abort(); - } - return pass; -} - -bool TestOS_RNG() -{ - bool pass = true; - - member_ptr rng; -#ifdef BLOCKING_RNG_AVAILABLE - try {rng.reset(new BlockingRng);} - catch (OS_RNG_Err &) {} -#endif - - if (rng.get()) - { - cout << "\nTesting operating system provided blocking random number generator...\n\n"; - - ArraySink *sink; - RandomNumberSource test(*rng, UINT_MAX, false, new Deflator(sink=new ArraySink(NULL,0))); - unsigned long total=0, length=0; - time_t t = time(NULL), t1 = 0; - - // check that it doesn't take too long to generate a reasonable amount of randomness - while (total < 16 && (t1 < 10 || total*8 > (unsigned long)t1)) - { - test.Pump(1); - total += 1; - t1 = time(NULL) - t; - } - - if (total < 16) - { - cout << "FAILED:"; - pass = false; - } - else - cout << "passed:"; - cout << " it took " << long(t1) << " seconds to generate " << total << " bytes" << endl; - -#if 0 // disable this part. it's causing an unpredictable pause during the validation testing - if (t1 < 2) - { - // that was fast, are we really blocking? - // first exhaust the extropy reserve - t = time(NULL); - while (time(NULL) - t < 2) - { - test.Pump(1); - total += 1; - } - - // if it generates too many bytes in a certain amount of time, - // something's probably wrong - t = time(NULL); - while (time(NULL) - t < 2) - { - test.Pump(1); - total += 1; - length += 1; - } - if (length > 1024) - { - cout << "FAILED:"; - pass = false; - } - else - cout << "passed:"; - cout << " it generated " << length << " bytes in " << long(time(NULL) - t) << " seconds" << endl; - } -#endif - - test.AttachedTransformation()->MessageEnd(); - - if (sink->TotalPutLength() < total) - { - cout << "FAILED:"; - pass = false; - } - else - cout << "passed:"; - cout << " " << total << " generated bytes compressed to " << (size_t)sink->TotalPutLength() << " bytes by DEFLATE" << endl; - } - else - cout << "\nNo operating system provided blocking random number generator, skipping test." << endl; - - rng.reset(NULL); -#ifdef NONBLOCKING_RNG_AVAILABLE - try {rng.reset(new NonblockingRng);} - catch (OS_RNG_Err &) {} -#endif - - if (rng.get()) - { - cout << "\nTesting operating system provided nonblocking random number generator...\n\n"; - - ArraySink *sink; - RandomNumberSource test(*rng, 100000, true, new Deflator(sink=new ArraySink(NULL, 0))); - - if (sink->TotalPutLength() < 100000) - { - cout << "FAILED:"; - pass = false; - } - else - cout << "passed:"; - cout << " 100000 generated bytes compressed to " << (size_t)sink->TotalPutLength() << " bytes by DEFLATE" << endl; - } - else - cout << "\nNo operating system provided nonblocking random number generator, skipping test." << endl; - - return pass; -} - -// VC50 workaround -typedef auto_ptr apbt; - -class CipherFactory -{ -public: - virtual unsigned int BlockSize() const =0; - virtual unsigned int KeyLength() const =0; - - virtual apbt NewEncryption(const byte *key) const =0; - virtual apbt NewDecryption(const byte *key) const =0; -}; - -template class FixedRoundsCipherFactory : public CipherFactory -{ -public: - FixedRoundsCipherFactory(unsigned int keylen=0) : m_keylen(keylen?keylen:E::DEFAULT_KEYLENGTH) {} - unsigned int BlockSize() const {return E::BLOCKSIZE;} - unsigned int KeyLength() const {return m_keylen;} - - apbt NewEncryption(const byte *key) const - {return apbt(new E(key, m_keylen));} - apbt NewDecryption(const byte *key) const - {return apbt(new D(key, m_keylen));} - - unsigned int m_keylen; -}; - -template class VariableRoundsCipherFactory : public CipherFactory -{ -public: - VariableRoundsCipherFactory(unsigned int keylen=0, unsigned int rounds=0) - : m_keylen(keylen ? keylen : E::DEFAULT_KEYLENGTH), m_rounds(rounds ? rounds : E::DEFAULT_ROUNDS) {} - unsigned int BlockSize() const {return E::BLOCKSIZE;} - unsigned int KeyLength() const {return m_keylen;} - - apbt NewEncryption(const byte *key) const - {return apbt(new E(key, m_keylen, m_rounds));} - apbt NewDecryption(const byte *key) const - {return apbt(new D(key, m_keylen, m_rounds));} - - unsigned int m_keylen, m_rounds; -}; - -bool BlockTransformationTest(const CipherFactory &cg, BufferedTransformation &valdata, unsigned int tuples = 0xffff) -{ - HexEncoder output(new FileSink(cout)); - SecByteBlock plain(cg.BlockSize()), cipher(cg.BlockSize()), out(cg.BlockSize()), outplain(cg.BlockSize()); - SecByteBlock key(cg.KeyLength()); - bool pass=true, fail; - - while (valdata.MaxRetrievable() && tuples--) - { - valdata.Get(key, cg.KeyLength()); - valdata.Get(plain, cg.BlockSize()); - valdata.Get(cipher, cg.BlockSize()); - - apbt transE = cg.NewEncryption(key); - transE->ProcessBlock(plain, out); - fail = memcmp(out, cipher, cg.BlockSize()) != 0; - - apbt transD = cg.NewDecryption(key); - transD->ProcessBlock(out, outplain); - fail=fail || memcmp(outplain, plain, cg.BlockSize()); - - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - output.Put(key, cg.KeyLength()); - cout << " "; - output.Put(outplain, cg.BlockSize()); - cout << " "; - output.Put(out, cg.BlockSize()); - cout << endl; - } - return pass; -} - -class FilterTester : public Unflushable -{ -public: - FilterTester(const byte *validOutput, size_t outputLen) - : validOutput(validOutput), outputLen(outputLen), counter(0), fail(false) {} - void PutByte(byte inByte) - { - if (counter >= outputLen || validOutput[counter] != inByte) - { - std::cerr << "incorrect output " << counter << ", " << (word16)validOutput[counter] << ", " << (word16)inByte << "\n"; - fail = true; - assert(false); - } - counter++; - } - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) - { - while (length--) - FilterTester::PutByte(*inString++); - - if (messageEnd) - if (counter != outputLen) - { - fail = true; - assert(false); - } - - return 0; - } - bool GetResult() - { - return !fail; - } - - const byte *validOutput; - size_t outputLen, counter; - bool fail; -}; - -bool TestFilter(BufferedTransformation &bt, const byte *in, size_t inLen, const byte *out, size_t outLen) -{ - FilterTester *ft; - bt.Attach(ft = new FilterTester(out, outLen)); - - while (inLen) - { - size_t randomLen = GlobalRNG().GenerateWord32(0, (word32)inLen); - bt.Put(in, randomLen); - in += randomLen; - inLen -= randomLen; - } - bt.MessageEnd(); - return ft->GetResult(); -} - -bool ValidateDES() -{ - cout << "\nDES validation suite running...\n\n"; - - FileSource valdata("TestData/descert.dat", true, new HexDecoder); - bool pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata); - - cout << "\nTesting EDE2, EDE3, and XEX3 variants...\n\n"; - - FileSource valdata1("TestData/3desval.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; - - return pass; -} - -bool TestModeIV(SymmetricCipher &e, SymmetricCipher &d) -{ - SecByteBlock lastIV, iv(e.IVSize()); - StreamTransformationFilter filter(e, new StreamTransformationFilter(d)); - byte plaintext[20480]; - - for (unsigned int i=1; i cbcmac(key); - HashFilter cbcmacFilter(cbcmac); - fail = !TestFilter(cbcmacFilter, plain, sizeof(plain), mac1, sizeof(mac1)); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "CBC MAC" << endl; - - DMAC dmac(key); - HashFilter dmacFilter(dmac); - fail = !TestFilter(dmacFilter, plain, sizeof(plain), mac2, sizeof(mac2)); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "DMAC" << endl; - } - { - CTR_Mode::Encryption modeE(plain, 16, plain); - CTR_Mode::Decryption modeD(plain, 16, plain); - fail = !TestModeIV(modeE, modeD); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "AES CTR Mode" << endl; - } - { - OFB_Mode::Encryption modeE(plain, 16, plain); - OFB_Mode::Decryption modeD(plain, 16, plain); - fail = !TestModeIV(modeE, modeD); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "AES OFB Mode" << endl; - } - { - CFB_Mode::Encryption modeE(plain, 16, plain); - CFB_Mode::Decryption modeD(plain, 16, plain); - fail = !TestModeIV(modeE, modeD); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "AES CFB Mode" << endl; - } - { - CBC_Mode::Encryption modeE(plain, 16, plain); - CBC_Mode::Decryption modeD(plain, 16, plain); - fail = !TestModeIV(modeE, modeD); - pass = pass && !fail; - cout << (fail ? "FAILED " : "passed ") << "AES CBC Mode" << endl; - } - - return pass; -} - -bool ValidateIDEA() -{ - cout << "\nIDEA validation suite running...\n\n"; - - FileSource valdata("TestData/ideaval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateSAFER() -{ - cout << "\nSAFER validation suite running...\n\n"; - - FileSource valdata("TestData/saferval.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(VariableRoundsCipherFactory(8,6), valdata, 4) && pass; - pass = BlockTransformationTest(VariableRoundsCipherFactory(16,12), valdata, 4) && pass; - pass = BlockTransformationTest(VariableRoundsCipherFactory(8,6), valdata, 4) && pass; - pass = BlockTransformationTest(VariableRoundsCipherFactory(16,10), valdata, 4) && pass; - return pass; -} - -bool ValidateRC2() -{ - cout << "\nRC2 validation suite running...\n\n"; - - FileSource valdata("TestData/rc2val.dat", true, new HexDecoder); - HexEncoder output(new FileSink(cout)); - SecByteBlock plain(RC2Encryption::BLOCKSIZE), cipher(RC2Encryption::BLOCKSIZE), out(RC2Encryption::BLOCKSIZE), outplain(RC2Encryption::BLOCKSIZE); - SecByteBlock key(128); - bool pass=true, fail; - - while (valdata.MaxRetrievable()) - { - byte keyLen, effectiveLen; - - valdata.Get(keyLen); - valdata.Get(effectiveLen); - valdata.Get(key, keyLen); - valdata.Get(plain, RC2Encryption::BLOCKSIZE); - valdata.Get(cipher, RC2Encryption::BLOCKSIZE); - - apbt transE(new RC2Encryption(key, keyLen, effectiveLen)); - transE->ProcessBlock(plain, out); - fail = memcmp(out, cipher, RC2Encryption::BLOCKSIZE) != 0; - - apbt transD(new RC2Decryption(key, keyLen, effectiveLen)); - transD->ProcessBlock(out, outplain); - fail=fail || memcmp(outplain, plain, RC2Encryption::BLOCKSIZE); - - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - output.Put(key, keyLen); - cout << " "; - output.Put(outplain, RC2Encryption::BLOCKSIZE); - cout << " "; - output.Put(out, RC2Encryption::BLOCKSIZE); - cout << endl; - } - return pass; -} - -bool ValidateARC4() -{ - unsigned char Key0[] = {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef }; - unsigned char Input0[]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; - unsigned char Output0[] = {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96}; - - unsigned char Key1[]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; - unsigned char Input1[]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; - unsigned char Output1[]={0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79}; - - unsigned char Key2[]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; - unsigned char Input2[]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; - unsigned char Output2[]={0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a}; - - unsigned char Key3[]={0xef,0x01,0x23,0x45}; - unsigned char Input3[]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; - unsigned char Output3[]={0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,0xbd,0x61}; - - unsigned char Key4[]={ 0x01,0x23,0x45,0x67,0x89,0xab, 0xcd,0xef }; - unsigned char Input4[] = - {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01}; - unsigned char Output4[]= { - 0x75,0x95,0xc3,0xe6,0x11,0x4a,0x09,0x78,0x0c,0x4a,0xd4, - 0x52,0x33,0x8e,0x1f,0xfd,0x9a,0x1b,0xe9,0x49,0x8f, - 0x81,0x3d,0x76,0x53,0x34,0x49,0xb6,0x77,0x8d,0xca, - 0xd8,0xc7,0x8a,0x8d,0x2b,0xa9,0xac,0x66,0x08,0x5d, - 0x0e,0x53,0xd5,0x9c,0x26,0xc2,0xd1,0xc4,0x90,0xc1, - 0xeb,0xbe,0x0c,0xe6,0x6d,0x1b,0x6b,0x1b,0x13,0xb6, - 0xb9,0x19,0xb8,0x47,0xc2,0x5a,0x91,0x44,0x7a,0x95, - 0xe7,0x5e,0x4e,0xf1,0x67,0x79,0xcd,0xe8,0xbf,0x0a, - 0x95,0x85,0x0e,0x32,0xaf,0x96,0x89,0x44,0x4f,0xd3, - 0x77,0x10,0x8f,0x98,0xfd,0xcb,0xd4,0xe7,0x26,0x56, - 0x75,0x00,0x99,0x0b,0xcc,0x7e,0x0c,0xa3,0xc4,0xaa, - 0xa3,0x04,0xa3,0x87,0xd2,0x0f,0x3b,0x8f,0xbb,0xcd, - 0x42,0xa1,0xbd,0x31,0x1d,0x7a,0x43,0x03,0xdd,0xa5, - 0xab,0x07,0x88,0x96,0xae,0x80,0xc1,0x8b,0x0a,0xf6, - 0x6d,0xff,0x31,0x96,0x16,0xeb,0x78,0x4e,0x49,0x5a, - 0xd2,0xce,0x90,0xd7,0xf7,0x72,0xa8,0x17,0x47,0xb6, - 0x5f,0x62,0x09,0x3b,0x1e,0x0d,0xb9,0xe5,0xba,0x53, - 0x2f,0xaf,0xec,0x47,0x50,0x83,0x23,0xe6,0x71,0x32, - 0x7d,0xf9,0x44,0x44,0x32,0xcb,0x73,0x67,0xce,0xc8, - 0x2f,0x5d,0x44,0xc0,0xd0,0x0b,0x67,0xd6,0x50,0xa0, - 0x75,0xcd,0x4b,0x70,0xde,0xdd,0x77,0xeb,0x9b,0x10, - 0x23,0x1b,0x6b,0x5b,0x74,0x13,0x47,0x39,0x6d,0x62, - 0x89,0x74,0x21,0xd4,0x3d,0xf9,0xb4,0x2e,0x44,0x6e, - 0x35,0x8e,0x9c,0x11,0xa9,0xb2,0x18,0x4e,0xcb,0xef, - 0x0c,0xd8,0xe7,0xa8,0x77,0xef,0x96,0x8f,0x13,0x90, - 0xec,0x9b,0x3d,0x35,0xa5,0x58,0x5c,0xb0,0x09,0x29, - 0x0e,0x2f,0xcd,0xe7,0xb5,0xec,0x66,0xd9,0x08,0x4b, - 0xe4,0x40,0x55,0xa6,0x19,0xd9,0xdd,0x7f,0xc3,0x16, - 0x6f,0x94,0x87,0xf7,0xcb,0x27,0x29,0x12,0x42,0x64, - 0x45,0x99,0x85,0x14,0xc1,0x5d,0x53,0xa1,0x8c,0x86, - 0x4c,0xe3,0xa2,0xb7,0x55,0x57,0x93,0x98,0x81,0x26, - 0x52,0x0e,0xac,0xf2,0xe3,0x06,0x6e,0x23,0x0c,0x91, - 0xbe,0xe4,0xdd,0x53,0x04,0xf5,0xfd,0x04,0x05,0xb3, - 0x5b,0xd9,0x9c,0x73,0x13,0x5d,0x3d,0x9b,0xc3,0x35, - 0xee,0x04,0x9e,0xf6,0x9b,0x38,0x67,0xbf,0x2d,0x7b, - 0xd1,0xea,0xa5,0x95,0xd8,0xbf,0xc0,0x06,0x6f,0xf8, - 0xd3,0x15,0x09,0xeb,0x0c,0x6c,0xaa,0x00,0x6c,0x80, - 0x7a,0x62,0x3e,0xf8,0x4c,0x3d,0x33,0xc1,0x95,0xd2, - 0x3e,0xe3,0x20,0xc4,0x0d,0xe0,0x55,0x81,0x57,0xc8, - 0x22,0xd4,0xb8,0xc5,0x69,0xd8,0x49,0xae,0xd5,0x9d, - 0x4e,0x0f,0xd7,0xf3,0x79,0x58,0x6b,0x4b,0x7f,0xf6, - 0x84,0xed,0x6a,0x18,0x9f,0x74,0x86,0xd4,0x9b,0x9c, - 0x4b,0xad,0x9b,0xa2,0x4b,0x96,0xab,0xf9,0x24,0x37, - 0x2c,0x8a,0x8f,0xff,0xb1,0x0d,0x55,0x35,0x49,0x00, - 0xa7,0x7a,0x3d,0xb5,0xf2,0x05,0xe1,0xb9,0x9f,0xcd, - 0x86,0x60,0x86,0x3a,0x15,0x9a,0xd4,0xab,0xe4,0x0f, - 0xa4,0x89,0x34,0x16,0x3d,0xdd,0xe5,0x42,0xa6,0x58, - 0x55,0x40,0xfd,0x68,0x3c,0xbf,0xd8,0xc0,0x0f,0x12, - 0x12,0x9a,0x28,0x4d,0xea,0xcc,0x4c,0xde,0xfe,0x58, - 0xbe,0x71,0x37,0x54,0x1c,0x04,0x71,0x26,0xc8,0xd4, - 0x9e,0x27,0x55,0xab,0x18,0x1a,0xb7,0xe9,0x40,0xb0, - 0xc0}; - - // VC60 workaround: auto_ptr lacks reset() - member_ptr arc4; - bool pass=true, fail; - int i; - - cout << "\nARC4 validation suite running...\n\n"; - - arc4.reset(new Weak::ARC4(Key0, sizeof(Key0))); - arc4->ProcessString(Input0, sizeof(Input0)); - fail = memcmp(Input0, Output0, sizeof(Input0)) != 0; - cout << (fail ? "FAILED" : "passed") << " Test 0" << endl; - pass = pass && !fail; - - arc4.reset(new Weak::ARC4(Key1, sizeof(Key1))); - arc4->ProcessString(Key1, Input1, sizeof(Key1)); - fail = memcmp(Output1, Key1, sizeof(Key1)) != 0; - cout << (fail ? "FAILED" : "passed") << " Test 1" << endl; - pass = pass && !fail; - - arc4.reset(new Weak::ARC4(Key2, sizeof(Key2))); - for (i=0, fail=false; iProcessByte(Input2[i]) != Output2[i]) - fail = true; - cout << (fail ? "FAILED" : "passed") << " Test 2" << endl; - pass = pass && !fail; - - arc4.reset(new Weak::ARC4(Key3, sizeof(Key3))); - for (i=0, fail=false; iProcessByte(Input3[i]) != Output3[i]) - fail = true; - cout << (fail ? "FAILED" : "passed") << " Test 3" << endl; - pass = pass && !fail; - - arc4.reset(new Weak::ARC4(Key4, sizeof(Key4))); - for (i=0, fail=false; iProcessByte(Input4[i]) != Output4[i]) - fail = true; - cout << (fail ? "FAILED" : "passed") << " Test 4" << endl; - pass = pass && !fail; - - return pass; -} - -bool ValidateRC5() -{ - cout << "\nRC5 validation suite running...\n\n"; - - FileSource valdata("TestData/rc5val.dat", true, new HexDecoder); - return BlockTransformationTest(VariableRoundsCipherFactory(16, 12), valdata); -} - -bool ValidateRC6() -{ - cout << "\nRC6 validation suite running...\n\n"; - - FileSource valdata("TestData/rc6val.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 2) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 2) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - return pass; -} - -bool ValidateMARS() -{ - cout << "\nMARS validation suite running...\n\n"; - - FileSource valdata("TestData/marsval.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - return pass; -} - -bool ValidateRijndael() -{ - cout << "\nRijndael (AES) validation suite running...\n\n"; - - FileSource valdata("TestData/rijndael.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - pass = RunTestDataFile("TestVectors/aes.txt") && pass; - return pass; -} - -bool ValidateTwofish() -{ - cout << "\nTwofish validation suite running...\n\n"; - - FileSource valdata("TestData/twofishv.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - return pass; -} - -bool ValidateSerpent() -{ - cout << "\nSerpent validation suite running...\n\n"; - - FileSource valdata("TestData/serpentv.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - return pass; -} - -bool ValidateBlowfish() -{ - cout << "\nBlowfish validation suite running...\n\n"; - - HexEncoder output(new FileSink(cout)); - const char *key[]={"abcdefghijklmnopqrstuvwxyz", "Who is John Galt?"}; - byte *plain[]={(byte *)"BLOWFISH", (byte *)"\xfe\xdc\xba\x98\x76\x54\x32\x10"}; - byte *cipher[]={(byte *)"\x32\x4e\xd0\xfe\xf4\x13\xa2\x03", (byte *)"\xcc\x91\x73\x2b\x80\x22\xf6\x84"}; - byte out[8], outplain[8]; - bool pass=true, fail; - - for (int i=0; i<2; i++) - { - ECB_Mode::Encryption enc((byte *)key[i], strlen(key[i])); - enc.ProcessData(out, plain[i], 8); - fail = memcmp(out, cipher[i], 8) != 0; - - ECB_Mode::Decryption dec((byte *)key[i], strlen(key[i])); - dec.ProcessData(outplain, cipher[i], 8); - fail = fail || memcmp(outplain, plain[i], 8); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << '\"' << key[i] << '\"'; - for (int j=0; j<(signed int)(30-strlen(key[i])); j++) - cout << ' '; - output.Put(outplain, 8); - cout << " "; - output.Put(out, 8); - cout << endl; - } - return pass; -} - -bool ValidateThreeWay() -{ - cout << "\n3-WAY validation suite running...\n\n"; - - FileSource valdata("TestData/3wayval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateGOST() -{ - cout << "\nGOST validation suite running...\n\n"; - - FileSource valdata("TestData/gostval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateSHARK() -{ - cout << "\nSHARK validation suite running...\n\n"; - - FileSource valdata("TestData/sharkval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateCAST() -{ - bool pass = true; - - cout << "\nCAST-128 validation suite running...\n\n"; - - FileSource val128("TestData/cast128v.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val128, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(10), val128, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(5), val128, 1) && pass; - - cout << "\nCAST-256 validation suite running...\n\n"; - - FileSource val256("TestData/cast256v.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val256, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), val256, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), val256, 1) && pass; - - return pass; -} - -bool ValidateSquare() -{ - cout << "\nSquare validation suite running...\n\n"; - - FileSource valdata("TestData/squareva.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateSKIPJACK() -{ - cout << "\nSKIPJACK validation suite running...\n\n"; - - FileSource valdata("TestData/skipjack.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); -} - -bool ValidateSEAL() -{ - byte input[] = {0x37,0xa0,0x05,0x95,0x9b,0x84,0xc4,0x9c,0xa4,0xbe,0x1e,0x05,0x06,0x73,0x53,0x0f,0x5f,0xb0,0x97,0xfd,0xf6,0xa1,0x3f,0xbd,0x6c,0x2c,0xde,0xcd,0x81,0xfd,0xee,0x7c}; - byte output[32]; - byte key[] = {0x67, 0x45, 0x23, 0x01, 0xef, 0xcd, 0xab, 0x89, 0x98, 0xba, 0xdc, 0xfe, 0x10, 0x32, 0x54, 0x76, 0xc3, 0xd2, 0xe1, 0xf0}; - byte iv[] = {0x01, 0x35, 0x77, 0xaf}; - - cout << "\nSEAL validation suite running...\n\n"; - - SEAL<>::Encryption seal(key, sizeof(key), iv); - unsigned int size = sizeof(input); - bool pass = true; - - memset(output, 1, size); - seal.ProcessString(output, input, size); - for (unsigned int i=0; i(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(64), valdata, 10) && pass; - return pass; -} - -bool ValidateCamellia() -{ - cout << "\nCamellia validation suite running...\n\n"; - - bool pass = true; - FileSource valdata("TestData/camellia.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 15) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 15) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 15) && pass; - return pass; -} - -bool ValidateSalsa() -{ - cout << "\nSalsa validation suite running...\n"; - - return RunTestDataFile("TestVectors/salsa.txt"); -} - -bool ValidateSosemanuk() -{ - cout << "\nSosemanuk validation suite running...\n"; - return RunTestDataFile("TestVectors/sosemanuk.txt"); -} - -bool ValidateVMAC() -{ - cout << "\nVMAC validation suite running...\n"; - return RunTestDataFile("TestVectors/vmac.txt"); -} - -bool ValidateCCM() -{ - cout << "\nAES/CCM validation suite running...\n"; - return RunTestDataFile("TestVectors/ccm.txt"); -} - -bool ValidateGCM() -{ - cout << "\nAES/GCM validation suite running...\n"; - cout << "\n2K tables:"; - bool pass = RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)2048)); - cout << "\n64K tables:"; - return RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)64*1024)) && pass; -} - -bool ValidateCMAC() -{ - cout << "\nCMAC validation suite running...\n"; - return RunTestDataFile("TestVectors/cmac.txt"); -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat2.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/validat2.cpp deleted file mode 100644 index e7526787..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat2.cpp +++ /dev/null @@ -1,764 +0,0 @@ -// validat2.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "blumshub.h" -#include "rsa.h" -#include "md2.h" -#include "elgamal.h" -#include "nr.h" -#include "dsa.h" -#include "dh.h" -#include "mqv.h" -#include "luc.h" -#include "xtrcrypt.h" -#include "rabin.h" -#include "rw.h" -#include "eccrypto.h" -#include "ecp.h" -#include "ec2n.h" -#include "asn.h" -#include "rng.h" -#include "files.h" -#include "hex.h" -#include "oids.h" -#include "esign.h" -#include "osrng.h" - -#include -#include - -#include "validate.h" - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -class FixedRNG : public RandomNumberGenerator -{ -public: - FixedRNG(BufferedTransformation &source) : m_source(source) {} - - void GenerateBlock(byte *output, size_t size) - { - m_source.Get(output, size); - } - -private: - BufferedTransformation &m_source; -}; - -bool ValidateBBS() -{ - cout << "\nBlumBlumShub validation suite running...\n\n"; - - Integer p("212004934506826557583707108431463840565872545889679278744389317666981496005411448865750399674653351"); - Integer q("100677295735404212434355574418077394581488455772477016953458064183204108039226017738610663984508231"); - Integer seed("63239752671357255800299643604761065219897634268887145610573595874544114193025997412441121667211431"); - BlumBlumShub bbs(p, q, seed); - bool pass = true, fail; - int j; - - const byte output1[] = { - 0x49,0xEA,0x2C,0xFD,0xB0,0x10,0x64,0xA0,0xBB,0xB9, - 0x2A,0xF1,0x01,0xDA,0xC1,0x8A,0x94,0xF7,0xB7,0xCE}; - const byte output2[] = { - 0x74,0x45,0x48,0xAE,0xAC,0xB7,0x0E,0xDF,0xAF,0xD7, - 0xD5,0x0E,0x8E,0x29,0x83,0x75,0x6B,0x27,0x46,0xA1}; - - byte buf[20]; - - bbs.GenerateBlock(buf, 20); - fail = memcmp(output1, buf, 20) != 0; - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - for (j=0;j<20;j++) - cout << setw(2) << setfill('0') << hex << (int)buf[j]; - cout << endl; - - bbs.Seek(10); - bbs.GenerateBlock(buf, 10); - fail = memcmp(output1+10, buf, 10) != 0; - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - for (j=0;j<10;j++) - cout << setw(2) << setfill('0') << hex << (int)buf[j]; - cout << endl; - - bbs.Seek(1234567); - bbs.GenerateBlock(buf, 20); - fail = memcmp(output2, buf, 20) != 0; - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - for (j=0;j<20;j++) - cout << setw(2) << setfill('0') << hex << (int)buf[j]; - cout << endl; - - return pass; -} - -bool SignatureValidate(PK_Signer &priv, PK_Verifier &pub, bool thorough = false) -{ - bool pass = true, fail; - - fail = !pub.GetMaterial().Validate(GlobalRNG(), thorough ? 3 : 2) || !priv.GetMaterial().Validate(GlobalRNG(), thorough ? 3 : 2); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature key validation\n"; - - const byte *message = (byte *)"test message"; - const int messageLen = 12; - - SecByteBlock signature(priv.MaxSignatureLength()); - size_t signatureLength = priv.SignMessage(GlobalRNG(), message, messageLen, signature); - fail = !pub.VerifyMessage(message, messageLen, signature, signatureLength); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature and verification\n"; - - ++signature[0]; - fail = pub.VerifyMessage(message, messageLen, signature, signatureLength); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "checking invalid signature" << endl; - - if (priv.MaxRecoverableLength() > 0) - { - signatureLength = priv.SignMessageWithRecovery(GlobalRNG(), message, messageLen, NULL, 0, signature); - SecByteBlock recovered(priv.MaxRecoverableLengthFromSignatureLength(signatureLength)); - DecodingResult result = pub.RecoverMessage(recovered, NULL, 0, signature, signatureLength); - fail = !(result.isValidCoding && result.messageLength == messageLen && memcmp(recovered, message, messageLen) == 0); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature and verification with recovery" << endl; - - ++signature[0]; - result = pub.RecoverMessage(recovered, NULL, 0, signature, signatureLength); - fail = result.isValidCoding; - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "recovery with invalid signature" << endl; - } - - return pass; -} - -bool CryptoSystemValidate(PK_Decryptor &priv, PK_Encryptor &pub, bool thorough = false) -{ - bool pass = true, fail; - - fail = !pub.GetMaterial().Validate(GlobalRNG(), thorough ? 3 : 2) || !priv.GetMaterial().Validate(GlobalRNG(), thorough ? 3 : 2); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "cryptosystem key validation\n"; - - const byte *message = (byte *)"test message"; - const int messageLen = 12; - SecByteBlock ciphertext(priv.CiphertextLength(messageLen)); - SecByteBlock plaintext(priv.MaxPlaintextLength(ciphertext.size())); - - pub.Encrypt(GlobalRNG(), message, messageLen, ciphertext); - fail = priv.Decrypt(GlobalRNG(), ciphertext, priv.CiphertextLength(messageLen), plaintext) != DecodingResult(messageLen); - fail = fail || memcmp(message, plaintext, messageLen); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "encryption and decryption\n"; - - return pass; -} - -bool SimpleKeyAgreementValidate(SimpleKeyAgreementDomain &d) -{ - if (d.GetCryptoParameters().Validate(GlobalRNG(), 3)) - cout << "passed simple key agreement domain parameters validation" << endl; - else - { - cout << "FAILED simple key agreement domain parameters invalid" << endl; - return false; - } - - SecByteBlock priv1(d.PrivateKeyLength()), priv2(d.PrivateKeyLength()); - SecByteBlock pub1(d.PublicKeyLength()), pub2(d.PublicKeyLength()); - SecByteBlock val1(d.AgreedValueLength()), val2(d.AgreedValueLength()); - - d.GenerateKeyPair(GlobalRNG(), priv1, pub1); - d.GenerateKeyPair(GlobalRNG(), priv2, pub2); - - memset(val1.begin(), 0x10, val1.size()); - memset(val2.begin(), 0x11, val2.size()); - - if (!(d.Agree(val1, priv1, pub2) && d.Agree(val2, priv2, pub1))) - { - cout << "FAILED simple key agreement failed" << endl; - return false; - } - - if (memcmp(val1.begin(), val2.begin(), d.AgreedValueLength())) - { - cout << "FAILED simple agreed values not equal" << endl; - return false; - } - - cout << "passed simple key agreement" << endl; - return true; -} - -bool AuthenticatedKeyAgreementValidate(AuthenticatedKeyAgreementDomain &d) -{ - if (d.GetCryptoParameters().Validate(GlobalRNG(), 3)) - cout << "passed authenticated key agreement domain parameters validation" << endl; - else - { - cout << "FAILED authenticated key agreement domain parameters invalid" << endl; - return false; - } - - SecByteBlock spriv1(d.StaticPrivateKeyLength()), spriv2(d.StaticPrivateKeyLength()); - SecByteBlock epriv1(d.EphemeralPrivateKeyLength()), epriv2(d.EphemeralPrivateKeyLength()); - SecByteBlock spub1(d.StaticPublicKeyLength()), spub2(d.StaticPublicKeyLength()); - SecByteBlock epub1(d.EphemeralPublicKeyLength()), epub2(d.EphemeralPublicKeyLength()); - SecByteBlock val1(d.AgreedValueLength()), val2(d.AgreedValueLength()); - - d.GenerateStaticKeyPair(GlobalRNG(), spriv1, spub1); - d.GenerateStaticKeyPair(GlobalRNG(), spriv2, spub2); - d.GenerateEphemeralKeyPair(GlobalRNG(), epriv1, epub1); - d.GenerateEphemeralKeyPair(GlobalRNG(), epriv2, epub2); - - memset(val1.begin(), 0x10, val1.size()); - memset(val2.begin(), 0x11, val2.size()); - - if (!(d.Agree(val1, spriv1, epriv1, spub2, epub2) && d.Agree(val2, spriv2, epriv2, spub1, epub1))) - { - cout << "FAILED authenticated key agreement failed" << endl; - return false; - } - - if (memcmp(val1.begin(), val2.begin(), d.AgreedValueLength())) - { - cout << "FAILED authenticated agreed values not equal" << endl; - return false; - } - - cout << "passed authenticated key agreement" << endl; - return true; -} - -bool ValidateRSA() -{ - cout << "\nRSA validation suite running...\n\n"; - - byte out[100], outPlain[100]; - bool pass = true, fail; - - { - const char *plain = "Everyone gets Friday off."; - byte *signature = (byte *) - "\x05\xfa\x6a\x81\x2f\xc7\xdf\x8b\xf4\xf2\x54\x25\x09\xe0\x3e\x84" - "\x6e\x11\xb9\xc6\x20\xbe\x20\x09\xef\xb4\x40\xef\xbc\xc6\x69\x21" - "\x69\x94\xac\x04\xf3\x41\xb5\x7d\x05\x20\x2d\x42\x8f\xb2\xa2\x7b" - "\x5c\x77\xdf\xd9\xb1\x5b\xfc\x3d\x55\x93\x53\x50\x34\x10\xc1\xe1"; - - FileSource keys("TestData/rsa512a.dat", true, new HexDecoder); - Weak::RSASSA_PKCS1v15_MD2_Signer rsaPriv(keys); - Weak::RSASSA_PKCS1v15_MD2_Verifier rsaPub(rsaPriv); - - size_t signatureLength = rsaPriv.SignMessage(GlobalRNG(), (byte *)plain, strlen(plain), out); - fail = memcmp(signature, out, 64) != 0; - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature check against test vector\n"; - - fail = !rsaPub.VerifyMessage((byte *)plain, strlen(plain), out, signatureLength); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "verification check against test vector\n"; - - out[10]++; - fail = rsaPub.VerifyMessage((byte *)plain, strlen(plain), out, signatureLength); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "invalid signature verification\n"; - } - { - FileSource keys("TestData/rsa1024.dat", true, new HexDecoder); - RSAES_PKCS1v15_Decryptor rsaPriv(keys); - RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv); - - pass = CryptoSystemValidate(rsaPriv, rsaPub) && pass; - } - { - RSAES >::Decryptor rsaPriv(GlobalRNG(), 512); - RSAES >::Encryptor rsaPub(rsaPriv); - - pass = CryptoSystemValidate(rsaPriv, rsaPub) && pass; - } - { - byte *plain = (byte *) - "\x54\x85\x9b\x34\x2c\x49\xea\x2a"; - byte *encrypted = (byte *) - "\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a" - "\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4" - "\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52" - "\x62\x51"; - byte *oaepSeed = (byte *) - "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2" - "\xf0\x6c\xb5\x8f"; - ByteQueue bq; - bq.Put(oaepSeed, 20); - FixedRNG rng(bq); - - FileSource privFile("TestData/rsa400pv.dat", true, new HexDecoder); - FileSource pubFile("TestData/rsa400pb.dat", true, new HexDecoder); - RSAES_OAEP_SHA_Decryptor rsaPriv; - rsaPriv.AccessKey().BERDecodePrivateKey(privFile, false, 0); - RSAES_OAEP_SHA_Encryptor rsaPub(pubFile); - - memset(out, 0, 50); - memset(outPlain, 0, 8); - rsaPub.Encrypt(rng, plain, 8, out); - DecodingResult result = rsaPriv.FixedLengthDecrypt(GlobalRNG(), encrypted, outPlain); - fail = !result.isValidCoding || (result.messageLength!=8) || memcmp(out, encrypted, 50) || memcmp(plain, outPlain, 8); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "PKCS 2.0 encryption and decryption\n"; - } - - return pass; -} - -bool ValidateDH() -{ - cout << "\nDH validation suite running...\n\n"; - - FileSource f("TestData/dh1024.dat", true, new HexDecoder()); - DH dh(f); - return SimpleKeyAgreementValidate(dh); -} - -bool ValidateMQV() -{ - cout << "\nMQV validation suite running...\n\n"; - - FileSource f("TestData/mqv1024.dat", true, new HexDecoder()); - MQV mqv(f); - return AuthenticatedKeyAgreementValidate(mqv); -} - -bool ValidateLUC_DH() -{ - cout << "\nLUC-DH validation suite running...\n\n"; - - FileSource f("TestData/lucd512.dat", true, new HexDecoder()); - LUC_DH dh(f); - return SimpleKeyAgreementValidate(dh); -} - -bool ValidateXTR_DH() -{ - cout << "\nXTR-DH validation suite running...\n\n"; - - FileSource f("TestData/xtrdh171.dat", true, new HexDecoder()); - XTR_DH dh(f); - return SimpleKeyAgreementValidate(dh); -} - -bool ValidateElGamal() -{ - cout << "\nElGamal validation suite running...\n\n"; - bool pass = true; - { - FileSource fc("TestData/elgc1024.dat", true, new HexDecoder); - ElGamalDecryptor privC(fc); - ElGamalEncryptor pubC(privC); - privC.AccessKey().Precompute(); - ByteQueue queue; - privC.AccessKey().SavePrecomputation(queue); - privC.AccessKey().LoadPrecomputation(queue); - - pass = CryptoSystemValidate(privC, pubC) && pass; - } - return pass; -} - -bool ValidateDLIES() -{ - cout << "\nDLIES validation suite running...\n\n"; - bool pass = true; - { - FileSource fc("TestData/dlie1024.dat", true, new HexDecoder); - DLIES<>::Decryptor privC(fc); - DLIES<>::Encryptor pubC(privC); - pass = CryptoSystemValidate(privC, pubC) && pass; - } - { - cout << "Generating new encryption key..." << endl; - DLIES<>::GroupParameters gp; - gp.GenerateRandomWithKeySize(GlobalRNG(), 128); - DLIES<>::Decryptor decryptor; - decryptor.AccessKey().GenerateRandom(GlobalRNG(), gp); - DLIES<>::Encryptor encryptor(decryptor); - - pass = CryptoSystemValidate(decryptor, encryptor) && pass; - } - return pass; -} - -bool ValidateNR() -{ - cout << "\nNR validation suite running...\n\n"; - bool pass = true; - { - FileSource f("TestData/nr2048.dat", true, new HexDecoder); - NR::Signer privS(f); - privS.AccessKey().Precompute(); - NR::Verifier pubS(privS); - - pass = SignatureValidate(privS, pubS) && pass; - } - { - cout << "Generating new signature key..." << endl; - NR::Signer privS(GlobalRNG(), 256); - NR::Verifier pubS(privS); - - pass = SignatureValidate(privS, pubS) && pass; - } - return pass; -} - -bool ValidateDSA(bool thorough) -{ - cout << "\nDSA validation suite running...\n\n"; - - bool pass = true, fail; - { - FileSource fs("TestData/dsa512.dat", true, new HexDecoder()); - GDSA::Signer priv(fs); - priv.AccessKey().Precompute(16); - GDSA::Verifier pub(priv); - - byte seed[]={0xd5, 0x01, 0x4e, 0x4b, 0x60, 0xef, 0x2b, 0xa8, 0xb6, 0x21, - 0x1b, 0x40, 0x62, 0xba, 0x32, 0x24, 0xe0, 0x42, 0x7d, 0xd3}; - Integer k("358dad57 1462710f 50e254cf 1a376b2b deaadfbfh"); - Integer h("a9993e36 4706816a ba3e2571 7850c26c 9cd0d89dh"); - byte sig[]={0x8b, 0xac, 0x1a, 0xb6, 0x64, 0x10, 0x43, 0x5c, 0xb7, 0x18, - 0x1f, 0x95, 0xb1, 0x6a, 0xb9, 0x7c, 0x92, 0xb3, 0x41, 0xc0, - 0x41, 0xe2, 0x34, 0x5f, 0x1f, 0x56, 0xdf, 0x24, 0x58, 0xf4, - 0x26, 0xd1, 0x55, 0xb4, 0xba, 0x2d, 0xb6, 0xdc, 0xd8, 0xc8}; - Integer r(sig, 20); - Integer s(sig+20, 20); - - Integer pGen, qGen, rOut, sOut; - int c; - - fail = !DSA::GeneratePrimes(seed, 160, c, pGen, 512, qGen); - fail = fail || (pGen != pub.GetKey().GetGroupParameters().GetModulus()) || (qGen != pub.GetKey().GetGroupParameters().GetSubgroupOrder()); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "prime generation test\n"; - - priv.RawSign(k, h, rOut, sOut); - fail = (rOut != r) || (sOut != s); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature check against test vector\n"; - - fail = !pub.VerifyMessage((byte *)"abc", 3, sig, sizeof(sig)); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "verification check against test vector\n"; - - fail = pub.VerifyMessage((byte *)"xyz", 3, sig, sizeof(sig)); - pass = pass && !fail; - } - FileSource fs1("TestData/dsa1024.dat", true, new HexDecoder()); - DSA::Signer priv(fs1); - DSA::Verifier pub(priv); - FileSource fs2("TestData/dsa1024b.dat", true, new HexDecoder()); - DSA::Verifier pub1(fs2); - assert(pub.GetKey() == pub1.GetKey()); - pass = SignatureValidate(priv, pub, thorough) && pass; - return pass; -} - -bool ValidateLUC() -{ - cout << "\nLUC validation suite running...\n\n"; - bool pass=true; - - { - FileSource f("TestData/luc1024.dat", true, new HexDecoder); - LUCSSA_PKCS1v15_SHA_Signer priv(f); - LUCSSA_PKCS1v15_SHA_Verifier pub(priv); - pass = SignatureValidate(priv, pub) && pass; - } - { - LUCES_OAEP_SHA_Decryptor priv(GlobalRNG(), 512); - LUCES_OAEP_SHA_Encryptor pub(priv); - pass = CryptoSystemValidate(priv, pub) && pass; - } - return pass; -} - -bool ValidateLUC_DL() -{ - cout << "\nLUC-HMP validation suite running...\n\n"; - - FileSource f("TestData/lucs512.dat", true, new HexDecoder); - LUC_HMP::Signer privS(f); - LUC_HMP::Verifier pubS(privS); - bool pass = SignatureValidate(privS, pubS); - - cout << "\nLUC-IES validation suite running...\n\n"; - - FileSource fc("TestData/lucc512.dat", true, new HexDecoder); - LUC_IES<>::Decryptor privC(fc); - LUC_IES<>::Encryptor pubC(privC); - pass = CryptoSystemValidate(privC, pubC) && pass; - - return pass; -} - -bool ValidateRabin() -{ - cout << "\nRabin validation suite running...\n\n"; - bool pass=true; - - { - FileSource f("TestData/rabi1024.dat", true, new HexDecoder); - RabinSS::Signer priv(f); - RabinSS::Verifier pub(priv); - pass = SignatureValidate(priv, pub) && pass; - } - { - RabinES >::Decryptor priv(GlobalRNG(), 512); - RabinES >::Encryptor pub(priv); - pass = CryptoSystemValidate(priv, pub) && pass; - } - return pass; -} - -bool ValidateRW() -{ - cout << "\nRW validation suite running...\n\n"; - - FileSource f("TestData/rw1024.dat", true, new HexDecoder); - RWSS::Signer priv(f); - RWSS::Verifier pub(priv); - - return SignatureValidate(priv, pub); -} - -/* -bool ValidateBlumGoldwasser() -{ - cout << "\nBlumGoldwasser validation suite running...\n\n"; - - FileSource f("TestData/blum512.dat", true, new HexDecoder); - BlumGoldwasserPrivateKey priv(f); - BlumGoldwasserPublicKey pub(priv); - - return CryptoSystemValidate(priv, pub); -} -*/ - -bool ValidateECP() -{ - cout << "\nECP validation suite running...\n\n"; - - ECIES::Decryptor cpriv(GlobalRNG(), ASN1::secp192r1()); - ECIES::Encryptor cpub(cpriv); - ByteQueue bq; - cpriv.GetKey().DEREncode(bq); - cpub.AccessKey().AccessGroupParameters().SetEncodeAsOID(true); - cpub.GetKey().DEREncode(bq); - ECDSA::Signer spriv(bq); - ECDSA::Verifier spub(bq); - ECDH::Domain ecdhc(ASN1::secp192r1()); - ECMQV::Domain ecmqvc(ASN1::secp192r1()); - - spriv.AccessKey().Precompute(); - ByteQueue queue; - spriv.AccessKey().SavePrecomputation(queue); - spriv.AccessKey().LoadPrecomputation(queue); - - bool pass = SignatureValidate(spriv, spub); - cpub.AccessKey().Precompute(); - cpriv.AccessKey().Precompute(); - pass = CryptoSystemValidate(cpriv, cpub) && pass; - pass = SimpleKeyAgreementValidate(ecdhc) && pass; - pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; - - cout << "Turning on point compression..." << endl; - cpriv.AccessKey().AccessGroupParameters().SetPointCompression(true); - cpub.AccessKey().AccessGroupParameters().SetPointCompression(true); - ecdhc.AccessGroupParameters().SetPointCompression(true); - ecmqvc.AccessGroupParameters().SetPointCompression(true); - pass = CryptoSystemValidate(cpriv, cpub) && pass; - pass = SimpleKeyAgreementValidate(ecdhc) && pass; - pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; - - cout << "Testing SEC 2, NIST, and Brainpool recommended curves..." << endl; - OID oid; - while (!(oid = DL_GroupParameters_EC::GetNextRecommendedParametersOID(oid)).m_values.empty()) - { - DL_GroupParameters_EC params(oid); - bool fail = !params.Validate(GlobalRNG(), 2); - cout << (fail ? "FAILED" : "passed") << " " << dec << params.GetCurve().GetField().MaxElementBitLength() << " bits" << endl; - pass = pass && !fail; - } - - return pass; -} - -bool ValidateEC2N() -{ - cout << "\nEC2N validation suite running...\n\n"; - - ECIES::Decryptor cpriv(GlobalRNG(), ASN1::sect193r1()); - ECIES::Encryptor cpub(cpriv); - ByteQueue bq; - cpriv.DEREncode(bq); - cpub.AccessKey().AccessGroupParameters().SetEncodeAsOID(true); - cpub.DEREncode(bq); - ECDSA::Signer spriv(bq); - ECDSA::Verifier spub(bq); - ECDH::Domain ecdhc(ASN1::sect193r1()); - ECMQV::Domain ecmqvc(ASN1::sect193r1()); - - spriv.AccessKey().Precompute(); - ByteQueue queue; - spriv.AccessKey().SavePrecomputation(queue); - spriv.AccessKey().LoadPrecomputation(queue); - - bool pass = SignatureValidate(spriv, spub); - pass = CryptoSystemValidate(cpriv, cpub) && pass; - pass = SimpleKeyAgreementValidate(ecdhc) && pass; - pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; - - cout << "Turning on point compression..." << endl; - cpriv.AccessKey().AccessGroupParameters().SetPointCompression(true); - cpub.AccessKey().AccessGroupParameters().SetPointCompression(true); - ecdhc.AccessGroupParameters().SetPointCompression(true); - ecmqvc.AccessGroupParameters().SetPointCompression(true); - pass = CryptoSystemValidate(cpriv, cpub) && pass; - pass = SimpleKeyAgreementValidate(ecdhc) && pass; - pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; - -#if 0 // TODO: turn this back on when I make EC2N faster for pentanomial basis - cout << "Testing SEC 2 recommended curves..." << endl; - OID oid; - while (!(oid = DL_GroupParameters_EC::GetNextRecommendedParametersOID(oid)).m_values.empty()) - { - DL_GroupParameters_EC params(oid); - bool fail = !params.Validate(GlobalRNG(), 2); - cout << (fail ? "FAILED" : "passed") << " " << params.GetCurve().GetField().MaxElementBitLength() << " bits" << endl; - pass = pass && !fail; - } -#endif - - return pass; -} - -bool ValidateECDSA() -{ - cout << "\nECDSA validation suite running...\n\n"; - - // from Sample Test Vectors for P1363 - GF2NT gf2n(191, 9, 0); - byte a[]="\x28\x66\x53\x7B\x67\x67\x52\x63\x6A\x68\xF5\x65\x54\xE1\x26\x40\x27\x6B\x64\x9E\xF7\x52\x62\x67"; - byte b[]="\x2E\x45\xEF\x57\x1F\x00\x78\x6F\x67\xB0\x08\x1B\x94\x95\xA3\xD9\x54\x62\xF5\xDE\x0A\xA1\x85\xEC"; - EC2N ec(gf2n, PolynomialMod2(a,24), PolynomialMod2(b,24)); - - EC2N::Point P; - ec.DecodePoint(P, (byte *)"\x04\x36\xB3\xDA\xF8\xA2\x32\x06\xF9\xC4\xF2\x99\xD7\xB2\x1A\x9C\x36\x91\x37\xF2\xC8\x4A\xE1\xAA\x0D" - "\x76\x5B\xE7\x34\x33\xB3\xF9\x5E\x33\x29\x32\xE7\x0E\xA2\x45\xCA\x24\x18\xEA\x0E\xF9\x80\x18\xFB", ec.EncodedPointSize()); - Integer n("40000000000000000000000004a20e90c39067c893bbb9a5H"); - Integer d("340562e1dda332f9d2aec168249b5696ee39d0ed4d03760fH"); - EC2N::Point Q(ec.Multiply(d, P)); - ECDSA::Signer priv(ec, P, n, d); - ECDSA::Verifier pub(priv); - - Integer h("A9993E364706816ABA3E25717850C26C9CD0D89DH"); - Integer k("3eeace72b4919d991738d521879f787cb590aff8189d2b69H"); - byte sig[]="\x03\x8e\x5a\x11\xfb\x55\xe4\xc6\x54\x71\xdc\xd4\x99\x84\x52\xb1\xe0\x2d\x8a\xf7\x09\x9b\xb9\x30" - "\x0c\x9a\x08\xc3\x44\x68\xc2\x44\xb4\xe5\xd6\xb2\x1b\x3c\x68\x36\x28\x07\x41\x60\x20\x32\x8b\x6e"; - Integer r(sig, 24); - Integer s(sig+24, 24); - - Integer rOut, sOut; - bool fail, pass=true; - - priv.RawSign(k, h, rOut, sOut); - fail = (rOut != r) || (sOut != s); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "signature check against test vector\n"; - - fail = !pub.VerifyMessage((byte *)"abc", 3, sig, sizeof(sig)); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "verification check against test vector\n"; - - fail = pub.VerifyMessage((byte *)"xyz", 3, sig, sizeof(sig)); - pass = pass && !fail; - - pass = SignatureValidate(priv, pub) && pass; - - return pass; -} - -bool ValidateESIGN() -{ - cout << "\nESIGN validation suite running...\n\n"; - - bool pass = true, fail; - - const char *plain = "test"; - const byte *signature = (byte *) - "\xA3\xE3\x20\x65\xDE\xDA\xE7\xEC\x05\xC1\xBF\xCD\x25\x79\x7D\x99\xCD\xD5\x73\x9D\x9D\xF3\xA4\xAA\x9A\xA4\x5A\xC8\x23\x3D\x0D\x37\xFE\xBC\x76\x3F\xF1\x84\xF6\x59" - "\x14\x91\x4F\x0C\x34\x1B\xAE\x9A\x5C\x2E\x2E\x38\x08\x78\x77\xCB\xDC\x3C\x7E\xA0\x34\x44\x5B\x0F\x67\xD9\x35\x2A\x79\x47\x1A\x52\x37\x71\xDB\x12\x67\xC1\xB6\xC6" - "\x66\x73\xB3\x40\x2E\xD6\xF2\x1A\x84\x0A\xB6\x7B\x0F\xEB\x8B\x88\xAB\x33\xDD\xE4\x83\x21\x90\x63\x2D\x51\x2A\xB1\x6F\xAB\xA7\x5C\xFD\x77\x99\xF2\xE1\xEF\x67\x1A" - "\x74\x02\x37\x0E\xED\x0A\x06\xAD\xF4\x15\x65\xB8\xE1\xD1\x45\xAE\x39\x19\xB4\xFF\x5D\xF1\x45\x7B\xE0\xFE\x72\xED\x11\x92\x8F\x61\x41\x4F\x02\x00\xF2\x76\x6F\x7C" - "\x79\xA2\xE5\x52\x20\x5D\x97\x5E\xFE\x39\xAE\x21\x10\xFB\x35\xF4\x80\x81\x41\x13\xDD\xE8\x5F\xCA\x1E\x4F\xF8\x9B\xB2\x68\xFB\x28"; - - FileSource keys("TestData/esig1536.dat", true, new HexDecoder); - ESIGN::Signer signer(keys); - ESIGN::Verifier verifier(signer); - - fail = !SignatureValidate(signer, verifier); - pass = pass && !fail; - - fail = !verifier.VerifyMessage((byte *)plain, strlen(plain), signature, verifier.SignatureLength()); - pass = pass && !fail; - - cout << (fail ? "FAILED " : "passed "); - cout << "verification check against test vector\n"; - - cout << "Generating signature key from seed..." << endl; - signer.AccessKey().GenerateRandom(GlobalRNG(), MakeParameters("Seed", ConstByteArrayParameter((const byte *)"test", 4))("KeySize", 3*512)); - verifier = signer; - - fail = !SignatureValidate(signer, verifier); - pass = pass && !fail; - - return pass; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat3.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/validat3.cpp deleted file mode 100644 index 035b5563..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/validat3.cpp +++ /dev/null @@ -1,591 +0,0 @@ -// validat3.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "validate.h" - -#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include "smartptr.h" -#include "crc.h" -#include "adler32.h" -#include "md2.h" -#include "md4.h" -#include "md5.h" -#include "sha.h" -#include "tiger.h" -#include "ripemd.h" - -#include "hmac.h" -#include "ttmac.h" - -#include "integer.h" -#include "pwdbased.h" -#include "filters.h" -#include "hex.h" -#include "files.h" - -#include -#include - -USING_NAMESPACE(CryptoPP) -USING_NAMESPACE(std) - -struct HashTestTuple -{ - HashTestTuple(const char *input, const char *output, unsigned int repeatTimes=1) - : input((byte *)input), output((byte *)output), inputLen(strlen(input)), repeatTimes(repeatTimes) {} - - HashTestTuple(const char *input, unsigned int inputLen, const char *output, unsigned int repeatTimes) - : input((byte *)input), output((byte *)output), inputLen(inputLen), repeatTimes(repeatTimes) {} - - const byte *input, *output; - size_t inputLen; - unsigned int repeatTimes; -}; - -bool HashModuleTest(HashTransformation &md, const HashTestTuple *testSet, unsigned int testSetSize) -{ - bool pass=true, fail; - SecByteBlock digest(md.DigestSize()); - - for (unsigned int i=0; i XMACC_MD5; - - const byte keys[2][XMACC_MD5::KEYLENGTH]={ - {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb}, - {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98}}; - - const word32 counters[2]={0xccddeeff, 0x76543210}; - - const char *TestVals[7]={ - "", - "a", - "abc", - "message digest", - "abcdefghijklmnopqrstuvwxyz", - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}; - - const byte output[2][7][XMACC_MD5::DIGESTSIZE]={ - {{0xcc,0xdd,0xef,0x00,0xfa,0x89,0x54,0x92,0x86,0x32,0xda,0x2a,0x3f,0x29,0xc5,0x52,0xa0,0x0d,0x05,0x13}, - {0xcc,0xdd,0xef,0x01,0xae,0xdb,0x8b,0x7b,0x69,0x71,0xc7,0x91,0x71,0x48,0x9d,0x18,0xe7,0xdf,0x9d,0x5a}, - {0xcc,0xdd,0xef,0x02,0x5e,0x01,0x2e,0x2e,0x4b,0xc3,0x83,0x62,0xc2,0xf4,0xe6,0x18,0x1c,0x44,0xaf,0xca}, - {0xcc,0xdd,0xef,0x03,0x3e,0xa9,0xf1,0xe0,0x97,0x91,0xf8,0xe2,0xbe,0xe0,0xdf,0xf3,0x41,0x03,0xb3,0x5a}, - {0xcc,0xdd,0xef,0x04,0x2e,0x6a,0x8d,0xb9,0x72,0xe3,0xce,0x9f,0xf4,0x28,0x45,0xe7,0xbc,0x80,0xa9,0xc7}, - {0xcc,0xdd,0xef,0x05,0x1a,0xd5,0x40,0x78,0xfb,0x16,0x37,0xfc,0x7a,0x1d,0xce,0xb4,0x77,0x10,0xb2,0xa0}, - {0xcc,0xdd,0xef,0x06,0x13,0x2f,0x11,0x47,0xd7,0x1b,0xb5,0x52,0x36,0x51,0x26,0xb0,0x96,0xd7,0x60,0x81}}, - {{0x76,0x54,0x32,0x11,0xe9,0xcb,0x74,0x32,0x07,0x93,0xfe,0x01,0xdd,0x27,0xdb,0xde,0x6b,0x77,0xa4,0x56}, - {0x76,0x54,0x32,0x12,0xcd,0x55,0x87,0x5c,0xc0,0x35,0x85,0x99,0x44,0x02,0xa5,0x0b,0x8c,0xe7,0x2c,0x68}, - {0x76,0x54,0x32,0x13,0xac,0xfd,0x87,0x50,0xc3,0x8f,0xcd,0x58,0xaa,0xa5,0x7e,0x7a,0x25,0x63,0x26,0xd1}, - {0x76,0x54,0x32,0x14,0xe3,0x30,0xf5,0xdd,0x27,0x2b,0x76,0x22,0x7f,0xaa,0x90,0x73,0x6a,0x48,0xdb,0x00}, - {0x76,0x54,0x32,0x15,0xfc,0x57,0x00,0x20,0x7c,0x9d,0xf6,0x30,0x6f,0xbd,0x46,0x3e,0xfb,0x8a,0x2c,0x60}, - {0x76,0x54,0x32,0x16,0xfb,0x0f,0xd3,0xdf,0x4c,0x4b,0xc3,0x05,0x9d,0x63,0x1e,0xba,0x25,0x2b,0xbe,0x35}, - {0x76,0x54,0x32,0x17,0xc6,0xfe,0xe6,0x5f,0xb1,0x35,0x8a,0xf5,0x32,0x7a,0x80,0xbd,0xb8,0x72,0xee,0xae}}}; - - byte digest[XMACC_MD5::DIGESTSIZE]; - bool pass=true, fail; - - cout << "\nXMACC/MD5 validation suite running...\n"; - - for (int k=0; k<2; k++) - { - XMACC_MD5 mac(keys[k], counters[k]); - cout << "\nKEY: "; - for (int j=0;j pbkdf; - - cout << "\nPKCS #12 PBKDF validation suite running...\n\n"; - pass = TestPBKDF(pbkdf, testSet, sizeof(testSet)/sizeof(testSet[0])) && pass; - } - - { - // from draft-ietf-smime-password-03.txt, at http://www.imc.org/draft-ietf-smime-password - PBKDF_TestTuple testSet[] = - { - {0, 5, "70617373776f7264", "1234567878563412", "D1DAA78615F287E6"}, - {0, 500, "416C6C206E2D656E746974696573206D75737420636F6D6D756E69636174652077697468206F74686572206E2d656E74697469657320766961206E2D3120656E746974656568656568656573", "1234567878563412","6A8970BF68C92CAEA84A8DF28510858607126380CC47AB2D"} - }; - - PKCS5_PBKDF2_HMAC pbkdf; - - cout << "\nPKCS #5 PBKDF2 validation suite running...\n\n"; - pass = TestPBKDF(pbkdf, testSet, sizeof(testSet)/sizeof(testSet[0])) && pass; - } - - return pass; -} diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/validate.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/validate.h deleted file mode 100644 index 68534077..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/validate.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef CRYPTOPP_VALIDATE_H -#define CRYPTOPP_VALIDATE_H - -#include "cryptlib.h" - -bool ValidateAll(bool thorough); -bool TestSettings(); -bool TestOS_RNG(); -bool ValidateBaseCode(); - -bool ValidateCRC32(); -bool ValidateAdler32(); -bool ValidateMD2(); -bool ValidateMD4(); -bool ValidateMD5(); -bool ValidateSHA(); -bool ValidateSHA2(); -bool ValidateTiger(); -bool ValidateRIPEMD(); -bool ValidatePanama(); -bool ValidateWhirlpool(); - -bool ValidateHMAC(); -bool ValidateTTMAC(); - -bool ValidateCipherModes(); -bool ValidatePBKDF(); - -bool ValidateDES(); -bool ValidateIDEA(); -bool ValidateSAFER(); -bool ValidateRC2(); -bool ValidateARC4(); - -bool ValidateRC5(); -bool ValidateBlowfish(); -bool ValidateThreeWay(); -bool ValidateGOST(); -bool ValidateSHARK(); -bool ValidateSEAL(); -bool ValidateCAST(); -bool ValidateSquare(); -bool ValidateSKIPJACK(); -bool ValidateRC6(); -bool ValidateMARS(); -bool ValidateRijndael(); -bool ValidateTwofish(); -bool ValidateSerpent(); -bool ValidateSHACAL2(); -bool ValidateCamellia(); -bool ValidateSalsa(); -bool ValidateSosemanuk(); -bool ValidateVMAC(); -bool ValidateCCM(); -bool ValidateGCM(); -bool ValidateCMAC(); - -bool ValidateBBS(); -bool ValidateDH(); -bool ValidateMQV(); -bool ValidateRSA(); -bool ValidateElGamal(); -bool ValidateDLIES(); -bool ValidateNR(); -bool ValidateDSA(bool thorough); -bool ValidateLUC(); -bool ValidateLUC_DL(); -bool ValidateLUC_DH(); -bool ValidateXTR_DH(); -bool ValidateRabin(); -bool ValidateRW(); -//bool ValidateBlumGoldwasser(); -bool ValidateECP(); -bool ValidateEC2N(); -bool ValidateECDSA(); -bool ValidateESIGN(); - -CryptoPP::RandomNumberGenerator & GlobalRNG(); -bool RunTestDataFile(const char *filename, const CryptoPP::NameValuePairs &overrideParameters=CryptoPP::g_nullNameValuePairs); - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.cpp deleted file mode 100644 index 6b490f90..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.cpp +++ /dev/null @@ -1,832 +0,0 @@ -// vmac.cpp - written and placed in the public domain by Wei Dai -// based on Ted Krovetz's public domain vmac.c and draft-krovetz-vmac-01.txt - -#include "pch.h" -#include "vmac.h" -#include "argnames.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -#if defined(_MSC_VER) && !CRYPTOPP_BOOL_SLOW_WORD64 -#include -#endif - -#define VMAC_BOOL_WORD128 (defined(CRYPTOPP_WORD128_AVAILABLE) && !defined(CRYPTOPP_X64_ASM_AVAILABLE)) -#ifdef __BORLANDC__ -#define const // Turbo C++ 2006 workaround -#endif -static const word64 p64 = W64LIT(0xfffffffffffffeff); /* 2^64 - 257 prime */ -static const word64 m62 = W64LIT(0x3fffffffffffffff); /* 62-bit mask */ -static const word64 m63 = W64LIT(0x7fffffffffffffff); /* 63-bit mask */ -static const word64 m64 = W64LIT(0xffffffffffffffff); /* 64-bit mask */ -static const word64 mpoly = W64LIT(0x1fffffff1fffffff); /* Poly key mask */ -#ifdef __BORLANDC__ -#undef const -#endif -#if VMAC_BOOL_WORD128 -#ifdef __powerpc__ -// workaround GCC Bug 31690: ICE with const __uint128_t and C++ front-end -#define m126 ((word128(m62)<<64)|m64) -#else -static const word128 m126 = (word128(m62)<<64)|m64; /* 126-bit mask */ -#endif -#endif - -void VMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs ¶ms) -{ - int digestLength = params.GetIntValueWithDefault(Name::DigestSize(), DefaultDigestSize()); - if (digestLength != 8 && digestLength != 16) - throw InvalidArgument("VMAC: DigestSize must be 8 or 16"); - m_is128 = digestLength == 16; - - m_L1KeyLength = params.GetIntValueWithDefault(Name::L1KeyLength(), 128); - if (m_L1KeyLength <= 0 || m_L1KeyLength % 128 != 0) - throw InvalidArgument("VMAC: L1KeyLength must be a positive multiple of 128"); - - AllocateBlocks(); - - BlockCipher &cipher = AccessCipher(); - cipher.SetKey(userKey, keylength, params); - unsigned int blockSize = cipher.BlockSize(); - unsigned int blockSizeInWords = blockSize / sizeof(word64); - SecBlock out(blockSizeInWords); - SecByteBlock in; - in.CleanNew(blockSize); - size_t i; - - /* Fill nh key */ - in[0] = 0x80; - cipher.AdvancedProcessBlocks(in, NULL, (byte *)m_nhKey(), m_nhKeySize()*sizeof(word64), cipher.BT_InBlockIsCounter); - ConditionalByteReverse(BIG_ENDIAN_ORDER, m_nhKey(), m_nhKey(), m_nhKeySize()*sizeof(word64)); - - /* Fill poly key */ - in[0] = 0xC0; - in[15] = 0; - for (i = 0; i <= (size_t)m_is128; i++) - { - cipher.ProcessBlock(in, out.BytePtr()); - m_polyState()[i*4+2] = GetWord(true, BIG_ENDIAN_ORDER, out.BytePtr()) & mpoly; - m_polyState()[i*4+3] = GetWord(true, BIG_ENDIAN_ORDER, out.BytePtr()+8) & mpoly; - in[15]++; - } - - /* Fill ip key */ - in[0] = 0xE0; - in[15] = 0; - word64 *l3Key = m_l3Key(); - for (i = 0; i <= (size_t)m_is128; i++) - do - { - cipher.ProcessBlock(in, out.BytePtr()); - l3Key[i*2+0] = GetWord(true, BIG_ENDIAN_ORDER, out.BytePtr()); - l3Key[i*2+1] = GetWord(true, BIG_ENDIAN_ORDER, out.BytePtr()+8); - in[15]++; - } while ((l3Key[i*2+0] >= p64) || (l3Key[i*2+1] >= p64)); - - m_padCached = false; - size_t nonceLength; - const byte *nonce = GetIVAndThrowIfInvalid(params, nonceLength); - Resynchronize(nonce, (int)nonceLength); -} - -void VMAC_Base::GetNextIV(RandomNumberGenerator &rng, byte *IV) -{ - SimpleKeyingInterface::GetNextIV(rng, IV); - IV[0] &= 0x7f; -} - -void VMAC_Base::Resynchronize(const byte *nonce, int len) -{ - size_t length = ThrowIfInvalidIVLength(len); - size_t s = IVSize(); - byte *storedNonce = m_nonce(); - - if (m_is128) - { - memset(storedNonce, 0, s-length); - memcpy(storedNonce+s-length, nonce, length); - AccessCipher().ProcessBlock(storedNonce, m_pad()); - } - else - { - if (m_padCached && (storedNonce[s-1] | 1) == (nonce[length-1] | 1)) - { - m_padCached = VerifyBufsEqual(storedNonce+s-length, nonce, length-1); - for (size_t i=0; m_padCached && i>64); rl = word64(p);} - #define AccumulateNH(a, b, c) a += word128(b)*(c) - #define Multiply128(r, i1, i2) r = word128(word64(i1)) * word64(i2) -#else - #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) - #define MUL32(a, b) __emulu(word32(a), word32(b)) - #else - #define MUL32(a, b) ((word64)((word32)(a)) * (word32)(b)) - #endif - #if defined(CRYPTOPP_X64_ASM_AVAILABLE) - #define DeclareNH(a) word64 a##0=0, a##1=0 - #define MUL64(rh,rl,i1,i2) asm ("mulq %3" : "=a"(rl), "=d"(rh) : "a"(i1), "g"(i2) : "cc"); - #define AccumulateNH(a, b, c) asm ("mulq %3; addq %%rax, %0; adcq %%rdx, %1" : "+r"(a##0), "+r"(a##1) : "a"(b), "g"(c) : "%rdx", "cc"); - #define ADD128(rh,rl,ih,il) asm ("addq %3, %1; adcq %2, %0" : "+r"(rh),"+r"(rl) : "r"(ih),"r"(il) : "cc"); - #elif defined(_MSC_VER) && !CRYPTOPP_BOOL_SLOW_WORD64 - #define DeclareNH(a) word64 a##0=0, a##1=0 - #define MUL64(rh,rl,i1,i2) (rl) = _umul128(i1,i2,&(rh)); - #define AccumulateNH(a, b, c) {\ - word64 ph, pl;\ - pl = _umul128(b,c,&ph);\ - a##0 += pl;\ - a##1 += ph + (a##0 < pl);} - #else - #define VMAC_BOOL_32BIT 1 - #define DeclareNH(a) word64 a##0=0, a##1=0, a##2=0 - #define MUL64(rh,rl,i1,i2) \ - { word64 _i1 = (i1), _i2 = (i2); \ - word64 m1= MUL32(_i1,_i2>>32); \ - word64 m2= MUL32(_i1>>32,_i2); \ - rh = MUL32(_i1>>32,_i2>>32); \ - rl = MUL32(_i1,_i2); \ - ADD128(rh,rl,(m1 >> 32),(m1 << 32)); \ - ADD128(rh,rl,(m2 >> 32),(m2 << 32)); \ - } - #define AccumulateNH(a, b, c) {\ - word64 p = MUL32(b, c);\ - a##1 += word32((p)>>32);\ - a##0 += word32(p);\ - p = MUL32((b)>>32, c);\ - a##2 += word32((p)>>32);\ - a##1 += word32(p);\ - p = MUL32((b)>>32, (c)>>32);\ - a##2 += p;\ - p = MUL32(b, (c)>>32);\ - a##1 += word32(p);\ - a##2 += word32(p>>32);} - #endif -#endif -#ifndef VMAC_BOOL_32BIT - #define VMAC_BOOL_32BIT 0 -#endif -#ifndef ADD128 - #define ADD128(rh,rl,ih,il) \ - { word64 _il = (il); \ - (rl) += (_il); \ - (rh) += (ih) + ((rl) < (_il)); \ - } -#endif - -#if !(defined(_MSC_VER) && _MSC_VER < 1300) -template -#endif -void VMAC_Base::VHASH_Update_Template(const word64 *data, size_t blocksRemainingInWord64) -{ - #define INNER_LOOP_ITERATION(j) {\ - word64 d0 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+0]);\ - word64 d1 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+1]);\ - AccumulateNH(nhA, d0+nhK[i+2*j+0], d1+nhK[i+2*j+1]);\ - if (T_128BitTag)\ - AccumulateNH(nhB, d0+nhK[i+2*j+2], d1+nhK[i+2*j+3]);\ - } - -#if (defined(_MSC_VER) && _MSC_VER < 1300) - bool T_128BitTag = m_is128; -#endif - size_t L1KeyLengthInWord64 = m_L1KeyLength / 8; - size_t innerLoopEnd = L1KeyLengthInWord64; - const word64 *nhK = m_nhKey(); - word64 *polyS = m_polyState(); - bool isFirstBlock = true; - size_t i; - - #if !VMAC_BOOL_32BIT - #if VMAC_BOOL_WORD128 - word128 a1, a2; - #else - word64 ah1, al1, ah2, al2; - #endif - word64 kh1, kl1, kh2, kl2; - kh1=(polyS+0*4+2)[0]; kl1=(polyS+0*4+2)[1]; - if (T_128BitTag) - { - kh2=(polyS+1*4+2)[0]; kl2=(polyS+1*4+2)[1]; - } - #endif - - do - { - DeclareNH(nhA); - DeclareNH(nhB); - - i = 0; - if (blocksRemainingInWord64 < L1KeyLengthInWord64) - { - if (blocksRemainingInWord64 % 8) - { - innerLoopEnd = blocksRemainingInWord64 % 8; - for (; i> 32); - nh1[0] = word32(nhA1); - nh2[0] = (nhA2 + (nhA1 >> 32)) & m62; - - if (T_128BitTag) - { - nh0[1] = word32(nhB0); - nhB1 += (nhB0 >> 32); - nh1[1] = word32(nhB1); - nh2[1] = (nhB2 + (nhB1 >> 32)) & m62; - } - - #define a0 (((word32 *)(polyS+i*4))[2+NativeByteOrder::ToEnum()]) - #define a1 (*(((word32 *)(polyS+i*4))+3-NativeByteOrder::ToEnum())) // workaround for GCC 3.2 - #define a2 (((word32 *)(polyS+i*4))[0+NativeByteOrder::ToEnum()]) - #define a3 (*(((word32 *)(polyS+i*4))+1-NativeByteOrder::ToEnum())) - #define aHi ((polyS+i*4)[0]) - #define k0 (((word32 *)(polyS+i*4+2))[2+NativeByteOrder::ToEnum()]) - #define k1 (*(((word32 *)(polyS+i*4+2))+3-NativeByteOrder::ToEnum())) - #define k2 (((word32 *)(polyS+i*4+2))[0+NativeByteOrder::ToEnum()]) - #define k3 (*(((word32 *)(polyS+i*4+2))+1-NativeByteOrder::ToEnum())) - #define kHi ((polyS+i*4+2)[0]) - - if (isFirstBlock) - { - isFirstBlock = false; - if (m_isFirstBlock) - { - m_isFirstBlock = false; - for (i=0; i<=(size_t)T_128BitTag; i++) - { - word64 t = (word64)nh0[i] + k0; - a0 = (word32)t; - t = (t >> 32) + nh1[i] + k1; - a1 = (word32)t; - aHi = (t >> 32) + nh2[i] + kHi; - } - continue; - } - } - for (i=0; i<=(size_t)T_128BitTag; i++) - { - word64 p, t; - word32 t2; - - p = MUL32(a3, 2*k3); - p += nh2[i]; - p += MUL32(a0, k2); - p += MUL32(a1, k1); - p += MUL32(a2, k0); - t2 = (word32)p; - p >>= 32; - p += MUL32(a0, k3); - p += MUL32(a1, k2); - p += MUL32(a2, k1); - p += MUL32(a3, k0); - t = (word64(word32(p) & 0x7fffffff) << 32) | t2; - p >>= 31; - p += nh0[i]; - p += MUL32(a0, k0); - p += MUL32(a1, 2*k3); - p += MUL32(a2, 2*k2); - p += MUL32(a3, 2*k1); - t2 = (word32)p; - p >>= 32; - p += nh1[i]; - p += MUL32(a0, k1); - p += MUL32(a1, k0); - p += MUL32(a2, 2*k3); - p += MUL32(a3, 2*k2); - a0 = t2; - a1 = (word32)p; - aHi = (p >> 32) + t; - } - - #undef a0 - #undef a1 - #undef a2 - #undef a3 - #undef aHi - #undef k0 - #undef k1 - #undef k2 - #undef k3 - #undef kHi - #else // #if VMAC_BOOL_32BIT - if (isFirstBlock) - { - isFirstBlock = false; - if (m_isFirstBlock) - { - m_isFirstBlock = false; - #if VMAC_BOOL_WORD128 - #define first_poly_step(a, kh, kl, m) a = (m & m126) + ((word128(kh) << 64) | kl) - - first_poly_step(a1, kh1, kl1, nhA); - if (T_128BitTag) - first_poly_step(a2, kh2, kl2, nhB); - #else - #define first_poly_step(ah, al, kh, kl, mh, ml) {\ - mh &= m62;\ - ADD128(mh, ml, kh, kl); \ - ah = mh; al = ml;} - - first_poly_step(ah1, al1, kh1, kl1, nhA1, nhA0); - if (T_128BitTag) - first_poly_step(ah2, al2, kh2, kl2, nhB1, nhB0); - #endif - continue; - } - else - { - #if VMAC_BOOL_WORD128 - a1 = (word128((polyS+0*4)[0]) << 64) | (polyS+0*4)[1]; - #else - ah1=(polyS+0*4)[0]; al1=(polyS+0*4)[1]; - #endif - if (T_128BitTag) - { - #if VMAC_BOOL_WORD128 - a2 = (word128((polyS+1*4)[0]) << 64) | (polyS+1*4)[1]; - #else - ah2=(polyS+1*4)[0]; al2=(polyS+1*4)[1]; - #endif - } - } - } - - #if VMAC_BOOL_WORD128 - #define poly_step(a, kh, kl, m) \ - { word128 t1, t2, t3, t4;\ - Multiply128(t2, a>>64, kl);\ - Multiply128(t3, a, kh);\ - Multiply128(t1, a, kl);\ - Multiply128(t4, a>>64, 2*kh);\ - t2 += t3;\ - t4 += t1;\ - t2 += t4>>64;\ - a = (word128(word64(t2)&m63) << 64) | word64(t4);\ - t2 *= 2;\ - a += m & m126;\ - a += t2>>64;} - - poly_step(a1, kh1, kl1, nhA); - if (T_128BitTag) - poly_step(a2, kh2, kl2, nhB); - #else - #define poly_step(ah, al, kh, kl, mh, ml) \ - { word64 t1h, t1l, t2h, t2l, t3h, t3l, z=0; \ - /* compute ab*cd, put bd into result registers */ \ - MUL64(t2h,t2l,ah,kl); \ - MUL64(t3h,t3l,al,kh); \ - MUL64(t1h,t1l,ah,2*kh); \ - MUL64(ah,al,al,kl); \ - /* add together ad + bc */ \ - ADD128(t2h,t2l,t3h,t3l); \ - /* add 2 * ac to result */ \ - ADD128(ah,al,t1h,t1l); \ - /* now (ah,al), (t2l,2*t2h) need summing */ \ - /* first add the high registers, carrying into t2h */ \ - ADD128(t2h,ah,z,t2l); \ - /* double t2h and add top bit of ah */ \ - t2h += t2h + (ah >> 63); \ - ah &= m63; \ - /* now add the low registers */ \ - mh &= m62; \ - ADD128(ah,al,mh,ml); \ - ADD128(ah,al,z,t2h); \ - } - - poly_step(ah1, al1, kh1, kl1, nhA1, nhA0); - if (T_128BitTag) - poly_step(ah2, al2, kh2, kl2, nhB1, nhB0); - #endif - #endif // #if VMAC_BOOL_32BIT - } while (blocksRemainingInWord64); - - #if VMAC_BOOL_WORD128 - (polyS+0*4)[0]=word64(a1>>64); (polyS+0*4)[1]=word64(a1); - if (T_128BitTag) - { - (polyS+1*4)[0]=word64(a2>>64); (polyS+1*4)[1]=word64(a2); - } - #elif !VMAC_BOOL_32BIT - (polyS+0*4)[0]=ah1; (polyS+0*4)[1]=al1; - if (T_128BitTag) - { - (polyS+1*4)[0]=ah2; (polyS+1*4)[1]=al2; - } - #endif -} - -inline void VMAC_Base::VHASH_Update(const word64 *data, size_t blocksRemainingInWord64) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 - if (HasSSE2()) - { - VHASH_Update_SSE2(data, blocksRemainingInWord64, 0); - if (m_is128) - VHASH_Update_SSE2(data, blocksRemainingInWord64, 1); - m_isFirstBlock = false; - } - else -#endif - { -#if defined(_MSC_VER) && _MSC_VER < 1300 - VHASH_Update_Template(data, blocksRemainingInWord64); -#else - if (m_is128) - VHASH_Update_Template(data, blocksRemainingInWord64); - else - VHASH_Update_Template(data, blocksRemainingInWord64); -#endif - } -} - -size_t VMAC_Base::HashMultipleBlocks(const word64 *data, size_t length) -{ - size_t remaining = ModPowerOf2(length, m_L1KeyLength); - VHASH_Update(data, (length-remaining)/8); - return remaining; -} - -static word64 L3Hash(const word64 *input, const word64 *l3Key, size_t len) -{ - word64 rh, rl, t, z=0; - word64 p1 = input[0], p2 = input[1]; - word64 k1 = l3Key[0], k2 = l3Key[1]; - - /* fully reduce (p1,p2)+(len,0) mod p127 */ - t = p1 >> 63; - p1 &= m63; - ADD128(p1, p2, len, t); - /* At this point, (p1,p2) is at most 2^127+(len<<64) */ - t = (p1 > m63) + ((p1 == m63) & (p2 == m64)); - ADD128(p1, p2, z, t); - p1 &= m63; - - /* compute (p1,p2)/(2^64-2^32) and (p1,p2)%(2^64-2^32) */ - t = p1 + (p2 >> 32); - t += (t >> 32); - t += (word32)t > 0xfffffffeU; - p1 += (t >> 32); - p2 += (p1 << 32); - - /* compute (p1+k1)%p64 and (p2+k2)%p64 */ - p1 += k1; - p1 += (0 - (p1 < k1)) & 257; - p2 += k2; - p2 += (0 - (p2 < k2)) & 257; - - /* compute (p1+k1)*(p2+k2)%p64 */ - MUL64(rh, rl, p1, p2); - t = rh >> 56; - ADD128(t, rl, z, rh); - rh <<= 8; - ADD128(t, rl, z, rh); - t += t << 8; - rl += t; - rl += (0 - (rl < t)) & 257; - rl += (0 - (rl > p64-1)) & 257; - return rl; -} - -void VMAC_Base::TruncatedFinal(byte *mac, size_t size) -{ - size_t len = ModPowerOf2(GetBitCountLo()/8, m_L1KeyLength); - - if (len) - { - memset(m_data()+len, 0, (0-len)%16); - VHASH_Update(DataBuf(), ((len+15)/16)*2); - len *= 8; // convert to bits - } - else if (m_isFirstBlock) - { - // special case for empty string - m_polyState()[0] = m_polyState()[2]; - m_polyState()[1] = m_polyState()[3]; - if (m_is128) - { - m_polyState()[4] = m_polyState()[6]; - m_polyState()[5] = m_polyState()[7]; - } - } - - if (m_is128) - { - word64 t[2]; - t[0] = L3Hash(m_polyState(), m_l3Key(), len) + GetWord(true, BIG_ENDIAN_ORDER, m_pad()); - t[1] = L3Hash(m_polyState()+4, m_l3Key()+2, len) + GetWord(true, BIG_ENDIAN_ORDER, m_pad()+8); - if (size == 16) - { - PutWord(false, BIG_ENDIAN_ORDER, mac, t[0]); - PutWord(false, BIG_ENDIAN_ORDER, mac+8, t[1]); - } - else - { - t[0] = ConditionalByteReverse(BIG_ENDIAN_ORDER, t[0]); - t[1] = ConditionalByteReverse(BIG_ENDIAN_ORDER, t[1]); - memcpy(mac, t, size); - } - } - else - { - word64 t = L3Hash(m_polyState(), m_l3Key(), len); - t += GetWord(true, BIG_ENDIAN_ORDER, m_pad() + (m_nonce()[IVSize()-1]&1) * 8); - if (size == 8) - PutWord(false, BIG_ENDIAN_ORDER, mac, t); - else - { - t = ConditionalByteReverse(BIG_ENDIAN_ORDER, t); - memcpy(mac, &t, size); - } - } -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.h deleted file mode 100644 index 07240173..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/vmac.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef CRYPTOPP_VMAC_H -#define CRYPTOPP_VMAC_H - -#include "iterhash.h" -#include "seckey.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// . -class VMAC_Base : public IteratedHashBase -{ -public: - std::string AlgorithmName() const {return std::string("VMAC(") + GetCipher().AlgorithmName() + ")-" + IntToString(DigestSize()*8);} - unsigned int IVSize() const {return GetCipher().BlockSize();} - unsigned int MinIVLength() const {return 1;} - void Resynchronize(const byte *nonce, int length=-1); - void GetNextIV(RandomNumberGenerator &rng, byte *IV); - unsigned int DigestSize() const {return m_is128 ? 16 : 8;}; - void UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs ¶ms); - void TruncatedFinal(byte *mac, size_t size); - unsigned int BlockSize() const {return m_L1KeyLength;} - ByteOrder GetByteOrder() const {return LITTLE_ENDIAN_ORDER;} - -protected: - virtual BlockCipher & AccessCipher() =0; - virtual int DefaultDigestSize() const =0; - const BlockCipher & GetCipher() const {return const_cast(this)->AccessCipher();} - void HashEndianCorrectedBlock(const word64 *data); - size_t HashMultipleBlocks(const word64 *input, size_t length); - void Init() {} - word64* StateBuf() {return NULL;} - word64* DataBuf() {return (word64 *)m_data();} - - void VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64, int tagPart); -#if !(defined(_MSC_VER) && _MSC_VER < 1300) // can't use function template here with VC6 - template -#endif - void VHASH_Update_Template(const word64 *data, size_t blockRemainingInWord128); - void VHASH_Update(const word64 *data, size_t blocksRemainingInWord128); - - CRYPTOPP_BLOCK_1(polyState, word64, 4*(m_is128+1)) - CRYPTOPP_BLOCK_2(nhKey, word64, m_L1KeyLength/sizeof(word64) + 2*m_is128) - CRYPTOPP_BLOCK_3(data, byte, m_L1KeyLength) - CRYPTOPP_BLOCK_4(l3Key, word64, 2*(m_is128+1)) - CRYPTOPP_BLOCK_5(nonce, byte, IVSize()) - CRYPTOPP_BLOCK_6(pad, byte, IVSize()) - CRYPTOPP_BLOCKS_END(6) - - bool m_is128, m_padCached, m_isFirstBlock; - int m_L1KeyLength; -}; - -/// VMAC -template -class VMAC : public SimpleKeyingInterfaceImpl > -{ -public: - static std::string StaticAlgorithmName() {return std::string("VMAC(") + T_BlockCipher::StaticAlgorithmName() + ")-" + IntToString(T_DigestBitSize);} - -private: - BlockCipher & AccessCipher() {return m_cipher;} - int DefaultDigestSize() const {return T_DigestBitSize/8;} - typename T_BlockCipher::Encryption m_cipher; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.cpp deleted file mode 100644 index 19878583..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.cpp +++ /dev/null @@ -1,397 +0,0 @@ -// wait.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "wait.h" -#include "misc.h" - -#ifdef SOCKETS_AVAILABLE - -#ifdef USE_BERKELEY_STYLE_SOCKETS -#include -#include -#include -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -unsigned int WaitObjectContainer::MaxWaitObjects() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - return MAXIMUM_WAIT_OBJECTS * (MAXIMUM_WAIT_OBJECTS-1); -#else - return FD_SETSIZE; -#endif -} - -WaitObjectContainer::WaitObjectContainer(WaitObjectsTracer* tracer) - : m_tracer(tracer), m_eventTimer(Timer::MILLISECONDS) - , m_sameResultCount(0), m_noWaitTimer(Timer::MILLISECONDS) -{ - Clear(); - m_eventTimer.StartTimer(); -} - -void WaitObjectContainer::Clear() -{ -#ifdef USE_WINDOWS_STYLE_SOCKETS - m_handles.clear(); -#else - m_maxFd = 0; - FD_ZERO(&m_readfds); - FD_ZERO(&m_writefds); -#endif - m_noWait = false; - m_firstEventTime = 0; -} - -inline void WaitObjectContainer::SetLastResult(LastResultType result) -{ - if (result == m_lastResult) - m_sameResultCount++; - else - { - m_lastResult = result; - m_sameResultCount = 0; - } -} - -void WaitObjectContainer::DetectNoWait(LastResultType result, CallStack const& callStack) -{ - if (result == m_lastResult && m_noWaitTimer.ElapsedTime() > 1000) - { - if (m_sameResultCount > m_noWaitTimer.ElapsedTime()) - { - if (m_tracer) - { - std::string desc = "No wait loop detected - m_lastResult: "; - desc.append(IntToString(m_lastResult)).append(", call stack:"); - for (CallStack const* cs = &callStack; cs; cs = cs->Prev()) - desc.append("\n- ").append(cs->Format()); - m_tracer->TraceNoWaitLoop(desc); - } - try { throw 0; } catch (...) {} // help debugger break - } - - m_noWaitTimer.StartTimer(); - m_sameResultCount = 0; - } -} - -void WaitObjectContainer::SetNoWait(CallStack const& callStack) -{ - DetectNoWait(LASTRESULT_NOWAIT, CallStack("WaitObjectContainer::SetNoWait()", &callStack)); - m_noWait = true; -} - -void WaitObjectContainer::ScheduleEvent(double milliseconds, CallStack const& callStack) -{ - if (milliseconds <= 3) - DetectNoWait(LASTRESULT_SCHEDULED, CallStack("WaitObjectContainer::ScheduleEvent()", &callStack)); - double thisEventTime = m_eventTimer.ElapsedTimeAsDouble() + milliseconds; - if (!m_firstEventTime || thisEventTime < m_firstEventTime) - m_firstEventTime = thisEventTime; -} - -#ifdef USE_WINDOWS_STYLE_SOCKETS - -struct WaitingThreadData -{ - bool waitingToWait, terminate; - HANDLE startWaiting, stopWaiting; - const HANDLE *waitHandles; - unsigned int count; - HANDLE threadHandle; - DWORD threadId; - DWORD* error; -}; - -WaitObjectContainer::~WaitObjectContainer() -{ - try // don't let exceptions escape destructor - { - if (!m_threads.empty()) - { - HANDLE threadHandles[MAXIMUM_WAIT_OBJECTS]; - unsigned int i; - for (i=0; i pThread((WaitingThreadData *)lParam); - WaitingThreadData &thread = *pThread; - std::vector handles; - - while (true) - { - thread.waitingToWait = true; - ::WaitForSingleObject(thread.startWaiting, INFINITE); - thread.waitingToWait = false; - - if (thread.terminate) - break; - if (!thread.count) - continue; - - handles.resize(thread.count + 1); - handles[0] = thread.stopWaiting; - std::copy(thread.waitHandles, thread.waitHandles+thread.count, handles.begin()+1); - - DWORD result = ::WaitForMultipleObjects((DWORD)handles.size(), &handles[0], FALSE, INFINITE); - - if (result == WAIT_OBJECT_0) - continue; // another thread finished waiting first, so do nothing - SetEvent(thread.stopWaiting); - if (!(result > WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + handles.size())) - { - assert(!"error in WaitingThread"); // break here so we can see which thread has an error - *thread.error = ::GetLastError(); - } - } - - return S_OK; // return a value here to avoid compiler warning -} - -void WaitObjectContainer::CreateThreads(unsigned int count) -{ - size_t currentCount = m_threads.size(); - if (currentCount == 0) - { - m_startWaiting = ::CreateEvent(NULL, TRUE, FALSE, NULL); - m_stopWaiting = ::CreateEvent(NULL, TRUE, FALSE, NULL); - } - - if (currentCount < count) - { - m_threads.resize(count); - for (size_t i=currentCount; i MAXIMUM_WAIT_OBJECTS) - { - // too many wait objects for a single WaitForMultipleObjects call, so use multiple threads - static const unsigned int WAIT_OBJECTS_PER_THREAD = MAXIMUM_WAIT_OBJECTS-1; - unsigned int nThreads = (unsigned int)((m_handles.size() + WAIT_OBJECTS_PER_THREAD - 1) / WAIT_OBJECTS_PER_THREAD); - if (nThreads > MAXIMUM_WAIT_OBJECTS) // still too many wait objects, maybe implement recursive threading later? - throw Err("WaitObjectContainer: number of wait objects exceeds limit"); - CreateThreads(nThreads); - DWORD error = S_OK; - - for (unsigned int i=0; i 0) - { - unsigned long timeAfterWait = t.ElapsedTime(); - OutputDebugString(("Handles " + IntToString(m_handles.size()) + ", Woke up by " + IntToString(result-WAIT_OBJECT_0) + ", Busied for " + IntToString(timeBeforeWait-lastTime) + " us, Waited for " + IntToString(timeAfterWait-timeBeforeWait) + " us, max " + IntToString(milliseconds) + "ms\n").c_str()); - lastTime = timeAfterWait; - } -#endif - if (result >= WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + m_handles.size()) - { - if (result == m_lastResult) - m_sameResultCount++; - else - { - m_lastResult = result; - m_sameResultCount = 0; - } - return true; - } - else if (result == WAIT_TIMEOUT) - { - SetLastResult(timeoutIsScheduledEvent ? LASTRESULT_SCHEDULED : LASTRESULT_TIMEOUT); - return timeoutIsScheduledEvent; - } - else - throw Err("WaitObjectContainer: WaitForMultipleObjects failed with error " + IntToString(::GetLastError())); - } -} - -#else // #ifdef USE_WINDOWS_STYLE_SOCKETS - -void WaitObjectContainer::AddReadFd(int fd, CallStack const& callStack) // TODO: do something with callStack -{ - FD_SET(fd, &m_readfds); - m_maxFd = STDMAX(m_maxFd, fd); -} - -void WaitObjectContainer::AddWriteFd(int fd, CallStack const& callStack) // TODO: do something with callStack -{ - FD_SET(fd, &m_writefds); - m_maxFd = STDMAX(m_maxFd, fd); -} - -bool WaitObjectContainer::Wait(unsigned long milliseconds) -{ - if (m_noWait || (!m_maxFd && !m_firstEventTime)) - return true; - - bool timeoutIsScheduledEvent = false; - - if (m_firstEventTime) - { - double timeToFirstEvent = SaturatingSubtract(m_firstEventTime, m_eventTimer.ElapsedTimeAsDouble()); - if (timeToFirstEvent <= milliseconds) - { - milliseconds = (unsigned long)timeToFirstEvent; - timeoutIsScheduledEvent = true; - } - } - - timeval tv, *timeout; - - if (milliseconds == INFINITE_TIME) - timeout = NULL; - else - { - tv.tv_sec = milliseconds / 1000; - tv.tv_usec = (milliseconds % 1000) * 1000; - timeout = &tv; - } - - int result = select(m_maxFd+1, &m_readfds, &m_writefds, NULL, timeout); - - if (result > 0) - return true; - else if (result == 0) - return timeoutIsScheduledEvent; - else - throw Err("WaitObjectContainer: select failed with error " + errno); -} - -#endif - -// ******************************************************** - -std::string CallStack::Format() const -{ - return m_info; -} - -std::string CallStackWithNr::Format() const -{ - return std::string(m_info) + " / nr: " + IntToString(m_nr); -} - -std::string CallStackWithStr::Format() const -{ - return std::string(m_info) + " / " + std::string(m_z); -} - -bool Waitable::Wait(unsigned long milliseconds, CallStack const& callStack) -{ - WaitObjectContainer container; - GetWaitObjects(container, callStack); // reduce clutter by not adding this func to stack - return container.Wait(milliseconds); -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.h deleted file mode 100644 index 045afbc1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/wait.h +++ /dev/null @@ -1,208 +0,0 @@ -#ifndef CRYPTOPP_WAIT_H -#define CRYPTOPP_WAIT_H - -#include "config.h" - -#ifdef SOCKETS_AVAILABLE - -#include "misc.h" -#include "cryptlib.h" -#include - -#ifdef USE_WINDOWS_STYLE_SOCKETS -#include -#else -#include -#endif - -#include "hrtimer.h" - -NAMESPACE_BEGIN(CryptoPP) - -class Tracer -{ -public: - Tracer(unsigned int level) : m_level(level) {} - virtual ~Tracer() {} - -protected: - //! Override this in your most-derived tracer to do the actual tracing. - virtual void Trace(unsigned int n, std::string const& s) = 0; - - /*! By default, tracers will decide which trace messages to trace according to a trace level - mechanism. If your most-derived tracer uses a different mechanism, override this to - return false. If this method returns false, the default TraceXxxx(void) methods will all - return 0 and must be overridden explicitly by your tracer for trace messages you want. */ - virtual bool UsingDefaults() const { return true; } - -protected: - unsigned int m_level; - - void TraceIf(unsigned int n, std::string const&s) - { if (n) Trace(n, s); } - - /*! Returns nr if, according to the default log settings mechanism (using log levels), - the message should be traced. Returns 0 if the default trace level mechanism is not - in use, or if it is in use but the event should not be traced. Provided as a utility - method for easier and shorter coding of default TraceXxxx(void) implementations. */ - unsigned int Tracing(unsigned int nr, unsigned int minLevel) const - { return (UsingDefaults() && m_level >= minLevel) ? nr : 0; } -}; - -// Your Tracer-derived class should inherit as virtual public from Tracer or another -// Tracer-derived class, and should pass the log level in its constructor. You can use the -// following methods to begin and end your Tracer definition. - -// This constructor macro initializes Tracer directly even if not derived directly from it; -// this is intended, virtual base classes are always initialized by the most derived class. -#define CRYPTOPP_TRACER_CONSTRUCTOR(DERIVED) \ - public: DERIVED(unsigned int level = 0) : Tracer(level) {} - -#define CRYPTOPP_BEGIN_TRACER_CLASS_1(DERIVED, BASE1) \ - class DERIVED : virtual public BASE1 { CRYPTOPP_TRACER_CONSTRUCTOR(DERIVED) - -#define CRYPTOPP_BEGIN_TRACER_CLASS_2(DERIVED, BASE1, BASE2) \ - class DERIVED : virtual public BASE1, virtual public BASE2 { CRYPTOPP_TRACER_CONSTRUCTOR(DERIVED) - -#define CRYPTOPP_END_TRACER_CLASS }; - -// In your Tracer-derived class, you should define a globally unique event number for each -// new event defined. This can be done using the following macros. - -#define CRYPTOPP_BEGIN_TRACER_EVENTS(UNIQUENR) enum { EVENTBASE = UNIQUENR, -#define CRYPTOPP_TRACER_EVENT(EVENTNAME) EventNr_##EVENTNAME, -#define CRYPTOPP_END_TRACER_EVENTS }; - -// In your own Tracer-derived class, you must define two methods per new trace event type: -// - unsigned int TraceXxxx() const -// Your default implementation of this method should return the event number if according -// to the default trace level system the event should be traced, or 0 if it should not. -// - void TraceXxxx(string const& s) -// This method should call TraceIf(TraceXxxx(), s); to do the tracing. -// For your convenience, a macro to define these two types of methods are defined below. -// If you use this macro, you should also use the TRACER_EVENTS macros above to associate -// event names with numbers. - -#define CRYPTOPP_TRACER_EVENT_METHODS(EVENTNAME, LOGLEVEL) \ - virtual unsigned int Trace##EVENTNAME() const { return Tracing(EventNr_##EVENTNAME, LOGLEVEL); } \ - virtual void Trace##EVENTNAME(std::string const& s) { TraceIf(Trace##EVENTNAME(), s); } - - -/*! A simple unidirectional linked list with m_prev == 0 to indicate the final entry. - The aim of this implementation is to provide a very lightweight and practical - tracing mechanism with a low performance impact. Functions and methods supporting - this call-stack mechanism would take a parameter of the form "CallStack const& callStack", - and would pass this parameter to subsequent functions they call using the construct: - - SubFunc(arg1, arg2, CallStack("my func at place such and such", &callStack)); - - The advantage of this approach is that it is easy to use and should be very efficient, - involving no allocation from the heap, just a linked list of stack objects containing - pointers to static ASCIIZ strings (or possibly additional but simple data if derived). */ -class CallStack -{ -public: - CallStack(char const* i, CallStack const* p) : m_info(i), m_prev(p) {} - CallStack const* Prev() const { return m_prev; } - virtual std::string Format() const; - -protected: - char const* m_info; - CallStack const* m_prev; -}; - -/*! An extended CallStack entry type with an additional numeric parameter. */ -class CallStackWithNr : public CallStack -{ -public: - CallStackWithNr(char const* i, word32 n, CallStack const* p) : CallStack(i, p), m_nr(n) {} - std::string Format() const; - -protected: - word32 m_nr; -}; - -/*! An extended CallStack entry type with an additional string parameter. */ -class CallStackWithStr : public CallStack -{ -public: - CallStackWithStr(char const* i, char const* z, CallStack const* p) : CallStack(i, p), m_z(z) {} - std::string Format() const; - -protected: - char const* m_z; -}; - -CRYPTOPP_BEGIN_TRACER_CLASS_1(WaitObjectsTracer, Tracer) - CRYPTOPP_BEGIN_TRACER_EVENTS(0x48752841) - CRYPTOPP_TRACER_EVENT(NoWaitLoop) - CRYPTOPP_END_TRACER_EVENTS - CRYPTOPP_TRACER_EVENT_METHODS(NoWaitLoop, 1) -CRYPTOPP_END_TRACER_CLASS - -struct WaitingThreadData; - -//! container of wait objects -class WaitObjectContainer : public NotCopyable -{ -public: - //! exception thrown by WaitObjectContainer - class Err : public Exception - { - public: - Err(const std::string& s) : Exception(IO_ERROR, s) {} - }; - - static unsigned int MaxWaitObjects(); - - WaitObjectContainer(WaitObjectsTracer* tracer = 0); - - void Clear(); - void SetNoWait(CallStack const& callStack); - void ScheduleEvent(double milliseconds, CallStack const& callStack); - // returns false if timed out - bool Wait(unsigned long milliseconds); - -#ifdef USE_WINDOWS_STYLE_SOCKETS - ~WaitObjectContainer(); - void AddHandle(HANDLE handle, CallStack const& callStack); -#else - void AddReadFd(int fd, CallStack const& callStack); - void AddWriteFd(int fd, CallStack const& callStack); -#endif - -private: - WaitObjectsTracer* m_tracer; - -#ifdef USE_WINDOWS_STYLE_SOCKETS - void CreateThreads(unsigned int count); - std::vector m_handles; - std::vector m_threads; - HANDLE m_startWaiting; - HANDLE m_stopWaiting; -#else - fd_set m_readfds, m_writefds; - int m_maxFd; -#endif - bool m_noWait; - double m_firstEventTime; - Timer m_eventTimer; - -#ifdef USE_WINDOWS_STYLE_SOCKETS - typedef size_t LastResultType; -#else - typedef int LastResultType; -#endif - enum { LASTRESULT_NOWAIT = -1, LASTRESULT_SCHEDULED = -2, LASTRESULT_TIMEOUT = -3 }; - LastResultType m_lastResult; - unsigned int m_sameResultCount; - Timer m_noWaitTimer; - void SetLastResult(LastResultType result); - void DetectNoWait(LastResultType result, CallStack const& callStack); -}; - -NAMESPACE_END - -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.cpp deleted file mode 100644 index c34165b8..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.cpp +++ /dev/null @@ -1,109 +0,0 @@ -// wake.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "wake.h" - -NAMESPACE_BEGIN(CryptoPP) - -void WAKE_TestInstantiations() -{ - WAKE_OFB<>::Encryption x2; - WAKE_OFB<>::Decryption x4; -} - -inline word32 WAKE_Base::M(word32 x, word32 y) -{ - word32 w = x+y; - return (w>>8) ^ t[w & 0xff]; -} - -void WAKE_Base::GenKey(word32 k0, word32 k1, word32 k2, word32 k3) -{ - // this code is mostly copied from David Wheeler's paper "A Bulk Data Encryption Algorithm" - signed int x, z, p; - // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010 - CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4); - static int tt[10]= { - 0x726a8f3b, // table - 0xe69a3b5c, - 0xd3c71fe5, - 0xab3c73d2, - 0x4d3a8eb3, - 0x0396d6e8, - 0x3d4c2f7a, - 0x9ee27cf3, } ; - t[0] = k0; - t[1] = k1; - t[2] = k2; - t[3] = k3; - for (p=4 ; p<256 ; p++) - { - x=t[p-4]+t[p-1] ; // fill t - t[p]= (x>>3) ^ tt[x&7] ; - } - - for (p=0 ; p<23 ; p++) - t[p]+=t[p+89] ; // mix first entries - x=t[33] ; z=t[59] | 0x01000001 ; - z=z&0xff7fffff ; - for (p=0 ; p<256 ; p++) { //change top byte to - x=(x&0xff7fffff)+z ; // a permutation etc - t[p]=(t[p] & 0x00ffffff) ^ x ; } - - t[256]=t[0] ; - byte y=byte(x); - for (p=0 ; p<256 ; p++) { // further change perm. - t[p]=t[y=byte(t[p^y]^y)] ; // and other digits - t[y]=t[p+1] ; } -} - -template -void WAKE_Policy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) -{ - word32 k0, k1, k2, k3; - BlockGetAndPut::Get(key)(r3)(r4)(r5)(r6)(k0)(k1)(k2)(k3); - GenKey(k0, k1, k2, k3); -} - -// OFB -template -void WAKE_Policy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) -{ -#define WAKE_OUTPUT(x)\ - while (iterationCount--)\ - {\ - CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, B::ToEnum(), 0, r6);\ - r3 = M(r3, r6);\ - r4 = M(r4, r3);\ - r5 = M(r5, r4);\ - r6 = M(r6, r5);\ - output += 4;\ - if (!(x & INPUT_NULL))\ - input += 4;\ - } - - typedef word32 WordType; - CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(WAKE_OUTPUT, 0); -} -/* -template -void WAKE_ROFB_Policy::Iterate(KeystreamOperation operation, byte *output, const byte *input, unsigned int iterationCount) -{ - KeystreamOutput keystreamOperation(operation, output, input); - - while (iterationCount--) - { - keystreamOperation(r6); - r3 = M(r3, r6); - r4 = M(r4, r3); - r5 = M(r5, r4); - r6 = M(r6, r5); - } -} -*/ -template class WAKE_Policy; -template class WAKE_Policy; -//template class WAKE_ROFB_Policy; -//template class WAKE_ROFB_Policy; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.h deleted file mode 100644 index 199957d1..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/wake.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef CRYPTOPP_WAKE_H -#define CRYPTOPP_WAKE_H - -#include "seckey.h" -#include "secblock.h" -#include "strciphr.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -template -struct WAKE_OFB_Info : public FixedKeyLength<32> -{ - static const char *StaticAlgorithmName() {return B::ToEnum() == LITTLE_ENDIAN_ORDER ? "WAKE-OFB-LE" : "WAKE-OFB-BE";} -}; - -class CRYPTOPP_NO_VTABLE WAKE_Base -{ -protected: - word32 M(word32 x, word32 y); - void GenKey(word32 k0, word32 k1, word32 k2, word32 k3); - - word32 t[257]; - word32 r3, r4, r5, r6; -}; - -template -class CRYPTOPP_NO_VTABLE WAKE_Policy : public AdditiveCipherConcretePolicy, protected WAKE_Base -{ -protected: - void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); - // OFB - void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); - bool CipherIsRandomAccess() const {return false;} -}; - -//! WAKE-OFB -template -struct WAKE_OFB : public WAKE_OFB_Info, public SymmetricCipherDocumentation -{ - typedef SymmetricCipherFinal, AdditiveCipherTemplate<> >, WAKE_OFB_Info > Encryption; - typedef Encryption Decryption; -}; - -/* -template -class WAKE_ROFB_Policy : public WAKE_Policy -{ -protected: - void Iterate(KeystreamOperation operation, byte *output, const byte *input, unsigned int iterationCount); -}; - -template -struct WAKE_ROFB : public WAKE_Info -{ - typedef SymmetricCipherTemplate, WAKE_ROFB_Policy > > Encryption; - typedef Encryption Decryption; -}; -*/ - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.cpp deleted file mode 100644 index 9da12e3d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.cpp +++ /dev/null @@ -1,701 +0,0 @@ -// whrlpool.cpp - originally modified by Kevin Springle from -// Paulo Barreto and Vincent Rijmen's public domain code, whirlpool.c. -// Updated to Whirlpool version 3.0, optimized and SSE version added by Wei Dai -// All modifications are placed in the public domain - -// This is the original introductory comment: - -/** - * The Whirlpool hashing function. - * - *

- * References - * - *

- * The Whirlpool algorithm was developed by - * Paulo S. L. M. Barreto and - * Vincent Rijmen. - * - * See - * P.S.L.M. Barreto, V. Rijmen, - * ``The Whirlpool hashing function,'' - * NESSIE submission, 2000 (tweaked version, 2001), - * - * - * @author Paulo S.L.M. Barreto - * @author Vincent Rijmen. - * - * @version 3.0 (2003.03.12) - * - * ============================================================================= - * - * Differences from version 2.1: - * - * - Suboptimal diffusion matrix replaced by cir(1, 1, 4, 1, 8, 5, 2, 9). - * - * ============================================================================= - * - * Differences from version 2.0: - * - * - Generation of ISO/IEC 10118-3 test vectors. - * - Bug fix: nonzero carry was ignored when tallying the data length - * (this bug apparently only manifested itself when feeding data - * in pieces rather than in a single chunk at once). - * - Support for MS Visual C++ 64-bit integer arithmetic. - * - * Differences from version 1.0: - * - * - Original S-box replaced by the tweaked, hardware-efficient version. - * - * ============================================================================= - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 THE AUTHORS 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. - * - */ - -#include "pch.h" -#include "whrlpool.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -void Whirlpool_TestInstantiations() -{ - Whirlpool x; -} - -void Whirlpool::InitState(HashWordType *state) -{ - memset(state, 0, 8*sizeof(state[0])); -} - -void Whirlpool::TruncatedFinal(byte *hash, size_t size) -{ - ThrowIfInvalidTruncatedSize(size); - - PadLastBlock(32); - CorrectEndianess(m_data, m_data, 32); - - m_data[m_data.size()-4] = 0; - m_data[m_data.size()-3] = 0; - m_data[m_data.size()-2] = GetBitCountHi(); - m_data[m_data.size()-1] = GetBitCountLo(); - - Transform(m_state, m_data); - CorrectEndianess(m_state, m_state, DigestSize()); - memcpy(hash, m_state, size); - - Restart(); // reinit for next use -} - -/* - * The number of rounds of the internal dedicated block cipher. - */ -#define R 10 - -/* - * Though Whirlpool is endianness-neutral, the encryption tables are listed - * in BIG-ENDIAN format, which is adopted throughout this implementation - * (but little-endian notation would be equally suitable if consistently - * employed). - */ - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -CRYPTOPP_ALIGN_DATA(16) static const word64 Whirlpool_C[4*256+R] CRYPTOPP_SECTION_ALIGN16 = { -#else -static const word64 Whirlpool_C[4*256+R] = { -#endif - W64LIT(0x18186018c07830d8), W64LIT(0x23238c2305af4626), W64LIT(0xc6c63fc67ef991b8), W64LIT(0xe8e887e8136fcdfb), - W64LIT(0x878726874ca113cb), W64LIT(0xb8b8dab8a9626d11), W64LIT(0x0101040108050209), W64LIT(0x4f4f214f426e9e0d), - W64LIT(0x3636d836adee6c9b), W64LIT(0xa6a6a2a6590451ff), W64LIT(0xd2d26fd2debdb90c), W64LIT(0xf5f5f3f5fb06f70e), - W64LIT(0x7979f979ef80f296), W64LIT(0x6f6fa16f5fcede30), W64LIT(0x91917e91fcef3f6d), W64LIT(0x52525552aa07a4f8), - W64LIT(0x60609d6027fdc047), W64LIT(0xbcbccabc89766535), W64LIT(0x9b9b569baccd2b37), W64LIT(0x8e8e028e048c018a), - W64LIT(0xa3a3b6a371155bd2), W64LIT(0x0c0c300c603c186c), W64LIT(0x7b7bf17bff8af684), W64LIT(0x3535d435b5e16a80), - W64LIT(0x1d1d741de8693af5), W64LIT(0xe0e0a7e05347ddb3), W64LIT(0xd7d77bd7f6acb321), W64LIT(0xc2c22fc25eed999c), - W64LIT(0x2e2eb82e6d965c43), W64LIT(0x4b4b314b627a9629), W64LIT(0xfefedffea321e15d), W64LIT(0x575741578216aed5), - W64LIT(0x15155415a8412abd), W64LIT(0x7777c1779fb6eee8), W64LIT(0x3737dc37a5eb6e92), W64LIT(0xe5e5b3e57b56d79e), - W64LIT(0x9f9f469f8cd92313), W64LIT(0xf0f0e7f0d317fd23), W64LIT(0x4a4a354a6a7f9420), W64LIT(0xdada4fda9e95a944), - W64LIT(0x58587d58fa25b0a2), W64LIT(0xc9c903c906ca8fcf), W64LIT(0x2929a429558d527c), W64LIT(0x0a0a280a5022145a), - W64LIT(0xb1b1feb1e14f7f50), W64LIT(0xa0a0baa0691a5dc9), W64LIT(0x6b6bb16b7fdad614), W64LIT(0x85852e855cab17d9), - W64LIT(0xbdbdcebd8173673c), W64LIT(0x5d5d695dd234ba8f), W64LIT(0x1010401080502090), W64LIT(0xf4f4f7f4f303f507), - W64LIT(0xcbcb0bcb16c08bdd), W64LIT(0x3e3ef83eedc67cd3), W64LIT(0x0505140528110a2d), W64LIT(0x676781671fe6ce78), - W64LIT(0xe4e4b7e47353d597), W64LIT(0x27279c2725bb4e02), W64LIT(0x4141194132588273), W64LIT(0x8b8b168b2c9d0ba7), - W64LIT(0xa7a7a6a7510153f6), W64LIT(0x7d7de97dcf94fab2), W64LIT(0x95956e95dcfb3749), W64LIT(0xd8d847d88e9fad56), - W64LIT(0xfbfbcbfb8b30eb70), W64LIT(0xeeee9fee2371c1cd), W64LIT(0x7c7ced7cc791f8bb), W64LIT(0x6666856617e3cc71), - W64LIT(0xdddd53dda68ea77b), W64LIT(0x17175c17b84b2eaf), W64LIT(0x4747014702468e45), W64LIT(0x9e9e429e84dc211a), - W64LIT(0xcaca0fca1ec589d4), W64LIT(0x2d2db42d75995a58), W64LIT(0xbfbfc6bf9179632e), W64LIT(0x07071c07381b0e3f), - W64LIT(0xadad8ead012347ac), W64LIT(0x5a5a755aea2fb4b0), W64LIT(0x838336836cb51bef), W64LIT(0x3333cc3385ff66b6), - W64LIT(0x636391633ff2c65c), W64LIT(0x02020802100a0412), W64LIT(0xaaaa92aa39384993), W64LIT(0x7171d971afa8e2de), - W64LIT(0xc8c807c80ecf8dc6), W64LIT(0x19196419c87d32d1), W64LIT(0x494939497270923b), W64LIT(0xd9d943d9869aaf5f), - W64LIT(0xf2f2eff2c31df931), W64LIT(0xe3e3abe34b48dba8), W64LIT(0x5b5b715be22ab6b9), W64LIT(0x88881a8834920dbc), - W64LIT(0x9a9a529aa4c8293e), W64LIT(0x262698262dbe4c0b), W64LIT(0x3232c8328dfa64bf), W64LIT(0xb0b0fab0e94a7d59), - W64LIT(0xe9e983e91b6acff2), W64LIT(0x0f0f3c0f78331e77), W64LIT(0xd5d573d5e6a6b733), W64LIT(0x80803a8074ba1df4), - W64LIT(0xbebec2be997c6127), W64LIT(0xcdcd13cd26de87eb), W64LIT(0x3434d034bde46889), W64LIT(0x48483d487a759032), - W64LIT(0xffffdbffab24e354), W64LIT(0x7a7af57af78ff48d), W64LIT(0x90907a90f4ea3d64), W64LIT(0x5f5f615fc23ebe9d), - W64LIT(0x202080201da0403d), W64LIT(0x6868bd6867d5d00f), W64LIT(0x1a1a681ad07234ca), W64LIT(0xaeae82ae192c41b7), - W64LIT(0xb4b4eab4c95e757d), W64LIT(0x54544d549a19a8ce), W64LIT(0x93937693ece53b7f), W64LIT(0x222288220daa442f), - W64LIT(0x64648d6407e9c863), W64LIT(0xf1f1e3f1db12ff2a), W64LIT(0x7373d173bfa2e6cc), W64LIT(0x12124812905a2482), - W64LIT(0x40401d403a5d807a), W64LIT(0x0808200840281048), W64LIT(0xc3c32bc356e89b95), W64LIT(0xecec97ec337bc5df), - W64LIT(0xdbdb4bdb9690ab4d), W64LIT(0xa1a1bea1611f5fc0), W64LIT(0x8d8d0e8d1c830791), W64LIT(0x3d3df43df5c97ac8), - W64LIT(0x97976697ccf1335b), W64LIT(0x0000000000000000), W64LIT(0xcfcf1bcf36d483f9), W64LIT(0x2b2bac2b4587566e), - W64LIT(0x7676c57697b3ece1), W64LIT(0x8282328264b019e6), W64LIT(0xd6d67fd6fea9b128), W64LIT(0x1b1b6c1bd87736c3), - W64LIT(0xb5b5eeb5c15b7774), W64LIT(0xafaf86af112943be), W64LIT(0x6a6ab56a77dfd41d), W64LIT(0x50505d50ba0da0ea), - W64LIT(0x45450945124c8a57), W64LIT(0xf3f3ebf3cb18fb38), W64LIT(0x3030c0309df060ad), W64LIT(0xefef9bef2b74c3c4), - W64LIT(0x3f3ffc3fe5c37eda), W64LIT(0x55554955921caac7), W64LIT(0xa2a2b2a2791059db), W64LIT(0xeaea8fea0365c9e9), - W64LIT(0x656589650fecca6a), W64LIT(0xbabad2bab9686903), W64LIT(0x2f2fbc2f65935e4a), W64LIT(0xc0c027c04ee79d8e), - W64LIT(0xdede5fdebe81a160), W64LIT(0x1c1c701ce06c38fc), W64LIT(0xfdfdd3fdbb2ee746), W64LIT(0x4d4d294d52649a1f), - W64LIT(0x92927292e4e03976), W64LIT(0x7575c9758fbceafa), W64LIT(0x06061806301e0c36), W64LIT(0x8a8a128a249809ae), - W64LIT(0xb2b2f2b2f940794b), W64LIT(0xe6e6bfe66359d185), W64LIT(0x0e0e380e70361c7e), W64LIT(0x1f1f7c1ff8633ee7), - W64LIT(0x6262956237f7c455), W64LIT(0xd4d477d4eea3b53a), W64LIT(0xa8a89aa829324d81), W64LIT(0x96966296c4f43152), - W64LIT(0xf9f9c3f99b3aef62), W64LIT(0xc5c533c566f697a3), W64LIT(0x2525942535b14a10), W64LIT(0x59597959f220b2ab), - W64LIT(0x84842a8454ae15d0), W64LIT(0x7272d572b7a7e4c5), W64LIT(0x3939e439d5dd72ec), W64LIT(0x4c4c2d4c5a619816), - W64LIT(0x5e5e655eca3bbc94), W64LIT(0x7878fd78e785f09f), W64LIT(0x3838e038ddd870e5), W64LIT(0x8c8c0a8c14860598), - W64LIT(0xd1d163d1c6b2bf17), W64LIT(0xa5a5aea5410b57e4), W64LIT(0xe2e2afe2434dd9a1), W64LIT(0x616199612ff8c24e), - W64LIT(0xb3b3f6b3f1457b42), W64LIT(0x2121842115a54234), W64LIT(0x9c9c4a9c94d62508), W64LIT(0x1e1e781ef0663cee), - W64LIT(0x4343114322528661), W64LIT(0xc7c73bc776fc93b1), W64LIT(0xfcfcd7fcb32be54f), W64LIT(0x0404100420140824), - W64LIT(0x51515951b208a2e3), W64LIT(0x99995e99bcc72f25), W64LIT(0x6d6da96d4fc4da22), W64LIT(0x0d0d340d68391a65), - W64LIT(0xfafacffa8335e979), W64LIT(0xdfdf5bdfb684a369), W64LIT(0x7e7ee57ed79bfca9), W64LIT(0x242490243db44819), - W64LIT(0x3b3bec3bc5d776fe), W64LIT(0xabab96ab313d4b9a), W64LIT(0xcece1fce3ed181f0), W64LIT(0x1111441188552299), - W64LIT(0x8f8f068f0c890383), W64LIT(0x4e4e254e4a6b9c04), W64LIT(0xb7b7e6b7d1517366), W64LIT(0xebeb8beb0b60cbe0), - W64LIT(0x3c3cf03cfdcc78c1), W64LIT(0x81813e817cbf1ffd), W64LIT(0x94946a94d4fe3540), W64LIT(0xf7f7fbf7eb0cf31c), - W64LIT(0xb9b9deb9a1676f18), W64LIT(0x13134c13985f268b), W64LIT(0x2c2cb02c7d9c5851), W64LIT(0xd3d36bd3d6b8bb05), - W64LIT(0xe7e7bbe76b5cd38c), W64LIT(0x6e6ea56e57cbdc39), W64LIT(0xc4c437c46ef395aa), W64LIT(0x03030c03180f061b), - W64LIT(0x565645568a13acdc), W64LIT(0x44440d441a49885e), W64LIT(0x7f7fe17fdf9efea0), W64LIT(0xa9a99ea921374f88), - W64LIT(0x2a2aa82a4d825467), W64LIT(0xbbbbd6bbb16d6b0a), W64LIT(0xc1c123c146e29f87), W64LIT(0x53535153a202a6f1), - W64LIT(0xdcdc57dcae8ba572), W64LIT(0x0b0b2c0b58271653), W64LIT(0x9d9d4e9d9cd32701), W64LIT(0x6c6cad6c47c1d82b), - W64LIT(0x3131c43195f562a4), W64LIT(0x7474cd7487b9e8f3), W64LIT(0xf6f6fff6e309f115), W64LIT(0x464605460a438c4c), - W64LIT(0xacac8aac092645a5), W64LIT(0x89891e893c970fb5), W64LIT(0x14145014a04428b4), W64LIT(0xe1e1a3e15b42dfba), - W64LIT(0x16165816b04e2ca6), W64LIT(0x3a3ae83acdd274f7), W64LIT(0x6969b9696fd0d206), W64LIT(0x09092409482d1241), - W64LIT(0x7070dd70a7ade0d7), W64LIT(0xb6b6e2b6d954716f), W64LIT(0xd0d067d0ceb7bd1e), W64LIT(0xeded93ed3b7ec7d6), - W64LIT(0xcccc17cc2edb85e2), W64LIT(0x424215422a578468), W64LIT(0x98985a98b4c22d2c), W64LIT(0xa4a4aaa4490e55ed), - W64LIT(0x2828a0285d885075), W64LIT(0x5c5c6d5cda31b886), W64LIT(0xf8f8c7f8933fed6b), W64LIT(0x8686228644a411c2), - - W64LIT(0xd818186018c07830), W64LIT(0x2623238c2305af46), W64LIT(0xb8c6c63fc67ef991), W64LIT(0xfbe8e887e8136fcd), - W64LIT(0xcb878726874ca113), W64LIT(0x11b8b8dab8a9626d), W64LIT(0x0901010401080502), W64LIT(0x0d4f4f214f426e9e), - W64LIT(0x9b3636d836adee6c), W64LIT(0xffa6a6a2a6590451), W64LIT(0x0cd2d26fd2debdb9), W64LIT(0x0ef5f5f3f5fb06f7), - W64LIT(0x967979f979ef80f2), W64LIT(0x306f6fa16f5fcede), W64LIT(0x6d91917e91fcef3f), W64LIT(0xf852525552aa07a4), - W64LIT(0x4760609d6027fdc0), W64LIT(0x35bcbccabc897665), W64LIT(0x379b9b569baccd2b), W64LIT(0x8a8e8e028e048c01), - W64LIT(0xd2a3a3b6a371155b), W64LIT(0x6c0c0c300c603c18), W64LIT(0x847b7bf17bff8af6), W64LIT(0x803535d435b5e16a), - W64LIT(0xf51d1d741de8693a), W64LIT(0xb3e0e0a7e05347dd), W64LIT(0x21d7d77bd7f6acb3), W64LIT(0x9cc2c22fc25eed99), - W64LIT(0x432e2eb82e6d965c), W64LIT(0x294b4b314b627a96), W64LIT(0x5dfefedffea321e1), W64LIT(0xd5575741578216ae), - W64LIT(0xbd15155415a8412a), W64LIT(0xe87777c1779fb6ee), W64LIT(0x923737dc37a5eb6e), W64LIT(0x9ee5e5b3e57b56d7), - W64LIT(0x139f9f469f8cd923), W64LIT(0x23f0f0e7f0d317fd), W64LIT(0x204a4a354a6a7f94), W64LIT(0x44dada4fda9e95a9), - W64LIT(0xa258587d58fa25b0), W64LIT(0xcfc9c903c906ca8f), W64LIT(0x7c2929a429558d52), W64LIT(0x5a0a0a280a502214), - W64LIT(0x50b1b1feb1e14f7f), W64LIT(0xc9a0a0baa0691a5d), W64LIT(0x146b6bb16b7fdad6), W64LIT(0xd985852e855cab17), - W64LIT(0x3cbdbdcebd817367), W64LIT(0x8f5d5d695dd234ba), W64LIT(0x9010104010805020), W64LIT(0x07f4f4f7f4f303f5), - W64LIT(0xddcbcb0bcb16c08b), W64LIT(0xd33e3ef83eedc67c), W64LIT(0x2d0505140528110a), W64LIT(0x78676781671fe6ce), - W64LIT(0x97e4e4b7e47353d5), W64LIT(0x0227279c2725bb4e), W64LIT(0x7341411941325882), W64LIT(0xa78b8b168b2c9d0b), - W64LIT(0xf6a7a7a6a7510153), W64LIT(0xb27d7de97dcf94fa), W64LIT(0x4995956e95dcfb37), W64LIT(0x56d8d847d88e9fad), - W64LIT(0x70fbfbcbfb8b30eb), W64LIT(0xcdeeee9fee2371c1), W64LIT(0xbb7c7ced7cc791f8), W64LIT(0x716666856617e3cc), - W64LIT(0x7bdddd53dda68ea7), W64LIT(0xaf17175c17b84b2e), W64LIT(0x454747014702468e), W64LIT(0x1a9e9e429e84dc21), - W64LIT(0xd4caca0fca1ec589), W64LIT(0x582d2db42d75995a), W64LIT(0x2ebfbfc6bf917963), W64LIT(0x3f07071c07381b0e), - W64LIT(0xacadad8ead012347), W64LIT(0xb05a5a755aea2fb4), W64LIT(0xef838336836cb51b), W64LIT(0xb63333cc3385ff66), - W64LIT(0x5c636391633ff2c6), W64LIT(0x1202020802100a04), W64LIT(0x93aaaa92aa393849), W64LIT(0xde7171d971afa8e2), - W64LIT(0xc6c8c807c80ecf8d), W64LIT(0xd119196419c87d32), W64LIT(0x3b49493949727092), W64LIT(0x5fd9d943d9869aaf), - W64LIT(0x31f2f2eff2c31df9), W64LIT(0xa8e3e3abe34b48db), W64LIT(0xb95b5b715be22ab6), W64LIT(0xbc88881a8834920d), - W64LIT(0x3e9a9a529aa4c829), W64LIT(0x0b262698262dbe4c), W64LIT(0xbf3232c8328dfa64), W64LIT(0x59b0b0fab0e94a7d), - W64LIT(0xf2e9e983e91b6acf), W64LIT(0x770f0f3c0f78331e), W64LIT(0x33d5d573d5e6a6b7), W64LIT(0xf480803a8074ba1d), - W64LIT(0x27bebec2be997c61), W64LIT(0xebcdcd13cd26de87), W64LIT(0x893434d034bde468), W64LIT(0x3248483d487a7590), - W64LIT(0x54ffffdbffab24e3), W64LIT(0x8d7a7af57af78ff4), W64LIT(0x6490907a90f4ea3d), W64LIT(0x9d5f5f615fc23ebe), - W64LIT(0x3d202080201da040), W64LIT(0x0f6868bd6867d5d0), W64LIT(0xca1a1a681ad07234), W64LIT(0xb7aeae82ae192c41), - W64LIT(0x7db4b4eab4c95e75), W64LIT(0xce54544d549a19a8), W64LIT(0x7f93937693ece53b), W64LIT(0x2f222288220daa44), - W64LIT(0x6364648d6407e9c8), W64LIT(0x2af1f1e3f1db12ff), W64LIT(0xcc7373d173bfa2e6), W64LIT(0x8212124812905a24), - W64LIT(0x7a40401d403a5d80), W64LIT(0x4808082008402810), W64LIT(0x95c3c32bc356e89b), W64LIT(0xdfecec97ec337bc5), - W64LIT(0x4ddbdb4bdb9690ab), W64LIT(0xc0a1a1bea1611f5f), W64LIT(0x918d8d0e8d1c8307), W64LIT(0xc83d3df43df5c97a), - W64LIT(0x5b97976697ccf133), W64LIT(0x0000000000000000), W64LIT(0xf9cfcf1bcf36d483), W64LIT(0x6e2b2bac2b458756), - W64LIT(0xe17676c57697b3ec), W64LIT(0xe68282328264b019), W64LIT(0x28d6d67fd6fea9b1), W64LIT(0xc31b1b6c1bd87736), - W64LIT(0x74b5b5eeb5c15b77), W64LIT(0xbeafaf86af112943), W64LIT(0x1d6a6ab56a77dfd4), W64LIT(0xea50505d50ba0da0), - W64LIT(0x5745450945124c8a), W64LIT(0x38f3f3ebf3cb18fb), W64LIT(0xad3030c0309df060), W64LIT(0xc4efef9bef2b74c3), - W64LIT(0xda3f3ffc3fe5c37e), W64LIT(0xc755554955921caa), W64LIT(0xdba2a2b2a2791059), W64LIT(0xe9eaea8fea0365c9), - W64LIT(0x6a656589650fecca), W64LIT(0x03babad2bab96869), W64LIT(0x4a2f2fbc2f65935e), W64LIT(0x8ec0c027c04ee79d), - W64LIT(0x60dede5fdebe81a1), W64LIT(0xfc1c1c701ce06c38), W64LIT(0x46fdfdd3fdbb2ee7), W64LIT(0x1f4d4d294d52649a), - W64LIT(0x7692927292e4e039), W64LIT(0xfa7575c9758fbcea), W64LIT(0x3606061806301e0c), W64LIT(0xae8a8a128a249809), - W64LIT(0x4bb2b2f2b2f94079), W64LIT(0x85e6e6bfe66359d1), W64LIT(0x7e0e0e380e70361c), W64LIT(0xe71f1f7c1ff8633e), - W64LIT(0x556262956237f7c4), W64LIT(0x3ad4d477d4eea3b5), W64LIT(0x81a8a89aa829324d), W64LIT(0x5296966296c4f431), - W64LIT(0x62f9f9c3f99b3aef), W64LIT(0xa3c5c533c566f697), W64LIT(0x102525942535b14a), W64LIT(0xab59597959f220b2), - W64LIT(0xd084842a8454ae15), W64LIT(0xc57272d572b7a7e4), W64LIT(0xec3939e439d5dd72), W64LIT(0x164c4c2d4c5a6198), - W64LIT(0x945e5e655eca3bbc), W64LIT(0x9f7878fd78e785f0), W64LIT(0xe53838e038ddd870), W64LIT(0x988c8c0a8c148605), - W64LIT(0x17d1d163d1c6b2bf), W64LIT(0xe4a5a5aea5410b57), W64LIT(0xa1e2e2afe2434dd9), W64LIT(0x4e616199612ff8c2), - W64LIT(0x42b3b3f6b3f1457b), W64LIT(0x342121842115a542), W64LIT(0x089c9c4a9c94d625), W64LIT(0xee1e1e781ef0663c), - W64LIT(0x6143431143225286), W64LIT(0xb1c7c73bc776fc93), W64LIT(0x4ffcfcd7fcb32be5), W64LIT(0x2404041004201408), - W64LIT(0xe351515951b208a2), W64LIT(0x2599995e99bcc72f), W64LIT(0x226d6da96d4fc4da), W64LIT(0x650d0d340d68391a), - W64LIT(0x79fafacffa8335e9), W64LIT(0x69dfdf5bdfb684a3), W64LIT(0xa97e7ee57ed79bfc), W64LIT(0x19242490243db448), - W64LIT(0xfe3b3bec3bc5d776), W64LIT(0x9aabab96ab313d4b), W64LIT(0xf0cece1fce3ed181), W64LIT(0x9911114411885522), - W64LIT(0x838f8f068f0c8903), W64LIT(0x044e4e254e4a6b9c), W64LIT(0x66b7b7e6b7d15173), W64LIT(0xe0ebeb8beb0b60cb), - W64LIT(0xc13c3cf03cfdcc78), W64LIT(0xfd81813e817cbf1f), W64LIT(0x4094946a94d4fe35), W64LIT(0x1cf7f7fbf7eb0cf3), - W64LIT(0x18b9b9deb9a1676f), W64LIT(0x8b13134c13985f26), W64LIT(0x512c2cb02c7d9c58), W64LIT(0x05d3d36bd3d6b8bb), - W64LIT(0x8ce7e7bbe76b5cd3), W64LIT(0x396e6ea56e57cbdc), W64LIT(0xaac4c437c46ef395), W64LIT(0x1b03030c03180f06), - W64LIT(0xdc565645568a13ac), W64LIT(0x5e44440d441a4988), W64LIT(0xa07f7fe17fdf9efe), W64LIT(0x88a9a99ea921374f), - W64LIT(0x672a2aa82a4d8254), W64LIT(0x0abbbbd6bbb16d6b), W64LIT(0x87c1c123c146e29f), W64LIT(0xf153535153a202a6), - W64LIT(0x72dcdc57dcae8ba5), W64LIT(0x530b0b2c0b582716), W64LIT(0x019d9d4e9d9cd327), W64LIT(0x2b6c6cad6c47c1d8), - W64LIT(0xa43131c43195f562), W64LIT(0xf37474cd7487b9e8), W64LIT(0x15f6f6fff6e309f1), W64LIT(0x4c464605460a438c), - W64LIT(0xa5acac8aac092645), W64LIT(0xb589891e893c970f), W64LIT(0xb414145014a04428), W64LIT(0xbae1e1a3e15b42df), - W64LIT(0xa616165816b04e2c), W64LIT(0xf73a3ae83acdd274), W64LIT(0x066969b9696fd0d2), W64LIT(0x4109092409482d12), - W64LIT(0xd77070dd70a7ade0), W64LIT(0x6fb6b6e2b6d95471), W64LIT(0x1ed0d067d0ceb7bd), W64LIT(0xd6eded93ed3b7ec7), - W64LIT(0xe2cccc17cc2edb85), W64LIT(0x68424215422a5784), W64LIT(0x2c98985a98b4c22d), W64LIT(0xeda4a4aaa4490e55), - W64LIT(0x752828a0285d8850), W64LIT(0x865c5c6d5cda31b8), W64LIT(0x6bf8f8c7f8933fed), W64LIT(0xc28686228644a411), - - W64LIT(0x30d818186018c078), W64LIT(0x462623238c2305af), W64LIT(0x91b8c6c63fc67ef9), W64LIT(0xcdfbe8e887e8136f), - W64LIT(0x13cb878726874ca1), W64LIT(0x6d11b8b8dab8a962), W64LIT(0x0209010104010805), W64LIT(0x9e0d4f4f214f426e), - W64LIT(0x6c9b3636d836adee), W64LIT(0x51ffa6a6a2a65904), W64LIT(0xb90cd2d26fd2debd), W64LIT(0xf70ef5f5f3f5fb06), - W64LIT(0xf2967979f979ef80), W64LIT(0xde306f6fa16f5fce), W64LIT(0x3f6d91917e91fcef), W64LIT(0xa4f852525552aa07), - W64LIT(0xc04760609d6027fd), W64LIT(0x6535bcbccabc8976), W64LIT(0x2b379b9b569baccd), W64LIT(0x018a8e8e028e048c), - W64LIT(0x5bd2a3a3b6a37115), W64LIT(0x186c0c0c300c603c), W64LIT(0xf6847b7bf17bff8a), W64LIT(0x6a803535d435b5e1), - W64LIT(0x3af51d1d741de869), W64LIT(0xddb3e0e0a7e05347), W64LIT(0xb321d7d77bd7f6ac), W64LIT(0x999cc2c22fc25eed), - W64LIT(0x5c432e2eb82e6d96), W64LIT(0x96294b4b314b627a), W64LIT(0xe15dfefedffea321), W64LIT(0xaed5575741578216), - W64LIT(0x2abd15155415a841), W64LIT(0xeee87777c1779fb6), W64LIT(0x6e923737dc37a5eb), W64LIT(0xd79ee5e5b3e57b56), - W64LIT(0x23139f9f469f8cd9), W64LIT(0xfd23f0f0e7f0d317), W64LIT(0x94204a4a354a6a7f), W64LIT(0xa944dada4fda9e95), - W64LIT(0xb0a258587d58fa25), W64LIT(0x8fcfc9c903c906ca), W64LIT(0x527c2929a429558d), W64LIT(0x145a0a0a280a5022), - W64LIT(0x7f50b1b1feb1e14f), W64LIT(0x5dc9a0a0baa0691a), W64LIT(0xd6146b6bb16b7fda), W64LIT(0x17d985852e855cab), - W64LIT(0x673cbdbdcebd8173), W64LIT(0xba8f5d5d695dd234), W64LIT(0x2090101040108050), W64LIT(0xf507f4f4f7f4f303), - W64LIT(0x8bddcbcb0bcb16c0), W64LIT(0x7cd33e3ef83eedc6), W64LIT(0x0a2d050514052811), W64LIT(0xce78676781671fe6), - W64LIT(0xd597e4e4b7e47353), W64LIT(0x4e0227279c2725bb), W64LIT(0x8273414119413258), W64LIT(0x0ba78b8b168b2c9d), - W64LIT(0x53f6a7a7a6a75101), W64LIT(0xfab27d7de97dcf94), W64LIT(0x374995956e95dcfb), W64LIT(0xad56d8d847d88e9f), - W64LIT(0xeb70fbfbcbfb8b30), W64LIT(0xc1cdeeee9fee2371), W64LIT(0xf8bb7c7ced7cc791), W64LIT(0xcc716666856617e3), - W64LIT(0xa77bdddd53dda68e), W64LIT(0x2eaf17175c17b84b), W64LIT(0x8e45474701470246), W64LIT(0x211a9e9e429e84dc), - W64LIT(0x89d4caca0fca1ec5), W64LIT(0x5a582d2db42d7599), W64LIT(0x632ebfbfc6bf9179), W64LIT(0x0e3f07071c07381b), - W64LIT(0x47acadad8ead0123), W64LIT(0xb4b05a5a755aea2f), W64LIT(0x1bef838336836cb5), W64LIT(0x66b63333cc3385ff), - W64LIT(0xc65c636391633ff2), W64LIT(0x041202020802100a), W64LIT(0x4993aaaa92aa3938), W64LIT(0xe2de7171d971afa8), - W64LIT(0x8dc6c8c807c80ecf), W64LIT(0x32d119196419c87d), W64LIT(0x923b494939497270), W64LIT(0xaf5fd9d943d9869a), - W64LIT(0xf931f2f2eff2c31d), W64LIT(0xdba8e3e3abe34b48), W64LIT(0xb6b95b5b715be22a), W64LIT(0x0dbc88881a883492), - W64LIT(0x293e9a9a529aa4c8), W64LIT(0x4c0b262698262dbe), W64LIT(0x64bf3232c8328dfa), W64LIT(0x7d59b0b0fab0e94a), - W64LIT(0xcff2e9e983e91b6a), W64LIT(0x1e770f0f3c0f7833), W64LIT(0xb733d5d573d5e6a6), W64LIT(0x1df480803a8074ba), - W64LIT(0x6127bebec2be997c), W64LIT(0x87ebcdcd13cd26de), W64LIT(0x68893434d034bde4), W64LIT(0x903248483d487a75), - W64LIT(0xe354ffffdbffab24), W64LIT(0xf48d7a7af57af78f), W64LIT(0x3d6490907a90f4ea), W64LIT(0xbe9d5f5f615fc23e), - W64LIT(0x403d202080201da0), W64LIT(0xd00f6868bd6867d5), W64LIT(0x34ca1a1a681ad072), W64LIT(0x41b7aeae82ae192c), - W64LIT(0x757db4b4eab4c95e), W64LIT(0xa8ce54544d549a19), W64LIT(0x3b7f93937693ece5), W64LIT(0x442f222288220daa), - W64LIT(0xc86364648d6407e9), W64LIT(0xff2af1f1e3f1db12), W64LIT(0xe6cc7373d173bfa2), W64LIT(0x248212124812905a), - W64LIT(0x807a40401d403a5d), W64LIT(0x1048080820084028), W64LIT(0x9b95c3c32bc356e8), W64LIT(0xc5dfecec97ec337b), - W64LIT(0xab4ddbdb4bdb9690), W64LIT(0x5fc0a1a1bea1611f), W64LIT(0x07918d8d0e8d1c83), W64LIT(0x7ac83d3df43df5c9), - W64LIT(0x335b97976697ccf1), W64LIT(0x0000000000000000), W64LIT(0x83f9cfcf1bcf36d4), W64LIT(0x566e2b2bac2b4587), - W64LIT(0xece17676c57697b3), W64LIT(0x19e68282328264b0), W64LIT(0xb128d6d67fd6fea9), W64LIT(0x36c31b1b6c1bd877), - W64LIT(0x7774b5b5eeb5c15b), W64LIT(0x43beafaf86af1129), W64LIT(0xd41d6a6ab56a77df), W64LIT(0xa0ea50505d50ba0d), - W64LIT(0x8a5745450945124c), W64LIT(0xfb38f3f3ebf3cb18), W64LIT(0x60ad3030c0309df0), W64LIT(0xc3c4efef9bef2b74), - W64LIT(0x7eda3f3ffc3fe5c3), W64LIT(0xaac755554955921c), W64LIT(0x59dba2a2b2a27910), W64LIT(0xc9e9eaea8fea0365), - W64LIT(0xca6a656589650fec), W64LIT(0x6903babad2bab968), W64LIT(0x5e4a2f2fbc2f6593), W64LIT(0x9d8ec0c027c04ee7), - W64LIT(0xa160dede5fdebe81), W64LIT(0x38fc1c1c701ce06c), W64LIT(0xe746fdfdd3fdbb2e), W64LIT(0x9a1f4d4d294d5264), - W64LIT(0x397692927292e4e0), W64LIT(0xeafa7575c9758fbc), W64LIT(0x0c3606061806301e), W64LIT(0x09ae8a8a128a2498), - W64LIT(0x794bb2b2f2b2f940), W64LIT(0xd185e6e6bfe66359), W64LIT(0x1c7e0e0e380e7036), W64LIT(0x3ee71f1f7c1ff863), - W64LIT(0xc4556262956237f7), W64LIT(0xb53ad4d477d4eea3), W64LIT(0x4d81a8a89aa82932), W64LIT(0x315296966296c4f4), - W64LIT(0xef62f9f9c3f99b3a), W64LIT(0x97a3c5c533c566f6), W64LIT(0x4a102525942535b1), W64LIT(0xb2ab59597959f220), - W64LIT(0x15d084842a8454ae), W64LIT(0xe4c57272d572b7a7), W64LIT(0x72ec3939e439d5dd), W64LIT(0x98164c4c2d4c5a61), - W64LIT(0xbc945e5e655eca3b), W64LIT(0xf09f7878fd78e785), W64LIT(0x70e53838e038ddd8), W64LIT(0x05988c8c0a8c1486), - W64LIT(0xbf17d1d163d1c6b2), W64LIT(0x57e4a5a5aea5410b), W64LIT(0xd9a1e2e2afe2434d), W64LIT(0xc24e616199612ff8), - W64LIT(0x7b42b3b3f6b3f145), W64LIT(0x42342121842115a5), W64LIT(0x25089c9c4a9c94d6), W64LIT(0x3cee1e1e781ef066), - W64LIT(0x8661434311432252), W64LIT(0x93b1c7c73bc776fc), W64LIT(0xe54ffcfcd7fcb32b), W64LIT(0x0824040410042014), - W64LIT(0xa2e351515951b208), W64LIT(0x2f2599995e99bcc7), W64LIT(0xda226d6da96d4fc4), W64LIT(0x1a650d0d340d6839), - W64LIT(0xe979fafacffa8335), W64LIT(0xa369dfdf5bdfb684), W64LIT(0xfca97e7ee57ed79b), W64LIT(0x4819242490243db4), - W64LIT(0x76fe3b3bec3bc5d7), W64LIT(0x4b9aabab96ab313d), W64LIT(0x81f0cece1fce3ed1), W64LIT(0x2299111144118855), - W64LIT(0x03838f8f068f0c89), W64LIT(0x9c044e4e254e4a6b), W64LIT(0x7366b7b7e6b7d151), W64LIT(0xcbe0ebeb8beb0b60), - W64LIT(0x78c13c3cf03cfdcc), W64LIT(0x1ffd81813e817cbf), W64LIT(0x354094946a94d4fe), W64LIT(0xf31cf7f7fbf7eb0c), - W64LIT(0x6f18b9b9deb9a167), W64LIT(0x268b13134c13985f), W64LIT(0x58512c2cb02c7d9c), W64LIT(0xbb05d3d36bd3d6b8), - W64LIT(0xd38ce7e7bbe76b5c), W64LIT(0xdc396e6ea56e57cb), W64LIT(0x95aac4c437c46ef3), W64LIT(0x061b03030c03180f), - W64LIT(0xacdc565645568a13), W64LIT(0x885e44440d441a49), W64LIT(0xfea07f7fe17fdf9e), W64LIT(0x4f88a9a99ea92137), - W64LIT(0x54672a2aa82a4d82), W64LIT(0x6b0abbbbd6bbb16d), W64LIT(0x9f87c1c123c146e2), W64LIT(0xa6f153535153a202), - W64LIT(0xa572dcdc57dcae8b), W64LIT(0x16530b0b2c0b5827), W64LIT(0x27019d9d4e9d9cd3), W64LIT(0xd82b6c6cad6c47c1), - W64LIT(0x62a43131c43195f5), W64LIT(0xe8f37474cd7487b9), W64LIT(0xf115f6f6fff6e309), W64LIT(0x8c4c464605460a43), - W64LIT(0x45a5acac8aac0926), W64LIT(0x0fb589891e893c97), W64LIT(0x28b414145014a044), W64LIT(0xdfbae1e1a3e15b42), - W64LIT(0x2ca616165816b04e), W64LIT(0x74f73a3ae83acdd2), W64LIT(0xd2066969b9696fd0), W64LIT(0x124109092409482d), - W64LIT(0xe0d77070dd70a7ad), W64LIT(0x716fb6b6e2b6d954), W64LIT(0xbd1ed0d067d0ceb7), W64LIT(0xc7d6eded93ed3b7e), - W64LIT(0x85e2cccc17cc2edb), W64LIT(0x8468424215422a57), W64LIT(0x2d2c98985a98b4c2), W64LIT(0x55eda4a4aaa4490e), - W64LIT(0x50752828a0285d88), W64LIT(0xb8865c5c6d5cda31), W64LIT(0xed6bf8f8c7f8933f), W64LIT(0x11c28686228644a4), - - W64LIT(0x7830d818186018c0), W64LIT(0xaf462623238c2305), W64LIT(0xf991b8c6c63fc67e), W64LIT(0x6fcdfbe8e887e813), - W64LIT(0xa113cb878726874c), W64LIT(0x626d11b8b8dab8a9), W64LIT(0x0502090101040108), W64LIT(0x6e9e0d4f4f214f42), - W64LIT(0xee6c9b3636d836ad), W64LIT(0x0451ffa6a6a2a659), W64LIT(0xbdb90cd2d26fd2de), W64LIT(0x06f70ef5f5f3f5fb), - W64LIT(0x80f2967979f979ef), W64LIT(0xcede306f6fa16f5f), W64LIT(0xef3f6d91917e91fc), W64LIT(0x07a4f852525552aa), - W64LIT(0xfdc04760609d6027), W64LIT(0x766535bcbccabc89), W64LIT(0xcd2b379b9b569bac), W64LIT(0x8c018a8e8e028e04), - W64LIT(0x155bd2a3a3b6a371), W64LIT(0x3c186c0c0c300c60), W64LIT(0x8af6847b7bf17bff), W64LIT(0xe16a803535d435b5), - W64LIT(0x693af51d1d741de8), W64LIT(0x47ddb3e0e0a7e053), W64LIT(0xacb321d7d77bd7f6), W64LIT(0xed999cc2c22fc25e), - W64LIT(0x965c432e2eb82e6d), W64LIT(0x7a96294b4b314b62), W64LIT(0x21e15dfefedffea3), W64LIT(0x16aed55757415782), - W64LIT(0x412abd15155415a8), W64LIT(0xb6eee87777c1779f), W64LIT(0xeb6e923737dc37a5), W64LIT(0x56d79ee5e5b3e57b), - W64LIT(0xd923139f9f469f8c), W64LIT(0x17fd23f0f0e7f0d3), W64LIT(0x7f94204a4a354a6a), W64LIT(0x95a944dada4fda9e), - W64LIT(0x25b0a258587d58fa), W64LIT(0xca8fcfc9c903c906), W64LIT(0x8d527c2929a42955), W64LIT(0x22145a0a0a280a50), - W64LIT(0x4f7f50b1b1feb1e1), W64LIT(0x1a5dc9a0a0baa069), W64LIT(0xdad6146b6bb16b7f), W64LIT(0xab17d985852e855c), - W64LIT(0x73673cbdbdcebd81), W64LIT(0x34ba8f5d5d695dd2), W64LIT(0x5020901010401080), W64LIT(0x03f507f4f4f7f4f3), - W64LIT(0xc08bddcbcb0bcb16), W64LIT(0xc67cd33e3ef83eed), W64LIT(0x110a2d0505140528), W64LIT(0xe6ce78676781671f), - W64LIT(0x53d597e4e4b7e473), W64LIT(0xbb4e0227279c2725), W64LIT(0x5882734141194132), W64LIT(0x9d0ba78b8b168b2c), - W64LIT(0x0153f6a7a7a6a751), W64LIT(0x94fab27d7de97dcf), W64LIT(0xfb374995956e95dc), W64LIT(0x9fad56d8d847d88e), - W64LIT(0x30eb70fbfbcbfb8b), W64LIT(0x71c1cdeeee9fee23), W64LIT(0x91f8bb7c7ced7cc7), W64LIT(0xe3cc716666856617), - W64LIT(0x8ea77bdddd53dda6), W64LIT(0x4b2eaf17175c17b8), W64LIT(0x468e454747014702), W64LIT(0xdc211a9e9e429e84), - W64LIT(0xc589d4caca0fca1e), W64LIT(0x995a582d2db42d75), W64LIT(0x79632ebfbfc6bf91), W64LIT(0x1b0e3f07071c0738), - W64LIT(0x2347acadad8ead01), W64LIT(0x2fb4b05a5a755aea), W64LIT(0xb51bef838336836c), W64LIT(0xff66b63333cc3385), - W64LIT(0xf2c65c636391633f), W64LIT(0x0a04120202080210), W64LIT(0x384993aaaa92aa39), W64LIT(0xa8e2de7171d971af), - W64LIT(0xcf8dc6c8c807c80e), W64LIT(0x7d32d119196419c8), W64LIT(0x70923b4949394972), W64LIT(0x9aaf5fd9d943d986), - W64LIT(0x1df931f2f2eff2c3), W64LIT(0x48dba8e3e3abe34b), W64LIT(0x2ab6b95b5b715be2), W64LIT(0x920dbc88881a8834), - W64LIT(0xc8293e9a9a529aa4), W64LIT(0xbe4c0b262698262d), W64LIT(0xfa64bf3232c8328d), W64LIT(0x4a7d59b0b0fab0e9), - W64LIT(0x6acff2e9e983e91b), W64LIT(0x331e770f0f3c0f78), W64LIT(0xa6b733d5d573d5e6), W64LIT(0xba1df480803a8074), - W64LIT(0x7c6127bebec2be99), W64LIT(0xde87ebcdcd13cd26), W64LIT(0xe468893434d034bd), W64LIT(0x75903248483d487a), - W64LIT(0x24e354ffffdbffab), W64LIT(0x8ff48d7a7af57af7), W64LIT(0xea3d6490907a90f4), W64LIT(0x3ebe9d5f5f615fc2), - W64LIT(0xa0403d202080201d), W64LIT(0xd5d00f6868bd6867), W64LIT(0x7234ca1a1a681ad0), W64LIT(0x2c41b7aeae82ae19), - W64LIT(0x5e757db4b4eab4c9), W64LIT(0x19a8ce54544d549a), W64LIT(0xe53b7f93937693ec), W64LIT(0xaa442f222288220d), - W64LIT(0xe9c86364648d6407), W64LIT(0x12ff2af1f1e3f1db), W64LIT(0xa2e6cc7373d173bf), W64LIT(0x5a24821212481290), - W64LIT(0x5d807a40401d403a), W64LIT(0x2810480808200840), W64LIT(0xe89b95c3c32bc356), W64LIT(0x7bc5dfecec97ec33), - W64LIT(0x90ab4ddbdb4bdb96), W64LIT(0x1f5fc0a1a1bea161), W64LIT(0x8307918d8d0e8d1c), W64LIT(0xc97ac83d3df43df5), - W64LIT(0xf1335b97976697cc), W64LIT(0x0000000000000000), W64LIT(0xd483f9cfcf1bcf36), W64LIT(0x87566e2b2bac2b45), - W64LIT(0xb3ece17676c57697), W64LIT(0xb019e68282328264), W64LIT(0xa9b128d6d67fd6fe), W64LIT(0x7736c31b1b6c1bd8), - W64LIT(0x5b7774b5b5eeb5c1), W64LIT(0x2943beafaf86af11), W64LIT(0xdfd41d6a6ab56a77), W64LIT(0x0da0ea50505d50ba), - W64LIT(0x4c8a574545094512), W64LIT(0x18fb38f3f3ebf3cb), W64LIT(0xf060ad3030c0309d), W64LIT(0x74c3c4efef9bef2b), - W64LIT(0xc37eda3f3ffc3fe5), W64LIT(0x1caac75555495592), W64LIT(0x1059dba2a2b2a279), W64LIT(0x65c9e9eaea8fea03), - W64LIT(0xecca6a656589650f), W64LIT(0x686903babad2bab9), W64LIT(0x935e4a2f2fbc2f65), W64LIT(0xe79d8ec0c027c04e), - W64LIT(0x81a160dede5fdebe), W64LIT(0x6c38fc1c1c701ce0), W64LIT(0x2ee746fdfdd3fdbb), W64LIT(0x649a1f4d4d294d52), - W64LIT(0xe0397692927292e4), W64LIT(0xbceafa7575c9758f), W64LIT(0x1e0c360606180630), W64LIT(0x9809ae8a8a128a24), - W64LIT(0x40794bb2b2f2b2f9), W64LIT(0x59d185e6e6bfe663), W64LIT(0x361c7e0e0e380e70), W64LIT(0x633ee71f1f7c1ff8), - W64LIT(0xf7c4556262956237), W64LIT(0xa3b53ad4d477d4ee), W64LIT(0x324d81a8a89aa829), W64LIT(0xf4315296966296c4), - W64LIT(0x3aef62f9f9c3f99b), W64LIT(0xf697a3c5c533c566), W64LIT(0xb14a102525942535), W64LIT(0x20b2ab59597959f2), - W64LIT(0xae15d084842a8454), W64LIT(0xa7e4c57272d572b7), W64LIT(0xdd72ec3939e439d5), W64LIT(0x6198164c4c2d4c5a), - W64LIT(0x3bbc945e5e655eca), W64LIT(0x85f09f7878fd78e7), W64LIT(0xd870e53838e038dd), W64LIT(0x8605988c8c0a8c14), - W64LIT(0xb2bf17d1d163d1c6), W64LIT(0x0b57e4a5a5aea541), W64LIT(0x4dd9a1e2e2afe243), W64LIT(0xf8c24e616199612f), - W64LIT(0x457b42b3b3f6b3f1), W64LIT(0xa542342121842115), W64LIT(0xd625089c9c4a9c94), W64LIT(0x663cee1e1e781ef0), - W64LIT(0x5286614343114322), W64LIT(0xfc93b1c7c73bc776), W64LIT(0x2be54ffcfcd7fcb3), W64LIT(0x1408240404100420), - W64LIT(0x08a2e351515951b2), W64LIT(0xc72f2599995e99bc), W64LIT(0xc4da226d6da96d4f), W64LIT(0x391a650d0d340d68), - W64LIT(0x35e979fafacffa83), W64LIT(0x84a369dfdf5bdfb6), W64LIT(0x9bfca97e7ee57ed7), W64LIT(0xb44819242490243d), - W64LIT(0xd776fe3b3bec3bc5), W64LIT(0x3d4b9aabab96ab31), W64LIT(0xd181f0cece1fce3e), W64LIT(0x5522991111441188), - W64LIT(0x8903838f8f068f0c), W64LIT(0x6b9c044e4e254e4a), W64LIT(0x517366b7b7e6b7d1), W64LIT(0x60cbe0ebeb8beb0b), - W64LIT(0xcc78c13c3cf03cfd), W64LIT(0xbf1ffd81813e817c), W64LIT(0xfe354094946a94d4), W64LIT(0x0cf31cf7f7fbf7eb), - W64LIT(0x676f18b9b9deb9a1), W64LIT(0x5f268b13134c1398), W64LIT(0x9c58512c2cb02c7d), W64LIT(0xb8bb05d3d36bd3d6), - W64LIT(0x5cd38ce7e7bbe76b), W64LIT(0xcbdc396e6ea56e57), W64LIT(0xf395aac4c437c46e), W64LIT(0x0f061b03030c0318), - W64LIT(0x13acdc565645568a), W64LIT(0x49885e44440d441a), W64LIT(0x9efea07f7fe17fdf), W64LIT(0x374f88a9a99ea921), - W64LIT(0x8254672a2aa82a4d), W64LIT(0x6d6b0abbbbd6bbb1), W64LIT(0xe29f87c1c123c146), W64LIT(0x02a6f153535153a2), - W64LIT(0x8ba572dcdc57dcae), W64LIT(0x2716530b0b2c0b58), W64LIT(0xd327019d9d4e9d9c), W64LIT(0xc1d82b6c6cad6c47), - W64LIT(0xf562a43131c43195), W64LIT(0xb9e8f37474cd7487), W64LIT(0x09f115f6f6fff6e3), W64LIT(0x438c4c464605460a), - W64LIT(0x2645a5acac8aac09), W64LIT(0x970fb589891e893c), W64LIT(0x4428b414145014a0), W64LIT(0x42dfbae1e1a3e15b), - W64LIT(0x4e2ca616165816b0), W64LIT(0xd274f73a3ae83acd), W64LIT(0xd0d2066969b9696f), W64LIT(0x2d12410909240948), - W64LIT(0xade0d77070dd70a7), W64LIT(0x54716fb6b6e2b6d9), W64LIT(0xb7bd1ed0d067d0ce), W64LIT(0x7ec7d6eded93ed3b), - W64LIT(0xdb85e2cccc17cc2e), W64LIT(0x578468424215422a), W64LIT(0xc22d2c98985a98b4), W64LIT(0x0e55eda4a4aaa449), - W64LIT(0x8850752828a0285d), W64LIT(0x31b8865c5c6d5cda), W64LIT(0x3fed6bf8f8c7f893), W64LIT(0xa411c28686228644), - - W64LIT(0x1823c6e887b8014f), - W64LIT(0x36a6d2f5796f9152), - W64LIT(0x60bc9b8ea30c7b35), - W64LIT(0x1de0d7c22e4bfe57), - W64LIT(0x157737e59ff04ada), - W64LIT(0x58c9290ab1a06b85), - W64LIT(0xbd5d10f4cb3e0567), - W64LIT(0xe427418ba77d95d8), - W64LIT(0xfbee7c66dd17479e), - W64LIT(0xca2dbf07ad5a8333) -}; - -// Whirlpool basic transformation. Transforms state based on block. -void Whirlpool::Transform(word64 *digest, const word64 *block) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - if (HasISSE()) - { - // MMX version has the same structure as C version below -#ifdef __GNUC__ - #if CRYPTOPP_BOOL_X64 - word64 workspace[16]; - #endif - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS_PUSH_IF86( bx) - AS2( mov AS_REG_6, WORD_REG(ax)) -#else - #if _MSC_VER < 1300 - AS_PUSH_IF86( bx) - #endif - AS2( lea AS_REG_6, [Whirlpool_C]) - AS2( mov WORD_REG(cx), digest) - AS2( mov WORD_REG(dx), block) -#endif -#if CRYPTOPP_BOOL_X86 - AS2( mov eax, esp) - AS2( and esp, -16) - AS2( sub esp, 16*8) - AS1( push eax) - #define SSE2_workspace esp+WORD_SZ -#else - #define SSE2_workspace %3 -#endif - AS2( xor esi, esi) - ASL(0) - AS2( movq mm0, [WORD_REG(cx)+8*WORD_REG(si)]) - AS2( movq [SSE2_workspace+8*WORD_REG(si)], mm0) // k - AS2( pxor mm0, [WORD_REG(dx)+8*WORD_REG(si)]) - AS2( movq [SSE2_workspace+64+8*WORD_REG(si)], mm0) // s - AS2( movq [WORD_REG(cx)+8*WORD_REG(si)], mm0) - AS1( inc WORD_REG(si)) - AS2( cmp WORD_REG(si), 8) - ASJ( jne, 0, b) - - AS2( xor esi, esi) - ASL(1) - -#define KSL0(a, b) AS2(movq mm##a, b) -#define KSL1(a, b) AS2(pxor mm##a, b) - -#define KSL(op, i, a, b, c, d) \ - AS2(mov eax, [SSE2_workspace+8*i])\ - AS2(movzx edi, al)\ - KSL##op(a, [AS_REG_6+3*2048+8*WORD_REG(di)])\ - AS2(movzx edi, ah)\ - KSL##op(b, [AS_REG_6+2*2048+8*WORD_REG(di)])\ - AS2(shr eax, 16)\ - AS2(movzx edi, al)\ - AS2(shr eax, 8)\ - KSL##op(c, [AS_REG_6+1*2048+8*WORD_REG(di)])\ - KSL##op(d, [AS_REG_6+0*2048+8*WORD_REG(ax)]) - -#define KSH0(a, b) \ - ASS(pshufw mm##a, mm##a, 1, 0, 3, 2)\ - AS2(pxor mm##a, b) -#define KSH1(a, b) \ - AS2(pxor mm##a, b) -#define KSH2(a, b) \ - AS2(pxor mm##a, b)\ - AS2(movq [SSE2_workspace+8*a], mm##a) - -#define KSH(op, i, a, b, c, d) \ - AS2(mov eax, [SSE2_workspace+8*((i+4)-8*((i+4)/8))+4])\ - AS2(movzx edi, al)\ - KSH##op(a, [AS_REG_6+3*2048+8*WORD_REG(di)])\ - AS2(movzx edi, ah)\ - KSH##op(b, [AS_REG_6+2*2048+8*WORD_REG(di)])\ - AS2(shr eax, 16)\ - AS2(movzx edi, al)\ - AS2(shr eax, 8)\ - KSH##op(c, [AS_REG_6+1*2048+8*WORD_REG(di)])\ - KSH##op(d, [AS_REG_6+0*2048+8*WORD_REG(ax)]) - -#define TSL(op, i, a, b, c, d) \ - AS2(mov eax, [SSE2_workspace+64+8*i])\ - AS2(movzx edi, al)\ - KSL##op(a, [AS_REG_6+3*2048+8*WORD_REG(di)])\ - AS2(movzx edi, ah)\ - KSL##op(b, [AS_REG_6+2*2048+8*WORD_REG(di)])\ - AS2(shr eax, 16)\ - AS2(movzx edi, al)\ - AS2(shr eax, 8)\ - KSL##op(c, [AS_REG_6+1*2048+8*WORD_REG(di)])\ - KSL##op(d, [AS_REG_6+0*2048+8*WORD_REG(ax)]) - -#define TSH0(a, b) \ - ASS(pshufw mm##a, mm##a, 1, 0, 3, 2)\ - AS2(pxor mm##a, [SSE2_workspace+8*a])\ - AS2(pxor mm##a, b) -#define TSH1(a, b) \ - AS2(pxor mm##a, b) -#define TSH2(a, b) \ - AS2(pxor mm##a, b)\ - AS2(movq [SSE2_workspace+64+8*a], mm##a) -#define TSH3(a, b) \ - AS2(pxor mm##a, b)\ - AS2(pxor mm##a, [WORD_REG(cx)+8*a])\ - AS2(movq [WORD_REG(cx)+8*a], mm##a) - -#define TSH(op, i, a, b, c, d) \ - AS2(mov eax, [SSE2_workspace+64+8*((i+4)-8*((i+4)/8))+4])\ - AS2(movzx edi, al)\ - TSH##op(a, [AS_REG_6+3*2048+8*WORD_REG(di)])\ - AS2(movzx edi, ah)\ - TSH##op(b, [AS_REG_6+2*2048+8*WORD_REG(di)])\ - AS2(shr eax, 16)\ - AS2(movzx edi, al)\ - AS2(shr eax, 8)\ - TSH##op(c, [AS_REG_6+1*2048+8*WORD_REG(di)])\ - TSH##op(d, [AS_REG_6+0*2048+8*WORD_REG(ax)]) - - KSL(0, 4, 3, 2, 1, 0) - KSL(0, 0, 7, 6, 5, 4) - KSL(1, 1, 0, 7, 6, 5) - KSL(1, 2, 1, 0, 7, 6) - KSL(1, 3, 2, 1, 0, 7) - KSL(1, 5, 4, 3, 2, 1) - KSL(1, 6, 5, 4, 3, 2) - KSL(1, 7, 6, 5, 4, 3) - KSH(0, 0, 7, 6, 5, 4) - KSH(0, 4, 3, 2, 1, 0) - KSH(1, 1, 0, 7, 6, 5) - KSH(1, 2, 1, 0, 7, 6) - KSH(1, 5, 4, 3, 2, 1) - KSH(1, 6, 5, 4, 3, 2) - KSH(2, 3, 2, 1, 0, 7) - KSH(2, 7, 6, 5, 4, 3) - - AS2( pxor mm0, [AS_REG_6 + 8*1024 + WORD_REG(si)*8]) - AS2( movq [SSE2_workspace], mm0) - - TSL(0, 4, 3, 2, 1, 0) - TSL(0, 0, 7, 6, 5, 4) - TSL(1, 1, 0, 7, 6, 5) - TSL(1, 2, 1, 0, 7, 6) - TSL(1, 3, 2, 1, 0, 7) - TSL(1, 5, 4, 3, 2, 1) - TSL(1, 6, 5, 4, 3, 2) - TSL(1, 7, 6, 5, 4, 3) - TSH(0, 0, 7, 6, 5, 4) - TSH(0, 4, 3, 2, 1, 0) - TSH(1, 1, 0, 7, 6, 5) - TSH(1, 2, 1, 0, 7, 6) - TSH(1, 5, 4, 3, 2, 1) - TSH(1, 6, 5, 4, 3, 2) - - AS1( inc WORD_REG(si)) - AS2( cmp WORD_REG(si), 10) - ASJ( je, 2, f) - - TSH(2, 3, 2, 1, 0, 7) - TSH(2, 7, 6, 5, 4, 3) - - ASJ( jmp, 1, b) - ASL(2) - - TSH(3, 3, 2, 1, 0, 7) - TSH(3, 7, 6, 5, 4, 3) - -#undef KSL -#undef KSH -#undef TSL -#undef TSH - - AS_POP_IF86( sp) - AS1( emms) - -#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER < 1300) - AS_POP_IF86( bx) -#endif -#ifdef __GNUC__ - ".att_syntax prefix;" - : - : "a" (Whirlpool_C), "c" (digest), "d" (block) - #if CRYPTOPP_BOOL_X64 - , "r" (workspace) - #endif - : "%esi", "%edi", "memory", "cc" - #if CRYPTOPP_BOOL_X64 - , "%r9" - #endif - ); -#endif - } - else -#endif // #ifdef CRYPTOPP_X86_ASM_AVAILABLE - { - word64 s[8]; // the cipher state - word64 k[8]; // the round key - - // Compute and apply K^0 to the cipher state - // Also apply part of the Miyaguchi-Preneel compression function - for (int i=0; i<8; i++) - digest[i] = s[i] = block[i] ^ (k[i] = digest[i]); - -#define KSL(op, i, a, b, c, d) \ - t = (word32)k[i];\ - w##a = Whirlpool_C[3*256 + (byte)t] ^ (op ? w##a : 0);\ - t >>= 8;\ - w##b = Whirlpool_C[2*256 + (byte)t] ^ (op ? w##b : 0);\ - t >>= 8;\ - w##c = Whirlpool_C[1*256 + (byte)t] ^ (op ? w##c : 0);\ - t >>= 8;\ - w##d = Whirlpool_C[0*256 + t] ^ (op ? w##d : 0); - -#define KSH(op, i, a, b, c, d) \ - t = (word32)(k[(i+4)%8]>>32);\ - w##a = Whirlpool_C[3*256 + (byte)t] ^ (op ? w##a : rotrFixed(w##a, 32));\ - if (op==2) k[a] = w##a;\ - t >>= 8;\ - w##b = Whirlpool_C[2*256 + (byte)t] ^ (op ? w##b : rotrFixed(w##b, 32));\ - if (op==2) k[b] = w##b;\ - t >>= 8;\ - w##c = Whirlpool_C[1*256 + (byte)t] ^ (op ? w##c : rotrFixed(w##c, 32));\ - if (op==2) k[c] = w##c;\ - t >>= 8;\ - w##d = Whirlpool_C[0*256 + t] ^ (op ? w##d : rotrFixed(w##d, 32));\ - if (op==2) k[d] = w##d;\ - -#define TSL(op, i, a, b, c, d) \ - t = (word32)s[i];\ - w##a = Whirlpool_C[3*256 + (byte)t] ^ (op ? w##a : 0);\ - t >>= 8;\ - w##b = Whirlpool_C[2*256 + (byte)t] ^ (op ? w##b : 0);\ - t >>= 8;\ - w##c = Whirlpool_C[1*256 + (byte)t] ^ (op ? w##c : 0);\ - t >>= 8;\ - w##d = Whirlpool_C[0*256 + t] ^ (op ? w##d : 0); - -#define TSH_OP(op, a, b) \ - w##a = Whirlpool_C[b*256 + (byte)t] ^ (op ? w##a : rotrFixed(w##a, 32) ^ k[a]);\ - if (op==2) s[a] = w##a;\ - if (op==3) digest[a] ^= w##a;\ - -#define TSH(op, i, a, b, c, d) \ - t = (word32)(s[(i+4)%8]>>32);\ - TSH_OP(op, a, 3);\ - t >>= 8;\ - TSH_OP(op, b, 2);\ - t >>= 8;\ - TSH_OP(op, c, 1);\ - t >>= 8;\ - TSH_OP(op, d, 0);\ - - // Iterate over all rounds: - int r=0; - while (true) - { - word64 w0, w1, w2, w3, w4, w5, w6, w7; // temporary storage - word32 t; - - KSL(0, 4, 3, 2, 1, 0) - KSL(0, 0, 7, 6, 5, 4) - KSL(1, 1, 0, 7, 6, 5) - KSL(1, 2, 1, 0, 7, 6) - KSL(1, 3, 2, 1, 0, 7) - KSL(1, 5, 4, 3, 2, 1) - KSL(1, 6, 5, 4, 3, 2) - KSL(1, 7, 6, 5, 4, 3) - KSH(0, 0, 7, 6, 5, 4) - KSH(0, 4, 3, 2, 1, 0) - KSH(1, 1, 0, 7, 6, 5) - KSH(1, 2, 1, 0, 7, 6) - KSH(1, 5, 4, 3, 2, 1) - KSH(1, 6, 5, 4, 3, 2) - KSH(2, 3, 2, 1, 0, 7) - KSH(2, 7, 6, 5, 4, 3) - - k[0] ^= Whirlpool_C[1024+r]; - - TSL(0, 4, 3, 2, 1, 0) - TSL(0, 0, 7, 6, 5, 4) - TSL(1, 1, 0, 7, 6, 5) - TSL(1, 2, 1, 0, 7, 6) - TSL(1, 3, 2, 1, 0, 7) - TSL(1, 5, 4, 3, 2, 1) - TSL(1, 6, 5, 4, 3, 2) - TSL(1, 7, 6, 5, 4, 3) - TSH(0, 0, 7, 6, 5, 4) - TSH(0, 4, 3, 2, 1, 0) - TSH(1, 1, 0, 7, 6, 5) - TSH(1, 2, 1, 0, 7, 6) - TSH(1, 5, 4, 3, 2, 1) - TSH(1, 6, 5, 4, 3, 2) - - if (++r < R) - { - TSH(2, 3, 2, 1, 0, 7) - TSH(2, 7, 6, 5, 4, 3) - } - else - { - TSH(3, 3, 2, 1, 0, 7) - TSH(3, 7, 6, 5, 4, 3) - break; - } - } - } -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.h deleted file mode 100644 index 62c9d8a5..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/whrlpool.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CRYPTOPP_WHIRLPOOL_H -#define CRYPTOPP_WHIRLPOOL_H - -#include "config.h" -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! Whirlpool -class Whirlpool : public IteratedHashWithStaticTransform -{ -public: - static void InitState(HashWordType *state); - static void Transform(word64 *digest, const word64 *data); - void TruncatedFinal(byte *hash, size_t size); - static const char * StaticAlgorithmName() {return "Whirlpool";} -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.cpp deleted file mode 100644 index 1c2e047b..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.cpp +++ /dev/null @@ -1,205 +0,0 @@ -// winpipes.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "winpipes.h" - -#ifdef WINDOWS_PIPES_AVAILABLE - -#include "wait.h" - -NAMESPACE_BEGIN(CryptoPP) - -WindowsHandle::WindowsHandle(HANDLE h, bool own) - : m_h(h), m_own(own) -{ -} - -WindowsHandle::~WindowsHandle() -{ - if (m_own) - { - try - { - CloseHandle(); - } - catch (...) - { - } - } -} - -bool WindowsHandle::HandleValid() const -{ - return m_h && m_h != INVALID_HANDLE_VALUE; -} - -void WindowsHandle::AttachHandle(HANDLE h, bool own) -{ - if (m_own) - CloseHandle(); - - m_h = h; - m_own = own; - HandleChanged(); -} - -HANDLE WindowsHandle::DetachHandle() -{ - HANDLE h = m_h; - m_h = INVALID_HANDLE_VALUE; - HandleChanged(); - return h; -} - -void WindowsHandle::CloseHandle() -{ - if (m_h != INVALID_HANDLE_VALUE) - { - ::CloseHandle(m_h); - m_h = INVALID_HANDLE_VALUE; - HandleChanged(); - } -} - -// ******************************************************** - -void WindowsPipe::HandleError(const char *operation) const -{ - DWORD err = GetLastError(); - throw Err(GetHandle(), operation, err); -} - -WindowsPipe::Err::Err(HANDLE s, const std::string& operation, int error) - : OS_Error(IO_ERROR, "WindowsPipe: " + operation + " operation failed with error 0x" + IntToString(error, 16), operation, error) - , m_h(s) -{ -} - -// ************************************************************* - -WindowsPipeReceiver::WindowsPipeReceiver() - : m_resultPending(false), m_eofReceived(false) -{ - m_event.AttachHandle(CreateEvent(NULL, true, false, NULL), true); - CheckAndHandleError("CreateEvent", m_event.HandleValid()); - memset(&m_overlapped, 0, sizeof(m_overlapped)); - m_overlapped.hEvent = m_event; -} - -bool WindowsPipeReceiver::Receive(byte* buf, size_t bufLen) -{ - assert(!m_resultPending && !m_eofReceived); - - HANDLE h = GetHandle(); - // don't queue too much at once, or we might use up non-paged memory - if (ReadFile(h, buf, UnsignedMin((DWORD)128*1024, bufLen), &m_lastResult, &m_overlapped)) - { - if (m_lastResult == 0) - m_eofReceived = true; - } - else - { - switch (GetLastError()) - { - default: - CheckAndHandleError("ReadFile", false); - case ERROR_BROKEN_PIPE: - case ERROR_HANDLE_EOF: - m_lastResult = 0; - m_eofReceived = true; - break; - case ERROR_IO_PENDING: - m_resultPending = true; - } - } - return !m_resultPending; -} - -void WindowsPipeReceiver::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (m_resultPending) - container.AddHandle(m_event, CallStack("WindowsPipeReceiver::GetWaitObjects() - result pending", &callStack)); - else if (!m_eofReceived) - container.SetNoWait(CallStack("WindowsPipeReceiver::GetWaitObjects() - result ready", &callStack)); -} - -unsigned int WindowsPipeReceiver::GetReceiveResult() -{ - if (m_resultPending) - { - HANDLE h = GetHandle(); - if (GetOverlappedResult(h, &m_overlapped, &m_lastResult, false)) - { - if (m_lastResult == 0) - m_eofReceived = true; - } - else - { - switch (GetLastError()) - { - default: - CheckAndHandleError("GetOverlappedResult", false); - case ERROR_BROKEN_PIPE: - case ERROR_HANDLE_EOF: - m_lastResult = 0; - m_eofReceived = true; - } - } - m_resultPending = false; - } - return m_lastResult; -} - -// ************************************************************* - -WindowsPipeSender::WindowsPipeSender() - : m_resultPending(false), m_lastResult(0) -{ - m_event.AttachHandle(CreateEvent(NULL, true, false, NULL), true); - CheckAndHandleError("CreateEvent", m_event.HandleValid()); - memset(&m_overlapped, 0, sizeof(m_overlapped)); - m_overlapped.hEvent = m_event; -} - -void WindowsPipeSender::Send(const byte* buf, size_t bufLen) -{ - DWORD written = 0; - HANDLE h = GetHandle(); - // don't queue too much at once, or we might use up non-paged memory - if (WriteFile(h, buf, UnsignedMin((DWORD)128*1024, bufLen), &written, &m_overlapped)) - { - m_resultPending = false; - m_lastResult = written; - } - else - { - if (GetLastError() != ERROR_IO_PENDING) - CheckAndHandleError("WriteFile", false); - - m_resultPending = true; - } -} - -void WindowsPipeSender::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) -{ - if (m_resultPending) - container.AddHandle(m_event, CallStack("WindowsPipeSender::GetWaitObjects() - result pending", &callStack)); - else - container.SetNoWait(CallStack("WindowsPipeSender::GetWaitObjects() - result ready", &callStack)); -} - -unsigned int WindowsPipeSender::GetSendResult() -{ - if (m_resultPending) - { - HANDLE h = GetHandle(); - BOOL result = GetOverlappedResult(h, &m_overlapped, &m_lastResult, false); - CheckAndHandleError("GetOverlappedResult", result); - m_resultPending = false; - } - return m_lastResult; -} - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.h deleted file mode 100644 index 07225f9f..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/winpipes.h +++ /dev/null @@ -1,142 +0,0 @@ -#ifndef CRYPTOPP_WINPIPES_H -#define CRYPTOPP_WINPIPES_H - -#include "config.h" - -#ifdef WINDOWS_PIPES_AVAILABLE - -#include "network.h" -#include "queue.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! Windows Handle -class WindowsHandle -{ -public: - WindowsHandle(HANDLE h = INVALID_HANDLE_VALUE, bool own=false); - WindowsHandle(const WindowsHandle &h) : m_h(h.m_h), m_own(false) {} - virtual ~WindowsHandle(); - - bool GetOwnership() const {return m_own;} - void SetOwnership(bool own) {m_own = own;} - - operator HANDLE() {return m_h;} - HANDLE GetHandle() const {return m_h;} - bool HandleValid() const; - void AttachHandle(HANDLE h, bool own=false); - HANDLE DetachHandle(); - void CloseHandle(); - -protected: - virtual void HandleChanged() {} - - HANDLE m_h; - bool m_own; -}; - -//! Windows Pipe -class WindowsPipe -{ -public: - class Err : public OS_Error - { - public: - Err(HANDLE h, const std::string& operation, int error); - HANDLE GetHandle() const {return m_h;} - - private: - HANDLE m_h; - }; - -protected: - virtual HANDLE GetHandle() const =0; - virtual void HandleError(const char *operation) const; - void CheckAndHandleError(const char *operation, BOOL result) const - {assert(result==TRUE || result==FALSE); if (!result) HandleError(operation);} -}; - -//! pipe-based implementation of NetworkReceiver -class WindowsPipeReceiver : public WindowsPipe, public NetworkReceiver -{ -public: - WindowsPipeReceiver(); - - bool MustWaitForResult() {return true;} - bool Receive(byte* buf, size_t bufLen); - unsigned int GetReceiveResult(); - bool EofReceived() const {return m_eofReceived;} - - unsigned int GetMaxWaitObjectCount() const {return 1;} - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - -private: - WindowsHandle m_event; - OVERLAPPED m_overlapped; - bool m_resultPending; - DWORD m_lastResult; - bool m_eofReceived; -}; - -//! pipe-based implementation of NetworkSender -class WindowsPipeSender : public WindowsPipe, public NetworkSender -{ -public: - WindowsPipeSender(); - - bool MustWaitForResult() {return true;} - void Send(const byte* buf, size_t bufLen); - unsigned int GetSendResult(); - bool MustWaitForEof() { return false; } - void SendEof() {} - - unsigned int GetMaxWaitObjectCount() const {return 1;} - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - -private: - WindowsHandle m_event; - OVERLAPPED m_overlapped; - bool m_resultPending; - DWORD m_lastResult; -}; - -//! Windows Pipe Source -class WindowsPipeSource : public WindowsHandle, public NetworkSource, public WindowsPipeReceiver -{ -public: - WindowsPipeSource(HANDLE h=INVALID_HANDLE_VALUE, bool pumpAll=false, BufferedTransformation *attachment=NULL) - : WindowsHandle(h), NetworkSource(attachment) - { - if (pumpAll) - PumpAll(); - } - - NetworkSource::GetMaxWaitObjectCount; - NetworkSource::GetWaitObjects; - -private: - HANDLE GetHandle() const {return WindowsHandle::GetHandle();} - NetworkReceiver & AccessReceiver() {return *this;} -}; - -//! Windows Pipe Sink -class WindowsPipeSink : public WindowsHandle, public NetworkSink, public WindowsPipeSender -{ -public: - WindowsPipeSink(HANDLE h=INVALID_HANDLE_VALUE, unsigned int maxBufferSize=0, unsigned int autoFlushBound=16*1024) - : WindowsHandle(h), NetworkSink(maxBufferSize, autoFlushBound) {} - - NetworkSink::GetMaxWaitObjectCount; - NetworkSink::GetWaitObjects; - -private: - HANDLE GetHandle() const {return WindowsHandle::GetHandle();} - NetworkSender & AccessSender() {return *this;} -}; - -NAMESPACE_END - -#endif - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/words.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/words.h deleted file mode 100644 index d5fda71d..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/words.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef CRYPTOPP_WORDS_H -#define CRYPTOPP_WORDS_H - -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -inline size_t CountWords(const word *X, size_t N) -{ - while (N && X[N-1]==0) - N--; - return N; -} - -inline void SetWords(word *r, word a, size_t n) -{ - for (size_t i=0; i> (WORD_BITS-shiftBits); - } - return carry; -} - -inline word ShiftWordsRightByBits(word *r, size_t n, unsigned int shiftBits) -{ - assert (shiftBits0; i--) - { - u = r[i-1]; - r[i-1] = (u >> shiftBits) | carry; - carry = u << (WORD_BITS-shiftBits); - } - return carry; -} - -inline void ShiftWordsLeftByWords(word *r, size_t n, size_t shiftWords) -{ - shiftWords = STDMIN(shiftWords, n); - if (shiftWords) - { - for (size_t i=n-1; i>=shiftWords; i--) - r[i] = r[i-shiftWords]; - SetWords(r, 0, shiftWords); - } -} - -inline void ShiftWordsRightByWords(word *r, size_t n, size_t shiftWords) -{ - shiftWords = STDMIN(shiftWords, n); - if (shiftWords) - { - for (size_t i=0; i+shiftWords().Ref(); -} - -void XTR_FindPrimesAndGenerator(RandomNumberGenerator &rng, Integer &p, Integer &q, GFP2Element &g, unsigned int pbits, unsigned int qbits) -{ - assert(qbits > 9); // no primes exist for pbits = 10, qbits = 9 - assert(pbits > qbits); - - const Integer minQ = Integer::Power2(qbits - 1); - const Integer maxQ = Integer::Power2(qbits) - 1; - const Integer minP = Integer::Power2(pbits - 1); - const Integer maxP = Integer::Power2(pbits) - 1; - - Integer r1, r2; - do - { - bool qFound = q.Randomize(rng, minQ, maxQ, Integer::PRIME, 7, 12); - assert(qFound); - bool solutionsExist = SolveModularQuadraticEquation(r1, r2, 1, -1, 1, q); - assert(solutionsExist); - } while (!p.Randomize(rng, minP, maxP, Integer::PRIME, CRT(rng.GenerateBit()?r1:r2, q, 2, 3, EuclideanMultiplicativeInverse(p, 3)), 3*q)); - assert(((p.Squared() - p + 1) % q).IsZero()); - - GFP2_ONB gfp2(p); - GFP2Element three = gfp2.ConvertIn(3), t; - - while (true) - { - g.c1.Randomize(rng, Integer::Zero(), p-1); - g.c2.Randomize(rng, Integer::Zero(), p-1); - t = XTR_Exponentiate(g, p+1, p); - if (t.c1 == t.c2) - continue; - g = XTR_Exponentiate(g, (p.Squared()-p+1)/q, p); - if (g != three) - break; - } - assert(XTR_Exponentiate(g, q, p) == three); -} - -GFP2Element XTR_Exponentiate(const GFP2Element &b, const Integer &e, const Integer &p) -{ - unsigned int bitCount = e.BitCount(); - if (bitCount == 0) - return GFP2Element(-3, -3); - - // find the lowest bit of e that is 1 - unsigned int lowest1bit; - for (lowest1bit=0; e.GetBit(lowest1bit) == 0; lowest1bit++) {} - - GFP2_ONB gfp2(p); - GFP2Element c = gfp2.ConvertIn(b); - GFP2Element cp = gfp2.PthPower(c); - GFP2Element S[5] = {gfp2.ConvertIn(3), c, gfp2.SpecialOperation1(c)}; - - // do all exponents bits except the lowest zeros starting from the top - unsigned int i; - for (i = e.BitCount() - 1; i>lowest1bit; i--) - { - if (e.GetBit(i)) - { - gfp2.RaiseToPthPower(S[0]); - gfp2.Accumulate(S[0], gfp2.SpecialOperation2(S[2], c, S[1])); - S[1] = gfp2.SpecialOperation1(S[1]); - S[2] = gfp2.SpecialOperation1(S[2]); - S[0].swap(S[1]); - } - else - { - gfp2.RaiseToPthPower(S[2]); - gfp2.Accumulate(S[2], gfp2.SpecialOperation2(S[0], cp, S[1])); - S[1] = gfp2.SpecialOperation1(S[1]); - S[0] = gfp2.SpecialOperation1(S[0]); - S[2].swap(S[1]); - } - } - - // now do the lowest zeros - while (i--) - S[1] = gfp2.SpecialOperation1(S[1]); - - return gfp2.ConvertOut(S[1]); -} - -template class AbstractRing; -template class AbstractGroup; - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtr.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/xtr.h deleted file mode 100644 index 89d39f03..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtr.h +++ /dev/null @@ -1,215 +0,0 @@ -#ifndef CRYPTOPP_XTR_H -#define CRYPTOPP_XTR_H - -/** \file - "The XTR public key system" by Arjen K. Lenstra and Eric R. Verheul -*/ - -#include "modarith.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! an element of GF(p^2) -class GFP2Element -{ -public: - GFP2Element() {} - GFP2Element(const Integer &c1, const Integer &c2) : c1(c1), c2(c2) {} - GFP2Element(const byte *encodedElement, unsigned int size) - : c1(encodedElement, size/2), c2(encodedElement+size/2, size/2) {} - - void Encode(byte *encodedElement, unsigned int size) - { - c1.Encode(encodedElement, size/2); - c2.Encode(encodedElement+size/2, size/2); - } - - bool operator==(const GFP2Element &rhs) const {return c1 == rhs.c1 && c2 == rhs.c2;} - bool operator!=(const GFP2Element &rhs) const {return !operator==(rhs);} - - void swap(GFP2Element &a) - { - c1.swap(a.c1); - c2.swap(a.c2); - } - - static const GFP2Element & Zero(); - - Integer c1, c2; -}; - -//! GF(p^2), optimal normal basis -template -class GFP2_ONB : public AbstractRing -{ -public: - typedef F BaseField; - - GFP2_ONB(const Integer &p) : modp(p) - { - if (p%3 != 2) - throw InvalidArgument("GFP2_ONB: modulus must be equivalent to 2 mod 3"); - } - - const Integer& GetModulus() const {return modp.GetModulus();} - - GFP2Element ConvertIn(const Integer &a) const - { - t = modp.Inverse(modp.ConvertIn(a)); - return GFP2Element(t, t); - } - - GFP2Element ConvertIn(const GFP2Element &a) const - {return GFP2Element(modp.ConvertIn(a.c1), modp.ConvertIn(a.c2));} - - GFP2Element ConvertOut(const GFP2Element &a) const - {return GFP2Element(modp.ConvertOut(a.c1), modp.ConvertOut(a.c2));} - - bool Equal(const GFP2Element &a, const GFP2Element &b) const - { - return modp.Equal(a.c1, b.c1) && modp.Equal(a.c2, b.c2); - } - - const Element& Identity() const - { - return GFP2Element::Zero(); - } - - const Element& Add(const Element &a, const Element &b) const - { - result.c1 = modp.Add(a.c1, b.c1); - result.c2 = modp.Add(a.c2, b.c2); - return result; - } - - const Element& Inverse(const Element &a) const - { - result.c1 = modp.Inverse(a.c1); - result.c2 = modp.Inverse(a.c2); - return result; - } - - const Element& Double(const Element &a) const - { - result.c1 = modp.Double(a.c1); - result.c2 = modp.Double(a.c2); - return result; - } - - const Element& Subtract(const Element &a, const Element &b) const - { - result.c1 = modp.Subtract(a.c1, b.c1); - result.c2 = modp.Subtract(a.c2, b.c2); - return result; - } - - Element& Accumulate(Element &a, const Element &b) const - { - modp.Accumulate(a.c1, b.c1); - modp.Accumulate(a.c2, b.c2); - return a; - } - - Element& Reduce(Element &a, const Element &b) const - { - modp.Reduce(a.c1, b.c1); - modp.Reduce(a.c2, b.c2); - return a; - } - - bool IsUnit(const Element &a) const - { - return a.c1.NotZero() || a.c2.NotZero(); - } - - const Element& MultiplicativeIdentity() const - { - result.c1 = result.c2 = modp.Inverse(modp.MultiplicativeIdentity()); - return result; - } - - const Element& Multiply(const Element &a, const Element &b) const - { - t = modp.Add(a.c1, a.c2); - t = modp.Multiply(t, modp.Add(b.c1, b.c2)); - result.c1 = modp.Multiply(a.c1, b.c1); - result.c2 = modp.Multiply(a.c2, b.c2); - result.c1.swap(result.c2); - modp.Reduce(t, result.c1); - modp.Reduce(t, result.c2); - modp.Reduce(result.c1, t); - modp.Reduce(result.c2, t); - return result; - } - - const Element& MultiplicativeInverse(const Element &a) const - { - return result = Exponentiate(a, modp.GetModulus()-2); - } - - const Element& Square(const Element &a) const - { - const Integer &ac1 = (&a == &result) ? (t = a.c1) : a.c1; - result.c1 = modp.Multiply(modp.Subtract(modp.Subtract(a.c2, a.c1), a.c1), a.c2); - result.c2 = modp.Multiply(modp.Subtract(modp.Subtract(ac1, a.c2), a.c2), ac1); - return result; - } - - Element Exponentiate(const Element &a, const Integer &e) const - { - Integer edivp, emodp; - Integer::Divide(emodp, edivp, e, modp.GetModulus()); - Element b = PthPower(a); - return AbstractRing::CascadeExponentiate(a, emodp, b, edivp); - } - - const Element & PthPower(const Element &a) const - { - result = a; - result.c1.swap(result.c2); - return result; - } - - void RaiseToPthPower(Element &a) const - { - a.c1.swap(a.c2); - } - - // a^2 - 2a^p - const Element & SpecialOperation1(const Element &a) const - { - assert(&a != &result); - result = Square(a); - modp.Reduce(result.c1, a.c2); - modp.Reduce(result.c1, a.c2); - modp.Reduce(result.c2, a.c1); - modp.Reduce(result.c2, a.c1); - return result; - } - - // x * z - y * z^p - const Element & SpecialOperation2(const Element &x, const Element &y, const Element &z) const - { - assert(&x != &result && &y != &result && &z != &result); - t = modp.Add(x.c2, y.c2); - result.c1 = modp.Multiply(z.c1, modp.Subtract(y.c1, t)); - modp.Accumulate(result.c1, modp.Multiply(z.c2, modp.Subtract(t, x.c1))); - t = modp.Add(x.c1, y.c1); - result.c2 = modp.Multiply(z.c2, modp.Subtract(y.c2, t)); - modp.Accumulate(result.c2, modp.Multiply(z.c1, modp.Subtract(t, x.c2))); - return result; - } - -protected: - BaseField modp; - mutable GFP2Element result; - mutable Integer t; -}; - -void XTR_FindPrimesAndGenerator(RandomNumberGenerator &rng, Integer &p, Integer &q, GFP2Element &g, unsigned int pbits, unsigned int qbits); - -GFP2Element XTR_Exponentiate(const GFP2Element &b, const Integer &e, const Integer &p); - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.cpp deleted file mode 100644 index 20e78e7c..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// xtrcrypt.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" -#include "xtrcrypt.h" -#include "nbtheory.h" -#include "asn.h" -#include "argnames.h" - -NAMESPACE_BEGIN(CryptoPP) - -XTR_DH::XTR_DH(const Integer &p, const Integer &q, const GFP2Element &g) - : m_p(p), m_q(q), m_g(g) -{ -} - -XTR_DH::XTR_DH(RandomNumberGenerator &rng, unsigned int pbits, unsigned int qbits) -{ - XTR_FindPrimesAndGenerator(rng, m_p, m_q, m_g, pbits, qbits); -} - -XTR_DH::XTR_DH(BufferedTransformation &bt) -{ - BERSequenceDecoder seq(bt); - m_p.BERDecode(seq); - m_q.BERDecode(seq); - m_g.c1.BERDecode(seq); - m_g.c2.BERDecode(seq); - seq.MessageEnd(); -} - -void XTR_DH::DEREncode(BufferedTransformation &bt) const -{ - DERSequenceEncoder seq(bt); - m_p.DEREncode(seq); - m_q.DEREncode(seq); - m_g.c1.DEREncode(seq); - m_g.c2.DEREncode(seq); - seq.MessageEnd(); -} - -bool XTR_DH::Validate(RandomNumberGenerator &rng, unsigned int level) const -{ - bool pass = true; - pass = pass && m_p > Integer::One() && m_p.IsOdd(); - pass = pass && m_q > Integer::One() && m_q.IsOdd(); - GFP2Element three = GFP2_ONB(m_p).ConvertIn(3); - pass = pass && !(m_g.c1.IsNegative() || m_g.c2.IsNegative() || m_g.c1 >= m_p || m_g.c2 >= m_p || m_g == three); - if (level >= 1) - pass = pass && ((m_p.Squared()-m_p+1)%m_q).IsZero(); - if (level >= 2) - { - pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2); - pass = pass && XTR_Exponentiate(m_g, (m_p.Squared()-m_p+1)/m_q, m_p) != three; - pass = pass && XTR_Exponentiate(m_g, m_q, m_p) == three; - } - return pass; -} - -bool XTR_DH::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const -{ - return GetValueHelper(this, name, valueType, pValue).Assignable() - CRYPTOPP_GET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupOrder) - CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupGenerator) - ; -} - -void XTR_DH::AssignFrom(const NameValuePairs &source) -{ - AssignFromHelper(this, source) - CRYPTOPP_SET_FUNCTION_ENTRY(Modulus) - CRYPTOPP_SET_FUNCTION_ENTRY(SubgroupOrder) - CRYPTOPP_SET_FUNCTION_ENTRY(SubgroupGenerator) - ; -} - -void XTR_DH::GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const -{ - Integer x(rng, Integer::Zero(), m_q-1); - x.Encode(privateKey, PrivateKeyLength()); -} - -void XTR_DH::GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const -{ - Integer x(privateKey, PrivateKeyLength()); - GFP2Element y = XTR_Exponentiate(m_g, x, m_p); - y.Encode(publicKey, PublicKeyLength()); -} - -bool XTR_DH::Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey) const -{ - GFP2Element w(otherPublicKey, PublicKeyLength()); - if (validateOtherPublicKey) - { - GFP2_ONB gfp2(m_p); - GFP2Element three = gfp2.ConvertIn(3); - if (w.c1.IsNegative() || w.c2.IsNegative() || w.c1 >= m_p || w.c2 >= m_p || w == three) - return false; - if (XTR_Exponentiate(w, m_q, m_p) != three) - return false; - } - Integer s(privateKey, PrivateKeyLength()); - GFP2Element z = XTR_Exponentiate(w, s, m_p); - z.Encode(agreedValue, AgreedValueLength()); - return true; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.h deleted file mode 100644 index 6aee1276..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/xtrcrypt.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef CRYPTOPP_XTRCRYPT_H -#define CRYPTOPP_XTRCRYPT_H - -/** \file - "The XTR public key system" by Arjen K. Lenstra and Eric R. Verheul -*/ - -#include "xtr.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! XTR-DH with key validation - -class XTR_DH : public SimpleKeyAgreementDomain, public CryptoParameters -{ - typedef XTR_DH ThisClass; - -public: - XTR_DH(const Integer &p, const Integer &q, const GFP2Element &g); - XTR_DH(RandomNumberGenerator &rng, unsigned int pbits, unsigned int qbits); - XTR_DH(BufferedTransformation &domainParams); - - void DEREncode(BufferedTransformation &domainParams) const; - - bool Validate(RandomNumberGenerator &rng, unsigned int level) const; - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const; - void AssignFrom(const NameValuePairs &source); - CryptoParameters & AccessCryptoParameters() {return *this;} - unsigned int AgreedValueLength() const {return 2*m_p.ByteCount();} - unsigned int PrivateKeyLength() const {return m_q.ByteCount();} - unsigned int PublicKeyLength() const {return 2*m_p.ByteCount();} - - void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const; - void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const; - bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const; - - const Integer &GetModulus() const {return m_p;} - const Integer &GetSubgroupOrder() const {return m_q;} - const GFP2Element &GetSubgroupGenerator() const {return m_g;} - - void SetModulus(const Integer &p) {m_p = p;} - void SetSubgroupOrder(const Integer &q) {m_q = q;} - void SetSubgroupGenerator(const GFP2Element &g) {m_g = g;} - -private: - unsigned int ExponentBitLength() const; - - Integer m_p, m_q; - GFP2Element m_g; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.cpp deleted file mode 100644 index bdcd7ba4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.cpp +++ /dev/null @@ -1,801 +0,0 @@ -// zdeflate.cpp - written and placed in the public domain by Wei Dai - -// Many of the algorithms and tables used here came from the deflate implementation -// by Jean-loup Gailly, which was included in Crypto++ 4.0 and earlier. I completely -// rewrote it in order to fix a bug that I could not figure out. This code -// is less clever, but hopefully more understandable and maintainable. - -#include "pch.h" -#include "zdeflate.h" -#include - -#if _MSC_VER >= 1600 -// for make_unchecked_array_iterator -#include -#endif - -NAMESPACE_BEGIN(CryptoPP) - -using namespace std; - -LowFirstBitWriter::LowFirstBitWriter(BufferedTransformation *attachment) - : Filter(attachment), m_counting(false), m_buffer(0), m_bitsBuffered(0), m_bytesBuffered(0) -{ -} - -void LowFirstBitWriter::StartCounting() -{ - assert(!m_counting); - m_counting = true; - m_bitCount = 0; -} - -unsigned long LowFirstBitWriter::FinishCounting() -{ - assert(m_counting); - m_counting = false; - return m_bitCount; -} - -void LowFirstBitWriter::PutBits(unsigned long value, unsigned int length) -{ - if (m_counting) - m_bitCount += length; - else - { - m_buffer |= value << m_bitsBuffered; - m_bitsBuffered += length; - assert(m_bitsBuffered <= sizeof(unsigned long)*8); - while (m_bitsBuffered >= 8) - { - m_outputBuffer[m_bytesBuffered++] = (byte)m_buffer; - if (m_bytesBuffered == m_outputBuffer.size()) - { - AttachedTransformation()->PutModifiable(m_outputBuffer, m_bytesBuffered); - m_bytesBuffered = 0; - } - m_buffer >>= 8; - m_bitsBuffered -= 8; - } - } -} - -void LowFirstBitWriter::FlushBitBuffer() -{ - if (m_counting) - m_bitCount += 8*(m_bitsBuffered > 0); - else - { - if (m_bytesBuffered > 0) - { - AttachedTransformation()->PutModifiable(m_outputBuffer, m_bytesBuffered); - m_bytesBuffered = 0; - } - if (m_bitsBuffered > 0) - { - AttachedTransformation()->Put((byte)m_buffer); - m_buffer = 0; - m_bitsBuffered = 0; - } - } -} - -void LowFirstBitWriter::ClearBitBuffer() -{ - m_buffer = 0; - m_bytesBuffered = 0; - m_bitsBuffered = 0; -} - -HuffmanEncoder::HuffmanEncoder(const unsigned int *codeBits, unsigned int nCodes) -{ - Initialize(codeBits, nCodes); -} - -struct HuffmanNode -{ - size_t symbol; - union {size_t parent; unsigned depth, freq;}; -}; - -struct FreqLessThan -{ - inline bool operator()(unsigned int lhs, const HuffmanNode &rhs) {return lhs < rhs.freq;} - inline bool operator()(const HuffmanNode &lhs, const HuffmanNode &rhs) const {return lhs.freq < rhs.freq;} - // needed for MSVC .NET 2005 - inline bool operator()(const HuffmanNode &lhs, unsigned int rhs) {return lhs.freq < rhs;} -}; - -void HuffmanEncoder::GenerateCodeLengths(unsigned int *codeBits, unsigned int maxCodeBits, const unsigned int *codeCounts, size_t nCodes) -{ - assert(nCodes > 0); - assert(nCodes <= ((size_t)1 << maxCodeBits)); - - size_t i; - SecBlockWithHint tree(nCodes); - for (i=0; i= 2) - for (i=tree.size()-2; i>=nCodes; i--) - tree[i].depth = tree[tree[i].parent].depth + 1; - unsigned int sum = 0; - SecBlockWithHint blCount(maxCodeBits+1); - fill(blCount.begin(), blCount.end(), 0); - for (i=treeBegin; i (unsigned int)(1 << maxCodeBits) ? sum - (1 << maxCodeBits) : 0; - - while (overflow--) - { - unsigned int bits = maxCodeBits-1; - while (blCount[bits] == 0) - bits--; - blCount[bits]--; - blCount[bits+1] += 2; - assert(blCount[maxCodeBits] > 0); - blCount[maxCodeBits]--; - } - - for (i=0; i 0); - unsigned int maxCodeBits = *max_element(codeBits, codeBits+nCodes); - if (maxCodeBits == 0) - return; // assume this object won't be used - - SecBlockWithHint blCount(maxCodeBits+1); - fill(blCount.begin(), blCount.end(), 0); - unsigned int i; - for (i=0; i nextCode(maxCodeBits+1); - nextCode[1] = 0; - for (i=2; i<=maxCodeBits; i++) - { - code = (code + blCount[i-1]) << 1; - nextCode[i] = code; - } - assert(maxCodeBits == 1 || code == (1 << maxCodeBits) - blCount[maxCodeBits]); - - m_valueToCode.resize(nCodes); - for (i=0; i> (8*sizeof(code_t)-len); - } -} - -inline void HuffmanEncoder::Encode(LowFirstBitWriter &writer, value_t value) const -{ - assert(m_valueToCode[value].len > 0); - writer.PutBits(m_valueToCode[value].code, m_valueToCode[value].len); -} - -Deflator::Deflator(BufferedTransformation *attachment, int deflateLevel, int log2WindowSize, bool detectUncompressible) - : LowFirstBitWriter(attachment) - , m_deflateLevel(-1) -{ - InitializeStaticEncoders(); - IsolatedInitialize(MakeParameters("DeflateLevel", deflateLevel)("Log2WindowSize", log2WindowSize)("DetectUncompressible", detectUncompressible)); -} - -Deflator::Deflator(const NameValuePairs ¶meters, BufferedTransformation *attachment) - : LowFirstBitWriter(attachment) - , m_deflateLevel(-1) -{ - InitializeStaticEncoders(); - IsolatedInitialize(parameters); -} - -void Deflator::InitializeStaticEncoders() -{ - unsigned int codeLengths[288]; - fill(codeLengths + 0, codeLengths + 144, 8); - fill(codeLengths + 144, codeLengths + 256, 9); - fill(codeLengths + 256, codeLengths + 280, 7); - fill(codeLengths + 280, codeLengths + 288, 8); - m_staticLiteralEncoder.Initialize(codeLengths, 288); - fill(codeLengths + 0, codeLengths + 32, 5); - m_staticDistanceEncoder.Initialize(codeLengths, 32); -} - -void Deflator::IsolatedInitialize(const NameValuePairs ¶meters) -{ - int log2WindowSize = parameters.GetIntValueWithDefault("Log2WindowSize", DEFAULT_LOG2_WINDOW_SIZE); - if (!(MIN_LOG2_WINDOW_SIZE <= log2WindowSize && log2WindowSize <= MAX_LOG2_WINDOW_SIZE)) - throw InvalidArgument("Deflator: " + IntToString(log2WindowSize) + " is an invalid window size"); - - m_log2WindowSize = log2WindowSize; - DSIZE = 1 << m_log2WindowSize; - DMASK = DSIZE - 1; - HSIZE = 1 << m_log2WindowSize; - HMASK = HSIZE - 1; - m_byteBuffer.New(2*DSIZE); - m_head.New(HSIZE); - m_prev.New(DSIZE); - m_matchBuffer.New(DSIZE/2); - Reset(true); - - SetDeflateLevel(parameters.GetIntValueWithDefault("DeflateLevel", DEFAULT_DEFLATE_LEVEL)); - bool detectUncompressible = parameters.GetValueWithDefault("DetectUncompressible", true); - m_compressibleDeflateLevel = detectUncompressible ? m_deflateLevel : 0; -} - -void Deflator::Reset(bool forceReset) -{ - if (forceReset) - ClearBitBuffer(); - else - assert(m_bitsBuffered == 0); - - m_headerWritten = false; - m_matchAvailable = false; - m_dictionaryEnd = 0; - m_stringStart = 0; - m_lookahead = 0; - m_minLookahead = MAX_MATCH; - m_matchBufferEnd = 0; - m_blockStart = 0; - m_blockLength = 0; - - m_detectCount = 1; - m_detectSkip = 0; - - // m_prev will be initialized automaticly in InsertString - fill(m_head.begin(), m_head.end(), 0); - - fill(m_literalCounts.begin(), m_literalCounts.end(), 0); - fill(m_distanceCounts.begin(), m_distanceCounts.end(), 0); -} - -void Deflator::SetDeflateLevel(int deflateLevel) -{ - if (!(MIN_DEFLATE_LEVEL <= deflateLevel && deflateLevel <= MAX_DEFLATE_LEVEL)) - throw InvalidArgument("Deflator: " + IntToString(deflateLevel) + " is an invalid deflate level"); - - if (deflateLevel == m_deflateLevel) - return; - - EndBlock(false); - - static const unsigned int configurationTable[10][4] = { - /* good lazy nice chain */ - /* 0 */ {0, 0, 0, 0}, /* store only */ - /* 1 */ {4, 3, 8, 4}, /* maximum speed, no lazy matches */ - /* 2 */ {4, 3, 16, 8}, - /* 3 */ {4, 3, 32, 32}, - /* 4 */ {4, 4, 16, 16}, /* lazy matches */ - /* 5 */ {8, 16, 32, 32}, - /* 6 */ {8, 16, 128, 128}, - /* 7 */ {8, 32, 128, 256}, - /* 8 */ {32, 128, 258, 1024}, - /* 9 */ {32, 258, 258, 4096}}; /* maximum compression */ - - GOOD_MATCH = configurationTable[deflateLevel][0]; - MAX_LAZYLENGTH = configurationTable[deflateLevel][1]; - MAX_CHAIN_LENGTH = configurationTable[deflateLevel][3]; - - m_deflateLevel = deflateLevel; -} - -unsigned int Deflator::FillWindow(const byte *str, size_t length) -{ - unsigned int maxBlockSize = (unsigned int)STDMIN(2UL*DSIZE, 0xffffUL); - - if (m_stringStart >= maxBlockSize - MAX_MATCH) - { - if (m_blockStart < DSIZE) - EndBlock(false); - - memcpy(m_byteBuffer, m_byteBuffer + DSIZE, DSIZE); - - m_dictionaryEnd = m_dictionaryEnd < DSIZE ? 0 : m_dictionaryEnd-DSIZE; - assert(m_stringStart >= DSIZE); - m_stringStart -= DSIZE; - assert(!m_matchAvailable || m_previousMatch >= DSIZE); - m_previousMatch -= DSIZE; - assert(m_blockStart >= DSIZE); - m_blockStart -= DSIZE; - - unsigned int i; - - for (i=0; i m_stringStart+m_lookahead); - unsigned int accepted = UnsignedMin(maxBlockSize-(m_stringStart+m_lookahead), length); - assert(accepted > 0); - memcpy(m_byteBuffer + m_stringStart + m_lookahead, str, accepted); - m_lookahead += accepted; - return accepted; -} - -inline unsigned int Deflator::ComputeHash(const byte *str) const -{ - assert(str+3 <= m_byteBuffer + m_stringStart + m_lookahead); - return ((str[0] << 10) ^ (str[1] << 5) ^ str[2]) & HMASK; -} - -unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const -{ - assert(m_previousLength < MAX_MATCH); - - bestMatch = 0; - unsigned int bestLength = STDMAX(m_previousLength, (unsigned int)MIN_MATCH-1); - if (m_lookahead <= bestLength) - return 0; - - const byte *scan = m_byteBuffer + m_stringStart, *scanEnd = scan + STDMIN((unsigned int)MAX_MATCH, m_lookahead); - unsigned int limit = m_stringStart > (DSIZE-MAX_MATCH) ? m_stringStart - (DSIZE-MAX_MATCH) : 0; - unsigned int current = m_head[ComputeHash(scan)]; - - unsigned int chainLength = MAX_CHAIN_LENGTH; - if (m_previousLength >= GOOD_MATCH) - chainLength >>= 2; - - while (current > limit && --chainLength > 0) - { - const byte *match = m_byteBuffer + current; - assert(scan + bestLength < m_byteBuffer + m_stringStart + m_lookahead); - if (scan[bestLength-1] == match[bestLength-1] && scan[bestLength] == match[bestLength] && scan[0] == match[0] && scan[1] == match[1]) - { - assert(scan[2] == match[2]); - unsigned int len = (unsigned int)( -#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && (_MSC_VER < 1400 || _MSC_VER >= 1600)) && !defined(_STLPORT_VERSION) - stdext::unchecked_mismatch -#else - std::mismatch -#endif -#if _MSC_VER >= 1600 - (stdext::make_unchecked_array_iterator(scan)+3, stdext::make_unchecked_array_iterator(scanEnd), stdext::make_unchecked_array_iterator(match)+3).first - stdext::make_unchecked_array_iterator(scan)); -#else - (scan+3, scanEnd, match+3).first - scan); -#endif - assert(len != bestLength); - if (len > bestLength) - { - bestLength = len; - bestMatch = current; - if (len == (scanEnd - scan)) - break; - } - } - current = m_prev[current & DMASK]; - } - return (bestMatch > 0) ? bestLength : 0; -} - -inline void Deflator::InsertString(unsigned int start) -{ - unsigned int hash = ComputeHash(m_byteBuffer + start); - m_prev[start & DMASK] = m_head[hash]; - m_head[hash] = start; -} - -void Deflator::ProcessBuffer() -{ - if (!m_headerWritten) - { - WritePrestreamHeader(); - m_headerWritten = true; - } - - if (m_deflateLevel == 0) - { - m_stringStart += m_lookahead; - m_lookahead = 0; - m_blockLength = m_stringStart - m_blockStart; - m_matchAvailable = false; - return; - } - - while (m_lookahead > m_minLookahead) - { - while (m_dictionaryEnd < m_stringStart && m_dictionaryEnd+3 <= m_stringStart+m_lookahead) - InsertString(m_dictionaryEnd++); - - if (m_matchAvailable) - { - unsigned int matchPosition, matchLength; - bool usePreviousMatch; - if (m_previousLength >= MAX_LAZYLENGTH) - usePreviousMatch = true; - else - { - matchLength = LongestMatch(matchPosition); - usePreviousMatch = (matchLength == 0); - } - if (usePreviousMatch) - { - MatchFound(m_stringStart-1-m_previousMatch, m_previousLength); - m_stringStart += m_previousLength-1; - m_lookahead -= m_previousLength-1; - m_matchAvailable = false; - } - else - { - m_previousLength = matchLength; - m_previousMatch = matchPosition; - LiteralByte(m_byteBuffer[m_stringStart-1]); - m_stringStart++; - m_lookahead--; - } - } - else - { - m_previousLength = 0; - m_previousLength = LongestMatch(m_previousMatch); - if (m_previousLength) - m_matchAvailable = true; - else - LiteralByte(m_byteBuffer[m_stringStart]); - m_stringStart++; - m_lookahead--; - } - - assert(m_stringStart - (m_blockStart+m_blockLength) == (unsigned int)m_matchAvailable); - } - - if (m_minLookahead == 0 && m_matchAvailable) - { - LiteralByte(m_byteBuffer[m_stringStart-1]); - m_matchAvailable = false; - } -} - -size_t Deflator::Put2(const byte *str, size_t length, int messageEnd, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("Deflator"); - - size_t accepted = 0; - while (accepted < length) - { - unsigned int newAccepted = FillWindow(str+accepted, length-accepted); - ProcessBuffer(); - // call ProcessUncompressedData() after WritePrestreamHeader() - ProcessUncompressedData(str+accepted, newAccepted); - accepted += newAccepted; - } - assert(accepted == length); - - if (messageEnd) - { - m_minLookahead = 0; - ProcessBuffer(); - EndBlock(true); - FlushBitBuffer(); - WritePoststreamTail(); - Reset(); - } - - Output(0, NULL, 0, messageEnd, blocking); - return 0; -} - -bool Deflator::IsolatedFlush(bool hardFlush, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("Deflator"); - - m_minLookahead = 0; - ProcessBuffer(); - m_minLookahead = MAX_MATCH; - EndBlock(false); - if (hardFlush) - EncodeBlock(false, STORED); - return false; -} - -void Deflator::LiteralByte(byte b) -{ - if (m_matchBufferEnd == m_matchBuffer.size()) - EndBlock(false); - - m_matchBuffer[m_matchBufferEnd++].literalCode = b; - m_literalCounts[b]++; - m_blockLength++; -} - -void Deflator::MatchFound(unsigned int distance, unsigned int length) -{ - if (m_matchBufferEnd == m_matchBuffer.size()) - EndBlock(false); - - static const unsigned int lengthCodes[] = { - 257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, 268, - 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, 272, 272, - 273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, 274, 274, 274, - 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, 276, 276, 276, 276, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, - 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, - 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, - 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, - 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, - 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, - 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, - 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 285}; - static const unsigned int lengthBases[] = {3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258}; - static const unsigned int distanceBases[30] = - {1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577}; - - EncodedMatch &m = m_matchBuffer[m_matchBufferEnd++]; - assert(length >= 3); - unsigned int lengthCode = lengthCodes[length-3]; - m.literalCode = lengthCode; - m.literalExtra = length - lengthBases[lengthCode-257]; - unsigned int distanceCode = (unsigned int)(upper_bound(distanceBases, distanceBases+30, distance) - distanceBases - 1); - m.distanceCode = distanceCode; - m.distanceExtra = distance - distanceBases[distanceCode]; - - m_literalCounts[lengthCode]++; - m_distanceCounts[distanceCode]++; - m_blockLength += length; -} - -inline unsigned int CodeLengthEncode(const unsigned int *begin, - const unsigned int *end, - const unsigned int *& p, - unsigned int &extraBits, - unsigned int &extraBitsLength) -{ - unsigned int v = *p; - if ((end-p) >= 3) - { - const unsigned int *oldp = p; - if (v==0 && p[1]==0 && p[2]==0) - { - for (p=p+3; p!=end && *p==0 && p!=oldp+138; p++) {} - unsigned int repeat = (unsigned int)(p - oldp); - if (repeat <= 10) - { - extraBits = repeat-3; - extraBitsLength = 3; - return 17; - } - else - { - extraBits = repeat-11; - extraBitsLength = 7; - return 18; - } - } - else if (p!=begin && v==p[-1] && v==p[1] && v==p[2]) - { - for (p=p+3; p!=end && *p==v && p!=oldp+6; p++) {} - unsigned int repeat = (unsigned int)(p - oldp); - extraBits = repeat-3; - extraBitsLength = 2; - return 16; - } - } - p++; - extraBits = 0; - extraBitsLength = 0; - return v; -} - -void Deflator::EncodeBlock(bool eof, unsigned int blockType) -{ - PutBits(eof, 1); - PutBits(blockType, 2); - - if (blockType == STORED) - { - assert(m_blockStart + m_blockLength <= m_byteBuffer.size()); - assert(m_blockLength <= 0xffff); - FlushBitBuffer(); - AttachedTransformation()->PutWord16(m_blockLength, LITTLE_ENDIAN_ORDER); - AttachedTransformation()->PutWord16(~m_blockLength, LITTLE_ENDIAN_ORDER); - AttachedTransformation()->Put(m_byteBuffer + m_blockStart, m_blockLength); - } - else - { - if (blockType == DYNAMIC) - { -#if defined(_MSC_VER) && !defined(__MWERKS__) && (_MSC_VER <= 1300) - // VC60 and VC7 workaround: built-in reverse_iterator has two template parameters, Dinkumware only has one - typedef reverse_bidirectional_iterator RevIt; -#elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) - typedef reverse_iterator RevIt; -#else - typedef reverse_iterator RevIt; -#endif - - FixedSizeSecBlock literalCodeLengths; - FixedSizeSecBlock distanceCodeLengths; - - m_literalCounts[256] = 1; - HuffmanEncoder::GenerateCodeLengths(literalCodeLengths, 15, m_literalCounts, 286); - m_dynamicLiteralEncoder.Initialize(literalCodeLengths, 286); - unsigned int hlit = (unsigned int)(find_if(RevIt(literalCodeLengths.end()), RevIt(literalCodeLengths.begin()+257), bind2nd(not_equal_to(), 0)).base() - (literalCodeLengths.begin()+257)); - - HuffmanEncoder::GenerateCodeLengths(distanceCodeLengths, 15, m_distanceCounts, 30); - m_dynamicDistanceEncoder.Initialize(distanceCodeLengths, 30); - unsigned int hdist = (unsigned int)(find_if(RevIt(distanceCodeLengths.end()), RevIt(distanceCodeLengths.begin()+1), bind2nd(not_equal_to(), 0)).base() - (distanceCodeLengths.begin()+1)); - - SecBlockWithHint combinedLengths(hlit+257+hdist+1); - memcpy(combinedLengths, literalCodeLengths, (hlit+257)*sizeof(unsigned int)); - memcpy(combinedLengths+hlit+257, distanceCodeLengths, (hdist+1)*sizeof(unsigned int)); - - FixedSizeSecBlock codeLengthCodeCounts, codeLengthCodeLengths; - fill(codeLengthCodeCounts.begin(), codeLengthCodeCounts.end(), 0); - const unsigned int *p = combinedLengths.begin(), *begin = combinedLengths.begin(), *end = combinedLengths.end(); - while (p != end) - { - unsigned int code, extraBits, extraBitsLength; - code = CodeLengthEncode(begin, end, p, extraBits, extraBitsLength); - codeLengthCodeCounts[code]++; - } - HuffmanEncoder::GenerateCodeLengths(codeLengthCodeLengths, 7, codeLengthCodeCounts, 19); - HuffmanEncoder codeLengthEncoder(codeLengthCodeLengths, 19); - static const unsigned int border[] = { // Order of the bit length code lengths - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - unsigned int hclen = 19; - while (hclen > 4 && codeLengthCodeLengths[border[hclen-1]] == 0) - hclen--; - hclen -= 4; - - PutBits(hlit, 5); - PutBits(hdist, 5); - PutBits(hclen, 4); - - for (unsigned int i=0; i= 257) - { - assert(literalCode <= 285); - PutBits(m_matchBuffer[i].literalExtra, lengthExtraBits[literalCode-257]); - unsigned int distanceCode = m_matchBuffer[i].distanceCode; - distanceEncoder.Encode(*this, distanceCode); - PutBits(m_matchBuffer[i].distanceExtra, distanceExtraBits[distanceCode]); - } - } - literalEncoder.Encode(*this, 256); // end of block - } -} - -void Deflator::EndBlock(bool eof) -{ - if (m_blockLength == 0 && !eof) - return; - - if (m_deflateLevel == 0) - { - EncodeBlock(eof, STORED); - - if (m_compressibleDeflateLevel > 0 && ++m_detectCount == m_detectSkip) - { - m_deflateLevel = m_compressibleDeflateLevel; - m_detectCount = 1; - } - } - else - { - unsigned long storedLen = 8*((unsigned long)m_blockLength+4) + RoundUpToMultipleOf(m_bitsBuffered+3, 8U)-m_bitsBuffered; - - StartCounting(); - EncodeBlock(eof, STATIC); - unsigned long staticLen = FinishCounting(); - - unsigned long dynamicLen; - if (m_blockLength < 128 && m_deflateLevel < 8) - dynamicLen = ULONG_MAX; - else - { - StartCounting(); - EncodeBlock(eof, DYNAMIC); - dynamicLen = FinishCounting(); - } - - if (storedLen <= staticLen && storedLen <= dynamicLen) - { - EncodeBlock(eof, STORED); - - if (m_compressibleDeflateLevel > 0) - { - if (m_detectSkip) - m_deflateLevel = 0; - m_detectSkip = m_detectSkip ? STDMIN(2*m_detectSkip, 128U) : 1; - } - } - else - { - if (staticLen <= dynamicLen) - EncodeBlock(eof, STATIC); - else - EncodeBlock(eof, DYNAMIC); - - if (m_compressibleDeflateLevel > 0) - m_detectSkip = 0; - } - } - - m_matchBufferEnd = 0; - m_blockStart += m_blockLength; - m_blockLength = 0; - fill(m_literalCounts.begin(), m_literalCounts.end(), 0); - fill(m_distanceCounts.begin(), m_distanceCounts.end(), 0); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.h deleted file mode 100644 index 8bbd14e4..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zdeflate.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef CRYPTOPP_ZDEFLATE_H -#define CRYPTOPP_ZDEFLATE_H - -#include "filters.h" -#include "misc.h" - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class LowFirstBitWriter : public Filter -{ -public: - LowFirstBitWriter(BufferedTransformation *attachment); - void PutBits(unsigned long value, unsigned int length); - void FlushBitBuffer(); - void ClearBitBuffer(); - - void StartCounting(); - unsigned long FinishCounting(); - -protected: - bool m_counting; - unsigned long m_bitCount; - unsigned long m_buffer; - unsigned int m_bitsBuffered, m_bytesBuffered; - FixedSizeSecBlock m_outputBuffer; -}; - -//! Huffman Encoder -class HuffmanEncoder -{ -public: - typedef unsigned int code_t; - typedef unsigned int value_t; - - HuffmanEncoder() {} - HuffmanEncoder(const unsigned int *codeBits, unsigned int nCodes); - void Initialize(const unsigned int *codeBits, unsigned int nCodes); - - static void GenerateCodeLengths(unsigned int *codeBits, unsigned int maxCodeBits, const unsigned int *codeCounts, size_t nCodes); - - void Encode(LowFirstBitWriter &writer, value_t value) const; - - struct Code - { - unsigned int code; - unsigned int len; - }; - - SecBlock m_valueToCode; -}; - -//! DEFLATE (RFC 1951) compressor - -class Deflator : public LowFirstBitWriter -{ -public: - enum {MIN_DEFLATE_LEVEL = 0, DEFAULT_DEFLATE_LEVEL = 6, MAX_DEFLATE_LEVEL = 9}; - enum {MIN_LOG2_WINDOW_SIZE = 9, DEFAULT_LOG2_WINDOW_SIZE = 15, MAX_LOG2_WINDOW_SIZE = 15}; - /*! \note detectUncompressible makes it faster to process uncompressible files, but - if a file has both compressible and uncompressible parts, it may fail to compress some of the - compressible parts. */ - Deflator(BufferedTransformation *attachment=NULL, int deflateLevel=DEFAULT_DEFLATE_LEVEL, int log2WindowSize=DEFAULT_LOG2_WINDOW_SIZE, bool detectUncompressible=true); - //! possible parameter names: Log2WindowSize, DeflateLevel, DetectUncompressible - Deflator(const NameValuePairs ¶meters, BufferedTransformation *attachment=NULL); - - //! this function can be used to set the deflate level in the middle of compression - void SetDeflateLevel(int deflateLevel); - int GetDeflateLevel() const {return m_deflateLevel;} - int GetLog2WindowSize() const {return m_log2WindowSize;} - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - bool IsolatedFlush(bool hardFlush, bool blocking); - -protected: - virtual void WritePrestreamHeader() {} - virtual void ProcessUncompressedData(const byte *string, size_t length) {} - virtual void WritePoststreamTail() {} - - enum {STORED = 0, STATIC = 1, DYNAMIC = 2}; - enum {MIN_MATCH = 3, MAX_MATCH = 258}; - - void InitializeStaticEncoders(); - void Reset(bool forceReset = false); - unsigned int FillWindow(const byte *str, size_t length); - unsigned int ComputeHash(const byte *str) const; - unsigned int LongestMatch(unsigned int &bestMatch) const; - void InsertString(unsigned int start); - void ProcessBuffer(); - - void LiteralByte(byte b); - void MatchFound(unsigned int distance, unsigned int length); - void EncodeBlock(bool eof, unsigned int blockType); - void EndBlock(bool eof); - - struct EncodedMatch - { - unsigned literalCode : 9; - unsigned literalExtra : 5; - unsigned distanceCode : 5; - unsigned distanceExtra : 13; - }; - - int m_deflateLevel, m_log2WindowSize, m_compressibleDeflateLevel; - unsigned int m_detectSkip, m_detectCount; - unsigned int DSIZE, DMASK, HSIZE, HMASK, GOOD_MATCH, MAX_LAZYLENGTH, MAX_CHAIN_LENGTH; - bool m_headerWritten, m_matchAvailable; - unsigned int m_dictionaryEnd, m_stringStart, m_lookahead, m_minLookahead, m_previousMatch, m_previousLength; - HuffmanEncoder m_staticLiteralEncoder, m_staticDistanceEncoder, m_dynamicLiteralEncoder, m_dynamicDistanceEncoder; - SecByteBlock m_byteBuffer; - SecBlock m_head, m_prev; - FixedSizeSecBlock m_literalCounts; - FixedSizeSecBlock m_distanceCounts; - SecBlock m_matchBuffer; - unsigned int m_matchBufferEnd, m_blockStart, m_blockLength; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.cpp deleted file mode 100644 index 4018e115..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.cpp +++ /dev/null @@ -1,621 +0,0 @@ -// zinflate.cpp - written and placed in the public domain by Wei Dai - -// This is a complete reimplementation of the DEFLATE decompression algorithm. -// It should not be affected by any security vulnerabilities in the zlib -// compression library. In particular it is not affected by the double free bug -// (http://www.kb.cert.org/vuls/id/368819). - -#include "pch.h" -#include "zinflate.h" - -NAMESPACE_BEGIN(CryptoPP) - -struct CodeLessThan -{ - inline bool operator()(CryptoPP::HuffmanDecoder::code_t lhs, const CryptoPP::HuffmanDecoder::CodeInfo &rhs) - {return lhs < rhs.code;} - // needed for MSVC .NET 2005 - inline bool operator()(const CryptoPP::HuffmanDecoder::CodeInfo &lhs, const CryptoPP::HuffmanDecoder::CodeInfo &rhs) - {return lhs.code < rhs.code;} -}; - -inline bool LowFirstBitReader::FillBuffer(unsigned int length) -{ - while (m_bitsBuffered < length) - { - byte b; - if (!m_store.Get(b)) - return false; - m_buffer |= (unsigned long)b << m_bitsBuffered; - m_bitsBuffered += 8; - } - assert(m_bitsBuffered <= sizeof(unsigned long)*8); - return true; -} - -inline unsigned long LowFirstBitReader::PeekBits(unsigned int length) -{ - bool result = FillBuffer(length); - assert(result); - return m_buffer & (((unsigned long)1 << length) - 1); -} - -inline void LowFirstBitReader::SkipBits(unsigned int length) -{ - assert(m_bitsBuffered >= length); - m_buffer >>= length; - m_bitsBuffered -= length; -} - -inline unsigned long LowFirstBitReader::GetBits(unsigned int length) -{ - unsigned long result = PeekBits(length); - SkipBits(length); - return result; -} - -inline HuffmanDecoder::code_t HuffmanDecoder::NormalizeCode(HuffmanDecoder::code_t code, unsigned int codeBits) -{ - return code << (MAX_CODE_BITS - codeBits); -} - -void HuffmanDecoder::Initialize(const unsigned int *codeBits, unsigned int nCodes) -{ - // the Huffman codes are represented in 3 ways in this code: - // - // 1. most significant code bit (i.e. top of code tree) in the least significant bit position - // 2. most significant code bit (i.e. top of code tree) in the most significant bit position - // 3. most significant code bit (i.e. top of code tree) in n-th least significant bit position, - // where n is the maximum code length for this code tree - // - // (1) is the way the codes come in from the deflate stream - // (2) is used to sort codes so they can be binary searched - // (3) is used in this function to compute codes from code lengths - // - // a code in representation (2) is called "normalized" here - // The BitReverse() function is used to convert between (1) and (2) - // The NormalizeCode() function is used to convert from (3) to (2) - - if (nCodes == 0) - throw Err("null code"); - - m_maxCodeBits = *std::max_element(codeBits, codeBits+nCodes); - - if (m_maxCodeBits > MAX_CODE_BITS) - throw Err("code length exceeds maximum"); - - if (m_maxCodeBits == 0) - throw Err("null code"); - - // count number of codes of each length - SecBlockWithHint blCount(m_maxCodeBits+1); - std::fill(blCount.begin(), blCount.end(), 0); - unsigned int i; - for (i=0; i nextCode(m_maxCodeBits+1); - nextCode[1] = 0; - for (i=2; i<=m_maxCodeBits; i++) - { - // compute this while checking for overflow: code = (code + blCount[i-1]) << 1 - if (code > code + blCount[i-1]) - throw Err("codes oversubscribed"); - code += blCount[i-1]; - if (code > (code << 1)) - throw Err("codes oversubscribed"); - code <<= 1; - nextCode[i] = code; - } - - if (code > (1 << m_maxCodeBits) - blCount[m_maxCodeBits]) - throw Err("codes oversubscribed"); - else if (m_maxCodeBits != 1 && code < (1 << m_maxCodeBits) - blCount[m_maxCodeBits]) - throw Err("codes incomplete"); - - // compute a vector of triples sorted by code - m_codeToValue.resize(nCodes - blCount[0]); - unsigned int j=0; - for (i=0; ilen) - { - entry.type = 2; - entry.len = codeInfo.len; - } - else - { - entry.type = 3; - entry.end = last+1; - } - } -} - -inline unsigned int HuffmanDecoder::Decode(code_t code, /* out */ value_t &value) const -{ - assert(m_codeToValue.size() > 0); - LookupEntry &entry = m_cache[code & m_cacheMask]; - - code_t normalizedCode; - if (entry.type != 1) - normalizedCode = BitReverse(code); - - if (entry.type == 0) - FillCacheEntry(entry, normalizedCode); - - if (entry.type == 1) - { - value = entry.value; - return entry.len; - } - else - { - const CodeInfo &codeInfo = (entry.type == 2) - ? entry.begin[(normalizedCode << m_cacheBits) >> (MAX_CODE_BITS - (entry.len - m_cacheBits))] - : *(std::upper_bound(entry.begin, entry.end, normalizedCode, CodeLessThan())-1); - value = codeInfo.value; - return codeInfo.len; - } -} - -bool HuffmanDecoder::Decode(LowFirstBitReader &reader, value_t &value) const -{ - reader.FillBuffer(m_maxCodeBits); - unsigned int codeBits = Decode(reader.PeekBuffer(), value); - if (codeBits > reader.BitsBuffered()) - return false; - reader.SkipBits(codeBits); - return true; -} - -// ************************************************************* - -Inflator::Inflator(BufferedTransformation *attachment, bool repeat, int propagation) - : AutoSignaling(propagation) - , m_state(PRE_STREAM), m_repeat(repeat), m_reader(m_inQueue) -{ - Detach(attachment); -} - -void Inflator::IsolatedInitialize(const NameValuePairs ¶meters) -{ - m_state = PRE_STREAM; - parameters.GetValue("Repeat", m_repeat); - m_inQueue.Clear(); - m_reader.SkipBits(m_reader.BitsBuffered()); -} - -void Inflator::OutputByte(byte b) -{ - m_window[m_current++] = b; - if (m_current == m_window.size()) - { - ProcessDecompressedData(m_window + m_lastFlush, m_window.size() - m_lastFlush); - m_lastFlush = 0; - m_current = 0; - m_wrappedAround = true; - } -} - -void Inflator::OutputString(const byte *string, size_t length) -{ - while (length) - { - size_t len = UnsignedMin(length, m_window.size() - m_current); - memcpy(m_window + m_current, string, len); - m_current += len; - if (m_current == m_window.size()) - { - ProcessDecompressedData(m_window + m_lastFlush, m_window.size() - m_lastFlush); - m_lastFlush = 0; - m_current = 0; - m_wrappedAround = true; - } - string += len; - length -= len; - } -} - -void Inflator::OutputPast(unsigned int length, unsigned int distance) -{ - size_t start; - if (distance <= m_current) - start = m_current - distance; - else if (m_wrappedAround && distance <= m_window.size()) - start = m_current + m_window.size() - distance; - else - throw BadBlockErr(); - - if (start + length > m_window.size()) - { - for (; start < m_window.size(); start++, length--) - OutputByte(m_window[start]); - start = 0; - } - - if (start + length > m_current || m_current + length >= m_window.size()) - { - while (length--) - OutputByte(m_window[start++]); - } - else - { - memcpy(m_window + m_current, m_window + start, length); - m_current += length; - } -} - -size_t Inflator::Put2(const byte *inString, size_t length, int messageEnd, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("Inflator"); - - LazyPutter lp(m_inQueue, inString, length); - ProcessInput(messageEnd != 0); - - if (messageEnd) - if (!(m_state == PRE_STREAM || m_state == AFTER_END)) - throw UnexpectedEndErr(); - - Output(0, NULL, 0, messageEnd, blocking); - return 0; -} - -bool Inflator::IsolatedFlush(bool hardFlush, bool blocking) -{ - if (!blocking) - throw BlockingInputOnly("Inflator"); - - if (hardFlush) - ProcessInput(true); - FlushOutput(); - - return false; -} - -void Inflator::ProcessInput(bool flush) -{ - while (true) - { - switch (m_state) - { - case PRE_STREAM: - if (!flush && m_inQueue.CurrentSize() < MaxPrestreamHeaderSize()) - return; - ProcessPrestreamHeader(); - m_state = WAIT_HEADER; - m_wrappedAround = false; - m_current = 0; - m_lastFlush = 0; - m_window.New(1 << GetLog2WindowSize()); - break; - case WAIT_HEADER: - { - // maximum number of bytes before actual compressed data starts - const size_t MAX_HEADER_SIZE = BitsToBytes(3+5+5+4+19*7+286*15+19*15); - if (m_inQueue.CurrentSize() < (flush ? 1 : MAX_HEADER_SIZE)) - return; - DecodeHeader(); - break; - } - case DECODING_BODY: - if (!DecodeBody()) - return; - break; - case POST_STREAM: - if (!flush && m_inQueue.CurrentSize() < MaxPoststreamTailSize()) - return; - ProcessPoststreamTail(); - m_state = m_repeat ? PRE_STREAM : AFTER_END; - Output(0, NULL, 0, GetAutoSignalPropagation(), true); // TODO: non-blocking - if (m_inQueue.IsEmpty()) - return; - break; - case AFTER_END: - m_inQueue.TransferTo(*AttachedTransformation()); - return; - } - } -} - -void Inflator::DecodeHeader() -{ - if (!m_reader.FillBuffer(3)) - throw UnexpectedEndErr(); - m_eof = m_reader.GetBits(1) != 0; - m_blockType = (byte)m_reader.GetBits(2); - switch (m_blockType) - { - case 0: // stored - { - m_reader.SkipBits(m_reader.BitsBuffered() % 8); - if (!m_reader.FillBuffer(32)) - throw UnexpectedEndErr(); - m_storedLen = (word16)m_reader.GetBits(16); - word16 nlen = (word16)m_reader.GetBits(16); - if (nlen != (word16)~m_storedLen) - throw BadBlockErr(); - break; - } - case 1: // fixed codes - m_nextDecode = LITERAL; - break; - case 2: // dynamic codes - { - if (!m_reader.FillBuffer(5+5+4)) - throw UnexpectedEndErr(); - unsigned int hlit = m_reader.GetBits(5); - unsigned int hdist = m_reader.GetBits(5); - unsigned int hclen = m_reader.GetBits(4); - - FixedSizeSecBlock codeLengths; - unsigned int i; - static const unsigned int border[] = { // Order of the bit length code lengths - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - std::fill(codeLengths.begin(), codeLengths+19, 0); - for (i=0; i hlit+257+hdist+1) - throw BadBlockErr(); - std::fill(codeLengths + i, codeLengths + i + count, repeater); - i += count; - } - m_dynamicLiteralDecoder.Initialize(codeLengths, hlit+257); - if (hdist == 0 && codeLengths[hlit+257] == 0) - { - if (hlit != 0) // a single zero distance code length means all literals - throw BadBlockErr(); - } - else - m_dynamicDistanceDecoder.Initialize(codeLengths+hlit+257, hdist+1); - m_nextDecode = LITERAL; - } - catch (HuffmanDecoder::Err &) - { - throw BadBlockErr(); - } - break; - } - default: - throw BadBlockErr(); // reserved block type - } - m_state = DECODING_BODY; -} - -bool Inflator::DecodeBody() -{ - bool blockEnd = false; - switch (m_blockType) - { - case 0: // stored - assert(m_reader.BitsBuffered() == 0); - while (!m_inQueue.IsEmpty() && !blockEnd) - { - size_t size; - const byte *block = m_inQueue.Spy(size); - size = UnsignedMin(m_storedLen, size); - OutputString(block, size); - m_inQueue.Skip(size); - m_storedLen -= (word16)size; - if (m_storedLen == 0) - blockEnd = true; - } - break; - case 1: // fixed codes - case 2: // dynamic codes - static const unsigned int lengthStarts[] = { - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258}; - static const unsigned int lengthExtraBits[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0}; - static const unsigned int distanceStarts[] = { - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577}; - static const unsigned int distanceExtraBits[] = { - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, - 12, 12, 13, 13}; - - const HuffmanDecoder& literalDecoder = GetLiteralDecoder(); - const HuffmanDecoder& distanceDecoder = GetDistanceDecoder(); - - switch (m_nextDecode) - { - case LITERAL: - while (true) - { - if (!literalDecoder.Decode(m_reader, m_literal)) - { - m_nextDecode = LITERAL; - break; - } - if (m_literal < 256) - OutputByte((byte)m_literal); - else if (m_literal == 256) // end of block - { - blockEnd = true; - break; - } - else - { - if (m_literal > 285) - throw BadBlockErr(); - unsigned int bits; - case LENGTH_BITS: - bits = lengthExtraBits[m_literal-257]; - if (!m_reader.FillBuffer(bits)) - { - m_nextDecode = LENGTH_BITS; - break; - } - m_literal = m_reader.GetBits(bits) + lengthStarts[m_literal-257]; - case DISTANCE: - if (!distanceDecoder.Decode(m_reader, m_distance)) - { - m_nextDecode = DISTANCE; - break; - } - case DISTANCE_BITS: - bits = distanceExtraBits[m_distance]; - if (!m_reader.FillBuffer(bits)) - { - m_nextDecode = DISTANCE_BITS; - break; - } - m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance]; - OutputPast(m_literal, m_distance); - } - } - } - } - if (blockEnd) - { - if (m_eof) - { - FlushOutput(); - m_reader.SkipBits(m_reader.BitsBuffered()%8); - if (m_reader.BitsBuffered()) - { - // undo too much lookahead - SecBlockWithHint buffer(m_reader.BitsBuffered() / 8); - for (unsigned int i=0; i= m_lastFlush); - ProcessDecompressedData(m_window + m_lastFlush, m_current - m_lastFlush); - m_lastFlush = m_current; - } -} - -struct NewFixedLiteralDecoder -{ - HuffmanDecoder * operator()() const - { - unsigned int codeLengths[288]; - std::fill(codeLengths + 0, codeLengths + 144, 8); - std::fill(codeLengths + 144, codeLengths + 256, 9); - std::fill(codeLengths + 256, codeLengths + 280, 7); - std::fill(codeLengths + 280, codeLengths + 288, 8); - std::auto_ptr pDecoder(new HuffmanDecoder); - pDecoder->Initialize(codeLengths, 288); - return pDecoder.release(); - } -}; - -struct NewFixedDistanceDecoder -{ - HuffmanDecoder * operator()() const - { - unsigned int codeLengths[32]; - std::fill(codeLengths + 0, codeLengths + 32, 5); - std::auto_ptr pDecoder(new HuffmanDecoder); - pDecoder->Initialize(codeLengths, 32); - return pDecoder.release(); - } -}; - -const HuffmanDecoder& Inflator::GetLiteralDecoder() const -{ - return m_blockType == 1 ? Singleton().Ref() : m_dynamicLiteralDecoder; -} - -const HuffmanDecoder& Inflator::GetDistanceDecoder() const -{ - return m_blockType == 1 ? Singleton().Ref() : m_dynamicDistanceDecoder; -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.h deleted file mode 100644 index 7e1225bf..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zinflate.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef CRYPTOPP_ZINFLATE_H -#define CRYPTOPP_ZINFLATE_H - -#include "filters.h" -#include - -NAMESPACE_BEGIN(CryptoPP) - -//! _ -class LowFirstBitReader -{ -public: - LowFirstBitReader(BufferedTransformation &store) - : m_store(store), m_buffer(0), m_bitsBuffered(0) {} -// unsigned long BitsLeft() const {return m_store.MaxRetrievable() * 8 + m_bitsBuffered;} - unsigned int BitsBuffered() const {return m_bitsBuffered;} - unsigned long PeekBuffer() const {return m_buffer;} - bool FillBuffer(unsigned int length); - unsigned long PeekBits(unsigned int length); - void SkipBits(unsigned int length); - unsigned long GetBits(unsigned int length); - -private: - BufferedTransformation &m_store; - unsigned long m_buffer; - unsigned int m_bitsBuffered; -}; - -struct CodeLessThan; - -//! Huffman Decoder -class HuffmanDecoder -{ -public: - typedef unsigned int code_t; - typedef unsigned int value_t; - enum {MAX_CODE_BITS = sizeof(code_t)*8}; - - class Err : public Exception {public: Err(const std::string &what) : Exception(INVALID_DATA_FORMAT, "HuffmanDecoder: " + what) {}}; - - HuffmanDecoder() {} - HuffmanDecoder(const unsigned int *codeBitLengths, unsigned int nCodes) {Initialize(codeBitLengths, nCodes);} - - void Initialize(const unsigned int *codeBitLengths, unsigned int nCodes); - unsigned int Decode(code_t code, /* out */ value_t &value) const; - bool Decode(LowFirstBitReader &reader, value_t &value) const; - -private: - friend struct CodeLessThan; - - struct CodeInfo - { - CodeInfo(code_t code=0, unsigned int len=0, value_t value=0) : code(code), len(len), value(value) {} - inline bool operator<(const CodeInfo &rhs) const {return code < rhs.code;} - code_t code; - unsigned int len; - value_t value; - }; - - struct LookupEntry - { - unsigned int type; - union - { - value_t value; - const CodeInfo *begin; - }; - union - { - unsigned int len; - const CodeInfo *end; - }; - }; - - static code_t NormalizeCode(code_t code, unsigned int codeBits); - void FillCacheEntry(LookupEntry &entry, code_t normalizedCode) const; - - unsigned int m_maxCodeBits, m_cacheBits, m_cacheMask, m_normalizedCacheMask; - std::vector > m_codeToValue; - mutable std::vector > m_cache; -}; - -//! DEFLATE (RFC 1951) decompressor - -class Inflator : public AutoSignaling -{ -public: - class Err : public Exception - { - public: - Err(ErrorType e, const std::string &s) - : Exception(e, s) {} - }; - class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}}; - class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}}; - - /*! \param repeat decompress multiple compressed streams in series - \param autoSignalPropagation 0 to turn off MessageEnd signal - */ - Inflator(BufferedTransformation *attachment = NULL, bool repeat = false, int autoSignalPropagation = -1); - - void IsolatedInitialize(const NameValuePairs ¶meters); - size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking); - bool IsolatedFlush(bool hardFlush, bool blocking); - - virtual unsigned int GetLog2WindowSize() const {return 15;} - -protected: - ByteQueue m_inQueue; - -private: - virtual unsigned int MaxPrestreamHeaderSize() const {return 0;} - virtual void ProcessPrestreamHeader() {} - virtual void ProcessDecompressedData(const byte *string, size_t length) - {AttachedTransformation()->Put(string, length);} - virtual unsigned int MaxPoststreamTailSize() const {return 0;} - virtual void ProcessPoststreamTail() {} - - void ProcessInput(bool flush); - void DecodeHeader(); - bool DecodeBody(); - void FlushOutput(); - void OutputByte(byte b); - void OutputString(const byte *string, size_t length); - void OutputPast(unsigned int length, unsigned int distance); - - static const HuffmanDecoder *FixedLiteralDecoder(); - static const HuffmanDecoder *FixedDistanceDecoder(); - - const HuffmanDecoder& GetLiteralDecoder() const; - const HuffmanDecoder& GetDistanceDecoder() const; - - enum State {PRE_STREAM, WAIT_HEADER, DECODING_BODY, POST_STREAM, AFTER_END}; - State m_state; - bool m_repeat, m_eof, m_wrappedAround; - byte m_blockType; - word16 m_storedLen; - enum NextDecode {LITERAL, LENGTH_BITS, DISTANCE, DISTANCE_BITS}; - NextDecode m_nextDecode; - unsigned int m_literal, m_distance; // for LENGTH_BITS or DISTANCE_BITS - HuffmanDecoder m_dynamicLiteralDecoder, m_dynamicDistanceDecoder; - LowFirstBitReader m_reader; - SecByteBlock m_window; - size_t m_current, m_lastFlush; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.cpp b/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.cpp deleted file mode 100644 index 4abafb01..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// zlib.cpp - written and placed in the public domain by Wei Dai - -// "zlib" is the name of a well known C language compression library -// (http://www.zlib.org) and also the name of a compression format -// (RFC 1950) that the library implements. This file is part of a -// complete reimplementation of the zlib compression format. - -#include "pch.h" -#include "zlib.h" -#include "zdeflate.h" -#include "zinflate.h" - -NAMESPACE_BEGIN(CryptoPP) - -static const byte DEFLATE_METHOD = 8; -static const byte FDICT_FLAG = 1 << 5; - -// ************************************************************* - -void ZlibCompressor::WritePrestreamHeader() -{ - m_adler32.Restart(); - byte cmf = DEFLATE_METHOD | ((GetLog2WindowSize()-8) << 4); - byte flags = GetCompressionLevel() << 6; - AttachedTransformation()->PutWord16(RoundUpToMultipleOf(cmf*256+flags, 31)); -} - -void ZlibCompressor::ProcessUncompressedData(const byte *inString, size_t length) -{ - m_adler32.Update(inString, length); -} - -void ZlibCompressor::WritePoststreamTail() -{ - FixedSizeSecBlock adler32; - m_adler32.Final(adler32); - AttachedTransformation()->Put(adler32, 4); -} - -unsigned int ZlibCompressor::GetCompressionLevel() const -{ - static const unsigned int deflateToCompressionLevel[] = {0, 1, 1, 1, 2, 2, 2, 2, 2, 3}; - return deflateToCompressionLevel[GetDeflateLevel()]; -} - -// ************************************************************* - -ZlibDecompressor::ZlibDecompressor(BufferedTransformation *attachment, bool repeat, int propagation) - : Inflator(attachment, repeat, propagation) -{ -} - -void ZlibDecompressor::ProcessPrestreamHeader() -{ - m_adler32.Restart(); - - byte cmf; - byte flags; - - if (!m_inQueue.Get(cmf) || !m_inQueue.Get(flags)) - throw HeaderErr(); - - if ((cmf*256+flags) % 31 != 0) - throw HeaderErr(); // if you hit this exception, you're probably trying to decompress invalid data - - if ((cmf & 0xf) != DEFLATE_METHOD) - throw UnsupportedAlgorithm(); - - if (flags & FDICT_FLAG) - throw UnsupportedPresetDictionary(); - - m_log2WindowSize = 8 + (cmf >> 4); -} - -void ZlibDecompressor::ProcessDecompressedData(const byte *inString, size_t length) -{ - AttachedTransformation()->Put(inString, length); - m_adler32.Update(inString, length); -} - -void ZlibDecompressor::ProcessPoststreamTail() -{ - FixedSizeSecBlock adler32; - if (m_inQueue.Get(adler32, 4) != 4) - throw Adler32Err(); - if (!m_adler32.Verify(adler32)) - throw Adler32Err(); -} - -NAMESPACE_END diff --git a/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.h b/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.h deleted file mode 100644 index 443b1442..00000000 --- a/src/3rd_party/cryptopp/cryptopp-5.6.1/zlib.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CRYPTOPP_ZLIB_H -#define CRYPTOPP_ZLIB_H - -#include "adler32.h" -#include "zdeflate.h" -#include "zinflate.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// ZLIB Compressor (RFC 1950) -class ZlibCompressor : public Deflator -{ -public: - ZlibCompressor(BufferedTransformation *attachment=NULL, unsigned int deflateLevel=DEFAULT_DEFLATE_LEVEL, unsigned int log2WindowSize=DEFAULT_LOG2_WINDOW_SIZE, bool detectUncompressible=true) - : Deflator(attachment, deflateLevel, log2WindowSize, detectUncompressible) {} - ZlibCompressor(const NameValuePairs ¶meters, BufferedTransformation *attachment=NULL) - : Deflator(parameters, attachment) {} - - unsigned int GetCompressionLevel() const; - -protected: - void WritePrestreamHeader(); - void ProcessUncompressedData(const byte *string, size_t length); - void WritePoststreamTail(); - - Adler32 m_adler32; -}; - -/// ZLIB Decompressor (RFC 1950) -class ZlibDecompressor : public Inflator -{ -public: - typedef Inflator::Err Err; - class HeaderErr : public Err {public: HeaderErr() : Err(INVALID_DATA_FORMAT, "ZlibDecompressor: header decoding error") {}}; - class Adler32Err : public Err {public: Adler32Err() : Err(DATA_INTEGRITY_CHECK_FAILED, "ZlibDecompressor: ADLER32 check error") {}}; - class UnsupportedAlgorithm : public Err {public: UnsupportedAlgorithm() : Err(INVALID_DATA_FORMAT, "ZlibDecompressor: unsupported algorithm") {}}; - class UnsupportedPresetDictionary : public Err {public: UnsupportedPresetDictionary() : Err(INVALID_DATA_FORMAT, "ZlibDecompressor: unsupported preset dictionary") {}}; - - /*! \param repeat decompress multiple compressed streams in series - \param autoSignalPropagation 0 to turn off MessageEnd signal - */ - ZlibDecompressor(BufferedTransformation *attachment = NULL, bool repeat = false, int autoSignalPropagation = -1); - unsigned int GetLog2WindowSize() const {return m_log2WindowSize;} - -private: - unsigned int MaxPrestreamHeaderSize() const {return 2;} - void ProcessPrestreamHeader(); - void ProcessDecompressedData(const byte *string, size_t length); - unsigned int MaxPoststreamTailSize() const {return 4;} - void ProcessPoststreamTail(); - - unsigned int m_log2WindowSize; - Adler32 m_adler32; -}; - -NAMESPACE_END - -#endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/.gitignore b/src/3rd_party/log4cplus/log4cplus-1.0.4/.gitignore deleted file mode 100644 index 9d1220b2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# this will prevent anyting to be commited from this folder and its subfolders -* diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/AUTHORS b/src/3rd_party/log4cplus/log4cplus-1.0.4/AUTHORS deleted file mode 100644 index 015f260c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/AUTHORS +++ /dev/null @@ -1,5 +0,0 @@ -Tad E. Smith -Michael CATANZARITI -Steighton Haley -Eduardo Francos -Vaclav Haisman diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/CMakeLists.txt deleted file mode 100755 index c0e0796e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/CMakeLists.txt +++ /dev/null @@ -1,150 +0,0 @@ -project (log4cplus CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -set (log4cplus_version_major 1) -set (log4cplus_version_minor 0) -set (log4cplus_version_patch 4) -set (log4cplus_soversion 4) -set (log4cplus_postfix "") - -find_package (Threads) -message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") - -set (log4cplus_headers - include/log4cplus/appender.h - include/log4cplus/config/macosx.h - include/log4cplus/config/win32.h - include/log4cplus/config.hxx - include/log4cplus/configurator.h - include/log4cplus/consoleappender.h - include/log4cplus/fileappender.h - include/log4cplus/fstreams.h - include/log4cplus/helpers/appenderattachableimpl.h - include/log4cplus/helpers/loglog.h - include/log4cplus/helpers/logloguser.h - include/log4cplus/helpers/pointer.h - include/log4cplus/helpers/property.h - include/log4cplus/helpers/sleep.h - include/log4cplus/helpers/socket.h - include/log4cplus/helpers/socketbuffer.h - include/log4cplus/helpers/stringhelper.h - include/log4cplus/helpers/syncprims.h - include/log4cplus/helpers/thread-config.h - include/log4cplus/helpers/threads.h - include/log4cplus/helpers/timehelper.h - include/log4cplus/hierarchy.h - include/log4cplus/hierarchylocker.h - include/log4cplus/layout.h - include/log4cplus/logger.h - include/log4cplus/loggingmacros.h - include/log4cplus/loglevel.h - include/log4cplus/ndc.h - include/log4cplus/nteventlogappender.h - include/log4cplus/nullappender.h - include/log4cplus/socketappender.h - include/log4cplus/spi/appenderattachable.h - include/log4cplus/spi/factory.h - include/log4cplus/spi/filter.h - include/log4cplus/spi/loggerfactory.h - include/log4cplus/spi/loggerimpl.h - include/log4cplus/spi/loggingevent.h - include/log4cplus/spi/objectregistry.h - include/log4cplus/spi/rootlogger.h - include/log4cplus/streams.h - include/log4cplus/syslogappender.h - include/log4cplus/tstring.h - include/log4cplus/version.h - include/log4cplus/win32debugappender.h - include/log4cplus/win32consoleappender.h) - - -set (log4cplus_sources - src/appender.cxx - src/appenderattachableimpl.cxx - src/configurator.cxx - src/consoleappender.cxx - src/factory.cxx - src/fileappender.cxx - src/filter.cxx - src/global-init.cxx - src/hierarchy.cxx - src/hierarchylocker.cxx - src/layout.cxx - src/logger.cxx - src/loggerimpl.cxx - src/loggingevent.cxx - src/loglevel.cxx - src/loglog.cxx - src/logloguser.cxx - src/ndc.cxx - src/nullappender.cxx - src/objectregistry.cxx - src/patternlayout.cxx - src/pointer.cxx - src/property.cxx - src/rootlogger.cxx - src/sleep.cxx - src/socket.cxx - src/socketappender.cxx - src/socketbuffer.cxx - src/stringhelper.cxx - src/syncprims.cxx - src/syslogappender.cxx - src/threads.cxx - src/timehelper.cxx - src/version.cxx) - -#message (STATUS "Type: ${UNIX}|${CYGWIN}|${WIN32}") - -# Uncomment the following line to get locale aware string conversions. -#add_definitions (-DLOG4CPLUS_WORKING_LOCALE) - -if ("${UNIX}" OR "${CYGWIN}") - set (log4cplus_sources ${log4cplus_sources} - src/socket-unix.cxx) - set (log4cplus_headers ${log4cplus_headers} - include/log4cplus/config/defines.hxx - include/log4cplus/helpers/syncprims-pthreads.h) -elseif (WIN32) - set (log4cplus_sources ${log4cplus_sources} - src/socket-win32.cxx - src/win32debugappender.cxx - src/nteventlogappender.cxx - src/win32consoleappender.cxx) - set (log4cplus_headers ${log4cplus_headers} - include/log4cplus/helpers/syncprims-win32.h) - - # Comment out the following lines if you want non-Unicode version. - add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) - set (log4cplus_postfix "${log4cplus_postfix}U") - - #add_definitions (-DLOG4CPLUS_STATIC) - #set (log4cplus_postfix "${log4cplus_postfix}S") -endif () - -message (STATUS "Headers: ${log4cplus_headers}") -message (STATUS "Sources: ${log4cplus_sources}") - -include_directories ("include") -set (log4cplus_all_sources ${log4cplus_sources} ${log4cplus_headers}) - -#add_library (log4cplus STATIC ${log4cplus_all_sources}) -add_library (log4cplus SHARED ${log4cplus_all_sources}) -target_link_libraries (log4cplus ${CMAKE_THREAD_LIBS_INIT}) - -set_target_properties (log4cplus PROPERTIES - VERSION "${log4cplus_version_major}.${log4cplus_version_minor}" - SOVERSION "${log4cplus_soversion}" - COMPILE_FLAGS "-DINSIDE_LOG4CPLUS") -if (WIN32) - set_target_properties (log4cplus PROPERTIES - DEBUG_POSTFIX "${log4cplus_postfix}D" - RELEASE_POSTFIX "${log4cplus_postfix}" - MINSIZEREL_POSTFIX "${log4cplus_postfix}" - RELWITHDEBINFO_POSTFIX "${log4cplus_postfix}") - target_link_libraries (log4cplus ws2_32 advapi32) -endif () - -add_subdirectory (loggingserver) -add_subdirectory (tests) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/COPYING b/src/3rd_party/log4cplus/log4cplus-1.0.4/COPYING deleted file mode 100644 index 9e94ab8f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/COPYING +++ /dev/null @@ -1 +0,0 @@ -See the LICENSE file. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/ChangeLog b/src/3rd_party/log4cplus/log4cplus-1.0.4/ChangeLog deleted file mode 100644 index c528c74f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/ChangeLog +++ /dev/null @@ -1,428 +0,0 @@ -Version 1.0.4 - - - Fixed bug #3101459 - TTCCLayout time is not in milliseconds since - process start by default. - - Fixed compilation of Non-Windows builds. - - Fixed various compilation and linking issues on SunOS. - -Version 1.0.4-RC11 - - - Fixed bug #3083313, deadlock because of double locking when using - ConfigurationWatchDogThread. - - Improved portability to HP-UX and aCC compiler. - - Added %b PatternLayout format specifier; it expands to file - component of file path. - - Fixed bug #3058706, compilation error on AIX in socket-unix.cxx. - - Added %b pattern layout specifier. It expands to file name - component of path name. - - Fixed bug #3034758. Fixed infinite loop in - Hierarchy::updateParents() when logger hierarchy name starts with - a dot. - - Fixed bug #3034748. Fixed infinite loop in - PatternParser::extractOption() on missing '}'. - -Version 1.0.4-RC10 - - - Fixed bug #3030133. Make Autoconf/Automake build system to respect - provided --includedir= value. - - Removed %X{N} PatternLayout format specifier for NDC with limited - depth. Replaced it with NDCMaxDepth property. - - Improved compatibility with Windows CE. - - Fixed memory leak when using POSIX threads. - - Fixed leak of mutex used to synchronize gethostbyname() calls. - - Fixed problem with how std::toupper(), std::tolower() and - std::isspace() are used in non-Unicode builds. - -Version 1.0.4-RC9 - - - Fixed compilation problem in timehelper.cxx. - - Added %X{N} PatternLayout format specifier for NDC with limited - depth. - - Added facility property to SysLogAppender. - -Version 1.0.4-RC8 - - - Always handle %s time format specifier (seconds since epoch) in - log4cplus. Detect and use clock_gettime() when available. - - Fixed compilation on OpenSolaris with Sun C++. - - Fixed compilation on OpenBSD. - - Fixed use of operator delete/delete[] in FileAppender (Patch - #3005234). - - Updated config.guess and config.sub to latest Git repository - versions. - - Added BufferSize property to FileAppender to allow control of the - appender's output buffer. - - Removed -fkeep-inline-functions from GCC flags for non-debugging - build. - -Version 1.0.4-RC7 - - - Fixed thread safety issues with gethostbyname() by using - getaddrinfo() instead, where available. - - Fixed bug #2965390 - Minor internal debugging output issue. - - Added --enable-warnings (--disable-warnings) switches to the - configure script. - - Added ReopenDelay property to FileAppender, allowing the appender - to reopen output stream after write failure. (Patch #2971315) - -Version 1.0.4-RC6 - - - Fixed bug #2945335 - MinGW/MSYS build problems. For Windows builds - the source now defaults to static library/empty LOG4CPLUS_EXPORT - macro. - - Fixed a security problem in SyslogAppender. - - Fixed bug #2955058 - Looping over properties during variables - expansion. - - Added missing dependency on log4cplus_dll project to filter_test - project. - - Added a constructor with Properties parameter to DenyAllFilter. - - Reworked Layout, Appender and Filter factories registration. - -Version 1.0.4-RC5 - - - Implemented feature request #2927416 "Add a native Win32 Console - Appender". - - Loggingserver now exits with value 2 when it cannot open - listening socket. - - Improved Doxygen documentation. - - Added PropertyConfigurator::getProperties() and - PropertyConfigurator::getPropertyFilename() functions. - - Removed LOG4CPLUS_EXPORT on SharedObjectPtr<>. - - Turned on linker optimizations for MSVC8 builds to make resulting - binaries slightly smaller. - - Added --enable-runtime-pseudo-reloc linker option for Cygwin and - Mingw. Enable --enable-auto-import linker flag also for Mingw. - -Version 1.0.4-RC4 - - - Fixed bug #2875993 - Implement connector thread for - SocketAppender. - - Improved documentation of Appenders' properties. - - Improved behaviour of DailyRollingFileAppender. - - Added x64 (AMD64) build configuration to MSVC8 project files. - - Reworked MSVC8 project files to use .vsprops files to share - project settings. - - Moved all tests into Tests project folder. - - Improved behaviour of ConfigurationWatchDogThread. - - Fixed bug #2890819 - Handle empty input in towstring_internal() - and tostring_internal(). - - Corrected VERSION and SOVERSION in CMakeLists.txt. - - Fixed thread_test compilation on AIX. - - Added missing syncprims.cxx file in log4cplus_static.vcproj. - -Version 1.0.4-RC3 - - IMPORTANT: Majority of log4cplus' source code is now licensed using - the Apache Software License 2.0. The rest is covered by two clause - BSD license. - - - Fixed bug #2747435. Implement handling of log4cplus.configDebug - configuration property. - - Fixed variables shadowing. - - Doxygen documentation improvements and fixes. - - Add %i PatternLayout format. It expands to process ID. - - Fix logging macros compilation for LOG4CPLUS_SINGLE_THREADED case. - - Fix Logger log level configuration and root Logger handling log - level handling. - -Version 1.0.4-RC2 - - - Fixed bug #2834811. Accessing index 0 of empty strings. - - Fixed bug #2834808. Memory leak in thread local storage code. - - Removed MSVC6 directory and project files. - - Update to libtool-2.2.6. - -Version 1.0.4-RC1 - - - Fixed compilation with Borland C++ Builder compiler. - - Improved CMake build system to also build tests. - - Fixed compilation and improved support for Windows CE. - - Fixed compilation and improved support for Sun Studio 11 compiler. - - Fixed use after free and improved shutdown handling in - ConfigurationWatchDogThread. - - Implement %H (FQDN) and %h (host name) PatternLayout format - specifiers. - - Fixed bug #2829604. Environment variables substitution. - -Version 1.0.3 - - - List of bugs fixed or otherwise dealt with: - - -Version 1.0.3-RC9 - - - Tweaked Doxygen docs in comments for more recent Doxygen versions. - - Fix bug #2632087. Reworked WinSock initialization to fix deadlock - in WSAStartup() on Windows Vista. - - Fixed excessive errors reported in RollingFileAppender when - renaming non-existing files. - - Fall back to DAILY schedule in DailyRollingFileAppender for - invalid schedule specification. - - Added Debug_Unicode and Release_Unicode targets to MSVC8 test - cases builds. - -Version 1.0.3-RC8 - - - Fixed SysLogAppender not being exported out of shared library - because of missing LOG4CPLUS_EXPORT. - - Fix bug #1168433. RollingFileAppender does a rename() to rename - logfile to logfile.1 etc. rename() on Windows will not overwrite - an existing file so only the first rename works. On Windows - (only), try to remove existing file first before calling rename(). - - Fix bug #2573222. License issues. Most of log4cplus is covered by - ASL 1.1. The bits that are not covered by ASL 1.1 are covered by - two clause BSD licence. Texts of both licences are in LICENCE - file. - - Fix bug #2580037. Trim leading white space before comment - character '#' and both leading and trailing white space around - both key and value (e.g. " key = value ") in property files. - - Fix bug #2594345. Loggingserver and SocketAppender message format - mismatch. - - Fixed CMake builds. - -Version 1.0.3-RC7 - - - Fix Bug #894464. Really only consider prefixes when searching for - matching properties. - - Fix compilation for combination of non-threaded and UNICODE - settings. - -Version 1.0.3-RC6 - - - Fix Bug #852513 - Reconfiguring a logger does not remove old - appenders. - - Changed log4cplus thread helpers to block all signals on POSIX - platforms to enable their handling in a dedicated thread. (See - README, chapter Notes for explanation.) - - Changed thread creation from using CreateThread() to using - _beginthreadex() to avoid leaking C and C++ runtime memory. - - Fixed convertIntegerToString() to for negative numbers. - - Fixed wrong name used in BasicConfigurator for the - ConsoleAppender. - -Version 1.0.3-RC5 - - - Add CMakeLists.txt to facilitate compilation of log4cplus on - Windows with different compilers than just the MSVC8. - - Fix compilation of Unicode enabled build without working locale. - (Patch #2429185) - -Version 1.0.3-RC4 - - - IMPORTANT: log4cplus shared library version has been bumped to - 3. The interfaces have slightly changed and 1.0.3 is not binary - compatible with 1.0.2. - - - Fix more MSVC compilation problems. - - Changed log4cplus_static.vcproj to link with DLL C/C++ run time - (MSVCR80.dll and MSVCP80.dll). - - Implemented environment variables shadowing by properties and - recursive properties expansion. - - Reworked output directories layout of MSVC8 project. Now it - produces directories of the form - "log4cplus_{static,dll}.{Release,Debug}{_Unicode,}" and - "loggingserver.{Release,Debug}{_Unicode,}". The tests directory - projects still only compile using non-Unicode release and debug - version of the library. - - For single-threaded builds, re-use single tostringstream instead - of using a new one for each LOG4CPLUS_DEBUG() etc. macros. - - Merge Win32DebugAppender from trunk. (Patches #834925 and #858128) - - Make configuration of local server for NTEventLogAppender easier - by allowing empty server parameter string. (Feature Request - #875935) - -Version 1.0.3-RC3 - - - Fix Bug #2268760 - Trailing garbage in strings produced by - Time::getFormattedTime(). - - Fixed compilation of MSVC builds. - -Version 1.0.3-RC2 - - - Fix Bug #2106949 - Compilation problem with Borland's compiler. - - Fix Bug #1717320, #1040902, #1040676 - strftime() complains about - our custom %q and %Q format specifiers with "Invalid format - directive". - - Removed safe_auto_ptr. - - Added --enable-debugging switch to configure script. It disables - optimization and turns on debugging info generation. - - Use locale and its codecvt facet in towstring()/tostring() - implementations when --with-working-locale is defined. - - Added support for GCC's -fvisibility=hidden flag where available - together with __attribute__ ((visibility("default"))). - -Version 1.0.3-RC1 - - IMPORTANT: VC6 users, VC6 is unsupported. Its standard C++ library - is too broken. The work around for VC6's std::string has been - removed from log4cplus code; it actually does not fix the problem, - it only makes it a little bit less likely to manifest. VC6 project - files are still distributed with the source but they are broken as - we have no means to update them. We strongly suggest that you - either move away from VC6 to some more modern and standard - conforming compiler (like VC8) or that you use the STLport - standard C++ library implementation instead of VC6's own. - - - Fixed various compilation issues with MSVC8. - - Added MSVC8 project files. - - Fixed compilation with GCC 4.3. - - Fixed autoconf/automake build machinery so that it is possible to - build log4cplus in separate directory. - - Updated used autoconf and automake to version 2.62 and 1.10 - respectively. - - Enabled DLL building on Cygwin. - - Fixed Bug #894623, #1178841 - Various compilation issues on - Cygwin. - - Fixed Bug #2017876 - Destruction synchronization issue. - - Fixed Bug #1831238 - Unintentional sign extension in char -> - wchar_t conversion. - - Fixed Bug #1548998 - config.h is exporting symbols that conflict - with other applications/libraries. - - Fixed Bug #898646 - Ambiguity between ::yield() and - thread::yeild() on Solaris. - - Fixed Bug #954455 - LOG4CPLUS_ macros semicolon problem. - -Version 1.0.2 (February 10, 2004) - - Added "ImmediateFlush" configuration option to log4cplus::ConsoleAppender. - - Added do while loops around the logging statements in the macros. - - Fixed Bug #875960 - "log4cplus::ConfigureAndWatchThread crash" - - Fixed Bug #992034 - "rpm[build] -ta log4cplus-1.0.1.tar.gz doesn't work" - - Fixed Bug #875724 - "ConfigureAndWatchThread and mounted file systems" - - Fixed Bug #842280 - "'Append' mode when using FileAppended from cfg file." - All FileAppenders now have the "Append" configuration option. If this is - "true" any existing files will be opened with ios::append, otherwise they - will be opened with ios::trunc. - - Fixed Bug #805203 - "%q ConversionFormat does not accept modifiers" - - -Version 1.0.1 (December 18, 2003) - - Fixed Bug #831311 - "loggingserver.cxx clientsock.read()" - - Fixed Bug #851074 - "build problem HPUX 11, gcc 3.3" - - Fixed Bug #805242 - "Crash in log4cplus::helpers::SocketBuffer::appendSize_t" - - Fixed Bug #808119 - "TRACE_METHOD not displaying file name in log" - - Fixed Bug #827804 - "UMR in ConfigurationWatchdogThread" - - Fixed Bug #851116 - "Can not build" - - Added the OFF_LOG_LEVEL and the ALL_LOG_LEVEL LogLevels. - - -Version 1.0 (September 6 2003) - - Fix Bug #96934. (fileappender.cxx would not compile in a UNICODE build) - - Fixed compilation warning in MSVC for pointer.h - - -Version 0.9.10 (August 27 2003) - - Fixed singled-threaded build compilation issues - - The DailyRollingFileAppender no longer truncates files - - The DailyRollingFileAppender now performs a "rollover" on close(). If the - "rollover file" exists, then it will be renamed according to the pattern - that is used by the RollingFileAppender class. (Thanks Philip Green for - the suggestion.) - - Some socket-unix.cxx corrections. - - Fixed the *Factory initialization so that it compile with the HP aCC - compiler. - - Corrected the getCurrentThreadName() for MacOS X and DEC. - - "make install" now installs the header files. - - -Version 0.9.9 (August 9 2003) - - Fixed many MSVC++ compilation errors (6 and 7). - - Updated the MSVC++ projects - - Modified the Time::getFormattedTime() method to increase performance - - Modified Hierarcy::getInstanceImpl() to "deep copy" Logger names. - - Corrected some of the PatternLayout documentation to work better with - doxygen. - - Some Borland C++ Builder 6 fixes. - - -Version 0.9.8 (August 3 2003) - - Changed the LogLog class so that it is now reference counted. - - Restored the LOG4CPLUS_*_STR logging macros. - - Added support to disable the ERROR and FATAL macros by defining - LOG4CPLUS_DISABLE_* - - API Change: The LOG4CPLUS_TRACE macro now has behavior similar to all of - the other logging macros. If the old behavior is desired, then the new - LOG4CPLUS_TRACE_METHOD macro should be used. - - Modified Appender class to support the "Threshold" property. - - "localtime" is now the default time in log4cplus. - - The FileAppender no longer prints out the "header" when it opens a file. - - Added the "immediateFlush" field to the FileAppender class. - - Changed the API of the LogLevelManager class. - - Initial port work done to run on MacOS X. - - Added the HierarchyLocker class - - Added the ConfigureAndWatchThread class for runtime dynamic reconfiguration. - - Added several performance enhancements to the InternalLoggingEvent class. - - Renamed the PatternLayout "Pattern" configuration option to - "ConversionPattern". - - Added 3 new tests: configandwatch_test, customloglevel_test, and - performance_test. (No MSVC projects created for these tests, yet.) - - -Version 0.9.7 (June 28 2003) - - Added the log4cplus::DailyRollingFileAppender class. - - Added the log4cplus::helper::Time class. Now log with millisecond - granularity. (microsecond granularity if the gettimeofday() function is - available.) - - Changed log4cplus::spi::InternalLoggingEvent from a POD to a class and - introduced several performance ehancements to that class. This class - can now be extended to introduce "customized" logging. - - Fixed Bug #757989 - "TraceLogger should not hold a Logger reference" - - Added TYPE_SOCKLEN_T to configure.in (checking for whether - defines `socklen_t'). - - Added the "operator!=" to log4cplus::helpers::SharedObjectPtr. - - Made changes to make the DEC CXX 6.1 compiler happy. - - Renamed the tolower and toupper methods to avoid a name collision with a - macro with the DEC CXX compiler. - - Removed "-lstdc++" from the list of libraries in all Makefiles. - - -Version 0.9.6 (June 10 2003) - - Fixed multiple compiler warnings for the MSVC++ 7 compiler - - Modified configure.in so that it can now build on Solaris. - - Modified the configure script so that it can build a single-threaded - library (--enable-threads=no) - - Added "Filtering" to Appenders. - - Fixed Bug #741515 - "LogLog is causing a core on HP". - - Fixed Bug #733944 - "logging in system/local time" - - Fixed Bug #749040 - "Use of gmtime and localtime not thread-safe" - - Fixed Bug #750232 - "Copying of Hierarchy should not be allowed" - - Added an MSVC++ project to build log4cplus as a static library. - - -Version 0.9.5 (May 19 2003) - - Removed the LOG4CPLUS_*_STR logging macros. - - Added support to disable the TRACE, DEBUG, and INFO macros by defining - LOG4CPLUS_DISABLE_* - - Added a static doConfigure() method to PropertyConfigurator and - BasicConfigurator. - - Fixed problems with the configure script on several platforms. - - Optimized single-threaded mode. - - Fixed some problems with the MSVC++ 7 compiler. - - -Version 0.9.4 (May-5-2003) - Added SocketAppender class. - Now builds loggingserver to act as a source of logging messages from a - SocketAppender. - Numerous fixes needed for various compilers. - - -Version 0.9.3 (Apr-19-2003) - Added preliminary UNICODE support. (Little testing.) Thanks Michael CATANZARITI - Now built as a shared library instead of a static library. - Add support for Microsoft Visual C++ 6.0 back in. (Multi-threaded DLL) - Added SysLogAppender class. - Added NTEventLogAppender class. (Thanks Michael CATANZARITI) - - -Version 0.9.2 (Apr-5-2003) - Major API change: Changed the name of the Category class to Logger and - replaced the Priority class with LogLevel. - Added PropertyConfigurator class. - Added BasicConfigurator class. - - -Version 0.9.1 (Mar-22-2003) - Added PatternLayout class. - - -Version 0.9.0 - Initial beta release. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/LICENSE b/src/3rd_party/log4cplus/log4cplus-1.0.4/LICENSE deleted file mode 100644 index e2674fdc..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/LICENSE +++ /dev/null @@ -1,452 +0,0 @@ -Contents -======== - -1. Log4j license -2. Log4cplus license - - -1. Log4j license -================ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 1999-2005 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -2. Log4cplus license -==================== - -Each file of log4cplus source is licensed using either two clause BSD license -or Apache license 2.0. - - -2.1 Two clause BSD license -========================== - - Copyright (C) 1999-2009 Contributors to log4cplus project. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, 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. - - -2.2 Apache 2.0 license -====================== - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 1999-2009 Contributors to log4cplus project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.am deleted file mode 100644 index 33ad52b2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = ChangeLog -SUBDIRS = include src loggingserver tests diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.in deleted file mode 100644 index 3b2ed415..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/Makefile.in +++ /dev/null @@ -1,756 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/include/log4cplus/config.h.in \ - $(top_srcdir)/include/log4cplus/config/defines.hxx.in AUTHORS \ - COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -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 = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(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 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = ChangeLog -SUBDIRS = include src loggingserver tests -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(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: $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -include/log4cplus/config.h: include/log4cplus/stamp-h1 - @if test ! -f $@; then \ - rm -f include/log4cplus/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) include/log4cplus/stamp-h1; \ - else :; fi - -include/log4cplus/stamp-h1: $(top_srcdir)/include/log4cplus/config.h.in $(top_builddir)/config.status - @rm -f include/log4cplus/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status include/log4cplus/config.h -$(top_srcdir)/include/log4cplus/config.h.in: $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f include/log4cplus/stamp-h1 - touch $@ - -include/log4cplus/config/defines.hxx: include/log4cplus/config/stamp-h2 - @if test ! -f $@; then \ - rm -f include/log4cplus/config/stamp-h2; \ - $(MAKE) $(AM_MAKEFLAGS) include/log4cplus/config/stamp-h2; \ - else :; fi - -include/log4cplus/config/stamp-h2: $(top_srcdir)/include/log4cplus/config/defines.hxx.in $(top_builddir)/config.status - @rm -f include/log4cplus/config/stamp-h2 - cd $(top_builddir) && $(SHELL) ./config.status include/log4cplus/config/defines.hxx - -distclean-hdr: - -rm -f include/log4cplus/config.h include/log4cplus/stamp-h1 include/log4cplus/config/defines.hxx include/log4cplus/config/stamp-h2 - -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. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - 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 - -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__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__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.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(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 a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(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 --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(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__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: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { 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 -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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 $(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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma 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-recursive 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/3rd_party/log4cplus/log4cplus-1.0.4/NEWS b/src/3rd_party/log4cplus/log4cplus-1.0.4/NEWS deleted file mode 100644 index 5e9e6a58..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/NEWS +++ /dev/null @@ -1 +0,0 @@ -See http://log4cplus.sourceforge.net/ for the latest news. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/README b/src/3rd_party/log4cplus/log4cplus-1.0.4/README deleted file mode 100644 index 096707ae..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/README +++ /dev/null @@ -1,105 +0,0 @@ -Short Description -================= - -log4cplus is a simple to use C++ logging API providing thread-safe, -flexible, and arbitrarily granular control over log management and -configuration. It is modeled after the Java log4j API. - - -Latest Project Information -========================== - -The latest up-to-date information for this project can be found at -http://log4cplus.sourceforge.net. Please submit bugs, patches, -feature requests, etc. there. - - -Current Status -============== - -This library has now reached "Production" status. - - -Tested on the following platforms -================================= - -- Linux/AMD64 with GCC 4.1.2 and 4.3.2 -- FreeBSD/i386 and AMD64 with GCC 3.4.6, 4.2.1 and 4.3.3 -- Windows XP with MS Visual C++ 8.0, 9.0 and 10.0 -- OpenSolaris 5.11 with Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21, - with -library=stlport4 - - -Notes -===== - -Cygwin/MinGW ------------- - -Some version of GCC (3.4.x and probably some of 4.x series too) on -Windows (both Mingw and Cygwin) produces lots of warnings of the form -"warning: inline function 'void foo()' is declared as dllimport: -attribute ignored." This can be worked around by adding --Wno-attributes option to GCC command. Unfortunatelly, not all -affected version of GCC have this option. - - -Threads and signals -------------------- - -log4cplus is not safe to be used from async signals' handlers. This -is a property of most threaded programmes in general. If you are -going to use log4cplus in threaded application and if you want to use -log4cplus from signal handlers then your only option is to block -signals in all threads but one that will handle all signals. On POSIX -platforms, this is possible using the sigwait() call. log4cplus -enables this approach by blocking all signals in any threads created -through its threads helpers. - - -AIX ---- - -There appears to be a reentracy problem with AIX 5.3 and xlC 8 which -can result into a deadlock condition in some curcumstances. It is -unknown whether the problem manifests with other versions of either -the OS or the compiler, too. The problem was initially reported in a -bug report #3056687 ([1]). - -The core of the problem is that IBM's/xlC's standard C++ IOStreams -implementation uses global non recursive lock to protect some of its -state. The application in the bug report was trying to do logging -using log4cplus from inside overflow() member function of a class -derived from std::streambuf class. log4cplus itself uses -std::ostringstream. This resulted into an attempt to recursivly lock -the global non recursive lock and a deadlock. - -[1] - - -Unsupported compilers ---------------------- - -log4cplus does not support too old and broken C++ compilers: - -- Visual C++ prior to 7.1 -- GCC prior to 3.2 -- All Borland/CodeGear/Embarcadero C++ compilers - - -Unsupported platforms ---------------------- - -log4cplus requires some minimal set of C and/or C++ library -functions. Some systems/platforms fail to provide these functions and -thus log4cplus cannot be supported there: - -- Windows CE - missing implementations of functions - - -License -======= - -This library is licensed under the Apache Public License 2.0 and two -clause BSD license. Please read the included LICENSE file for -details. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/acinclude.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/acinclude.m4 deleted file mode 100644 index 4af467ff..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/acinclude.m4 +++ /dev/null @@ -1,10 +0,0 @@ -m4_include([m4/ax_c_ifdef.m4]) -m4_include([m4/type_socklen_t.m4]) -m4_include([m4/ac_cxx_compiler_vendor.m4]) -m4_include([m4/ax_cflags_gcc_option.m4]) -m4_include([m4/ax_cflags_sun_option.m4]) -m4_include([m4/ax_pthread.m4]) -m4_include([m4/ax_declspec.m4]) -m4_include([m4/ax_gethostbyname_r.m4]) -m4_include([m4/ax_getaddrinfo.m4]) -m4_include([m4/ax_log4cplus_wrappers.m4]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/aclocal.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/aclocal.m4 deleted file mode 100644 index a6217809..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/aclocal.m4 +++ /dev/null @@ -1,957 +0,0 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 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_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. -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, 2003, 2005, 2006, 2007, 2008 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.11' -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.11.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.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 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], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# 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. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$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, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# 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. - -# serial 10 - -# 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", "GCJ", or "OBJC". -# 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 - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" 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'. - 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 8's {/usr,}/bin/sh. - touch 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 - ;; - 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, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# 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. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 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"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 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. - -# serial 16 - -# 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. - -# 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.62])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], -[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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [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([AM_PROG_MKDIR_P])dnl -# 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)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl 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 -]) - -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, 2003, 2005, 2008 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, 2005 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. - -# serial 2 - -# 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])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 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. - -# serial 4 - -# 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, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# 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. - -# serial 6 - -# 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 supports --run. -# If it does, 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 --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 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_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 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. - -# serial 4 - -# _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])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# 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. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# 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 ( - 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 - rm -f conftest.file - 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 - - 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)]) - -# Copyright (C) 2001, 2003, 2005 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, 2008 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. - -# serial 2 - -# _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, 2005 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. - -# serial 2 - -# _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. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -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/libtool.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) -m4_include([acinclude.m4]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/config.guess b/src/3rd_party/log4cplus/log4cplus-1.0.4/config.guess deleted file mode 100755 index 115f944a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/config.guess +++ /dev/null @@ -1,1502 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. - -timestamp='2010-04-03' - -# 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 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# 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 Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# 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 - -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 (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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' HUP INT TERM - -# 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" HUP INT PIPE TERM ; -: ${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 - -# 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 tupples: *-*-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 ;; - *: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'` - exit ;; - 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:*:[456]) - 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/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - 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:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - 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-gnu`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/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - 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="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${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-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - 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-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - 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-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - 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 ;; - 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 - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - 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 - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - 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 ;; - 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 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -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/3rd_party/log4cplus/log4cplus-1.0.4/config.sub b/src/3rd_party/log4cplus/log4cplus-1.0.4/config.sub deleted file mode 100755 index ae354316..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/config.sub +++ /dev/null @@ -1,1729 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. - -timestamp='2010-03-22' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# 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. - - -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. -# -# 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 (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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-dietlibc | linux-newlib* | 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/'` - ;; - *) - 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*) - 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 \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | 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 \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | 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 | strongarm \ - | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-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-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | 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-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | 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-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | 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-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | 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) - 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'm not sure what "Sysv32" means. Should this be sysv3.2? - 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 - ;; - 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 - ;; - mingw32) - basic_machine=i386-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 - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - 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 - ;; - 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) basic_machine=powerpc-unknown - ;; - ppc-*) 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) - 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 - ;; - 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 - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; - tile*) - basic_machine=tile-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 - ;; - 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* \ - | -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* \ - | -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* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -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*) - # 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 - ;; - -kaos*) - os=-kaos - ;; - -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 - ;; - 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 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - 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/3rd_party/log4cplus/log4cplus-1.0.4/configure b/src/3rd_party/log4cplus/log4cplus-1.0.4/configure deleted file mode 100755 index af556f35..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/configure +++ /dev/null @@ -1,19787 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for log4cplus 1.0.4. -# -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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 -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="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 -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - - 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\" ) || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -SHELL=${CONFIG_SHELL-/bin/sh} - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='log4cplus' -PACKAGE_TARNAME='log4cplus' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='log4cplus 1.0.4' -PACKAGE_BUGREPORT='' -PACKAGE_URL='' - -ac_unique_file="src/logger.cxx" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS -LIBOBJS -MULTI_THREADED_FALSE -MULTI_THREADED_TRUE -PTHREAD_CFLAGS -PTHREAD_LIBS -PTHREAD_CC -ax_pthread_config -CPP -OTOOL64 -OTOOL -LIPO -NMEDIT -DSYMUTIL -RANLIB -AR -LN_S -NM -ac_ct_DUMPBIN -DUMPBIN -LD -FGREP -EGREP -GREP -SED -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -ac_ct_CC -CFLAGS -CC -LIBTOOL -OBJDUMP -DLLTOOL -AS -WINSOCK_SOCKETS_FALSE -WINSOCK_SOCKETS_TRUE -CXXCPP -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CXX -CPPFLAGS -LDFLAGS -CXXFLAGS -CXX -LOG4CPLUS_NDEBUG -LT_VERSION -am__untar -am__tar -AMTAR -am__leading_dot -SET_MAKE -AWK -mkdir_p -MKDIR_P -INSTALL_STRIP_PROGRAM -STRIP -install_sh -MAKEINFO -AUTOHEADER -AUTOMAKE -AUTOCONF -ACLOCAL -VERSION -PACKAGE -CYGPATH_W -am__isrc -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -with_working_locale -enable_debugging -enable_warnings -enable_dependency_tracking -enable_shared -enable_static -with_pic -enable_fast_install -with_gnu_ld -enable_libtool_lock -with_gnu_ld -enable_threads -' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS -CCC -CXXCPP -CPPFLAGS -CC -CFLAGS -LDFLAGS -LIBS -CPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures log4cplus 1.0.4 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/log4cplus] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of log4cplus 1.0.4:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-debugging Turns off optimization and adds switches that - generate debugging information. - --enable-warnings Use compiler warnings option, e.g. -Wall. Enabled by - default. - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-threads=yes/no Use this option to create a singled-threaded version - of this library - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-working-locale Use std::locale for char->wchar_t conversion. - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXXCPP C++ preprocessor - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to the package provider. -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -log4cplus configure 1.0.4 -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library 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_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link - -# ac_fn_cxx_try_run LINENO -# ------------------------ -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_cxx_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_run - -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_cxx_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_header_mongrel - -# ac_fn_cxx_check_func LINENO FUNC VAR -# ------------------------------------ -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_cxx_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library 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_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_func -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by log4cplus $as_me 1.0.4, which was -generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -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 || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - -am__api_version='1.11' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# 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]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -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 ( - 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 - rm -f conftest.file - 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". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -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 --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -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 - -# 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. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -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 - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - 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 - - -# Define the identity of the package. - PACKAGE='log4cplus' - VERSION='1.0.4' - - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -# -# +1 : ? : +1 == new interface that does not break old one -# +1 : ? : 0 == new interfac that breaks old one -# ? : ? : 0 == no new interfaces, but breaks apps -# ? :+1 : ? == just some internal changes, nothing breaks but might work -# better -# CURRENT : REVISION : AGE -LT_VERSION=4:0:0 - - - - - - -# Check whether --with-working-locale was given. -if test "${with_working_locale+set}" = set; then : - withval=$with_working_locale; -else - with_working_locale=no -fi - - -if test "x$with_working_locale" = "xyes"; then : - $as_echo "#define LOG4CPLUS_WORKING_LOCALE 1" >>confdefs.h - -fi - - -# Check whether --enable-debugging was given. -if test "${enable_debugging+set}" = set; then : - enableval=$enable_debugging; -else - enable_debugging=no -fi - - - - -if test "x$enable_debugging" = "xyes"; then : - $as_echo "#define LOG4CPLUS_DEBUGGING 1" >>confdefs.h - - LOG4CPLUS_NDEBUG=-UNDEBUG -else - LOG4CPLUS_NDEBUG=-DNDEBUG -fi - - - -# Check whether --enable-warnings was given. -if test "${enable_warnings+set}" = set; then : - enableval=$enable_warnings; -else - enable_warnings=yes -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C++ compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -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. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -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 - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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'. - 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_CXX_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 - 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 8's {/usr,}/bin/sh. - touch 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 - ;; - 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_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -case "$target_os" in #( - mingw*) : - CPPFLAGS="${CPPFLAGS} -U__STRICT_ANSI__" - CPPFLAGS="${CPPFLAGS} -DWIN32 -D_WIN32" - use_winsock_sockets=yes ;; #( - *) : - ;; -esac - - if test "x$use_winsock_sockets" = "xyes"; then - WINSOCK_SOCKETS_TRUE= - WINSOCK_SOCKETS_FALSE='#' -else - WINSOCK_SOCKETS_TRUE='#' - WINSOCK_SOCKETS_FALSE= -fi - - - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.2.10' -macro_revision='1.3175' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# 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' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# 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*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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'. - 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_CC_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 - 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 8's {/usr,}/bin/sh. - touch 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 - ;; - 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_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -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 - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 - ;; - - 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"; 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"`func_fallback_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 - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# 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 - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/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 - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -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 Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - 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 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } -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 - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# 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 \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# 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 - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - -# 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};"\ -" /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 - - # 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && 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 -#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. */ -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_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - 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 - -fi - -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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - - - - - - - - - - - - - - - - - - - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi - -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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; 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*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; 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*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - 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" - ;; - ppc*-*linux*|powerpc*-*linux*) - 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" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - 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 - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - 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" - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - 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 - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - - - - - - -# Set options -enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; -esac - -test -z "$AS" && AS=as - - - - - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - enable_dlopen=no - - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; 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 -else - enable_shared=yes -fi - - - - - - - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; 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 -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; 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 -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - -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 - -for cc_temp in $compiler""; 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-%%"` - - -# 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - 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 -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - 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 -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$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);}' - - - - - - - -# 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 - -# 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 -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* - -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* - - -## 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_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # 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\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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 - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-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_prog_compiler_pic='-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 - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - - 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_prog_compiler_pic='-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_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-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). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-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_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # 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\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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 - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=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\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $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* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=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\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $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* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # 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'. - exclude_expsyms='_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. - 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 - ;; - esac - - ld_shlibs=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 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${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 - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - 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 - ld_shlibs=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 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$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)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$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... - archive_expsym_cmds='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 - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${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. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='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= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${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 - whole_archive_flag_spec='${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 - whole_archive_flag_spec= - 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 - whole_archive_flag_spec='${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' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${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' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='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 - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='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 - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $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 - ld_shlibs=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 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - 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 - 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 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$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. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; 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 - 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 - export_symbols_cmds='$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 - export_symbols_cmds='$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. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${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 - hardcode_direct=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 - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - 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 - - export_dynamic_flag_spec='${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. - always_export_symbols=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. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$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 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$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. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${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. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$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 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$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)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-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. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=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. - archive_cmds='$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. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_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 - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="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}" - module_expsym_cmds="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}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - freebsd1*) - ld_shlibs=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*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$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 - 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 - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # 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 "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # 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) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - 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>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - 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_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # 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*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $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. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo(void) {} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $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 -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds='$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' - archive_expsym_cmds='$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 - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - 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 - allow_undefined_flag=unsupported - archive_cmds='$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' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$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 - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$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 - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_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' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$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' - archive_expsym_cmds='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 - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${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='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='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}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='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 - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=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 - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=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. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$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. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds 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. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -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 - 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 - 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 - 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,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - 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}' - - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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`' - - 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 - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux - 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 - 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 - 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 Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-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' - 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 - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - 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' - ;; - -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 - 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 - 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 - 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 - 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 - 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 - 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != 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, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = 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 - - - - - - - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - 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" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -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)) -void fnord () __attribute__((visibility("default"))); -#endif - -void fnord () { int i=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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -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)) -void fnord () __attribute__((visibility("default"))); -#endif - -void fnord () { int i=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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - 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 - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -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" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -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" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -CC="$lt_save_CC" - - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$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. - - - - - - -# 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 - - - # save warnings/boilerplate of simple test code - 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* - - 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* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - 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++"} - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; 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-%%"` - - - 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_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_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 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${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 - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - 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. - archive_cmds_CXX='$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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=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. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${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 - hardcode_direct_CXX=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 - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - 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 - - export_dynamic_flag_spec_CXX='${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. - always_export_symbols_CXX=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. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$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 - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$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. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${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. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$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 - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$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... - archive_expsym_cmds_CXX='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 - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else - whole_archive_flag_spec_CXX='' - fi - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_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 - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="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}" - module_expsym_cmds_CXX="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}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$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}" - archive_expsym_cmds_CXX="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 - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=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 - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$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 - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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 - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=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 - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$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*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${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 - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${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. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='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++ - archive_cmds_CXX='$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. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -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 - archive_cmds_CXX='$CC -shared -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 - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-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. - archive_cmds_CXX='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' - archive_expsym_cmds_CXX='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"' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$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."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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 - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) - prelink_cmds_CXX='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`"' - old_archive_cmds_CXX='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' - archive_cmds_CXX='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' - archive_expsym_cmds_CXX='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 - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$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 - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${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++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$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 - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # 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 - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='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 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${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' - compiler_needs_object_CXX=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. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=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*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - ld_shlibs_CXX=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. - archive_cmds_CXX='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' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$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' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$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' - archive_expsym_cmds_CXX='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' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # 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 - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$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' - ;; - *) - archive_cmds_CXX='$CC -shared -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 - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # 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 - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='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' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=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?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=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. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$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. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -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. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='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 - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$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. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$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 - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$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... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; 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 $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 - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p 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 "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$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 "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -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. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -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 - postdeps_CXX='-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 - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-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_prog_compiler_pic_CXX='-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 - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static_CXX= - ;; - 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_prog_compiler_pic_CXX=-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_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-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_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--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 - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # 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\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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 - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - 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>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=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\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $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* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=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\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - 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_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $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* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - 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 - export_symbols_cmds_CXX='$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 - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX 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. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc_CXX=no - else - lt_cv_archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } - archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -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 - 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 - 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 - 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,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - 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}' - - ;; - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[123]*) 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 - ;; - -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 - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux - 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 - 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 - 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 Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-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' - 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 - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - 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' - ;; - -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 - 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 - 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 - 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 - 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 - 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 - 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != 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, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = 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 - - - - - - - - fi # test -n "$compiler" - - CC=$lt_save_CC - 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_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the C++ compiler vendor" >&5 -$as_echo_n "checking the C++ compiler vendor... " >&6; } -if ${ac_cv_cxx_compiler_vendor+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __GNUG__ - # error "Macro __GNUG__ is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=gnu -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __DECCXX - # error "Macro __DECCXX is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=compaq -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __HP_aCC - # error "Macro __HP_aCC is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=hp -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __SUNPRO_CC - # error "Macro __SUNPRO_CC is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=sun -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __sgi - # error "Macro __sgi is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=sgi -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef _MSC_VER - # error "Macro _MSC_VER is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_cxx_compiler_vendor=microsoft -else - ac_cv_cxx_compiler_vendor=unknown -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_vendor" >&5 -$as_echo "$ac_cv_cxx_compiler_vendor" >&6; } - ac_cxx_compiler_vendor="$ac_cv_cxx_compiler_vendor" - - - -case $ac_cxx_compiler_vendor in #( - gnu) : - if test "x$enable_warnings" = "xyes"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -Wall" >&5 -$as_echo_n "checking CXXFLAGS for gcc -Wall... " >&6; } -if ${ax_cv_cxxflags_gcc_option__Wall+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__Wall="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -Wall" "-pedantic % -Wall %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__Wall=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wall" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__Wall" >&6; } -var=$ax_cv_cxxflags_gcc_option__Wall -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -Wextra" >&5 -$as_echo_n "checking CXXFLAGS for gcc -Wextra... " >&6; } -if ${ax_cv_cxxflags_gcc_option__Wextra+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__Wextra="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -Wextra" "-pedantic % -Wextra %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__Wextra=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wextra" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__Wextra" >&6; } -var=$ax_cv_cxxflags_gcc_option__Wextra -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -pedantic" >&5 -$as_echo_n "checking CXXFLAGS for gcc -pedantic... " >&6; } -if ${ax_cv_cxxflags_gcc_option__pedantic+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__pedantic="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -pedantic" "-pedantic % -pedantic %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__pedantic=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__pedantic" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__pedantic" >&6; } -var=$ax_cv_cxxflags_gcc_option__pedantic -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -Wshadow" >&5 -$as_echo_n "checking CXXFLAGS for gcc -Wshadow... " >&6; } -if ${ax_cv_cxxflags_gcc_option__Wshadow+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__Wshadow="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -Wshadow" "-pedantic % -Wshadow %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__Wshadow=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__Wshadow" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__Wshadow" >&6; } -var=$ax_cv_cxxflags_gcc_option__Wshadow -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - -fi - - if test "x$enable_debugging" = "xyes"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -g3" >&5 -$as_echo_n "checking CXXFLAGS for gcc -g3... " >&6; } -if ${ax_cv_cxxflags_gcc_option__g3+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__g3="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -g3" "-pedantic % -g3 %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__g3=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__g3" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__g3" >&6; } -var=$ax_cv_cxxflags_gcc_option__g3 -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -fkeep-inline-functions" >&5 -$as_echo_n "checking CXXFLAGS for gcc -fkeep-inline-functions... " >&6; } -if ${ax_cv_cxxflags_gcc_option__fkeep_inline_functions+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__fkeep_inline_functions="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -fkeep-inline-functions" "-pedantic % -fkeep-inline-functions %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__fkeep_inline_functions=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__fkeep_inline_functions" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__fkeep_inline_functions" >&6; } -var=$ax_cv_cxxflags_gcc_option__fkeep_inline_functions -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -O2" >&5 -$as_echo_n "checking CXXFLAGS for gcc -O2... " >&6; } -if ${ax_cv_cxxflags_gcc_option__O2+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_gcc_option__O2="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -O2" "-pedantic % -O2 %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_gcc_option__O2=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_gcc_option__O2" >&5 -$as_echo "$ax_cv_cxxflags_gcc_option__O2" >&6; } -var=$ax_cv_cxxflags_gcc_option__O2 -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - -fi - - case "$target_os" in #( - cygwin*|mingw*) : - LDFLAGS="${LDFLAGS} -Wl,--enable-auto-import" - LDFLAGS="${LDFLAGS} -Wl,--enable-runtime-pseudo-reloc" ;; #( - *) : - ;; -esac ;; #( - sun) : - if test "x$enable_warnings" = "xyes"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for sun/cc +w" >&5 -$as_echo_n "checking CXXFLAGS for sun/cc +w... " >&6; } -if ${ax_cv_cxxflags_sun_option_pw+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_cxxflags_sun_option_pw="no, unknown" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "+xstrconst -Xc % +w" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxxflags_sun_option_pw=`echo $ac_arg | sed -e 's,.*% *,,'`; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxxflags_sun_option_pw" >&5 -$as_echo "$ax_cv_cxxflags_sun_option_pw" >&6; } -var=$ax_cv_cxxflags_sun_option_pw -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - -fi - as_VAR=`$as_echo "ax_cv_cxxflags_sun_option_-library=stlport4" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for sun/cc -library=stlport4" >&5 -$as_echo_n "checking CXXFLAGS for sun/cc -library=stlport4... " >&6; } -if eval \${$as_VAR+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$as_VAR=\"no, unknown\"" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "+xstrconst -Xc % -library=stlport4" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$as_VAR=\`echo \$ac_arg | sed -e 's,.*% *,,'\`"; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -eval ac_res=\$$as_VAR - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval var=\$$as_VAR -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - - as_VAR=`$as_echo "ax_cv_cxxflags_sun_option_-library=Crun" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for sun/cc -library=Crun" >&5 -$as_echo_n "checking CXXFLAGS for sun/cc -library=Crun... " >&6; } -if eval \${$as_VAR+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$as_VAR=\"no, unknown\"" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "+xstrconst -Xc % -library=Crun" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$as_VAR=\`echo \$ac_arg | sed -e 's,.*% *,,'\`"; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -eval ac_res=\$$as_VAR - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval var=\$$as_VAR -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - ;; #( - *) : - ;; -esac - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __declspec(dllexport)" >&5 -$as_echo_n "checking for __declspec(dllexport)... " >&6; } -if ${ac_cv_declspec+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -__declspec(dllexport) int x = 0; - __declspec(dllexport) int foo (); - int foo () { return 0; } - __declspec(dllexport) int bar () { return x; } - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_declspec=yes -else - ac_cv_declspec=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_declspec" >&5 -$as_echo "$ac_cv_declspec" >&6; } - -if test "x$ac_cv_declspec" = "xyes"; then : - $as_echo "#define LOG4CPLUS_DECLSPEC_IMPORT __declspec(dllimport)" >>confdefs.h - - $as_echo "#define LOG4CPLUS_DECLSPEC_EXPORT __declspec(dllexport)" >>confdefs.h - -else - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((visibility(\"default\")))" >&5 -$as_echo_n "checking for __attribute__((visibility(\"default\")))... " >&6; } -if ${ac_cv__attribute__visibility+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#if defined (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)) -# error Please fail. -And extra please fail. -#else - __attribute__((visibility("default"))) int x = 0; - __attribute__((visibility("default"))) int foo (); - int foo () { return 0; } - __attribute__((visibility("default"))) int bar () { return x; } - __attribute__((visibility("hidden"))) int baz () { return 1; } -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv__attribute__visibility=yes -else - ac_cv__attribute__visibility=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv__attribute__visibility" >&5 -$as_echo "$ac_cv__attribute__visibility" >&6; } - -if test "x$ac_cv__attribute__visibility" = "xyes"; then : - $as_echo "#define LOG4CPLUS_DECLSPEC_IMPORT /**/" >>confdefs.h - - $as_echo "#define LOG4CPLUS_DECLSPEC_EXPORT __attribute__ ((visibility(\"default\")))" >>confdefs.h - -fi - -fi - -if test "x$ac_cv__attribute__visibility" = "xno" && test "x$ac_cv_declspec" = "xno"; then : - $as_echo "#define LOG4CPLUS_DECLSPEC_IMPORT /**/" >>confdefs.h - - $as_echo "#define LOG4CPLUS_DECLSPEC_EXPORT /**/" >>confdefs.h - -fi - - -if test "x$ac_cv_declspec" = "xyes" || test "x$ac_cv__attribute__visibility" = "xyes"; then : - case $ac_cxx_compiler_vendor in #( - gnu) : - if test "x$ac_cv_declspec" = "xyes" || test "x$ac_cv__attribute__visibility" = "xyes"; then : - as_VAR=`$as_echo "ax_cv_cxxflags_gcc_option_-fvisibility=hidden" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -fvisibility=hidden" >&5 -$as_echo_n "checking CXXFLAGS for gcc -fvisibility=hidden... " >&6; } -if eval \${$as_VAR+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$as_VAR=\"no, unknown\"" - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" -for ac_arg in "-pedantic -Werror % -fvisibility=hidden" "-pedantic % -fvisibility=hidden %% no, obsolete" # -do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$as_VAR=\`echo \$ac_arg | sed -e 's,.*% *,,'\`"; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -eval ac_res=\$$as_VAR - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval var=\$$as_VAR -case ".$var" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $CXXFLAGS " | grep " $var " 2>&1 >/dev/null - then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$var"; } >&5 - (: CXXFLAGS does contain $var) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$var\""; } >&5 - (: CXXFLAGS="$CXXFLAGS $var") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - CXXFLAGS="$CXXFLAGS $var" - fi - ;; -esac - -fi ;; #( - *) : - ;; -esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : - break -fi -done -if ${ac_cv_search_strerror+:} false; then : - -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -$as_echo_n "checking for library containing clock_gettime... " >&6; } -if ${ac_cv_search_clock_gettime+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -for ac_lib in '' posix4; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_clock_gettime=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_clock_gettime+:} false; then : - break -fi -done -if ${ac_cv_search_clock_gettime+:} false; then : - -else - ac_cv_search_clock_gettime=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -$as_echo "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 -$as_echo_n "checking for library containing nanosleep... " >&6; } -if ${ac_cv_search_nanosleep+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char nanosleep (); -int -main () -{ -return nanosleep (); - ; - return 0; -} -_ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_nanosleep=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_nanosleep+:} false; then : - break -fi -done -if ${ac_cv_search_nanosleep+:} false; then : - -else - ac_cv_search_nanosleep=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 -$as_echo "$ac_cv_search_nanosleep" >&6; } -ac_res=$ac_cv_search_nanosleep -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostent" >&5 -$as_echo_n "checking for library containing gethostent... " >&6; } -if ${ac_cv_search_gethostent+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostent (); -int -main () -{ -return gethostent (); - ; - return 0; -} -_ACEOF -for ac_lib in '' nsl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_gethostent=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_gethostent+:} false; then : - break -fi -done -if ${ac_cv_search_gethostent+:} false; then : - -else - ac_cv_search_gethostent=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostent" >&5 -$as_echo "$ac_cv_search_gethostent" >&6; } -ac_res=$ac_cv_search_gethostent -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 -$as_echo_n "checking for library containing setsockopt... " >&6; } -if ${ac_cv_search_setsockopt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setsockopt (); -int -main () -{ -return setsockopt (); - ; - return 0; -} -_ACEOF -for ac_lib in '' socket; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_setsockopt=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_setsockopt+:} false; then : - break -fi -done -if ${ac_cv_search_setsockopt+:} false; then : - -else - ac_cv_search_setsockopt=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setsockopt" >&5 -$as_echo "$ac_cv_search_setsockopt" >&6; } -ac_res=$ac_cv_search_setsockopt -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5 -$as_echo_n "checking for main in -lkernel32... " >&6; } -if ${ac_cv_lib_kernel32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkernel32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_kernel32_main=yes -else - ac_cv_lib_kernel32_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kernel32_main" >&5 -$as_echo "$ac_cv_lib_kernel32_main" >&6; } -if test "x$ac_cv_lib_kernel32_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBKERNEL32 1 -_ACEOF - - LIBS="-lkernel32 $LIBS" - -fi -ac_cv_lib_kernel32=ac_cv_lib_kernel32_main - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5 -$as_echo_n "checking for main in -ladvapi32... " >&6; } -if ${ac_cv_lib_advapi32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ladvapi32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_advapi32_main=yes -else - ac_cv_lib_advapi32_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_advapi32_main" >&5 -$as_echo "$ac_cv_lib_advapi32_main" >&6; } -if test "x$ac_cv_lib_advapi32_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBADVAPI32 1 -_ACEOF - - LIBS="-ladvapi32 $LIBS" - -fi -ac_cv_lib_advapi32=ac_cv_lib_advapi32_main - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 -$as_echo_n "checking for main in -lws2_32... " >&6; } -if ${ac_cv_lib_ws2_32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lws2_32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ws2_32_main=yes -else - ac_cv_lib_ws2_32_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 -$as_echo "$ac_cv_lib_ws2_32_main" >&6; } -if test "x$ac_cv_lib_ws2_32_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBWS2_32 1 -_ACEOF - - LIBS="-lws2_32 $LIBS" - -fi -ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_types_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYS_TYPES_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_socket_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYS_SOCKET_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYS_TIME_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_timeb_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYS_TIMEB_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_stat_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYS_STAT_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" -if test "x$ac_cv_header_syslog_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_SYSLOG_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_in_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_NETINET_IN_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" -if test "x$ac_cv_header_netdb_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_NETDB_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_UNISTD_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" -if test "x$ac_cv_header_stdio_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_STDIO_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" -if test "x$ac_cv_header_wchar_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_WCHAR_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" -if test "x$ac_cv_header_stdarg_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_STDARG_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default" -if test "x$ac_cv_header_time_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_TIME_H 1" >>confdefs.h - -fi - - - - ac_fn_cxx_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" -if test "x$ac_cv_header_errno_h" = xyes; then : - $as_echo "#define LOG4CPLUS_HAVE_ERRNO_H 1" >>confdefs.h - -fi - - - - - - for ac_func in gmtime_r -do : - ac_fn_cxx_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" -if test "x$ac_cv_func_gmtime_r" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GMTIME_R 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_GMTIME_R 1" >>confdefs.h - -fi -done - - - for ac_func in localtime_r -do : - ac_fn_cxx_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" -if test "x$ac_cv_func_localtime_r" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALTIME_R 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_LOCALTIME_R 1" >>confdefs.h - -fi -done - - - for ac_func in gettimeofday -do : - ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_GETTIMEOFDAY 1" >>confdefs.h - -fi -done - - - for ac_func in clock_gettime -do : - ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" -if test "x$ac_cv_func_clock_gettime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CLOCK_GETTIME 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_CLOCK_GETTIME 1" >>confdefs.h - -fi -done - - - for ac_func in getpid -do : - ac_fn_cxx_check_func "$LINENO" "getpid" "ac_cv_func_getpid" -if test "x$ac_cv_func_getpid" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPID 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_GETPID 1" >>confdefs.h - -fi -done - - - for ac_func in ftime -do : - ac_fn_cxx_check_func "$LINENO" "ftime" "ac_cv_func_ftime" -if test "x$ac_cv_func_ftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FTIME 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_FTIME 1" >>confdefs.h - -fi -done - - - for ac_func in stat -do : - ac_fn_cxx_check_func "$LINENO" "stat" "ac_cv_func_stat" -if test "x$ac_cv_func_stat" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STAT 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_STAT 1" >>confdefs.h - -fi -done - - - for ac_func in lstat -do : - ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat" -if test "x$ac_cv_func_lstat" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LSTAT 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_LSTAT 1" >>confdefs.h - -fi -done - - - for ac_func in htons -do : - ac_fn_cxx_check_func "$LINENO" "htons" "ac_cv_func_htons" -if test "x$ac_cv_func_htons" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_HTONS 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_HTONS 1" >>confdefs.h - -fi -done - - - for ac_func in ntohs -do : - ac_fn_cxx_check_func "$LINENO" "ntohs" "ac_cv_func_ntohs" -if test "x$ac_cv_func_ntohs" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NTOHS 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_NTOHS 1" >>confdefs.h - -fi -done - - - for ac_func in htonl -do : - ac_fn_cxx_check_func "$LINENO" "htonl" "ac_cv_func_htonl" -if test "x$ac_cv_func_htonl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_HTONL 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_HTONL 1" >>confdefs.h - -fi -done - - - for ac_func in ntohl -do : - ac_fn_cxx_check_func "$LINENO" "ntohl" "ac_cv_func_ntohl" -if test "x$ac_cv_func_ntohl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NTOHL 1 -_ACEOF - $as_echo "#define LOG4CPLUS_HAVE_NTOHL 1" >>confdefs.h - -fi -done - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENAMETOOLONG" >&5 -$as_echo_n "checking for ENAMETOOLONG... " >&6; } -if ${ax_cv_have_enametoolong+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int value = ENAMETOOLONG; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_have_enametoolong=yes -else - ax_cv_have_enametoolong=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_enametoolong" >&5 -$as_echo "$ax_cv_have_enametoolong" >&6; } -if test "x$ax_cv_have_enametoolong" = "xyes"; then : - $as_echo "#define LOG4CPLUS_HAVE_ENAMETOOLONG 1" >>confdefs.h - -fi - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 -$as_echo_n "checking for getaddrinfo... " >&6; } -if ${ax_cv_have_getaddrinfo+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __cplusplus -#include -#else -#include -#endif - -#include -#include -#include - -int -main () -{ - -getaddrinfo (NULL, NULL, NULL, NULL); - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_have_getaddrinfo=yes -else - ax_cv_have_getaddrinfo=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_getaddrinfo" >&5 -$as_echo "$ax_cv_have_getaddrinfo" >&6; } - -if test "x$ax_cv_have_getaddrinfo" = "xyes"; then : - $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h - -fi - -if test "x$ax_cv_have_getaddrinfo" = "xyes"; then : - $as_echo "#define LOG4CPLUS_HAVE_GETADDRINFO 1" >>confdefs.h - -fi - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r" >&5 -$as_echo_n "checking for gethostbyname_r... " >&6; } -if ${ax_cv_have_gethostbyname_r+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __cplusplus -#include -#else -#include -#endif - -#include -#include -#include - -int -main () -{ - -gethostbyname_r (NULL, NULL, NULL, 0, NULL, NULL); - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_have_gethostbyname_r=yes -else - ax_cv_have_gethostbyname_r=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_gethostbyname_r" >&5 -$as_echo "$ax_cv_have_gethostbyname_r" >&6; } - -if test "x$ax_cv_have_gethostbyname_r" = "xyes"; then : - $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h - -fi - -if test "x$ax_cv_have_gethostbyname_r" = "xyes"; then : - $as_echo "#define LOG4CPLUS_HAVE_GETHOSTBYNAME_R 1" >>confdefs.h - -fi - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 -$as_echo_n "checking for socklen_t... " >&6; } -if ${ac_cv_type_socklen_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -socklen_t len = 42; return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_type_socklen_t=yes -else - ac_cv_type_socklen_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 -$as_echo "$ac_cv_type_socklen_t" >&6; } - if test $ac_cv_type_socklen_t != yes; then - $as_echo "#define socklen_t int" >>confdefs.h - - fi - - - - - - -# Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then : - enableval=$enable_threads; case "${enableval}" in #( - yes) : - ;; #( - no) : - ;; #( - *) : - as_fn_error $? "bad value ${enableval} for --enable-threads" "$LINENO" 5 ;; -esac -else - enable_threads=yes -fi - - -if test x$enable_threads = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Creating a multi-threaded library." >&5 -$as_echo "$as_me: Creating a multi-threaded library." >&6;} - - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - - case "$target_os" in #( - mingw*) : - ;; #( - *) : - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -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" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_join (); -int -main () -{ -return pthread_join (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } - 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_cpu}-${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*) - acx_pthread_flags="-pthread $acx_pthread_flags" - ;; -esac - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } - ;; - - -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. -set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ax_pthread_config+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ax_pthread_config"; then - ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ax_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" -fi -fi -ax_pthread_config=$ac_cv_prog_ax_pthread_config -if test -n "$ax_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 -$as_echo "$ax_pthread_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # 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. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - static void routine(void* a) {a=0;} - static void* start_routine(void* a) {return a;} -int -main () -{ -pthread_t th; pthread_attr_t attr; - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_create(&th,0,start_routine,0); - pthread_cleanup_pop(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } - 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. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int attr=$attr; return attr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - attr_name=$attr; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 -$as_echo "$attr_name" >&6; } - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $attr_name -_ACEOF - - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -$as_echo "${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - for ac_prog in xlc_r cc_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PTHREAD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$PTHREAD_CC" && break -done -test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" - - else - PTHREAD_CC=$CC - fi -else - PTHREAD_CC="$CC" -fi - - - - - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h - - : -else - ax_pthread_ok=no - as_fn_error $? "Requested threads support but no threads were found." "$LINENO" 5 -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ;; -esac - - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: Creating a single-threaded library" >&5 -$as_echo "$as_me: Creating a single-threaded library" >&6;} - -$as_echo "#define LOG4CPLUS_SINGLE_THREADED 1" >>confdefs.h - -fi - - if test x$enable_threads = xyes; then - MULTI_THREADED_TRUE= - MULTI_THREADED_FALSE='#' -else - MULTI_THREADED_TRUE='#' - MULTI_THREADED_FALSE= -fi - - - - - - -ac_config_headers="$ac_config_headers include/log4cplus/config.h" - -ac_config_headers="$ac_config_headers include/log4cplus/config/defines.hxx" - -ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile loggingserver/Makefile tests/Makefile tests/appender_test/Makefile tests/configandwatch_test/Makefile tests/customloglevel_test/Makefile tests/fileappender_test/Makefile tests/filter_test/Makefile tests/hierarchy_test/Makefile tests/loglog_test/Makefile tests/ndc_test/Makefile tests/ostream_test/Makefile tests/patternlayout_test/Makefile tests/performance_test/Makefile tests/priority_test/Makefile tests/propertyconfig_test/Makefile tests/socket_test/Makefile tests/thread_test/Makefile tests/timeformat_test/Makefile" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${WINSOCK_SOCKETS_TRUE}" && test -z "${WINSOCK_SOCKETS_FALSE}"; then - as_fn_error $? "conditional \"WINSOCK_SOCKETS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${MULTI_THREADED_TRUE}" && test -z "${MULTI_THREADED_FALSE}"; then - as_fn_error $? "conditional \"MULTI_THREADED\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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 -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by log4cplus $as_me 1.0.4, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to the package provider." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -log4cplus config.status 1.0.4 -configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2010 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# 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' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' - -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 AS \ -DLLTOOL \ -OBJDUMP \ -SHELL \ -ECHO \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -deplibs_check_method \ -file_magic_cmd \ -AR \ -AR_FLAGS \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ -lt_prog_compiler_pic \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ -hardcode_libdir_separator \ -fix_srcfile_path \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -reload_flag_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; 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 reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX; 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 - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# 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 - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "include/log4cplus/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/log4cplus/config.h" ;; - "include/log4cplus/config/defines.hxx") CONFIG_HEADERS="$CONFIG_HEADERS include/log4cplus/config/defines.hxx" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "loggingserver/Makefile") CONFIG_FILES="$CONFIG_FILES loggingserver/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "tests/appender_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/appender_test/Makefile" ;; - "tests/configandwatch_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/configandwatch_test/Makefile" ;; - "tests/customloglevel_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/customloglevel_test/Makefile" ;; - "tests/fileappender_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/fileappender_test/Makefile" ;; - "tests/filter_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/filter_test/Makefile" ;; - "tests/hierarchy_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/hierarchy_test/Makefile" ;; - "tests/loglog_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/loglog_test/Makefile" ;; - "tests/ndc_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ndc_test/Makefile" ;; - "tests/ostream_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ostream_test/Makefile" ;; - "tests/patternlayout_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/patternlayout_test/Makefile" ;; - "tests/performance_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/performance_test/Makefile" ;; - "tests/priority_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/priority_test/Makefile" ;; - "tests/propertyconfig_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/propertyconfig_test/Makefile" ;; - "tests/socket_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/socket_test/Makefile" ;; - "tests/thread_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/thread_test/Makefile" ;; - "tests/timeformat_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/timeformat_test/Makefile" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_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" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 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" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - 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"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} - ;; - "libtool":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. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 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. - - -# The names of the tagged configurations supported by this script. -available_tags="CXX " - -# ### BEGIN LIBTOOL CONFIG - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Assembler program. -AS=$lt_AS - -# DLL creation program. -DLLTOOL=$lt_DLLTOOL - -# Object dumper program. -OBJDUMP=$lt_OBJDUMP - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# 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 -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# 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. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# ### 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 - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# 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_stripname () -{ - # 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}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - # Extract subdirectory from the argument. - 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_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# 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 -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac - - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# 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. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - ;; - - esac -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/configure.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/configure.in deleted file mode 100644 index f3a7e318..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/configure.in +++ /dev/null @@ -1,261 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl This version of log4cplus requires the follwing autotools versions: -dnl autoconf-2.67 -dnl automake-1.11.1 -dnl libtool-2.2.10 - -AC_INIT([log4cplus],[1.0.4]) -AC_CANONICAL_TARGET -AC_CONFIG_SRCDIR([src/logger.cxx]) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11.1 no-define nostdinc gnu -Wall]) - -# -# +1 : ? : +1 == new interface that does not break old one -# +1 : ? : 0 == new interfac that breaks old one -# ? : ? : 0 == no new interfaces, but breaks apps -# ? :+1 : ? == just some internal changes, nothing breaks but might work -# better -# CURRENT : REVISION : AGE -LT_VERSION=4:0:0 -AC_SUBST([LT_VERSION]) - -dnl Sane locale? - -AH_TEMPLATE([LOG4CPLUS_WORKING_LOCALE], - [Define for compilers/standard libraries that support more than - just the "C" locale.]) - -AC_ARG_WITH([working-locale], - [AS_HELP_STRING([--with-working-locale], - [Use std::locale for char->wchar_t conversion.])], - [], - [with_working_locale=no]) - -AS_IF([test "x$with_working_locale" = "xyes"], - [AC_DEFINE([LOG4CPLUS_WORKING_LOCALE], [1])], - []) - -dnl Debugging or release build? - -AC_ARG_ENABLE([debugging], - [AS_HELP_STRING([--enable-debugging], - [Turns off optimization and adds switches that generate debugging - information.])], - [], - [enable_debugging=no]) - -AH_TEMPLATE([LOG4CPLUS_DEBUGGING], - [Defined for --enable-debugging builds.]) - -AS_IF([test "x$enable_debugging" = "xyes"], - [AC_DEFINE([LOG4CPLUS_DEBUGGING]) - LOG4CPLUS_NDEBUG=-UNDEBUG], - [LOG4CPLUS_NDEBUG=-DNDEBUG]) -AC_SUBST([LOG4CPLUS_NDEBUG]) - -dnl Turn warnings on/off? - -AC_ARG_ENABLE([warnings], - [AC_HELP_STRING([--enable-warnings], - [Use compiler warnings option, e.g. -Wall. Enabled by default.])], - [], - [enable_warnings=yes]) - -dnl first check for c/c++ compilers -AC_PROG_CXX -AC_PROG_CXXCPP -AC_LANG([C++]) - -AS_CASE(["$target_os"], - [mingw*], - [dnl Undefining __STRICT_ANSI__ is a workaround for MinGW - dnl compilation problem. C++ header does not compile in - dnl GCC 4.4.0 because some functions like swprintf() are not - dnl visible. - CPPFLAGS="${CPPFLAGS} -U__STRICT_ANSI__" - CPPFLAGS="${CPPFLAGS} -DWIN32 -D_WIN32" - use_winsock_sockets=yes]) - -AM_CONDITIONAL([WINSOCK_SOCKETS], [test "x$use_winsock_sockets" = "xyes"]) - -dnl Libtool setup. - -LT_PREREQ([2.2.6]) -LT_INIT([win32-dll]) - -dnl Check for compiler specifics. - -AC_CXX_COMPILER_VENDOR([ac_cxx_compiler_vendor]) - -AS_CASE([$ac_cxx_compiler_vendor], - [gnu], - [AS_IF([test "x$enable_warnings" = "xyes"], - [AX_CXXFLAGS_GCC_OPTION([-Wall]) - AX_CXXFLAGS_GCC_OPTION([-Wextra]) - dnl The -ansi flag removes declarations of some useful functions - dnl from headers. - dnl AX_CXXFLAGS_GCC_OPTION([-ansi]) - AX_CXXFLAGS_GCC_OPTION([-pedantic]) - AX_CXXFLAGS_GCC_OPTION([-Wshadow])]) - - AS_IF([test "x$enable_debugging" = "xyes"], - [AX_CXXFLAGS_GCC_OPTION([-g3]) - AX_CXXFLAGS_GCC_OPTION([-fkeep-inline-functions])], - [AX_CXXFLAGS_GCC_OPTION([-O2])]) - - dnl The --enable-auto-import and --enable-runtime-pseudo-reloc - dnl options are required for log4cplus to work when compiled with - dnl Cygwin's GCC 4.3.x. - AS_CASE(["$target_os"], - [cygwin*|mingw*], - [LDFLAGS="${LDFLAGS} -Wl,--enable-auto-import" - LDFLAGS="${LDFLAGS} -Wl,--enable-runtime-pseudo-reloc"])], - - [sun], - [AS_IF([test "x$enable_warnings" = "xyes"], - [AX_CXXFLAGS_SUN_OPTION([+w])]) - AX_CXXFLAGS_SUN_OPTION([-library=stlport4]) - AX_CXXFLAGS_SUN_OPTION([-library=Crun])]) - -AX_DECLSPEC([LOG4CPLUS_DECLSPEC]) -AS_IF([test "x$ac_cv_declspec" = "xyes" || test "x$ac_cv__attribute__visibility" = "xyes"], - [AS_CASE([$ac_cxx_compiler_vendor], - [gnu], - [AS_IF([test "x$ac_cv_declspec" = "xyes" || test "x$ac_cv__attribute__visibility" = "xyes"], - [AX_CXXFLAGS_GCC_OPTION([-fvisibility=hidden])])])]) - -dnl Checks for libraries. - -AC_SEARCH_LIBS([strerror], [cposix]) -AC_SEARCH_LIBS([clock_gettime], [posix4]) -AC_SEARCH_LIBS([nanosleep], [rt]) -AC_SEARCH_LIBS([gethostent], [nsl]) -AC_SEARCH_LIBS([setsockopt], [socket]) - -dnl Windows/MinGW specific. - -AC_LANG_PUSH([C]) -AC_HAVE_LIBRARY([kernel32]) -AC_HAVE_LIBRARY([advapi32]) -AC_HAVE_LIBRARY([ws2_32]) -AC_LANG_POP([C]) - -dnl Checks for header files. - -AC_HEADER_STDC - -LOG4CPLUS_CHECK_HEADER([sys/types.h], [LOG4CPLUS_HAVE_SYS_TYPES_H]) -LOG4CPLUS_CHECK_HEADER([sys/socket.h], [LOG4CPLUS_HAVE_SYS_SOCKET_H]) -LOG4CPLUS_CHECK_HEADER([sys/time.h], [LOG4CPLUS_HAVE_SYS_TIME_H]) -LOG4CPLUS_CHECK_HEADER([sys/timeb.h], [LOG4CPLUS_HAVE_SYS_TIMEB_H]) -LOG4CPLUS_CHECK_HEADER([sys/stat.h], [LOG4CPLUS_HAVE_SYS_STAT_H]) -LOG4CPLUS_CHECK_HEADER([syslog.h], [LOG4CPLUS_HAVE_SYSLOG_H]) -LOG4CPLUS_CHECK_HEADER([netinet/in.h], [LOG4CPLUS_HAVE_NETINET_IN_H]) -LOG4CPLUS_CHECK_HEADER([netdb.h], [LOG4CPLUS_HAVE_NETDB_H]) -LOG4CPLUS_CHECK_HEADER([unistd.h], [LOG4CPLUS_HAVE_UNISTD_H]) -LOG4CPLUS_CHECK_HEADER([stdio.h], [LOG4CPLUS_HAVE_STDIO_H]) -LOG4CPLUS_CHECK_HEADER([wchar.h], [LOG4CPLUS_HAVE_WCHAR_H]) -LOG4CPLUS_CHECK_HEADER([stdarg.h], [LOG4CPLUS_HAVE_STDARG_H]) -LOG4CPLUS_CHECK_HEADER([time.h], [LOG4CPLUS_HAVE_TIME_H]) -LOG4CPLUS_CHECK_HEADER([errno.h], [LOG4CPLUS_HAVE_ERRNO_H]) - -dnl Checks for library functions. - -LOG4CPLUS_CHECK_FUNCS([gmtime_r], [LOG4CPLUS_HAVE_GMTIME_R]) -LOG4CPLUS_CHECK_FUNCS([localtime_r], [LOG4CPLUS_HAVE_LOCALTIME_R]) -LOG4CPLUS_CHECK_FUNCS([gettimeofday], [LOG4CPLUS_HAVE_GETTIMEOFDAY]) -LOG4CPLUS_CHECK_FUNCS([clock_gettime], [LOG4CPLUS_HAVE_CLOCK_GETTIME]) -LOG4CPLUS_CHECK_FUNCS([getpid], [LOG4CPLUS_HAVE_GETPID]) -LOG4CPLUS_CHECK_FUNCS([ftime], [LOG4CPLUS_HAVE_FTIME]) -LOG4CPLUS_CHECK_FUNCS([stat], [LOG4CPLUS_HAVE_STAT]) -LOG4CPLUS_CHECK_FUNCS([lstat], [LOG4CPLUS_HAVE_LSTAT]) -LOG4CPLUS_CHECK_FUNCS([htons], [LOG4CPLUS_HAVE_HTONS]) -LOG4CPLUS_CHECK_FUNCS([ntohs], [LOG4CPLUS_HAVE_NTOHS]) -LOG4CPLUS_CHECK_FUNCS([htonl], [LOG4CPLUS_HAVE_HTONL]) -LOG4CPLUS_CHECK_FUNCS([ntohl], [LOG4CPLUS_HAVE_NTOHL]) - -AH_TEMPLATE([LOG4CPLUS_HAVE_ENAMETOOLONG]) -AC_CACHE_CHECK([for ENAMETOOLONG], [ax_cv_have_enametoolong], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include ], [int value = ENAMETOOLONG;])], - [ax_cv_have_enametoolong=yes], - [ax_cv_have_enametoolong=no])]) -AS_IF([test "x$ax_cv_have_enametoolong" = "xyes"], - [AC_DEFINE([LOG4CPLUS_HAVE_ENAMETOOLONG])]) - -AH_TEMPLATE([LOG4CPLUS_HAVE_GETADDRINFO]) -AX_GETADDRINFO -AS_IF([test "x$ax_cv_have_getaddrinfo" = "xyes"], - [AC_DEFINE([LOG4CPLUS_HAVE_GETADDRINFO])]) - -AH_TEMPLATE([LOG4CPLUS_HAVE_GETHOSTBYNAME_R]) -AX_GETHOSTBYNAME_R -AS_IF([test "x$ax_cv_have_gethostbyname_r" = "xyes"], - [AC_DEFINE([LOG4CPLUS_HAVE_GETHOSTBYNAME_R])]) - -dnl Check for the existance of type socklen_t. -TYPE_SOCKLEN_T - - -dnl Check for single-threaded compilation - -AH_TEMPLATE([LOG4CPLUS_USE_PTHREADS]) - -AC_ARG_ENABLE([threads], - [AS_HELP_STRING([--enable-threads=yes/no], - [Use this option to create a singled-threaded version of this library])], - [AS_CASE(["${enableval}"], - [yes], [], - [no], [], - [AC_MSG_ERROR([bad value ${enableval} for --enable-threads])])], - [enable_threads=yes]) - -AS_IF([test x$enable_threads = xyes], - [AC_MSG_NOTICE([Creating a multi-threaded library.]) - - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - - AS_CASE(["$target_os"], - [mingw*], [], - [ACX_PTHREAD([], - [AC_MSG_ERROR([Requested threads support but no threads were found.])])]) - - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS"], - - [AC_MSG_NOTICE([Creating a single-threaded library]) - AC_DEFINE([LOG4CPLUS_SINGLE_THREADED], [1], - [Define if this is a single-threaded library.])]) - -AM_CONDITIONAL([MULTI_THREADED], [test x$enable_threads = xyes]) - -AH_TOP([#ifndef LOG4CPLUS_CONFIG_H]) -AH_TOP([#define LOG4CPLUS_CONFIG_H]) -AH_BOTTOM([#endif // LOG4CPLUS_CONFIG_H]) - -AC_CONFIG_HEADERS([include/log4cplus/config.h]) -AC_CONFIG_HEADERS([include/log4cplus/config/defines.hxx]) -AC_CONFIG_FILES([Makefile - include/Makefile - src/Makefile - loggingserver/Makefile - tests/Makefile - tests/appender_test/Makefile - tests/configandwatch_test/Makefile - tests/customloglevel_test/Makefile - tests/fileappender_test/Makefile - tests/filter_test/Makefile - tests/hierarchy_test/Makefile - tests/loglog_test/Makefile - tests/ndc_test/Makefile - tests/ostream_test/Makefile - tests/patternlayout_test/Makefile - tests/performance_test/Makefile - tests/priority_test/Makefile - tests/propertyconfig_test/Makefile - tests/socket_test/Makefile - tests/thread_test/Makefile - tests/timeformat_test/Makefile]) -AC_OUTPUT diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/depcomp b/src/3rd_party/log4cplus/log4cplus-1.0.4/depcomp deleted file mode 100644 index df8eea7e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/depcomp +++ /dev/null @@ -1,630 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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 outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -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" - -# 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 - -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 -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## 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). -## - 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 -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## 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. - tr ' ' ' -' < "$tmpdepfile" | -## 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. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -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 -eq 0; then : - else - 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 ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" - echo >> "$depfile" - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - 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 -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - 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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - 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 -eq 0; then : - else - 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,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - echo "#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. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # 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.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#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:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - 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" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - 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:: \1 \\:p' >> "$depfile" - echo " " >> "$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/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.am deleted file mode 100644 index 8f4018e2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -log4cplusincdir = $(includedir) -nobase_log4cplusinc_HEADERS = \ - log4cplus/appender.h \ - log4cplus/config.hxx \ - log4cplus/config/win32.h \ - log4cplus/config/macosx.h \ - log4cplus/config/defines.hxx \ - log4cplus/configurator.h \ - log4cplus/consoleappender.h \ - log4cplus/fileappender.h \ - log4cplus/fstreams.h \ - log4cplus/hierarchy.h \ - log4cplus/hierarchylocker.h \ - log4cplus/layout.h \ - log4cplus/logger.h \ - log4cplus/loggingmacros.h \ - log4cplus/loglevel.h \ - log4cplus/ndc.h \ - log4cplus/nullappender.h \ - log4cplus/socketappender.h \ - log4cplus/streams.h \ - log4cplus/syslogappender.h \ - log4cplus/tstring.h \ - log4cplus/version.h \ - log4cplus/helpers/appenderattachableimpl.h \ - log4cplus/helpers/loglog.h \ - log4cplus/helpers/logloguser.h \ - log4cplus/helpers/pointer.h \ - log4cplus/helpers/property.h \ - log4cplus/helpers/sleep.h \ - log4cplus/helpers/socketbuffer.h \ - log4cplus/helpers/socket.h \ - log4cplus/helpers/stringhelper.h \ - log4cplus/helpers/syncprims.h \ - log4cplus/helpers/syncprims-pthreads.h \ - log4cplus/helpers/thread-config.h \ - log4cplus/helpers/threads.h \ - log4cplus/helpers/timehelper.h \ - log4cplus/spi/appenderattachable.h \ - log4cplus/spi/factory.h \ - log4cplus/spi/filter.h \ - log4cplus/spi/loggerfactory.h \ - log4cplus/spi/loggerimpl.h \ - log4cplus/spi/loggingevent.h \ - log4cplus/spi/objectregistry.h \ - log4cplus/spi/rootlogger.h diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.in deleted file mode 100644 index 3b35f2a2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/Makefile.in +++ /dev/null @@ -1,526 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -subdir = include -DIST_COMMON = $(nobase_log4cplusinc_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -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__installdirs = "$(DESTDIR)$(log4cplusincdir)" -HEADERS = $(nobase_log4cplusinc_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -log4cplusincdir = $(includedir) -nobase_log4cplusinc_HEADERS = \ - log4cplus/appender.h \ - log4cplus/config.hxx \ - log4cplus/config/win32.h \ - log4cplus/config/macosx.h \ - log4cplus/config/defines.hxx \ - log4cplus/configurator.h \ - log4cplus/consoleappender.h \ - log4cplus/fileappender.h \ - log4cplus/fstreams.h \ - log4cplus/hierarchy.h \ - log4cplus/hierarchylocker.h \ - log4cplus/layout.h \ - log4cplus/logger.h \ - log4cplus/loggingmacros.h \ - log4cplus/loglevel.h \ - log4cplus/ndc.h \ - log4cplus/nullappender.h \ - log4cplus/socketappender.h \ - log4cplus/streams.h \ - log4cplus/syslogappender.h \ - log4cplus/tstring.h \ - log4cplus/version.h \ - log4cplus/helpers/appenderattachableimpl.h \ - log4cplus/helpers/loglog.h \ - log4cplus/helpers/logloguser.h \ - log4cplus/helpers/pointer.h \ - log4cplus/helpers/property.h \ - log4cplus/helpers/sleep.h \ - log4cplus/helpers/socketbuffer.h \ - log4cplus/helpers/socket.h \ - log4cplus/helpers/stringhelper.h \ - log4cplus/helpers/syncprims.h \ - log4cplus/helpers/syncprims-pthreads.h \ - log4cplus/helpers/thread-config.h \ - log4cplus/helpers/threads.h \ - log4cplus/helpers/timehelper.h \ - log4cplus/spi/appenderattachable.h \ - log4cplus/spi/factory.h \ - log4cplus/spi/filter.h \ - log4cplus/spi/loggerfactory.h \ - log4cplus/spi/loggerimpl.h \ - log4cplus/spi/loggingevent.h \ - log4cplus/spi/objectregistry.h \ - log4cplus/spi/rootlogger.h - -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 include/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu 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-nobase_log4cplusincHEADERS: $(nobase_log4cplusinc_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(log4cplusincdir)" || $(MKDIR_P) "$(DESTDIR)$(log4cplusincdir)" - @list='$(nobase_log4cplusinc_HEADERS)'; test -n "$(log4cplusincdir)" || list=; \ - $(am__nobase_list) | while read dir files; do \ - xfiles=; for file in $$files; do \ - if test -f "$$file"; then xfiles="$$xfiles $$file"; \ - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ - test -z "$$xfiles" || { \ - test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(log4cplusincdir)/$$dir'"; \ - $(MKDIR_P) "$(DESTDIR)$(log4cplusincdir)/$$dir"; }; \ - echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(log4cplusincdir)/$$dir'"; \ - $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(log4cplusincdir)/$$dir" || exit $$?; }; \ - done - -uninstall-nobase_log4cplusincHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nobase_log4cplusinc_HEADERS)'; test -n "$(log4cplusincdir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(log4cplusincdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(log4cplusincdir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(log4cplusincdir)"; 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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 distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-nobase_log4cplusincHEADERS - -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: uninstall-nobase_log4cplusincHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags 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-nobase_log4cplusincHEADERS \ - 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 uninstall uninstall-am \ - uninstall-nobase_log4cplusincHEADERS - - -# 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/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/appender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/appender.h deleted file mode 100644 index 591ec631..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/appender.h +++ /dev/null @@ -1,212 +0,0 @@ -// Module: Log4CPLUS -// File: appender.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_APPENDER_HEADER_ -#define _LOG4CPLUS_APPENDER_HEADER_ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - - -namespace log4cplus { - - /** - * This class is used to "handle" errors encountered in an {@link - * log4cplus::Appender}. - */ - class LOG4CPLUS_EXPORT ErrorHandler { - public: - virtual ~ErrorHandler(); - virtual void error(const log4cplus::tstring& err) = 0; - virtual void reset() = 0; - }; - - - - class LOG4CPLUS_EXPORT OnlyOnceErrorHandler : public ErrorHandler, - protected log4cplus::helpers::LogLogUser - { - public: - // Ctor - OnlyOnceErrorHandler() : firstTime(true){} - - virtual void error(const log4cplus::tstring& err); - virtual void reset(); - - private: - bool firstTime; - }; - - - /** - * Extend this class for implementing your own strategies for printing log - * statements. - */ - class LOG4CPLUS_EXPORT Appender - : public virtual log4cplus::helpers::SharedObject - , protected log4cplus::helpers::LogLogUser - - { - public: - // Ctor - Appender(); - Appender(const log4cplus::helpers::Properties properties); - - // Dtor - virtual ~Appender(); - - void destructorImpl(); - - // Methods - /** - * Release any resources allocated within the appender such as file - * handles, network connections, etc. - * - * It is a programming error to append to a closed appender. - */ - virtual void close() = 0; - - /** - * This method performs threshold checks and invokes filters before - * delegating actual logging to the subclasses specific {@link - * #append} method. - */ - void doAppend(const log4cplus::spi::InternalLoggingEvent& event); - - /** - * Get the name of this appender. The name uniquely identifies the - * appender. - */ - virtual log4cplus::tstring getName(); - - /** - * Set the name of this appender. The name is used by other - * components to identify this appender. - */ - virtual void setName(const log4cplus::tstring& name); - - /** - * Set the {@link ErrorHandler} for this Appender. - */ - virtual void setErrorHandler(std::auto_ptr eh); - - /** - * Return the currently set {@link ErrorHandler} for this - * Appender. - */ - virtual ErrorHandler* getErrorHandler(); - - /** - * Set the layout for this appender. Note that some appenders have - * their own (fixed) layouts or do not use one. For example, the - * SocketAppender ignores the layout set here. - */ - virtual void setLayout(std::auto_ptr layout); - - /** - * Returns the layout of this appender. The value may be NULL. - * - * This class owns the returned pointer. - */ - virtual Layout* getLayout(); - - /** - * Set the filter chain on this Appender. - */ - void setFilter(log4cplus::spi::FilterPtr f) { filter = f; } - - /** - * Get the filter chain on this Appender. - */ - log4cplus::spi::FilterPtr getFilter() const { return filter; } - - /** - * Returns this appenders threshold LogLevel. See the {@link - * #setThreshold} method for the meaning of this option. - */ - LogLevel getThreshold() const { return threshold; } - - /** - * Set the threshold LogLevel. All log events with lower LogLevel - * than the threshold LogLevel are ignored by the appender. - * - * In configuration files this option is specified by setting the - * value of the Threshold option to a LogLevel - * string, such as "DEBUG", "INFO" and so on. - */ - void setThreshold(LogLevel th) { threshold = th; } - - /** - * Check whether the message LogLevel is below the appender's - * threshold. If there is no threshold set, then the return value is - * always true. - */ - bool isAsSevereAsThreshold(LogLevel ll) const { - return ((ll != NOT_SET_LOG_LEVEL) && (ll >= threshold)); - } - - protected: - // Methods - /** - * Subclasses of Appender should implement this - * method to perform actual logging. - * @see doAppend method. - */ - virtual void append(const log4cplus::spi::InternalLoggingEvent& event) = 0; - - // Data - /** The layout variable does not need to be set if the appender - * implementation has its own layout. */ - std::auto_ptr layout; - - /** Appenders are named. */ - log4cplus::tstring name; - - /** There is no LogLevel threshold filtering by default. */ - LogLevel threshold; - - /** The first filter in the filter chain. Set to null - * initially. */ - log4cplus::spi::FilterPtr filter; - - /** It is assumed and enforced that errorHandler is never null. */ - std::auto_ptr errorHandler; - - /** Is this appender closed? */ - bool closed; - }; - - /** This is a pointer to an Appender. */ - typedef helpers::SharedObjectPtr SharedAppenderPtr; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.h.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.h.in deleted file mode 100644 index 17c7877a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.h.in +++ /dev/null @@ -1,230 +0,0 @@ -/* include/log4cplus/config.h.in. Generated from configure.in by autoheader. */ - -#ifndef LOG4CPLUS_CONFIG_H - -#define LOG4CPLUS_CONFIG_H - -/* Define to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `ftime' function. */ -#undef HAVE_FTIME - -/* */ -#undef HAVE_GETADDRINFO - -/* */ -#undef HAVE_GETHOSTBYNAME_R - -/* Define to 1 if you have the `getpid' function. */ -#undef HAVE_GETPID - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the `htonl' function. */ -#undef HAVE_HTONL - -/* Define to 1 if you have the `htons' function. */ -#undef HAVE_HTONS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `advapi32' library (-ladvapi32). */ -#undef HAVE_LIBADVAPI32 - -/* Define to 1 if you have the `kernel32' library (-lkernel32). */ -#undef HAVE_LIBKERNEL32 - -/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ -#undef HAVE_LIBWS2_32 - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the `lstat' function. */ -#undef HAVE_LSTAT - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `ntohl' function. */ -#undef HAVE_NTOHL - -/* Define to 1 if you have the `ntohs' function. */ -#undef HAVE_NTOHS - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Define to 1 if you have the `stat' function. */ -#undef HAVE_STAT - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Defined for --enable-debugging builds. */ -#undef LOG4CPLUS_DEBUGGING - -/* Defined if the compiler understands __declspec(dllimport) or - __attribute__((visibility("default"))) construct. */ -#undef LOG4CPLUS_DECLSPEC_EXPORT - -/* Defined if the compiler understands __declspec(dllexport) or construct. */ -#undef LOG4CPLUS_DECLSPEC_IMPORT - -/* */ -#undef LOG4CPLUS_HAVE_CLOCK_GETTIME - -/* */ -#undef LOG4CPLUS_HAVE_ENAMETOOLONG - -/* */ -#undef LOG4CPLUS_HAVE_ERRNO_H - -/* */ -#undef LOG4CPLUS_HAVE_FTIME - -/* */ -#undef LOG4CPLUS_HAVE_GETADDRINFO - -/* */ -#undef LOG4CPLUS_HAVE_GETHOSTBYNAME_R - -/* */ -#undef LOG4CPLUS_HAVE_GETPID - -/* */ -#undef LOG4CPLUS_HAVE_GETTIMEOFDAY - -/* */ -#undef LOG4CPLUS_HAVE_GMTIME_R - -/* */ -#undef LOG4CPLUS_HAVE_HTONL - -/* */ -#undef LOG4CPLUS_HAVE_HTONS - -/* */ -#undef LOG4CPLUS_HAVE_LOCALTIME_R - -/* */ -#undef LOG4CPLUS_HAVE_LSTAT - -/* */ -#undef LOG4CPLUS_HAVE_NETDB_H - -/* */ -#undef LOG4CPLUS_HAVE_NETINET_IN_H - -/* */ -#undef LOG4CPLUS_HAVE_NTOHL - -/* */ -#undef LOG4CPLUS_HAVE_NTOHS - -/* */ -#undef LOG4CPLUS_HAVE_STAT - -/* */ -#undef LOG4CPLUS_HAVE_STDARG_H - -/* */ -#undef LOG4CPLUS_HAVE_STDIO_H - -/* */ -#undef LOG4CPLUS_HAVE_SYSLOG_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_SOCKET_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_STAT_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TIMEB_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TIME_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TYPES_H - -/* */ -#undef LOG4CPLUS_HAVE_TIME_H - -/* */ -#undef LOG4CPLUS_HAVE_UNISTD_H - -/* */ -#undef LOG4CPLUS_HAVE_WCHAR_H - -/* Define if this is a single-threaded library. */ -#undef LOG4CPLUS_SINGLE_THREADED - -/* */ -#undef LOG4CPLUS_USE_PTHREADS - -/* Define for compilers/standard libraries that support more than just the "C" - locale. */ -#undef LOG4CPLUS_WORKING_LOCALE - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to int if undefined. */ -#undef socklen_t - -#endif // LOG4CPLUS_CONFIG_H diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.hxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.hxx deleted file mode 100644 index 85f1649f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config.hxx +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (C) 2009, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -#ifndef LOG4CPLUS_CONFIG_HXX -#define LOG4CPLUS_CONFIG_HXX - - -#if defined (_WIN32) -# include -#elif (defined(__MWERKS__) && defined(__MACOS__)) -# include -#else -# include -#endif - -#if !defined(_WIN32) -# if !defined(LOG4CPLUS_SINGLE_THREADED) -# define LOG4CPLUS_USE_PTHREADS -# endif -# if defined (INSIDE_LOG4CPLUS) -# define LOG4CPLUS_EXPORT LOG4CPLUS_DECLSPEC_EXPORT -# else -# define LOG4CPLUS_EXPORT LOG4CPLUS_DECLSPEC_IMPORT -# endif // defined (INSIDE_LOG4CPLUS) -#endif // !_WIN32 - -#include - - -#endif // LOG4CPLUS_CONFIG_HXX diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/defines.hxx.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/defines.hxx.in deleted file mode 100644 index 5bd9538a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/defines.hxx.in +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef LOG4CPLUS_CONFIG_DEFINES_HXX -#define LOG4CPLUS_CONFIG_DEFINES_HXX - -/* */ -#undef LOG4CPLUS_HAVE_SYSLOG_H - -/* */ -#undef LOG4CPLUS_HAVE_NETINET_IN_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TYPES_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_SOCKET_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_STAT_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TIMEB_H - -/* */ -#undef LOG4CPLUS_HAVE_SYS_TIME_H - -/* */ -#undef LOG4CPLUS_HAVE_TIME_H - -/* */ -#undef LOG4CPLUS_HAVE_NETDB_H - -/* */ -#undef LOG4CPLUS_HAVE_UNISTD_H - -/* */ -#undef LOG4CPLUS_HAVE_ERRNO_H - -/* */ -#undef LOG4CPLUS_HAVE_STDARG_H - -/* */ -#undef LOG4CPLUS_HAVE_STDIO_H - -/* */ -#undef LOG4CPLUS_HAVE_WCHAR_H - -/* */ -#undef LOG4CPLUS_HAVE_FTIME - -/* */ -#undef LOG4CPLUS_HAVE_GETADDRINFO - -/* */ -#undef LOG4CPLUS_HAVE_GETHOSTBYNAME_R - -/* */ -#undef LOG4CPLUS_HAVE_GETPID - -/* */ -#undef LOG4CPLUS_HAVE_GETTIMEOFDAY - -/* */ -#undef LOG4CPLUS_HAVE_GMTIME_R - -/* */ -#undef LOG4CPLUS_HAVE_HTONL - -/* */ -#undef LOG4CPLUS_HAVE_HTONS - -/* */ -#undef LOG4CPLUS_HAVE_LOCALTIME_R - -/* */ -#undef LOG4CPLUS_HAVE_LSTAT - -/* */ -#undef LOG4CPLUS_HAVE_NTOHL - -/* */ -#undef LOG4CPLUS_HAVE_NTOHS - -/* */ -#undef LOG4CPLUS_HAVE_STAT - -/* Define if this is a single-threaded library. */ -#undef LOG4CPLUS_SINGLE_THREADED - -/* */ -#undef LOG4CPLUS_USE_PTHREADS - -/* Define for compilers/standard libraries that support more than just the "C" - locale. */ -#undef LOG4CPLUS_WORKING_LOCALE - -/* Define to int if undefined. */ -#undef socklen_t - -/* Defined for --enable-debugging builds. */ -#undef LOG4CPLUS_DEBUGGING - -/* Defined if the compiler understands __declspec(export) or __attribute__((export)) construct. */ -#undef LOG4CPLUS_DECLSPEC_EXPORT - -/* Defined if the compiler understands __declspec(import) or __attribute__((import)) construct. */ -#undef LOG4CPLUS_DECLSPEC_IMPORT - -/* Defined if the host OS provides ENAMETOOLONG errno value. */ -#undef LOG4CPLUS_HAVE_ENAMETOOLONG - -/* Define to 1 if you have the `clock_gettime' function. */ -#undef LOG4CPLUS_HAVE_CLOCK_GETTIME - -#endif // LOG4CPLUS_CONFIG_DEFINES_HXX diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/macosx.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/macosx.h deleted file mode 100644 index e526ab56..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/macosx.h +++ /dev/null @@ -1,25 +0,0 @@ -// Module: Log4CPLUS -// File: config-macosx.h -// Created: 7/2003 -// Author: Christopher R. Bailey -// -// -// Copyright (C) Tad E. Smith All rights reserved. -// -// This software is published under the terms of the Apache Software -// License version 1.1, a copy of which has been included with this -// distribution in the LICENSE.APL file. -// - -/** @file */ - -#ifndef LOG4CPLUS_CONFIG_MACOSX_HEADER_ -#define LOG4CPLUS_CONFIG_MACOSX_HEADER_ - -#if (defined(__APPLE__) || (defined(__MWERKS__) && defined(__MACOS__))) - -#define LOG4CPLUS_HAVE_GETTIMEOFDAY 1 -#define socklen_t int - -#endif // MACOSX -#endif // LOG4CPLUS_CONFIG_MACOSX_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/win32.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/win32.h deleted file mode 100644 index f15de86a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/config/win32.h +++ /dev/null @@ -1,96 +0,0 @@ -// Module: Log4CPLUS -// File: config-win32.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_CONFIG_WIN32_HEADER_ -#define LOG4CPLUS_CONFIG_WIN32_HEADER_ - -#ifdef _WIN32 -#include - -#if ! defined (_WIN32_WCE) -/* Define if you have the ftime function. */ -#define LOG4CPLUS_HAVE_FTIME 1 -#define LOG4CPLUS_HAVE_ERRNO_H -#define LOG4CPLUS_HAVE_SYS_STAT_H -#endif -#define LOG4CPLUS_HAVE_TIME_H -#define LOG4CPLUS_HAVE_STDLIB_H - -#if defined (_WIN32_WCE) -# define LOG4CPLUS_DLLMAIN_HINSTANCE HANDLE -# undef LOG4CPLUS_HAVE_NT_EVENT_LOG -#else -# define LOG4CPLUS_DLLMAIN_HINSTANCE HINSTANCE -# define LOG4CPLUS_HAVE_NT_EVENT_LOG -# define LOG4CPLUS_HAVE_WIN32_CONSOLE -#endif - -// Enable Win32DebugAppender -#define LOG4CPLUS_HAVE_OUTPUTDEBUGSTRING - -// log4cplus_EXPORTS is used by the CMake build system. DLL_EXPORT is -// used by the autotools build system. -#if (defined (log4cplus_EXPORTS) || defined (DLL_EXPORT)) \ - && ! defined (LOG4CPLUS_STATIC) -# undef LOG4CPLUS_BUILD_DLL -# define LOG4CPLUS_BUILD_DLL -#endif - -#if ! defined (LOG4CPLUS_BUILD_DLL) -# undef LOG4CPLUS_STATIC -# define LOG4CPLUS_STATIC -#endif - -#if defined (LOG4CPLUS_STATIC) && defined (LOG4CPLUS_BUILD_DLL) -# error LOG4CPLUS_STATIC and LOG4CPLUS_BUILD_DLL cannot be defined both. -#endif - -#if defined (LOG4CPLUS_BUILD_DLL) -# if defined (INSIDE_LOG4CPLUS) -# define LOG4CPLUS_EXPORT __declspec(dllexport) -# else -# define LOG4CPLUS_EXPORT __declspec(dllimport) -# endif -#else -# define LOG4CPLUS_EXPORT -#endif - -#ifndef LOG4CPLUS_SINGLE_THREADED -# define LOG4CPLUS_USE_WIN32_THREADS -#endif - -#if defined(_MSC_VER) - // Warning about: identifier was truncated to '255' characters in the debug information -# pragma warning( disable : 4786 ) - // Warning about: needs to have dll-interface to be used by clients of class -# pragma warning( disable : 4251 ) - -# if _MSC_VER >= 1400 && ! defined (_WIN32_WCE) -# define LOG4CPLUS_WORKING_LOCALE -# endif - -#endif - - -#endif // _WIN32 -#endif // LOG4CPLUS_CONFIG_WIN32_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/configurator.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/configurator.h deleted file mode 100644 index 62de401a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/configurator.h +++ /dev/null @@ -1,340 +0,0 @@ -// Module: Log4CPLUS -// File: configurator.h -// Created: 3/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _CONFIGURATOR_HEADER_ -#define _CONFIGURATOR_HEADER_ - -#include -#include -#include -#include -#include -#include -#include - -#include - - -namespace log4cplus -{ - - /** - * Provides configuration from an external file. See configure() for - * the expected format. - * - * All option values admit variable substitution. For - * example, if userhome environment property is set to - * /home/xyz and the File option is set to the string - * ${userhome}/test.log, then File option will be - * interpreted as the string /home/xyz/test.log. - * - * The syntax of variable substitution is similar to that of UNIX - * shells. The string between an opening "${" and - * closing "}" is interpreted as a key. Its value is - * searched in the environment properties. The corresponding value replaces - * the ${variableName} sequence. - */ - class LOG4CPLUS_EXPORT PropertyConfigurator - : protected log4cplus::helpers::LogLogUser - { - public: - enum PCFlags - { - fRecursiveExpansion = 0x0001, - fShadowEnvironment = 0x0002, - fAllowEmptyVars = 0x0004 - }; - - // ctor and dtor - PropertyConfigurator(const log4cplus::tstring& propertyFile, - Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0); - PropertyConfigurator(const log4cplus::helpers::Properties& props, - Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0); - PropertyConfigurator(log4cplus::tistream& propertyStream, - Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0); - virtual ~PropertyConfigurator(); - - /** - * This method eliminates the need to create a temporary - * PropertyConfigurator to configure log4cplus. - * It is equivalent to the following:
- * - * PropertyConfigurator config("filename"); - * config.configure(); - * - */ - static void doConfigure(const log4cplus::tstring& configFilename, - Hierarchy& h = Logger::getDefaultHierarchy(), unsigned flags = 0); - - /** - * Read configuration from a file. The existing configuration is - * not cleared nor reset. If you require a different behavior, - * then call {@link Hierarchy::resetConfiguration - * resetConfiguration} method before calling - * doConfigure. - * - * The configuration file consists of statements in the format - * key=value. The syntax of different configuration - * elements are discussed below. - * - *

Appender configuration

- * - * Appender configuration syntax is: - * 
-         * # For appender named appenderName, set its class.
-         * # Note: The appender name can contain dots.
-         * log4cplus.appender.appenderName=fully.qualified.name.of.appender.class
-         *
-         * # Set appender specific options.
-         * log4cplus.appender.appenderName.option1=value1
-         * ...
-         * log4cplus.appender.appenderName.optionN=valueN
-         *
- * - * For each named appender you can configure its {@link Layout}. The - * syntax for configuring an appender's layout is: - * 
-         * log4cplus.appender.appenderName.layout=fully.qualified.name.of.layout.class
-         * log4cplus.appender.appenderName.layout.option1=value1
-         * ....
-         * log4cplus.appender.appenderName.layout.optionN=valueN
-         *
- * - *

Configuring loggers

- * - * The syntax for configuring the root logger is: - * 
-         * log4cplus.rootLogger=[LogLevel], appenderName, appenderName, ...
-         *
- * - * This syntax means that an optional LogLevel value can - * be supplied followed by appender names separated by commas. - * - * The LogLevel value can consist of the string values FATAL, - * ERROR, WARN, INFO, DEBUG or a custom LogLevel value. - * - * If a LogLevel value is specified, then the root LogLevel is set - * to the corresponding LogLevel. If no LogLevel value is specified, - * then the root LogLevel remains untouched. - * - * The root logger can be assigned multiple appenders. - * - * Each appenderName (separated by commas) will be added to - * the root logger. The named appender is defined using the - * appender syntax defined above. - * - * For non-root loggers the syntax is almost the same: - * 
-         * log4cplus.logger.logger_name=[LogLevel|INHERITED], appenderName, appenderName, ...
-         *
- * - * The meaning of the optional LogLevel value is discussed above - * in relation to the root logger. In addition however, the value - * INHERITED can be specified meaning that the named logger should - * inherit its LogLevel from the logger hierarchy. - * - * By default loggers inherit their LogLevel from the - * hierarchy. However, if you set the LogLevel of a logger and - * later decide that that logger should inherit its LogLevel, then - * you should specify INHERITED as the value for the LogLevel value. - * - * Similar to the root logger syntax, each appenderName - * (separated by commas) will be attached to the named logger. - * - * See the appender - * additivity rule in the user manual for the meaning of the - * additivity flag. - * - * The user can override any of the {@link - * Hierarchy#disable} family of methods by setting the a key - * "log4cplus.disableOverride" to true or any value other - * than false. As in 
log4cplus.disableOverride=true
- * - *

Example

- * - * An example configuration is given below. - * - * 
-         *
-         * # Set options for appender named "A1".
-         * # Appender "A1" will be a SyslogAppender
-         * log4cplus.appender.A1=log4cplus::SyslogAppender
-         *
-         * # The syslog daemon resides on www.abc.net
-         * log4cplus.appender.A1.SyslogHost=www.abc.net
-         *
-         * # A1's layout is a PatternLayout, using the conversion pattern
-         * # %r %-5p %c{2} %M.%L %x - %m\n. Thus, the log output will
-         * # include # the relative time since the start of the application in
-         * # milliseconds, followed by the LogLevel of the log request,
-         * # followed by the two rightmost components of the logger name,
-         * # followed by the callers method name, followed by the line number,
-         * # the nested disgnostic context and finally the message itself.
-         * # Refer to the documentation of {@link PatternLayout} for further information
-         * # on the syntax of the ConversionPattern key.
-         * log4cplus.appender.A1.layout=log4cplus::PatternLayout
-         * log4cplus.appender.A1.layout.ConversionPattern=%-4r %-5p %c{2} %M.%L %x - %m\n
-         *
-         * # Set options for appender named "A2"
-         * # A2 should be a RollingFileAppender, with maximum file size of 10 MB
-         * # using at most one backup file. A2's layout is TTCC, using the
-         * # ISO8061 date format with context printing enabled.
-         * log4cplus.appender.A2=log4cplus::RollingFileAppender
-         * log4cplus.appender.A2.MaxFileSize=10MB
-         * log4cplus.appender.A2.MaxBackupIndex=1
-         * log4cplus.appender.A2.layout=log4cplus::TTCCLayout
-         * log4cplus.appender.A2.layout.ContextPrinting=enabled
-         * log4cplus.appender.A2.layout.DateFormat=ISO8601
-         *
-         * # Root logger set to DEBUG using the A2 appender defined above.
-         * log4cplus.rootLogger=DEBUG, A2
-         *
-         * # Logger definitions:
-         * # The SECURITY logger inherits is LogLevel from root. However, it's output
-         * # will go to A1 appender defined above. It's additivity is non-cumulative.
-         * log4cplus.logger.SECURITY=INHERIT, A1
-         * log4cplus.additivity.SECURITY=false
-         *
-         * # Only warnings or above will be logged for the logger "SECURITY.access".
-         * # Output will go to A1.
-         * log4cplus.logger.SECURITY.access=WARN
-         *
-         *
-         * # The logger "class.of.the.day" inherits its LogLevel from the
-         * # logger hierarchy.  Output will go to the appender's of the root
-         * # logger, A2 in this case.
-         * log4cplus.logger.class.of.the.day=INHERIT
-         *
- * - * Refer to the setOption method in each Appender and - * Layout for class specific options. - * - * Use the # character at the beginning of a line - * for comments. - */ - virtual void configure(); - - /** - * \return The return value is reference to Properties - * container of properties with the "log4cplus." - * prefix removed and references to other properties and/or - * environment variables expanded. - */ - log4cplus::helpers::Properties const & getProperties () const; - - /** - * \return The return value is a reference to log4cplus::tstring - * containing filename of properties source file. It will be - * string "UNAVAILABLE" if the PropertyConfigurator instance has been - * constructed using one of the other constructors that do not take - * filename as parameter. - */ - log4cplus::tstring const & getPropertyFilename () const; - - protected: - // Methods - void init(); // called by the ctor - void reconfigure(); - void replaceEnvironVariables(); - void configureLoggers(); - void configureLogger(log4cplus::Logger logger, const log4cplus::tstring& config); - void configureAppenders(); - void configureAdditivity(); - - virtual Logger getLogger(const log4cplus::tstring& name); - virtual void addAppender(Logger &logger, log4cplus::SharedAppenderPtr& appender); - - // Types - typedef std::map AppenderMap; - - // Data - Hierarchy& h; - log4cplus::tstring propertyFilename; - log4cplus::helpers::Properties properties; - AppenderMap appenders; - unsigned flags; - - private: - // Disable copy - PropertyConfigurator(const PropertyConfigurator&); - PropertyConfigurator& operator=(PropertyConfigurator&); - }; - - - - /** - * Use this class to quickly configure the package. For file based - * configuration see PropertyConfigurator. BasicConfigurator - * automatically attaches ConsoleAppender to - * rootLogger, with output going to standard output, - * using DEBUG LogLevel value. - */ - class LOG4CPLUS_EXPORT BasicConfigurator : public PropertyConfigurator { - public: - // ctor and dtor - BasicConfigurator(Hierarchy& h = Logger::getDefaultHierarchy()); - virtual ~BasicConfigurator(); - - /** - * This method eliminates the need to create a temporary - * BasicConfigurator object to configure log4cplus. - * It is equivalent to the following:
- * 
-         * BasicConfigurator config;
-         * config.configure();
-         *
- */ - static void doConfigure(Hierarchy& h = Logger::getDefaultHierarchy()); - - private: - // Disable copy - BasicConfigurator(const BasicConfigurator&); - BasicConfigurator& operator=(BasicConfigurator&); - }; - - -#if !defined(LOG4CPLUS_SINGLE_THREADED) - // Forward Declarations - class ConfigurationWatchDogThread; - - - class LOG4CPLUS_EXPORT ConfigureAndWatchThread { - public: - // ctor and dtor - ConfigureAndWatchThread(const log4cplus::tstring& propertyFile, - unsigned int millis = 60 * 1000); - virtual ~ConfigureAndWatchThread(); - - private: - // Disallow copying of instances of this class - ConfigureAndWatchThread(const ConfigureAndWatchThread&); - ConfigureAndWatchThread& operator=(const ConfigureAndWatchThread&); - - // Data - ConfigurationWatchDogThread * watchDogThread; - }; -#endif - -} // end namespace log4cplus - -#endif // _CONFIGURATOR_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/consoleappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/consoleappender.h deleted file mode 100644 index b76ad952..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/consoleappender.h +++ /dev/null @@ -1,74 +0,0 @@ -// Module: Log4CPLUS -// File: consoleappender.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_CONSOLE_APPENDER_HEADER_ -#define _LOG4CPLUS_CONSOLE_APPENDER_HEADER_ - -#include -#include - -namespace log4cplus { - /** - * ConsoleAppender appends log events to std::cout or - * std::cerr using a layout specified by the - * user. The default target is std::cout. - * - *

Properties

- *
- *
logToStdErr
- *
When it is set true, the output stream will be - * std::cerr instead of std::cout.
- * - *
ImmediateFlush
- *
When it is set true, output stream will be flushed after - * each appended event.
- * - *
- */ - class LOG4CPLUS_EXPORT ConsoleAppender : public Appender { - public: - // Ctors - ConsoleAppender(bool logToStdErr = false, bool immediateFlush = false); - ConsoleAppender(const log4cplus::helpers::Properties properties); - - // Dtor - ~ConsoleAppender(); - - // Methods - virtual void close(); - - protected: - virtual void append(const spi::InternalLoggingEvent& event); - - // Data - bool logToStdErr; - /** - * Immediate flush means that the underlying output stream - * will be flushed at the end of each append operation. - */ - bool immediateFlush; - }; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_CONSOLE_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fileappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fileappender.h deleted file mode 100644 index 785f0b02..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fileappender.h +++ /dev/null @@ -1,237 +0,0 @@ -// Module: Log4CPLUS -// File: fileappender.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_FILE_APPENDER_HEADER_ -#define _LOG4CPLUS_FILE_APPENDER_HEADER_ - -#include -#include -#include -#include -#include - -#if defined(__DECCXX) -# define LOG4CPLUS_OPEN_MODE_TYPE LOG4CPLUS_FSTREAM_NAMESPACE::ios::open_mode -#else -# define LOG4CPLUS_OPEN_MODE_TYPE LOG4CPLUS_FSTREAM_NAMESPACE::ios::openmode -#endif - -namespace log4cplus { - - /** - * Appends log events to a file. - * - *

Properties

- *
- *
File
- *
This property specifies output file name.
- * - *
ImmediateFlush
- *
When it is set true, output stream will be flushed after - * each appended event.
- * - *
Append
- *
When it is set true, output file will be appended to - * instead of being truncated at opening.
- * - *
ReopenDelay
- *
This property sets a delay after which the appender will - * try to reopen log file again, after last logging failure. The - * default value is 1 second. Setting the delay to 0 makes the - * appender not to try reopening the stream. - *
- * - *
BufferSize
- *
Non-zero value of this property sets up buffering of output - * stream using a buffer of given size. - *
- *
- */ - class LOG4CPLUS_EXPORT FileAppender : public Appender { - public: - // Ctors - FileAppender(const log4cplus::tstring& filename, - LOG4CPLUS_OPEN_MODE_TYPE mode = LOG4CPLUS_FSTREAM_NAMESPACE::ios::trunc, - bool immediateFlush = true); - FileAppender(const log4cplus::helpers::Properties& properties, - LOG4CPLUS_OPEN_MODE_TYPE mode = LOG4CPLUS_FSTREAM_NAMESPACE::ios::trunc); - - // Dtor - virtual ~FileAppender(); - - // Methods - virtual void close(); - - protected: - virtual void append(const spi::InternalLoggingEvent& event); - - void open(LOG4CPLUS_OPEN_MODE_TYPE mode); - bool reopen(); - - // Data - /** - * Immediate flush means that the underlying writer or output stream - * will be flushed at the end of each append operation. Immediate - * flush is slower but ensures that each append request is actually - * written. If immediateFlush is set to - * false, then there is a good chance that the last few - * logs events are not actually written to persistent media if and - * when the application crashes. - * - * The immediateFlush variable is set to - * true by default. - */ - bool immediateFlush; - - /** - * When any append operation fails, reopenDelay says - * for how many seconds the next attempt to re-open the log file and - * resume logging will be delayed. If reopenDelay is zero, - * each failed append operation will cause log file to be re-opened. - * By default, reopenDelay is 1 second. - */ - int reopenDelay; - - unsigned long bufferSize; - log4cplus::tchar * buffer; - - log4cplus::tofstream out; - log4cplus::tstring filename; - - log4cplus::helpers::Time reopen_time; - - private: - void init(const log4cplus::tstring& filename, - LOG4CPLUS_OPEN_MODE_TYPE mode); - - // Disallow copying of instances of this class - FileAppender(const FileAppender&); - FileAppender& operator=(const FileAppender&); - }; - - - - /** - * RollingFileAppender extends FileAppender to backup the log - * files when they reach a certain size. - * - *

Properties

- *

Properties additional to {@link FileAppender}'s properties: - * - *

- *
MaxFileSize
- *
This property specifies maximal size of output file. The - * value is in bytes. It is possible to use MB and - * KB suffixes to specify the value in megabytes or - * kilobytes instead.
- * - *
MaxBackupIndex
- *
This property limits the number of backup output - * files; e.g. how many log.1, log.2 etc. files - * will be kept.
- *
- */ - class LOG4CPLUS_EXPORT RollingFileAppender : public FileAppender { - public: - // Ctors - RollingFileAppender(const log4cplus::tstring& filename, - long maxFileSize = 10*1024*1024, // 10 MB - int maxBackupIndex = 1, - bool immediateFlush = true); - RollingFileAppender(const log4cplus::helpers::Properties& properties); - - // Dtor - virtual ~RollingFileAppender(); - - protected: - virtual void append(const spi::InternalLoggingEvent& event); - void rollover(); - - // Data - long maxFileSize; - int maxBackupIndex; - - private: - void init(long maxFileSize, int maxBackupIndex); - }; - - - - enum DailyRollingFileSchedule { MONTHLY, WEEKLY, DAILY, - TWICE_DAILY, HOURLY, MINUTELY}; - - /** - * DailyRollingFileAppender extends {@link FileAppender} so that the - * underlying file is rolled over at a user chosen frequency. - * - *

Properties

- *

Properties additional to {@link FileAppender}'s properties: - * - *

- *
Schedule
- *
This property specifies rollover schedule. The possible - * values are MONTHLY, WEEKLY, DAILY, - * TWICE_DAILY, HOURLY and - * MINUTELY.
- * - *
MaxBackupIndex
- *
This property limits how many backup files are kept per - * single logging period; e.g. how many log.2009-11-07.1, - * log.2009-11-07.2 etc. files are kept.
- * - *
- */ - class LOG4CPLUS_EXPORT DailyRollingFileAppender : public FileAppender { - public: - // Ctors - DailyRollingFileAppender(const log4cplus::tstring& filename, - DailyRollingFileSchedule schedule = DAILY, - bool immediateFlush = true, - int maxBackupIndex = 10); - DailyRollingFileAppender(const log4cplus::helpers::Properties& properties); - - // Dtor - virtual ~DailyRollingFileAppender(); - - // Methods - virtual void close(); - - protected: - virtual void append(const spi::InternalLoggingEvent& event); - void rollover(); - log4cplus::helpers::Time calculateNextRolloverTime(const log4cplus::helpers::Time& t) const; - log4cplus::tstring getFilename(const log4cplus::helpers::Time& t) const; - - // Data - DailyRollingFileSchedule schedule; - log4cplus::tstring scheduledFilename; - log4cplus::helpers::Time nextRolloverTime; - int maxBackupIndex; - - private: - void init(DailyRollingFileSchedule schedule); - }; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_FILE_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fstreams.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fstreams.h deleted file mode 100644 index 5a25790a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/fstreams.h +++ /dev/null @@ -1,50 +0,0 @@ -// Module: Log4CPLUS -// File: fstreams.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_FSTREAMS_HEADER_ -#define LOG4CPLUS_FSTREAMS_HEADER_ - -#include - -#include - -#if defined(__DECCXX) && !defined(__USE_STD_IOSTREAM) -# define LOG4CPLUS_FSTREAM_NAMESPACE -#else -# define LOG4CPLUS_FSTREAM_NAMESPACE std -#endif - - -#ifdef UNICODE - namespace log4cplus { - typedef LOG4CPLUS_FSTREAM_NAMESPACE::wofstream tofstream; - typedef LOG4CPLUS_FSTREAM_NAMESPACE::wifstream tifstream; - } -#else - namespace log4cplus { - typedef LOG4CPLUS_FSTREAM_NAMESPACE::ofstream tofstream; - typedef LOG4CPLUS_FSTREAM_NAMESPACE::ifstream tifstream; - } -#endif // UNICODE - -#endif // LOG4CPLUS_FSTREAMS_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/appenderattachableimpl.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/appenderattachableimpl.h deleted file mode 100644 index 710232e4..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/appenderattachableimpl.h +++ /dev/null @@ -1,112 +0,0 @@ -// Module: Log4CPLUS -// File: appenderattachableimpl.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_APPENDER_ATTACHABLE_IMPL_HEADER_ -#define _LOG4CPLUS_HELPERS_APPENDER_ATTACHABLE_IMPL_HEADER_ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -namespace log4cplus { - namespace helpers { - - /** - * This Interface is for attaching Appenders to objects. - */ - class LOG4CPLUS_EXPORT AppenderAttachableImpl - : public log4cplus::spi::AppenderAttachable, - protected log4cplus::helpers::LogLogUser - { - public: - // Data - LOG4CPLUS_MUTEX_PTR_DECLARE appender_list_mutex; - - // Ctors - AppenderAttachableImpl(); - - // Dtor - virtual ~AppenderAttachableImpl(); - - // Methods - /** - * Add an appender. If the appender is already in the list in - * won't be added again. - */ - virtual void addAppender(SharedAppenderPtr newAppender); - - /** - * Get all previously added appenders as an vectory. - */ - virtual SharedAppenderPtrList getAllAppenders(); - - /** - * Look for an attached appender named as name. - * - * Return the appender with that name if in the list. Return null - * otherwise. - */ - virtual SharedAppenderPtr getAppender(const log4cplus::tstring& name); - - /** - * Remove all previously added appenders. - */ - virtual void removeAllAppenders(); - - /** - * Remove the appender passed as parameter from the list of appenders. - */ - virtual void removeAppender(SharedAppenderPtr appender); - - /** - * Remove the appender with the name passed as parameter from the - * list of appenders. - */ - virtual void removeAppender(const log4cplus::tstring& name); - - /** - * Call the doAppend method on all attached appenders. - */ - int appendLoopOnAppenders(const spi::InternalLoggingEvent& event) const; - - protected: - // Types - typedef std::vector ListType; - - // Data - /** Array of appenders. */ - ListType appenderList; - }; // end class AppenderAttachableImpl - - } // end namespace helpers -} // end namespace log4cplus - -#endif // _LOG4CPLUS_HELPERS_APPENDER_ATTACHABLE_IMPL_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/loglog.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/loglog.h deleted file mode 100644 index 595ab9a9..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/loglog.h +++ /dev/null @@ -1,113 +0,0 @@ -// Module: Log4CPLUS -// File: loglog.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_LOGLOG -#define _LOG4CPLUS_HELPERS_LOGLOG - -#include -#include -#include -#include - - -namespace log4cplus { - namespace helpers { - - /** - * This class used to output log statements from within the log4cplus package. - * - * Log4cplus components cannot make log4cplus logging calls. However, it is - * sometimes useful for the user to learn about what log4cplus is - * doing. You can enable log4cplus internal logging by defining the - * log4cplus.configDebug variable. - * - * All log4cplus internal debug calls go to cout - * where as internal error messages are sent to - * cerr. All internal messages are prepended with - * the string "log4clus: ". - */ - class LOG4CPLUS_EXPORT LogLog - : public virtual log4cplus::helpers::SharedObject - { - public: - // Static methods - /** - * Returns a reference to the LogLog singleton. - */ - static log4cplus::helpers::SharedObjectPtr getLogLog(); - - - /** - * Allows to enable/disable log4cplus internal logging. - */ - void setInternalDebugging(bool enabled); - - /** - * In quite mode no LogLog generates strictly no output, not even - * for errors. - * - * @param quietMode A true for not - */ - void setQuietMode(bool quietMode); - - /** - * This method is used to output log4cplus internal debug - * statements. Output goes to std::cout. - */ - void debug(const log4cplus::tstring& msg); - - /** - * This method is used to output log4cplus internal error - * statements. There is no way to disable error statements. - * Output goes to std::cerr. - */ - void error(const log4cplus::tstring& msg); - - /** - * This method is used to output log4cplus internal warning - * statements. There is no way to disable warning statements. - * Output goes to std::cerr. - */ - void warn(const log4cplus::tstring& msg); - - // Dtor - virtual ~LogLog(); - - // Data - LOG4CPLUS_MUTEX_PTR_DECLARE mutex; - - private: - // Data - bool debugEnabled; - bool quietMode; - - // Ctors - LogLog(); - LogLog(const LogLog&); - }; - - } // end namespace helpers -} // end namespace log4cplus - - -#endif // _LOG4CPLUS_HELPERS_LOGLOG - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/logloguser.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/logloguser.h deleted file mode 100644 index 2cbcb155..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/logloguser.h +++ /dev/null @@ -1,62 +0,0 @@ -// Module: Log4CPLUS -// File: logloguser.h -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_LOGLOG_USER -#define _LOG4CPLUS_HELPERS_LOGLOG_USER - -#include - - -namespace log4cplus { - namespace helpers { - // forward declarations - class LogLog; - - /** - * This class used to simplify the use of the LogLog class. Any class - * that uses the LogLog class should extend this class and retrieve - * their reference to LogLog using the method provided. - */ - class LOG4CPLUS_EXPORT LogLogUser { - public: - // ctor and dtor - LogLogUser(); - LogLogUser(const LogLogUser&); - virtual ~LogLogUser(); - - // public methods - LogLog& getLogLog() const; - - // operators - LogLogUser& operator=(const LogLogUser& rhs); - - private: - // Data - void* loglogRef; - }; - - } // end namespace helpers -} // end namespace log4cplus - - -#endif // _LOG4CPLUS_HELPERS_LOGLOG_USER - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/pointer.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/pointer.h deleted file mode 100644 index 52c1989c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/pointer.h +++ /dev/null @@ -1,160 +0,0 @@ -// Module: Log4CPLUS -// File: pointer.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// -// Note: Some of this code uses ideas from "More Effective C++" by Scott -// Myers, Addison Wesley Longmain, Inc., (c) 1996, Chapter 29, pp. 183-213 -// - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_POINTERS_HEADER_ -#define _LOG4CPLUS_HELPERS_POINTERS_HEADER_ - -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { - namespace helpers { - - /****************************************************************************** - * Class SharedObject (from pp. 204-205) * - ******************************************************************************/ - - class LOG4CPLUS_EXPORT SharedObject - { - public: - void addReference() const; - void removeReference() const; - - protected: - // Ctor - SharedObject() - : access_mutex(LOG4CPLUS_MUTEX_CREATE) - , count(0) - { } - - SharedObject(const SharedObject&) - : access_mutex(LOG4CPLUS_MUTEX_CREATE) - , count(0) - { } - - // Dtor - virtual ~SharedObject(); - - // Operators - SharedObject& operator=(const SharedObject&) { return *this; } - - public: - LOG4CPLUS_MUTEX_PTR_DECLARE access_mutex; - - private: - mutable int count; - }; - - - /****************************************************************************** - * Template Class SharedObjectPtr (from pp. 203, 206) * - ******************************************************************************/ - template - class SharedObjectPtr - { - public: - // Ctor - explicit - SharedObjectPtr(T* realPtr = 0) - : pointee(realPtr) - { - addref (); - } - - SharedObjectPtr(const SharedObjectPtr& rhs) - : pointee(rhs.pointee) - { - addref (); - } - - // Dtor - ~SharedObjectPtr() - { - if (pointee) - pointee->removeReference(); - } - - // Operators - bool operator==(const SharedObjectPtr& rhs) const { return (pointee == rhs.pointee); } - bool operator!=(const SharedObjectPtr& rhs) const { return (pointee != rhs.pointee); } - bool operator==(const T* rhs) const { return (pointee == rhs); } - bool operator!=(const T* rhs) const { return (pointee != rhs); } - T* operator->() const {assert (pointee); return pointee; } - T& operator*() const {assert (pointee); return *pointee; } - - SharedObjectPtr& operator=(const SharedObjectPtr& rhs) - { - return this->operator = (rhs.pointee); - } - - SharedObjectPtr& operator=(T* rhs) - { - SharedObjectPtr (rhs).swap (*this); - return *this; - } - - // Methods - T* get() const { return pointee; } - - void swap (SharedObjectPtr & other) throw () - { - std::swap (pointee, other.pointee); - } - - typedef T * (SharedObjectPtr:: * unspec_bool_type) () const; - operator unspec_bool_type () const - { - return pointee ? &SharedObjectPtr::get : 0; - } - - bool operator ! () const - { - return ! pointee; - } - - private: - // Methods - void addref() const - { - if (pointee) - pointee->addReference(); - } - - // Data - T* pointee; - }; - - } // end namespace helpers -} // end namespace log4cplus - - -#endif // _LOG4CPLUS_HELPERS_POINTERS_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/property.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/property.h deleted file mode 100644 index 017796a7..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/property.h +++ /dev/null @@ -1,123 +0,0 @@ -// Module: Log4CPLUS -// File: property.h -// Created: 2/2002 -// Author: Tad E. Smith -// -// -// Copyright 2002-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_HELPERS_PROPERTY_HEADER_ -#define LOG4CPLUS_HELPERS_PROPERTY_HEADER_ - -#include -#include -#include -#include -#include - -#if (defined(__MWERKS__) && defined(__MACOS__)) -using std::size_t; -#endif - - -namespace log4cplus { - namespace helpers { - - class LOG4CPLUS_EXPORT Properties { - public: - Properties(); - explicit Properties(log4cplus::tistream& input); - explicit Properties(const log4cplus::tstring& inputFile); - virtual ~Properties(); - - // constants - static const tchar PROPERTIES_COMMENT_CHAR; - - // methods - /** - * Tests to see if key can be found in this map. - */ - bool exists(const log4cplus::tstring& key) const { - return data.find(key) != data.end(); - } - - - /** - * Returns the number of entries in this map. - */ - size_t size() const { - return data.size(); - } - - /** - * Searches for the property with the specified key in this property - * list. If the key is not found in this property list, the default - * property list, and its defaults, recursively, are then checked. - * The method returns null if the property is not found. - */ - log4cplus::tstring getProperty(const log4cplus::tstring& key) const; - - /** - * Searches for the property with the specified key in this property - * list. If the key is not found in this property list, the default - * property list, and its defaults, recursively, are then checked. - * The method returns the default value argument if the property is - * not found. - */ - log4cplus::tstring getProperty(const log4cplus::tstring& key, - const log4cplus::tstring& defaultVal) const; - - /** - * Returns all the keys in this property list. - */ - std::vector propertyNames() const; - - /** - * Inserts value into this map indexed by key. - */ - void setProperty(const log4cplus::tstring& key, const log4cplus::tstring& value); - - /** - * Removed the property index by key from this map. - */ - bool removeProperty(const log4cplus::tstring& key); - - /** - * Returns a subset of the "properties" whose keys start with - * "prefix". The returned "properties" have "prefix" trimmed from - * their keys. - */ - Properties getPropertySubset(const log4cplus::tstring& prefix) const; - - protected: - // Types -// LOG4CPLUS_EXPIMP_TEMPLATE template class LOG4CPLUS_EXPORT std::map; - typedef std::map StringMap; - - // Methods - void init(log4cplus::tistream& input); - - // Data - StringMap data; - }; - } // end namespace helpers - -} - - -#endif // LOG4CPLUS_HELPERS_PROPERTY_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/sleep.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/sleep.h deleted file mode 100644 index 8dc687c9..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/sleep.h +++ /dev/null @@ -1,38 +0,0 @@ -// Module: Log4CPLUS -// File: sleep.h -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_SLEEP_HEADER_ -#define _LOG4CPLUS_HELPERS_SLEEP_HEADER_ - -#include - - -namespace log4cplus { - namespace helpers { - LOG4CPLUS_EXPORT void sleep(unsigned long secs, - unsigned long nanosecs = 0); - LOG4CPLUS_EXPORT void sleepmillis(unsigned long millis); - } // end namespace helpers -} // end namespace log4cplus - -#endif // _LOG4CPLUS_HELPERS_SLEEP_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socket.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socket.h deleted file mode 100644 index e79f7064..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socket.h +++ /dev/null @@ -1,128 +0,0 @@ -// Module: Log4CPLUS -// File: socket.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_HELPERS_SOCKET_HEADER_ -#define LOG4CPLUS_HELPERS_SOCKET_HEADER_ - -#include -#include -#include -#if defined(_WIN32) -#include -#endif - -namespace log4cplus { - namespace helpers { - - enum SocketState { ok, - not_opened, - bad_address, - connection_failed, - broken_pipe, - invalid_access_mode, - message_truncated - }; - -#if !defined(_WIN32) - typedef int SOCKET_TYPE; -#define INVALID_SOCKET -1 -#else - typedef SOCKET SOCKET_TYPE; -#endif - - class LOG4CPLUS_EXPORT AbstractSocket { - public: - // ctor and dtor - AbstractSocket(); - AbstractSocket(SOCKET_TYPE sock, SocketState state, int err); - AbstractSocket(const AbstractSocket&); - virtual ~AbstractSocket() = 0; - - // methods - /// Close socket - virtual void close(); - virtual bool isOpen() const; - - AbstractSocket& operator=(const AbstractSocket& rhs); - - protected: - // Methods - virtual void copy(const AbstractSocket& rhs); - - // Data - SOCKET_TYPE sock; - SocketState state; - int err; - }; - - - - /** - * This class implements client sockets (also called just "sockets"). - * A socket is an endpoint for communication between two machines. - */ - class LOG4CPLUS_EXPORT Socket : public AbstractSocket { - public: - // ctor and dtor - Socket(); - Socket(SOCKET_TYPE sock, SocketState state, int err); - Socket(const tstring& address, int port); - virtual ~Socket(); - - // methods - virtual bool read(SocketBuffer& buffer); - virtual bool write(const SocketBuffer& buffer); - }; - - - - /** - * This class implements server sockets. A server socket waits for - * requests to come in over the network. It performs some operation - * based on that request, and then possibly returns a result to the - * requester. - */ - class LOG4CPLUS_EXPORT ServerSocket : public AbstractSocket { - public: - // ctor and dtor - ServerSocket(int port); - virtual ~ServerSocket(); - - Socket accept(); - }; - - - LOG4CPLUS_EXPORT SOCKET_TYPE openSocket(unsigned short port, SocketState& state); - LOG4CPLUS_EXPORT SOCKET_TYPE connectSocket(const log4cplus::tstring& hostn, - unsigned short port, SocketState& state); - LOG4CPLUS_EXPORT SOCKET_TYPE acceptSocket(SOCKET_TYPE sock, SocketState& state); - LOG4CPLUS_EXPORT int closeSocket(SOCKET_TYPE sock); - - LOG4CPLUS_EXPORT long read(SOCKET_TYPE sock, SocketBuffer& buffer); - LOG4CPLUS_EXPORT long write(SOCKET_TYPE sock, const SocketBuffer& buffer); - - LOG4CPLUS_EXPORT tstring getHostname (bool fqdn); - - } // end namespace helpers -} // end namespace log4cplus - -#endif // LOG4CPLUS_HELPERS_SOCKET_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socketbuffer.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socketbuffer.h deleted file mode 100644 index d7ecfc03..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/socketbuffer.h +++ /dev/null @@ -1,79 +0,0 @@ -// Module: Log4CPLUS -// File: socketbuffer.h -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_HELPERS_SOCKET_BUFFER_HEADER_ -#define LOG4CPLUS_HELPERS_SOCKET_BUFFER_HEADER_ - -#include -#include -#include - - -namespace log4cplus { - namespace helpers { - - /** - * - */ - class LOG4CPLUS_EXPORT SocketBuffer : protected log4cplus::helpers::LogLogUser - { - public: - SocketBuffer(size_t max); - SocketBuffer(const SocketBuffer& rhs); - ~SocketBuffer(); - - SocketBuffer& operator=(const SocketBuffer& rhs); - - char *getBuffer() const { return buffer; } - size_t getMaxSize() const { return maxsize; } - size_t getSize() const { return size; } - void setSize(size_t s) { size = s; } - size_t getPos() const { return pos; } - - unsigned char readByte(); - unsigned short readShort(); - unsigned int readInt(); - tstring readString(unsigned char sizeOfChar); - - void appendByte(unsigned char val); - void appendShort(unsigned short val); - void appendInt(unsigned int val); - void appendSize_t(size_t val); - void appendString(const tstring& str); - void appendBuffer(const SocketBuffer& buffer); - - private: - // Methods - void copy(const SocketBuffer& rhs); - - // Data - size_t maxsize; - size_t size; - size_t pos; - char *buffer; - }; - - } // end namespace helpers -} // end namespace log4cplus - -#endif // LOG4CPLUS_HELPERS_SOCKET_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/stringhelper.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/stringhelper.h deleted file mode 100644 index 8a17b6ba..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/stringhelper.h +++ /dev/null @@ -1,239 +0,0 @@ -// Module: Log4CPLUS -// File: stringhelper.h -// Created: 3/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_HELPERS_STRINGHELPER_HEADER_ -#define LOG4CPLUS_HELPERS_STRINGHELPER_HEADER_ - -#include -#include - -#include -#include -#include - - -namespace log4cplus { - namespace helpers { - - /** - * Returns s in upper case. - */ - LOG4CPLUS_EXPORT log4cplus::tstring toUpper(const log4cplus::tstring& s); - - - /** - * Returns s in lower case. - */ - LOG4CPLUS_EXPORT log4cplus::tstring toLower(const log4cplus::tstring& s); - - - /** - * Tokenize s using c as the delimiter and - * put the resulting tokens in _result. If - * collapseTokens is false, multiple adjacent delimiters - * will result in zero length tokens. - * - * Example: - * 
-         *   string s = // Set string with '.' as delimiters
-         *   list tokens;
-         *   tokenize(s, '.', back_insert_iterator >(tokens));
-         *
- */ - template - inline - void - tokenize(const StringType& s, typename StringType::value_type c, - OutputIter result, bool collapseTokens = true) - { - typedef typename StringType::size_type size_type; - size_type const slen = s.length(); - size_type first = 0; - size_type i = 0; - for (i=0; i < slen; ++i) - { - if (s[i] == c) - { - *result = StringType (s, first, i - first); - ++result; - if (collapseTokens) - while (i+1 < slen && s[i+1] == c) - ++i; - first = i + 1; - } - } - if (first != i) - *result = StringType (s, first, i - first); - } - - - template - struct ConvertIntegerToStringHelper; - - - template - struct ConvertIntegerToStringHelper - { - static inline - void - step1 (tchar * & it, intType & value) - { - // The sign of the result of the modulo operator is - // implementation defined. That's why we work with - // positive counterpart instead. Also, in twos - // complement arithmetic the smallest negative number - // does not have positive counterpart; the range is - // asymetric. That's why we handle the case of value - // == min() specially here. - if (value == (std::numeric_limits::min) ()) - { - intType const r = value / 10; - intType const a = (-r) * 10; - intType const mod = -(a + value); - value = -r; - - *(it - 1) = LOG4CPLUS_TEXT('0') + static_cast(mod); - --it; - } - else - value = -value; - } - }; - - - template - struct ConvertIntegerToStringHelper - { - static inline - void - step1 (tchar * &, intType &) - { - // This will never be called for unsigned types. - } - }; - - - template - inline - void - convertIntegerToString (tstring & str, intType value) - { - typedef std::numeric_limits intTypeLimits; - typedef ConvertIntegerToStringHelper HelperType; - - const size_t buffer_size - = intTypeLimits::digits10 + 2; - tchar buffer[buffer_size]; - tchar * it = &buffer[buffer_size]; - tchar const * const buf_end = it; - - if (value == 0) - { - --it; - *it = LOG4CPLUS_TEXT('0'); - } - - bool const negative = value < 0; - if (negative) - HelperType::step1 (it, value); - - for (; value != 0; --it) - { - intType mod = value % 10; - value = value / 10; - *(it - 1) = LOG4CPLUS_TEXT('0') + static_cast(mod); - } - - if (negative) - { - --it; - *it = LOG4CPLUS_TEXT('-'); - } - - str.assign (static_cast(it), buf_end); - } - - - template - inline - tstring - convertIntegerToString (intType value) - { - tstring result; - convertIntegerToString (result, value); - return result; - } - - - - /** - * This iterator can be used in place of the back_insert_iterator - * for compilers that don't have a std::basic_string class that - * has the push_back method. - */ - template - class string_append_iterator - : public std::iterator - { - public: - typedef Container container_type; - - explicit string_append_iterator(container_type & c) - : container(&c) - { } - - string_append_iterator & - operator = (const typename container_type::value_type& value) - { - *container += value; - return *this; - } - - string_append_iterator & - operator * () - { - return *this; - } - - string_append_iterator & - operator ++ () - { - return *this; - } - - string_append_iterator - operator ++ (int) - { - return *this; - } - - protected: - container_type * container; - }; - - } // namespace helpers - -} // namespace log4cplus - -#endif // LOG4CPLUS_HELPERS_STRINGHELPER_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-pthreads.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-pthreads.h deleted file mode 100644 index 8ff6ac69..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-pthreads.h +++ /dev/null @@ -1,307 +0,0 @@ -// Copyright (C) 2009-2010, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -//! @file -//! This file contains implementations of synchronization -//! primitives using the POSIX threads. It does not contain any -//! include guards because it is only a fragment to be included by -//! syncprims.h. - -#include -#include - - -namespace log4cplus { namespace thread { - - -#define LOG4CPLUS_THROW_RTE(msg) \ - do { detail::syncprims_throw_exception (msg, __FILE__, __LINE__); } while (0) - - -// -// -// - -struct PthreadMutexAttr -{ - PthreadMutexAttr () - { - int ret = pthread_mutexattr_init (&attr); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("PthreadMutexAttr::PthreadMutexAttr"); - } - - - ~PthreadMutexAttr () - try - { - int ret = pthread_mutexattr_destroy (&attr); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("PthreadMutexAttr::~PthreadMutexAttr"); - } - catch (...) - { } - - - void - set_type (Mutex::Type t) - { - int mutex_type; - switch (t) - { - case Mutex::RECURSIVE: - mutex_type = PTHREAD_MUTEX_RECURSIVE; - break; - - default: - mutex_type = PTHREAD_MUTEX_DEFAULT; - } - - int ret = pthread_mutexattr_settype (&attr, mutex_type); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("PthreadMutexAttr::set_type"); - } - - - pthread_mutexattr_t attr; -}; - - -// -// -// - -inline -Mutex::Mutex (Mutex::Type t) -{ - PthreadMutexAttr attr; - attr.set_type (t); - - int ret = pthread_mutex_init (&mtx, &attr.attr); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Mutex::Mutex"); -} - - -inline -Mutex::~Mutex () -{ - int ret = pthread_mutex_destroy (&mtx); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Mutex::~Mutex"); -} - - -inline -void -Mutex::lock () const -{ - int ret = pthread_mutex_lock (&mtx); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Mutex::lock"); -} - - -inline -void -Mutex::unlock () const -{ - int ret = pthread_mutex_unlock (&mtx); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Mutex::unlock"); -} - - -// -// -// - -inline -Semaphore::Semaphore (unsigned max, unsigned initial) -{ - unsigned const sem_value_max = -#if defined (SEM_VALUE_MAX) - SEM_VALUE_MAX -#else - std::numeric_limits::max () -#endif - ; - - unsigned const limited_max = (std::min) (max, sem_value_max); - unsigned const limited_initial = (std::min) (initial, limited_max); - int ret = sem_init (&sem, 0, limited_initial); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Semaphore::Semaphore"); -} - - -inline -Semaphore::~Semaphore () -try -{ - int ret = sem_destroy (&sem); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Semaphore::~Semaphore"); -} -catch (...) -{ } - - -inline -void -Semaphore::unlock () const -{ - int ret = sem_post (&sem); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Semaphore::unlock"); -} - - -inline -void -Semaphore::lock () const -{ - int ret = sem_wait (&sem); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("Semaphore::lock"); -} - - -// -// -// - -inline -ManualResetEvent::ManualResetEvent (bool sig) - : mtx (Mutex::DEFAULT) - , sigcount (0) - , signaled (sig) -{ - int ret = pthread_cond_init (&cv, 0); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::ManualResetEvent"); -} - - -inline -ManualResetEvent::~ManualResetEvent () -try -{ - int ret = pthread_cond_destroy (&cv); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::~ManualResetEvent"); -} -catch (...) -{ } - - -inline -void -ManualResetEvent::signal () const -{ - MutexGuard mguard (mtx); - - signaled = true; - sigcount += 1; - int ret = pthread_cond_broadcast (&cv); - if (ret != 0) - LOG4CPLUS_THROW_RTE ("ManualResetEVent::signal"); - -} - - -inline -void -ManualResetEvent::wait () const -{ - MutexGuard mguard (mtx); - - if (! signaled) - { - unsigned prev_count = sigcount; - do - { - int ret = pthread_cond_wait (&cv, &mtx.mtx); - if (ret != 0) - { - mguard.unlock (); - mguard.detach (); - LOG4CPLUS_THROW_RTE ("ManualResetEvent::wait"); - } - } - while (prev_count == sigcount); - } -} - - -inline -bool -ManualResetEvent::timed_wait (unsigned long msec) const -{ - MutexGuard mguard (mtx); - - if (! signaled) - { - helpers::Time const wakeup_time (helpers::Time::gettimeofday () - + helpers::Time (msec / 1000, (msec % 1000) * 1000)); - struct timespec const ts = {wakeup_time.sec (), - wakeup_time.usec () * 1000}; - unsigned prev_count = sigcount; - do - { - int ret = pthread_cond_timedwait (&cv, &mtx.mtx, &ts); - switch (ret) - { - case 0: - break; - - case ETIMEDOUT: - return false; - - default: - mguard.unlock (); - mguard.detach (); - LOG4CPLUS_THROW_RTE ("ManualResetEvent::timed_wait"); - } - } - while (prev_count == sigcount); - } - - return true; -} - - -inline -void -ManualResetEvent::reset () const -{ - MutexGuard mguard (mtx); - - signaled = false; -} - - -#undef LOG4CPLUS_THROW_RTE - - -} } // namespace log4cplus { namespace thread { diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-win32.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-win32.h deleted file mode 100644 index 5ffc8784..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims-win32.h +++ /dev/null @@ -1,195 +0,0 @@ -// Copyright (C) 2009, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -//! @file -//! This file contains implementations of synchronization -//! primitives using the Win32 API. It does not contain any include -//! guards because it is only a fragment to be included by -//! syncprims.h. - -namespace log4cplus { namespace thread { - - -#define LOG4CPLUS_THROW_RTE(msg) \ - do { detail::syncprims_throw_exception (msg, __FILE__, __LINE__); } while (0) - -// -// -// - -inline -Mutex::Mutex (Mutex::Type) -{ - InitializeCriticalSection (&cs); -} - - -inline -Mutex::~Mutex () -{ - DeleteCriticalSection (&cs); -} - - -inline -void -Mutex::lock () const -{ - EnterCriticalSection (&cs); -} - - -inline -void -Mutex::unlock () const -{ - LeaveCriticalSection (&cs); -} - - -// -// -// - -inline -Semaphore::Semaphore (unsigned max, unsigned initial) -{ - sem = CreateSemaphore (0, initial, max, 0); - if (! sem) - LOG4CPLUS_THROW_RTE ("Semaphore::Semaphore"); -} - - -inline -Semaphore::~Semaphore () -{ - try - { - if (! CloseHandle (sem)) - LOG4CPLUS_THROW_RTE ("Semaphore::~Semaphore"); - } - catch (...) - { } -} - - -inline -void -Semaphore::unlock () const -{ - DWORD ret = ReleaseSemaphore (sem, 1, 0); - if (! ret) - LOG4CPLUS_THROW_RTE ("Semaphore::unlock"); -} - - -inline -void -Semaphore::lock () const -{ - DWORD ret = WaitForSingleObject (sem, INFINITE); - if (ret != WAIT_OBJECT_0) - LOG4CPLUS_THROW_RTE ("Semaphore::lock"); -} - - -// -// -// - -inline -ManualResetEvent::ManualResetEvent (bool sig) -{ - ev = CreateEvent (0, true, sig, 0); - if (! ev) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::ManualResetEvent"); -} - - -inline -ManualResetEvent::~ManualResetEvent () -{ - try - { - if (! CloseHandle (ev)) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::~ManualResetEvent"); - } - catch (...) - { } -} - - -inline -void -ManualResetEvent::signal () const -{ - if (! SetEvent (ev)) - LOG4CPLUS_THROW_RTE ("ManualResetEVent::signal"); -} - - -inline -void -ManualResetEvent::wait () const -{ - DWORD ret = WaitForSingleObject (ev, INFINITE); - if (ret != WAIT_OBJECT_0) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::wait"); -} - - -inline -bool -ManualResetEvent::timed_wait (unsigned long msec) const -{ - DWORD ret = WaitForSingleObject (ev, static_cast(msec)); - switch(ret) - { - case WAIT_OBJECT_0: - return true; - - case WAIT_TIMEOUT: - return false; - - default: - LOG4CPLUS_THROW_RTE ("ManualResetEvent::timed_wait"); - // Silence warnings about not returning any value from function - // returning bool. - return false; - } -} - - -inline -void -ManualResetEvent::reset () const -{ - if (! ResetEvent (ev)) - LOG4CPLUS_THROW_RTE ("ManualResetEvent::reset"); -} - - -#undef LOG4CPLUS_THROW_RTE - - -} } // namespace log4cplus { namespace thread { diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims.h deleted file mode 100644 index 990b4a33..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/syncprims.h +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright (C) 2009, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -#ifndef LOG4CPLUS_THREAD_SYNCPRIMS_H -#define LOG4CPLUS_THREAD_SYNCPRIMS_H - -#include -#include -#if defined (LOG4CPLUS_USE_PTHREADS) -# include -# include -# include -# include - -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) -# undef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# include - -#endif - - -namespace log4cplus { namespace thread { - - -namespace detail -{ - -LOG4CPLUS_EXPORT void syncprims_throw_exception (char const * const msg, - char const * const file, int line); - -} // namespace detail - - -template -class SyncGuard -{ -public: - SyncGuard (SP const &); - ~SyncGuard (); - - void lock (); - void unlock (); - void attach (SP const &); - void detach (); - -private: - SP const * sp; - - SyncGuard (SyncGuard const &); - SyncGuard & operator = (SyncGuard const &); -}; - - -class ManualResetEvent; - - -class Mutex -{ -public: - enum Type - { - DEFAULT, - RECURSIVE - }; - - explicit Mutex (Type = RECURSIVE); - ~Mutex (); - - void lock () const; - void unlock () const; - -private: -#if defined (LOG4CPLUS_USE_PTHREADS) - mutable pthread_mutex_t mtx; - friend class ManualResetEvent; -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) - mutable CRITICAL_SECTION cs; -#endif - - Mutex (Mutex const &); - Mutex & operator = (Mutex &); -}; - - -typedef SyncGuard MutexGuard; - - -class Semaphore -{ -public: - Semaphore (unsigned max, unsigned initial); - ~Semaphore (); - - void lock () const; - void unlock () const; - -private: -#if defined (LOG4CPLUS_USE_PTHREADS) - mutable sem_t sem; -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) - HANDLE sem; -#endif - - Semaphore (Semaphore const &); - Semaphore & operator = (Semaphore const &); -}; - - -typedef SyncGuard SemaphoreGuard; - - -class ManualResetEvent -{ -public: - ManualResetEvent (bool = false); - ~ManualResetEvent (); - - void signal () const; - void wait () const; - bool timed_wait (unsigned long msec) const; - void reset () const; - -private: -#if defined (LOG4CPLUS_USE_PTHREADS) - mutable pthread_cond_t cv; - mutable Mutex mtx; - mutable volatile unsigned sigcount; - mutable volatile bool signaled; -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) - HANDLE ev; -#endif - - ManualResetEvent (ManualResetEvent const &); - ManualResetEvent & operator = (ManualResetEvent const &); -}; - - -} } // namespace log4cplus { namespace thread { - - -// Include the appropriate implementations of the classes declared -// above. - -#if defined (LOG4CPLUS_USE_PTHREADS) -# include -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) -# include -#endif - - -namespace log4cplus { namespace thread { - - -// -// -// - -template -inline -SyncGuard::SyncGuard (SP const & m) - : sp (&m) -{ - sp->lock (); -} - - -template -inline -SyncGuard::~SyncGuard () -{ - if (sp) - sp->unlock (); -} - - -template -inline -void -SyncGuard::lock () -{ - sp->lock (); -} - - -template -inline -void -SyncGuard::unlock () -{ - sp->unlock (); -} - - -template -inline -void -SyncGuard::attach (SP const & m) -{ - sp = &m; -} - - -template -inline -void -SyncGuard::detach () -{ - sp = 0; -} - - -} } // namespace log4cplus { namespace thread { - - - -#endif // LOG4CPLUS_THREAD_SYNCPRIMS_H diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/thread-config.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/thread-config.h deleted file mode 100644 index 3aa1d04a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/thread-config.h +++ /dev/null @@ -1,143 +0,0 @@ -// Module: Log4CPLUS -// File: thread-config.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -/** @file */ - -#ifndef LOG4CPLUS_HELPERS_THREAD_CONFIG_HEADER_ -#define LOG4CPLUS_HELPERS_THREAD_CONFIG_HEADER_ - - -#ifdef LOG4CPLUS_USE_PTHREADS -# include -# include -# define LOG4CPLUS_MUTEX_PTR_DECLARE pthread_mutex_t* -# define LOG4CPLUS_MUTEX_CREATE ::log4cplus::thread::createNewMutex() -# define LOG4CPLUS_MUTEX_LOCK(mutex) pthread_mutex_lock(mutex) -# define LOG4CPLUS_MUTEX_UNLOCK(mutex) pthread_mutex_unlock(mutex) -# define LOG4CPLUS_MUTEX_FREE(mutex) ::log4cplus::thread::deleteMutex(mutex) -# define LOG4CPLUS_THREAD_HANDLE_TYPE pthread_t -# define LOG4CPLUS_THREAD_KEY_TYPE pthread_t -# define LOG4CPLUS_GET_CURRENT_THREAD_NAME \ - ::log4cplus::thread::getCurrentThreadName() -# define LOG4CPLUS_GET_CURRENT_THREAD pthread_self() -# define LOG4CPLUS_THREAD_LOCAL_TYPE pthread_key_t* -# define LOG4CPLUS_THREAD_LOCAL_INIT(cleanup) \ - ::log4cplus::thread::createPthreadKey(cleanup) -# define LOG4CPLUS_GET_THREAD_LOCAL_VALUE(key) pthread_getspecific(*(key)) -# define LOG4CPLUS_SET_THREAD_LOCAL_VALUE(key, value) \ - pthread_setspecific(*(key), value) -# define LOG4CPLUS_THREAD_LOCAL_CLEANUP(key) \ - do { pthread_key_t * pthkey (key); pthread_key_delete(*pthkey); \ - delete pthkey; } while(0) -namespace log4cplus { - namespace thread { - LOG4CPLUS_EXPORT LOG4CPLUS_MUTEX_PTR_DECLARE createNewMutex(); - LOG4CPLUS_EXPORT void deleteMutex(LOG4CPLUS_MUTEX_PTR_DECLARE); - LOG4CPLUS_EXPORT LOG4CPLUS_THREAD_LOCAL_TYPE createPthreadKey(void (*) (void *)); - } -} - -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) -# undef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# include - -# define LOG4CPLUS_MUTEX_PTR_DECLARE CRITICAL_SECTION* -# define LOG4CPLUS_MUTEX_CREATE ::log4cplus::thread::createNewMutex() -# define LOG4CPLUS_MUTEX_LOCK(mutex) EnterCriticalSection(mutex) -# define LOG4CPLUS_MUTEX_UNLOCK(mutex) LeaveCriticalSection(mutex) -# define LOG4CPLUS_MUTEX_FREE(mutex) ::log4cplus::thread::deleteMutex(mutex) - -# define LOG4CPLUS_THREAD_HANDLE_TYPE HANDLE -# define LOG4CPLUS_THREAD_KEY_TYPE DWORD -# define LOG4CPLUS_GET_CURRENT_THREAD GetCurrentThreadId() -# define LOG4CPLUS_GET_CURRENT_THREAD_NAME \ - ::log4cplus::thread::getCurrentThreadName() -# define LOG4CPLUS_THREAD_LOCAL_TYPE DWORD -# define LOG4CPLUS_THREAD_LOCAL_INIT(cleanup) TlsAlloc() -# define LOG4CPLUS_GET_THREAD_LOCAL_VALUE(key) TlsGetValue(key) -# define LOG4CPLUS_SET_THREAD_LOCAL_VALUE(key, value) \ - TlsSetValue(key, static_cast(value)) -# define LOG4CPLUS_THREAD_LOCAL_CLEANUP(key) TlsFree(key) -# if defined (_MSC_VER) -# undef LOG4CPLUS_HAVE_TLS_SUPPORT -# undef LOG4CPLUS_THREAD_LOCAL_VAR -// Comment out the following two lines if you do intend to use log4cplus.dll -// for loading using LoadLibrary(). The __declspec(thread) functionality is not -// compatible with such DLL use. For more information why is this necessary see -// . -# define LOG4CPLUS_HAVE_TLS_SUPPORT 1 -# define LOG4CPLUS_THREAD_LOCAL_VAR __declspec(thread) -# endif - - -namespace log4cplus { namespace thread { - -LOG4CPLUS_EXPORT LOG4CPLUS_MUTEX_PTR_DECLARE createNewMutex(); -LOG4CPLUS_EXPORT void deleteMutex(LOG4CPLUS_MUTEX_PTR_DECLARE); - -} } // namespace log4cplus { namespace thread { - -#elif defined(LOG4CPLUS_SINGLE_THREADED) -# define LOG4CPLUS_MUTEX_PTR_DECLARE int* -# define LOG4CPLUS_MUTEX_CREATE NULL -# define LOG4CPLUS_MUTEX_LOCK(mutex) -# define LOG4CPLUS_MUTEX_UNLOCK(mutex) -# define LOG4CPLUS_MUTEX_FREE(mutex) -# define LOG4CPLUS_THREAD_HANDLE_TYPE void * -# define LOG4CPLUS_THREAD_KEY_TYPE int -# define LOG4CPLUS_GET_CURRENT_THREAD 1 -# define LOG4CPLUS_GET_CURRENT_THREAD_NAME \ - LOG4CPLUS_C_STR_TO_TSTRING("single") -# define LOG4CPLUS_THREAD_LOCAL_TYPE void* -# define LOG4CPLUS_THREAD_LOCAL_INIT(cleanup) NULL -# define LOG4CPLUS_GET_THREAD_LOCAL_VALUE(key) (key) -# define LOG4CPLUS_SET_THREAD_LOCAL_VALUE(key, value) \ - do { (key) = (value); } while (0) -# define LOG4CPLUS_THREAD_LOCAL_CLEANUP(key) do { (key) = NULL; } while (0) -# undef LOG4CPLUS_HAVE_TLS_SUPPORT -# undef LOG4CPLUS_THREAD_LOCAL_VAR - -#else -# error "You Must define a Threading model" -#endif - -/** - * @def LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX(mutex) - * Begin a block synchronized on a mutex. - * - * @see LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX - * - * @def LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX - * End a block synchronized on a mutex. - * - * @see LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX - */ -#ifndef LOG4CPLUS_SINGLE_THREADED -# define LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX(mutex) \ - do { ::log4cplus::thread::Guard _sync_guard_object(mutex); -#else -# define LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX(mutex) do { (void)(mutex); -#endif - -#define LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX } while (0) - - -#endif // LOG4CPLUS_HELPERS_THREAD_CONFIG_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/threads.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/threads.h deleted file mode 100644 index ed7f3f6e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/threads.h +++ /dev/null @@ -1,133 +0,0 @@ -// Module: Log4CPLUS -// File: threads.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_THREADS_HEADER_ -#define _LOG4CPLUS_THREADS_HEADER_ - -#include -#include -#include - - -namespace log4cplus { namespace thread { - -/** - * This is used to lock a mutex. The dtor unlocks the mutex. - */ -class Guard -{ -public: - /** "locks" mutex. */ - Guard(LOG4CPLUS_MUTEX_PTR_DECLARE mutex) - : _mutex (mutex) - { - LOG4CPLUS_MUTEX_LOCK( _mutex ); - } - - /** "unlocks" mutex. */ - ~Guard() - { - LOG4CPLUS_MUTEX_UNLOCK( _mutex ); - } - -private: - LOG4CPLUS_MUTEX_PTR_DECLARE _mutex; - - // disable copy - Guard(const Guard&); - Guard& operator=(const Guard&); -}; - - -#ifndef LOG4CPLUS_SINGLE_THREADED - -LOG4CPLUS_EXPORT void blockAllSignals(); -LOG4CPLUS_EXPORT void yield(); -LOG4CPLUS_EXPORT tstring getCurrentThreadName(); - - -struct ThreadStart; - - -/** - * There are many cross-platform C++ Threading libraries. The goal of - * this class is not to replace (or match in functionality) those - * libraries. The goal of this class is to provide a simple Threading - * class with basic functionality. - */ -class LOG4CPLUS_EXPORT AbstractThread - : public virtual log4cplus::helpers::SharedObject -{ -public: - AbstractThread(); - bool isRunning() const { return (flags & fRUNNING) != 0; } - LOG4CPLUS_THREAD_KEY_TYPE getThreadId() const; - LOG4CPLUS_THREAD_HANDLE_TYPE getThreadHandle () const; - virtual void start(); - void join (); - -protected: - // Force objects to be constructed on the heap - virtual ~AbstractThread(); - virtual void run() = 0; - -private: - enum Flags - { - fRUNNING = 0x01, - fJOINED = 0x02 - }; - - unsigned flags; - - // Friends. - friend struct ThreadStart; - -# ifdef LOG4CPLUS_USE_PTHREADS - pthread_t handle; - -# elif defined(LOG4CPLUS_USE_WIN32_THREADS) - HANDLE handle; -# if defined (_WIN32_WCE) - DWORD thread_id; -# else - unsigned thread_id; -# endif - -# endif - - // Disallow copying of instances of this class. - AbstractThread(const AbstractThread&); - AbstractThread& operator=(const AbstractThread&); -}; - -typedef helpers::SharedObjectPtr AbstractThreadPtr; - - -#endif // LOG4CPLUS_SINGLE_THREADED - - -} } // namespace log4cplus { namespace thread { - - -#endif // _LOG4CPLUS_THREADS_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/timehelper.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/timehelper.h deleted file mode 100644 index 90527cbd..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/helpers/timehelper.h +++ /dev/null @@ -1,179 +0,0 @@ -// Module: Log4CPLUS -// File: timehelper.h -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HELPERS_TIME_HELPER_HEADER_ -#define _LOG4CPLUS_HELPERS_TIME_HELPER_HEADER_ - -#include -#include - -#if defined (LOG4CPLUS_HAVE_TIME_H) -#include -#endif - -#if ! defined (_WIN32_WCE) -#include -#endif - - -namespace log4cplus { - -namespace helpers { - - -#if defined (_WIN32_WCE) -using ::time_t; -using ::tm; - -#else -using std::time_t; -using std::tm; - -#endif - - -/** - * This class represents a Epoch time with microsecond accuracy. - */ -class LOG4CPLUS_EXPORT Time { -public: - Time(); - Time(time_t tv_sec, long tv_usec); - explicit Time(time_t time); - - /** - * Returns the current time using the gettimeofday() - * method if it is available on the current platform. (Not on - * WIN32.) - */ - static Time gettimeofday(); - - // Methods - /** - * Returns seconds value. - */ - time_t sec() const { return tv_sec; } - - /** - * Returns microseconds value. - */ - long usec() const { return tv_usec; } - - /** - * Sets the seconds value. - */ - void sec(time_t s) { tv_sec = s; } - - /** - * Sets the microseconds value. - */ - void usec(long us) { tv_usec = us; } - - /** - * Sets this Time using the mktime function. - */ - time_t setTime(tm* t); - - /** - * Returns this Time as a time_t value. - */ - time_t getTime() const; - - /** - * Populates tm using the gmtime() - * function. - */ - void gmtime(tm* t) const; - - /** - * Populates tm using the localtime() - * function. - */ - void localtime(tm* t) const; - - /** - * Returns a string with a "formatted time" specified by - * fmt. It used the strftime() - * function to do this. - * - * Look at your platform's strftime() documentation - * for the formatting options available. - * - * The following additional options are provided:
- * %q - 3 character field that provides milliseconds - * %Q - 7 character field that provides fractional - * milliseconds. - */ - log4cplus::tstring getFormattedTime(const log4cplus::tstring& fmt, - bool use_gmtime = false) const; - - // Operators - Time& operator+=(const Time& rhs); - Time& operator-=(const Time& rhs); - Time& operator/=(long rhs); - Time& operator*=(long rhs); - -private: - void build_q_value (log4cplus::tstring & q_str) const; - void build_uc_q_value (log4cplus::tstring & uc_q_str) const; - - // Data - time_t tv_sec; /* seconds */ - long tv_usec; /* microseconds */ -}; - - -LOG4CPLUS_EXPORT const log4cplus::helpers::Time operator+ - (const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); -LOG4CPLUS_EXPORT const log4cplus::helpers::Time operator- - (const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); -LOG4CPLUS_EXPORT const log4cplus::helpers::Time operator/ - (const log4cplus::helpers::Time& lhs, - long rhs); -LOG4CPLUS_EXPORT const log4cplus::helpers::Time operator* - (const log4cplus::helpers::Time& lhs, - long rhs); - -LOG4CPLUS_EXPORT bool operator<(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); -LOG4CPLUS_EXPORT bool operator<=(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); - -LOG4CPLUS_EXPORT bool operator>(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); -LOG4CPLUS_EXPORT bool operator>=(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); - -LOG4CPLUS_EXPORT bool operator==(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); -LOG4CPLUS_EXPORT bool operator!=(const log4cplus::helpers::Time& lhs, - const log4cplus::helpers::Time& rhs); - -} // namespace helpers - -} // namespace log4cplus - - -#endif // _LOG4CPLUS_HELPERS_TIME_HELPER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchy.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchy.h deleted file mode 100644 index 2e8e467e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchy.h +++ /dev/null @@ -1,316 +0,0 @@ -// Module: Log4CPLUS -// File: hierarchy.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HIERARCHY_HEADER_ -#define _LOG4CPLUS_HIERARCHY_HEADER_ - -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { - // Forward Declarations - class HierarchyLocker; - - /** - * This class is specialized in retrieving loggers by name and - * also maintaining the logger hierarchy. - * - * The casual user should not have to deal with this class - * directly. However, if you are in an environment where - * multiple applications run in the same process, then read on. - * - * The structure of the logger hierarchy is maintained by the - * {@link #getInstance} method. The hierarchy is such that children - * link to their parent but parents do not have any pointers to their - * children. Moreover, loggers can be instantiated in any order, in - * particular descendant before ancestor. - * - * In case a descendant is created before a particular ancestor, - * then it creates a provision node for the ancestor and adds itself - * to the provision node. Other descendants of the same ancestor add - * themselves to the previously created provision node. - */ - class LOG4CPLUS_EXPORT Hierarchy : protected log4cplus::helpers::LogLogUser { - public: - // DISABLE_OFF should be set to a value lower than all possible - // priorities. - static const LogLevel DISABLE_OFF; - static const LogLevel DISABLE_OVERRIDE; - - // Ctors - /** - * Create a new Logger hierarchy. - */ - Hierarchy(); - - // Dtor - virtual ~Hierarchy(); - - // Methods - /** - * This call will clear all logger definitions from the internal - * hashtable. Invoking this method will irrevocably mess up the - * logger hierarchy. - * - * You should really know what you are doing before - * invoking this method. - */ - virtual void clear(); - - /** - * Returns true if the named logger exists - * (in the default hierarchy). - * - * @param name The name of the logger to search for. - */ - virtual bool exists(const log4cplus::tstring& name); - - /** - * Similar to {@link #disable(LogLevel)} except that the LogLevel - * argument is given as a log4cplus::tstring. - */ - virtual void disable(const log4cplus::tstring& loglevelStr); - - /** - * Disable all logging requests of LogLevel equal to or - * below the ll parameter p, for - * all loggers in this hierarchy. Logging requests of - * higher LogLevel then p remain unaffected. - * - * Nevertheless, if the {@link - * BasicConfigurator#DISABLE_OVERRIDE_KEY} system property is set to - * "true" or any value other than "false", then logging requests are - * evaluated as usual, i.e. according to the Basic Selection Rule. - * - * The "disable" family of methods are there for speed. They - * allow printing methods such as debug, info, etc. to return - * immediately after an integer comparison without walking the - * logger hierarchy. In most modern computers an integer - * comparison is measured in nanoseconds where as a logger walk is - * measured in units of microseconds. - */ - virtual void disable(LogLevel ll); - - /** - * Disable all logging requests regardless of logger and LogLevel. - * This method is equivalent to calling {@link #disable} with the - * argument FATAL_LOG_LEVEL, the highest possible LogLevel. - */ - virtual void disableAll(); - - /** - * Disable all Debug logging requests regardless of logger. - * This method is equivalent to calling {@link #disable} with the - * argument DEBUG_LOG_LEVEL. - */ - virtual void disableDebug(); - - /** - * Disable all Info logging requests regardless of logger. - * This method is equivalent to calling {@link #disable} with the - * argument INFO_LOG_LEVEL. - */ - virtual void disableInfo(); - - /** - * Undoes the effect of calling any of {@link #disable}, {@link - * #disableAll}, {@link #disableDebug} and {@link #disableInfo} - * methods. More precisely, invoking this method sets the Logger - * class internal variable called disable to its - * default "off" value. - */ - virtual void enableAll(); - - /** - * Return a new logger instance named as the first parameter using - * the default factory. - * - * If a logger of that name already exists, then it will be - * returned. Otherwise, a new logger will be instantiated and - * then linked with its existing ancestors as well as children. - * - * @param name The name of the logger to retrieve. - */ - virtual Logger getInstance(const log4cplus::tstring& name); - - /** - * Return a new logger instance named as the first parameter using - * factory. - * - * If a logger of that name already exists, then it will be - * returned. Otherwise, a new logger will be instantiated by the - * factory parameter and linked with its existing - * ancestors as well as children. - * - * @param name The name of the logger to retrieve. - * @param factory The factory that will make the new logger instance. - */ - virtual Logger getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory); - - /** - * Returns all the currently defined loggers in this hierarchy. - * - * The root logger is not included in the returned list. - */ - virtual LoggerList getCurrentLoggers(); - - /** - * Is the LogLevel specified by level enabled? - */ - virtual bool isDisabled(int level); - - /** - * Get the root of this hierarchy. - */ - virtual Logger getRoot() const; - - /** - * Reset all values contained in this hierarchy instance to their - * default. This removes all appenders from all loggers, sets - * the LogLevel of all non-root loggers to NOT_SET_LOG_LEVEL, - * sets their additivity flag to true and sets the LogLevel - * of the root logger to DEBUG_LOG_LEVEL. Moreover, message disabling - * is set its default "off" value. - * - * Existing loggers are not removed. They are just reset. - * - * This method should be used sparingly and with care as it will - * block all logging until it is completed.

- */ - virtual void resetConfiguration(); - - /** - * Set the default LoggerFactory instance. - */ - virtual void setLoggerFactory(std::auto_ptr factory); - - /** - * Returns the default LoggerFactory instance. - */ - virtual spi::LoggerFactory* getLoggerFactory() { return defaultFactory.get(); } - - /** - * Shutting down a hierarchy will safely close and remove - * all appenders in all loggers including the root logger. - * - * Some appenders such as SocketAppender need to be closed before the - * application exits. Otherwise, pending logging events might be - * lost. - * - * The shutdown method is careful to close nested - * appenders before closing regular appenders. This is allows - * configurations where a regular appender is attached to a logger - * and again to a nested appender. - */ - virtual void shutdown(); - - private: - // Types - typedef std::vector ProvisionNode; - typedef std::map ProvisionNodeMap; - typedef std::map LoggerMap; - - // Methods - /** - * This is the implementation of the getInstance() method. - * NOTE: This method does not lock the hashtable_mutex. - */ - virtual Logger getInstanceImpl(const log4cplus::tstring& name, - spi::LoggerFactory& factory); - - /** - * This is the implementation of the getCurrentLoggers(). - * NOTE: This method does not lock the hashtable_mutex. - */ - virtual void initializeLoggerList(LoggerList& list) const; - - /** - * This method loops through all the *potential* parents of - * logger'. There 3 possible cases: - * - * 1) No entry for the potential parent of 'logger' exists - * - * We create a ProvisionNode for this potential parent and insert - * 'logger' in that provision node. - * - * 2) There is an entry of type Logger for the potential parent. - * - * The entry is 'logger's nearest existing parent. We update logger's - * parent field with this entry. We also break from the loop - * because updating our parent's parent is our parent's - * responsibility. - * - * 3) There entry is of type ProvisionNode for this potential parent. - * - * We add 'logger' to the list of children for this potential parent. - */ - void updateParents(Logger logger); - - /** - * We update the links for all the children that placed themselves - * in the provision node 'pn'. The second argument 'logger' is a - * reference for the newly created Logger, parent of all the - * children in 'pn' - * - * We loop on all the children 'c' in 'pn': - * - * If the child 'c' has been already linked to a child of - * 'logger' then there is no need to update 'c'. - * - * Otherwise, we set logger's parent field to c's parent and set - * c's parent field to logger. - */ - void updateChildren(ProvisionNode& pn, Logger logger); - - // Data - LOG4CPLUS_MUTEX_PTR_DECLARE hashtable_mutex; - std::auto_ptr defaultFactory; - ProvisionNodeMap provisionNodes; - LoggerMap loggerPtrs; - Logger root; - - int disableValue; - - bool emittedNoAppenderWarning; - bool emittedNoResourceBundleWarning; - - // Disallow copying of instances of this class - Hierarchy(const Hierarchy&); - Hierarchy& operator=(const Hierarchy&); - - // Friends - friend class log4cplus::spi::LoggerImpl; - friend class log4cplus::HierarchyLocker; - }; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_HIERARCHY_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchylocker.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchylocker.h deleted file mode 100644 index 63549234..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/hierarchylocker.h +++ /dev/null @@ -1,67 +0,0 @@ -// Module: Log4CPLUS -// File: hierarchylocker.h -// Created: 8/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_HIERARCHY_LOCKER_HEADER_ -#define _LOG4CPLUS_HIERARCHY_LOCKER_HEADER_ - -#include - - -namespace log4cplus { - - /** - * This is used to lock a Hierarchy. The dtor unlocks the Hierarchy. - */ - class LOG4CPLUS_EXPORT HierarchyLocker { - public: - // ctor & dtor - HierarchyLocker(Hierarchy& h); - ~HierarchyLocker(); - - /** - * Calls the resetConfiguration() method on the locked Hierarchy. - */ - void resetConfiguration(); - - /** - * Calls the getInstance() method on the locked Hierarchy. - */ - Logger getInstance(const log4cplus::tstring& name); - - /** - * Calls the getInstance() method on the locked Hierarchy. - */ - Logger getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory); - - void addAppender(Logger &logger, log4cplus::SharedAppenderPtr& appender); - - private: - // Data - Hierarchy& h; - log4cplus::thread::Guard hierarchyLocker; - LoggerList loggerList; - }; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_HIERARCHY_LOCKER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/layout.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/layout.h deleted file mode 100644 index cb0b2dde..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/layout.h +++ /dev/null @@ -1,532 +0,0 @@ -// Module: Log4CPLUS -// File: Layout.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_LAYOUT_HEADER_ -#define _LOG4CPLUS_LAYOUT_HEADER_ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - - -namespace log4cplus { - - // Forward Declarations - namespace pattern { - class PatternConverter; - } - - - /** - * This class is used to layout strings sent to an {@link - * log4cplus::Appender}. - */ - class LOG4CPLUS_EXPORT Layout : protected :: log4cplus::helpers::LogLogUser { - public: - Layout() : llmCache(getLogLevelManager()) {} - Layout(const log4cplus::helpers::Properties&) - : llmCache(getLogLevelManager()) {} - virtual ~Layout() {} - - virtual void formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event) = 0; - protected: - LogLevelManager& llmCache; - - private: - // Disable copy - Layout(const Layout&); - Layout& operator=(Layout&); - }; - - - - /** - * SimpleLayout consists of the LogLevel of the log statement, - * followed by " - " and then the log message itself. For example, - * - * 
-     *         DEBUG - Hello world
-     *
- * - * {@link PatternLayout} offers a much more powerful alternative. - */ - class LOG4CPLUS_EXPORT SimpleLayout : public Layout { - public: - SimpleLayout() {} - SimpleLayout(const log4cplus::helpers::Properties& properties) : Layout(properties) {} - - virtual void formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event); - - private: - // Disallow copying of instances of this class - SimpleLayout(const SimpleLayout&); - SimpleLayout& operator=(const SimpleLayout&); - }; - - - - /** - * TTCC layout format consists of time, thread, Logger and nested - * diagnostic context information, hence the name. - * - * The time format depends on the DateFormat used. Use the - * Use_gmtime to specify whether messages should be logged using - * localtime or gmtime. - * - * Here is an example TTCCLayout output: - * - * 
-     * 176 [main] INFO  org.apache.log4j.examples.Sort - Populating an array of 2 elements in reverse order.
-     * 225 [main] INFO  org.apache.log4j.examples.SortAlgo - Entered the sort method.
-     * 262 [main] DEBUG org.apache.log4j.examples.SortAlgo.OUTER i=1 - Outer loop.
-     * 276 [main] DEBUG org.apache.log4j.examples.SortAlgo.SWAP i=1 j=0 - Swapping intArray[0] = 1 and intArray[1] = 0
-     * 290 [main] DEBUG org.apache.log4j.examples.SortAlgo.OUTER i=0 - Outer loop.
-     * 304 [main] INFO  org.apache.log4j.examples.SortAlgo.DUMP - Dump of interger array:
-     * 317 [main] INFO  org.apache.log4j.examples.SortAlgo.DUMP - Element [0] = 0
-     * 331 [main] INFO  org.apache.log4j.examples.SortAlgo.DUMP - Element [1] = 1
-     * 343 [main] INFO  org.apache.log4j.examples.Sort - The next log statement should be an error message.
-     * 346 [main] ERROR org.apache.log4j.examples.SortAlgo.DUMP - Tried to dump an uninitialized array.
-     * 467 [main] INFO  org.apache.log4j.examples.Sort - Exiting main method.
-     *
- * - * The first field is the number of milliseconds elapsed since the - * start of the program. The second field is the thread outputting the - * log statement. The third field is the LogLevel, the fourth field is - * the logger to which the statement belongs. - * - * The fifth field (just before the '-') is the nested diagnostic - * context. Note the nested diagnostic context may be empty as in the - * first two statements. The text after the '-' is the message of the - * statement. - * - * PatternLayout offers a much more flexible alternative. - */ - class LOG4CPLUS_EXPORT TTCCLayout : public Layout { - public: - // Ctor and dtor - TTCCLayout(bool use_gmtime = false); - TTCCLayout(const log4cplus::helpers::Properties& properties); - virtual ~TTCCLayout(); - - virtual void formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event); - - protected: - log4cplus::tstring dateFormat; - bool use_gmtime; - - private: - // Disallow copying of instances of this class - TTCCLayout(const TTCCLayout&); - TTCCLayout& operator=(const TTCCLayout&); - }; - - - - - /** - * A flexible layout configurable with pattern string. - * - * The goal of this class is to format a InternalLoggingEvent and return - * the results as a string. The results depend on the conversion - * pattern. - * - * The conversion pattern is closely related to the conversion - * pattern of the printf function in C. A conversion pattern is - * composed of literal text and format control expressions called - * conversion specifiers. - * - * You are free to insert any literal text within the conversion - * pattern. - * - * Each conversion specifier starts with a percent sign (%%) and is - * followed by optional format modifiers and a conversion - * character. The conversion character specifies the type of - * data, e.g. Logger, LogLevel, date, thread name. The format - * modifiers control such things as field width, padding, left and - * right justification. The following is a simple example. - * - * Let the conversion pattern be "%-5p [%t]: %m%n" and assume - * that the log4cplus environment was set to use a PatternLayout. Then the - * statements - * 
-     * Logger root = Logger.getRoot();
-     * LOG4CPLUS_DEBUG(root, "Message 1");
-     * LOG4CPLUS_WARN(root, "Message 2");
-     *
- * would yield the output - * 
-     * DEBUG [main]: Message 1
-     * WARN  [main]: Message 2  
-     *
- * - * Note that there is no explicit separator between text and - * conversion specifiers. The pattern parser knows when it has reached - * the end of a conversion specifier when it reads a conversion - * character. In the example above the conversion specifier - * "%-5p" means the LogLevel of the logging event should be left - * justified to a width of five characters. - * - * The recognized conversion characters are - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Conversion CharacterEffect
bUsed to output file name component of path name. - * E.g. main.cxx from path ../../main.cxx.
cUsed to output the logger of the logging event. The - * logger conversion specifier can be optionally followed by - * precision specifier, that is a decimal constant in - * brackets. - * - * If a precision specifier is given, then only the corresponding - * number of right most components of the logger name will be - * printed. By default the logger name is printed in full. - * - * For example, for the logger name "a.b.c" the pattern - * %c{2} will output "b.c". - * - *
dUsed to output the date of the logging event in UTC. - * - * The date conversion specifier may be followed by a date format - * specifier enclosed between braces. For example, %%d{%%H:%%M:%%s} - * or %%d{%%d %%b %%Y %%H:%%M:%%s}. If no date format - * specifier is given then %%d{%%d %%m %%Y %%H:%%M:%%s} - * is assumed. - * - * The Following format options are possible: - *
    - *
  • %%a -- Abbreviated weekday name
    • - *
  • %%A -- Full weekday name
    • - *
  • %%b -- Abbreviated month name
    • - *
  • %%B -- Full month name
    • - *
  • %%c -- Standard date and time string
    • - *
  • %%d -- Day of month as a decimal(1-31)
    • - *
  • %%H -- Hour(0-23)
    • - *
  • %%I -- Hour(1-12)
    • - *
  • %%j -- Day of year as a decimal(1-366)
    • - *
  • %%m -- Month as decimal(1-12)
    • - *
  • %%M -- Minute as decimal(0-59)
    • - *
  • %%p -- Locale's equivalent of AM or PM
    • - *
  • %%q -- milliseconds as decimal(0-999) -- Log4CPLUS specific - *
  • %%Q -- fractional milliseconds as decimal(0-999.999) -- Log4CPLUS specific - *
  • %%S -- Second as decimal(0-59)
    • - *
  • %%U -- Week of year, Sunday being first day(0-53)
    • - *
  • %%w -- Weekday as a decimal(0-6, Sunday being 0)
    • - *
  • %%W -- Week of year, Monday being first day(0-53)
    • - *
  • %%x -- Standard date string
    • - *
  • %%X -- Standard time string
    • - *
  • %%y -- Year in decimal without century(0-99)
    • - *
  • %%Y -- Year including century as decimal
    • - *
  • %%Z -- Time zone name
    • - *
  • %% -- The percent sign
    • - *
- * - * Lookup the documentation for the strftime() function - * found in the <ctime> header for more information. - *
DUsed to output the date of the logging event in local time. - * - * All of the above information applies. - *
FUsed to output the file name where the logging request was - * issued. - * - * NOTE Unlike log4j, there is no performance penalty for - * calling this method. - * - *
hUsed to output the hostname of this system (as returned - * by gethostname(2)). - * - * NOTE The hostname is only retrieved once at - * initialization. - * - *
HUsed to output the fully-qualified domain name of this - * system (as returned by gethostbyname(2) for the hostname - * returned by gethostname(2)). - * - * NOTE The hostname is only retrieved once at - * initialization. - * - *
lEquivalent to using "%F:%L" - * - * NOTE: Unlike log4j, there is no performance penalty for - * calling this method. - * - *
LUsed to output the line number from where the logging request - * was issued. - * - * NOTE: Unlike log4j, there is no performance penalty for - * calling this method. - * - *
mUsed to output the application supplied message associated with - * the logging event.
nOutputs the platform dependent line separator character or - * characters. - *
pUsed to output the LogLevel of the logging event.
tUsed to output the name of the thread that generated the - * logging event.
iUsed to output the process ID of the process that generated the - * logging event.
xUsed to output the NDC (nested diagnostic context) associated - * with the thread that generated the logging event. - *
"%%"The sequence "%%" outputs a single percent sign. - *
- * - * By default the relevant information is output as is. However, - * with the aid of format modifiers it is possible to change the - * minimum field width, the maximum field width and justification. - * - * The optional format modifier is placed between the percent sign - * and the conversion character. - * - * The first optional format modifier is the left justification - * flag which is just the minus (-) character. Then comes the - * optional minimum field width modifier. This is a decimal - * constant that represents the minimum number of characters to - * output. If the data item requires fewer characters, it is padded on - * either the left or the right until the minimum width is - * reached. The default is to pad on the left (right justify) but you - * can specify right padding with the left justification flag. The - * padding character is space. If the data item is larger than the - * minimum field width, the field is expanded to accommodate the - * data. The value is never truncated. - * - * This behavior can be changed using the maximum field - * width modifier which is designated by a period followed by a - * decimal constant. If the data item is longer than the maximum - * field, then the extra characters are removed from the - * beginning of the data item and not from the end. For - * example, it the maximum field width is eight and the data item is - * ten characters long, then the first two characters of the data item - * are dropped. This behavior deviates from the printf function in C - * where truncation is done from the end. - * - * Below are various format modifier examples for the logger - * conversion specifier. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Format modifierleft justifyminimum widthmaximum widthcomment
%20cfalse20noneLeft pad with spaces if the logger name is less than 20 - * characters long. - *
%-20c true 20 none Right pad with - * spaces if the logger name is less than 20 characters long. - *
%.30cNAnone30Truncate from the beginning if the logger name is longer than 30 - * characters. - *
%20.30cfalse2030Left pad with spaces if the logger name is shorter than 20 - * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. - *
%-20.30ctrue2030Right pad with spaces if the logger name is shorter than 20 - * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. - *
- * - * Below are some examples of conversion patterns. - * - *
- * - *
"%r [%t] %-5p %c %x - %m%n" - *
This is essentially the TTCC layout. - * - *
"%-6r [%15.15t] %-5p %30.30c %x - %m%n" - * - *
Similar to the TTCC layout except that the relative time is - * right padded if less than 6 digits, thread name is right padded if - * less than 15 characters and truncated if longer and the logger - * name is left padded if shorter than 30 characters and truncated if - * longer. - * - *
- * - * The above text is largely inspired from Peter A. Darnell and - * Philip E. Margolis' highly recommended book "C -- a Software - * Engineering Approach", ISBN 0-387-97389-3. - */ - class LOG4CPLUS_EXPORT PatternLayout : public Layout { - public: - // Ctors and dtor - PatternLayout(const log4cplus::tstring& pattern); - PatternLayout(const log4cplus::helpers::Properties& properties); - virtual ~PatternLayout(); - - virtual void formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event); - - protected: - void init(const log4cplus::tstring& pattern, unsigned ndcMaxDepth = 0); - - // Data - log4cplus::tstring pattern; - std::vector parsedPattern; - - private: - // Disallow copying of instances of this class - PatternLayout(const PatternLayout&); - PatternLayout& operator=(const PatternLayout&); - }; - - - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_LAYOUT_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/logger.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/logger.h deleted file mode 100644 index 1423106b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/logger.h +++ /dev/null @@ -1,344 +0,0 @@ -// Module: Log4CPLUS -// File: logger.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file - * This header defines the Logger class and the logging macros. */ - -#ifndef _LOG4CPLUS_LOGGERHEADER_ -#define _LOG4CPLUS_LOGGERHEADER_ - -#include -#include -#include -#include -#include - -#include - - -namespace log4cplus -{ - // Forward declarations - - class Appender; - class Hierarchy; - class HierarchyLocker; - class DefaultLoggerFactory; - - namespace spi - { - - class LoggerImpl; - - } - - - /** \typedef std::vector LoggerList - * This is a list of {@link Logger Loggers}. */ - typedef std::vector LoggerList; - - - /** - * This is the central class in the log4cplus package. One of the - * distintive features of log4cplus are hierarchical loggers and their - * evaluation. - * - * See the user manual for an - * introduction on this class. - */ - class LOG4CPLUS_EXPORT Logger - : public log4cplus::spi::AppenderAttachable - { - public: - // Static Methods - /** - * Returns true if the named logger exists - * (in the default hierarchy). - * - * @param name The name of the logger to search for. - */ - static bool exists(const log4cplus::tstring& name); - - /* - * Returns all the currently defined loggers in the default - * hierarchy. - * - * The root logger is not included in the returned - * list. - */ - static LoggerList getCurrentLoggers(); - - /** - * Return the default Hierarchy instance. - */ - static Hierarchy& getDefaultHierarchy(); - - /** - * Retrieve a logger with name name. If the named - * logger already exists, then the existing instance will be returned. - * Otherwise, a new instance is created. - * - * By default, loggers do not have a set LogLevel but inherit - * it from the hierarchy. This is one of the central features of - * log4cplus. - * - * @param name The name of the logger to retrieve. - */ - static Logger getInstance(const log4cplus::tstring& name); - - /** - * Like getInstance() except that the type of logger - * instantiated depends on the type returned by the {@link - * spi::LoggerFactory#makeNewLoggerInstance} method of the - * factory parameter. - * - * This method is intended to be used by sub-classes. - * - * @param name The name of the logger to retrieve. - * @param factory A {@link spi::LoggerFactory} implementation that will - * actually create a new Instance. - */ - static Logger getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory); - - /** - * Return the root of the default logger hierrachy. - * - * The root logger is always instantiated and available. It's - * name is "root". - * - * Nevertheless, calling {@link #getInstance - * Logger.getInstance("root")} does not retrieve the root logger - * but a logger just under root named "root". - */ - static Logger getRoot(); - - /** - * Calling this method will safely close and remove all - * appenders in all the loggers including root contained in the - * default hierachy. - * - * Some appenders such as SocketAppender need to be closed before the - * application exits. Otherwise, pending logging events might be - * lost. - * - * The shutdown method is careful to close nested - * appenders before closing regular appenders. This is allows - * configurations where a regular appender is attached to a logger - * and again to a nested appender. - */ - static void shutdown(); - - // Non-Static Methods - /** - * If assertionVal parameter is false, then - * logs msg with FATAL_LOG_LEVEL log level. - * - * @param assertionVal Truth value of assertion condition. - * @param msg The message to print if assertion is - * false. - */ - void assertion(bool assertionVal, const log4cplus::tstring& msg) const; - - /** - * Close all attached appenders implementing the AppenderAttachable - * interface. - */ - void closeNestedAppenders() const; - - /** - * Check whether this logger is enabled for a given - * LogLevel passed as parameter. - * - * @return boolean True if this logger is enabled for ll. - */ - bool isEnabledFor(LogLevel ll) const; - - /** - * This generic form is intended to be used by wrappers. - */ - void log(LogLevel ll, const log4cplus::tstring& message, - const char* file=NULL, int line=-1) const; - - /** - * This method creates a new logging event and logs the event - * without further checks. - */ - void forcedLog(LogLevel ll, const log4cplus::tstring& message, - const char* file=NULL, int line=-1) const; - - /** - * Call the appenders in the hierrachy starting at - * this. If no appenders could be found, emit a - * warning. - * - * This method calls all the appenders inherited from the - * hierarchy circumventing any evaluation of whether to log or not - * to log the particular log request. - * - * @param event the event to log. - */ - void callAppenders(const spi::InternalLoggingEvent& event) const; - - /** - * Starting from this logger, search the logger hierarchy for a - * "set" LogLevel and return it. Otherwise, return the LogLevel of the - * root logger. - * - * The Logger class is designed so that this method executes as - * quickly as possible. - */ - LogLevel getChainedLogLevel() const; - - /** - * Returns the assigned LogLevel, if any, for this Logger. - * - * @return LogLevel - the assigned LogLevel, can be NOT_SET_LOG_LEVEL. - */ - LogLevel getLogLevel() const; - - /** - * Set the LogLevel of this Logger. - */ - void setLogLevel(LogLevel ll); - - /** - * Return the the {@link Hierarchy} where this Logger instance is - * attached. - */ - Hierarchy& getHierarchy() const; - - /** - * Return the logger name. - */ - log4cplus::tstring getName() const; - - /** - * Get the additivity flag for this Logger instance. - */ - bool getAdditivity() const; - - /** - * Set the additivity flag for this Logger instance. - */ - void setAdditivity(bool additive); - - // AppenderAttachable Methods - virtual void addAppender(SharedAppenderPtr newAppender); - - virtual SharedAppenderPtrList getAllAppenders(); - - virtual SharedAppenderPtr getAppender(const log4cplus::tstring& name); - - virtual void removeAllAppenders(); - - virtual void removeAppender(SharedAppenderPtr appender); - - virtual void removeAppender(const log4cplus::tstring& name); - - Logger (); - Logger(const Logger& rhs); - Logger& operator=(const Logger& rhs); - virtual ~Logger(); - - void swap (Logger &); - - /** - * Used to retrieve the parent of this Logger in the - * Logger tree. - */ - Logger getParent() const; - - protected: - // Data - /** This is a pointer to the implementation class. */ - spi::LoggerImpl * value; - - private: - // Ctors - /** - * This constructor created a new Logger instance - * with a pointer to a Logger implementation. - * - * You should not create loggers directly. - * - * @param ptr A pointer to the Logger implementation. This value - * cannot be NULL. - */ - Logger(spi::LoggerImpl * ptr); - - // Friends - friend class log4cplus::spi::LoggerImpl; - friend class log4cplus::Hierarchy; - friend class log4cplus::HierarchyLocker; - friend class log4cplus::DefaultLoggerFactory; - }; - - - /** - * This class is used to create the default implementation of - * the Logger class - */ - class LOG4CPLUS_EXPORT DefaultLoggerFactory : public spi::LoggerFactory { - public: - Logger makeNewLoggerInstance(const log4cplus::tstring& name, Hierarchy& h); - }; - - - - /** - * This class is used to produce "Trace" logging. When an instance of - * this class is created, it will log a "ENTER: " + msg - * log message if TRACE_LOG_LEVEL is enabled for logger. - * When an instance of this class is destroyed, it will log a - * "ENTER: " + msg log message if TRACE_LOG_LEVEL is enabled - * for logger. - * - * @see LOG4CPLUS_TRACE - */ - class TraceLogger - { - public: - TraceLogger(const Logger& l, const log4cplus::tstring& _msg, - const char* _file=NULL, int _line=-1) - : logger(l), msg(_msg), file(_file), line(_line) - { if(logger.isEnabledFor(TRACE_LOG_LEVEL)) - logger.forcedLog(TRACE_LOG_LEVEL, LOG4CPLUS_TEXT("ENTER: ") + msg, file, line); - } - - ~TraceLogger() - { if(logger.isEnabledFor(TRACE_LOG_LEVEL)) - logger.forcedLog(TRACE_LOG_LEVEL, LOG4CPLUS_TEXT("EXIT: ") + msg, file, line); - } - - private: - Logger logger; - log4cplus::tstring msg; - const char* file; - int line; - }; - -} // end namespace log4cplus - - -#include - - -#endif // _LOG4CPLUS_LOGGERHEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loggingmacros.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loggingmacros.h deleted file mode 100644 index fb955042..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loggingmacros.h +++ /dev/null @@ -1,191 +0,0 @@ -// Module: Log4CPLUS -// File: loggingmacros.h -// Created: 8/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file - * This header defines the logging macros. */ - -#ifndef _LOG4CPLUS_LOGGING_MACROS_HEADER_ -#define _LOG4CPLUS_LOGGING_MACROS_HEADER_ - -#include -#include - - -#if defined(LOG4CPLUS_DISABLE_FATAL) && !defined(LOG4CPLUS_DISABLE_ERROR) -#define LOG4CPLUS_DISABLE_ERROR -#endif -#if defined(LOG4CPLUS_DISABLE_ERROR) && !defined(LOG4CPLUS_DISABLE_WARN) -#define LOG4CPLUS_DISABLE_WARN -#endif -#if defined(LOG4CPLUS_DISABLE_WARN) && !defined(LOG4CPLUS_DISABLE_INFO) -#define LOG4CPLUS_DISABLE_INFO -#endif -#if defined(LOG4CPLUS_DISABLE_INFO) && !defined(LOG4CPLUS_DISABLE_DEBUG) -#define LOG4CPLUS_DISABLE_DEBUG -#endif -#if defined(LOG4CPLUS_DISABLE_DEBUG) && !defined(LOG4CPLUS_DISABLE_TRACE) -#define LOG4CPLUS_DISABLE_TRACE -#endif - - -#if defined (LOG4CPLUS_SINGLE_THREADED) - -namespace log4cplus -{ - -extern LOG4CPLUS_EXPORT tostringstream _macros_oss; - -LOG4CPLUS_EXPORT void _clear_tostringstream (tostringstream &); - -} // namespace log4cplus - - -#define LOG4CPLUS_MACRO_BODY(logger, logEvent, logLevel) \ - do { \ - if((logger).isEnabledFor(log4cplus::logLevel##_LOG_LEVEL)) { \ - log4cplus::_clear_tostringstream (log4cplus::_macros_oss); \ - log4cplus::_macros_oss << logEvent; \ - (logger).forcedLog(log4cplus::logLevel##_LOG_LEVEL, \ - log4cplus::_macros_oss.str(), __FILE__, __LINE__); \ - } \ - } while (0) - - -#else // defined (LOG4CPLUS_SINGLE_THREADED) - -#define LOG4CPLUS_MACRO_BODY(logger, logEvent, logLevel) \ - do { \ - if((logger).isEnabledFor(log4cplus::logLevel##_LOG_LEVEL)) { \ - log4cplus::tostringstream _log4cplus_buf; \ - _log4cplus_buf << logEvent; \ - (logger).forcedLog(log4cplus::logLevel##_LOG_LEVEL, \ - _log4cplus_buf.str(), __FILE__, __LINE__); \ - } \ - } while (0) - - -#endif // defined (LOG4CPLUS_SINGLE_THREADED) - -#define LOG4CPLUS_MACRO_STR_BODY(logger, logEvent, logLevel) \ - do { \ - if((logger).isEnabledFor(log4cplus::logLevel##_LOG_LEVEL)) { \ - (logger).forcedLog(log4cplus::logLevel##_LOG_LEVEL, \ - logEvent, __FILE__, __LINE__); \ - } \ - } while(0) - - -/** - * @def LOG4CPLUS_TRACE(logger, logEvent) This macro creates a TraceLogger - * to log a TRACE_LOG_LEVEL message to logger upon entry and - * exiting of a method. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_TRACE) -#define LOG4CPLUS_TRACE_METHOD(logger, logEvent) \ - log4cplus::TraceLogger _log4cplus_trace_logger(logger, logEvent, \ - __FILE__, __LINE__); -#define LOG4CPLUS_TRACE(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, TRACE) -#define LOG4CPLUS_TRACE_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, TRACE) -#else -#define LOG4CPLUS_TRACE_METHOD(logger, logEvent) do { } while (0) -#define LOG4CPLUS_TRACE(logger, logEvent) do { } while (0) -#define LOG4CPLUS_TRACE_STR(logger, logEvent) do { } while (0) -#endif - -/** - * @def LOG4CPLUS_DEBUG(logger, logEvent) This macro is used to log a - * DEBUG_LOG_LEVEL message to logger. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_DEBUG) -#define LOG4CPLUS_DEBUG(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, DEBUG) -#define LOG4CPLUS_DEBUG_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, DEBUG) -#else -#define LOG4CPLUS_DEBUG(logger, logEvent) do { } while (0) -#define LOG4CPLUS_DEBUG_STR(logger, logEvent) do { } while (0) -#endif - -/** - * @def LOG4CPLUS_INFO(logger, logEvent) This macro is used to log a - * INFO_LOG_LEVEL message to logger. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_INFO) -#define LOG4CPLUS_INFO(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, INFO) -#define LOG4CPLUS_INFO_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, INFO) -#else -#define LOG4CPLUS_INFO(logger, logEvent) do { } while (0) -#define LOG4CPLUS_INFO_STR(logger, logEvent) do { } while (0) -#endif - -/** - * @def LOG4CPLUS_WARN(logger, logEvent) This macro is used to log a - * WARN_LOG_LEVEL message to logger. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_WARN) -#define LOG4CPLUS_WARN(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, WARN) -#define LOG4CPLUS_WARN_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, WARN) -#else -#define LOG4CPLUS_WARN(logger, logEvent) do { } while (0) -#define LOG4CPLUS_WARN_STR(logger, logEvent) do { } while (0) -#endif - -/** - * @def LOG4CPLUS_ERROR(logger, logEvent) This macro is used to log a - * ERROR_LOG_LEVEL message to logger. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_ERROR) -#define LOG4CPLUS_ERROR(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, ERROR) -#define LOG4CPLUS_ERROR_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, ERROR) -#else -#define LOG4CPLUS_ERROR(logger, logEvent) do { } while (0) -#define LOG4CPLUS_ERROR_STR(logger, logEvent) do { } while (0) -#endif - -/** - * @def LOG4CPLUS_FATAL(logger, logEvent) This macro is used to log a - * FATAL_LOG_LEVEL message to logger. - * logEvent will be streamed into an ostream. - */ -#if !defined(LOG4CPLUS_DISABLE_FATAL) -#define LOG4CPLUS_FATAL(logger, logEvent) \ - LOG4CPLUS_MACRO_BODY (logger, logEvent, FATAL) -#define LOG4CPLUS_FATAL_STR(logger, logEvent) \ - LOG4CPLUS_MACRO_STR_BODY (logger, logEvent, FATAL) -#else -#define LOG4CPLUS_FATAL(logger, logEvent) do { } while (0) -#define LOG4CPLUS_FATAL_STR(logger, logEvent) do { } while (0) -#endif - -#endif /* _LOG4CPLUS_LOGGING_MACROS_HEADER_ */ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loglevel.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loglevel.h deleted file mode 100644 index 8e7dfeb5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/loglevel.h +++ /dev/null @@ -1,183 +0,0 @@ -// Module: Log4CPLUS -// File: loglevel.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file - * This header defines the LogLevel type. - */ - -#ifndef LOG4CPLUS_LOGLEVEL_HEADER_ -#define LOG4CPLUS_LOGLEVEL_HEADER_ - -#include -#include - -#include - -namespace log4cplus { - - /** - * \typedef int LogLevel - * Defines the minimum set of priorities recognized by the system, - * that is {@link #FATAL_LOG_LEVEL}, {@link #ERROR_LOG_LEVEL}, {@link - * #WARN_LOG_LEVEL}, {@link #INFO_LOG_LEVEL}, {@link #DEBUG_LOG_LEVEL}, - * and {@link #TRACE_LOG_LEVEL}. - */ - typedef int LogLevel; - - /** \var const LogLevel OFF_LOG_LEVEL - * The OFF_LOG_LEVEL LogLevel is used during configuration to - * turn off logging. */ - const LogLevel OFF_LOG_LEVEL = 60000; - - /** \var const LogLevel FATAL_LOG_LEVEL - * The FATAL_LOG_LEVEL LogLevel designates very severe error - * events that will presumably lead the application to abort. */ - const LogLevel FATAL_LOG_LEVEL = 50000; - - /** \var const LogLevel ERROR_LOG_LEVEL - * The ERROR_LOG_LEVEL LogLevel designates error events that - * might still allow the application to continue running. */ - const LogLevel ERROR_LOG_LEVEL = 40000; - - /** \var const LogLevel WARN_LOG_LEVEL - * The WARN_LOG_LEVEL LogLevel designates potentially harmful - * situations. */ - const LogLevel WARN_LOG_LEVEL = 30000; - - /** \var const LogLevel INFO_LOG_LEVEL - * The INFO_LOG_LEVEL LogLevel designates informational - * messages that highlight the progress of the application at - * coarse-grained level. */ - const LogLevel INFO_LOG_LEVEL = 20000; - - /** \var const LogLevel DEBUG_LOG_LEVEL - * The DEBUG_LOG_LEVEL LogLevel designates fine-grained - * informational events that are most useful to debug an application. */ - const LogLevel DEBUG_LOG_LEVEL = 10000; - - /** \var const LogLevel TRACE_LOG_LEVEL - * The TRACE_LOG_LEVEL LogLevel is used to "trace" entry - * and exiting of methods. */ - const LogLevel TRACE_LOG_LEVEL = 0; - - /** \var const LogLevel ALL_LOG_LEVEL - * The ALL_LOG_LEVEL LogLevel is used during configuration to - * turn on all logging. */ - const LogLevel ALL_LOG_LEVEL = TRACE_LOG_LEVEL; - - /** \var const LogLevel NOT_SET_LOG_LEVEL - * The NOT_SET_LOG_LEVEL LogLevel is used to indicated that - * no particular LogLevel is desired and that the default should be used. - */ - const LogLevel NOT_SET_LOG_LEVEL = -1; - - - /** - * This method type defined the signature of methods that convert LogLevels - * into strings. - * - * Note: Must return an empty tstring for unrecognized values. - */ - typedef log4cplus::tstring (*LogLevelToStringMethod)(LogLevel); - - /** - * This method type defined the signature of methods that convert strings - * into LogLevels. - * - * Note: Must return NOT_SET_LOG_LEVEL for unrecognized values. - */ - typedef LogLevel (*StringToLogLevelMethod)(const log4cplus::tstring&); - - - - /** - * This class is used to "manage" LogLevel definitions. This class is also - * how "derived" LogLevels are created. Here are the steps to creating a - * "derived" LogLevel: - *
    - *
  1. Create a LogLevel constant (greater than 0)
    2. - *
  2. Define a string to represent that constant
    3. - *
  3. Implement a LogLevelToStringMethod method.
    4. - *
  4. Implement a StringToLogLevelMethod method.
    5. - *
  5. create a "static initializer" that registers those 2 methods - * with the LogLevelManager singleton.
    6. - *
- */ - class LOG4CPLUS_EXPORT LogLevelManager { - public: - LogLevelManager(); - ~LogLevelManager(); - - /** - * This method is called by all Layout classes to convert a LogLevel - * into a string. - * - * Note: It traverses the list of LogLevelToStringMethod - * to do this, so all "derived" LogLevels are recognized as well. - */ - log4cplus::tstring toString(LogLevel ll) const; - - /** - * This method is called by all classes internally to log4cplus to - * convert a string into a LogLevel. - * - * Note: It traverses the list of StringToLogLevelMethod - * to do this, so all "derived" LogLevels are recognized as well. - */ - LogLevel fromString(const log4cplus::tstring& s) const; - - /** - * When creating a "derived" LogLevel, a LogLevelToStringMethod - * should be defined and registered with the LogLevelManager by calling - * this method. - * - * @see pushFromStringMethod - */ - void pushToStringMethod(LogLevelToStringMethod newToString); - - /** - * When creating a "derived" LogLevel, a StringToLogLevelMethod - * should be defined and registered with the LogLevelManager by calling - * this method. - * - * @see pushToStringMethod - */ - void pushFromStringMethod(StringToLogLevelMethod newFromString); - - private: - // Data - void* toStringMethods; - void* fromStringMethods; - - // Disable Copy - LogLevelManager(const LogLevelManager&); - LogLevelManager& operator=(const LogLevelManager&); - }; - - /** - * Returns the singleton LogLevelManager. - */ - LOG4CPLUS_EXPORT LogLevelManager& getLogLevelManager(); - -} - - -#endif // LOG4CPLUS_LOGLEVEL_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/ndc.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/ndc.h deleted file mode 100644 index 64988163..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/ndc.h +++ /dev/null @@ -1,318 +0,0 @@ -// Module: Log4CPLUS -// File: ndc.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file - * This header defined the NDC class. - */ - -#ifndef _LO4CPLUS_NDC_HEADER_ -#define _LO4CPLUS_NDC_HEADER_ - -#include -#include -#include - -#include -#include - -#if (defined(__MWERKS__) && defined(__MACOS__)) -using std::size_t; -#endif - - -namespace log4cplus { - // Forward declarations - class NDC; - struct DiagnosticContext; - typedef std::stack DiagnosticContextStack; - -#if defined (_MSC_VER) || defined (__HP_aCC) - LOG4CPLUS_EXPORT NDC& getNDC(); -#endif - - - /** - * The NDC class implements nested diagnostic contexts as - * defined by Neil Harrison in the article "Patterns for Logging - * Diagnostic Messages" part of the book "Pattern Languages of - * Program Design 3" edited by Martin et al. - * - * A Nested Diagnostic Context, or NDC in short, is an instrument - * to distinguish interleaved log output from different sources. Log - * output is typically interleaved when a server handles multiple - * clients near-simultaneously. - * - * Interleaved log output can still be meaningful if each log entry - * from different contexts had a distinctive stamp. This is where NDCs - * come into play. - * - * Note that NDCs are managed on a per thread - * basis. NDC operations such as {@link #push}, {@link - * #pop}, {@link #clear}, {@link #getDepth} and {@link #setMaxDepth} - * affect the NDC of the current thread only. NDCs of other - * threads remain unaffected. - * - * For example, a server can build a per client request NDC - * consisting the clients host name and other information contained in - * the the request. Cookies are another source of distinctive - * information. To build an NDC one uses the {@link #push} - * operation. Simply put, - * - *
    - *
  • Contexts can be nested. - * - *
  • When entering a context, call getNDC().push(). As a - * side effect, if there is no nested diagnostic context for the - * current thread, this method will create it. - * - *
  • When leaving a context, call getNDC().pop(). - * - *
  • When exiting a thread make sure to call {@link #remove - * NDC.remove()}. - *
- * - * There is no penalty for forgetting to match each - * push operation with a corresponding pop, - * except the obvious mismatch between the real application context - * and the context set in the NDC. Use of the {@link NDCContextCreator} - * class can automate this process and make your code exception-safe. - * - * If configured to do so, {@link log4cplus::PatternLayout} and {@link - * log4cplus::TTCCLayout} instances automatically retrieve the nested diagnostic - * context for the current thread without any user intervention. - * Hence, even if a server is serving multiple clients - * simultaneously, the logs emanating from the same code (belonging to - * the same logger) can still be distinguished because each client - * request will have a different NDC tag. - * - * Heavy duty systems should call the {@link #remove} method when - * leaving the run method of a thread. This ensures that the memory - * used by the thread can be freed. - * - * A thread may inherit the nested diagnostic context of another - * (possibly parent) thread using the {@link #inherit inherit} - * method. A thread may obtain a copy of its NDC with the {@link - * #cloneStack cloneStack} method and pass the reference to any other - * thread, in particular to a child. - */ - class LOG4CPLUS_EXPORT NDC : protected log4cplus::helpers::LogLogUser { - public: - /** - * Clear any nested diagnostic information if any. This method is - * useful in cases where the same thread can be potentially used - * over and over in different unrelated contexts. - * - * This method is equivalent to calling the {@link #setMaxDepth} - * method with a zero maxDepth argument. - */ - void clear(); - - /** - * Clone the diagnostic context for the current thread. - * - * Internally a diagnostic context is represented as a stack. A - * given thread can supply the stack (i.e. diagnostic context) to a - * child thread so that the child can inherit the parent thread's - * diagnostic context. - * - * The child thread uses the {@link #inherit inherit} method to - * inherit the parent's diagnostic context. - * - * @return Stack A clone of the current thread's diagnostic context. - */ - DiagnosticContextStack cloneStack(); - - /** - * Inherit the diagnostic context of another thread. - * - * The parent thread can obtain a reference to its diagnostic - * context using the {@link #cloneStack} method. It should - * communicate this information to its child so that it may inherit - * the parent's diagnostic context. - * - * The parent's diagnostic context is cloned before being - * inherited. In other words, once inherited, the two diagnostic - * contexts can be managed independently. - * - * @param stack The diagnostic context of the parent thread. - */ - void inherit(const DiagnosticContextStack& stack); - - /** - * Used when printing the diagnostic context. - */ - log4cplus::tstring get(); - - /** - * Get the current nesting depth of this diagnostic context. - * - * @see #setMaxDepth - */ - size_t getDepth(); - - /** - * Clients should call this method before leaving a diagnostic - * context. - * - * The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is - * returned. If each call to push() is paired with a call to - * pop() (even in presence of thrown exceptions), the last - * pop() call frees the memory used by NDC for this - * thread. Otherwise, remove() must be called at the end of - * the thread to free the memory used by NDC for the thread. - * - * @return String The innermost diagnostic context. - * - * @see NDCContextCreator, remove(), push() - */ - log4cplus::tstring pop(); - - /** - * Looks at the last diagnostic context at the top of this NDC - * without removing it. - * - * The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned. - * - * @return String The innermost diagnostic context. - */ - log4cplus::tstring peek(); - - /** - * Push new diagnostic context information for the current thread. - * - * The contents of the message parameter is - * determined solely by the client. Each call to push() should - * be paired with a call to pop(). - * - * @param message The new diagnostic context information. - * - * @see NDCContextCreator, pop(), remove() - */ - void push(const log4cplus::tstring& message); - - /** - * Remove the diagnostic context for this thread. - * - * Each thread that created a diagnostic context by calling - * push() should call this method before exiting. Otherwise, - * the memory used by the thread cannot be reclaimed. It is - * possible to omit this call if and only if each push() call - * is always paired with a pop() call (even in presence of - * thrown exceptions). Then the memory used by NDC will be - * returned by the last pop() call and a call to remove() will - * be no-op. - */ - void remove(); - - /** - * Set maximum depth of this diagnostic context. If the current - * depth is smaller or equal to maxDepth, then no - * action is taken. - * - * This method is a convenient alternative to multiple {@link - * #pop} calls. Moreover, it is often the case that at the end of - * complex call sequences, the depth of the NDC is - * unpredictable. The setMaxDepth method circumvents - * this problem. - * - * For example, the combination - * 
-         *    void foo() {
-         *       size_t depth = NDC.getDepth();
-         *
-         *       ... complex sequence of calls
-         *
-         *       NDC.setMaxDepth(depth);
-         *    }
-         *
- * - * ensures that between the entry and exit of foo the depth of the - * diagnostic stack is conserved. - * - * Note: Use of the {@link NDCContextCreator} class will solve - * this particular problem. - * - * @see #getDepth - */ - void setMaxDepth(size_t maxDepth); - - // Dtor - ~NDC(); - - private: - // Methods - DiagnosticContextStack* getPtr(); - - // Data - LOG4CPLUS_THREAD_LOCAL_TYPE threadLocal; - - // Disallow construction (and copying) except by getNDC() - NDC(); - NDC(const NDC&); - NDC& operator=(const NDC&); - - // Friends -#if defined (_MSC_VER) || defined (__HP_aCC) - friend LOG4CPLUS_EXPORT NDC& getNDC(); -#else - friend NDC& getNDC(); -#endif - }; - - - /** - * Return a reference to the singleton object. - */ - LOG4CPLUS_EXPORT NDC& getNDC(); - - - /** - * This is the internal object that is stored on the NDC stack. - */ - struct LOG4CPLUS_EXPORT DiagnosticContext { - // Ctors - DiagnosticContext(const log4cplus::tstring& message, DiagnosticContext *parent); - DiagnosticContext(const log4cplus::tstring& message); - - // Data - log4cplus::tstring message; /*!< The message at this context level. */ - log4cplus::tstring fullMessage; /*!< The entire message stack. */ - }; - - - /** - * This class ensures that a {@link NDC#push} call is always matched with - * a {@link NDC#pop} call even in the face of exceptions. - */ - class LOG4CPLUS_EXPORT NDCContextCreator { - public: - /** Pushes msg onto the NDC stack. */ - NDCContextCreator(const log4cplus::tstring& msg); - - /** Pops the NDC stack. */ - ~NDCContextCreator(); - }; - -} // end namespace log4cplus - - -#endif // _LO4CPLUS_NDC_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nteventlogappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nteventlogappender.h deleted file mode 100644 index 58da44cd..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nteventlogappender.h +++ /dev/null @@ -1,81 +0,0 @@ -// Module: Log4CPLUS -// File: nteventlogappender.h -// Created: 4/2003 -// Author: Michael CATANZARITI -// -// Copyright 2003-2009 Michael CATANZARITI -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_NT_EVENT_LOG_APPENDER_HEADER_ -#define _LOG4CPLUS_NT_EVENT_LOG_APPENDER_HEADER_ - -#include -#include - -#if defined(_WIN32) -# if ! defined (LOG4CPLUS_HAVE_NT_EVENT_LOG) -# error "Your platform does not support NT event log." -# else - - -namespace log4cplus { - - /** - * Appends log events to NT EventLog. - */ - class LOG4CPLUS_EXPORT NTEventLogAppender : public Appender { - public: - // ctors - NTEventLogAppender(const log4cplus::tstring& server, - const log4cplus::tstring& log, - const log4cplus::tstring& source); - NTEventLogAppender(const log4cplus::helpers::Properties properties); - - // dtor - virtual ~NTEventLogAppender(); - - // public Methods - virtual void close(); - - protected: - virtual void append(const spi::InternalLoggingEvent& event); - virtual WORD getEventType(const spi::InternalLoggingEvent& event); - virtual WORD getEventCategory(const spi::InternalLoggingEvent& event); - void init(); - - /* - * Add this source with appropriate configuration keys to the registry. - */ - void addRegistryInfo(); - - // Data - log4cplus::tstring server; - log4cplus::tstring log; - log4cplus::tstring source; - HANDLE hEventLog; - SID* pCurrentUserSID; - - private: - // Disallow copying of instances of this class - NTEventLogAppender(const NTEventLogAppender&); - NTEventLogAppender& operator=(const NTEventLogAppender&); - }; - -} // end namespace log4cplus - -#endif // LOG4CPLUS_HAVE_NT_EVENT_LOG -#endif // _WIN32 -#endif //_LOG4CPLUS_NT_EVENT_LOG_APPENDER_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nullappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nullappender.h deleted file mode 100644 index 32063f21..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/nullappender.h +++ /dev/null @@ -1,60 +0,0 @@ -// Module: Log4CPLUS -// File: nullappender.h -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_NULL_APPENDER_HEADER_ -#define _LOG4CPLUS_NULL_APPENDER_HEADER_ - -#include -#include -#include - - -namespace log4cplus { - - /** - * Appends log events to a file. - */ - class LOG4CPLUS_EXPORT NullAppender : public Appender { - public: - // Ctors - NullAppender(); - NullAppender(const log4cplus::helpers::Properties& properties); - - // Dtor - virtual ~NullAppender(); - - // Methods - virtual void close(); - - protected: - virtual void append(const log4cplus::spi::InternalLoggingEvent& event); - - private: - // Disallow copying of instances of this class - NullAppender(const NullAppender&); - NullAppender& operator=(const NullAppender&); - }; - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_NULL_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/socketappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/socketappender.h deleted file mode 100644 index 5b141586..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/socketappender.h +++ /dev/null @@ -1,161 +0,0 @@ -// Module: LOG4CPLUS -// File: socketappender.h -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SOCKET_APPENDER_HEADER_ -#define _LOG4CPLUS_SOCKET_APPENDER_HEADER_ - -#include -#include -#include -#include - - -#ifndef UNICODE -# define LOG4CPLUS_MAX_MESSAGE_SIZE (8*1024) -#else -# define LOG4CPLUS_MAX_MESSAGE_SIZE (2*8*1024) -#endif - - -namespace log4cplus { - - /** - * Sends {@link spi::InternalLoggingEvent} objects to a remote a log server. - * - * The SocketAppender has the following properties: - * - *
    - * - *
  • Remote logging is non-intrusive as far as the log event - * is concerned. In other words, the event will be logged with - * the same time stamp, NDC, location info as if it were logged - * locally by the client. - * - *
  • SocketAppenders do not use a layout. - * - *
  • Remote logging uses the TCP protocol. Consequently, if - * the server is reachable, then log events will eventually arrive - * at the server. - * - *
  • If the remote server is down, the logging requests are - * simply dropped. However, if and when the server comes back up, - * then event transmission is resumed transparently. This - * transparent reconneciton is performed by a connector - * thread which periodically attempts to connect to the server. - * - *
  • Logging events are automatically buffered by the - * native TCP implementation. This means that if the link to server - * is slow but still faster than the rate of (log) event production - * by the client, the client will not be affected by the slow - * network connection. However, if the network connection is slower - * then the rate of event production, then the client can only - * progress at the network rate. In particular, if the network link - * to the the server is down, the client will be blocked. - * - *
  • On the other hand, if the network link is up, but the server - * is down, the client will not be blocked when making log requests - * but the log events will be lost due to server unavailability. - *
- * - *

Properties

- *
- *
host
- *
Remote host name to connect and send events to.
- * - *
port
- *
Port on remote host to send events to.
- * - *
ServerName
- *
Host name of event's origin prepended to each event.
- * - *
- */ - class LOG4CPLUS_EXPORT SocketAppender : public Appender { - public: - // Ctors - SocketAppender(const log4cplus::tstring& host, int port, - const log4cplus::tstring& serverName = tstring()); - SocketAppender(const log4cplus::helpers::Properties & properties); - - // Dtor - ~SocketAppender(); - - // Methods - virtual void close(); - - protected: - void openSocket(); - void initConnector (); - virtual void append(const spi::InternalLoggingEvent& event); - - // Data - log4cplus::helpers::Socket socket; - log4cplus::tstring host; - int port; - log4cplus::tstring serverName; - -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - class LOG4CPLUS_EXPORT ConnectorThread; - friend class ConnectorThread; - - class LOG4CPLUS_EXPORT ConnectorThread - : public thread::AbstractThread - , public helpers::LogLogUser - { - public: - ConnectorThread (SocketAppender &); - virtual ~ConnectorThread (); - - virtual void run(); - - void terminate (); - void trigger (); - - protected: - SocketAppender & sa; - thread::ManualResetEvent trigger_ev; - bool exit_flag; - }; - - volatile bool connected; - helpers::SharedObjectPtr connector; -#endif - - private: - // Disallow copying of instances of this class - SocketAppender(const SocketAppender&); - SocketAppender& operator=(const SocketAppender&); - }; - - namespace helpers { - LOG4CPLUS_EXPORT - SocketBuffer convertToBuffer(const log4cplus::spi::InternalLoggingEvent& event, - const log4cplus::tstring& serverName); - - LOG4CPLUS_EXPORT - log4cplus::spi::InternalLoggingEvent readFromBuffer(SocketBuffer& buffer); - } // end namespace helpers - -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SOCKET_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/appenderattachable.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/appenderattachable.h deleted file mode 100644 index b486e5fe..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/appenderattachable.h +++ /dev/null @@ -1,84 +0,0 @@ -// Module: Log4CPLUS -// File: appenderattachable.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SPI_APPENDER_ATTACHABLE_HEADER_ -#define _LOG4CPLUS_SPI_APPENDER_ATTACHABLE_HEADER_ - -#include -#include -#include -#include -#include - -namespace log4cplus { - // Forward Declarations - typedef helpers::SharedObjectPtr SharedAppenderPtr; - typedef std::vector SharedAppenderPtrList; - - namespace spi { - - /** - * This Interface is for attaching Appenders to objects. - */ - class LOG4CPLUS_EXPORT AppenderAttachable { - public: - // Methods - /** - * Add an appender. - */ - virtual void addAppender(SharedAppenderPtr newAppender) = 0; - - /** - * Get all previously added appenders as an Enumeration. - */ - virtual SharedAppenderPtrList getAllAppenders() = 0; - - /** - * Get an appender by name. - */ - virtual SharedAppenderPtr getAppender(const log4cplus::tstring& name) = 0; - - /** - * Remove all previously added appenders. - */ - virtual void removeAllAppenders() = 0; - - /** - * Remove the appender passed as parameter from the list of appenders. - */ - virtual void removeAppender(SharedAppenderPtr appender) = 0; - - /** - * Remove the appender with the name passed as parameter from the - * list of appenders. - */ - virtual void removeAppender(const log4cplus::tstring& name) = 0; - - // Dtor - virtual ~AppenderAttachable() = 0; - }; - - } // end namespace spi -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SPI_APPENDER_ATTACHABLE_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/factory.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/factory.h deleted file mode 100644 index 7ed0be0b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/factory.h +++ /dev/null @@ -1,185 +0,0 @@ -// Module: Log4CPLUS -// File: factory.h -// Created: 2/2002 -// Author: Tad E. Smith -// -// -// Copyright 2002-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_SPI_FACTORY_HEADER_ -#define LOG4CPLUS_SPI_FACTORY_HEADER_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { - namespace spi { - - /** - * This is the base class for all factories. - */ - class LOG4CPLUS_EXPORT BaseFactory { - public: - virtual ~BaseFactory() = 0; - - /** - * Returns the typename of the objects this factory creates. - */ - virtual log4cplus::tstring getTypeName() = 0; - }; - - - /** - * This abstract class defines the "Factory" interface to create "Appender" - * objects. - */ - class LOG4CPLUS_EXPORT AppenderFactory : public BaseFactory { - public: - typedef Appender ProductType; - typedef SharedAppenderPtr ProductPtr; - - AppenderFactory(); - virtual ~AppenderFactory() = 0; - - /** - * Create an "Appender" object. - */ - virtual SharedAppenderPtr createObject(const log4cplus::helpers::Properties& props) = 0; - }; - - - - /** - * This abstract class defines the "Factory" interface to create "Layout" - * objects. - */ - class LOG4CPLUS_EXPORT LayoutFactory : public BaseFactory { - public: - typedef Layout ProductType; - typedef std::auto_ptr ProductPtr; - - LayoutFactory(); - virtual ~LayoutFactory() = 0; - - /** - * Create a "Layout" object. - */ - virtual std::auto_ptr createObject(const log4cplus::helpers::Properties& props) = 0; - }; - - - - /** - * This abstract class defines the "Factory" interface to create "Appender" - * objects. - */ - class LOG4CPLUS_EXPORT FilterFactory : public BaseFactory { - public: - typedef Filter ProductType; - typedef FilterPtr ProductPtr; - - FilterFactory(); - virtual ~FilterFactory() = 0; - - /** - * Create a "Filter" object. - */ - virtual FilterPtr createObject(const log4cplus::helpers::Properties& props) = 0; - }; - - - - /** - * This template class is used as a "Factory Registry". Objects are - * "entered" into the registry with a "name" using the - * put() method. (The registry then owns the object.) - * These object can then be retrieved using the get() - * method. - * - * Note: This class is Thread-safe. - */ - template - class LOG4CPLUS_EXPORT FactoryRegistry : ObjectRegistryBase { - public: - typedef T product_type; - - virtual ~FactoryRegistry() { - clear(); - } - - // public methods - /** - * Used to enter an object into the registry. (The registry now - * owns object.) - */ - bool put(std::auto_ptr object) { - bool putValResult = putVal(object->getTypeName(), object.get()); - object.release(); - return putValResult; - } - - /** - * Used to retrieve an object from the registry. (The registry - * owns the returned pointer.) - */ - T* get(const log4cplus::tstring& name) const { - return static_cast(getVal(name)); - } - - protected: - virtual void deleteObject(void *object) const { - delete static_cast(object); - } - }; - - - typedef FactoryRegistry AppenderFactoryRegistry; - typedef FactoryRegistry LayoutFactoryRegistry; - typedef FactoryRegistry FilterFactoryRegistry; - - - /** - * Returns the "singleton" AppenderFactoryRegistry. - */ - LOG4CPLUS_EXPORT AppenderFactoryRegistry& getAppenderFactoryRegistry(); - - /** - * Returns the "singleton" LayoutFactoryRegistry. - */ - LOG4CPLUS_EXPORT LayoutFactoryRegistry& getLayoutFactoryRegistry(); - - /** - * Returns the "singleton" FilterFactoryRegistry. - */ - LOG4CPLUS_EXPORT FilterFactoryRegistry& getFilterFactoryRegistry(); - - } -} - - -#endif // LOG4CPLUS_SPI_FACTORY_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/filter.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/filter.h deleted file mode 100644 index ef8b573b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/filter.h +++ /dev/null @@ -1,273 +0,0 @@ -// Module: Log4CPLUS -// File: filter.h -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 1999-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file - * This header defines Filter and all of it's subclasses. */ - -#ifndef LOG4CPLUS_SPI_FILTER_HEADER_ -#define LOG4CPLUS_SPI_FILTER_HEADER_ - -#include -#include -#include -#include - - -namespace log4cplus { - namespace spi { - - - enum FilterResult { DENY, /**< The log event must be dropped immediately - * without consulting with the remaining - * filters, if any, in the chain. */ - NEUTRAL, /**< This filter is neutral with respect to - * the log event; the remaining filters, if - * if any, should be consulted for a final - * decision. */ - ACCEPT /**< The log event must be logged immediately - * without consulting with the remaining - * filters, if any, in the chain. */ - }; - - // Forward Declarations - class Filter; - - - /** - * This method is used to filter an InternalLoggingEvent. - * - * Note: filter can be NULL. - */ - LOG4CPLUS_EXPORT FilterResult checkFilter(const Filter* filter, - const InternalLoggingEvent& event); - - typedef helpers::SharedObjectPtr FilterPtr; - - - /** - * Users should extend this class to implement customized logging - * event filtering. Note that the {@link Logger} and {@link - * Appender} classes have built-in filtering rules. It is suggested - * that you first use and understand the built-in rules before rushing - * to write your own custom filters. - * - * This abstract class assumes and also imposes that filters be - * organized in a linear chain. The {@link #decide - * decide(LoggingEvent)} method of each filter is called sequentially, - * in the order of their addition to the chain. - * - * If the value {@link #DENY} is returned, then the log event is - * dropped immediately without consulting with the remaining - * filters. - * - * If the value {@link #NEUTRAL} is returned, then the next filter - * in the chain is consulted. If there are no more filters in the - * chain, then the log event is logged. Thus, in the presence of no - * filters, the default behaviour is to log all logging events. - * - * If the value {@link #ACCEPT} is returned, then the log - * event is logged without consulting the remaining filters. - * - * The philosophy of log4cplus filters is largely inspired from the - * Linux ipchains. - */ - class LOG4CPLUS_EXPORT Filter - : public virtual log4cplus::helpers::SharedObject - { - public: - // ctor and dtor - Filter(); - virtual ~Filter(); - - // Methods - /** - * Appends filter to the end of this filter chain. - */ - void appendFilter(FilterPtr filter); - - /** - * If the decision is DENY, then the event will be - * dropped. If the decision is NEUTRAL, then the next - * filter, if any, will be invoked. If the decision is ACCEPT then - * the event will be logged without consulting with other filters in - * the chain. - * - * @param event The LoggingEvent to decide upon. - * @return The decision of the filter. - */ - virtual FilterResult decide(const InternalLoggingEvent& event) const = 0; - - // Data - /** - * Points to the next filter in the filter chain. - */ - FilterPtr next; - }; - - - - /** - * This filter drops all logging events. - * - * You can add this filter to the end of a filter chain to - * switch from the default "accept all unless instructed otherwise" - * filtering behaviour to a "deny all unless instructed otherwise" - * behaviour. - */ - class LOG4CPLUS_EXPORT DenyAllFilter : public Filter { - public: - DenyAllFilter (); - DenyAllFilter (const log4cplus::helpers::Properties&); - - /** - * Always returns the {@link #DENY} regardless of the - * {@link InternalLoggingEvent} parameter. - */ - virtual FilterResult decide(const InternalLoggingEvent& event) const; - }; - - - /** - * This is a very simple filter based on LogLevel matching. - * - * The filter admits two options LogLevelToMatch and - * AcceptOnMatch. If there is an exact match between the value - * of the LogLevelToMatch option and the LogLevel of the {@link - * spi::InternalLoggingEvent}, then the {@link #decide} method returns - * {@link #ACCEPT} in case the AcceptOnMatch option value is set - * to true, if it is false then {@link #DENY} - * is returned. If there is no match, {@link #NEUTRAL} is returned. - */ - class LOG4CPLUS_EXPORT LogLevelMatchFilter : public Filter { - public: - LogLevelMatchFilter(); - LogLevelMatchFilter(const log4cplus::helpers::Properties& p); - - /** - * Return the decision of this filter. - * - * Returns {@link #NEUTRAL} if the LogLevelToMatch - * option is not set or if there is no match. Otherwise, if - * there is a match, then the returned decision is {@link #ACCEPT} - * if the AcceptOnMatch property is set to true. - * The returned decision is {@link #DENY} if the AcceptOnMatch - * property is set to false. - */ - virtual FilterResult decide(const InternalLoggingEvent& event) const; - - private: - // Methods - void init(); - - // Data - /** Do we return ACCEPT when a match occurs. Default is true. */ - bool acceptOnMatch; - LogLevel logLevelToMatch; - }; - - - - /** - * This is a very simple filter based on LogLevel matching, which can be - * used to reject messages with LogLevels outside a certain range. - * - * The filter admits three options LogLevelMin, LogLevelMax - * and AcceptOnMatch. - * - * If the LogLevel of the Logging event is not between Min and Max - * (inclusive), then {@link #DENY} is returned. - * - * If the Logging event LogLevel is within the specified range, then if - * AcceptOnMatch is true, {@link #ACCEPT} is returned, and if - * AcceptOnMatch is false, {@link #NEUTRAL} is returned. - * - * If LogLevelMin is not defined, then there is no - * minimum acceptable LogLevel (ie a LogLevel is never rejected for - * being too "low"/unimportant). If LogLevelMax is not - * defined, then there is no maximum acceptable LogLevel (ie a - * LogLevel is never rejected for beeing too "high"/important). - * - * Refer to the {@link - * Appender#setThreshold setThreshold} method - * available to all appenders for a more convenient way to - * filter out events by LogLevel. - */ - class LOG4CPLUS_EXPORT LogLevelRangeFilter : public Filter { - public: - // ctors - LogLevelRangeFilter(); - LogLevelRangeFilter(const log4cplus::helpers::Properties& p); - - /** - * Return the decision of this filter. - */ - virtual FilterResult decide(const InternalLoggingEvent& event) const; - - private: - // Methods - void init(); - - // Data - /** Do we return ACCEPT when a match occurs. Default is true. */ - bool acceptOnMatch; - LogLevel logLevelMin; - LogLevel logLevelMax; - }; - - - - /** - * This is a very simple filter based on string matching. - * - * The filter admits two options StringToMatch and - * AcceptOnMatch. If there is a match between the value of the - * StringToMatch option and the message of the Logging event, - * then the {@link #decide} method returns {@link #ACCEPT} if - * the AcceptOnMatch option value is true, if it is false then - * {@link #DENY} is returned. If there is no match, {@link #NEUTRAL} - * is returned. - */ - class LOG4CPLUS_EXPORT StringMatchFilter : public Filter { - public: - // ctors - StringMatchFilter(); - StringMatchFilter(const log4cplus::helpers::Properties& p); - - /** - * Returns {@link #NEUTRAL} is there is no string match. - */ - virtual FilterResult decide(const InternalLoggingEvent& event) const; - - private: - // Methods - void init(); - - // Data - /** Do we return ACCEPT when a match occurs. Default is true. */ - bool acceptOnMatch; - log4cplus::tstring stringToMatch; - }; - - } // end namespace spi -} // end namespace log4cplus - -#endif /* LOG4CPLUS_SPI_FILTER_HEADER_ */ - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerfactory.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerfactory.h deleted file mode 100644 index c3532949..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerfactory.h +++ /dev/null @@ -1,55 +0,0 @@ -// Module: Log4CPLUS -// File: loggerfactory.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SPI_LOGGER_FACTORY_HEADER -#define _LOG4CPLUS_SPI_LOGGER_FACTORY_HEADER - -#include -#include -#include - - -namespace log4cplus { - // Forward Declarations - class Logger; - class Hierarchy; - - namespace spi { - /** - * Implement this interface to create new instances of Logger or - * a sub-class of Logger. - */ - class LOG4CPLUS_EXPORT LoggerFactory { - public: - /** - * Creates a new Logger object. - */ - virtual Logger makeNewLoggerInstance(const log4cplus::tstring& name, - Hierarchy& h) = 0; - virtual ~LoggerFactory() = 0; - }; - - } // end namespace spi -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SPI_LOGGER_FACTORY_HEADER - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerimpl.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerimpl.h deleted file mode 100644 index ae89673b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggerimpl.h +++ /dev/null @@ -1,209 +0,0 @@ -// Module: Log4CPLUS -// File: loggerimpl.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SPI_LOGGER_HEADER_ -#define _LOG4CPLUS_SPI_LOGGER_HEADER_ - -#include -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { - class DefaultLoggerFactory; - - namespace spi { - - /** - * This is the central class in the log4cplus package. One of the - * distintive features of log4cplus are hierarchical loggers and their - * evaluation. - * - * See the user manual for an - * introduction on this class. - */ - class LOG4CPLUS_EXPORT LoggerImpl - : public virtual log4cplus::helpers::SharedObject, - public log4cplus::helpers::AppenderAttachableImpl - { - public: - typedef helpers::SharedObjectPtr SharedLoggerImplPtr; - - // Methods - - /** - * Call the appenders in the hierrachy starting at - * this. If no appenders could be found, emit a - * warning. - * - * This method calls all the appenders inherited from the - * hierarchy circumventing any evaluation of whether to log or not - * to log the particular log request. - * - * @param event The event to log. - */ - virtual void callAppenders(const InternalLoggingEvent& event); - - /** - * Close all attached appenders implementing the AppenderAttachable - * interface. - */ - virtual void closeNestedAppenders(); - - /** - * Check whether this logger is enabled for a given LogLevel passed - * as parameter. - * - * @return boolean True if this logger is enabled for ll. - */ - virtual bool isEnabledFor(LogLevel ll) const; - - /** - * This generic form is intended to be used by wrappers. - */ - virtual void log(LogLevel ll, const log4cplus::tstring& message, - const char* file=NULL, int line=-1); - - /** - * Starting from this logger, search the logger hierarchy for a - * "set" LogLevel and return it. Otherwise, return the LogLevel of the - * root logger. - * - * The Logger class is designed so that this method executes as - * quickly as possible. - */ - virtual LogLevel getChainedLogLevel() const; - - /** - * Returns the assigned LogLevel, if any, for this Logger. - * - * @return LogLevel - the assigned LogLevel. - */ - LogLevel getLogLevel() const { return this->ll; } - - /** - * Set the LogLevel of this Logger. - */ - void setLogLevel(LogLevel _ll) { this->ll = _ll; } - - /** - * Return the the {@link Hierarchy} where this Logger - * instance is attached. - */ - virtual Hierarchy& getHierarchy() const; - - /** - * Return the logger name. - */ - log4cplus::tstring getName() const { return name; } - - /** - * Get the additivity flag for this Logger instance. - */ - bool getAdditivity() const; - - /** - * Set the additivity flag for this Logger instance. - */ - void setAdditivity(bool additive); - - virtual ~LoggerImpl(); - - protected: - // Ctors - /** - * This constructor created a new Logger instance and - * sets its name. - * - * It is intended to be used by sub-classes only. You should not - * create loggers directly. - * - * @param name The name of the logger. - * @param h Hierarchy - */ - LoggerImpl(const log4cplus::tstring& name, Hierarchy& h); - - - // Methods - /** - * This method creates a new logging event and logs the event - * without further checks. - */ - virtual void forcedLog(LogLevel ll, - const log4cplus::tstring& message, - const char* file=NULL, - int line=-1); - - - // Data - /** The name of this logger */ - log4cplus::tstring name; - - /** - * The assigned LogLevel of this logger. - */ - LogLevel ll; - - /** - * The parent of this logger. All loggers have at least one - * ancestor which is the root logger. - */ - SharedLoggerImplPtr parent; - - /** - * Additivity is set to true by default, that is children inherit - * the appenders of their ancestors by default. If this variable is - * set to false then the appenders found in the - * ancestors of this logger are not used. However, the children - * of this logger will inherit its appenders, unless the children - * have their additivity flag set to false too. See - * the user manual for more details. - */ - bool additive; - - private: - // Data - /** Loggers need to know what Hierarchy they are in. */ - Hierarchy& hierarchy; - - // Disallow copying of instances of this class - LoggerImpl(const LoggerImpl&); - LoggerImpl& operator=(const LoggerImpl&); - - // Friends - friend class log4cplus::Logger; - friend class log4cplus::DefaultLoggerFactory; - friend class log4cplus::Hierarchy; - }; - - typedef LoggerImpl::SharedLoggerImplPtr SharedLoggerImplPtr; - - } // end namespace spi -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SPI_LOGGER_HEADER_ - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggingevent.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggingevent.h deleted file mode 100644 index 5650baf5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/loggingevent.h +++ /dev/null @@ -1,198 +0,0 @@ -// Module: Log4CPLUS -// File: loggingevent.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SPI_INTERNAL_LOGGING_EVENT_HEADER_ -#define _LOG4CPLUS_SPI_INTERNAL_LOGGING_EVENT_HEADER_ - -#include -#include -#include -#include -#include -#include - -namespace log4cplus { - namespace spi { - /** - * The internal representation of logging events. When an affirmative - * decision is made to log then a InternalLoggingEvent - * instance is created. This instance is passed around to the - * different log4cplus components. - * - * This class is of concern to those wishing to extend log4cplus. - */ - class LOG4CPLUS_EXPORT InternalLoggingEvent { - public: - // Ctors - /** - * Instantiate a LoggingEvent from the supplied parameters. - * - * @param logger The logger of this event. - * @param ll_ The LogLevel of this event. - * @param message_ The message of this event. - * @param filename Name of file where this event has occurred, - * can be NULL. - * @param line_ Line number in file specified by - * the filename parameter. - */ - InternalLoggingEvent(const log4cplus::tstring& logger, - LogLevel ll_, - const log4cplus::tstring& message_, - const char* filename, - int line_) - : message(message_), - loggerName(logger), - ll(ll_), - ndc(), - thread(), - timestamp(log4cplus::helpers::Time::gettimeofday()), - file( ( filename - ? LOG4CPLUS_C_STR_TO_TSTRING(filename) - : log4cplus::tstring()) ), - line(line_), - threadCached(false), - ndcCached(false) - { - } - - InternalLoggingEvent(const log4cplus::tstring& logger, - LogLevel ll_, - const log4cplus::tstring& ndc_, - const log4cplus::tstring& message_, - const log4cplus::tstring& thread_, - log4cplus::helpers::Time time, - const log4cplus::tstring& file_, - int line_) - : message(message_), - loggerName(logger), - ll(ll_), - ndc(ndc_), - thread(thread_), - timestamp(time), - file(file_), - line(line_), - threadCached(true), - ndcCached(true) - { - } - - InternalLoggingEvent(const log4cplus::spi::InternalLoggingEvent& rhs) - : message(rhs.getMessage()), - loggerName(rhs.getLoggerName()), - ll(rhs.getLogLevel()), - ndc(rhs.getNDC()), - thread(rhs.getThread()), - timestamp(rhs.getTimestamp()), - file(rhs.getFile()), - line(rhs.getLine()), - threadCached(true), - ndcCached(true) - { - } - - virtual ~InternalLoggingEvent(); - - - // public virtual methods - /** The application supplied message of logging event. */ - virtual const log4cplus::tstring& getMessage() const; - - /** Returns the 'type' of InternalLoggingEvent. Derived classes - * should override this method. (NOTE: Values <= 1000 are - * reserved for log4cplus and should not be used.) - */ - virtual unsigned int getType() const; - - /** Returns a copy of this object. Derived classes - * should override this method. - */ - virtual std::auto_ptr clone() const; - - - - // public methods - /** The logger of the logging event. It is set by - * the LoggingEvent constructor. - */ - const log4cplus::tstring& getLoggerName() const { return loggerName; } - - /** LogLevel of logging event. */ - LogLevel getLogLevel() const { return ll; } - - /** The nested diagnostic context (NDC) of logging event. */ - const log4cplus::tstring& getNDC() const { - if(!ndcCached) { - ndc = log4cplus::getNDC().get(); - ndcCached = true; - } - return ndc; - } - - /** The name of thread in which this logging event was generated. */ - const log4cplus::tstring& getThread() const { - if(!threadCached) { - thread = LOG4CPLUS_GET_CURRENT_THREAD_NAME; - threadCached = true; - } - return thread; - } - - /** The number of milliseconds elapsed from 1/1/1970 until logging event - * was created. */ - const log4cplus::helpers::Time& getTimestamp() const { return timestamp; } - - /** The is the file where this log statement was written */ - const log4cplus::tstring& getFile() const { return file; } - - /** The is the line where this log statement was written */ - int getLine() const { return line; } - - // public operators - log4cplus::spi::InternalLoggingEvent& - operator=(const log4cplus::spi::InternalLoggingEvent& rhs); - - // static methods - static unsigned int getDefaultType(); - - protected: - // Data - log4cplus::tstring message; - - private: - log4cplus::tstring loggerName; - LogLevel ll; - mutable log4cplus::tstring ndc; - mutable log4cplus::tstring thread; - log4cplus::helpers::Time timestamp; - log4cplus::tstring file; - int line; - /** Indicates whether or not the Threadname has been retrieved. */ - mutable bool threadCached; - /** Indicates whether or not the NDC has been retrieved. */ - mutable bool ndcCached; - }; - - } // end namespace spi -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SPI_INTERNAL_LOGGING_EVENT_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/objectregistry.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/objectregistry.h deleted file mode 100644 index cb10931b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/objectregistry.h +++ /dev/null @@ -1,96 +0,0 @@ -// Module: Log4CPLUS -// File: objectregistry.h -// Created: 3/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_SPI_OBJECT_REGISTRY_HEADER_ -#define LOG4CPLUS_SPI_OBJECT_REGISTRY_HEADER_ - -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { - namespace spi { - - /** - * This is the base class used to implement the functionality required - * by the ObjectRegistry template class. - */ - class LOG4CPLUS_EXPORT ObjectRegistryBase { - public: - // public methods - /** - * Tests to see whether or not an object is bound in the - * registry as name. - */ - bool exists(const log4cplus::tstring& name) const; - - /** - * Returns the names of all registered objects. - */ - std::vector getAllNames() const; - - protected: - // Ctor and Dtor - ObjectRegistryBase(); - virtual ~ObjectRegistryBase(); - - // protected methods - /** - * Used to enter an object into the registry. (The registry now - * owns object.) - */ - bool putVal(const log4cplus::tstring& name, void* object); - - /** - * Used to retrieve an object from the registry. (The registry - * owns the returned pointer.) - */ - void* getVal(const log4cplus::tstring& name) const; - - /** - * Deletes object. - */ - virtual void deleteObject(void *object) const = 0; - - /** - * Deletes all objects from this registry. - */ - virtual void clear(); - - // Types - typedef std::map ObjectMap; - - // Data - LOG4CPLUS_MUTEX_PTR_DECLARE mutex; - ObjectMap data; - }; - - } -} - - -#endif // LOG4CPLUS_SPI_OBJECT_REGISTRY_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/rootlogger.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/rootlogger.h deleted file mode 100644 index 098abd22..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/spi/rootlogger.h +++ /dev/null @@ -1,70 +0,0 @@ -// Module: Log4CPLUS -// File: rootlogger.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SPI_ROOT_LOGGER_HEADER_ -#define _LOG4CPLUS_SPI_ROOT_LOGGER_HEADER_ - -#include -#include -#include - -namespace log4cplus { - namespace spi { - - /** - * RootLogger sits at the top of the logger hierachy. It is a - * regular logger except that it provides several guarantees. - * - * First, it cannot be assigned a NOT_SET_LOG_LEVEL - * LogLevel. Second, since root logger cannot have a parent, the - * getChainedLogLevel method always returns the value of the - * ll field without walking the hierarchy. - */ - class LOG4CPLUS_EXPORT RootLogger : public LoggerImpl { - public: - // Ctors - /** - * The root logger names itself as "root". However, the root - * logger cannot be retrieved by name. - */ - RootLogger(Hierarchy& h, LogLevel ll); - - // Methods - /** - * Return the assigned LogLevel value without walking the logger - * hierarchy. - */ - virtual LogLevel getChainedLogLevel() const; - - /** - * Setting a NOT_SET_LOG_LEVEL value to the LogLevel of the root logger - * may have catastrophic results. We prevent this here. - */ - void setLogLevel(LogLevel ll); - - }; - - } // end namespace spi -} // end namespace log4cplus - -#endif // _LOG4CPLUS_SPI_ROOT_LOGGER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/streams.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/streams.h deleted file mode 100644 index 12051376..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/streams.h +++ /dev/null @@ -1,55 +0,0 @@ -// Module: Log4CPLUS -// File: streams.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_STREAMS_HEADER_ -#define LOG4CPLUS_STREAMS_HEADER_ - -#include -#include - -#include -#include -#define LOG4CPLUS_STREAM_NAMESPACE std - -#ifdef UNICODE - namespace log4cplus { - typedef LOG4CPLUS_STREAM_NAMESPACE::wostream tostream; - typedef LOG4CPLUS_STREAM_NAMESPACE::wistream tistream; - typedef LOG4CPLUS_STREAM_NAMESPACE::wostringstream tostringstream; - static tostream &tcout = LOG4CPLUS_STREAM_NAMESPACE::wcout; - static tostream &tcerr = LOG4CPLUS_STREAM_NAMESPACE::wcerr; - } - -LOG4CPLUS_EXPORT log4cplus::tostream& operator <<(log4cplus::tostream&, const char* psz ); - -#else - namespace log4cplus { - typedef LOG4CPLUS_STREAM_NAMESPACE::ostream tostream; - typedef LOG4CPLUS_STREAM_NAMESPACE::istream tistream; - static tostream &tcout = LOG4CPLUS_STREAM_NAMESPACE::cout; - static tostream &tcerr = LOG4CPLUS_STREAM_NAMESPACE::cerr; - typedef LOG4CPLUS_STREAM_NAMESPACE::ostringstream tostringstream; - } -#endif // UNICODE - -#endif // LOG4CPLUS_STREAMS_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/syslogappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/syslogappender.h deleted file mode 100644 index 7a177740..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/syslogappender.h +++ /dev/null @@ -1,82 +0,0 @@ -// Module: Log4CPLUS -// File: syslogappender.h -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_SYSLOG_APPENDER_HEADER_ -#define _LOG4CPLUS_SYSLOG_APPENDER_HEADER_ - -#include - -#if defined(LOG4CPLUS_HAVE_SYSLOG_H) && !defined(_WIN32) -#include - -namespace log4cplus { - - /** - * Appends log events to a file. - * - *

Properties

- *
- *
ident
- *
First argument to openlog(), a string that - * will be prepended to every message.
- * - *
facility
- *
Facility is used in combination with syslog level in first - * argument to syslog(). It can be one of the supported facility - * names (case insensitive), e.g. auth, cron, kern, mail, news - * etc.
- *
- */ - class LOG4CPLUS_EXPORT SysLogAppender : public Appender { - public: - // Ctors - SysLogAppender(const tstring& ident); - SysLogAppender(const log4cplus::helpers::Properties & properties); - - // Dtor - virtual ~SysLogAppender(); - - // Methods - virtual void close(); - - protected: - virtual int getSysLogLevel(const LogLevel& ll) const; - virtual void append(const spi::InternalLoggingEvent& event); - - // Data - tstring ident; - int facility; - - private: - // Disallow copying of instances of this class - SysLogAppender(const SysLogAppender&); - SysLogAppender& operator=(const SysLogAppender&); - - std::string identStr; - }; - -} // end namespace log4cplus - -#endif // defined(HAVE_SYSLOG_H) - -#endif // _LOG4CPLUS_SYSLOG_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/tstring.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/tstring.h deleted file mode 100644 index f419828f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/tstring.h +++ /dev/null @@ -1,85 +0,0 @@ -// Module: Log4CPLUS -// File: tstring.h -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef LOG4CPLUS_TSTRING_HEADER_ -#define LOG4CPLUS_TSTRING_HEADER_ - -#include -#include - -#ifdef UNICODE -# ifdef LOG4CPLUS_WORKING_LOCALE -# include -# endif // LOG4CPLUS_WORKING_LOCALE -# define LOG4CPLUS_TEXT2(STRING) L##STRING -#else -# define LOG4CPLUS_TEXT2(STRING) STRING -#endif // UNICODE -#define LOG4CPLUS_TEXT(STRING) LOG4CPLUS_TEXT2(STRING) - - -#ifdef UNICODE -namespace log4cplus { - typedef wchar_t tchar; - typedef std::wstring tstring; - - namespace helpers { -#ifdef LOG4CPLUS_WORKING_LOCALE - LOG4CPLUS_EXPORT std::string tostring(const std::wstring&, - std::locale const & = std::locale ()); - - LOG4CPLUS_EXPORT std::string tostring (wchar_t const *, - std::locale const & = std::locale ()); - - LOG4CPLUS_EXPORT std::wstring towstring(const std::string&, - std::locale const & = std::locale ()); - - LOG4CPLUS_EXPORT std::wstring towstring(char const *, - std::locale const & = std::locale ()); - -#else // LOG4CPLUS_WORKING_LOCALE - LOG4CPLUS_EXPORT std::string tostring(const std::wstring&); - LOG4CPLUS_EXPORT std::string tostring(wchar_t const *); - LOG4CPLUS_EXPORT std::wstring towstring(const std::string&); - LOG4CPLUS_EXPORT std::wstring towstring(char const *); -#endif // LOG4CPLUS_WORKING_LOCALE - } - -} - -#define LOG4CPLUS_C_STR_TO_TSTRING(STRING) log4cplus::helpers::towstring(STRING) -#define LOG4CPLUS_STRING_TO_TSTRING(STRING) log4cplus::helpers::towstring(STRING) -#define LOG4CPLUS_TSTRING_TO_STRING(STRING) log4cplus::helpers::tostring(STRING) - -#else // UNICODE -namespace log4cplus { - typedef char tchar; - typedef std::string tstring; -} - -#define LOG4CPLUS_C_STR_TO_TSTRING(STRING) std::string(STRING) -#define LOG4CPLUS_STRING_TO_TSTRING(STRING) STRING -#define LOG4CPLUS_TSTRING_TO_STRING(STRING) STRING - -#endif // UNICODE - -#endif // LOG4CPLUS_TSTRING_HEADER_ diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/version.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/version.h deleted file mode 100644 index 618eb456..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/version.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2010, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - - -#if ! defined (LOG4CPLUS_VERSION_H) -#define LOG4CPLUS_VERSION_H - -#include - - -#define LOG4CPLUS_MAKE_VERSION(major, minor, point) \ - (major * 1000 * 1000u + minor * 1000u + point) - -#define LOG4CPLUS_MAKE_VERSION_STR(major, minor, point) \ - #major "." #minor "." #point - -#define LOG4CPLUS_VERSION LOG4CPLUS_MAKE_VERSION(1, 0, 4) -#define LOG4CPLUS_VERSION_STR LOG4CPLUS_MAKE_VERSION_STR(1, 0, 4) - - -namespace log4cplus -{ - -extern LOG4CPLUS_EXPORT unsigned const version; -extern LOG4CPLUS_EXPORT char const versionStr[]; - -} - -#endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32consoleappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32consoleappender.h deleted file mode 100644 index 2cd93cae..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32consoleappender.h +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (C) 2009-2010, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -#ifndef LOG4CPLUS_WIN32CONSOLEAPPENDER_H -#define LOG4CPLUS_WIN32CONSOLEAPPENDER_H - - -#include -#if defined(_WIN32) && defined (LOG4CPLUS_HAVE_WIN32_CONSOLE) - -#include -#include - - -namespace log4cplus -{ - - /** - * Prints events to Win32 console. - * - *

Properties

- *
- *
AllocConsole
- *
This boolean property specifies whether or not this appender - * will try to allocate new console using the - * AllocConsole() Win32 function.
- * - *
- */ - class LOG4CPLUS_EXPORT Win32ConsoleAppender - : public Appender - { - public: - explicit Win32ConsoleAppender (bool allocConsole = true); - Win32ConsoleAppender (helpers::Properties const & properties); - virtual ~Win32ConsoleAppender (); - - virtual void close (); - - protected: - virtual void append (spi::InternalLoggingEvent const &); - - void write_handle (HANDLE, tchar const *, size_t); - void write_console (HANDLE, tchar const *, size_t); - - bool alloc_console; - - private: - Win32ConsoleAppender (Win32ConsoleAppender const &); - Win32ConsoleAppender & operator = (Win32ConsoleAppender const &); - }; - -} // namespace log4cplus - -#endif - -#endif // LOG4CPLUS_WIN32CONSOLEAPPENDER_H diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32debugappender.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32debugappender.h deleted file mode 100644 index 57130915..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/include/log4cplus/win32debugappender.h +++ /dev/null @@ -1,65 +0,0 @@ -// Module: Log4CPLUS -// File: win32debugappender.h -// Created: 12/2003 -// Author: Eduardo Francos, Odalio SARL -// -// -// Copyright 2003-2010 Odalio SARL -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** @file */ - -#ifndef _LOG4CPLUS_WIN32DEBUG_APPENDER_HEADER_ -#define _LOG4CPLUS_WIN32DEBUG_APPENDER_HEADER_ - -#include -#if defined (LOG4CPLUS_HAVE_WIN32_CONSOLE) - -#include -#include - - -namespace log4cplus { - - /** - * Prints log events using OutputDebugString(). - */ - class LOG4CPLUS_EXPORT Win32DebugAppender - : public Appender - { - public: - // Ctors - Win32DebugAppender(); - Win32DebugAppender(const log4cplus::helpers::Properties& properties); - - // Dtor - virtual ~Win32DebugAppender(); - - // Methods - virtual void close(); - - protected: - virtual void append(const log4cplus::spi::InternalLoggingEvent& event); - - private: - // Disallow copying of instances of this class - Win32DebugAppender(const Win32DebugAppender&); - Win32DebugAppender& operator=(const Win32DebugAppender&); - }; - -} // end namespace log4cplus - -#endif // LOG4CPLUS_HAVE_WIN32_CONSOLE -#endif // _LOG4CPLUS_WIN32DEBUG_APPENDER_HEADER_ - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/install-sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/install-sh deleted file mode 100755 index 3f83ce9b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/install-sh +++ /dev/null @@ -1,524 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2010-02-06.18; # 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 - 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 - 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 starting with `-'. - 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 - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # 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-writeable 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 -z "$d" && 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/3rd_party/log4cplus/log4cplus-1.0.4/log4cplus.spec b/src/3rd_party/log4cplus/log4cplus-1.0.4/log4cplus.spec deleted file mode 100644 index e13a2412..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/log4cplus.spec +++ /dev/null @@ -1,62 +0,0 @@ -Name: log4cplus -Version: 1.0.4 -Release: 1 - -Summary: log4cplus, C++ logging library -Copyright: Apache -Group: Development/Libraries -Vendor: log4cplus project -Packager: Yusuke SATO -Url: http://log4cplus.sourceforge.net/ - -Source: %name-%version.tar.gz - -Prefix: %_prefix -BuildRoot: %_tmppath/%name-%version-root - -%description -log4cplus is a simple to use C++ logging API providing thread-safe, -flexible, and arbitrarily granular control over log management and -configuration. It is modeled after the Java log4j API. - -%package devel -Summary: log4cplus headers, static libraries -Group: Development/Libraries -Requires: %name = %version - -%description devel -log4cplus is a simple to use C++ logging API providing thread-safe, -flexible, and arbitrarily granular control over log management and -configuration. It is modeled after the Java log4j API. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{prefix} install -mkdir -p $RPM_BUILD_ROOT%{prefix}/include/ -cp -rp include/log4cplus $RPM_BUILD_ROOT%{prefix}/include/ - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,755) -%attr(755,root,root) %prefix/lib/lib*.so* -%attr(644,root,root) %prefix/lib/*.la - -%files devel -%defattr(-,root,root,755) -%prefix/include/log4cplus/*.h -%prefix/include/log4cplus/helpers/*.h -%prefix/include/log4cplus/spi/*.h -%attr(644,root,root) %prefix/lib/*.a - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/CMakeLists.txt deleted file mode 100644 index 27aa4efa..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) -message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") - -set (loggingserver_sources - loggingserver.cxx) - -message (STATUS "Sources: ${loggingserver_sources}") - -include_directories ("../include") - -add_executable (loggingserver ${loggingserver_sources}) -target_link_libraries (loggingserver log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.am deleted file mode 100644 index 66a176af..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \ - @LOG4CPLUS_NDEBUG@ - -if MULTI_THREADED -noinst_PROGRAMS = loggingserver -loggingserver_SOURCES = loggingserver.cxx -loggingserver_LDADD = $(top_builddir)/src/liblog4cplus.la -endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.in deleted file mode 100644 index c0402ceb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/Makefile.in +++ /dev/null @@ -1,501 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -@MULTI_THREADED_TRUE@noinst_PROGRAMS = loggingserver$(EXEEXT) -subdir = loggingserver -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am__loggingserver_SOURCES_DIST = loggingserver.cxx -@MULTI_THREADED_TRUE@am_loggingserver_OBJECTS = \ -@MULTI_THREADED_TRUE@ loggingserver.$(OBJEXT) -loggingserver_OBJECTS = $(am_loggingserver_OBJECTS) -@MULTI_THREADED_TRUE@loggingserver_DEPENDENCIES = \ -@MULTI_THREADED_TRUE@ $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(loggingserver_SOURCES) -DIST_SOURCES = $(am__loggingserver_SOURCES_DIST) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \ - @LOG4CPLUS_NDEBUG@ - -@MULTI_THREADED_TRUE@loggingserver_SOURCES = loggingserver.cxx -@MULTI_THREADED_TRUE@loggingserver_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 loggingserver/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu loggingserver/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 -loggingserver$(EXEEXT): $(loggingserver_OBJECTS) $(loggingserver_DEPENDENCIES) - @rm -f loggingserver$(EXEEXT) - $(CXXLINK) $(loggingserver_OBJECTS) $(loggingserver_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loggingserver.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/loggingserver.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/loggingserver.cxx deleted file mode 100644 index 2a37a243..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/loggingserver/loggingserver.cxx +++ /dev/null @@ -1,125 +0,0 @@ -// Module: LOG4CPLUS -// File: loggingserver.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::thread; - - -namespace loggingserver { - class ClientThread : public AbstractThread { - public: - ClientThread(Socket clientsock_) - : clientsock(clientsock_) - { - cout << "Received a client connection!!!!" << endl; - } - - ~ClientThread() - { - cout << "Client connection closed." << endl; - } - - virtual void run(); - - private: - Socket clientsock; - }; - -} - - - - -int -main(int argc, char** argv) -{ - if(argc < 3) { - cout << "Usage: port config_file" << endl; - return 1; - } - int port = std::atoi(argv[1]); - tstring configFile = LOG4CPLUS_C_STR_TO_TSTRING(argv[2]); - - PropertyConfigurator config(configFile); - config.configure(); - - ServerSocket serverSocket(port); - if (!serverSocket.isOpen()) { - cout << "Could not open server socket, maybe port " - << port << " is already in use." << endl; - return 2; - } - - while(1) { - loggingserver::ClientThread *thr = - new loggingserver::ClientThread(serverSocket.accept()); - thr->start(); - } - - return 0; -} - - -//////////////////////////////////////////////////////////////////////////////// -// loggingserver::ClientThread implementation -//////////////////////////////////////////////////////////////////////////////// - - -void -loggingserver::ClientThread::run() -{ - while(1) { - if(!clientsock.isOpen()) { - return; - } - SocketBuffer msgSizeBuffer(sizeof(unsigned int)); - if(!clientsock.read(msgSizeBuffer)) { - return; - } - - unsigned int msgSize = msgSizeBuffer.readInt(); - - SocketBuffer buffer(msgSize); - if(!clientsock.read(buffer)) { - return; - } - - spi::InternalLoggingEvent event = readFromBuffer(buffer); - Logger logger = Logger::getInstance(event.getLoggerName()); - logger.callAppenders(event); - } -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/ltmain.sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/ltmain.sh deleted file mode 100644 index d41416a5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/ltmain.sh +++ /dev/null @@ -1,8796 +0,0 @@ -# Generated from ltmain.m4sh. - -# libtool (GNU libtool) 2.2.10 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 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) -# --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.2.10 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . - -PROGRAM=libtool -PACKAGE=libtool -VERSION=2.2.10 -TIMESTAMP="" -package_revision=1.3175 - -# 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'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SED="sed"} -: ${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_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"` -} - -# Generated shell functions inserted here. - -# 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=: - 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' - -# 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${mode+: }$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${mode+: }$mode: "${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname${mode+: }$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_version -# Echo version message to standard output and exit. -func_version () -{ - $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 () -{ - $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 () -{ - $SED -n '/^# Usage:/,/# Report bugs to/ { - 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 --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p - }' < "$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 () -{ - func_error "missing argument for $1." - exit_cmd=exit -} - -exit_cmd=: - - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -# $mode is unset -nonopt= -execute_dlfiles= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - -# 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_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 -} - -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. -{ - - # 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 - - # Parse non-mode specific arguments: - while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" - func_echo "enabling shell trace mode" - opt_debug='set -x' - $opt_debug - ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift - ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 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 - - mode="$1" - shift - ;; - - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - opt_verbose=false - ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false - ;; - - --verbose| -v) preserve_args="$preserve_args $opt" - opt_silent=false - opt_verbose=: - ;; - - --no-verbose) preserve_args="$preserve_args $opt" - opt_verbose=false - ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here - shift - ;; - - # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} - shift - ;; - - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --help-all) opt_help=': help-all' ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break - ;; - esac - done - - - 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_duplicate_deps - ;; - esac - - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} - -# 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 -} - - -## ----------- ## -## Main. ## -## ----------- ## - -$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 - - test -z "$mode" && func_fatal_error "error: you must specify a MODE." - - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$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=$mode' for more information." -} - - -# 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_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi -} - -# 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_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 - - # FreeBSD-specific: where we install compilers with non-standard names - tag_compilers_CC="*cc cc* *gcc gcc* clang" - tag_compilers_CXX="*c++ c++* *g++ g++* clang++" - base_compiler=`set -- "$@"; echo $1` - - # If $tagname isn't set, then try to infer if the default "CC" tag applies - if test -z "$tagname"; then - for zp in $tag_compilers_CC; do - case $base_compiler in - $zp) tagname="CC"; break;; - esac - done - fi - - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" - 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_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" - 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 - - # FreeBSD-specific: try compilers based on inferred tag - if test -z "$tagname"; then - eval "tag_compilers=\$tag_compilers_${z}" - if test -n "$tag_compilers"; then - for zp in $tag_compilers; do - case $base_compiler in - $zp) tagname=$z; break;; - esac - done - if test -n "$tagname"; then - break - fi - fi - fi - 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 <?"'"'"' &()|`$[]' \ - && 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 - removelist="$removelist $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - 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 - command="$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 - command="$command -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - command="$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 "$mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $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 \`$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 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 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 $execute_dlfiles; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - # 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 - dir="$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_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" - 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 "$mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - 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" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - 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 "----------------------------------------------------------------------" - exit $EXIT_SUCCESS -} - -test "$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" - install_prog="$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 - files="$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" - install_prog="$install_prog $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - install_shared_prog="$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" - install_shared_prog="$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. - staticlibs="$staticlibs $file" - ;; - - *.la) - # 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 "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - dir="$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" && staticlibs="$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_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $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 "$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 - -/* 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_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $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" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - 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; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - echo >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - echo >> "$output_objdir/$my_dlsyms" "\ -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) ;; - *) symtab_cflags="$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 - ;; - *-*-freebsd*) - # FreeBSD doesn't need this... - ;; - *) - 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 - win32_nmres=`eval $NM -f posix -A $1 | - $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_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 () -{ - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done - 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" - - # 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 - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - 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_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# 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. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # 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_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist - -# 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 -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - - 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 - dlfiles="$dlfiles $arg" - else - dlprefiles="$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 "*) ;; - *) deplibs="$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 -# moreargs="$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 - dlfiles="$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. - dlprefiles="$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 "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - weak_libs="$weak_libs $arg" - prev= - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$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" - dir=$func_stripname_result - if test -z "$dir"; 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 - # 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 "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$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;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$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 - deplibs="$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 - deplibs="$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) - compiler_flags="$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) - compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; - esac - deplibs="$deplibs $arg" - 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_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$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" - arg="$arg $func_quote_for_eval_result" - compiler_flags="$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" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$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 - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - objs="$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 - dlfiles="$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. - dlprefiles="$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. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - 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" - # 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_duplicate_deps ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$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 "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$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% $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= - case $lib in - *.la) func_source "$lib" ;; - 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 "*) ;; - *) deplibs="$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) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - ;; - 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 - ;; - *) - ;; - esac # linkmode - - 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 "*) ;; - * ) new_inherited_linker_flags="$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" - newlib_search_path="$newlib_search_path $func_stripname_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" - newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - dir=$func_stripname_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$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. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$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 "*) ;; - *) new_inherited_linker_flags="$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" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$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. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - 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. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$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 "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$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 - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$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 - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$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" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - 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 - newlib_search_path="$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" - newlib_search_path="$newlib_search_path $func_stripname_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_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$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:"*) ;; - *) temp_rpath="$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 "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$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 - notinst_deplibs="$notinst_deplibs $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - notinst_deplibs="$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 "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$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 "$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$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$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:"*) ;; - *) compile_shlibpath="$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:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$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:"*) ;; - *) finalize_shlibpath="$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 - [\\/]*) - add_dir="$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 "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$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" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - 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_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 - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$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 "*) ;; - *) lib_search_path="$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 "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$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 - tmp_libs="$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" - objs="$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!" - libobjs="$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 - 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 - ;; - 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) - 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. - verstring="$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" - libobjs="$libobjs $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$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 - removelist="$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 - oldlibs="$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 - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$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 "*) ;; - *) dlfiles="$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 "*) ;; - *) dlprefiles="$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 - deplibs="$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 - deplibs="$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` - 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 - newdeplibs="$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. - newdeplibs="$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 "*) - newdeplibs="$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 - newdeplibs="$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. - newdeplibs="$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 "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$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 - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$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 - 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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$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" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$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 "$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 - linknames="$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" - delfiles="$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 cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - func_show_eval "$cmd" 'exit $?' - 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 - delfiles="$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 "*) ;; - *) - tmp_deplibs="$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" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - libobjs="$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\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$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 - $ECHO "$obj" >> $output - done - echo ')' >> $output - delfiles="$delfiles $output" - 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 - $ECHO "$obj" >> $output - done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" - 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 - delfiles="$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 "$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 - delfiles="$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" - generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles - libobjs="$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 "$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 "$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" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # 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]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$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 "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$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 "*) ;; - *) finalize_rpath="$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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$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;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$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"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$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=$?' - - # 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 - rpath="$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 - rpath="$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 $?' - 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 $?' - - # 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 - oldobjs="$oldobjs $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $addlibs - oldobjs="$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" - generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles - oldobjs="$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" - generated="$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" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - 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 - 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" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$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" - newdlfiles="$newdlfiles $libdir/$name" - ;; - *) newdlfiles="$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" - newdlprefiles="$newdlprefiles $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 - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$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 "$mode" = link || test "$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) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - 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 - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${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 - rmfiles="$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 - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$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 - rmfiles="$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 - rmfiles="$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 - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - objdir="$origobjdir" - - # 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 "$mode" = uninstall || test "$mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$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/3rd_party/log4cplus/log4cplus-1.0.4/m4/ac_cxx_compiler_vendor.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ac_cxx_compiler_vendor.m4 deleted file mode 100644 index 7fc9eb03..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ac_cxx_compiler_vendor.m4 +++ /dev/null @@ -1,73 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ac_cxx_compiler_vendor.html -# =========================================================================== -# -# SYNOPSIS -# -# AC_CXX_COMPILER_VENDOR(VENDOR-NAME, [NICKNAME]) -# -# DESCRIPTION -# -# Set VENDOR-NAME to the lower-case name of the compiler vendor or -# `unknown' if the compiler's vendor is unknown. `compaq' means the CXX -# compiler as available on Tru64/OSF1/Digital Unix on Alpha machines. If -# NICKNAME is provided, set it to the compiler's usual name (eg. `g++', -# `cxx', `aCC', etc.). -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Ludovic Courtès -# -# 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. - -AC_DEFUN([AC_CXX_COMPILER_VENDOR], - [AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PROG_CXXCPP]) - AC_CACHE_CHECK([the C++ compiler vendor], - [ac_cv_cxx_compiler_vendor], - - [AC_LANG_PUSH([C++]) - - dnl GNU C++ - _AC_C_IFDEF([__GNUG__], - [ac_cv_cxx_compiler_vendor=gnu], - [_AC_C_IFDEF([__DECCXX], - [ac_cv_cxx_compiler_vendor=compaq], - [dnl HP's aCC - _AC_C_IFDEF([__HP_aCC], - [ac_cv_cxx_compiler_vendor=hp], - [dnl SUN CC - _AC_C_IFDEF([__SUNPRO_CC], - [ac_cv_cxx_compiler_vendor=sun], - [dnl SGI CC - _AC_C_IFDEF([__sgi], - [ac_cv_cxx_compiler_vendor=sgi], - [dnl Note: We are using the C compiler because VC++ doesn't - dnl recognize `.cc'(which is used by `configure') as a C++ file - dnl extension and requires `/TP' to be passed. - AC_LANG_PUSH([C]) - _AC_C_IFDEF([_MSC_VER], - [ac_cv_cxx_compiler_vendor=microsoft], - [ac_cv_cxx_compiler_vendor=unknown]) - AC_LANG_POP()])])])])]) - - AC_LANG_POP()]) - $1="$ac_cv_cxx_compiler_vendor" - - dnl The compiler nickname - ifelse([$2], , [], - [case "$ac_cv_cxx_compiler_vendor" in - gnu) $2=g++;; - compaq) $2=cxx;; - hp) $2=aCC;; - sgi) $2=CC;; - sun) $2=CC;; - microsoft) $2=cl;; - *) $2=unknown;; - esac])])dnl diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_c_ifdef.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_c_ifdef.m4 deleted file mode 100644 index 2417e8e2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_c_ifdef.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_c_ifdef.html -# =========================================================================== -# -# OBSOLETE MACRO -# -# Deprecated in favor of the standard Autoconf macro AC_CHECK_DECL. -# -# SYNOPSIS -# -# AX_C_IFDEF(MACRO-NAME, ACTION-IF-DEF, ACTION-IF-NOT-DEF) -# -# DESCRIPTION -# -# Check for the definition of macro MACRO-NAME using the current -# language's compiler. -# -# LICENSE -# -# Copyright (c) 2008 Ludovic Courtes -# -# 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 6 - -AU_ALIAS([_AC_C_IFDEF], [AX_C_IFDEF]) -AC_DEFUN([AX_C_IFDEF], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifndef $1 - # error "Macro $1 is undefined!" - /* For some compilers (eg. SGI's CC), #error is not - enough... */ - please, do fail - #endif]])], - [$2], [$3])]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_gcc_option.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_gcc_option.m4 deleted file mode 100644 index 4ab4a5af..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_gcc_option.m4 +++ /dev/null @@ -1,225 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cflags_gcc_option.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) -# -# DESCRIPTION -# -# AX_CFLAGS_GCC_OPTION(-fomit-frame-pointer) would show a message like -# "checking CFLAGS for gcc -fomit-frame-pointer ... yes" and add the -# optionflag to CFLAGS if it is understood. You can override the -# shellvar-default of CFLAGS of course. The order of arguments stems from -# the explicit macros like AX_CFLAGS_WARN_ALL. -# -# The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add to -# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it -# is possible to use different compilers for C and C++). -# -# The macro is a lot simpler than any special AX_CFLAGS_* macro (or -# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. -# However, if you use this macro in a few places, it would be great if you -# would make up a new function-macro and submit it to the ac-archive. -# -# - $1 option-to-check-for : required ("-option" as non-value) -# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) -# - $3 action-if-found : add value to shellvariable -# - $4 action-if-not-found : nothing -# -# Note: in earlier versions, $1-$2 were swapped. We try to detect the -# situation and accept a $2=~/-/ as being the old option-to-check-for. -# -# There are other variants that emerged from the original macro variant -# which did just test an option to be possibly added. However, some -# compilers accept an option silently, or possibly for just another option -# that was not intended. Therefore, we have to do a generic test for a -# compiler family. For gcc we check "-pedantic" being accepted which is -# also understood by compilers who just want to be compatible with gcc -# even when not being made from gcc sources. -# -# See also: AX_CFLAGS_SUN_OPTION, AX_CFLAGS_HPUX_OPTION, -# AX_CFLAGS_AIX_OPTION, and AX_CFLAGS_IRIX_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# -# 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, 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 12 - -AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl -AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_C - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC - "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - - -dnl the only difference - the LANG selection... and the default FLAGS - -AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl -AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC - "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -dnl ------------------------------------------------------------------------- - -AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl -AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl -AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_C - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC - "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"]) - m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - - -dnl the only difference - the LANG selection... and the default FLAGS - -AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl -AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl -AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC - "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"]) - m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1, -[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])]) - -AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1, -[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_sun_option.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_sun_option.m4 deleted file mode 100644 index 58703de2..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_cflags_sun_option.m4 +++ /dev/null @@ -1,212 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cflags_sun_option.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CFLAGS_SUN_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) -# -# DESCRIPTION -# -# AX_CFLAGS_SUN_OPTION(+xtreme) would show a message as like "checking -# CFLAGS for sun/cc +xtreme ... yes" and adds the optionflag to CFLAGS if -# it is understood. You can override the shellvar-default of CFLAGS of -# course. The order of arguments stems from the explicit macros like -# AX_CFLAGS_WARN_ALL. -# -# The cousin AX_CXXFLAGS_SUN_OPTION would check for an option to add to -# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it -# is possible to use different compilers for C and C++). -# -# The macro is a lot simpler than any special AX_CFLAGS_* macro (or -# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. -# However, if you use this macro in a few places, it would be great if you -# would make up a new function-macro and submit it to the ac-archive. -# -# - $1 option-to-check-for : required ("-option" as non-value) -# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) -# - $3 action-if-found : add value to shellvariable -# - $4 action-if-not-found : nothing -# -# note: in earlier versions, $1-$2 were swapped. We try to detect the -# situation and accept a $2=~/-/ as being the old option-to-check-for. -# -# see also: AX_CFLAGS_GCC_OPTION for the widely used original variant. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# -# 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, 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 7 - -AC_DEFUN([AX_CFLAGS_SUN_OPTION_OLD], [dnl -AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_sun_option_$2])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for sun/cc m4_ifval($2,$2,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_C - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "+xstrconst -Xc % m4_ifval($2,$2,-option)" dnl Solaris C - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - - -dnl the only difference - the LANG selection... and the default FLAGS - -AC_DEFUN([AX_CXXFLAGS_SUN_OPTION_OLD], [dnl -AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_sun_option_$2])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for sun/cc m4_ifval($2,$2,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "+xstrconst -Xc % m4_ifval($2,$2,-option)" dnl Solaris C - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -dnl ----------------------------------------------------------------------- - -AC_DEFUN([AX_CFLAGS_SUN_OPTION_NEW], [dnl -AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_sun_option_$1])dnl -AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for sun/cc m4_ifval($1,$1,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_C - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "+xstrconst -Xc % m4_ifval($1,$1,-option)" dnl Solaris C - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"]) - m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - - -dnl the only difference - the LANG selection... and the default FLAGS - -AC_DEFUN([AX_CXXFLAGS_SUN_OPTION_NEW], [dnl -AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_sun_option_$1])dnl -AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for sun/cc m4_ifval($1,$1,-option)], -VAR,[AS_VAR_SET([VAR],["no, unknown"]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "+xstrconst -Xc % m4_ifval($1,$1,-option)" dnl Solaris C - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])]) -case ".$var" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var]) - else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"]) - m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -AC_DEFUN([AX_CFLAGS_SUN_OPTION],[ifelse(m4_bregexp([$2],[-]),-1, -[AX_CFLAGS_SUN_OPTION_NEW($@)],[AX_CFLAGS_SUN_OPTION_OLD($@)])]) - -AC_DEFUN([AX_CXXFLAGS_SUN_OPTION],[ifelse(m4_bregexp([$2],[-]),-1, -[AX_CXXFLAGS_SUN_OPTION_NEW($@)],[AX_CXXFLAGS_SUN_OPTION_OLD($@)])]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_declspec.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_declspec.m4 deleted file mode 100644 index b932dc96..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_declspec.m4 +++ /dev/null @@ -1,61 +0,0 @@ -dnl Check for the __declspec(dllexport) construct support. - -AC_DEFUN([AX_DECLSPEC], -[ -AH_TEMPLATE($1_IMPORT, - [Defined if the compiler understands __declspec(dllexport) - or construct.]) -AH_TEMPLATE($1_EXPORT, - [Defined if the compiler understands __declspec(dllimport) - or __attribute__((visibility("default"))) construct.]) - -AC_CACHE_CHECK([for __declspec(dllexport)], [ac_cv_declspec], -[ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[__declspec(dllexport) int x = 0; - __declspec(dllexport) int foo (); - int foo () { return 0; } - __declspec(dllexport) int bar () { return x; } - ]], - [[]])], - [ac_cv_declspec=yes], - [ac_cv_declspec=no]) -]) - -AS_IF([test "x$ac_cv_declspec" = "xyes"], - [AC_DEFINE($1_IMPORT, [__declspec(dllimport)]) - AC_DEFINE($1_EXPORT, [__declspec(dllexport)])], - -[ -AC_CACHE_CHECK([for __attribute__((visibility("default")))], [ac_cv__attribute__visibility], -[ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#if defined (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)) -# error Please fail. -And extra please fail. -#else - __attribute__((visibility("default"))) int x = 0; - __attribute__((visibility("default"))) int foo (); - int foo () { return 0; } - __attribute__((visibility("default"))) int bar () { return x; } - __attribute__((visibility("hidden"))) int baz () { return 1; } -#endif - ]], - [[]])], - [ac_cv__attribute__visibility=yes], - [ac_cv__attribute__visibility=no]) -]) - -AS_IF([test "x$ac_cv__attribute__visibility" = "xyes"], - [AC_DEFINE($1_IMPORT, []) - AC_DEFINE($1_EXPORT, [__attribute__ ((visibility("default")))])]) -]) - -AS_IF([test "x$ac_cv__attribute__visibility" = "xno" && test "x$ac_cv_declspec" = "xno"], - [AC_DEFINE($1_IMPORT, []) - AC_DEFINE($1_EXPORT, [])]) - -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_getaddrinfo.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_getaddrinfo.m4 deleted file mode 100644 index 262529d9..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_getaddrinfo.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl AX_GETADDRINFO checks for getaddrinfo() function and sets -dnl $ax_cv_have_getaddrinfo accordingly and defines -dnl HAVE_GETADDRINFO. - -AC_DEFUN([AX_GETADDRINFO], [ -AH_TEMPLATE([HAVE_GETADDRINFO]) -AC_CACHE_CHECK([for getaddrinfo], [ax_cv_have_getaddrinfo], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([ -#ifdef __cplusplus -#include -#else -#include -#endif - -#include -#include -#include - ], [ -getaddrinfo (NULL, NULL, NULL, NULL); - ])], - [ax_cv_have_getaddrinfo=yes], - [ax_cv_have_getaddrinfo=no])]) - -AS_IF([test "x$ax_cv_have_getaddrinfo" = "xyes"], - [AC_DEFINE([HAVE_GETADDRINFO])]) -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_gethostbyname_r.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_gethostbyname_r.m4 deleted file mode 100644 index 196ce5fb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_gethostbyname_r.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl AX_GETHOSTBYNAME_R checks for gethostbyname_r() function and sets -dnl $ax_cv_have_gethostbyname_r accordingly and defines -dnl HAVE_GETHOSTBYNAME_R. - -AC_DEFUN([AX_GETHOSTBYNAME_R], [ -AH_TEMPLATE([HAVE_GETHOSTBYNAME_R]) -AC_CACHE_CHECK([for gethostbyname_r], [ax_cv_have_gethostbyname_r], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([ -#ifdef __cplusplus -#include -#else -#include -#endif - -#include -#include -#include - ], [ -gethostbyname_r (NULL, NULL, NULL, 0, NULL, NULL); - ])], - [ax_cv_have_gethostbyname_r=yes], - [ax_cv_have_gethostbyname_r=no])]) - -AS_IF([test "x$ax_cv_have_gethostbyname_r" = "xyes"], - [AC_DEFINE([HAVE_GETHOSTBYNAME_R])]) -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_log4cplus_wrappers.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_log4cplus_wrappers.m4 deleted file mode 100644 index cfb4d407..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_log4cplus_wrappers.m4 +++ /dev/null @@ -1,9 +0,0 @@ -dnl LOG4CPLUS_CHECK_HEADER([header], [preprocessor symbol to define]) -AC_DEFUN([LOG4CPLUS_CHECK_HEADER], - [AH_TEMPLATE([$2]) - AC_CHECK_HEADER([$1], [AC_DEFINE([$2])])]) - -dnl LOG4CPLUS_CHECK_FUNCS([function], [preprocessor symbol to define]) -AC_DEFUN([LOG4CPLUS_CHECK_FUNCS], - [AH_TEMPLATE([$2]) - AC_CHECK_FUNCS([$1], [AC_DEFINE([$2])])]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_pthread.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_pthread.m4 deleted file mode 100644 index bdae4771..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ax_pthread.m4 +++ /dev/null @@ -1,283 +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). -# -# 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. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# -# 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 7 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_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_cpu}-${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*) - acx_pthread_flags="-pthread $acx_pthread_flags" - ;; -esac - -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" - - # 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_TRY_LINK([#include - static void routine(void* a) {a=0;} - static void* start_routine(void* a) {return a;}], - [pthread_t th; pthread_attr_t attr; - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_create(&th,0,start_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_TRY_LINK([#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_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) - else - PTHREAD_CC=$CC - fi -else - PTHREAD_CC="$CC" -fi - -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_RESTORE -])dnl AX_PTHREAD diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/libtool.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/libtool.m4 deleted file mode 100644 index 22924a86..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/libtool.m4 +++ /dev/null @@ -1,7437 +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 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 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([], [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_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])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) 2010 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - 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)], - [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 - - -# _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([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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; 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 -# -------------------------- -# 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\"`' - 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 -# ----------------------- -# 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. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`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 "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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_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*|ppc*-*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*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - 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" - ;; - ppc*-*linux*|powerpc*-*linux*) - 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 - ;; -sparc*-*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*) LD="${LD-ld} -m elf64_sparc" ;; - *) - 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_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) - -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 \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$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 - ;; - - 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"; 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"`func_fallback_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)) -void fnord () __attribute__((visibility("default"))); -#endif - -void fnord () { int i=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 - 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 - 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 - 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,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - 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 - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # 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 - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[[123]]*) 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 - ;; - -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 - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux - 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 - 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 - 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 Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-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' - 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' - ;; - -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 - 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 - 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 - 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 - 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 - 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 - 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 - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -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 Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - 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_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_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_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};"\ -" /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 - - # 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 -#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. */ -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_save_LIBS="$LIBS" - lt_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_save_LIBS" - CFLAGS="$lt_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 - -_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_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)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) -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 - ;; - 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) - 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*) - ;; - *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 ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' - ;; - 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) - 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' - ;; - 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\ F* | *Sun*Fortran*) - # 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\ 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,' - ;; - 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_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) - -# -# 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]) - -# -# 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_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' - 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*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -], [ - 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_flag_spec_ld, $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 - ;; - 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/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - 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= - 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)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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*) - 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 $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' - 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 $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 - ;; - - 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 $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 - - 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 - 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 - _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 - _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. - _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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - 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 - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $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 -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 -fPIC ${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 -fPIC ${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_flag_spec_ld, $1)='+b $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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${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 $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. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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' - ) - LDFLAGS="$save_LDFLAGS" - 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*) - 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} $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 ${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 ${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_flag_spec_ld], [1], - [[If ld is used when linking, 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([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) -_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([], [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 -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_flag_spec_ld, $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_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++"} - 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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -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 - _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 - _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*) - # _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 - ;; - 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 - ;; - - freebsd[[12]]*) - # 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 - ;; - - gnu*) - ;; - - 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 -fPIC ${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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${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 -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 -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) - 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 -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 -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 -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 - 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_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 -# 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 -]) -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 $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 - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p 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 - ;; - - *.$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 - -# 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_flag_spec_ld, $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 - CC=${F77-"f77"} - 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" -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_flag_spec_ld, $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 - CC=${FC-"f95"} - 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" -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_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -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" -])# _LT_LANG_GCJ_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_GCC=$GCC -GCC= -CC=${RC-"windres"} -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" -])# _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_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_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"}, \ - = c,a/b,, \ - && 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_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# 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 () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# 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_stripname () -{ - # 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}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# 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 () -{ - # Extract subdirectory from the argument. - 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_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# 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 -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF - ;; - esac -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltoptions.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltoptions.m4 deleted file mode 100644 index 17cfd51c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltoptions.m4 +++ /dev/null @@ -1,369 +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], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [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/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltsugar.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltsugar.m4 deleted file mode 100644 index 9000a057..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/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/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltversion.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/ltversion.m4 deleted file mode 100644 index 93fc7712..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/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. - -# Generated from ltversion.in. - -# serial 3175 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.2.10]) -m4_define([LT_PACKAGE_REVISION], [1.3175]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.10' -macro_revision='1.3175' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/lt~obsolete.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/lt~obsolete.m4 deleted file mode 100644 index c573da90..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/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/3rd_party/log4cplus/log4cplus-1.0.4/m4/type_socklen_t.m4 b/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/type_socklen_t.m4 deleted file mode 100644 index 6e460a3c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/m4/type_socklen_t.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl Check for the existance of type socklen_t. - -AC_DEFUN([TYPE_SOCKLEN_T], -[ -AH_TEMPLATE([socklen_t], [Define to int if undefined.]) -AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, -[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], [[socklen_t len = 42; return 0;]])],[ac_cv_type_socklen_t=yes],[ac_cv_type_socklen_t=no]) -]) - if test $ac_cv_type_socklen_t != yes; then - AC_DEFINE(socklen_t, int) - fi -]) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/missing b/src/3rd_party/log4cplus/log4cplus-1.0.4/missing deleted file mode 100755 index 28055d2a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/missing +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally 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 - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -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 - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# 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/3rd_party/log4cplus/log4cplus-1.0.4/mkinstalldirs b/src/3rd_party/log4cplus/log4cplus-1.0.4/mkinstalldirs deleted file mode 100755 index 4191a45d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/mkinstalldirs +++ /dev/null @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# 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/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.sln b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.sln deleted file mode 100644 index e8e9a990..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.sln +++ /dev/null @@ -1,392 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appender_test", "tests\appender_test.vcproj", "{63AF3784-3FFB-46AC-B341-76B55AEE3148}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileappender_test", "tests\fileappender_test.vcproj", "{434FBB6C-6D3C-466A-86DB-DE999065B5E5}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filter_test", "tests\filter_test.vcproj", "{66FE475D-D26C-4457-8B1C-B057D770C716}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hierarchy_test", "tests\hierarchy_test.vcproj", "{07817E6D-9FAB-4261-9D62-C5AD13810258}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplus_dll", "log4cplus_dll.vcproj", "{917836A4-0DDC-47BE-B930-1B3BFDF6C940}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cplus_static", "log4cplus_static.vcproj", "{BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loggingserver", "loggingserver.vcproj", "{B8E88AF6-0427-4839-88AC-0C6E12615B10}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loglog_test", "tests\loglog_test.vcproj", "{1F8CC79C-876D-4A13-BA92-98A3A51B2749}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndc_test", "tests\ndc_test.vcproj", "{FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance_test", "tests\performance_test.vcproj", "{94EF9EE0-6E68-4F5F-9174-D09896518894}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configandwatch_test", "tests\configandwatch_test.vcproj", "{0A878274-362D-4184-B5C6-A1C80D22A170}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "customloglevel_test", "tests\customloglevel_test.vcproj", "{040B829F-8ED6-4D35-9043-0DF31597F7FB}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ostream_test", "tests\ostream_test.vcproj", "{C133DEF0-FAF5-4635-8D5A-2C789B424371}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "priority_test", "tests\priority_test.vcproj", "{CBD762A9-79BC-4AE7-8890-76360F539D76}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket_test", "tests\socket_test.vcproj", "{D405C4A0-D62F-4EE7-96D2-76AD808C7319}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thread_test", "tests\thread_test.vcproj", "{F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BAC1F7E5-C861-4FB2-A466-D0D675F4C33D}" - ProjectSection(SolutionItems) = preProject - tests\log4cplus_tests.vsprops = tests\log4cplus_tests.vsprops - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patternlayout_test", "tests\patternlayout_test.vcproj", "{AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}" - ProjectSection(ProjectDependencies) = postProject - {917836A4-0DDC-47BE-B930-1B3BFDF6C940} = {917836A4-0DDC-47BE-B930-1B3BFDF6C940} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Unicode|Win32 = Debug_Unicode|Win32 - Debug_Unicode|x64 = Debug_Unicode|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_Unicode|Win32 = Release_Unicode|Win32 - Release_Unicode|x64 = Release_Unicode|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.ActiveCfg = Debug|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|Win32.Build.0 = Debug|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.ActiveCfg = Debug|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Debug|x64.Build.0 = Debug|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.ActiveCfg = Release|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|Win32.Build.0 = Release|Win32 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.ActiveCfg = Release|x64 - {63AF3784-3FFB-46AC-B341-76B55AEE3148}.Release|x64.Build.0 = Release|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.ActiveCfg = Debug|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|Win32.Build.0 = Debug|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.ActiveCfg = Debug|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Debug|x64.Build.0 = Debug|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.ActiveCfg = Release|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|Win32.Build.0 = Release|Win32 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.ActiveCfg = Release|x64 - {434FBB6C-6D3C-466A-86DB-DE999065B5E5}.Release|x64.Build.0 = Release|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.ActiveCfg = Debug|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|Win32.Build.0 = Debug|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.ActiveCfg = Debug|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Debug|x64.Build.0 = Debug|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.ActiveCfg = Release|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|Win32.Build.0 = Release|Win32 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.ActiveCfg = Release|x64 - {66FE475D-D26C-4457-8B1C-B057D770C716}.Release|x64.Build.0 = Release|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.ActiveCfg = Debug|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|Win32.Build.0 = Debug|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.ActiveCfg = Debug|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Debug|x64.Build.0 = Debug|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.ActiveCfg = Release|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|Win32.Build.0 = Release|Win32 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.ActiveCfg = Release|x64 - {07817E6D-9FAB-4261-9D62-C5AD13810258}.Release|x64.Build.0 = Release|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.ActiveCfg = Debug|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|Win32.Build.0 = Debug|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.ActiveCfg = Debug|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Debug|x64.Build.0 = Debug|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.ActiveCfg = Release|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|Win32.Build.0 = Release|Win32 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.ActiveCfg = Release|x64 - {917836A4-0DDC-47BE-B930-1B3BFDF6C940}.Release|x64.Build.0 = Release|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|Win32.Build.0 = Debug|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.ActiveCfg = Debug|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Debug|x64.Build.0 = Debug|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.ActiveCfg = Release|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|Win32.Build.0 = Release|Win32 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.ActiveCfg = Release|x64 - {BEC0CD2F-60CD-40E2-A89B-AB10E902F1D5}.Release|x64.Build.0 = Release|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|Win32.Build.0 = Debug|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.ActiveCfg = Debug|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Debug|x64.Build.0 = Debug|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.ActiveCfg = Release|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|Win32.Build.0 = Release|Win32 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.ActiveCfg = Release|x64 - {B8E88AF6-0427-4839-88AC-0C6E12615B10}.Release|x64.Build.0 = Release|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|Win32.Build.0 = Debug|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.ActiveCfg = Debug|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Debug|x64.Build.0 = Debug|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.ActiveCfg = Release|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|Win32.Build.0 = Release|Win32 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.ActiveCfg = Release|x64 - {1F8CC79C-876D-4A13-BA92-98A3A51B2749}.Release|x64.Build.0 = Release|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|Win32.Build.0 = Debug|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.ActiveCfg = Debug|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Debug|x64.Build.0 = Debug|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.ActiveCfg = Release|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|Win32.Build.0 = Release|Win32 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.ActiveCfg = Release|x64 - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC}.Release|x64.Build.0 = Release|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.ActiveCfg = Debug|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|Win32.Build.0 = Debug|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.ActiveCfg = Debug|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Debug|x64.Build.0 = Debug|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.ActiveCfg = Release|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|Win32.Build.0 = Release|Win32 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.ActiveCfg = Release|x64 - {94EF9EE0-6E68-4F5F-9174-D09896518894}.Release|x64.Build.0 = Release|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|Win32.Build.0 = Debug|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.ActiveCfg = Debug|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Debug|x64.Build.0 = Debug|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.ActiveCfg = Release|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|Win32.Build.0 = Release|Win32 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.ActiveCfg = Release|x64 - {0A878274-362D-4184-B5C6-A1C80D22A170}.Release|x64.Build.0 = Release|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|Win32.Build.0 = Debug|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.ActiveCfg = Debug|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Debug|x64.Build.0 = Debug|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.ActiveCfg = Release|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|Win32.Build.0 = Release|Win32 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.ActiveCfg = Release|x64 - {040B829F-8ED6-4D35-9043-0DF31597F7FB}.Release|x64.Build.0 = Release|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.ActiveCfg = Debug|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|Win32.Build.0 = Debug|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.ActiveCfg = Debug|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Debug|x64.Build.0 = Debug|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.ActiveCfg = Release|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|Win32.Build.0 = Release|Win32 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.ActiveCfg = Release|x64 - {C133DEF0-FAF5-4635-8D5A-2C789B424371}.Release|x64.Build.0 = Release|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.ActiveCfg = Debug|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|Win32.Build.0 = Debug|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.ActiveCfg = Debug|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Debug|x64.Build.0 = Debug|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.ActiveCfg = Release|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|Win32.Build.0 = Release|Win32 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.ActiveCfg = Release|x64 - {CBD762A9-79BC-4AE7-8890-76360F539D76}.Release|x64.Build.0 = Release|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.ActiveCfg = Debug|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|Win32.Build.0 = Debug|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.ActiveCfg = Debug|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Debug|x64.Build.0 = Debug|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.ActiveCfg = Release|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|Win32.Build.0 = Release|Win32 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.ActiveCfg = Release|x64 - {D405C4A0-D62F-4EE7-96D2-76AD808C7319}.Release|x64.Build.0 = Release|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|Win32.Build.0 = Debug|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.ActiveCfg = Debug|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Debug|x64.Build.0 = Debug|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.ActiveCfg = Release|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|Win32.Build.0 = Release|Win32 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.ActiveCfg = Release|x64 - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED}.Release|x64.Build.0 = Release|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug_Unicode|x64.Build.0 = Debug_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.ActiveCfg = Debug|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|Win32.Build.0 = Debug|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.ActiveCfg = Debug|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Debug|x64.Build.0 = Debug|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.ActiveCfg = Release_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release_Unicode|x64.Build.0 = Release_Unicode|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.ActiveCfg = Release|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|Win32.Build.0 = Release|Win32 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.ActiveCfg = Release|x64 - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {434FBB6C-6D3C-466A-86DB-DE999065B5E5} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {66FE475D-D26C-4457-8B1C-B057D770C716} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {07817E6D-9FAB-4261-9D62-C5AD13810258} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {1F8CC79C-876D-4A13-BA92-98A3A51B2749} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {FBCE50FB-C87B-4A28-9551-7D1BFDAA65EC} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {94EF9EE0-6E68-4F5F-9174-D09896518894} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {0A878274-362D-4184-B5C6-A1C80D22A170} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {040B829F-8ED6-4D35-9043-0DF31597F7FB} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {C133DEF0-FAF5-4635-8D5A-2C789B424371} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {CBD762A9-79BC-4AE7-8890-76360F539D76} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {D405C4A0-D62F-4EE7-96D2-76AD808C7319} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {F83D31E0-B607-4D3E-AF53-BA2A19BE17ED} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {63AF3784-3FFB-46AC-B341-76B55AEE3148} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - {AE4CF05D-9770-4BF2-BB73-1DA37E2A1508} = {BAC1F7E5-C861-4FB2-A466-D0D675F4C33D} - EndGlobalSection -EndGlobal diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.vsprops b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.vsprops deleted file mode 100644 index 2159330e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus.vsprops +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_dll.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_dll.vcproj deleted file mode 100644 index 9e351b5f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_dll.vcproj +++ /dev/null @@ -1,3696 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_static.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_static.vcproj deleted file mode 100644 index a248fcd7..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/log4cplus_static.vcproj +++ /dev/null @@ -1,3556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vcproj deleted file mode 100644 index a638d042..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vcproj +++ /dev/null @@ -1,772 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vsprops b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vsprops deleted file mode 100644 index 61a87c0e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/loggingserver.vsprops +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/appender_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/appender_test.vcproj deleted file mode 100644 index 842b198a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/appender_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/configandwatch_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/configandwatch_test.vcproj deleted file mode 100644 index ce712a57..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/configandwatch_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/customloglevel_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/customloglevel_test.vcproj deleted file mode 100644 index f6590a84..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/customloglevel_test.vcproj +++ /dev/null @@ -1,967 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/fileappender_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/fileappender_test.vcproj deleted file mode 100644 index c4af13bf..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/fileappender_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/filter_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/filter_test.vcproj deleted file mode 100644 index 3bfb41b1..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/filter_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/hierarchy_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/hierarchy_test.vcproj deleted file mode 100644 index fa80719f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/hierarchy_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/log4cplus_tests.vsprops b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/log4cplus_tests.vsprops deleted file mode 100644 index d08d6108..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/log4cplus_tests.vsprops +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/loglog_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/loglog_test.vcproj deleted file mode 100644 index a38d5b0d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/loglog_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ndc_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ndc_test.vcproj deleted file mode 100644 index 648d97f1..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ndc_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ostream_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ostream_test.vcproj deleted file mode 100644 index d3b34b44..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/ostream_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/patternlayout_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/patternlayout_test.vcproj deleted file mode 100644 index 4685fd91..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/patternlayout_test.vcproj +++ /dev/null @@ -1,830 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/performance_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/performance_test.vcproj deleted file mode 100644 index 4ae0e3fb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/performance_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/priority_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/priority_test.vcproj deleted file mode 100644 index 4607fc5c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/priority_test.vcproj +++ /dev/null @@ -1,891 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/socket_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/socket_test.vcproj deleted file mode 100644 index 438a2f8a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/socket_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/thread_test.vcproj b/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/thread_test.vcproj deleted file mode 100644 index 27fdb061..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/msvc8/tests/thread_test.vcproj +++ /dev/null @@ -1,815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/autogen.sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/autogen.sh deleted file mode 100755 index ae5c4085..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/autogen.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -libtoolize --force --automake - -autoheader -aclocal $ACLOCAL_FLAGS -autoconf -automake --ignore-deps --add-missing - -echo 'run "configure; make"' - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.bat b/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.bat deleted file mode 100755 index 75b0b723..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.bat +++ /dev/null @@ -1,21 +0,0 @@ - -REM Make changes to environment local -setlocal - -SET RMDIR=rmdir /S /Q -SET DEL=del /Q - -%RMDIR% CMakeFiles -%RMDIR% debug -%RMDIR% log4cplus.dir -%RMDIR% loggingserver.dir -%RMDIR% minsizerel -%RMDIR% release -%RMDIR% relwithdebinfo -%RMDIR% ZERO_CHECK.dir - -%DEL% cmake_install.cmake -%DEL% CMakeCache.txt - -REM Clean up changes to environment. -endlocal diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.sh deleted file mode 100755 index e287a27a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/clean_cmake_files.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -x - -for f in CMakeFiles \ - debug \ - log4cplus.dir \ - loggingserver.dir \ - minsizerel \ - release \ - relwithdebinfo \ - ZERO_CHECK.dir \ - cmake_install.cmake \ - CMakeCache.txt \ - ; -do - rm -rf "${f}" -done diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/doautoreconf.sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/doautoreconf.sh deleted file mode 100644 index 310d2dc6..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/doautoreconf.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -export AUTOMAKE_SUFFIX=-1.11.1 -export AUTOCONF_SUFFIX=-2.68 -export LIBTOOL_SUFFIX=-2.2.10 - -export ACLOCAL="aclocal${AUTOMAKE_SUFFIX}" -export AUTOMAKE="automake${AUTOMAKE_SUFFIX}" - -export AUTOCONF="autoconf${AUTOCONF_SUFFIX}" -export AUTOHEADER="autoheader${AUTOCONF_SUFFIX}" -export AUTOM4TE="autom4te${AUTOCONF_SUFFIX}" -export AUTORECONF="autoreconf${AUTOCONF_SUFFIX}" -export AUTOSCAN="autoscan${AUTOCONF_SUFFIX}" -export AUTOUPDATE="autoupdate${AUTOCONF_SUFFIX}" -export IFNAMES="ifnames${AUTOCONF_SUFFIX}" - -export LIBTOOLIZE="libtoolize${LIBTOOL_SUFFIX}" -export LIBTOOL="libtool${LIBTOOL_SUFFIX}" - -$AUTORECONF -f diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/fix-timestamps.sh b/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/fix-timestamps.sh deleted file mode 100755 index 149e5f3e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/scripts/fix-timestamps.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x - -touch aclocal.m4 -find . -name 'Makefile.in' -print -exec touch '{}' ';' -touch configure diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.am deleted file mode 100644 index 691149fe..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -lib_LTLIBRARIES = liblog4cplus.la - -AM_CPPFLAGS = -DINSIDE_LOG4CPLUS \ - -I$(top_srcdir)/include -I$(top_builddir)/include \ - @LOG4CPLUS_NDEBUG@ - -AM_CXXFLAGS = -no-suppress - -INCLUDES_SRC_PATH = $(top_srcdir)/include/log4cplus - -INCLUDES_SRC = \ - $(INCLUDES_SRC_PATH)/appender.h \ - $(INCLUDES_SRC_PATH)/config.hxx \ - $(INCLUDES_SRC_PATH)/config/win32.h \ - $(INCLUDES_SRC_PATH)/config/macosx.h \ - $(INCLUDES_SRC_PATH)/configurator.h \ - $(INCLUDES_SRC_PATH)/consoleappender.h \ - $(INCLUDES_SRC_PATH)/fileappender.h \ - $(INCLUDES_SRC_PATH)/fstreams.h \ - $(INCLUDES_SRC_PATH)/hierarchy.h \ - $(INCLUDES_SRC_PATH)/hierarchylocker.h \ - $(INCLUDES_SRC_PATH)/layout.h \ - $(INCLUDES_SRC_PATH)/logger.h \ - $(INCLUDES_SRC_PATH)/loggingmacros.h \ - $(INCLUDES_SRC_PATH)/loglevel.h \ - $(INCLUDES_SRC_PATH)/ndc.h \ - $(INCLUDES_SRC_PATH)/nullappender.h \ - $(INCLUDES_SRC_PATH)/socketappender.h \ - $(INCLUDES_SRC_PATH)/streams.h \ - $(INCLUDES_SRC_PATH)/syslogappender.h \ - $(INCLUDES_SRC_PATH)/tstring.h \ - $(INCLUDES_SRC_PATH)/version.h \ - $(INCLUDES_SRC_PATH)/helpers/appenderattachableimpl.h \ - $(INCLUDES_SRC_PATH)/helpers/loglog.h \ - $(INCLUDES_SRC_PATH)/helpers/logloguser.h \ - $(INCLUDES_SRC_PATH)/helpers/pointer.h \ - $(INCLUDES_SRC_PATH)/helpers/property.h \ - $(INCLUDES_SRC_PATH)/helpers/sleep.h \ - $(INCLUDES_SRC_PATH)/helpers/socketbuffer.h \ - $(INCLUDES_SRC_PATH)/helpers/socket.h \ - $(INCLUDES_SRC_PATH)/helpers/stringhelper.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims-pthreads.h \ - $(INCLUDES_SRC_PATH)/helpers/thread-config.h \ - $(INCLUDES_SRC_PATH)/helpers/threads.h \ - $(INCLUDES_SRC_PATH)/helpers/timehelper.h \ - $(INCLUDES_SRC_PATH)/spi/appenderattachable.h \ - $(INCLUDES_SRC_PATH)/spi/factory.h \ - $(INCLUDES_SRC_PATH)/spi/filter.h \ - $(INCLUDES_SRC_PATH)/spi/loggerfactory.h \ - $(INCLUDES_SRC_PATH)/spi/loggerimpl.h \ - $(INCLUDES_SRC_PATH)/spi/loggingevent.h \ - $(INCLUDES_SRC_PATH)/spi/objectregistry.h \ - $(INCLUDES_SRC_PATH)/spi/rootlogger.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx - -SINGLE_THREADED_SRC = \ - $(INCLUDES_SRC) \ - appenderattachableimpl.cxx \ - appender.cxx \ - configurator.cxx \ - consoleappender.cxx \ - factory.cxx \ - fileappender.cxx \ - filter.cxx \ - global-init.cxx \ - hierarchy.cxx \ - hierarchylocker.cxx \ - layout.cxx \ - logger.cxx \ - loggerimpl.cxx \ - loggingevent.cxx \ - loglevel.cxx \ - loglog.cxx \ - logloguser.cxx \ - ndc.cxx \ - nteventlogappender.cxx \ - nullappender.cxx \ - objectregistry.cxx \ - patternlayout.cxx \ - pointer.cxx \ - property.cxx \ - rootlogger.cxx \ - sleep.cxx \ - socket.cxx \ - socketappender.cxx \ - socketbuffer.cxx \ - stringhelper.cxx \ - syslogappender.cxx \ - timehelper.cxx \ - version.cxx \ - win32consoleappender.cxx \ - win32debugappender.cxx - -if WINSOCK_SOCKETS -SOCKETS_SRC = socket-win32.cxx -else -SOCKETS_SRC = socket-unix.cxx -endif - -if MULTI_THREADED -THREADS_SRC = threads.cxx \ - syncprims.cxx -else -THREADS_SRC = -endif - -LIB_SRC = $(SINGLE_THREADED_SRC) \ - $(THREADS_SRC) \ - $(SOCKETS_SRC) - -liblog4cplus_la_SOURCES = $(LIB_SRC) - -#liblog4cplus_a_LIBADD = @LIBOBJS@ @ALLOCA@ -liblog4cplus_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ -release 1.0 diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.in deleted file mode 100644 index b9bbc444..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/Makefile.in +++ /dev/null @@ -1,761 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -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__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -liblog4cplus_la_LIBADD = -am__liblog4cplus_la_SOURCES_DIST = $(INCLUDES_SRC_PATH)/appender.h \ - $(INCLUDES_SRC_PATH)/config.hxx \ - $(INCLUDES_SRC_PATH)/config/win32.h \ - $(INCLUDES_SRC_PATH)/config/macosx.h \ - $(INCLUDES_SRC_PATH)/configurator.h \ - $(INCLUDES_SRC_PATH)/consoleappender.h \ - $(INCLUDES_SRC_PATH)/fileappender.h \ - $(INCLUDES_SRC_PATH)/fstreams.h \ - $(INCLUDES_SRC_PATH)/hierarchy.h \ - $(INCLUDES_SRC_PATH)/hierarchylocker.h \ - $(INCLUDES_SRC_PATH)/layout.h $(INCLUDES_SRC_PATH)/logger.h \ - $(INCLUDES_SRC_PATH)/loggingmacros.h \ - $(INCLUDES_SRC_PATH)/loglevel.h $(INCLUDES_SRC_PATH)/ndc.h \ - $(INCLUDES_SRC_PATH)/nullappender.h \ - $(INCLUDES_SRC_PATH)/socketappender.h \ - $(INCLUDES_SRC_PATH)/streams.h \ - $(INCLUDES_SRC_PATH)/syslogappender.h \ - $(INCLUDES_SRC_PATH)/tstring.h $(INCLUDES_SRC_PATH)/version.h \ - $(INCLUDES_SRC_PATH)/helpers/appenderattachableimpl.h \ - $(INCLUDES_SRC_PATH)/helpers/loglog.h \ - $(INCLUDES_SRC_PATH)/helpers/logloguser.h \ - $(INCLUDES_SRC_PATH)/helpers/pointer.h \ - $(INCLUDES_SRC_PATH)/helpers/property.h \ - $(INCLUDES_SRC_PATH)/helpers/sleep.h \ - $(INCLUDES_SRC_PATH)/helpers/socketbuffer.h \ - $(INCLUDES_SRC_PATH)/helpers/socket.h \ - $(INCLUDES_SRC_PATH)/helpers/stringhelper.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims-pthreads.h \ - $(INCLUDES_SRC_PATH)/helpers/thread-config.h \ - $(INCLUDES_SRC_PATH)/helpers/threads.h \ - $(INCLUDES_SRC_PATH)/helpers/timehelper.h \ - $(INCLUDES_SRC_PATH)/spi/appenderattachable.h \ - $(INCLUDES_SRC_PATH)/spi/factory.h \ - $(INCLUDES_SRC_PATH)/spi/filter.h \ - $(INCLUDES_SRC_PATH)/spi/loggerfactory.h \ - $(INCLUDES_SRC_PATH)/spi/loggerimpl.h \ - $(INCLUDES_SRC_PATH)/spi/loggingevent.h \ - $(INCLUDES_SRC_PATH)/spi/objectregistry.h \ - $(INCLUDES_SRC_PATH)/spi/rootlogger.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx \ - appenderattachableimpl.cxx appender.cxx configurator.cxx \ - consoleappender.cxx factory.cxx fileappender.cxx filter.cxx \ - global-init.cxx hierarchy.cxx hierarchylocker.cxx layout.cxx \ - logger.cxx loggerimpl.cxx loggingevent.cxx loglevel.cxx \ - loglog.cxx logloguser.cxx ndc.cxx nteventlogappender.cxx \ - nullappender.cxx objectregistry.cxx patternlayout.cxx \ - pointer.cxx property.cxx rootlogger.cxx sleep.cxx socket.cxx \ - socketappender.cxx socketbuffer.cxx stringhelper.cxx \ - syslogappender.cxx timehelper.cxx version.cxx \ - win32consoleappender.cxx win32debugappender.cxx threads.cxx \ - syncprims.cxx socket-unix.cxx socket-win32.cxx -am__objects_1 = -am__objects_2 = $(am__objects_1) appenderattachableimpl.lo appender.lo \ - configurator.lo consoleappender.lo factory.lo fileappender.lo \ - filter.lo global-init.lo hierarchy.lo hierarchylocker.lo \ - layout.lo logger.lo loggerimpl.lo loggingevent.lo loglevel.lo \ - loglog.lo logloguser.lo ndc.lo nteventlogappender.lo \ - nullappender.lo objectregistry.lo patternlayout.lo pointer.lo \ - property.lo rootlogger.lo sleep.lo socket.lo socketappender.lo \ - socketbuffer.lo stringhelper.lo syslogappender.lo \ - timehelper.lo version.lo win32consoleappender.lo \ - win32debugappender.lo -@MULTI_THREADED_TRUE@am__objects_3 = threads.lo syncprims.lo -@WINSOCK_SOCKETS_FALSE@am__objects_4 = socket-unix.lo -@WINSOCK_SOCKETS_TRUE@am__objects_4 = socket-win32.lo -am__objects_5 = $(am__objects_2) $(am__objects_3) $(am__objects_4) -am_liblog4cplus_la_OBJECTS = $(am__objects_5) -liblog4cplus_la_OBJECTS = $(am_liblog4cplus_la_OBJECTS) -liblog4cplus_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(liblog4cplus_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liblog4cplus_la_SOURCES) -DIST_SOURCES = $(am__liblog4cplus_la_SOURCES_DIST) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -lib_LTLIBRARIES = liblog4cplus.la -AM_CPPFLAGS = -DINSIDE_LOG4CPLUS \ - -I$(top_srcdir)/include -I$(top_builddir)/include \ - @LOG4CPLUS_NDEBUG@ - -AM_CXXFLAGS = -no-suppress -INCLUDES_SRC_PATH = $(top_srcdir)/include/log4cplus -INCLUDES_SRC = \ - $(INCLUDES_SRC_PATH)/appender.h \ - $(INCLUDES_SRC_PATH)/config.hxx \ - $(INCLUDES_SRC_PATH)/config/win32.h \ - $(INCLUDES_SRC_PATH)/config/macosx.h \ - $(INCLUDES_SRC_PATH)/configurator.h \ - $(INCLUDES_SRC_PATH)/consoleappender.h \ - $(INCLUDES_SRC_PATH)/fileappender.h \ - $(INCLUDES_SRC_PATH)/fstreams.h \ - $(INCLUDES_SRC_PATH)/hierarchy.h \ - $(INCLUDES_SRC_PATH)/hierarchylocker.h \ - $(INCLUDES_SRC_PATH)/layout.h \ - $(INCLUDES_SRC_PATH)/logger.h \ - $(INCLUDES_SRC_PATH)/loggingmacros.h \ - $(INCLUDES_SRC_PATH)/loglevel.h \ - $(INCLUDES_SRC_PATH)/ndc.h \ - $(INCLUDES_SRC_PATH)/nullappender.h \ - $(INCLUDES_SRC_PATH)/socketappender.h \ - $(INCLUDES_SRC_PATH)/streams.h \ - $(INCLUDES_SRC_PATH)/syslogappender.h \ - $(INCLUDES_SRC_PATH)/tstring.h \ - $(INCLUDES_SRC_PATH)/version.h \ - $(INCLUDES_SRC_PATH)/helpers/appenderattachableimpl.h \ - $(INCLUDES_SRC_PATH)/helpers/loglog.h \ - $(INCLUDES_SRC_PATH)/helpers/logloguser.h \ - $(INCLUDES_SRC_PATH)/helpers/pointer.h \ - $(INCLUDES_SRC_PATH)/helpers/property.h \ - $(INCLUDES_SRC_PATH)/helpers/sleep.h \ - $(INCLUDES_SRC_PATH)/helpers/socketbuffer.h \ - $(INCLUDES_SRC_PATH)/helpers/socket.h \ - $(INCLUDES_SRC_PATH)/helpers/stringhelper.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims.h \ - $(INCLUDES_SRC_PATH)/helpers/syncprims-pthreads.h \ - $(INCLUDES_SRC_PATH)/helpers/thread-config.h \ - $(INCLUDES_SRC_PATH)/helpers/threads.h \ - $(INCLUDES_SRC_PATH)/helpers/timehelper.h \ - $(INCLUDES_SRC_PATH)/spi/appenderattachable.h \ - $(INCLUDES_SRC_PATH)/spi/factory.h \ - $(INCLUDES_SRC_PATH)/spi/filter.h \ - $(INCLUDES_SRC_PATH)/spi/loggerfactory.h \ - $(INCLUDES_SRC_PATH)/spi/loggerimpl.h \ - $(INCLUDES_SRC_PATH)/spi/loggingevent.h \ - $(INCLUDES_SRC_PATH)/spi/objectregistry.h \ - $(INCLUDES_SRC_PATH)/spi/rootlogger.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx - -SINGLE_THREADED_SRC = \ - $(INCLUDES_SRC) \ - appenderattachableimpl.cxx \ - appender.cxx \ - configurator.cxx \ - consoleappender.cxx \ - factory.cxx \ - fileappender.cxx \ - filter.cxx \ - global-init.cxx \ - hierarchy.cxx \ - hierarchylocker.cxx \ - layout.cxx \ - logger.cxx \ - loggerimpl.cxx \ - loggingevent.cxx \ - loglevel.cxx \ - loglog.cxx \ - logloguser.cxx \ - ndc.cxx \ - nteventlogappender.cxx \ - nullappender.cxx \ - objectregistry.cxx \ - patternlayout.cxx \ - pointer.cxx \ - property.cxx \ - rootlogger.cxx \ - sleep.cxx \ - socket.cxx \ - socketappender.cxx \ - socketbuffer.cxx \ - stringhelper.cxx \ - syslogappender.cxx \ - timehelper.cxx \ - version.cxx \ - win32consoleappender.cxx \ - win32debugappender.cxx - -@WINSOCK_SOCKETS_FALSE@SOCKETS_SRC = socket-unix.cxx -@WINSOCK_SOCKETS_TRUE@SOCKETS_SRC = socket-win32.cxx -@MULTI_THREADED_FALSE@THREADS_SRC = -@MULTI_THREADED_TRUE@THREADS_SRC = threads.cxx \ -@MULTI_THREADED_TRUE@ syncprims.cxx - -LIB_SRC = $(SINGLE_THREADED_SRC) \ - $(THREADS_SRC) \ - $(SOCKETS_SRC) - -liblog4cplus_la_SOURCES = $(LIB_SRC) - -#liblog4cplus_a_LIBADD = @LIBOBJS@ @ALLOCA@ -liblog4cplus_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ -release 1.0 -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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/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): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @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 " $(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)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblog4cplus.la: $(liblog4cplus_la_OBJECTS) $(liblog4cplus_la_DEPENDENCIES) - $(liblog4cplus_la_LINK) -rpath $(libdir) $(liblog4cplus_la_OBJECTS) $(liblog4cplus_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appenderattachableimpl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configurator.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/consoleappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global-init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hierarchy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hierarchylocker.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loggerimpl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loggingevent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loglevel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loglog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logloguser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ndc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nteventlogappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nullappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objectregistry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patternlayout.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/property.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rootlogger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket-unix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket-win32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socketappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socketbuffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringhelper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syncprims.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syslogappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timehelper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32consoleappender.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32debugappender.Plo@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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 all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/src/appender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/appender.cxx deleted file mode 100644 index c1999cc0..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/appender.cxx +++ /dev/null @@ -1,266 +0,0 @@ -// Module: Log4CPLUS -// File: appender.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::ErrorHandler dtor -/////////////////////////////////////////////////////////////////////////////// - -ErrorHandler::~ErrorHandler() -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::OnlyOnceErrorHandler public methods -/////////////////////////////////////////////////////////////////////////////// - -void -OnlyOnceErrorHandler::error(const log4cplus::tstring& err) -{ - if(firstTime) { - getLogLog().error(err); - firstTime = false; - } -} - - - -void -OnlyOnceErrorHandler::reset() -{ - firstTime = true; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::Appender ctors -/////////////////////////////////////////////////////////////////////////////// - -Appender::Appender() - : layout(new SimpleLayout()), - name( LOG4CPLUS_TEXT("") ), - threshold(NOT_SET_LOG_LEVEL), - errorHandler(new OnlyOnceErrorHandler()), - closed(false) -{ -} - - - -Appender::Appender(const log4cplus::helpers::Properties properties) - : layout(new SimpleLayout()), - name( LOG4CPLUS_TEXT("") ), - threshold(NOT_SET_LOG_LEVEL), - errorHandler(new OnlyOnceErrorHandler()), - closed(false) -{ - if(properties.exists( LOG4CPLUS_TEXT("layout") )) { - log4cplus::tstring factoryName = properties.getProperty( LOG4CPLUS_TEXT("layout") ); - LayoutFactory* factory = getLayoutFactoryRegistry().get(factoryName); - if(factory == 0) { - getLogLog().error( LOG4CPLUS_TEXT("Cannot find LayoutFactory: \"") - + factoryName - + LOG4CPLUS_TEXT("\"") ); - return; - } - - Properties layoutProperties = - properties.getPropertySubset( LOG4CPLUS_TEXT("layout.") ); - try { - std::auto_ptr newLayout(factory->createObject(layoutProperties)); - if(newLayout.get() == 0) { - getLogLog().error( LOG4CPLUS_TEXT("Failed to create appender: ") - + factoryName); - } - else { - layout = newLayout; - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("Error while creating Layout: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - return; - } - - } - - // Support for appender.Threshold in properties configuration file - if(properties.exists(LOG4CPLUS_TEXT("Threshold"))) { - tstring tmp = properties.getProperty(LOG4CPLUS_TEXT("Threshold")); - tmp = log4cplus::helpers::toUpper(tmp); - threshold = log4cplus::getLogLevelManager().fromString(tmp); - } - - // Configure the filters - Properties filterProps = properties.getPropertySubset( LOG4CPLUS_TEXT("filters.") ); - int filterCount = 0; - FilterPtr filterChain; - tstring filterName, factoryName; - while( filterProps.exists(filterName = convertIntegerToString(++filterCount)) ) { - factoryName = filterProps.getProperty(filterName); - FilterFactory* factory = getFilterFactoryRegistry().get(factoryName); - - if(factory == 0) { - tstring err = LOG4CPLUS_TEXT("Appender::ctor()- Cannot find FilterFactory: "); - getLogLog().error(err + factoryName); - continue; - } - FilterPtr tmp_filter = factory->createObject - (filterProps.getPropertySubset(filterName + LOG4CPLUS_TEXT("."))); - if(tmp_filter.get() == 0) { - tstring err = LOG4CPLUS_TEXT("Appender::ctor()- Failed to create filter: "); - getLogLog().error(err + filterName); - } - if(filterChain.get() == 0) { - filterChain = tmp_filter; - } - else { - filterChain->appendFilter(tmp_filter); - } - } - setFilter(filterChain); -} - - -Appender::~Appender() -{ } - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::Appender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -Appender::destructorImpl() -{ - getLogLog().debug( LOG4CPLUS_TEXT("Destroying appender named [") - + name - + LOG4CPLUS_TEXT("].")); - - // An appender might be closed then destroyed. There is no - // point in closing twice. - if(closed) { - return; - } - - close(); - closed = true; -} - - - -void -Appender::doAppend(const log4cplus::spi::InternalLoggingEvent& event) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - if(closed) { - getLogLog().error( LOG4CPLUS_TEXT("Attempted to append to closed appender named [") - + name - + LOG4CPLUS_TEXT("].")); - return; - } - - if(!isAsSevereAsThreshold(event.getLogLevel())) { - return; - } - - if(checkFilter(filter.get(), event) == DENY) { - return; - } - - append(event); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -log4cplus::tstring -Appender::getName() -{ - return name; -} - - - -void -Appender::setName(const log4cplus::tstring& name_) -{ - this->name = name_; -} - - -ErrorHandler* -Appender::getErrorHandler() -{ - return errorHandler.get(); -} - - - -void -Appender::setErrorHandler(std::auto_ptr eh) -{ - if(eh.get() == NULL) { - // We do not throw exception here since the cause is probably a - // bad config file. - getLogLog().warn(LOG4CPLUS_TEXT("You have tried to set a null error-handler.")); - return; - } - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - this->errorHandler = eh; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -void -Appender::setLayout(std::auto_ptr lo) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - this->layout = lo; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -Layout* -Appender::getLayout() -{ - return layout.get(); -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/appenderattachableimpl.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/appenderattachableimpl.cxx deleted file mode 100644 index 123102bb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/appenderattachableimpl.cxx +++ /dev/null @@ -1,177 +0,0 @@ -// Module: Log4CPLUS -// File: appenderattachableimpl.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -#include -#include -#include -#include - -#include - - -namespace log4cplus -{ - - -namespace spi -{ - - -AppenderAttachable::~AppenderAttachable() -{ } - - -} // namespace spi - - -namespace helpers -{ - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::AppenderAttachableImpl ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -AppenderAttachableImpl::AppenderAttachableImpl() - : appender_list_mutex(LOG4CPLUS_MUTEX_CREATE) -{ -} - - -AppenderAttachableImpl::~AppenderAttachableImpl() -{ - LOG4CPLUS_MUTEX_FREE( appender_list_mutex ); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::AppenderAttachableImpl public methods -/////////////////////////////////////////////////////////////////////////////// - -void -AppenderAttachableImpl::addAppender(SharedAppenderPtr newAppender) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - if(newAppender == NULL) { - getLogLog().warn( LOG4CPLUS_TEXT("Tried to add NULL appender") ); - return; - } - - ListType::iterator it = - std::find(appenderList.begin(), appenderList.end(), newAppender); - if(it == appenderList.end()) { - appenderList.push_back(newAppender); - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -AppenderAttachableImpl::ListType -AppenderAttachableImpl::getAllAppenders() -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - return appenderList; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -SharedAppenderPtr -AppenderAttachableImpl::getAppender(const log4cplus::tstring& name) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - for(ListType::iterator it=appenderList.begin(); - it!=appenderList.end(); - ++it) - { - if((*it)->getName() == name) { - return *it; - } - } - - return SharedAppenderPtr(NULL); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -void -AppenderAttachableImpl::removeAllAppenders() -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - appenderList.erase(appenderList.begin(), appenderList.end()); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -void -AppenderAttachableImpl::removeAppender(SharedAppenderPtr appender) -{ - if(appender == NULL) { - getLogLog().warn( LOG4CPLUS_TEXT("Tried to remove NULL appender") ); - return; - } - - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - ListType::iterator it = - std::find(appenderList.begin(), appenderList.end(), appender); - if(it != appenderList.end()) { - appenderList.erase(it); - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -void -AppenderAttachableImpl::removeAppender(const log4cplus::tstring& name) -{ - removeAppender(getAppender(name)); -} - - - -int -AppenderAttachableImpl::appendLoopOnAppenders(const spi::InternalLoggingEvent& event) const -{ - int count = 0; - - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( appender_list_mutex ) - for(ListType::const_iterator it=appenderList.begin(); - it!=appenderList.end(); - ++it) - { - ++count; - (*it)->doAppend(event); - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - - return count; -} - - -} // namespace helpers - - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/configurator.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/configurator.cxx deleted file mode 100644 index 5eaa4fd5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/configurator.cxx +++ /dev/null @@ -1,778 +0,0 @@ -// Module: LOG4CPLUS -// File: configurator.cxx -// Created: 3/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef LOG4CPLUS_HAVE_SYS_TYPES_H -#include -#endif -#ifdef LOG4CPLUS_HAVE_SYS_STAT_H -#include -#endif - -#ifdef LOG4CPLUS_HAVE_STDLIB_H -#include -#endif -#if defined (WIN32) -#include -#endif -#if defined (_WIN32_WCE) -#include -#endif - -#include -#include -#include - - -namespace log4cplus -{ - -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - -void initializeLog4cplus(); - - -namespace -{ - static tchar const DELIM_START[] = LOG4CPLUS_TEXT("${"); - static tchar const DELIM_STOP[] = LOG4CPLUS_TEXT("}"); - static size_t const DELIM_START_LEN = 2; - static size_t const DELIM_STOP_LEN = 1; - - - static - void - get_env_var (tstring & value, tstring const & name) - { -#if defined (_WIN32_WCE) - // Nothing to do here. Windows CE does not have environment variables. - -#elif defined (WIN32) && defined (UNICODE) - tchar const * val = _wgetenv (name.c_str ()); - if (val) - value = val; - -#else - char const * val - = std::getenv (LOG4CPLUS_TSTRING_TO_STRING (name).c_str ()); - if (val) - value = LOG4CPLUS_STRING_TO_TSTRING (val); - -#endif - } - - - struct file_info - { - Time mtime; - bool is_link; - }; - - - static - int - get_file_info (file_info * fi, tstring const & name) - { -#if defined (_WIN32_WCE) - WIN32_FILE_ATTRIBUTE_DATA fad; - BOOL ret = GetFileAttributesEx (name.c_str (), GetFileExInfoStandard, &fad); - if (! ret) - return -1; - - SYSTEMTIME systime; - ret = FileTimeToSystemTime (&fad.ftLastWriteTime, &systime); - if (! ret) - return -1; - - helpers::tm tm; - tm.tm_isdst = 0; - tm.tm_yday = 0; - tm.tm_wday = systime.wDayOfWeek; - tm.tm_year = systime.wYear - 1900; - tm.tm_mon = systime.wMonth - 1; - tm.tm_mday = systime.wDay; - tm.tm_hour = systime.wHour; - tm.tm_min = systime.wMinute; - tm.tm_sec = systime.wSecond; - - fi->mtime.setTime (&tm); - fi->is_link = false; - -#elif defined (_WIN32) - struct _stat fileStatus; - if (_tstat (name.c_str (), &fileStatus) == -1) - return -1; - - fi->mtime = Time (fileStatus.st_mtime); - fi->is_link = false; - -#else - struct stat fileStatus; - if (stat (LOG4CPLUS_TSTRING_TO_STRING (name).c_str (), - &fileStatus) == -1) - return -1; - fi->mtime = Time (fileStatus.st_mtime); - fi->is_link = S_ISLNK (fileStatus.st_mode); - -#endif - - return 0; - } - - - /** - * Perform variable substitution in string val from - * environment variables. - * - *

The variable substitution delimeters are ${ and }. - * - *

For example, if the System properties contains "key=value", then - * the call - * 

-     * string s;
-     * substEnvironVars(s, "Value of key is ${key}.");
-     *
- * - * will set the variable s to "Value of key is value.". - * - *

If no value could be found for the specified key, then - * substitution defaults to the empty string. - * - *

For example, if there is no environment variable "inexistentKey", - * then the call - * - * 

-     * string s;
-     * substEnvironVars(s, "Value of inexistentKey is [${inexistentKey}]");
-     *
- * will set s to "Value of inexistentKey is []" - * - * @param val The string on which variable substitution is performed. - * @param dest The result. - */ - static - bool - substVars (tstring & dest, const tstring & val, Properties const & props, - helpers::LogLog& loglog, unsigned flags) - { - tstring::size_type i = 0; - tstring::size_type var_start, var_end; - tstring pattern (val); - tstring key; - tstring replacement; - bool changed = false; - bool const empty_vars - = !! (flags & PropertyConfigurator::fAllowEmptyVars); - bool const shadow_env - = !! (flags & PropertyConfigurator::fShadowEnvironment); - bool const rec_exp - = !! (flags & PropertyConfigurator::fRecursiveExpansion); - - while (true) - { - // Find opening paren of variable substitution. - var_start = pattern.find(DELIM_START, i); - if (var_start == tstring::npos) - { - dest = pattern; - return changed; - } - - // Find closing paren of variable substitution. - var_end = pattern.find(DELIM_STOP, var_start); - if (var_end == tstring::npos) - { - tostringstream buffer; - buffer << '"' << pattern - << "\" has no closing brace. " - << "Opening brace at position " << var_start << "."; - loglog.error(buffer.str()); - dest = val; - return false; - } - - key.assign (pattern, var_start + DELIM_START_LEN, - var_end - (var_start + DELIM_START_LEN)); - replacement.clear (); - if (shadow_env) - replacement = props.getProperty (key); - if (! shadow_env || (! empty_vars && replacement.empty ())) - get_env_var (replacement, key); - - if (empty_vars || ! replacement.empty ()) - { - // Substitute the variable with its value in place. - pattern.replace (var_start, var_end - var_start + DELIM_STOP_LEN, - replacement); - changed = true; - if (rec_exp) - // Retry expansion on the same spot. - continue; - else - // Move beyond the just substitued part. - i = var_start + replacement.size (); - } - else - // Nothing has been subtituted, just move beyond the - // unexpanded variable. - i = var_end + DELIM_STOP_LEN; - } // end while loop - - } // end substVars() - -} // namespace - - - -////////////////////////////////////////////////////////////////////////////// -// PropertyConfigurator ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -PropertyConfigurator::PropertyConfigurator(const tstring& propertyFile, - Hierarchy& h_, unsigned flags_) - : h(h_) - , propertyFilename(propertyFile) - , properties(propertyFile) - , flags (flags_) -{ - init(); -} - - -PropertyConfigurator::PropertyConfigurator(const helpers::Properties& props, - Hierarchy& h_, unsigned flags_) - : h(h_) - , propertyFilename( LOG4CPLUS_TEXT("UNAVAILABLE") ) - , properties( props ) - , flags (flags_) -{ - init(); -} - - -PropertyConfigurator::PropertyConfigurator(tistream& propertyStream, - Hierarchy& h_, unsigned flags_) - : h(h_) - , propertyFilename( LOG4CPLUS_TEXT("UNAVAILABLE") ) - , properties(propertyStream) - , flags (flags_) -{ - init(); -} - - -void -PropertyConfigurator::init() -{ - replaceEnvironVariables(); - properties = properties.getPropertySubset( LOG4CPLUS_TEXT("log4cplus.") ); -} - - -PropertyConfigurator::~PropertyConfigurator() -{ -} - - - -////////////////////////////////////////////////////////////////////////////// -// PropertyConfigurator static methods -////////////////////////////////////////////////////////////////////////////// - -void -PropertyConfigurator::doConfigure(const tstring& file, Hierarchy& h, - unsigned flags) -{ - PropertyConfigurator tmp(file, h, flags); - tmp.configure(); -} - - - -////////////////////////////////////////////////////////////////////////////// -// PropertyConfigurator public methods -////////////////////////////////////////////////////////////////////////////// - -void -PropertyConfigurator::configure() -{ - // Configure log4cplus internals. - log4cplus::tstring val = properties.getProperty ( - LOG4CPLUS_TEXT ("configDebug"), LOG4CPLUS_TEXT ("false")); - getLogLog ().setInternalDebugging ( - helpers::toLower (val) == LOG4CPLUS_TEXT ("true")); - - initializeLog4cplus(); - configureAppenders(); - configureLoggers(); - configureAdditivity(); - - // Erase the appenders so that we are not artificially keeping them "alive". - appenders.clear (); -} - - -helpers::Properties const & -PropertyConfigurator::getProperties () const -{ - return properties; -} - - -log4cplus::tstring const & -PropertyConfigurator::getPropertyFilename () const -{ - return propertyFilename; -} - - -////////////////////////////////////////////////////////////////////////////// -// PropertyConfigurator protected methods -////////////////////////////////////////////////////////////////////////////// - -void -PropertyConfigurator::reconfigure() -{ - properties = Properties(propertyFilename); - init(); - configure(); -} - - -void -PropertyConfigurator::replaceEnvironVariables() -{ - tstring val, subKey, subVal; - std::vector keys; - bool const rec_exp - = !! (flags & PropertyConfigurator::fRecursiveExpansion); - bool changed; - - do - { - changed = false; - properties.propertyNames().swap (keys); - for (std::vector::const_iterator it = keys.begin(); - it != keys.end(); ++it) - { - tstring const & key = *it; - val = properties.getProperty(key); - - subKey.clear (); - if (substVars(subKey, key, properties, getLogLog(), flags)) - { - properties.removeProperty(key); - properties.setProperty(subKey, val); - changed = true; - } - - subVal.clear (); - if (substVars(subVal, val, properties, getLogLog(), flags)) - { - properties.setProperty(subKey, subVal); - changed = true; - } - } - } - while (changed && rec_exp); -} - - - -void -PropertyConfigurator::configureLoggers() -{ - if(properties.exists( LOG4CPLUS_TEXT("rootLogger") )) - { - Logger root = h.getRoot(); - configureLogger(root, - properties.getProperty(LOG4CPLUS_TEXT("rootLogger"))); - } - - Properties loggerProperties - = properties.getPropertySubset(LOG4CPLUS_TEXT("logger.")); - std::vector loggers = loggerProperties.propertyNames(); - for(std::vector::iterator it=loggers.begin(); it!=loggers.end(); - ++it) - { - Logger log = getLogger(*it); - configureLogger(log, loggerProperties.getProperty(*it)); - } -} - - - -void -PropertyConfigurator::configureLogger(Logger logger, const tstring& config) -{ - // Remove all spaces from config - tstring configString; - remove_copy_if(config.begin(), config.end(), - string_append_iterator(configString), - std::bind1st(std::equal_to(), LOG4CPLUS_TEXT(' '))); - - // "Tokenize" configString - std::vector tokens; - tokenize(configString, ',', std::back_inserter(tokens)); - - if(tokens.empty()) { - getLogLog().error( - LOG4CPLUS_TEXT("PropertyConfigurator::configureLogger()") - LOG4CPLUS_TEXT("- Invalid config string(Logger = ") - + logger.getName() - + LOG4CPLUS_TEXT("): \"") - + config - + LOG4CPLUS_TEXT("\"")); - return; - } - - // Set the loglevel - tstring loglevel = tokens[0]; - if (loglevel != LOG4CPLUS_TEXT("INHERITED")) - logger.setLogLevel( getLogLevelManager().fromString(loglevel) ); - else - logger.setLogLevel (NOT_SET_LOG_LEVEL); - - // Remove all existing appenders first so that we do not duplicate output. - logger.removeAllAppenders (); - - // Set the Appenders - for(std::vector::size_type j=1; jsecond); - } -} - - - -void -PropertyConfigurator::configureAppenders() -{ - Properties appenderProperties = - properties.getPropertySubset(LOG4CPLUS_TEXT("appender.")); - std::vector appendersProps = appenderProperties.propertyNames(); - tstring factoryName; - for(std::vector::iterator it=appendersProps.begin(); - it != appendersProps.end(); ++it) - { - if( it->find( LOG4CPLUS_TEXT('.') ) == tstring::npos ) - { - factoryName = appenderProperties.getProperty(*it); - AppenderFactory* factory - = getAppenderFactoryRegistry().get(factoryName); - if (factory == 0) - { - tstring err = - LOG4CPLUS_TEXT("PropertyConfigurator::configureAppenders()") - LOG4CPLUS_TEXT("- Cannot find AppenderFactory: "); - getLogLog().error(err + factoryName); - continue; - } - - Properties my_properties - = appenderProperties.getPropertySubset((*it) - + LOG4CPLUS_TEXT(".")); - try - { - SharedAppenderPtr appender = factory->createObject(my_properties); - if (appender.get() == 0) - { - tstring err = - LOG4CPLUS_TEXT("PropertyConfigurator::") - LOG4CPLUS_TEXT("configureAppenders()") - LOG4CPLUS_TEXT("- Failed to create appender: "); - getLogLog().error(err + *it); - } - else - { - appender->setName(*it); - appenders[*it] = appender; - } - } - catch(std::exception& e) - { - tstring err = - LOG4CPLUS_TEXT("PropertyConfigurator::") - LOG4CPLUS_TEXT("configureAppenders()") - LOG4CPLUS_TEXT("- Error while creating Appender: "); - getLogLog().error(err + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - } - } // end for loop -} - - -void -PropertyConfigurator::configureAdditivity() -{ - Properties additivityProperties = - properties.getPropertySubset(LOG4CPLUS_TEXT("additivity.")); - std::vector additivitysProps = additivityProperties.propertyNames(); - - tstring actualValue; - tstring value; - - for(std::vector::const_iterator it = additivitysProps.begin(); - it != additivitysProps.end(); ++it) - { - Logger logger = getLogger(*it); - actualValue = additivityProperties.getProperty(*it); - value = toLower(actualValue); - - if(value == LOG4CPLUS_TEXT("true")) - logger.setAdditivity(true); - else if(value == LOG4CPLUS_TEXT("false")) - logger.setAdditivity(false); - else - getLogLog().warn( LOG4CPLUS_TEXT("Invalid Additivity value: \"") - + actualValue - + LOG4CPLUS_TEXT("\"")); - } -} - - - -Logger -PropertyConfigurator::getLogger(const tstring& name) -{ - return h.getInstance(name); -} - - -void -PropertyConfigurator::addAppender(Logger &logger, SharedAppenderPtr& appender) -{ - logger.addAppender(appender); -} - - - -////////////////////////////////////////////////////////////////////////////// -// BasicConfigurator ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -BasicConfigurator::BasicConfigurator(Hierarchy& h_) - : PropertyConfigurator( LOG4CPLUS_TEXT(""), h_ ) -{ - properties.setProperty(LOG4CPLUS_TEXT("rootLogger"), - LOG4CPLUS_TEXT("DEBUG, STDOUT")); - properties.setProperty(LOG4CPLUS_TEXT("appender.STDOUT"), - LOG4CPLUS_TEXT("log4cplus::ConsoleAppender")); -} - - - - -BasicConfigurator::~BasicConfigurator() -{ -} - - -////////////////////////////////////////////////////////////////////////////// -// BasicConfigurator static methods -////////////////////////////////////////////////////////////////////////////// - -void -BasicConfigurator::doConfigure(Hierarchy& h) -{ - BasicConfigurator tmp(h); - tmp.configure(); -} - - -#if !defined(LOG4CPLUS_SINGLE_THREADED) - -////////////////////////////////////////////////////////////////////////////// -// ConfigurationWatchDogThread implementation -////////////////////////////////////////////////////////////////////////////// - -class ConfigurationWatchDogThread - : public thread::AbstractThread, - public PropertyConfigurator -{ -public: - ConfigurationWatchDogThread(const tstring& file, unsigned int millis) - : PropertyConfigurator(file) - , waitMillis(waitMillis < 1000 ? 1000 : millis) - , shouldTerminate(false) - , lock(NULL) - { } - - virtual ~ConfigurationWatchDogThread () - { } - - void terminate () - { - shouldTerminate.signal (); - join (); - } - -protected: - virtual void run(); - virtual Logger getLogger(const tstring& name); - virtual void addAppender(Logger &logger, SharedAppenderPtr& appender); - - bool checkForFileModification(Time & mtime); - void updateLastModTime(Time const & mtime); - -private: - unsigned int const waitMillis; - thread::ManualResetEvent shouldTerminate; - Time lastModTime; - HierarchyLocker* lock; -}; - - -void -ConfigurationWatchDogThread::run() -{ - Time mtime; - - // Initialize last modification time. - checkForFileModification (mtime); - updateLastModTime (mtime); - - while (! shouldTerminate.timed_wait (waitMillis)) - { - bool modified = checkForFileModification(mtime); - if(modified) { - // Lock the Hierarchy - HierarchyLocker theLock(h); - lock = &theLock; - - // reconfigure the Hierarchy - theLock.resetConfiguration(); - reconfigure(); - updateLastModTime(mtime); - - // release the lock - lock = NULL; - } - } -} - - -Logger -ConfigurationWatchDogThread::getLogger(const tstring& name) -{ - if(lock) - return lock->getInstance(name); - else - return PropertyConfigurator::getLogger(name); -} - - -void -ConfigurationWatchDogThread::addAppender(Logger& logger, - SharedAppenderPtr& appender) -{ - if(lock) - lock->addAppender(logger, appender); - else - PropertyConfigurator::addAppender(logger, appender); -} - - -bool -ConfigurationWatchDogThread::checkForFileModification(Time & mtime) -{ - file_info fi; - - if (get_file_info (&fi, propertyFilename.c_str ()) != 0) - return false; - - mtime = fi.mtime; - bool modified = mtime != lastModTime; - -#if defined(LOG4CPLUS_HAVE_LSTAT) - if (!modified && fi.is_link) - { - struct stat fileStatus; - if (lstat(LOG4CPLUS_TSTRING_TO_STRING(propertyFilename).c_str(), - &fileStatus) == -1) - return false; - - mtime = Time (fileStatus.st_mtime); - modified = mtime != lastModTime; - } -#endif - - return modified; -} - - -void -ConfigurationWatchDogThread::updateLastModTime(Time const & mtime) -{ - lastModTime = mtime; -} - - - -////////////////////////////////////////////////////////////////////////////// -// PropertyConfiguratorWatchDog ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -ConfigureAndWatchThread::ConfigureAndWatchThread(const tstring& file, - unsigned int millis) - : watchDogThread(0) -{ - watchDogThread = new ConfigurationWatchDogThread(file, millis); - watchDogThread->addReference (); - watchDogThread->configure(); - watchDogThread->start(); -} - - -ConfigureAndWatchThread::~ConfigureAndWatchThread() -{ - if (watchDogThread) - { - watchDogThread->terminate(); - watchDogThread->removeReference (); - } -} - - -#endif - - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/consoleappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/consoleappender.cxx deleted file mode 100644 index 8939223c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/consoleappender.cxx +++ /dev/null @@ -1,101 +0,0 @@ -// Module: Log4CPLUS -// File: consoleappender.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus::helpers; - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::ConsoleAppender ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -log4cplus::ConsoleAppender::ConsoleAppender(bool logToStdErr_, bool immediateFlush_) -: logToStdErr(logToStdErr_), - immediateFlush(immediateFlush_) -{ -} - - - -log4cplus::ConsoleAppender::ConsoleAppender(const log4cplus::helpers::Properties properties) -: Appender(properties), - logToStdErr(false), - immediateFlush(false) -{ - tstring val = toLower(properties.getProperty(LOG4CPLUS_TEXT("logToStdErr"))); - if(val == LOG4CPLUS_TEXT("true")) { - logToStdErr = true; - } - if(properties.exists( LOG4CPLUS_TEXT("ImmediateFlush") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("ImmediateFlush") ); - immediateFlush = (toLower(tmp) == LOG4CPLUS_TEXT("true")); - } -} - - - -log4cplus::ConsoleAppender::~ConsoleAppender() -{ - destructorImpl(); -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::ConsoleAppender public methods -////////////////////////////////////////////////////////////////////////////// - -void -log4cplus::ConsoleAppender::close() -{ - getLogLog().debug(LOG4CPLUS_TEXT("Entering ConsoleAppender::close()..")); - closed = true; -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::ConsoleAppender protected methods -////////////////////////////////////////////////////////////////////////////// - -// Normally, append() methods do not need to be locked since they are -// called by doAppend() which performs the locking. However, this locks -// on the LogLog instance, so we don't have multiple threads writing to -// tcout and tcerr -void -log4cplus::ConsoleAppender::append(const spi::InternalLoggingEvent& event) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( getLogLog().mutex ) - log4cplus::tostream& output = (logToStdErr ? tcerr : tcout); - layout->formatAndAppend(output, event); - if(immediateFlush) { - output.flush(); - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/factory.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/factory.cxx deleted file mode 100644 index 3144cd1c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/factory.cxx +++ /dev/null @@ -1,220 +0,0 @@ -// Module: Log4CPLUS -// File: factory.cxx -// Created: 2/2002 -// Author: Tad E. Smith -// -// -// Copyright 2002-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined (_WIN32) -# if defined (LOG4CPLUS_HAVE_NT_EVENT_LOG) -# include -# endif -# if defined (LOG4CPLUS_HAVE_WIN32_CONSOLE) -# include -# endif -# include -#endif - - -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - -/////////////////////////////////////////////////////////////////////////////// -// LOCAL file class definitions -/////////////////////////////////////////////////////////////////////////////// - -namespace log4cplus { - -namespace spi { - - BaseFactory::~BaseFactory() - { } - - - AppenderFactory::AppenderFactory() - { } - - AppenderFactory::~AppenderFactory() - { } - - - LayoutFactory::LayoutFactory() - { } - - LayoutFactory::~LayoutFactory() - { } - - - FilterFactory::FilterFactory() - { } - - FilterFactory::~FilterFactory() - { } - - - LoggerFactory::~LoggerFactory() - { } - - -} // namespace spi - - -namespace -{ - - -template -class LocalFactoryBase - : public ProductFactoryBase -{ -public: - LocalFactoryBase (tchar const * n) - : name (n) - { } - - virtual log4cplus::tstring getTypeName() - { - return name; - } - -private: - log4cplus::tstring name; -}; - - -template -class FactoryTempl - : public LocalFactoryBase -{ -public: - typedef typename ProductFactoryBase::ProductPtr ProductPtr; - - FactoryTempl (tchar const * n) - : LocalFactoryBase (n) - { } - - virtual ProductPtr createObject (Properties const & props) - { - return ProductPtr (new LocalProduct (props)); - } -}; - - -} // namespace - - -#define REG_PRODUCT(reg, productprefix, productname, productns, productfact) \ -reg.put ( \ - std::auto_ptr ( \ - new FactoryTempl ( \ - LOG4CPLUS_TEXT(productprefix) \ - LOG4CPLUS_TEXT(#productname)))) - - -#define REG_APPENDER(reg, appendername) \ -REG_PRODUCT (reg, "log4cplus::", appendername, log4cplus::, AppenderFactory) - -#define REG_LAYOUT(reg, layoutname) \ -REG_PRODUCT (reg, "log4cplus::", layoutname, log4cplus::, LayoutFactory) - -#define REG_FILTER(reg, filtername) \ -REG_PRODUCT (reg, "log4cplus::spi::", filtername, spi::, FilterFactory) - - -void initializeFactoryRegistry() -{ - AppenderFactoryRegistry& reg = getAppenderFactoryRegistry(); - REG_APPENDER (reg, ConsoleAppender); - REG_APPENDER (reg, NullAppender); - REG_APPENDER (reg, FileAppender); - REG_APPENDER (reg, RollingFileAppender); - REG_APPENDER (reg, DailyRollingFileAppender); - REG_APPENDER (reg, SocketAppender); -#if defined(_WIN32) -# if defined(LOG4CPLUS_HAVE_NT_EVENT_LOG) - REG_APPENDER (reg, NTEventLogAppender); -# endif -# if defined(LOG4CPLUS_HAVE_WIN32_CONSOLE) - REG_APPENDER (reg, Win32ConsoleAppender); -# endif - REG_APPENDER (reg, Win32DebugAppender); -#elif defined(LOG4CPLUS_HAVE_SYSLOG_H) - REG_APPENDER (reg, SysLogAppender); -#endif - - LayoutFactoryRegistry& reg2 = getLayoutFactoryRegistry(); - REG_LAYOUT (reg2, SimpleLayout); - REG_LAYOUT (reg2, TTCCLayout); - REG_LAYOUT (reg2, PatternLayout); - - FilterFactoryRegistry& reg3 = getFilterFactoryRegistry(); - REG_FILTER (reg3, DenyAllFilter); - REG_FILTER (reg3, LogLevelMatchFilter); - REG_FILTER (reg3, LogLevelRangeFilter); - REG_FILTER (reg3, StringMatchFilter); -} - - - - -/////////////////////////////////////////////////////////////////////////////// -// public methods -/////////////////////////////////////////////////////////////////////////////// - -namespace spi -{ - - -AppenderFactoryRegistry& -getAppenderFactoryRegistry() -{ - static AppenderFactoryRegistry singleton; - return singleton; -} - - -LayoutFactoryRegistry& -getLayoutFactoryRegistry() -{ - static LayoutFactoryRegistry singleton; - return singleton; -} - - -FilterFactoryRegistry& -getFilterFactoryRegistry() -{ - static FilterFactoryRegistry singleton; - return singleton; -} - - -} // namespace spi - - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/fileappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/fileappender.cxx deleted file mode 100644 index 993a740c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/fileappender.cxx +++ /dev/null @@ -1,798 +0,0 @@ -// Module: Log4CPLUS -// File: fileappender.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if defined (__BORLANDC__) -// For _wrename() and _wremove() on Windows. -# include -#endif -#if ! defined (_WIN32_WCE) -#include -#endif -#include - -#if defined (_WIN32_WCE) -#undef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#include -#endif - - -namespace log4cplus -{ - -using helpers::Properties; -using helpers::Time; - - -const long MINIMUM_ROLLING_LOG_SIZE = 200*1024L; - - -/////////////////////////////////////////////////////////////////////////////// -// File LOCAL definitions -/////////////////////////////////////////////////////////////////////////////// - -namespace -{ - - -#if defined (_WIN32_WCE) -long const LOG4CPLUS_FILE_NOT_FOUND = ERROR_FILE_NOT_FOUND; -#else -long const LOG4CPLUS_FILE_NOT_FOUND = ENOENT; -#endif - - -static -long -file_rename (tstring const & src, tstring const & target) -{ -#if defined (_WIN32_WCE) - if (MoveFile (src.c_str (), target.c_str ())) - return 0; - else - return GetLastError (); - -#elif defined (UNICODE) && defined (WIN32) - if (_wrename (src.c_str (), target.c_str ()) == 0) - return 0; - else - return errno; - -#else - if (std::rename (LOG4CPLUS_TSTRING_TO_STRING (src).c_str (), - LOG4CPLUS_TSTRING_TO_STRING (target).c_str ()) == 0) - return 0; - else - return errno; - -#endif -} - - -static -long -file_remove (tstring const & src) -{ -#if defined (_WIN32_WCE) - if (DeleteFile (src.c_str ())) - return 0; - else - return GetLastError (); - -#elif defined (UNICODE) && defined (WIN32) - if (_wremove (src.c_str ()) == 0) - return 0; - else - return errno; - -#else - if (std::remove (LOG4CPLUS_TSTRING_TO_STRING (src).c_str ()) == 0) - return 0; - else - return errno; - -#endif -} - - -static -void -loglog_renaming_result (helpers::LogLog & loglog, tstring const & src, - tstring const & target, long ret) -{ - if (ret == 0) - { - loglog.debug ( - LOG4CPLUS_TEXT("Renamed file ") - + src - + LOG4CPLUS_TEXT(" to ") - + target); - } - else if (ret != LOG4CPLUS_FILE_NOT_FOUND) - { - tostringstream oss; - oss << LOG4CPLUS_TEXT("Failed to rename file from ") - << target - << LOG4CPLUS_TEXT(" to ") - << target - << LOG4CPLUS_TEXT("; error ") - << ret; - loglog.error (oss.str ()); - } -} - - -static -void -loglog_opening_result (helpers::LogLog & loglog, - log4cplus::tostream const & os, tstring const & filename) -{ - if (! os) - { - loglog.error ( - LOG4CPLUS_TEXT("Failed to open file ") - + filename); - } -} - - -static -void -rolloverFiles(const tstring& filename, unsigned int maxBackupIndex) -{ - helpers::SharedObjectPtr loglog - = helpers::LogLog::getLogLog(); - - // Delete the oldest file - tostringstream buffer; - buffer << filename << LOG4CPLUS_TEXT(".") << maxBackupIndex; - long ret = file_remove (buffer.str ()); - - tostringstream source_oss; - tostringstream target_oss; - - // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2} - for (int i = maxBackupIndex - 1; i >= 1; --i) - { - source_oss.str(LOG4CPLUS_TEXT("")); - target_oss.str(LOG4CPLUS_TEXT("")); - - source_oss << filename << LOG4CPLUS_TEXT(".") << i; - target_oss << filename << LOG4CPLUS_TEXT(".") << (i+1); - - tstring const source (source_oss.str ()); - tstring const target (target_oss.str ()); - -#if defined (WIN32) - // Try to remove the target first. It seems it is not - // possible to rename over existing file. - ret = file_remove (target); -#endif - - ret = file_rename (source, target); - loglog_renaming_result (*loglog, source, target, ret); - } -} // end rolloverFiles() - -} - - -/////////////////////////////////////////////////////////////////////////////// -// FileAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -FileAppender::FileAppender(const tstring& filename_, - LOG4CPLUS_OPEN_MODE_TYPE mode, bool immediateFlush_) - : immediateFlush(immediateFlush_) - , reopenDelay(1) - , bufferSize (0) - , buffer (0) -{ - init(filename_, mode); -} - - -FileAppender::FileAppender(const Properties& properties, - LOG4CPLUS_OPEN_MODE_TYPE mode) - : Appender(properties) - , immediateFlush(true) - , reopenDelay(1) - , bufferSize (0) - , buffer (0) -{ - bool append_ = (mode == std::ios::app); - tstring filename_ = properties.getProperty( LOG4CPLUS_TEXT("File") ); - if (filename_.empty()) - { - getErrorHandler()->error( LOG4CPLUS_TEXT("Invalid filename") ); - return; - } - if(properties.exists( LOG4CPLUS_TEXT("ImmediateFlush") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("ImmediateFlush") ); - immediateFlush = (helpers::toLower(tmp) == LOG4CPLUS_TEXT("true")); - } - if(properties.exists( LOG4CPLUS_TEXT("Append") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("Append") ); - append_ = (helpers::toLower(tmp) == LOG4CPLUS_TEXT("true")); - } - if(properties.exists( LOG4CPLUS_TEXT("ReopenDelay") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("ReopenDelay") ); - reopenDelay = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - } - if(properties.exists( LOG4CPLUS_TEXT("BufferSize") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("BufferSize") ); - bufferSize = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - } - - init(filename_, (append_ ? std::ios::app : std::ios::trunc)); -} - - - -void -FileAppender::init(const tstring& filename_, - LOG4CPLUS_OPEN_MODE_TYPE mode) -{ - this->filename = filename_; - open(mode); - - if (bufferSize != 0) - { - delete[] buffer; - buffer = new tchar[bufferSize]; - out.rdbuf ()->pubsetbuf (buffer, bufferSize); - } - - if(!out.good()) { - getErrorHandler()->error( LOG4CPLUS_TEXT("Unable to open file: ") - + filename); - return; - } - getLogLog().debug(LOG4CPLUS_TEXT("Just opened file: ") + filename); -} - - - -FileAppender::~FileAppender() -{ - destructorImpl(); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// FileAppender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -FileAppender::close() -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - out.close(); - delete[] buffer; - buffer = 0; - closed = true; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// FileAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -FileAppender::append(const spi::InternalLoggingEvent& event) -{ - if(!out.good()) { - if(!reopen()) { - getErrorHandler()->error( LOG4CPLUS_TEXT("file is not open: ") - + filename); - return; - } - // Resets the error handler to make it - // ready to handle a future append error. - else - getErrorHandler()->reset(); - } - - layout->formatAndAppend(out, event); - if(immediateFlush) { - out.flush(); - } -} - -void -FileAppender::open(std::ios::openmode mode) -{ - out.open(LOG4CPLUS_TSTRING_TO_STRING(filename).c_str(), mode); -} - -bool -FileAppender::reopen() -{ - // When append never failed and the file re-open attempt must - // be delayed, set the time when reopen should take place. - if (reopen_time == log4cplus::helpers::Time () && reopenDelay != 0) - reopen_time = log4cplus::helpers::Time::gettimeofday() - + log4cplus::helpers::Time(reopenDelay); - else - { - // Otherwise, check for end of the delay (or absence of delay) to re-open the file. - if (reopen_time <= log4cplus::helpers::Time::gettimeofday() - || reopenDelay == 0) - { - // Close the current file - out.close(); - out.clear(); // reset flags since the C++ standard specified that all the - // flags should remain unchanged on a close - - // Re-open the file. - open(std::ios::app); - - // Reset last fail time. - reopen_time = log4cplus::helpers::Time (); - - // Succeed if no errors are found. - if(out.good()) - return true; - } - } - return false; -} - -/////////////////////////////////////////////////////////////////////////////// -// RollingFileAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -RollingFileAppender::RollingFileAppender(const tstring& filename_, - long maxFileSize_, int maxBackupIndex_, bool immediateFlush_) - : FileAppender(filename_, std::ios::app, immediateFlush_) -{ - init(maxFileSize_, maxBackupIndex_); -} - - -RollingFileAppender::RollingFileAppender(const Properties& properties) - : FileAppender(properties, std::ios::app) -{ - int maxFileSize_ = 10*1024*1024; - int maxBackupIndex_ = 1; - if(properties.exists( LOG4CPLUS_TEXT("MaxFileSize") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("MaxFileSize") ); - tmp = helpers::toUpper(tmp); - maxFileSize_ = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - if(tmp.find( LOG4CPLUS_TEXT("MB") ) == (tmp.length() - 2)) { - maxFileSize_ *= (1024 * 1024); // convert to megabytes - } - if(tmp.find( LOG4CPLUS_TEXT("KB") ) == (tmp.length() - 2)) { - maxFileSize_ *= 1024; // convert to kilobytes - } - } - - if(properties.exists( LOG4CPLUS_TEXT("MaxBackupIndex") )) { - tstring tmp = properties.getProperty(LOG4CPLUS_TEXT("MaxBackupIndex")); - maxBackupIndex_ = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - } - - init(maxFileSize_, maxBackupIndex_); -} - - -void -RollingFileAppender::init(long maxFileSize_, int maxBackupIndex_) -{ - if (maxFileSize_ < MINIMUM_ROLLING_LOG_SIZE) - { - tostringstream oss; - oss << LOG4CPLUS_TEXT ("RollingFileAppender: MaxFileSize property") - LOG4CPLUS_TEXT (" value is too small. Resetting to ") - << MINIMUM_ROLLING_LOG_SIZE << "."; - getLogLog ().warn (oss.str ()); - maxFileSize_ = MINIMUM_ROLLING_LOG_SIZE; - } - - this->maxFileSize = maxFileSize_; - this->maxBackupIndex = (std::max)(maxBackupIndex_, 1); -} - - -RollingFileAppender::~RollingFileAppender() -{ - destructorImpl(); -} - - -/////////////////////////////////////////////////////////////////////////////// -// RollingFileAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -RollingFileAppender::append(const spi::InternalLoggingEvent& event) -{ - FileAppender::append(event); - - if(out.tellp() > maxFileSize) { - rollover(); - } -} - - -void -RollingFileAppender::rollover() -{ - helpers::LogLog & loglog = getLogLog(); - - // Close the current file - out.close(); - out.clear(); // reset flags since the C++ standard specified that all the - // flags should remain unchanged on a close - - // If maxBackups <= 0, then there is no file renaming to be done. - if (maxBackupIndex > 0) - { - rolloverFiles(filename, maxBackupIndex); - - // Rename fileName to fileName.1 - tstring target = filename + LOG4CPLUS_TEXT(".1"); - - long ret; - -#if defined (WIN32) - // Try to remove the target first. It seems it is not - // possible to rename over existing file. - ret = file_remove (target); -#endif - - loglog.debug ( - LOG4CPLUS_TEXT("Renaming file ") - + filename - + LOG4CPLUS_TEXT(" to ") - + target); - ret = file_rename (filename, target); - loglog_renaming_result (loglog, filename, target, ret); - } - else - { - loglog.debug (filename + LOG4CPLUS_TEXT(" has no backups specified")); - } - - // Open it up again in truncation mode - open(std::ios::out | std::ios::trunc); - loglog_opening_result (loglog, out, filename); -} - - -/////////////////////////////////////////////////////////////////////////////// -// DailyRollingFileAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -DailyRollingFileAppender::DailyRollingFileAppender( - const tstring& filename_, DailyRollingFileSchedule schedule_, - bool immediateFlush_, int maxBackupIndex_) - : FileAppender(filename_, std::ios::app, immediateFlush_) - , maxBackupIndex(maxBackupIndex_) -{ - init(schedule_); -} - - - -DailyRollingFileAppender::DailyRollingFileAppender( - const Properties& properties) - : FileAppender(properties, std::ios::app) - , maxBackupIndex(10) -{ - DailyRollingFileSchedule theSchedule = DAILY; - tstring scheduleStr = properties.getProperty(LOG4CPLUS_TEXT("Schedule")); - scheduleStr = helpers::toUpper(scheduleStr); - - if(scheduleStr == LOG4CPLUS_TEXT("MONTHLY")) - theSchedule = MONTHLY; - else if(scheduleStr == LOG4CPLUS_TEXT("WEEKLY")) - theSchedule = WEEKLY; - else if(scheduleStr == LOG4CPLUS_TEXT("DAILY")) - theSchedule = DAILY; - else if(scheduleStr == LOG4CPLUS_TEXT("TWICE_DAILY")) - theSchedule = TWICE_DAILY; - else if(scheduleStr == LOG4CPLUS_TEXT("HOURLY")) - theSchedule = HOURLY; - else if(scheduleStr == LOG4CPLUS_TEXT("MINUTELY")) - theSchedule = MINUTELY; - else { - getLogLog().warn( LOG4CPLUS_TEXT("DailyRollingFileAppender::ctor()- \"Schedule\" not valid: ") - + properties.getProperty(LOG4CPLUS_TEXT("Schedule"))); - theSchedule = DAILY; - } - - if(properties.exists( LOG4CPLUS_TEXT("MaxBackupIndex") )) { - tstring tmp = properties.getProperty(LOG4CPLUS_TEXT("MaxBackupIndex")); - maxBackupIndex = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - } - - init(theSchedule); -} - - - -void -DailyRollingFileAppender::init(DailyRollingFileSchedule schedule_) -{ - this->schedule = schedule_; - - Time now = Time::gettimeofday(); - now.usec(0); - struct tm time; - now.localtime(&time); - - time.tm_sec = 0; - switch (schedule) - { - case MONTHLY: - time.tm_mday = 1; - time.tm_hour = 0; - time.tm_min = 0; - break; - - case WEEKLY: - time.tm_mday -= (time.tm_wday % 7); - time.tm_hour = 0; - time.tm_min = 0; - break; - - case DAILY: - time.tm_hour = 0; - time.tm_min = 0; - break; - - case TWICE_DAILY: - if(time.tm_hour >= 12) { - time.tm_hour = 12; - } - else { - time.tm_hour = 0; - } - time.tm_min = 0; - break; - - case HOURLY: - time.tm_min = 0; - break; - - case MINUTELY: - break; - }; - now.setTime(&time); - - scheduledFilename = getFilename(now); - nextRolloverTime = calculateNextRolloverTime(now); -} - - - -DailyRollingFileAppender::~DailyRollingFileAppender() -{ - destructorImpl(); -} - - - - -/////////////////////////////////////////////////////////////////////////////// -// DailyRollingFileAppender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -DailyRollingFileAppender::close() -{ - rollover(); - FileAppender::close(); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// DailyRollingFileAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -DailyRollingFileAppender::append(const spi::InternalLoggingEvent& event) -{ - if(event.getTimestamp() >= nextRolloverTime) { - rollover(); - } - - FileAppender::append(event); -} - - - -void -DailyRollingFileAppender::rollover() -{ - // Close the current file - out.close(); - out.clear(); // reset flags since the C++ standard specified that all the - // flags should remain unchanged on a close - - // If we've already rolled over this time period, we'll make sure that we - // don't overwrite any of those previous files. - // E.g. if "log.2009-11-07.1" already exists we rename it - // to "log.2009-11-07.2", etc. - rolloverFiles(scheduledFilename, maxBackupIndex); - - // Do not overwriet the newest file either, e.g. if "log.2009-11-07" - // already exists rename it to "log.2009-11-07.1" - tostringstream backup_target_oss; - backup_target_oss << scheduledFilename << LOG4CPLUS_TEXT(".") << 1; - tstring backupTarget = backup_target_oss.str(); - - helpers::LogLog & loglog = getLogLog(); - long ret; - -#if defined (WIN32) - // Try to remove the target first. It seems it is not - // possible to rename over existing file, e.g. "log.2009-11-07.1". - ret = file_remove (backupTarget); -#endif - - // Rename e.g. "log.2009-11-07" to "log.2009-11-07.1". - ret = file_rename (scheduledFilename, backupTarget); - loglog_renaming_result (loglog, scheduledFilename, backupTarget, ret); - -#if defined (WIN32) - // Try to remove the target first. It seems it is not - // possible to rename over existing file, e.g. "log.2009-11-07". - ret = file_remove (scheduledFilename); -#endif - - // Rename filename to scheduledFilename, - // e.g. rename "log" to "log.2009-11-07". - loglog.debug( - LOG4CPLUS_TEXT("Renaming file ") - + filename - + LOG4CPLUS_TEXT(" to ") - + scheduledFilename); - ret = file_rename (filename, scheduledFilename); - loglog_renaming_result (loglog, filename, scheduledFilename, ret); - - // Open a new file, e.g. "log". - open(std::ios::out | std::ios::trunc); - loglog_opening_result (loglog, out, filename); - - // Calculate the next rollover time - log4cplus::helpers::Time now = Time::gettimeofday(); - if (now >= nextRolloverTime) - { - scheduledFilename = getFilename(now); - nextRolloverTime = calculateNextRolloverTime(now); - } -} - - - -Time -DailyRollingFileAppender::calculateNextRolloverTime(const Time& t) const -{ - switch(schedule) - { - case MONTHLY: - { - struct tm nextMonthTime; - t.localtime(&nextMonthTime); - nextMonthTime.tm_mon += 1; - nextMonthTime.tm_isdst = 0; - - Time ret; - if(ret.setTime(&nextMonthTime) == -1) { - getLogLog().error( - LOG4CPLUS_TEXT("DailyRollingFileAppender::calculateNextRolloverTime()-") - LOG4CPLUS_TEXT(" setTime() returned error")); - // Set next rollover to 31 days in future. - ret = (t + Time(2678400)); - } - - return ret; - } - - case WEEKLY: - return (t + Time(7 * 24 * 60 * 60)); - - default: - getLogLog ().error ( - LOG4CPLUS_TEXT ("DailyRollingFileAppender::calculateNextRolloverTime()-") - LOG4CPLUS_TEXT (" invalid schedule value")); - // Fall through. - - case DAILY: - return (t + Time(24 * 60 * 60)); - - case TWICE_DAILY: - return (t + Time(12 * 60 * 60)); - - case HOURLY: - return (t + Time(60 * 60)); - - case MINUTELY: - return (t + Time(60)); - }; -} - - - -tstring -DailyRollingFileAppender::getFilename(const Time& t) const -{ - tchar const * pattern = 0; - switch (schedule) - { - case MONTHLY: - pattern = LOG4CPLUS_TEXT("%Y-%m"); - break; - - case WEEKLY: - pattern = LOG4CPLUS_TEXT("%Y-%W"); - break; - - default: - getLogLog ().error ( - LOG4CPLUS_TEXT ("DailyRollingFileAppender::getFilename()-") - LOG4CPLUS_TEXT (" invalid schedule value")); - // Fall through. - - case DAILY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d"); - break; - - case TWICE_DAILY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%p"); - break; - - case HOURLY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H"); - break; - - case MINUTELY: - pattern = LOG4CPLUS_TEXT("%Y-%m-%d-%H-%M"); - break; - }; - - tstring result (filename); - result += LOG4CPLUS_TEXT("."); - result += t.getFormattedTime(pattern, false); - return result; -} - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/filter.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/filter.cxx deleted file mode 100644 index 1adbca49..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/filter.cxx +++ /dev/null @@ -1,256 +0,0 @@ -// Module: Log4CPLUS -// File: filter.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::spi; -using namespace log4cplus::helpers; - - -/////////////////////////////////////////////////////////////////////////////// -// global methods -/////////////////////////////////////////////////////////////////////////////// - -FilterResult -log4cplus::spi::checkFilter(const Filter* filter, - const InternalLoggingEvent& event) -{ - const Filter* currentFilter = filter; - while(currentFilter) { - FilterResult result = currentFilter->decide(event); - if(result != NEUTRAL) { - return result; - } - - currentFilter = currentFilter->next.get(); - } - - return ACCEPT; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// Filter implementation -/////////////////////////////////////////////////////////////////////////////// - -Filter::Filter() -{ -} - - -Filter::~Filter() -{ -} - - -void -Filter::appendFilter(FilterPtr filter) -{ - if(next.get() == 0) { - next = filter; - } - else { - next->appendFilter(filter); - } -} - - - -/////////////////////////////////////////////////////////////////////////////// -// DenyAllFilter implementation -/////////////////////////////////////////////////////////////////////////////// - -DenyAllFilter::DenyAllFilter () -{ } - - -DenyAllFilter::DenyAllFilter (const log4cplus::helpers::Properties&) -{ } - - -FilterResult -DenyAllFilter::decide(const InternalLoggingEvent&) const -{ - return DENY; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// LogLevelMatchFilter implementation -/////////////////////////////////////////////////////////////////////////////// - -LogLevelMatchFilter::LogLevelMatchFilter() -{ - init(); -} - - - -LogLevelMatchFilter::LogLevelMatchFilter(const Properties& properties) -{ - init(); - - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("AcceptOnMatch") ); - acceptOnMatch = (toLower(tmp) == LOG4CPLUS_TEXT("true")); - - tmp = properties.getProperty( LOG4CPLUS_TEXT("LogLevelToMatch") ); - logLevelToMatch = getLogLevelManager().fromString(tmp); -} - - -void -LogLevelMatchFilter::init() -{ - acceptOnMatch = true; - logLevelToMatch = NOT_SET_LOG_LEVEL; -} - - -FilterResult -LogLevelMatchFilter::decide(const InternalLoggingEvent& event) const -{ - if(logLevelToMatch == NOT_SET_LOG_LEVEL) { - return NEUTRAL; - } - - bool matchOccured = (logLevelToMatch == event.getLogLevel()); - - if(matchOccured) { - return (acceptOnMatch ? ACCEPT : DENY); - } - else { - return NEUTRAL; - } -} - - - -/////////////////////////////////////////////////////////////////////////////// -// LogLevelRangeFilter implementation -/////////////////////////////////////////////////////////////////////////////// - -LogLevelRangeFilter::LogLevelRangeFilter() -{ - init(); -} - - - -LogLevelRangeFilter::LogLevelRangeFilter(const Properties& properties) -{ - init(); - - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("AcceptOnMatch") ); - acceptOnMatch = (toLower(tmp) == LOG4CPLUS_TEXT("true")); - - tmp = properties.getProperty( LOG4CPLUS_TEXT("LogLevelMin") ); - logLevelMin = getLogLevelManager().fromString(tmp); - - tmp = properties.getProperty( LOG4CPLUS_TEXT("LogLevelMax") ); - logLevelMax = getLogLevelManager().fromString(tmp); -} - - -void -LogLevelRangeFilter::init() -{ - acceptOnMatch = true; - logLevelMin = NOT_SET_LOG_LEVEL; - logLevelMax = NOT_SET_LOG_LEVEL; -} - - -FilterResult -LogLevelRangeFilter::decide(const InternalLoggingEvent& event) const -{ - if((logLevelMin != NOT_SET_LOG_LEVEL) && (event.getLogLevel() < logLevelMin)) { - // priority of event is less than minimum - return DENY; - } - - if((logLevelMax != NOT_SET_LOG_LEVEL) && (event.getLogLevel() > logLevelMax)) { - // priority of event is greater than maximum - return DENY; - } - - if(acceptOnMatch) { - // this filter set up to bypass later filters and always return - // accept if priority in range - return ACCEPT; - } - else { - // event is ok for this filter; allow later filters to have a look... - return NEUTRAL; - } -} - - - -/////////////////////////////////////////////////////////////////////////////// -// StringMatchFilter implementation -/////////////////////////////////////////////////////////////////////////////// - -StringMatchFilter::StringMatchFilter() -{ - init(); -} - - - -StringMatchFilter::StringMatchFilter(const Properties& properties) -{ - init(); - - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("AcceptOnMatch") ); - acceptOnMatch = (toLower(tmp) == LOG4CPLUS_TEXT("true")); - - stringToMatch = properties.getProperty( LOG4CPLUS_TEXT("StringToMatch") ); -} - - -void -StringMatchFilter::init() -{ - acceptOnMatch = true; -} - - -FilterResult -StringMatchFilter::decide(const InternalLoggingEvent& event) const -{ - const tstring& message = event.getMessage(); - - if(stringToMatch.empty () || message.empty ()) { - return NEUTRAL; - } - - if(message.find(stringToMatch) == tstring::npos) { - return NEUTRAL; - } - else { // we've got a match - return (acceptOnMatch ? ACCEPT : DENY); - } -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/global-init.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/global-init.cxx deleted file mode 100644 index 426b3015..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/global-init.cxx +++ /dev/null @@ -1,101 +0,0 @@ -// Module: Log4CPLUS -// File: global-init.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - - -// Forward Declarations -namespace log4cplus -{ - - -//! Defined here, used by initializeLayout(). -helpers::Time TTCCLayout_time_base; - - -void initializeFactoryRegistry(); -void initializeLayout (); - - -void initializeLog4cplus() -{ - static bool initialized = false; - if (initialized) - return; - - helpers::LogLog::getLogLog(); - getLogLevelManager (); - getNDC(); - Logger::getRoot(); - initializeFactoryRegistry(); - initializeLayout (); - - initialized = true; -} - - -} // namespace log4cplus - - -#if defined (_WIN32) && defined (LOG4CPLUS_BUILD_DLL) - -BOOL WINAPI DllMain(LOG4CPLUS_DLLMAIN_HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpReserved ) // reserved -{ - // Perform actions based on the reason for calling. - switch( fdwReason ) - { - case DLL_PROCESS_ATTACH: - log4cplus::initializeLog4cplus(); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. - break; - } - - return TRUE; // Successful DLL_PROCESS_ATTACH. -} - -#else - -namespace { - - class _static_log4cplus_initializer { - public: - _static_log4cplus_initializer() { - log4cplus::initializeLog4cplus(); - } - } static initializer; -} - -#endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchy.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchy.cxx deleted file mode 100644 index 8ad06536..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchy.cxx +++ /dev/null @@ -1,352 +0,0 @@ -// Module: Log4CPLUS -// File: hierarchy.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; - - -////////////////////////////////////////////////////////////////////////////// -// File "Local" methods -////////////////////////////////////////////////////////////////////////////// - -namespace -{ - -static -bool startsWith(tstring const & teststr, tstring const & substr) -{ - bool val = false; - tstring::size_type const len = substr.length(); - if (teststr.length() > len) - val = teststr.compare (0, len, substr) == 0; - - return val; -} - -} - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::Hierarchy static declarations -////////////////////////////////////////////////////////////////////////////// - -const LogLevel log4cplus::Hierarchy::DISABLE_OFF = -1; -const LogLevel log4cplus::Hierarchy::DISABLE_OVERRIDE = -2; - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::Hierarchy ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -Hierarchy::Hierarchy() - : hashtable_mutex(LOG4CPLUS_MUTEX_CREATE), - defaultFactory(new DefaultLoggerFactory()), - root(NULL), - disableValue(DISABLE_OFF), // Don't disable any LogLevel level by default. - emittedNoAppenderWarning(false), - emittedNoResourceBundleWarning(false) -{ - root = Logger( new spi::RootLogger(*this, DEBUG_LOG_LEVEL) ); -} - - -Hierarchy::~Hierarchy() -{ - shutdown(); - LOG4CPLUS_MUTEX_FREE( hashtable_mutex ); -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::Hierarchy public methods -////////////////////////////////////////////////////////////////////////////// - -void -Hierarchy::clear() -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( hashtable_mutex ) - provisionNodes.erase(provisionNodes.begin(), provisionNodes.end()); - loggerPtrs.erase(loggerPtrs.begin(), loggerPtrs.end()); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -bool -Hierarchy::exists(const log4cplus::tstring& name) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( hashtable_mutex ) - LoggerMap::iterator it = loggerPtrs.find(name); - return it != loggerPtrs.end(); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -void -Hierarchy::disable(const log4cplus::tstring& loglevelStr) -{ - if(disableValue != DISABLE_OVERRIDE) { - disableValue = getLogLevelManager().fromString(loglevelStr); - } -} - - -void -Hierarchy::disable(LogLevel ll) -{ - if(disableValue != DISABLE_OVERRIDE) { - disableValue = ll; - } -} - - -void -Hierarchy::disableAll() -{ - disable(FATAL_LOG_LEVEL); -} - - -void -Hierarchy::disableDebug() -{ - disable(DEBUG_LOG_LEVEL); -} - - -void -Hierarchy::disableInfo() -{ - disable(INFO_LOG_LEVEL); -} - - -void -Hierarchy::enableAll() -{ - disableValue = DISABLE_OFF; -} - - -Logger -Hierarchy::getInstance(const log4cplus::tstring& name) -{ - return getInstance(name, *defaultFactory); -} - - -Logger -Hierarchy::getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( hashtable_mutex ) - return getInstanceImpl(name, factory); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -LoggerList -Hierarchy::getCurrentLoggers() -{ - LoggerList ret; - - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( hashtable_mutex ) - initializeLoggerList(ret); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - - return ret; -} - - -bool -Hierarchy::isDisabled(int level) -{ - return disableValue >= level; -} - - -Logger -Hierarchy::getRoot() const -{ - return root; -} - - -void -Hierarchy::resetConfiguration() -{ - getRoot().setLogLevel(DEBUG_LOG_LEVEL); - disableValue = DISABLE_OFF; - - shutdown(); - - LoggerList loggers = getCurrentLoggers(); - LoggerList::iterator it = loggers.begin(); - while(it != loggers.end()) { - (*it).setLogLevel(NOT_SET_LOG_LEVEL); - (*it).setAdditivity(true); - ++it; - } - -} - - -void -Hierarchy::setLoggerFactory(std::auto_ptr factory) -{ - defaultFactory = factory; -} - - -void -Hierarchy::shutdown() -{ - LoggerList loggers = getCurrentLoggers(); - - // begin by closing nested appenders - // then, remove all appenders - root.closeNestedAppenders(); - root.removeAllAppenders(); - - // repeat - LoggerList::iterator it = loggers.begin(); - while(it != loggers.end()) { - (*it).closeNestedAppenders(); - (*it).removeAllAppenders(); - ++it; - } -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::Hierarchy private methods -////////////////////////////////////////////////////////////////////////////// - -Logger -Hierarchy::getInstanceImpl(const log4cplus::tstring& name, spi::LoggerFactory& factory) -{ - LoggerMap::iterator it = loggerPtrs.find(name); - if(it != loggerPtrs.end()) { - return (*it).second; - } - else { - // Need to create a new logger - Logger logger = factory.makeNewLoggerInstance(name, *this); - bool inserted = loggerPtrs.insert(std::make_pair(name, logger)).second; - if(!inserted) { - getLogLog().error(LOG4CPLUS_TEXT("Hierarchy::getInstanceImpl()- Insert failed")); - throw std::runtime_error("Hierarchy::getInstanceImpl()- Insert failed"); - } - - ProvisionNodeMap::iterator it2 = provisionNodes.find(name); - if(it2 != provisionNodes.end()) { - updateChildren(it2->second, logger); - bool deleted = (provisionNodes.erase(name) > 0); - if(!deleted) { - getLogLog().error(LOG4CPLUS_TEXT("Hierarchy::getInstanceImpl()- Delete failed")); - throw std::runtime_error("Hierarchy::getInstanceImpl()- Delete failed"); - } - } - updateParents(logger); - - return logger; - } -} - - -void -Hierarchy::initializeLoggerList(LoggerList& list) const -{ - for(LoggerMap::const_iterator it=loggerPtrs.begin(); - it!= loggerPtrs.end(); - ++it) - { - list.push_back((*it).second); - } -} - - -void -Hierarchy::updateParents(Logger logger) -{ - log4cplus::tstring name = logger.getName(); - size_t length = name.length(); - bool parentFound = false; - - // if name = "w.x.y.z", loop thourgh "w.x.y", "w.x" and "w", but not "w.x.y.z" - for(size_t i=name.find_last_of(LOG4CPLUS_TEXT('.'), length-1); - i != log4cplus::tstring::npos && i > 0; - i = name.find_last_of(LOG4CPLUS_TEXT('.'), i-1)) - { - log4cplus::tstring substr = name.substr(0, i); - - LoggerMap::iterator it = loggerPtrs.find(substr); - if(it != loggerPtrs.end()) { - parentFound = true; - logger.value->parent = it->second.value; - break; // no need to update the ancestors of the closest ancestor - } - else { - ProvisionNodeMap::iterator it2 = provisionNodes.find(substr); - if(it2 != provisionNodes.end()) { - it2->second.push_back(logger); - } - else { - ProvisionNode node; - node.push_back(logger); - std::pair tmp = - provisionNodes.insert(std::make_pair(substr, node)); - //bool inserted = provisionNodes.insert(std::make_pair(substr, node)).second; - if(!tmp.second) { - getLogLog().error(LOG4CPLUS_TEXT("Hierarchy::updateParents()- Insert failed")); - throw std::runtime_error("Hierarchy::updateParents()- Insert failed"); - } - } - } // end if Logger found - } // end for loop - - if(!parentFound) { - logger.value->parent = root.value; - } -} - - -void -Hierarchy::updateChildren(ProvisionNode& pn, Logger logger) -{ - - for(ProvisionNode::iterator it=pn.begin(); it!=pn.end(); ++it) { - Logger& c = *it; - // Unless this child already points to a correct (lower) parent, - // make logger.parent point to c.parent and c.parent to logger. - if( !startsWith(c.value->parent->getName(), logger.getName()) ) { - logger.value->parent = c.value->parent; - c.value->parent = logger.value; - } - } -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchylocker.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchylocker.cxx deleted file mode 100644 index cf0b98b6..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/hierarchylocker.cxx +++ /dev/null @@ -1,124 +0,0 @@ -// Module: Log4CPLUS -// File: hierarchylocker.cxx -// Created: 8/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include - - -using namespace log4cplus; -using namespace log4cplus::helpers; - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::HierarchyLocker ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -HierarchyLocker::HierarchyLocker(Hierarchy& _h) -: h(_h), - hierarchyLocker(h.hashtable_mutex), - loggerList() -{ - // Get a copy of all of the Hierarchy's Loggers (except the Root Logger) - h.initializeLoggerList(loggerList); - - // Lock all of the Hierarchy's Loggers' mutexs - try { - for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) { - LOG4CPLUS_MUTEX_LOCK( (*it).value->appender_list_mutex ) ; - } - } - catch(...) { - h.getLogLog().error(LOG4CPLUS_TEXT("HierarchyLocker::ctor()- An error occurred while locking")); - // TODO --> We need to unlock any Logger mutex that we were able to lock - throw; - } -} - - -HierarchyLocker::~HierarchyLocker() -{ - try { - for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) { - LOG4CPLUS_MUTEX_UNLOCK( (*it).value->appender_list_mutex ) ; - } - } - catch(...) { - h.getLogLog().error(LOG4CPLUS_TEXT("HierarchyLocker::dtor()- An error occurred while unlocking")); - throw; - } -} - -void -HierarchyLocker::resetConfiguration() -{ - Logger root = h.getRoot(); - h.disable(log4cplus::Hierarchy::DISABLE_OFF); - - // begin by closing nested appenders - // then, remove all appenders - root.setLogLevel(DEBUG_LOG_LEVEL); - root.closeNestedAppenders(); - root.removeAllAppenders(); - - // repeat - for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) { - LOG4CPLUS_MUTEX_UNLOCK( (*it).value->appender_list_mutex ) ; - (*it).closeNestedAppenders(); - (*it).removeAllAppenders(); - LOG4CPLUS_MUTEX_LOCK( (*it).value->appender_list_mutex ) ; - (*it).setLogLevel(NOT_SET_LOG_LEVEL); - (*it).setAdditivity(true); - } -} - - -Logger -HierarchyLocker::getInstance(const log4cplus::tstring& name) -{ - return h.getInstanceImpl(name, *h.getLoggerFactory()); -} - - -Logger -HierarchyLocker::getInstance(const log4cplus::tstring& name, spi::LoggerFactory& factory) -{ - return h.getInstanceImpl(name, factory); -} - - -void -HierarchyLocker::addAppender(Logger& logger, log4cplus::SharedAppenderPtr& appender) -{ - for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) { - if((*it).value == logger.value) { - LOG4CPLUS_MUTEX_UNLOCK( logger.value->appender_list_mutex ); - logger.addAppender(appender); - LOG4CPLUS_MUTEX_LOCK( logger.value->appender_list_mutex ); - return; - } - } - - // I don't have this Logger locked - logger.addAppender(appender); -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/layout.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/layout.cxx deleted file mode 100644 index 7fb07d92..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/layout.cxx +++ /dev/null @@ -1,127 +0,0 @@ -// Module: Log4CPLUS -// File: layout.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include - - -namespace log4cplus -{ - - -extern helpers::Time TTCCLayout_time_base; - - -void -initializeLayout () -{ - TTCCLayout_time_base = helpers::Time::gettimeofday (); -} - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::SimpleLayout public methods -/////////////////////////////////////////////////////////////////////////////// - -void -SimpleLayout::formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event) -{ - output << llmCache.toString(event.getLogLevel()) - << LOG4CPLUS_TEXT(" - ") - << event.getMessage() - << LOG4CPLUS_TEXT("\n"); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::TTCCLayout ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -TTCCLayout::TTCCLayout(bool use_gmtime_) -: dateFormat(), - use_gmtime(use_gmtime_) -{ -} - - -TTCCLayout::TTCCLayout(const log4cplus::helpers::Properties& properties) -: Layout(properties), - dateFormat(), - use_gmtime(false) -{ - if(properties.exists( LOG4CPLUS_TEXT("DateFormat") )) { - dateFormat = properties.getProperty( LOG4CPLUS_TEXT("DateFormat") ); - } - - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("Use_gmtime") ); - use_gmtime = (helpers::toLower(tmp) == LOG4CPLUS_TEXT("true")); -} - - -TTCCLayout::~TTCCLayout() -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::TTCCLayout public methods -/////////////////////////////////////////////////////////////////////////////// - -void -TTCCLayout::formatAndAppend(log4cplus::tostream& output, - const log4cplus::spi::InternalLoggingEvent& event) -{ - if (dateFormat.empty ()) - { - helpers::Time const rel_time = event.getTimestamp () - TTCCLayout_time_base; - tchar const old_fill = output.fill (); - helpers::time_t const sec = rel_time.sec (); - - if (sec != 0) - output << sec << std::setfill (LOG4CPLUS_TEXT ('0')) - << std::setw (3); - - output << rel_time.usec () / 1000; - output.fill (old_fill); - } - else - output << event.getTimestamp().getFormattedTime(dateFormat, use_gmtime); - - output << LOG4CPLUS_TEXT(" [") - << event.getThread() - << LOG4CPLUS_TEXT("] ") - << llmCache.toString(event.getLogLevel()) - << LOG4CPLUS_TEXT(" ") - << event.getLoggerName() - << LOG4CPLUS_TEXT(" <") - << event.getNDC() - << LOG4CPLUS_TEXT("> - ") - << event.getMessage() - << LOG4CPLUS_TEXT("\n"); -} - - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logger.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logger.cxx deleted file mode 100644 index 73db3425..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logger.cxx +++ /dev/null @@ -1,298 +0,0 @@ -// Module: Log4CPLUS -// File: logger.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include - - -namespace log4cplus -{ - - -Logger -DefaultLoggerFactory::makeNewLoggerInstance (const log4cplus::tstring & name, - Hierarchy& h) -{ - return Logger (new spi::LoggerImpl (name, h)); -} - - -////////////////////////////////////////////////////////////////////////////// -// static Logger Methods -////////////////////////////////////////////////////////////////////////////// -// -Hierarchy & -Logger::getDefaultHierarchy () -{ - static Hierarchy defaultHierarchy; - - return defaultHierarchy; -} - - -bool -Logger::exists (const log4cplus::tstring & name) -{ - return getDefaultHierarchy().exists(name); -} - - -LoggerList -Logger::getCurrentLoggers () -{ - return getDefaultHierarchy ().getCurrentLoggers (); -} - - -Logger -Logger::getInstance (const log4cplus::tstring& name) -{ - return getDefaultHierarchy().getInstance(name); -} - - -Logger -Logger::getInstance (const log4cplus::tstring& name, - spi::LoggerFactory& factory) -{ - return getDefaultHierarchy().getInstance(name, factory); -} - - -Logger -Logger::getRoot () -{ - return getDefaultHierarchy ().getRoot (); -} - - -void -Logger::shutdown () -{ - getDefaultHierarchy ().shutdown (); -} - - - -////////////////////////////////////////////////////////////////////////////// -// Logger ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -Logger::Logger () - : value (0) -{ } - - -Logger::Logger (spi::LoggerImpl * ptr) - : value (ptr) -{ - if (value) - value->addReference (); -} - - -Logger::Logger (const Logger& rhs) - : spi::AppenderAttachable (rhs) - , value (rhs.value) -{ - if (value) - value->addReference (); -} - - -Logger & -Logger::operator = (const Logger& rhs) -{ - Logger (rhs).swap (*this); - return *this; -} - - -Logger::~Logger () -{ - if (value) - value->removeReference (); -} - - -////////////////////////////////////////////////////////////////////////////// -// Logger Methods -////////////////////////////////////////////////////////////////////////////// - -void -Logger::swap (Logger & other) -{ - std::swap (value, other.value); -} - - -Logger -Logger::getParent () const -{ - if (value->parent) - return Logger (value->parent.get ()); - else - { - value->getLogLog().error(LOG4CPLUS_TEXT("********* This logger has no parent: " + getName())); - return *this; - } -} - - -void -Logger::addAppender (SharedAppenderPtr newAppender) -{ - value->addAppender(newAppender); -} - - -SharedAppenderPtrList -Logger::getAllAppenders () -{ - return value->getAllAppenders(); -} - - -SharedAppenderPtr -Logger::getAppender (const log4cplus::tstring& name) -{ - return value->getAppender (name); -} - - -void -Logger::removeAllAppenders () -{ - value->removeAllAppenders (); -} - - -void -Logger::removeAppender (SharedAppenderPtr appender) -{ - value->removeAppender(appender); -} - - -void -Logger::removeAppender (const log4cplus::tstring& name) -{ - value->removeAppender (name); -} - - -void -Logger::assertion (bool assertionVal, const log4cplus::tstring& msg) const -{ - if (! assertionVal) - log (FATAL_LOG_LEVEL, msg); -} - - -void -Logger::closeNestedAppenders () const -{ - value->closeNestedAppenders (); -} - - -bool -Logger::isEnabledFor (LogLevel ll) const -{ - return value->isEnabledFor (ll); -} - - -void -Logger::log (LogLevel ll, const log4cplus::tstring& message, const char* file, - int line) const -{ - value->log (ll, message, file, line); -} - - -void -Logger::forcedLog (LogLevel ll, const log4cplus::tstring& message, - const char* file, int line) const -{ - value->forcedLog (ll, message, file, line); -} - - -void -Logger::callAppenders (const spi::InternalLoggingEvent& event) const -{ - value->callAppenders (event); -} - - -LogLevel -Logger::getChainedLogLevel () const -{ - return value->getChainedLogLevel (); -} - - -LogLevel -Logger::getLogLevel() const -{ - return value->getLogLevel (); -} - - -void -Logger::setLogLevel (LogLevel ll) -{ - value->setLogLevel (ll); -} - - -Hierarchy & -Logger::getHierarchy () const -{ - return value->getHierarchy (); -} - - -log4cplus::tstring -Logger::getName () const -{ - return value->getName (); -} - - -bool -Logger::getAdditivity () const -{ - return value->getAdditivity (); -} - - -void -Logger::setAdditivity (bool additive) -{ - value->setAdditivity (additive); -} - - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggerimpl.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggerimpl.cxx deleted file mode 100644 index 22f2145f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggerimpl.cxx +++ /dev/null @@ -1,158 +0,0 @@ -// Module: Log4CPLUS -// File: loggerimpl.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - - -////////////////////////////////////////////////////////////////////////////// -// Logger Constructors and Destructor -////////////////////////////////////////////////////////////////////////////// -LoggerImpl::LoggerImpl(const log4cplus::tstring& name_, Hierarchy& h) - : name(name_), - ll(NOT_SET_LOG_LEVEL), - parent(NULL), - additive(true), - hierarchy(h) -{ -} - - -LoggerImpl::~LoggerImpl() -{ -} - - -////////////////////////////////////////////////////////////////////////////// -// Logger Methods -////////////////////////////////////////////////////////////////////////////// - -void -LoggerImpl::callAppenders(const InternalLoggingEvent& event) -{ - int writes = 0; - for(const LoggerImpl* c = this; c != NULL; c=c->parent.get()) { - writes += c->appendLoopOnAppenders(event); - if(!c->additive) { - break; - } - } - - // No appenders in hierarchy, warn user only once. - if(!hierarchy.emittedNoAppenderWarning && writes == 0) { - getLogLog().error( LOG4CPLUS_TEXT("No appenders could be found for logger (") - + getName() - + LOG4CPLUS_TEXT(").")); - getLogLog().error(LOG4CPLUS_TEXT("Please initialize the log4cplus system properly.")); - hierarchy.emittedNoAppenderWarning = true; - } -} - - -void -LoggerImpl::closeNestedAppenders() -{ - SharedAppenderPtrList appenders = getAllAppenders(); - for(SharedAppenderPtrList::iterator it=appenders.begin(); it!=appenders.end(); ++it) - { - (*it)->close(); - } -} - - -bool -LoggerImpl::isEnabledFor(LogLevel ll_) const -{ - if(hierarchy.disableValue >= ll_) { - return false; - } - return ll_ >= getChainedLogLevel(); -} - - -void -LoggerImpl::log(LogLevel ll_, - const log4cplus::tstring& message, - const char* file, - int line) -{ - if(isEnabledFor(ll_)) { - forcedLog(ll_, message, file, line); - } -} - - - -LogLevel -LoggerImpl::getChainedLogLevel() const -{ - for(const LoggerImpl *c=this; c != NULL; c=c->parent.get()) { - if(c->ll != NOT_SET_LOG_LEVEL) { - return c->ll; - } - } - - getLogLog().error( LOG4CPLUS_TEXT("LoggerImpl::getChainedLogLevel()- No valid LogLevel found") ); - throw std::runtime_error("No valid LogLevel found"); -} - - -Hierarchy& -LoggerImpl::getHierarchy() const -{ - return hierarchy; -} - - -bool -LoggerImpl::getAdditivity() const -{ - return additive; -} - - -void -LoggerImpl::setAdditivity(bool additive_) -{ - this->additive = additive_; -} - - -void -LoggerImpl::forcedLog(LogLevel ll_, - const log4cplus::tstring& message, - const char* file, - int line) -{ - callAppenders(spi::InternalLoggingEvent(this->getName(), ll_, message, file, line)); -} - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggingevent.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggingevent.cxx deleted file mode 100644 index 5c44a523..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loggingevent.cxx +++ /dev/null @@ -1,100 +0,0 @@ -// Module: Log4CPLUS -// File: loggingevent.cxx -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - - -using namespace log4cplus; -using namespace log4cplus::spi; - - -#define LOG4CPLUS_DEFAULT_TYPE 1 - - -/////////////////////////////////////////////////////////////////////////////// -// InternalLoggingEvent dtor -/////////////////////////////////////////////////////////////////////////////// - -InternalLoggingEvent::~InternalLoggingEvent() -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// InternalLoggingEvent static methods -/////////////////////////////////////////////////////////////////////////////// - -unsigned int -InternalLoggingEvent::getDefaultType() -{ - return LOG4CPLUS_DEFAULT_TYPE; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// InternalLoggingEvent implementation -/////////////////////////////////////////////////////////////////////////////// - -const log4cplus::tstring& -InternalLoggingEvent::getMessage() const -{ - return message; -} - - -unsigned int -InternalLoggingEvent::getType() const -{ - return LOG4CPLUS_DEFAULT_TYPE; -} - - - -std::auto_ptr -InternalLoggingEvent::clone() const -{ - std::auto_ptr tmp(new InternalLoggingEvent(*this)); - return tmp; -} - - - -log4cplus::spi::InternalLoggingEvent& -InternalLoggingEvent::operator=(const log4cplus::spi::InternalLoggingEvent& rhs) -{ - if(this == &rhs) return *this; - - message = rhs.message; - loggerName = rhs.loggerName; - ll = rhs.ll; - ndc = rhs.getNDC(); - thread = rhs.getThread(); - timestamp = rhs.timestamp; - file = rhs.file; - line = rhs.line; - threadCached = true; - ndcCached = true; - - return *this; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglevel.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglevel.cxx deleted file mode 100644 index 02d5d563..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglevel.cxx +++ /dev/null @@ -1,221 +0,0 @@ -// Module: Log4CPLUS -// File: loglevel.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; - -#define _ALL_STRING LOG4CPLUS_TEXT("ALL") -#define _TRACE_STRING LOG4CPLUS_TEXT("TRACE") -#define _DEBUG_STRING LOG4CPLUS_TEXT("DEBUG") -#define _INFO_STRING LOG4CPLUS_TEXT("INFO") -#define _WARN_STRING LOG4CPLUS_TEXT("WARN") -#define _ERROR_STRING LOG4CPLUS_TEXT("ERROR") -#define _FATAL_STRING LOG4CPLUS_TEXT("FATAL") -#define _OFF_STRING LOG4CPLUS_TEXT("OFF") -#define _NOTSET_STRING LOG4CPLUS_TEXT("NOTSET") -#define _UNKNOWN_STRING LOG4CPLUS_TEXT("UNKNOWN") - -#define GET_TO_STRING_NODE static_cast(this->toStringMethods) -#define GET_FROM_STRING_NODE static_cast(this->fromStringMethods) - - - -////////////////////////////////////////////////////////////////////////////// -// file LOCAL definitions -////////////////////////////////////////////////////////////////////////////// - -namespace { - class ToStringNode { - public: - ToStringNode(LogLevelToStringMethod m) : method(m), next(0) {} - - LogLevelToStringMethod method; - ToStringNode* next; - }; - - - class FromStringNode { - public: - FromStringNode(StringToLogLevelMethod m) : method(m), next(0) {} - - StringToLogLevelMethod method; - FromStringNode* next; - }; - - - static - log4cplus::tstring - defaultLogLevelToStringMethod(LogLevel ll) { - switch(ll) { - case OFF_LOG_LEVEL: return _OFF_STRING; - case FATAL_LOG_LEVEL: return _FATAL_STRING; - case ERROR_LOG_LEVEL: return _ERROR_STRING; - case WARN_LOG_LEVEL: return _WARN_STRING; - case INFO_LOG_LEVEL: return _INFO_STRING; - case DEBUG_LOG_LEVEL: return _DEBUG_STRING; - case TRACE_LOG_LEVEL: return _TRACE_STRING; - //case ALL_LOG_LEVEL: return _ALL_STRING; - case NOT_SET_LOG_LEVEL: return _NOTSET_STRING; - }; - - return tstring(); - } - - - static - LogLevel - defaultStringToLogLevelMethod(const log4cplus::tstring& arg) { - log4cplus::tstring s = log4cplus::helpers::toUpper(arg); - - if(s == _ALL_STRING) return ALL_LOG_LEVEL; - if(s == _TRACE_STRING) return TRACE_LOG_LEVEL; - if(s == _DEBUG_STRING) return DEBUG_LOG_LEVEL; - if(s == _INFO_STRING) return INFO_LOG_LEVEL; - if(s == _WARN_STRING) return WARN_LOG_LEVEL; - if(s == _ERROR_STRING) return ERROR_LOG_LEVEL; - if(s == _FATAL_STRING) return FATAL_LOG_LEVEL; - if(s == _OFF_STRING) return OFF_LOG_LEVEL; - - return NOT_SET_LOG_LEVEL; - } - -} - - - -////////////////////////////////////////////////////////////////////////////// -// public static methods -////////////////////////////////////////////////////////////////////////////// - -LogLevelManager& -log4cplus::getLogLevelManager() -{ - static LogLevelManager singleton; - return singleton; -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::LogLevelManager ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -LogLevelManager::LogLevelManager() -: toStringMethods(new ToStringNode(defaultLogLevelToStringMethod)), - fromStringMethods(new FromStringNode(defaultStringToLogLevelMethod)) -{ -} - - - -LogLevelManager::~LogLevelManager() -{ - ToStringNode* toStringTmp = GET_TO_STRING_NODE; - while(toStringTmp) { - ToStringNode* tmp = toStringTmp; - toStringTmp = toStringTmp->next; - delete tmp; - } - - FromStringNode* fromStringTmp = GET_FROM_STRING_NODE; - while(fromStringTmp) { - FromStringNode* tmp = fromStringTmp; - fromStringTmp = fromStringTmp->next; - delete tmp; - } -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::LogLevelManager public methods -////////////////////////////////////////////////////////////////////////////// - -log4cplus::tstring -LogLevelManager::toString(LogLevel ll) const -{ - ToStringNode* toStringTmp = GET_TO_STRING_NODE; - while(toStringTmp) { - tstring ret = toStringTmp->method(ll); - if(! ret.empty ()) { - return ret; - } - toStringTmp = toStringTmp->next; - } - - return _UNKNOWN_STRING; -} - - - -LogLevel -LogLevelManager::fromString(const log4cplus::tstring& s) const -{ - FromStringNode* fromStringTmp = GET_FROM_STRING_NODE; - while(fromStringTmp) { - LogLevel ret = fromStringTmp->method(s); - if(ret != NOT_SET_LOG_LEVEL) { - return ret; - } - fromStringTmp = fromStringTmp->next; - } - - return NOT_SET_LOG_LEVEL; -} - - - -void -LogLevelManager::pushToStringMethod(LogLevelToStringMethod newToString) -{ - ToStringNode* toStringTmp = GET_TO_STRING_NODE; - while(1) { - if(toStringTmp->next) { - toStringTmp = toStringTmp->next; - } - else { - toStringTmp->next = new ToStringNode(newToString); - break; - } - } -} - - - -void -LogLevelManager::pushFromStringMethod(StringToLogLevelMethod newFromString) -{ - FromStringNode* fromStringTmp = GET_FROM_STRING_NODE; - while(1) { - if(fromStringTmp->next) { - fromStringTmp = fromStringTmp->next; - } - else { - fromStringTmp->next = new FromStringNode(newFromString); - break; - } - } -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglog.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglog.cxx deleted file mode 100644 index 538d1328..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/loglog.cxx +++ /dev/null @@ -1,122 +0,0 @@ -// Module: Log4CPLUS -// File: loglog.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - -namespace -{ - -static tchar const PREFIX[] = LOG4CPLUS_TEXT("log4cplus: "); -static tchar const WARN_PREFIX[] = LOG4CPLUS_TEXT("log4cplus:WARN "); -static tchar const ERR_PREFIX[] = LOG4CPLUS_TEXT("log4cplus:ERROR "); - -} // namespace - - - -/////////////////////////////////////////////////////////////////////////////// -// static methods -/////////////////////////////////////////////////////////////////////////////// - -SharedObjectPtr -LogLog::getLogLog() -{ - static SharedObjectPtr singleton(new LogLog()); - return singleton; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::LogLog ctor and dtor -/////////////////////////////////////////////////////////////////////////////// - -LogLog::LogLog() - : mutex(LOG4CPLUS_MUTEX_CREATE), - debugEnabled(false), - quietMode(false) -{ -} - - -LogLog::~LogLog() -{ - LOG4CPLUS_MUTEX_FREE( mutex ); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::LogLog public methods -/////////////////////////////////////////////////////////////////////////////// - -void -LogLog::setInternalDebugging(bool enabled) -{ - debugEnabled = enabled; -} - - -void -LogLog::setQuietMode(bool quietModeVal) -{ - quietMode = quietModeVal; -} - - -void -LogLog::debug(const log4cplus::tstring& msg) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - if(debugEnabled && !quietMode) { - tcout << PREFIX << msg << endl; - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -void -LogLog::warn(const log4cplus::tstring& msg) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - if(quietMode) return; - - tcerr << WARN_PREFIX << msg << endl; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -void -LogLog::error(const log4cplus::tstring& msg) -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - if(quietMode) return; - - tcerr << ERR_PREFIX << msg << endl; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logloguser.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logloguser.cxx deleted file mode 100644 index 1f1acb37..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/logloguser.cxx +++ /dev/null @@ -1,80 +0,0 @@ -// Module: Log4CPLUS -// File: logloguser.cxx -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - -typedef SharedObjectPtr LogLogPtr; - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::LogLogUser ctor and dtor -/////////////////////////////////////////////////////////////////////////////// - -LogLogUser::LogLogUser() -{ - loglogRef = new SharedObjectPtr(LogLog::getLogLog()); -} - - -LogLogUser::LogLogUser(const LogLogUser& rhs) -{ - loglogRef = new SharedObjectPtr(*static_cast(rhs.loglogRef)); -} - - -LogLogUser::~LogLogUser() -{ - delete static_cast(loglogRef); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::LogLogUser public methods -/////////////////////////////////////////////////////////////////////////////// - -LogLog& -LogLogUser::getLogLog() const -{ - LogLogPtr* ptr = static_cast(loglogRef); - return **ptr; -} - - -LogLogUser& -LogLogUser::operator=(const LogLogUser& rhs) -{ - if(this == &rhs) { - return *this; - } - - delete static_cast(loglogRef); - loglogRef = new SharedObjectPtr(*static_cast(rhs.loglogRef)); - - return *this; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/ndc.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/ndc.cxx deleted file mode 100644 index d9e5db7f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/ndc.cxx +++ /dev/null @@ -1,329 +0,0 @@ -// Module: Log4CPLUS -// File: ndc.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; - - - -/////////////////////////////////////////////////////////////////////////////// -// public methods -/////////////////////////////////////////////////////////////////////////////// - -NDC& -log4cplus::getNDC() -{ - static NDC singleton; - return singleton; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::DiagnosticContext ctors -/////////////////////////////////////////////////////////////////////////////// - -DiagnosticContext::DiagnosticContext(const log4cplus::tstring& message_, DiagnosticContext* parent) - : message(message_), - fullMessage( ( (parent == NULL) - ? message - : parent->fullMessage + LOG4CPLUS_TEXT(" ") + message) ) -{ -} - - -DiagnosticContext::DiagnosticContext(const log4cplus::tstring& message_) - : message(message_), - fullMessage(message) -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::NDC ctor and dtor -/////////////////////////////////////////////////////////////////////////////// - -NDC::NDC() - : threadLocal(LOG4CPLUS_THREAD_LOCAL_INIT (0)) -{ -} - - -NDC::~NDC() -{ - LOG4CPLUS_THREAD_LOCAL_CLEANUP( threadLocal ); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::NDC public methods -/////////////////////////////////////////////////////////////////////////////// - -void -NDC::clear() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL) { - delete ptr; - LOG4CPLUS_SET_THREAD_LOCAL_VALUE( threadLocal, NULL ); - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::clear()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::clear()- exception occured")); - } -} - - -DiagnosticContextStack -NDC::cloneStack() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL) { - return DiagnosticContextStack(*ptr); - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::cloneStack()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::cloneStack()- exception occured")); - } - - return DiagnosticContextStack(); -} - - -void -NDC::inherit(const DiagnosticContextStack& stack) -{ - try { - DiagnosticContextStack* ptr = getPtr(); - delete ptr; - - ptr = new DiagnosticContextStack(stack); - LOG4CPLUS_SET_THREAD_LOCAL_VALUE( threadLocal, ptr ); - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::inherit()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::inherit()- exception occured")); - } -} - - -log4cplus::tstring -NDC::get() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL && !ptr->empty()) { - return ptr->top().fullMessage; - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::get()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::get()- exception occured")); - } - - return LOG4CPLUS_TEXT(""); -} - - -size_t -NDC::getDepth() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL) { - return ptr->size(); - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::getDepth()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::getDepth()- exception occured")); - } - - return 0; -} - - -log4cplus::tstring -NDC::pop() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL && !ptr->empty()) { - DiagnosticContext dc = ptr->top(); - ptr->pop(); - if(ptr->empty()) { - // If the NDC stack is empty we will delete it so that we can avoid - // most memory leaks if Threads don't call remove when exiting - delete ptr; - LOG4CPLUS_SET_THREAD_LOCAL_VALUE( threadLocal, NULL ); - } - return dc.message; - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::pop()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::pop()- exception occured")); - } - - return LOG4CPLUS_TEXT(""); -} - - -log4cplus::tstring -NDC::peek() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL && !ptr->empty()) { - return ptr->top().message; - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::peek()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::peek()- exception occured")); - } - - return LOG4CPLUS_TEXT(""); -} - - -void -NDC::push(const log4cplus::tstring& message) -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr == NULL) { - ptr = new DiagnosticContextStack(); - LOG4CPLUS_SET_THREAD_LOCAL_VALUE( threadLocal, ptr ); - } - - if(ptr->empty()) { - ptr->push( DiagnosticContext(message, NULL) ); - } - else { - DiagnosticContext dc = ptr->top(); - ptr->push( DiagnosticContext(message, &dc) ); - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::push()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::push()- exception occured")); - } -} - - -void -NDC::remove() -{ - try { - DiagnosticContextStack* ptr = getPtr(); - delete ptr; - LOG4CPLUS_SET_THREAD_LOCAL_VALUE( threadLocal, NULL ); - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::remove()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::remove()- exception occured")); - } -} - - -void -NDC::setMaxDepth(size_t maxDepth) -{ - try { - DiagnosticContextStack* ptr = getPtr(); - if(ptr != NULL) { - while(maxDepth < ptr->size()) { - ptr->pop(); - } - } - } - catch(std::exception& e) { - getLogLog().error( LOG4CPLUS_TEXT("NDC::setMaxDepth()- exception occured: ") - + LOG4CPLUS_C_STR_TO_TSTRING(e.what())); - } - catch(...) { - getLogLog().error(LOG4CPLUS_TEXT("NDC::setMaxDepth()- exception occured")); - } -} - - -DiagnosticContextStack* NDC::getPtr() -{ - return static_cast - (LOG4CPLUS_GET_THREAD_LOCAL_VALUE( threadLocal )); -} - - -// -// -// - -NDCContextCreator::NDCContextCreator(const log4cplus::tstring& msg) -{ - getNDC().push(msg); -} - - -NDCContextCreator::~NDCContextCreator() -{ - getNDC().pop(); -} diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nteventlogappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nteventlogappender.cxx deleted file mode 100644 index 1b9a7dca..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nteventlogappender.cxx +++ /dev/null @@ -1,348 +0,0 @@ -// Module: LOG4CPLUS -// File: nteventlogappender.cxx -// Created: 4/2003 -// Author: Michael CATANZARITI -// -// Copyright 2003-2010 Michael CATANZARITI -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include - - -#if defined (LOG4CPLUS_HAVE_NT_EVENT_LOG) - -using namespace log4cplus; -using namespace log4cplus::spi; -using namespace log4cplus::helpers; - - -////////////////////////////////////////////////////////////////////////////// -// File LOCAL methods -////////////////////////////////////////////////////////////////////////////// - -namespace { - - bool - FreeSid(SID* pSid) - { - return ::HeapFree(GetProcessHeap(), 0, (LPVOID)pSid) != 0; - } - - - bool - CopySid(SID** ppDstSid, SID* pSrcSid) - { - bool bSuccess = false; - - DWORD dwLength = ::GetLengthSid(pSrcSid); - *ppDstSid = (SID *) ::HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, dwLength); - - if(::CopySid(dwLength, *ppDstSid, pSrcSid)) { - bSuccess = true; - } - else { - FreeSid(*ppDstSid); - } - - return bSuccess; - } - - - - bool - GetCurrentUserSID(SID** ppSid) - { - bool bSuccess = false; - - // Pseudohandle so don't need to close it - HANDLE hProcess = ::GetCurrentProcess(); - HANDLE hToken = NULL; - if(::OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) { - // Get the required size - DWORD tusize = 0; - GetTokenInformation(hToken, TokenUser, NULL, 0, &tusize); - TOKEN_USER* ptu = (TOKEN_USER*)new BYTE[tusize]; - - if(GetTokenInformation(hToken, TokenUser, (LPVOID)ptu, tusize, &tusize)) { - bSuccess = CopySid(ppSid, (SID *)ptu->User.Sid); - } - - CloseHandle(hToken); - delete [] ptu; - } - - return bSuccess; - } - - - - - - HKEY - regGetKey(const log4cplus::tstring& subkey, DWORD* disposition) - { - HKEY hkey = 0; - RegCreateKeyEx(HKEY_LOCAL_MACHINE, - subkey.c_str(), - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hkey, - disposition); - return hkey; - } - - - - void - regSetString(HKEY hkey, const log4cplus::tstring& name, const log4cplus::tstring& value) - { - RegSetValueEx(hkey, - name.c_str(), - 0, - REG_SZ, - (LPBYTE)value.c_str(), - static_cast(value.length() * sizeof(tchar))); - } - - - - void - regSetDword(HKEY hkey, const log4cplus::tstring& name, DWORD value) - { - RegSetValueEx(hkey, - name.c_str(), - 0, - REG_DWORD, - (LPBYTE)&value, - sizeof(DWORD)); - } - -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::NTEventLogAppender ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -NTEventLogAppender::NTEventLogAppender(const log4cplus::tstring& server, - const log4cplus::tstring& log, - const log4cplus::tstring& source) -: server(server), - log(log), - source(source), - hEventLog(NULL), - pCurrentUserSID(NULL) -{ - init(); -} - - - -NTEventLogAppender::NTEventLogAppender(const Properties properties) -: Appender(properties), - hEventLog(NULL), - pCurrentUserSID(NULL) -{ - server = properties.getProperty( LOG4CPLUS_TEXT("server") ); - log = properties.getProperty( LOG4CPLUS_TEXT("log") ); - source = properties.getProperty( LOG4CPLUS_TEXT("source") ); - - init(); -} - - - -void -NTEventLogAppender::init() -{ - if(source.empty()) { - getLogLog().warn( LOG4CPLUS_TEXT("Source option not set for appender [") - + name - + LOG4CPLUS_TEXT("].")); - return; - } - - if(log.empty ()) { - log = LOG4CPLUS_TEXT("Application"); - } - - // current user security identifier - GetCurrentUserSID(&pCurrentUserSID); - - addRegistryInfo(); - - hEventLog = ::RegisterEventSource(server.empty () ? 0 : server.c_str(), - source.c_str()); - if (! hEventLog || hEventLog == HANDLE(ERROR_INVALID_HANDLE)) - getLogLog().warn (LOG4CPLUS_TEXT("Event source registration failed.")); -} - - - -NTEventLogAppender::~NTEventLogAppender() -{ - destructorImpl(); - - if(pCurrentUserSID != NULL) { - FreeSid(pCurrentUserSID); - pCurrentUserSID = NULL; - } -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::NTEventLogAppender public methods -////////////////////////////////////////////////////////////////////////////// - -void -NTEventLogAppender::close() -{ - if(hEventLog != NULL) { - ::DeregisterEventSource(hEventLog); - hEventLog = NULL; - } - closed = true; -} - - - -////////////////////////////////////////////////////////////////////////////// -// log4cplus::NTEventLogAppender protected methods -////////////////////////////////////////////////////////////////////////////// - -void -NTEventLogAppender::append(const InternalLoggingEvent& event) -{ - if(hEventLog == NULL) { - getLogLog().warn(LOG4CPLUS_TEXT("NT EventLog not opened.")); - return; - } - - tostringstream buf; - layout->formatAndAppend(buf, event); - tstring sz = buf.str(); - const tchar * s = sz.c_str(); - - BOOL bSuccess = ::ReportEvent(hEventLog, - getEventType(event), - getEventCategory(event), - 0x1000, - pCurrentUserSID, - 1, - 0, - &s, - NULL); - - if(!bSuccess) { - getLogLog().error(LOG4CPLUS_TEXT("Cannot report event in NT EventLog.")); - } -} - - - - -WORD -NTEventLogAppender::getEventType(const InternalLoggingEvent& event) -{ - WORD ret_val; - - switch ((int)event.getLogLevel()) - { - case FATAL_LOG_LEVEL: - case ERROR_LOG_LEVEL: - ret_val = EVENTLOG_ERROR_TYPE; - break; - case WARN_LOG_LEVEL: - ret_val = EVENTLOG_WARNING_TYPE; - break; - case INFO_LOG_LEVEL: - case DEBUG_LOG_LEVEL: - default: - ret_val = EVENTLOG_INFORMATION_TYPE; - break; - } - - return ret_val; -} - - - -WORD -NTEventLogAppender::getEventCategory(const InternalLoggingEvent& event) -{ - WORD ret_val; - - switch (event.getLogLevel()) - { - case FATAL_LOG_LEVEL: - ret_val = 1; - break; - case ERROR_LOG_LEVEL: - ret_val = 2; - break; - case WARN_LOG_LEVEL: - ret_val = 3; - break; - case INFO_LOG_LEVEL: - ret_val = 4; - break; - case DEBUG_LOG_LEVEL: - default: - ret_val = 5; - break; - } - - return ret_val; -} - - -// Add this source with appropriate configuration keys to the registry. -void -NTEventLogAppender::addRegistryInfo() -{ - DWORD disposition; - HKEY hkey = 0; - tstring subkey = LOG4CPLUS_TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog\\") - + log - + LOG4CPLUS_TEXT("\\") - + source; - - hkey = regGetKey(subkey, &disposition); - if(disposition == REG_CREATED_NEW_KEY) { - regSetString(hkey, - LOG4CPLUS_TEXT("EventMessageFile"), - LOG4CPLUS_TEXT("NTEventLogAppender.dll")); - regSetString(hkey, - LOG4CPLUS_TEXT("CategoryMessageFile"), - LOG4CPLUS_TEXT("NTEventLogAppender.dll")); - regSetDword(hkey, LOG4CPLUS_TEXT("TypesSupported"), (DWORD)7); - regSetDword(hkey, LOG4CPLUS_TEXT("CategoryCount"), (DWORD)5); - } - - RegCloseKey(hkey); - return; -} - - -#endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nullappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nullappender.cxx deleted file mode 100644 index c2944f87..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/nullappender.cxx +++ /dev/null @@ -1,74 +0,0 @@ -// Module: Log4CPLUS -// File: nullappender.cxx -// Created: 6/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::NullAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -log4cplus::NullAppender::NullAppender() -{ -} - - -log4cplus::NullAppender::NullAppender(const log4cplus::helpers::Properties& properties) -: Appender(properties) -{ -} - - - -log4cplus::NullAppender::~NullAppender() -{ - destructorImpl(); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::NullAppender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -log4cplus::NullAppender::close() -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::NullAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -log4cplus::NullAppender::append(const spi::InternalLoggingEvent&) -{ -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/objectregistry.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/objectregistry.cxx deleted file mode 100644 index ad365a61..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/objectregistry.cxx +++ /dev/null @@ -1,113 +0,0 @@ -// Module: Log4CPLUS -// File: objectregistry.cxx -// Created: 3/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -using namespace std; -using namespace log4cplus::spi; - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::spi::ObjectRegistryBase ctor and dtor -/////////////////////////////////////////////////////////////////////////////// - -log4cplus::spi::ObjectRegistryBase::ObjectRegistryBase() - : mutex(LOG4CPLUS_MUTEX_CREATE) -{ -} - - -log4cplus::spi::ObjectRegistryBase::~ObjectRegistryBase() -{ - LOG4CPLUS_MUTEX_FREE( mutex ); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::spi::ObjectRegistryBase public methods -/////////////////////////////////////////////////////////////////////////////// - -bool -log4cplus::spi::ObjectRegistryBase::exists(const log4cplus::tstring& name) const -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - return data.find(name) != data.end(); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -std::vector -log4cplus::spi::ObjectRegistryBase::getAllNames() const -{ - std::vector tmp; - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - for(ObjectMap::const_iterator it=data.begin(); it!=data.end(); ++it) - tmp.push_back( (*it).first ); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - return tmp; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::spi::ObjectRegistryBase protected methods -/////////////////////////////////////////////////////////////////////////////// - -bool -log4cplus::spi::ObjectRegistryBase::putVal(const log4cplus::tstring& name, void* object) -{ - ObjectMap::value_type value(name, object); - std::pair ret; - - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - ret = data.insert(value); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - - if (! ret.second) - deleteObject( value.second ); - return ret.second; -} - - -void* -log4cplus::spi::ObjectRegistryBase::getVal(const log4cplus::tstring& name) const -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - ObjectMap::const_iterator it (data.find (name)); - if (it != data.end ()) - return it->second; - else - return 0; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - - -void -log4cplus::spi::ObjectRegistryBase::clear() -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - for(ObjectMap::iterator it=data.begin(); it!=data.end(); ++it) { - deleteObject( (*it).second ); - } - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/patternlayout.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/patternlayout.cxx deleted file mode 100644 index e0b66c41..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/patternlayout.cxx +++ /dev/null @@ -1,957 +0,0 @@ -// Module: Log4CPLUS -// File: patternlayout.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include - -#ifdef LOG4CPLUS_HAVE_STDLIB_H -#include -#endif -#include - -#ifdef LOG4CPLUS_HAVE_SYS_TYPES_H -#include -#endif -#ifdef LOG4CPLUS_HAVE_UNISTD_H -#include -#endif - - -namespace -{ - -static -#if defined (_WIN32) -DWORD -get_process_id () -{ - return GetCurrentProcessId (); -} - -#elif defined (LOG4CPLUS_HAVE_GETPID) -pid_t -get_process_id () -{ - return getpid (); -} - -#else -int -get_process_id () -{ - return 0; -} - -#endif - - -static -log4cplus::tstring -get_basename (const log4cplus::tstring& filename) -{ -#if defined(_WIN32) - log4cplus::tchar const dir_sep(LOG4CPLUS_TEXT('\\')); -#else - log4cplus::tchar const dir_sep(LOG4CPLUS_TEXT('/')); -#endif - - log4cplus::tstring::size_type pos = filename.rfind(dir_sep); - if (pos != log4cplus::tstring::npos) - return filename.substr(pos+1); - else - return filename; -} - - -} // namespace - - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - -#define ESCAPE_CHAR LOG4CPLUS_TEXT('%') - - -namespace log4cplus { - namespace pattern { - - /** - * This is used by PatternConverter class to inform them how to format - * their output. - */ - struct FormattingInfo { - int minLen; - size_t maxLen; - bool leftAlign; - FormattingInfo() { reset(); } - - void reset(); - void dump(log4cplus::helpers::LogLog&); - }; - - - - /** - * This is the base class of all "Converter" classes that format a - * field of InternalLoggingEvent objects. In fact, the PatternLayout - * class simply uses an array of PatternConverter objects to format - * and append a logging event. - */ - class PatternConverter : protected log4cplus::helpers::LogLogUser { - public: - PatternConverter(const FormattingInfo& info); - virtual ~PatternConverter() {} - void formatAndAppend(log4cplus::tostream& output, - const InternalLoggingEvent& event); - - protected: - virtual log4cplus::tstring convert(const InternalLoggingEvent& event) = 0; - - private: - int minLen; - size_t maxLen; - bool leftAlign; - }; - - - - /** - * This PatternConverter returns a constant string. - */ - class LiteralPatternConverter : public PatternConverter { - public: - LiteralPatternConverter(const log4cplus::tstring& str); - virtual log4cplus::tstring convert(const InternalLoggingEvent&) { - return str; - } - - private: - log4cplus::tstring str; - }; - - - - /** - * This PatternConverter is used to format most of the "simple" fields - * found in the InternalLoggingEvent object. - */ - class BasicPatternConverter : public PatternConverter { - public: - enum Type { THREAD_CONVERTER, - PROCESS_CONVERTER, - LOGLEVEL_CONVERTER, - NDC_CONVERTER, - MESSAGE_CONVERTER, - NEWLINE_CONVERTER, - BASENAME_CONVERTER, - FILE_CONVERTER, - LINE_CONVERTER, - FULL_LOCATION_CONVERTER }; - BasicPatternConverter(const FormattingInfo& info, Type type); - virtual log4cplus::tstring convert(const InternalLoggingEvent& event); - - private: - // Disable copy - BasicPatternConverter(const BasicPatternConverter&); - BasicPatternConverter& operator=(BasicPatternConverter&); - - LogLevelManager& llmCache; - Type type; - }; - - - - /** - * This PatternConverter is used to format the Logger field found in - * the InternalLoggingEvent object. - */ - class LoggerPatternConverter : public PatternConverter { - public: - LoggerPatternConverter(const FormattingInfo& info, int precision); - virtual log4cplus::tstring convert(const InternalLoggingEvent& event); - - private: - int precision; - }; - - - - /** - * This PatternConverter is used to format the timestamp field found in - * the InternalLoggingEvent object. It will be formatted according to - * the specified "pattern". - */ - class DatePatternConverter : public PatternConverter { - public: - DatePatternConverter(const FormattingInfo& info, - const log4cplus::tstring& pattern, - bool use_gmtime); - virtual log4cplus::tstring convert(const InternalLoggingEvent& event); - - private: - bool use_gmtime; - log4cplus::tstring format; - }; - - - - /** - * This PatternConverter is used to format the hostname field. - */ - class HostnamePatternConverter : public PatternConverter { - public: - HostnamePatternConverter(const FormattingInfo& info, bool fqdn); - virtual log4cplus::tstring convert(const InternalLoggingEvent& event); - - private: - log4cplus::tstring hostname_; - }; - - - - /** - * This PatternConverter is used to format the NDC field found in - * the InternalLoggingEvent object, optionally limited to - * \c precision levels (using space to separate levels). - */ - class NDCPatternConverter : public PatternConverter { - public: - NDCPatternConverter(const FormattingInfo& info, int precision); - virtual log4cplus::tstring convert(const InternalLoggingEvent& event); - - private: - int precision; - }; - - - - /** - * This class parses a "pattern" string into an array of - * PatternConverter objects. - *

- * @see PatternLayout for the formatting of the "pattern" string. - */ - class PatternParser : protected log4cplus::helpers::LogLogUser { - public: - PatternParser(const log4cplus::tstring& pattern, unsigned ndcMaxDepth); - std::vector parse(); - - private: - // Types - enum ParserState { LITERAL_STATE, - CONVERTER_STATE, - DOT_STATE, - MIN_STATE, - MAX_STATE }; - - // Methods - log4cplus::tstring extractOption(); - int extractPrecisionOption(); - void finalizeConverter(log4cplus::tchar c); - - // Data - log4cplus::tstring pattern; - FormattingInfo formattingInfo; - std::vector list; - ParserState state; - tstring::size_type pos; - log4cplus::tstring currentLiteral; - unsigned ndcMaxDepth; - }; - } -} -using namespace log4cplus::pattern; -typedef std::vector PatternConverterList; - - - -//////////////////////////////////////////////// -// PatternConverter methods: -//////////////////////////////////////////////// - -void -log4cplus::pattern::FormattingInfo::reset() { - minLen = -1; - maxLen = 0x7FFFFFFF; - leftAlign = false; -} - - -void -log4cplus::pattern::FormattingInfo::dump(log4cplus::helpers::LogLog& loglog) { - log4cplus::tostringstream buf; - buf << LOG4CPLUS_TEXT("min=") << minLen - << LOG4CPLUS_TEXT(", max=") << maxLen - << LOG4CPLUS_TEXT(", leftAlign=") - << (leftAlign ? LOG4CPLUS_TEXT("true") : LOG4CPLUS_TEXT("false")); - loglog.debug(buf.str()); -} - - - - -//////////////////////////////////////////////// -// PatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::PatternConverter::PatternConverter(const FormattingInfo& i) -{ - minLen = i.minLen; - maxLen = i.maxLen; - leftAlign = i.leftAlign; -} - - - -void -log4cplus::pattern::PatternConverter::formatAndAppend - (log4cplus::tostream& output, const InternalLoggingEvent& event) -{ - log4cplus::tstring s = convert(event); - size_t len = s.length(); - - if(len > maxLen) { - output << s.substr(len - maxLen); - } - else if(static_cast(len) < minLen) { - if(leftAlign) { - output << s; - output << log4cplus::tstring(minLen - len, LOG4CPLUS_TEXT(' ')); - } - else { - output << log4cplus::tstring(minLen - len, LOG4CPLUS_TEXT(' ')); - output << s; - } - } - else { - output << s; - } -} - - - -//////////////////////////////////////////////// -// LiteralPatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::LiteralPatternConverter::LiteralPatternConverter - (const log4cplus::tstring& str_) -: PatternConverter(FormattingInfo()), - str(str_) -{ -} - - - -//////////////////////////////////////////////// -// BasicPatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::BasicPatternConverter::BasicPatternConverter - (const FormattingInfo& info, Type type_) -: PatternConverter(info), - llmCache(getLogLevelManager()), - type(type_) -{ -} - - - -log4cplus::tstring -log4cplus::pattern::BasicPatternConverter::convert - (const InternalLoggingEvent& event) -{ - switch(type) { - case LOGLEVEL_CONVERTER: return llmCache.toString(event.getLogLevel()); - case NDC_CONVERTER: return event.getNDC(); - case MESSAGE_CONVERTER: return event.getMessage(); - case NEWLINE_CONVERTER: return LOG4CPLUS_TEXT("\n"); - case BASENAME_CONVERTER: return get_basename(event.getFile()); - case FILE_CONVERTER: return event.getFile(); - case THREAD_CONVERTER: return event.getThread(); - case PROCESS_CONVERTER: return convertIntegerToString(get_process_id ()); - - case LINE_CONVERTER: - { - int line = event.getLine(); - if(line != -1) { - return convertIntegerToString(line); - } - else { - return log4cplus::tstring(); - } - } - - case FULL_LOCATION_CONVERTER: - { - tstring const & filename = event.getFile(); - if(! filename.empty ()) { - return filename - + LOG4CPLUS_TEXT(":") - + convertIntegerToString(event.getLine()); - } - else { - return LOG4CPLUS_TEXT(":"); - } - } - } - - return LOG4CPLUS_TEXT("INTERNAL LOG4CPLUS ERROR"); -} - - - -//////////////////////////////////////////////// -// LoggerPatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::LoggerPatternConverter::LoggerPatternConverter - (const FormattingInfo& info, int precision_) -: PatternConverter(info), - precision(precision_) -{ -} - - - -log4cplus::tstring -log4cplus::pattern::LoggerPatternConverter::convert - (const InternalLoggingEvent& event) -{ - const log4cplus::tstring& name = event.getLoggerName(); - if (precision <= 0) { - return name; - } - else { - size_t len = name.length(); - - // We substract 1 from 'len' when assigning to 'end' to avoid out of - // bounds exception in return r.substring(end+1, len). This can happen - // if precision is 1 and the logger name ends with a dot. - tstring::size_type end = len - 1; - for(int i=precision; i>0; --i) { - end = name.rfind(LOG4CPLUS_TEXT('.'), end - 1); - if(end == tstring::npos) { - return name; - } - } - return name.substr(end + 1); - } -} - - - -//////////////////////////////////////////////// -// DatePatternConverter methods: -//////////////////////////////////////////////// - - -log4cplus::pattern::DatePatternConverter::DatePatternConverter - (const FormattingInfo& info, - const log4cplus::tstring& pattern, - bool use_gmtime_) -: PatternConverter(info), - use_gmtime(use_gmtime_), - format(pattern) -{ -} - - - -log4cplus::tstring -log4cplus::pattern::DatePatternConverter::convert - (const InternalLoggingEvent& event) -{ - return event.getTimestamp().getFormattedTime(format, use_gmtime); -} - - - - -//////////////////////////////////////////////// -// HostnamePatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::HostnamePatternConverter::HostnamePatternConverter ( - const FormattingInfo& info, bool fqdn) - : PatternConverter(info) - , hostname_ (helpers::getHostname (fqdn)) -{ } - - -log4cplus::tstring -log4cplus::pattern::HostnamePatternConverter::convert ( - const InternalLoggingEvent &) -{ - return hostname_; -} - - - -//////////////////////////////////////////////// -// NDCPatternConverter methods: -//////////////////////////////////////////////// - -log4cplus::pattern::NDCPatternConverter::NDCPatternConverter ( - const FormattingInfo& info, int precision_) - : PatternConverter(info) - , precision(precision_) -{ } - - -log4cplus::tstring -log4cplus::pattern::NDCPatternConverter::convert ( - const InternalLoggingEvent& event) -{ - const log4cplus::tstring& text = event.getNDC(); - if (precision <= 0) - return text; - else - { - tstring::size_type p = text.find(LOG4CPLUS_TEXT(' ')); - for (int i = 1; i < precision && p != tstring::npos; ++i) - p = text.find(LOG4CPLUS_TEXT(' '), p + 1); - - return text.substr(0, p); - } -} - - - -//////////////////////////////////////////////// -// PatternParser methods: -//////////////////////////////////////////////// - -log4cplus::pattern::PatternParser::PatternParser( - const log4cplus::tstring& pattern_, unsigned ndcMaxDepth_) - : pattern(pattern_) - , state(LITERAL_STATE) - , pos(0) - , ndcMaxDepth (ndcMaxDepth_) -{ -} - - - -log4cplus::tstring -log4cplus::pattern::PatternParser::extractOption() -{ - if ( (pos < pattern.length()) - && (pattern[pos] == LOG4CPLUS_TEXT('{'))) - { - tstring::size_type end = pattern.find_first_of(LOG4CPLUS_TEXT('}'), pos); - if (end != tstring::npos) { - log4cplus::tstring r = pattern.substr(pos + 1, end - pos - 1); - pos = end + 1; - return r; - } - else { - log4cplus::tostringstream buf; - buf << LOG4CPLUS_TEXT("No matching '}' found in conversion pattern string \"") - << pattern - << LOG4CPLUS_TEXT("\""); - getLogLog().error(buf.str()); - pos = pattern.length(); - } - } - - return LOG4CPLUS_TEXT(""); -} - - -int -log4cplus::pattern::PatternParser::extractPrecisionOption() -{ - log4cplus::tstring opt = extractOption(); - int r = 0; - if(! opt.empty ()) { - r = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(opt).c_str()); - } - return r; -} - - - -PatternConverterList -log4cplus::pattern::PatternParser::parse() -{ - tchar c; - pos = 0; - while(pos < pattern.length()) { - c = pattern[pos++]; - switch (state) { - case LITERAL_STATE : - // In literal state, the last char is always a literal. - if(pos == pattern.length()) { - currentLiteral += c; - continue; - } - if(c == ESCAPE_CHAR) { - // peek at the next char. - switch (pattern[pos]) { - case ESCAPE_CHAR: - currentLiteral += c; - pos++; // move pointer - break; - default: - if(! currentLiteral.empty ()) { - list.push_back - (new LiteralPatternConverter(currentLiteral)); - //getLogLog().debug("Parsed LITERAL converter: \"" - // +currentLiteral+"\"."); - } - currentLiteral.resize(0); - currentLiteral += c; // append % - state = CONVERTER_STATE; - formattingInfo.reset(); - } - } - else { - currentLiteral += c; - } - break; - - case CONVERTER_STATE: - currentLiteral += c; - switch (c) { - case LOG4CPLUS_TEXT('-'): - formattingInfo.leftAlign = true; - break; - case LOG4CPLUS_TEXT('.'): - state = DOT_STATE; - break; - default: - if(c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) { - formattingInfo.minLen = c - LOG4CPLUS_TEXT('0'); - state = MIN_STATE; - } - else { - finalizeConverter(c); - } - } // switch - break; - - case MIN_STATE: - currentLiteral += c; - if (c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) { - formattingInfo.minLen = formattingInfo.minLen * 10 + (c - LOG4CPLUS_TEXT('0')); - } - else if(c == LOG4CPLUS_TEXT('.')) { - state = DOT_STATE; - } - else { - finalizeConverter(c); - } - break; - - case DOT_STATE: - currentLiteral += c; - if(c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) { - formattingInfo.maxLen = c - LOG4CPLUS_TEXT('0'); - state = MAX_STATE; - } - else { - log4cplus::tostringstream buf; - buf << LOG4CPLUS_TEXT("Error occured in position ") - << pos - << LOG4CPLUS_TEXT(".\n Was expecting digit, instead got char \"") - << c - << LOG4CPLUS_TEXT("\"."); - getLogLog().error(buf.str()); - state = LITERAL_STATE; - } - break; - - case MAX_STATE: - currentLiteral += c; - if (c >= LOG4CPLUS_TEXT('0') && c <= LOG4CPLUS_TEXT('9')) - formattingInfo.maxLen = formattingInfo.maxLen * 10 + (c - LOG4CPLUS_TEXT('0')); - else { - finalizeConverter(c); - state = LITERAL_STATE; - } - break; - } // end switch - } // end while - - if(! currentLiteral.empty ()) { - list.push_back(new LiteralPatternConverter(currentLiteral)); - //getLogLog().debug("Parsed LITERAL converter: \""+currentLiteral+"\"."); - } - - return list; -} - - - -void -log4cplus::pattern::PatternParser::finalizeConverter(log4cplus::tchar c) -{ - PatternConverter* pc = 0; - switch (c) { - case LOG4CPLUS_TEXT('b'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::BASENAME_CONVERTER); - //getLogLog().debug("BASENAME converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('c'): - pc = new LoggerPatternConverter(formattingInfo, - extractPrecisionOption()); - getLogLog().debug( LOG4CPLUS_TEXT("LOGGER converter.") ); - formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('d'): - case LOG4CPLUS_TEXT('D'): - { - log4cplus::tstring dOpt = extractOption(); - if(dOpt.empty ()) { - dOpt = LOG4CPLUS_TEXT("%Y-%m-%d %H:%M:%S"); - } - bool use_gmtime = c == LOG4CPLUS_TEXT('d'); - pc = new DatePatternConverter(formattingInfo, dOpt, use_gmtime); - //if(use_gmtime) { - // getLogLog().debug("GMT DATE converter."); - //} - //else { - // getLogLog().debug("LOCAL DATE converter."); - //} - //formattingInfo.dump(getLogLog()); - } - break; - - case LOG4CPLUS_TEXT('F'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::FILE_CONVERTER); - //getLogLog().debug("FILE NAME converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('h'): - case LOG4CPLUS_TEXT('H'): - { - bool fqdn = (c == LOG4CPLUS_TEXT('H')); - pc = new HostnamePatternConverter(formattingInfo, fqdn); - // getLogLog().debug( LOG4CPLUS_TEXT("HOSTNAME converter.") ); - // formattingInfo.dump(getLogLog()); - } - break; - - case LOG4CPLUS_TEXT('i'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::PROCESS_CONVERTER); - //getLogLog().debug("PROCESS_CONVERTER converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('l'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::FULL_LOCATION_CONVERTER); - //getLogLog().debug("FULL LOCATION converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('L'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::LINE_CONVERTER); - //getLogLog().debug("LINE NUMBER converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('m'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::MESSAGE_CONVERTER); - //getLogLog().debug("MESSAGE converter."); - //formattingInfo.dump(getLogLog()); - break; - - // 'M' is METHOD converter in log4j. - // Not implemented. - case LOG4CPLUS_TEXT('M'): - goto not_implemented; - - case LOG4CPLUS_TEXT('n'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::NEWLINE_CONVERTER); - //getLogLog().debug("MESSAGE converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('p'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::LOGLEVEL_CONVERTER); - //getLogLog().debug("LOGLEVEL converter."); - //formattingInfo.dump(getLogLog()); - break; - - // 'r' is RELATIVE time converter in log4j. - // Not implemented. - case LOG4CPLUS_TEXT('r'): - goto not_implemented; - - case LOG4CPLUS_TEXT('t'): - pc = new BasicPatternConverter - (formattingInfo, - BasicPatternConverter::THREAD_CONVERTER); - //getLogLog().debug("THREAD converter."); - //formattingInfo.dump(getLogLog()); - break; - - case LOG4CPLUS_TEXT('x'): - pc = new NDCPatternConverter (formattingInfo, ndcMaxDepth); - //getLogLog().debug("NDC converter."); - break; - - // 'X' is MDC in log4j. - // Not implemented. - case LOG4CPLUS_TEXT('X'): - goto not_implemented; - -not_implemented:; - default: - log4cplus::tostringstream buf; - buf << LOG4CPLUS_TEXT("Unexpected char [") - << c - << LOG4CPLUS_TEXT("] at position ") - << pos - << LOG4CPLUS_TEXT(" in conversion patterrn."); - getLogLog().error(buf.str()); - pc = new LiteralPatternConverter(currentLiteral); - } - - currentLiteral.resize(0); - list.push_back(pc); - state = LITERAL_STATE; - formattingInfo.reset(); -} - - - - - -//////////////////////////////////////////////// -// PatternLayout methods: -//////////////////////////////////////////////// - -PatternLayout::PatternLayout(const log4cplus::tstring& pattern_) -{ - init(pattern_, 0); -} - - -PatternLayout::PatternLayout(const log4cplus::helpers::Properties& properties) -{ - unsigned ndcMaxDepth - = std::atoi (LOG4CPLUS_TSTRING_TO_STRING ( - properties.getProperty ( - LOG4CPLUS_TEXT ("NDCMaxDepth"), - LOG4CPLUS_TEXT ("0"))).c_str ()); - - bool hasPattern = properties.exists( LOG4CPLUS_TEXT("Pattern") ); - bool hasConversionPattern = properties.exists( LOG4CPLUS_TEXT("ConversionPattern") ); - - if(hasPattern) { - getLogLog().warn( LOG4CPLUS_TEXT("PatternLayout- the \"Pattern\" property has been deprecated. Use \"ConversionPattern\" instead.")); - } - - if(hasConversionPattern) { - init(properties.getProperty( LOG4CPLUS_TEXT("ConversionPattern") ), - ndcMaxDepth); - } - else if(hasPattern) { - init(properties.getProperty( LOG4CPLUS_TEXT("Pattern") ), ndcMaxDepth); - } - else { - throw std::runtime_error("ConversionPattern not specified in properties"); - } - -} - - -void -PatternLayout::init(const log4cplus::tstring& pattern_, unsigned ndcMaxDepth) -{ - this->pattern = pattern_; - this->parsedPattern = PatternParser(pattern, ndcMaxDepth).parse(); - - // Let's validate that our parser didn't give us any NULLs. If it did, - // we will convert them to a valid PatternConverter that does nothing so - // at least we don't core. - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); - ++it) - { - if( (*it) == 0 ) { - getLogLog().error(LOG4CPLUS_TEXT("Parsed Pattern created a NULL PatternConverter")); - (*it) = new LiteralPatternConverter( LOG4CPLUS_TEXT("") ); - } - } - if(parsedPattern.empty ()) { - getLogLog().warn(LOG4CPLUS_TEXT("PatternLayout pattern is empty. Using default...")); - parsedPattern.push_back - (new BasicPatternConverter(FormattingInfo(), - BasicPatternConverter::MESSAGE_CONVERTER)); - } -} - - - -PatternLayout::~PatternLayout() -{ - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); - ++it) - { - delete (*it); - } -} - - - -void -PatternLayout::formatAndAppend(log4cplus::tostream& output, - const InternalLoggingEvent& event) -{ - for(PatternConverterList::iterator it=parsedPattern.begin(); - it!=parsedPattern.end(); - ++it) - { - (*it)->formatAndAppend(output, event); - } -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/pointer.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/pointer.cxx deleted file mode 100644 index fe1079fa..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/pointer.cxx +++ /dev/null @@ -1,70 +0,0 @@ -// Module: Log4CPLUS -// File: pointer.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - - -namespace log4cplus { namespace helpers { - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::SharedObject dtor -/////////////////////////////////////////////////////////////////////////////// - -SharedObject::~SharedObject() -{ - assert(count == 0); - LOG4CPLUS_MUTEX_FREE( access_mutex ); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::helpers::SharedObject public methods -/////////////////////////////////////////////////////////////////////////////// - -void -SharedObject::addReference() const -{ - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - assert (count >= 0); - ++count; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - -void -SharedObject::removeReference() const -{ - bool destroy = false; - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ); - assert (count > 0); - if (--count == 0) - destroy = true; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - if (destroy) - delete this; -} - - -} } // namespace log4cplus { namespace helpers diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/property.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/property.cxx deleted file mode 100644 index 1a5755a1..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/property.cxx +++ /dev/null @@ -1,241 +0,0 @@ -// Module: Log4CPLUS -// File: property.cxx -// Created: 2/2002 -// Author: Tad E. Smith -// -// -// Copyright 2002-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#if defined (UNICODE) -# include -#else -# include -#endif -#include -#include - - -namespace log4cplus -{ - - -const tchar helpers::Properties::PROPERTIES_COMMENT_CHAR = LOG4CPLUS_TEXT('#'); - - -namespace -{ - - -static -int -is_space (tchar ch) -{ -#if defined (UNICODE) - return std::iswspace (ch); -#else - return std::isspace (static_cast(ch)); -#endif -} - - -static -void -trim_leading_ws (tstring & str) -{ - tstring::iterator it = str.begin (); - for (; it != str.end (); ++it) - { - if (! is_space (*it)) - break; - } - str.erase (str.begin (), it); -} - - -static -void -trim_trailing_ws (tstring & str) -{ - tstring::reverse_iterator rit = str.rbegin (); - for (; rit != str.rend (); ++rit) - { - if (! is_space (*rit)) - break; - } - str.erase (rit.base (), str.end ()); -} - - -static -void -trim_ws (tstring & str) -{ - trim_trailing_ws (str); - trim_leading_ws (str); -} - - -} // namespace - - - -namespace helpers -{ - -/////////////////////////////////////////////////////////////////////////////// -// Properties ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -Properties::Properties() -{ -} - - - -Properties::Properties(tistream& input) -{ - init(input); -} - - - -Properties::Properties(const tstring& inputFile) -{ - if (inputFile.empty ()) - return; - - tifstream file (LOG4CPLUS_TSTRING_TO_STRING(inputFile).c_str()); - init(file); -} - - - -void -Properties::init(tistream& input) -{ - if (! input) - return; - - tstring buffer; - while (std::getline (input, buffer)) - { - trim_leading_ws (buffer); - - tstring::size_type const buffLen = buffer.size (); - if (buffLen == 0 || buffer[0] == PROPERTIES_COMMENT_CHAR) - continue; - - // Check if we have a trailing \r because we are - // reading a properties file produced on Windows. - if (buffer[buffLen-1] == LOG4CPLUS_TEXT('\r')) - // Remove trailing 'Windows' \r. - buffer.resize (buffLen - 1); - - tstring::size_type const idx = buffer.find('='); - if (idx != tstring::npos) - { - tstring key = buffer.substr(0, idx); - tstring value = buffer.substr(idx + 1); - trim_trailing_ws (key); - trim_ws (value); - setProperty(key, value); - } - } -} - - - -Properties::~Properties() -{ -} - - - -/////////////////////////////////////////////////////////////////////////////// -// Properties public methods -/////////////////////////////////////////////////////////////////////////////// - -tstring -Properties::getProperty(const tstring& key) const -{ - StringMap::const_iterator it (data.find(key)); - if (it == data.end()) - return LOG4CPLUS_TEXT(""); - else - return it->second; -} - - - -tstring -Properties::getProperty(const tstring& key, - const tstring& defaultVal) const -{ - StringMap::const_iterator it (data.find (key)); - if (it == data.end ()) - return defaultVal; - else - return it->second; -} - - -std::vector -Properties::propertyNames() const -{ - std::vector tmp; - for (StringMap::const_iterator it=data.begin(); it!=data.end(); ++it) - tmp.push_back(it->first); - - return tmp; -} - - - -void -Properties::setProperty(const tstring& key, const tstring& value) -{ - data[key] = value; -} - - -bool -Properties::removeProperty(const tstring& key) -{ - return (data.erase(key) > 0); -} - - -Properties -Properties::getPropertySubset( - const tstring& prefix) const -{ - Properties ret; - std::vector const keys = propertyNames(); - size_t const prefix_len = prefix.size (); - for (std::vector::const_iterator it = keys.begin(); - it != keys.end(); ++it) - { - int result = it->compare (0, prefix_len, prefix); - if (result == 0) - ret.setProperty (it->substr (prefix_len), getProperty(*it)); - } - - return ret; -} - -} // namespace helpers - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/rootlogger.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/rootlogger.cxx deleted file mode 100644 index b86d2306..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/rootlogger.cxx +++ /dev/null @@ -1,62 +0,0 @@ -// Module: Log4CPLUS -// File: rootlogger.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - - - -////////////////////////////////////////////////////////////////////////////// -// RootLogger Constructor -////////////////////////////////////////////////////////////////////////////// - -RootLogger::RootLogger(Hierarchy& h, LogLevel ll_) -: LoggerImpl(LOG4CPLUS_TEXT("root"), h) -{ - setLogLevel(ll_); -} - - - -////////////////////////////////////////////////////////////////////////////// -// Logger Methods -////////////////////////////////////////////////////////////////////////////// - -LogLevel -RootLogger::getChainedLogLevel() const -{ - return ll; -} - - -void -RootLogger::setLogLevel(LogLevel ll_) -{ - if(ll_ == NOT_SET_LOG_LEVEL) { - getLogLog().error(LOG4CPLUS_TEXT("You have tried to set NOT_SET_LOG_LEVEL to root.")); - } - else { - LoggerImpl::setLogLevel(ll_); - } -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/sleep.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/sleep.cxx deleted file mode 100644 index 57cf56ca..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/sleep.cxx +++ /dev/null @@ -1,83 +0,0 @@ -// Module: Log4CPLUS -// File: sleep.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include - -#ifdef LOG4CPLUS_HAVE_ERRNO_H -#include -#endif - - -using namespace log4cplus; - - -/////////////////////////////////////////////////////////////////////////////// -// public methods -/////////////////////////////////////////////////////////////////////////////// - -int const MILLIS_TO_NANOS = 1000000; -int const SEC_TO_MILLIS = 1000; - - -void -log4cplus::helpers::sleep(unsigned long secs, unsigned long nanosecs) -{ -#if defined(_WIN32) - DWORD const MAX_SLEEP_SECONDS = 4294966; // (2**32-2)/1000 - - DWORD nano_millis = nanosecs / static_cast(MILLIS_TO_NANOS); - if (secs <= MAX_SLEEP_SECONDS) { - Sleep((secs * SEC_TO_MILLIS) + nano_millis); - return; - } - - DWORD no_of_max_sleeps = secs / MAX_SLEEP_SECONDS; - - for(DWORD i = 0; i < no_of_max_sleeps; i++) { - Sleep(MAX_SLEEP_SECONDS * SEC_TO_MILLIS); - } - - Sleep((secs % MAX_SLEEP_SECONDS) * SEC_TO_MILLIS + nano_millis); -#else - timespec sleep_time = { secs, nanosecs }; - timespec remain; - while (nanosleep(&sleep_time, &remain)) { - if (errno == EINTR) { - sleep_time.tv_sec = remain.tv_sec; - sleep_time.tv_nsec = remain.tv_nsec; - continue; - } - else { - return; - } - } -#endif -} - - -void -log4cplus::helpers::sleepmillis(unsigned long millis) -{ - unsigned long secs = millis / SEC_TO_MILLIS; - unsigned long nanosecs = (millis % SEC_TO_MILLIS) * MILLIS_TO_NANOS; - sleep(secs, nanosecs); -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-unix.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-unix.cxx deleted file mode 100644 index b758d8c6..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-unix.cxx +++ /dev/null @@ -1,338 +0,0 @@ -// Module: Log4CPLUS -// File: socket-unix.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include - -#include - -#ifdef LOG4CPLUS_HAVE_NETINET_IN_H -#include -#endif - -#ifdef LOG4CPLUS_HAVE_SYS_TYPES_H -#include -#endif - -#ifdef LOG4CPLUS_HAVE_SYS_SOCKET_H -#include -#endif - -#include - -#ifdef LOG4CPLUS_HAVE_NETDB_H -#include -#endif - -#include - -#include -#include -#include - - -using namespace log4cplus; -using namespace log4cplus::helpers; - - -namespace -{ - -#if ! defined (LOG4CPLUS_SINGLE_THREADED) -// We need to use log4cplus::thread here to work around compilation -// problem on AIX. -static log4cplus::thread::Mutex ghbn_mutex; - -#endif - - -static -int -get_host_by_name (char const * hostname, std::string * name, - struct sockaddr_in * addr) -{ -#if defined (LOG4CPLUS_HAVE_GETADDRINFO) - struct addrinfo hints; - std::memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = IPPROTO_TCP; - hints.ai_flags = AI_CANONNAME; - - if (inet_addr (hostname) != static_cast(-1)) - hints.ai_flags |= AI_NUMERICHOST; - - struct addrinfo * res = 0; - int ret = getaddrinfo (hostname, 0, &hints, &res); - if (ret != 0) - return ret; - - struct addrinfo const & ai = *res; - assert (ai.ai_family == AF_INET); - - if (name) - *name = ai.ai_canonname; - - if (addr) - std::memcpy (addr, ai.ai_addr, ai.ai_addrlen); - - freeaddrinfo (res); - -#else -# if ! defined (LOG4CPLUS_SINGLE_THREADED) - // We need to use log4cplus::thread here to work around - // compilation problem on AIX. - log4cplus::thread::MutexGuard guard (ghbn_mutex); -# endif - - struct ::hostent * hp = gethostbyname (hostname); - if (! hp) - return 1; - assert (hp->h_addrtype == AF_INET); - - if (name) - *name = hp->h_name; - - if (addr) - { - assert (hp->h_length <= sizeof (addr->sin_addr)); - std::memcpy (&addr->sin_addr, hp->h_addr_list[0], hp->h_length); - } - -#endif - - return 0; -} - - -} // namespace - - -///////////////////////////////////////////////////////////////////////////// -// Global Methods -///////////////////////////////////////////////////////////////////////////// - -SOCKET_TYPE -log4cplus::helpers::openSocket(unsigned short port, SocketState& state) -{ - SOCKET_TYPE sock = ::socket(AF_INET, SOCK_STREAM, 0); - if(sock < 0) { - return INVALID_SOCKET; - } - - struct sockaddr_in server; - server.sin_family = AF_INET; - server.sin_addr.s_addr = INADDR_ANY; - server.sin_port = htons(port); - - int optval = 1; - setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval) ); - - if(bind(sock, (struct sockaddr*)&server, sizeof(server)) < 0) { - return INVALID_SOCKET; - } - - if(::listen(sock, 10)) { - return INVALID_SOCKET; - } - - state = ok; - return sock; -} - - -SOCKET_TYPE -log4cplus::helpers::connectSocket(const log4cplus::tstring& hostn, - unsigned short port, SocketState& state) -{ - struct sockaddr_in server; - SOCKET_TYPE sock; - int retval; - - std::memset (&server, 0, sizeof (server)); - retval = get_host_by_name (LOG4CPLUS_TSTRING_TO_STRING(hostn).c_str(), - 0, &server); - if (retval != 0) - return INVALID_SOCKET; - - server.sin_port = htons(port); - server.sin_family = AF_INET; - - sock = ::socket(AF_INET, SOCK_STREAM, 0); - if(sock < 0) { - return INVALID_SOCKET; - } - - while ((retval = ::connect(sock, - reinterpret_cast(&server), sizeof (server))) == -1 - && (errno == EINTR)) - ; - if(retval == INVALID_SOCKET) { - ::close(sock); - return INVALID_SOCKET; - } - - state = ok; - return sock; -} - - -namespace -{ - -//! Helper for accept_wrap(). -template -struct socklen_var -{ - typedef T type; -}; - - -template -struct socklen_var -{ - typedef U type; -}; - - -// Some systems like HP-UX have socklen_t but accept() does not use it -// as type of its 3rd parameter. This wrapper works around this -// incompatibility. -template -static -SOCKET_TYPE -accept_wrap ( - int (* accept_func) (int, accept_sockaddr_ptr_type, accept_socklen_type *), - SOCKET_TYPE sock, struct sockaddr * sa, socklen_t * len) -{ - typedef typename socklen_var::type - socklen_var_type; - socklen_var_type l = static_cast(*len); - SOCKET_TYPE result - = static_cast( - accept_func (sock, sa, - reinterpret_cast(&l))); - *len = static_cast(l); - return result; -} - - -} // namespace - - -SOCKET_TYPE -log4cplus::helpers::acceptSocket(SOCKET_TYPE sock, SocketState& state) -{ - struct sockaddr_in net_client; - socklen_t len = sizeof(struct sockaddr); - SOCKET_TYPE clientSock; - - while( (clientSock = accept_wrap (accept, sock, - (struct sockaddr*)&net_client, &len)) == -1 - && (errno == EINTR)) - ; - - if(clientSock != INVALID_SOCKET) { - state = ok; - } - - return clientSock; -} - - - -int -log4cplus::helpers::closeSocket(SOCKET_TYPE sock) -{ - return ::close(sock); -} - - - -long -log4cplus::helpers::read(SOCKET_TYPE sock, SocketBuffer& buffer) -{ - long read = 0; - - do - { - long res = ::read(sock, buffer.getBuffer() + read, - buffer.getMaxSize() - read); - if( res <= 0 ) { - return res; - } - read += res; - } while( read < static_cast(buffer.getMaxSize()) ); - - return read; -} - - - -long -log4cplus::helpers::write(SOCKET_TYPE sock, const SocketBuffer& buffer) -{ -#if defined(MSG_NOSIGNAL) - int flags = MSG_NOSIGNAL; -#else - int flags = 0; -#endif - return ::send( sock, buffer.getBuffer(), buffer.getSize(), flags ); -} - - -tstring -log4cplus::helpers::getHostname (bool fqdn) -{ - char const * hostname = "unknown"; - int ret; - std::vector hn (1024, 0); - - while (true) - { - ret = ::gethostname (&hn[0], static_cast(hn.size ()) - 1); - if (ret == 0) - { - hostname = &hn[0]; - break; - } -#if defined (LOG4CPLUS_HAVE_ENAMETOOLONG) - else if (ret != 0 && errno == ENAMETOOLONG) - // Out buffer was too short. Retry with buffer twice the size. - hn.resize (hn.size () * 2, 0); -#endif - else - break; - } - - if (ret != 0 || (ret == 0 && ! fqdn)) - return LOG4CPLUS_STRING_TO_TSTRING (hostname); - - std::string full_hostname; - ret = get_host_by_name (hostname, &full_hostname, 0); - if (ret == 0) - hostname = full_hostname.c_str (); - - return LOG4CPLUS_STRING_TO_TSTRING (hostname); -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-win32.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-win32.cxx deleted file mode 100644 index 71261d58..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket-win32.cxx +++ /dev/null @@ -1,293 +0,0 @@ -// Module: Log4CPLUS -// File: socket-win32.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - - -using namespace log4cplus; -using namespace log4cplus::helpers; - - -///////////////////////////////////////////////////////////////////////////// -// file LOCAL Classes -///////////////////////////////////////////////////////////////////////////// - -namespace -{ - -enum WSInitStates -{ - WS_UNINITIALIZED, - WS_INITIALIZING, - WS_INITIALIZED -}; - - -static WSADATA wsa; -static LONG volatile winsock_state = WS_UNINITIALIZED; - - -static -void -init_winsock () -{ - // Quick check first to avoid the expensive interlocked compare - // and exchange. - if (winsock_state == WS_INITIALIZED) - return; - - // Try to change the state to WS_INITIALIZING. - LONG val = ::InterlockedCompareExchange ( - const_cast(&winsock_state), WS_INITIALIZING, WS_UNINITIALIZED); - switch (val) - { - case WS_UNINITIALIZED: - { - int ret = WSAStartup (MAKEWORD (2, 2), &wsa); - if (ret != 0) - { - // Revert the state back to WS_UNINITIALIZED to unblock other - // threads and let them throw exception. - val = ::InterlockedCompareExchange ( - const_cast(&winsock_state), WS_UNINITIALIZED, - WS_INITIALIZING); - assert (val == WS_INITIALIZING); - throw std::runtime_error ("Could not initialize WinSock."); - } - - // WinSock is initialized, change the state to WS_INITIALIZED. - val = ::InterlockedCompareExchange ( - const_cast(&winsock_state), WS_INITIALIZED, - WS_INITIALIZING); - assert (val == WS_INITIALIZING); - return; - } - - case WS_INITIALIZING: - // Wait for state change. - while (true) - { - switch (winsock_state) - { - case WS_INITIALIZED: - return; - - case WS_INITIALIZING: - ::Sleep (0); - continue; - - default: - assert (0); - throw std::runtime_error ("Unknown WinSock state."); - } - } - - case WS_INITIALIZED: - // WinSock is already initialized. - return; - - default: - assert (0); - throw std::runtime_error ("Unknown WinSock state."); - } -} - - -struct WinSockInitializer -{ - ~WinSockInitializer () - { - if (winsock_state == WS_INITIALIZED) - WSACleanup (); - } - - static WinSockInitializer winSockInitializer; -}; - - -WinSockInitializer WinSockInitializer::winSockInitializer; - - -} // namespace - - - -///////////////////////////////////////////////////////////////////////////// -// Global Methods -///////////////////////////////////////////////////////////////////////////// - -SOCKET_TYPE -log4cplus::helpers::openSocket(unsigned short port, SocketState& state) -{ - init_winsock (); - - SOCKET sock = ::socket(AF_INET, SOCK_STREAM, 0); - if(sock == INVALID_SOCKET) { - return sock; - } - - struct sockaddr_in server; - server.sin_family = AF_INET; - server.sin_addr.s_addr = htonl(INADDR_ANY); - server.sin_port = htons(port); - - if(bind(sock, (struct sockaddr*)&server, sizeof(server)) != 0) { - return INVALID_SOCKET; - } - - if(::listen(sock, 10) != 0) { - return INVALID_SOCKET; - } - - state = ok; - return sock; -} - - -SOCKET_TYPE -log4cplus::helpers::connectSocket(const log4cplus::tstring& hostn, - unsigned short port, SocketState& state) -{ - init_winsock (); - - SOCKET sock = ::socket(AF_INET, SOCK_STREAM, 0); - if(sock == INVALID_SOCKET) { - return INVALID_SOCKET; - } - - unsigned long ip = INADDR_NONE; - struct hostent *hp = ::gethostbyname( LOG4CPLUS_TSTRING_TO_STRING(hostn).c_str() ); - if(hp == 0 || hp->h_addrtype != AF_INET) { - ip = inet_addr( LOG4CPLUS_TSTRING_TO_STRING(hostn).c_str() ); - if(ip == INADDR_NONE) { - state = bad_address; - return INVALID_SOCKET; - } - } - - struct sockaddr_in insock; - insock.sin_port = htons(port); - insock.sin_family = AF_INET; - if(hp != 0) { - memcpy(&insock.sin_addr, hp->h_addr, sizeof insock.sin_addr); - } - else { - insock.sin_addr.S_un.S_addr = ip; - } - - int retval; - while( (retval = ::connect(sock, (struct sockaddr*)&insock, sizeof(insock))) == -1 - && (WSAGetLastError() == WSAEINTR)) - ; - if(retval == SOCKET_ERROR) { - ::closesocket(sock); - return INVALID_SOCKET; - } - - int enabled = 1; - if(setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char*)&enabled, sizeof(enabled)) != 0) { - ::closesocket(sock); - return INVALID_SOCKET; - } - - state = ok; - return sock; -} - - -SOCKET_TYPE -log4cplus::helpers::acceptSocket(SOCKET_TYPE sock, SocketState& /*state*/) -{ - init_winsock (); - - return ::accept(sock, NULL, NULL); -} - - - -int -log4cplus::helpers::closeSocket(SOCKET_TYPE sock) -{ - return ::closesocket(sock); -} - - - -long -log4cplus::helpers::read(SOCKET_TYPE sock, SocketBuffer& buffer) -{ - long read = 0; - - do - { - long res = ::recv(sock, buffer.getBuffer() + read, - static_cast(buffer.getMaxSize() - read), 0); - if( res <= 0 ) { - return res; - } - read += res; - } while( read < static_cast(buffer.getMaxSize()) ); - - return read; -} - - - -long -log4cplus::helpers::write(SOCKET_TYPE sock, const SocketBuffer& buffer) -{ - return ::send(sock, buffer.getBuffer(), static_cast(buffer.getSize()), 0); -} - - -tstring -log4cplus::helpers::getHostname (bool fqdn) -{ - char const * hostname = "unknown"; - int ret; - std::vector hn (1024, 0); - - while (true) - { - ret = ::gethostname (&hn[0], static_cast(hn.size ()) - 1); - if (ret == 0) - { - hostname = &hn[0]; - break; - } - else if (ret != 0 && WSAGetLastError () == WSAEFAULT) - // Out buffer was too short. Retry with buffer twice the size. - hn.resize (hn.size () * 2, 0); - else - break; - } - - if (ret != 0 || (ret == 0 && ! fqdn)) - return LOG4CPLUS_STRING_TO_TSTRING (hostname); - - struct ::hostent * hp = ::gethostbyname (hostname); - if (hp) - hostname = hp->h_name; - - return LOG4CPLUS_STRING_TO_TSTRING (hostname); -} diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket.cxx deleted file mode 100644 index f58a6525..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socket.cxx +++ /dev/null @@ -1,226 +0,0 @@ -// Module: Log4CPLUS -// File: socket-win32.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include - - -using namespace log4cplus; -using namespace log4cplus::helpers; - -#if !defined(_WIN32) -# include -# include -# define GET_LAST_ERROR errno -#else -# define GET_LAST_ERROR WSAGetLastError() -#endif - - - -////////////////////////////////////////////////////////////////////////////// -// AbstractSocket ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -log4cplus::helpers::AbstractSocket::AbstractSocket() -: sock(INVALID_SOCKET), - state(not_opened), - err(0) -{ -} - - - -log4cplus::helpers::AbstractSocket::AbstractSocket(SOCKET_TYPE sock_, SocketState state_, int err_) -: sock(sock_), - state(state_), - err(err_) -{ -} - - - -log4cplus::helpers::AbstractSocket::AbstractSocket(const log4cplus::helpers::AbstractSocket& rhs) -{ - copy(rhs); -} - - -log4cplus::helpers::AbstractSocket::~AbstractSocket() -{ - close(); -} - - - -////////////////////////////////////////////////////////////////////////////// -// AbstractSocket methods -////////////////////////////////////////////////////////////////////////////// - -void -log4cplus::helpers::AbstractSocket::close() -{ - if(sock != INVALID_SOCKET) { - closeSocket(sock); - sock = INVALID_SOCKET; - } -} - - - -bool -log4cplus::helpers::AbstractSocket::isOpen() const -{ - return sock != INVALID_SOCKET; -} - - - - -log4cplus::helpers::AbstractSocket& -log4cplus::helpers::AbstractSocket::operator=(const log4cplus::helpers::AbstractSocket& rhs) -{ - if(&rhs != this) { - close(); - copy(rhs); - } - - return *this; -} - - - -void -log4cplus::helpers::AbstractSocket::copy(const log4cplus::helpers::AbstractSocket& r) -{ - AbstractSocket& rhs = const_cast(r); - sock = rhs.sock; - state = rhs.state; - err = rhs.err; - rhs.sock = INVALID_SOCKET; - rhs.state = not_opened; - rhs.err = 0; -} - - - -////////////////////////////////////////////////////////////////////////////// -// Socket ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -log4cplus::helpers::Socket::Socket() -: AbstractSocket() -{ -} - - - -log4cplus::helpers::Socket::Socket(const tstring& address, int port) -: AbstractSocket() -{ - sock = connectSocket(address, port, state); - if(sock == INVALID_SOCKET) { - err = GET_LAST_ERROR; - } -} - - -log4cplus::helpers::Socket::Socket(SOCKET_TYPE sock_, SocketState state_, int err_) -: AbstractSocket(sock_, state_, err_) -{ -} - - - -log4cplus::helpers::Socket::~Socket() -{ -} - - - - - -////////////////////////////////////////////////////////////////////////////// -// Socket methods -////////////////////////////////////////////////////////////////////////////// - -bool -log4cplus::helpers::Socket::read(SocketBuffer& buffer) -{ - long retval = log4cplus::helpers::read(sock, buffer); - if(retval <= 0) { - close(); - } - else { - buffer.setSize(retval); - } - - return (retval > 0); -} - - - -bool -log4cplus::helpers::Socket::write(const SocketBuffer& buffer) -{ - long retval = log4cplus::helpers::write(sock, buffer); - if(retval <= 0) { - close(); - } - - return (retval > 0); -} - - - - -////////////////////////////////////////////////////////////////////////////// -// ServerSocket ctor and dtor -////////////////////////////////////////////////////////////////////////////// - -log4cplus::helpers::ServerSocket::ServerSocket(int port) -{ - sock = openSocket(port, state); - if(sock == INVALID_SOCKET) { - err = GET_LAST_ERROR; - } -} - - - -log4cplus::helpers::ServerSocket::~ServerSocket() -{ -} - - - -////////////////////////////////////////////////////////////////////////////// -// ServerSocket methods -////////////////////////////////////////////////////////////////////////////// - -log4cplus::helpers::Socket -log4cplus::helpers::ServerSocket::accept() -{ - SocketState state_; - SOCKET_TYPE clientSock = acceptSocket(sock, state_); - return Socket(clientSock, state_, 0); -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketappender.cxx deleted file mode 100644 index fcd5c498..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketappender.cxx +++ /dev/null @@ -1,326 +0,0 @@ -// Module: Log4CPLUS -// File: socketappender.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include -#include -#include - - -int const LOG4CPLUS_MESSAGE_VERSION = 2; - - -namespace log4cplus -{ - -#if ! defined (LOG4CPLUS_SINGLE_THREADED) -SocketAppender::ConnectorThread::ConnectorThread ( - SocketAppender & socket_appender) - : sa (socket_appender) - , exit_flag (false) -{ } - - -SocketAppender::ConnectorThread::~ConnectorThread () -{ } - - -void -SocketAppender::ConnectorThread::run () -{ - while (true) - { - trigger_ev.timed_wait (30 * 1000); - - getLogLog().debug ( - LOG4CPLUS_TEXT("SocketAppender::ConnectorThread::run()") - LOG4CPLUS_TEXT("- running...")); - - // Check exit condition as the very first thing. - - { - thread::Guard guard (access_mutex); - if (exit_flag) - return; - trigger_ev.reset (); - } - - // Do not try to re-open already open socket. - - { - thread::Guard guard (sa.access_mutex); - if (sa.socket.isOpen ()) - continue; - } - - // The socket is not open, try to reconnect. - - helpers::Socket socket (sa.host, sa.port); - if (! socket.isOpen ()) - { - getLogLog().error( - LOG4CPLUS_TEXT("SocketAppender::ConnectorThread::run()") - LOG4CPLUS_TEXT("- Cannot connect to server")); - - // Sleep for a short while after unsuccessful connection attempt - // so that we do not try to reconnect after each logging attempt - // which could be many times per second. - helpers::sleep (5); - - continue; - } - - // Connection was successful, move the socket into SocketAppender. - - { - thread::Guard guard (sa.access_mutex); - sa.socket = socket; - sa.connected = true; - } - } -} - - -void -SocketAppender::ConnectorThread::terminate () -{ - { - thread::Guard guard (access_mutex); - exit_flag = true; - trigger_ev.signal (); - } - join (); -} - - -void -SocketAppender::ConnectorThread::trigger () -{ - trigger_ev.signal (); -} - -#endif - - -////////////////////////////////////////////////////////////////////////////// -// SocketAppender ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -SocketAppender::SocketAppender(const tstring& host_, int port_, - const tstring& serverName_) -: host(host_), - port(port_), - serverName(serverName_) -{ - openSocket(); - initConnector (); -} - - - -SocketAppender::SocketAppender(const helpers::Properties & properties) - : Appender(properties), - port(9998) -{ - host = properties.getProperty( LOG4CPLUS_TEXT("host") ); - if(properties.exists( LOG4CPLUS_TEXT("port") )) { - tstring tmp = properties.getProperty( LOG4CPLUS_TEXT("port") ); - port = std::atoi(LOG4CPLUS_TSTRING_TO_STRING(tmp).c_str()); - } - serverName = properties.getProperty( LOG4CPLUS_TEXT("ServerName") ); - - openSocket(); - initConnector (); -} - - - -SocketAppender::~SocketAppender() -{ -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - connector->terminate (); -#endif - - destructorImpl(); -} - - - -////////////////////////////////////////////////////////////////////////////// -// SocketAppender public methods -////////////////////////////////////////////////////////////////////////////// - -void -SocketAppender::close() -{ - getLogLog().debug(LOG4CPLUS_TEXT("Entering SocketAppender::close()...")); - -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - connector->terminate (); -#endif - - socket.close(); - closed = true; -} - - - -////////////////////////////////////////////////////////////////////////////// -// SocketAppender protected methods -////////////////////////////////////////////////////////////////////////////// - -void -SocketAppender::openSocket() -{ - if(!socket.isOpen()) { - socket = helpers::Socket(host, port); - } -} - - -void -SocketAppender::initConnector () -{ -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - connected = true; - connector = new ConnectorThread (*this); - connector->start (); -#endif -} - - -void -SocketAppender::append(const spi::InternalLoggingEvent& event) -{ -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - if (! connected) - { - connector->trigger (); - return; - } - -#else - if(!socket.isOpen()) { - openSocket(); - if(!socket.isOpen()) { - getLogLog().error(LOG4CPLUS_TEXT("SocketAppender::append()- Cannot connect to server")); - return; - } - } - -#endif - - helpers::SocketBuffer buffer = helpers::convertToBuffer(event, serverName); - helpers::SocketBuffer msgBuffer(LOG4CPLUS_MAX_MESSAGE_SIZE); - - msgBuffer.appendSize_t(buffer.getSize()); - msgBuffer.appendBuffer(buffer); - - bool ret = socket.write(msgBuffer); - if (! ret) - { -#if ! defined (LOG4CPLUS_SINGLE_THREADED) - connected = false; - connector->trigger (); -#endif - } -} - - -///////////////////////////////////////////////////////////////////////////// -// namespace helpers methods -///////////////////////////////////////////////////////////////////////////// - -namespace helpers -{ - -SocketBuffer -convertToBuffer(const spi::InternalLoggingEvent& event, - const tstring& serverName) -{ - SocketBuffer buffer(LOG4CPLUS_MAX_MESSAGE_SIZE - sizeof(unsigned int)); - - buffer.appendByte(LOG4CPLUS_MESSAGE_VERSION); -#ifndef UNICODE - buffer.appendByte(1); -#else - buffer.appendByte(2); -#endif - - buffer.appendString(serverName); - buffer.appendString(event.getLoggerName()); - buffer.appendInt(event.getLogLevel()); - buffer.appendString(event.getNDC()); - buffer.appendString(event.getMessage()); - buffer.appendString(event.getThread()); - buffer.appendInt( static_cast(event.getTimestamp().sec()) ); - buffer.appendInt( static_cast(event.getTimestamp().usec()) ); - buffer.appendString(event.getFile()); - buffer.appendInt(event.getLine()); - - return buffer; -} - - -spi::InternalLoggingEvent -readFromBuffer(SocketBuffer& buffer) -{ - unsigned char msgVersion = buffer.readByte(); - if(msgVersion != LOG4CPLUS_MESSAGE_VERSION) { - SharedObjectPtr loglog = LogLog::getLogLog(); - loglog->warn(LOG4CPLUS_TEXT("readFromBuffer() received socket message with an invalid version")); - } - - unsigned char sizeOfChar = buffer.readByte(); - - tstring serverName = buffer.readString(sizeOfChar); - tstring loggerName = buffer.readString(sizeOfChar); - LogLevel ll = buffer.readInt(); - tstring ndc = buffer.readString(sizeOfChar); - if(! serverName.empty ()) { - if(ndc.empty ()) { - ndc = serverName; - } - else { - ndc = serverName + LOG4CPLUS_TEXT(" - ") + ndc; - } - } - tstring message = buffer.readString(sizeOfChar); - tstring thread = buffer.readString(sizeOfChar); - long sec = buffer.readInt(); - long usec = buffer.readInt(); - tstring file = buffer.readString(sizeOfChar); - int line = buffer.readInt(); - - return spi::InternalLoggingEvent(loggerName, - ll, - ndc, - message, - thread, - Time(sec, usec), - file, - line); -} - -} // namespace helpers - -} // namespace log4cplus diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketbuffer.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketbuffer.cxx deleted file mode 100644 index 6716ae6c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/socketbuffer.cxx +++ /dev/null @@ -1,345 +0,0 @@ -// Module: Log4CPLUS -// File: socketbuffer.cxx -// Created: 5/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - -#if !defined(_WIN32) -# include -#else -#include -#endif - -#if defined (__CYGWIN__) || defined (LOG4CPLUS_HAVE_NETINET_IN_H) -#include -#endif - -using namespace log4cplus; -using namespace log4cplus::helpers; - - -////////////////////////////////////////////////////////////////////////////// -// SocketBuffer ctors and dtor -////////////////////////////////////////////////////////////////////////////// - -log4cplus::helpers::SocketBuffer::SocketBuffer(size_t maxsize_) -: maxsize(maxsize_), - size(0), - pos(0), - buffer(new char[maxsize_]) -{ -} - - - -log4cplus::helpers::SocketBuffer::SocketBuffer(const SocketBuffer& rhs) - : log4cplus::helpers::LogLogUser () -{ - copy(rhs); -} - - - -log4cplus::helpers::SocketBuffer::~SocketBuffer() -{ - delete [] buffer; -} - - - -SocketBuffer& -log4cplus::helpers::SocketBuffer::operator=(const SocketBuffer& rhs) -{ - if(&rhs != this) { - delete buffer; - copy(rhs); - } - - return *this; -} - - - -void -log4cplus::helpers::SocketBuffer::copy(const SocketBuffer& r) -{ - SocketBuffer& rhs = const_cast(r); - maxsize = rhs.maxsize; - size = rhs.size; - pos = rhs.pos; - buffer = rhs.buffer; - - rhs.maxsize = 0; - rhs.size = 0; - rhs.pos = 0; - rhs.buffer = 0; -} - - - - -////////////////////////////////////////////////////////////////////////////// -// SocketBuffer methods -////////////////////////////////////////////////////////////////////////////// - -unsigned char -log4cplus::helpers::SocketBuffer::readByte() -{ - if(pos >= maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readByte()- end of buffer reached")); - return 0; - } - else if((pos + sizeof(unsigned char)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readByte()- Attempt to read beyond end of buffer")); - return 0; - } - - unsigned char ret = *((unsigned char*)&buffer[pos]); - pos += sizeof(unsigned char); - - return ret; -} - - - -unsigned short -log4cplus::helpers::SocketBuffer::readShort() -{ - if(pos >= maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readShort()- end of buffer reached")); - return 0; - } - else if((pos + sizeof(unsigned short)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readShort()- Attempt to read beyond end of buffer")); - return 0; - } - - unsigned short ret; - std::memcpy(&ret, buffer + pos, sizeof(ret)); - ret = ntohs(ret); - pos += sizeof(unsigned short); - - return ret; -} - - - -unsigned int -log4cplus::helpers::SocketBuffer::readInt() -{ - if(pos >= maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readInt()- end of buffer reached")); - return 0; - } - else if((pos + sizeof(unsigned int)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readInt()- Attempt to read beyond end of buffer")); - return 0; - } - - unsigned int ret; - std::memcpy (&ret, buffer + pos, sizeof(ret)); - ret = ntohl(ret); - pos += sizeof(unsigned int); - - return ret; -} - - -tstring -log4cplus::helpers::SocketBuffer::readString(unsigned char sizeOfChar) -{ - size_t strlen = readInt(); - size_t bufferLen = strlen * sizeOfChar; - - if(strlen == 0) { - return tstring(); - } - if(pos > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readString()- end of buffer reached")); - return tstring(); - } - - if((pos + bufferLen) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readString()- Attempt to read beyond end of buffer")); - bufferLen = (maxsize - 1) - pos; - strlen = bufferLen / sizeOfChar; - } - -#ifndef UNICODE - if(sizeOfChar == 1) { - tstring ret(&buffer[pos], strlen); - pos += strlen; - return ret; - } - else if(sizeOfChar == 2) { - tstring ret; - for(tstring::size_type i=0; i(tmp < 256 ? tmp : ' '); - } - return ret; - } - else { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readString()- Invalid sizeOfChar!!!!")); - } - -#else /* UNICODE */ - if(sizeOfChar == 1) { - std::string ret(&buffer[pos], strlen); - pos += strlen; - return towstring(ret); - } - else if(sizeOfChar == 2) { - tstring ret; - for(tstring::size_type i=0; i(readShort()); - } - return ret; - } - else { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::readString()- Invalid sizeOfChar!!!!")); - } -#endif - - return tstring(); -} - - - -void -log4cplus::helpers::SocketBuffer::appendByte(unsigned char val) -{ - if((pos + sizeof(unsigned char)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendByte()- Attempt to write beyond end of buffer")); - return; - } - - *((unsigned char*)&buffer[pos]) = val; - pos += sizeof(unsigned char); - size = pos; -} - - - -void -log4cplus::helpers::SocketBuffer::appendShort(unsigned short val) -{ - if((pos + sizeof(unsigned short)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendShort()- Attempt to write beyond end of buffer")); - return; - } - - unsigned short s = htons(val); - std::memcpy(buffer + pos, &s, sizeof (s)); - pos += sizeof(s); - size = pos; -} - - - -void -log4cplus::helpers::SocketBuffer::appendInt(unsigned int val) -{ - if((pos + sizeof(unsigned int)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendInt()- Attempt to write beyond end of buffer")); - return; - } - - int i = htonl(val); - std::memcpy(buffer + pos, &i, sizeof (i)); - pos += sizeof(i); - size = pos; -} - - - -void -log4cplus::helpers::SocketBuffer::appendSize_t(size_t val) -{ - if ((pos + sizeof(unsigned)) > maxsize) - { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendInt(size_t)- ") - LOG4CPLUS_TEXT("Attempt to write beyond end of buffer")); - return; - } - if (val > (std::numeric_limits::max) ()) - { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendInt(size_t)-") - LOG4CPLUS_TEXT(" Attempt to write value greater than") - LOG4CPLUS_TEXT(" std::numeric_limits::max")); - return; - } - - unsigned st = htonl(static_cast(val)); - std::memcpy(buffer + pos, &st, sizeof(st)); - pos += sizeof(st); - size = pos; -} - - -void -log4cplus::helpers::SocketBuffer::appendString(const tstring& str) -{ -#ifndef UNICODE - size_t strlen = str.length(); - - if((pos + sizeof(unsigned int) + strlen) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendString()- Attempt to write beyond end of buffer")); - return; - } - - appendInt(static_cast(strlen)); - std::memcpy(&buffer[pos], str.data(), strlen); - pos += strlen; - size = pos; -#else - size_t strlen = str.length(); - - if((pos + sizeof(unsigned int) + (strlen * 2)) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendString()- Attempt to write beyond end of buffer")); - return; - } - - appendInt(static_cast(strlen)); - for(tstring::size_type i=0; i(str[i])); - } -#endif -} - - - -void -log4cplus::helpers::SocketBuffer::appendBuffer(const SocketBuffer& buf) -{ - if((pos + buf.getSize()) > maxsize) { - getLogLog().error(LOG4CPLUS_TEXT("SocketBuffer::appendBuffer()- Attempt to write beyond end of buffer")); - return; - } - - std::memcpy(&buffer[pos], buf.buffer, buf.getSize()); - pos += buf.getSize(); - size = pos; -} - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/stringhelper.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/stringhelper.cxx deleted file mode 100644 index 20e60816..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/stringhelper.cxx +++ /dev/null @@ -1,407 +0,0 @@ -// Module: Log4CPLUS -// File: stringhelper.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#ifdef UNICODE -# include -# include -#endif - -using namespace log4cplus; - -#if defined (LOG4CPLUS_SINGLE_THREADED) - -namespace log4cplus -{ - -tostringstream _macros_oss; - -namespace -{ - -static tostringstream const _macros_oss_defaults; -static tstring const _empty_str; - -} // namespace - -void _clear_tostringstream (tostringstream & os) -{ - os.clear (); - os.str (_empty_str); - os.setf (_macros_oss_defaults.flags ()); - os.fill (_macros_oss_defaults.fill ()); - os.precision (_macros_oss_defaults.precision ()); - os.width (_macros_oss_defaults.width ()); -#if defined (LOG4CPLUS_WORKING_LOCALE) - std::locale glocale = std::locale (); - if (os.getloc () != glocale) - os.imbue (glocale); -#endif // defined (LOG4CPLUS_WORKING_LOCALE) -} - -} // namespace log4cplus - -#endif - - -////////////////////////////////////////////////////////////////////////////// -// Global Methods -////////////////////////////////////////////////////////////////////////////// - -#ifdef UNICODE -log4cplus::tostream& -operator <<(log4cplus::tostream& stream, const char* str) -{ - return (stream << log4cplus::helpers::towstring(str)); -} - - -#ifdef LOG4CPLUS_WORKING_LOCALE - -static -void -clear_mbstate (std::mbstate_t & mbs) -{ - // Initialize/clear mbstate_t type. - // XXX: This is just a hack that works. The shape of mbstate_t varies - // from single unsigned to char[128]. Without some sort of initialization - // the codecvt::in/out methods randomly fail because the initial state is - // random/invalid. - ::memset (&mbs, 0, sizeof (std::mbstate_t)); -} - - -static -void -towstring_internal (std::wstring & outstr, const char * src, size_t size, - std::locale const & loc) -{ - if (size == 0) - { - outstr.clear (); - return; - } - - typedef std::codecvt CodeCvt; - const CodeCvt & cdcvt = std::use_facet(loc); - std::mbstate_t state; - clear_mbstate (state); - - char const * from_first = src; - size_t const from_size = size; - char const * const from_last = from_first + from_size; - char const * from_next = from_first; - - std::vector dest (from_size); - - wchar_t * to_first = &dest.front (); - size_t to_size = dest.size (); - wchar_t * to_last = to_first + to_size; - wchar_t * to_next = to_first; - - CodeCvt::result result; - size_t converted = 0; - while (true) - { - result = cdcvt.in ( - state, from_first, from_last, - from_next, to_first, to_last, - to_next); - // XXX: Even if only half of the input has been converted the - // in() method returns CodeCvt::ok. I think it should return - // CodeCvt::partial. - if ((result == CodeCvt::partial || result == CodeCvt::ok) - && from_next != from_last) - { - to_size = dest.size () * 2; - dest.resize (to_size); - converted = to_next - to_first; - to_first = &dest.front (); - to_last = to_first + to_size; - to_next = to_first + converted; - continue; - } - else if (result == CodeCvt::ok && from_next == from_last) - break; - else if (result == CodeCvt::error - && to_next != to_last && from_next != from_last) - { - clear_mbstate (state); - ++from_next; - from_first = from_next; - *to_next = L'?'; - ++to_next; - to_first = to_next; - } - else - break; - } - converted = to_next - &dest[0]; - - outstr.assign (dest.begin (), dest.begin () + converted); -} - - -std::wstring -log4cplus::helpers::towstring(const std::string& src, std::locale const & loc) -{ - std::wstring ret; - towstring_internal (ret, src.c_str (), src.size (), loc); - return ret; -} - - -std::wstring -log4cplus::helpers::towstring(char const * src, std::locale const & loc) -{ - std::wstring ret; - towstring_internal (ret, src, std::strlen (src), loc); - return ret; -} - - -static -void -tostring_internal (std::string & outstr, const wchar_t * src, size_t size, - std::locale const & loc) -{ - if (size == 0) - { - outstr.clear (); - return; - } - - typedef std::codecvt CodeCvt; - const CodeCvt & cdcvt = std::use_facet(loc); - std::mbstate_t state; - clear_mbstate (state); - - wchar_t const * from_first = src; - size_t const from_size = size; - wchar_t const * const from_last = from_first + from_size; - wchar_t const * from_next = from_first; - - std::vector dest (from_size); - - char * to_first = &dest.front (); - size_t to_size = dest.size (); - char * to_last = to_first + to_size; - char * to_next = to_first; - - CodeCvt::result result; - size_t converted = 0; - while (from_next != from_last) - { - result = cdcvt.out ( - state, from_first, from_last, - from_next, to_first, to_last, - to_next); - // XXX: Even if only half of the input has been converted the - // in() method returns CodeCvt::ok with VC8. I think it should - // return CodeCvt::partial. - if ((result == CodeCvt::partial || result == CodeCvt::ok) - && from_next != from_last) - { - to_size = dest.size () * 2; - dest.resize (to_size); - converted = to_next - to_first; - to_first = &dest.front (); - to_last = to_first + to_size; - to_next = to_first + converted; - } - else if (result == CodeCvt::ok && from_next == from_last) - break; - else if (result == CodeCvt::error - && to_next != to_last && from_next != from_last) - { - clear_mbstate (state); - ++from_next; - from_first = from_next; - *to_next = '?'; - ++to_next; - to_first = to_next; - } - else - break; - } - converted = to_next - &dest[0]; - - outstr.assign (dest.begin (), dest.begin () + converted); -} - - -std::string -log4cplus::helpers::tostring(const std::wstring& src, std::locale const & loc) -{ - std::string ret; - tostring_internal (ret, src.c_str (), src.size (), loc); - return ret; -} - - -std::string -log4cplus::helpers::tostring(wchar_t const * src, std::locale const & loc) -{ - std::string ret; - tostring_internal (ret, src, std::wcslen (src), loc); - return ret; -} - - -#else // LOG4CPLUS_WORKING_LOCALE - - -static -void -tostring_internal (std::string & ret, wchar_t const * src, size_t size) -{ - ret.resize(size); - for (size_t i = 0; i < size; ++i) - { - ret[i] = static_cast (static_cast (src[i])) < 256 - ? static_cast(src[i]) : '?'; - } -} - - -std::string -log4cplus::helpers::tostring(const std::wstring& src) -{ - std::string ret; - tostring_internal (ret, src.c_str (), src.size ()); - return ret; -} - - -std::string -log4cplus::helpers::tostring(wchar_t const * src) -{ - std::string ret; - tostring_internal (ret, src, std::wcslen (src)); - return ret; -} - - -static -void -towstring_internal (std::wstring & ret, char const * src, size_t size) -{ - ret.resize(size); - for (size_t i = 0; i < size; ++i) - { - ret[i] = static_cast - (static_cast (src[i])); - } -} - - -std::wstring -log4cplus::helpers::towstring(const std::string& src) -{ - std::wstring ret; - towstring_internal (ret, src.c_str (), src.size ()); - return ret; -} - - -std::wstring -log4cplus::helpers::towstring(char const * src) -{ - std::wstring ret; - towstring_internal (ret, src, std::strlen (src)); - return ret; -} - -#endif // LOG4CPLUS_WORKING_LOCALE - -#endif // UNICODE - - -namespace -{ - - -struct toupper_func -{ - tchar - operator () (tchar ch) const - { -#ifdef UNICODE -# if (defined(__MWERKS__) && defined(__MACOS__)) || defined (LOG4CPLUS_WORKING_LOCALE) - return std::towupper (ch); -# else - return ::towupper (ch); -# endif -#else - return ::toupper (static_cast(ch)); -#endif - } -}; - - -struct tolower_func -{ - tchar - operator () (tchar ch) const - { -#ifdef UNICODE -# if (defined(__MWERKS__) && defined(__MACOS__)) || defined (LOG4CPLUS_WORKING_LOCALE) - return std::towlower (ch); -# else - return ::towlower (ch); -# endif -#else - return ::tolower (static_cast(ch)); -#endif - } -}; - - -} // namespace - - -log4cplus::tstring -log4cplus::helpers::toUpper(const log4cplus::tstring& s) -{ - tstring ret; - std::transform(s.begin(), s.end(), - string_append_iterator(ret), toupper_func ()); - return ret; -} - - -log4cplus::tstring -log4cplus::helpers::toLower(const log4cplus::tstring& s) -{ - tstring ret; - std::transform(s.begin(), s.end(), - string_append_iterator(ret), tolower_func ()); - return ret; -} diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syncprims.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syncprims.cxx deleted file mode 100644 index 355d13c9..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syncprims.cxx +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) 2009, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -#include -#include - - -namespace log4cplus { namespace thread { namespace detail { - - -LOG4CPLUS_EXPORT -void -syncprims_throw_exception (char const * const msg, char const * const file, - int line) -{ - std::ostringstream oss; - oss << file << ":" << line << msg; - throw std::runtime_error (oss.str ()); -} - - -} } } // namespace log4cplus { namespace thread { namespace detail { diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syslogappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syslogappender.cxx deleted file mode 100644 index 1d066183..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/syslogappender.cxx +++ /dev/null @@ -1,244 +0,0 @@ -// Module: Log4CPLUS -// File: syslogappender.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#if defined(LOG4CPLUS_HAVE_SYSLOG_H) && !defined(_WIN32) - -#include -#include -#include -#include - -#include - -using namespace std; -using namespace log4cplus::helpers; - - -namespace -{ - -static -const char* -useIdent (const std::string& string) -{ - if (string.empty ()) - return 0; - else - return string.c_str (); -} - - -static -int -parseFacility (const log4cplus::tstring& text) -{ - if (text.empty ()) - return 0; -#ifdef LOG_AUTH - else if (text == LOG4CPLUS_TEXT ("auth")) - return LOG_AUTH; -#endif -#ifdef LOG_AUTHPRIV - else if (text == LOG4CPLUS_TEXT ("authpriv")) - return LOG_AUTHPRIV; -#endif -#ifdef LOG_CRON - else if (text == LOG4CPLUS_TEXT ("cron")) - return LOG_CRON; -#endif -#ifdef LOG_DAEMON - else if (text == LOG4CPLUS_TEXT ("daemon")) - return LOG_DAEMON; -#endif -#ifdef LOG_FTP - else if (text == LOG4CPLUS_TEXT ("ftp")) - return LOG_FTP; -#endif -#ifdef LOG_KERN - else if (text == LOG4CPLUS_TEXT ("kern")) - return LOG_KERN; -#endif -#ifdef LOG_LOCAL0 - else if (text == LOG4CPLUS_TEXT ("local0")) - return LOG_LOCAL0; -#endif -#ifdef LOG_LOCAL1 - else if (text == LOG4CPLUS_TEXT ("local1")) - return LOG_LOCAL1; -#endif -#ifdef LOG_LOCAL2 - else if (text == LOG4CPLUS_TEXT ("local2")) - return LOG_LOCAL2; -#endif -#ifdef LOG_LOCAL3 - else if (text == LOG4CPLUS_TEXT ("local3")) - return LOG_LOCAL3; -#endif -#ifdef LOG_LOCAL4 - else if (text == LOG4CPLUS_TEXT ("local4")) - return LOG_LOCAL4; -#endif -#ifdef LOG_LOCAL5 - else if (text == LOG4CPLUS_TEXT ("local5")) - return LOG_LOCAL5; -#endif -#ifdef LOG_LOCAL6 - else if (text == LOG4CPLUS_TEXT ("local6")) - return LOG_LOCAL6; -#endif -#ifdef LOG_LOCAL7 - else if (text == LOG4CPLUS_TEXT ("local7")) - return LOG_LOCAL7; -#endif -#ifdef LOG_LPR - else if (text == LOG4CPLUS_TEXT ("lpr")) - return LOG_LPR; -#endif -#ifdef LOG_MAIL - else if (text == LOG4CPLUS_TEXT ("mail")) - return LOG_MAIL; -#endif -#ifdef LOG_NEWS - else if (text == LOG4CPLUS_TEXT ("news")) - return LOG_NEWS; -#endif -#ifdef LOG_SYSLOG - else if (text == LOG4CPLUS_TEXT ("syslog")) - return LOG_SYSLOG; -#endif -#ifdef LOG_USER - else if (text == LOG4CPLUS_TEXT ("user")) - return LOG_USER; -#endif -#ifdef LOG_UUCP - else if (text == LOG4CPLUS_TEXT ("uucp")) - return LOG_UUCP; -#endif - else - { - // Unknown facility. - log4cplus::tstring msg (LOG4CPLUS_TEXT ("Unknown syslog facility: ")); - msg += text; - log4cplus::helpers::LogLog::getLogLog ()->error (msg); - - return 0; - } -} - -} // namespace - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::SysLogAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -log4cplus::SysLogAppender::SysLogAppender(const tstring& id) - : ident(id) - , facility (0) - // Store std::string form of ident as member of SysLogAppender so - // the address of the c_str() result remains stable for openlog & - // co to use even if we use wstrings. - , identStr(LOG4CPLUS_TSTRING_TO_STRING (id) ) -{ - ::openlog(useIdent(identStr), 0, 0); -} - - -log4cplus::SysLogAppender::SysLogAppender(const Properties & properties) - : Appender(properties) - , facility (0) -{ - ident = properties.getProperty( LOG4CPLUS_TEXT("ident") ); - facility = parseFacility ( - toLower (properties.getProperty (LOG4CPLUS_TEXT ("facility")))); - identStr = LOG4CPLUS_TSTRING_TO_STRING (ident); - ::openlog(useIdent(identStr), 0, 0); -} - - -log4cplus::SysLogAppender::~SysLogAppender() -{ - destructorImpl(); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::SysLogAppender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -log4cplus::SysLogAppender::close() -{ - getLogLog().debug(LOG4CPLUS_TEXT("Entering SysLogAppender::close()...")); - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( access_mutex ) - ::closelog(); - closed = true; - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::SysLogAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -int -log4cplus::SysLogAppender::getSysLogLevel(const LogLevel& ll) const -{ - if(ll < DEBUG_LOG_LEVEL) { - return -1; - } - else if(ll < INFO_LOG_LEVEL) { - return LOG_DEBUG; - } - else if(ll < WARN_LOG_LEVEL) { - return LOG_INFO; - } - else if(ll < ERROR_LOG_LEVEL) { - return LOG_WARNING; - } - else if(ll < FATAL_LOG_LEVEL) { - return LOG_ERR; - } - else if(ll == FATAL_LOG_LEVEL) { - return LOG_CRIT; - } - - return LOG_ALERT; // ll > FATAL_LOG_LEVEL -} - - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -log4cplus::SysLogAppender::append(const spi::InternalLoggingEvent& event) -{ - int level = getSysLogLevel(event.getLogLevel()); - if(level != -1) { - log4cplus::tostringstream buf; - layout->formatAndAppend(buf, event); - ::syslog(facility | level, "%s", - LOG4CPLUS_TSTRING_TO_STRING(buf.str()).c_str()); - } -} - -#endif // defined(LOG4CPLUS_HAVE_SYSLOG_H) - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/threads.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/threads.cxx deleted file mode 100644 index 185e8972..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/threads.cxx +++ /dev/null @@ -1,331 +0,0 @@ -// Module: Log4CPLUS -// File: threads.cxx -// Created: 6/2001 -// Author: Tad E. Smith -// -// -// Copyright 2001-2010 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef LOG4CPLUS_SINGLE_THREADED - -#include -#include -#include -#include - -#include - -#ifdef LOG4CPLUS_HAVE_ERRNO_H -#include -#endif - -#if defined(LOG4CPLUS_USE_PTHREADS) -# include -# include -#elif defined (LOG4CPLUS_USE_WIN32_THREADS) && ! defined (_WIN32_WCE) -# include -#endif - -#include -#include -#include -#include -#include -#include -#include - - -namespace log4cplus { namespace thread { - - -struct ThreadStart -{ -# ifdef LOG4CPLUS_USE_PTHREADS -static void* threadStartFuncWorker(void *); -# elif defined(LOG4CPLUS_USE_WIN32_THREADS) && defined (_WIN32_WCE) -static DWORD threadStartFuncWorker(void *); -# elif defined(LOG4CPLUS_USE_WIN32_THREADS) -static unsigned threadStartFuncWorker(void *); -# endif -}; - - -} } // namespace log4cplus { namespace thread { - - -namespace -{ - -# ifdef LOG4CPLUS_USE_PTHREADS -extern "C" void * threadStartFunc(void * param) -# elif defined(LOG4CPLUS_USE_WIN32_THREADS) && defined (_WIN32_WCE) -static DWORD WINAPI threadStartFunc(void * param) -# elif defined(LOG4CPLUS_USE_WIN32_THREADS) -static unsigned WINAPI threadStartFunc(void * param) -# endif -{ - return log4cplus::thread::ThreadStart::threadStartFuncWorker (param); -} - -} // namespace - - -namespace log4cplus { namespace thread { - - -/////////////////////////////////////////////////////////////////////////////// -// public methods -/////////////////////////////////////////////////////////////////////////////// - -LOG4CPLUS_MUTEX_PTR_DECLARE -createNewMutex() -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - // The mutexes that we provide need to be recursive. This is - // because of double locking, first lock gets acquired in - // ConfigurationWatchDogThread::run() through the HierarchyLocker - // instance there. The second lock on appender_list_mutex is - // attempted in - // helpers::AppenderAttachableImpl::removeAllAppenders(). This - // results into deadlock on (at least) Linux. - - log4cplus::thread::PthreadMutexAttr mattr; - mattr.set_type (log4cplus::thread::Mutex::RECURSIVE); - - std::auto_ptr m (new pthread_mutex_t); - int ret = pthread_mutex_init (m.get (), &mattr.attr); - if (ret != 0) - throw std::runtime_error ("createNewMutex(): pthread_mutex_init () has failed."); - -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - std::auto_ptr< ::CRITICAL_SECTION> m (new ::CRITICAL_SECTION); - ::InitializeCriticalSection(m.get ()); - -#endif - - return m.release (); -} - - -void -deleteMutex(LOG4CPLUS_MUTEX_PTR_DECLARE m) -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - ::pthread_mutex_destroy(m); -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - ::DeleteCriticalSection(m); -#endif - delete m; -} - - - -#if defined(LOG4CPLUS_USE_PTHREADS) -pthread_key_t* -createPthreadKey(void (*cleanupfunc)(void *)) -{ - ::pthread_key_t* key = new ::pthread_key_t; - ::pthread_key_create(key, cleanupfunc); - return key; -} -#endif - - -#ifndef LOG4CPLUS_SINGLE_THREADED -void -blockAllSignals() -{ -#if defined (LOG4CPLUS_USE_PTHREADS) - // Block all signals. - sigset_t signal_set; - sigfillset (&signal_set); - pthread_sigmask (SIG_BLOCK, &signal_set, 0); -#endif -} -#endif // LOG4CPLUS_SINGLE_THREADED - - -void -yield() -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - sched_yield(); -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - ::Sleep(0); -#endif -} - - -tstring -getCurrentThreadName() -{ - tostringstream tmp; - tmp << LOG4CPLUS_GET_CURRENT_THREAD; - return tmp.str (); -} - - -#if defined(LOG4CPLUS_USE_PTHREADS) -void* -ThreadStart::threadStartFuncWorker(void * arg) -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) && defined (_WIN32_WCE) -DWORD -ThreadStart::threadStartFuncWorker(void * arg) -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) -unsigned -ThreadStart::threadStartFuncWorker(void * arg) -#endif -{ - blockAllSignals (); - helpers::SharedObjectPtr loglog - = helpers::LogLog::getLogLog(); - if (! arg) - loglog->error(LOG4CPLUS_TEXT("threadStartFunc()- arg is NULL")); - else - { - AbstractThread * ptr = static_cast(arg); - AbstractThreadPtr thread(ptr); - - // Decrease reference count increased by AbstractThread::start(). - ptr->removeReference (); - - try - { - thread->run(); - } - catch(std::exception& e) - { - tstring err = LOG4CPLUS_TEXT("threadStartFunc()- run() terminated with an exception: "); - err += LOG4CPLUS_C_STR_TO_TSTRING(e.what()); - loglog->warn(err); - } - catch(...) - { - loglog->warn(LOG4CPLUS_TEXT("threadStartFunc()- run() terminated with an exception.")); - } - thread->flags &= ~AbstractThread::fRUNNING; - getNDC().remove(); - } - - return 0; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// AbstractThread ctor and dtor -/////////////////////////////////////////////////////////////////////////////// - -AbstractThread::AbstractThread() - : flags (0) -#if defined(LOG4CPLUS_USE_WIN32_THREADS) - , handle (INVALID_HANDLE_VALUE) -#endif -{ -} - - - -AbstractThread::~AbstractThread() -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - if ((flags & fJOINED) == 0) - pthread_detach (handle); - -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - if (handle != INVALID_HANDLE_VALUE) - ::CloseHandle (handle); - -#endif -} - - - -/////////////////////////////////////////////////////////////////////////////// -// AbstractThread public methods -/////////////////////////////////////////////////////////////////////////////// - -void -AbstractThread::start() -{ - flags |= fRUNNING; - - // Increase reference count here. It will be lowered by the running - // thread itself. - addReference (); - -#if defined(LOG4CPLUS_USE_PTHREADS) - if (pthread_create(&handle, NULL, threadStartFunc, this) ) - { - removeReference (); - flags &= ~fRUNNING; - throw std::runtime_error("Thread creation was not successful"); - } -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - HANDLE h = InterlockedExchangePointer (&handle, INVALID_HANDLE_VALUE); - if (h != INVALID_HANDLE_VALUE) - ::CloseHandle (h); - -#if defined (_WIN32_WCE) - h = ::CreateThread (0, 0, threadStartFunc, this, 0, &thread_id); -#else - h = reinterpret_cast( - ::_beginthreadex (0, 0, threadStartFunc, this, 0, &thread_id)); -#endif - if (! h) - { - removeReference (); - flags &= ~fRUNNING; - throw std::runtime_error("Thread creation was not successful"); - } - h = InterlockedExchangePointer (&handle, h); - assert (h == INVALID_HANDLE_VALUE); -#endif -} - - -LOG4CPLUS_THREAD_KEY_TYPE -AbstractThread::getThreadId () const -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - return handle; -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - return thread_id; -#endif -} - - -LOG4CPLUS_THREAD_HANDLE_TYPE -AbstractThread::getThreadHandle () const -{ - return handle; -} - - -void -AbstractThread::join () -{ -#if defined(LOG4CPLUS_USE_PTHREADS) - pthread_join (handle, 0); -#elif defined(LOG4CPLUS_USE_WIN32_THREADS) - ::WaitForSingleObject (handle, INFINITE); -#endif - flags |= fJOINED; -} - - -} } // namespace log4cplus { namespace thread { - -#endif // LOG4CPLUS_SINGLE_THREADED diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/timehelper.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/timehelper.cxx deleted file mode 100644 index 9432aa80..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/timehelper.cxx +++ /dev/null @@ -1,519 +0,0 @@ -// Module: Log4CPLUS -// File: timehelper.cxx -// Created: 4/2003 -// Author: Tad E. Smith -// -// -// Copyright 2003-2009 Tad E. Smith -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#if ! defined (_WIN32_WCE) -#include -#endif -#if defined (UNICODE) -#include -#endif - -#if defined (LOG4CPLUS_HAVE_SYS_TYPES_H) -#include -#endif - -#if defined(LOG4CPLUS_HAVE_FTIME) -#include -#endif - -#if defined(LOG4CPLUS_HAVE_GETTIMEOFDAY) -#include -#endif - -#if defined(LOG4CPLUS_HAVE_GMTIME_R) && !defined(LOG4CPLUS_SINGLE_THREADED) -#define LOG4CPLUS_NEED_GMTIME_R -#endif - -#if defined(LOG4CPLUS_HAVE_LOCALTIME_R) && !defined(LOG4CPLUS_SINGLE_THREADED) -#define LOG4CPLUS_NEED_LOCALTIME_R -#endif - - -namespace log4cplus { namespace helpers { - -const int ONE_SEC_IN_USEC = 1000000; - - -#if defined (_WIN32_WCE) -using ::mktime; -using ::gmtime; -using ::localtime; -#if defined (UNICODE) -using ::wcsftime; -#else -using ::strftime; -#endif - -#else -using std::mktime; -using std::gmtime; -using std::localtime; -#if defined (UNICODE) -using std::wcsftime; -#else -using std::strftime; -#endif - -#endif - - - -////////////////////////////////////////////////////////////////////////////// -// Time ctors -////////////////////////////////////////////////////////////////////////////// - -Time::Time() -: tv_sec(0), - tv_usec(0) -{ -} - - -Time::Time(time_t tv_sec_, long tv_usec_) -: tv_sec(tv_sec_), - tv_usec(tv_usec_) -{ - assert (tv_usec < ONE_SEC_IN_USEC); -} - - -Time::Time(time_t time) -: tv_sec(time), - tv_usec(0) -{ -} - - -Time -Time::gettimeofday() -{ -#if defined (LOG4CPLUS_HAVE_CLOCK_GETTIME) - struct timespec ts; - int res = clock_gettime (CLOCK_REALTIME, &ts); - assert (res == 0); - if (res != 0) - throw std::runtime_error ("clock_gettime() has failed"); - - return Time (ts.tv_sec, ts.tv_nsec / 1000); -#elif defined(LOG4CPLUS_HAVE_GETTIMEOFDAY) - timeval tp; - ::gettimeofday(&tp, 0); - - return Time(tp.tv_sec, tp.tv_usec); -#elif defined(LOG4CPLUS_HAVE_FTIME) - struct timeb tp; - ::ftime(&tp); - - return Time(tp.time, tp.millitm * 1000); -#else -#warning "Time::gettimeofday()- low resolution timer: gettimeofday and ftime unavailable" - return Time(::time(0), 0); -#endif -} - - -////////////////////////////////////////////////////////////////////////////// -// Time methods -////////////////////////////////////////////////////////////////////////////// - -time_t -Time::setTime(tm* t) -{ - time_t time = helpers::mktime(t); - if (time != -1) - tv_sec = time; - - return time; -} - - -time_t -Time::getTime() const -{ - return tv_sec; -} - - -void -Time::gmtime(tm* t) const -{ - time_t clock = tv_sec; -#ifdef LOG4CPLUS_NEED_GMTIME_R - ::gmtime_r(&clock, t); -#else - tm* tmp = helpers::gmtime(&clock); - *t = *tmp; -#endif -} - - -void -Time::localtime(tm* t) const -{ - time_t clock = tv_sec; -#ifdef LOG4CPLUS_NEED_LOCALTIME_R - ::localtime_r(&clock, t); -#else - tm* tmp = helpers::localtime(&clock); - *t = *tmp; -#endif -} - - -namespace -{ - -static log4cplus::tstring const padding_zeros[4] = -{ - log4cplus::tstring (LOG4CPLUS_TEXT("000")), - log4cplus::tstring (LOG4CPLUS_TEXT("00")), - log4cplus::tstring (LOG4CPLUS_TEXT("0")), - log4cplus::tstring (LOG4CPLUS_TEXT("")) -}; - -static log4cplus::tstring const uc_q_padding_zeros[4] = -{ - log4cplus::tstring (LOG4CPLUS_TEXT(".000")), - log4cplus::tstring (LOG4CPLUS_TEXT(".00")), - log4cplus::tstring (LOG4CPLUS_TEXT(".0")), - log4cplus::tstring (LOG4CPLUS_TEXT(".")) -}; - -} - - -void -Time::build_q_value (log4cplus::tstring & q_str) const -{ - q_str = convertIntegerToString(tv_usec / 1000); - size_t const len = q_str.length(); - if (len <= 2) - q_str.insert (0, padding_zeros[q_str.length()]); -} - - -void -Time::build_uc_q_value (log4cplus::tstring & uc_q_str) const -{ - build_q_value (uc_q_str); - - log4cplus::tstring usecs (convertIntegerToString(tv_usec % 1000)); - size_t usecs_len = usecs.length(); - usecs.insert (0, usecs_len <= 3 - ? uc_q_padding_zeros[usecs_len] : uc_q_padding_zeros[3]); - uc_q_str.append (usecs); -} - - -log4cplus::tstring -Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) const -{ - if (fmt_orig.empty () || fmt_orig[0] == 0) - return log4cplus::tstring (); - - tm time; - - if(use_gmtime) - gmtime(&time); - else - localtime(&time); - - enum State - { - TEXT, - PERCENT_SIGN - }; - - log4cplus::tstring fmt (fmt_orig); - log4cplus::tstring ret; - ret.reserve (static_cast(fmt.size () * 1.35)); - State state = TEXT; - - log4cplus::tstring q_str; - bool q_str_valid = false; - - log4cplus::tstring uc_q_str; - bool uc_q_str_valid = false; - - log4cplus::tstring s_str; - bool s_str_valid = false; - - // Walk the format string and process all occurences of %q and %Q. - - for (log4cplus::tstring::const_iterator fmt_it = fmt.begin (); - fmt_it != fmt.end (); ++fmt_it) - { - switch (state) - { - case TEXT: - { - if (*fmt_it == LOG4CPLUS_TEXT ('%')) - state = PERCENT_SIGN; - else - ret.push_back (*fmt_it); - } - break; - - case PERCENT_SIGN: - { - switch (*fmt_it) - { - case LOG4CPLUS_TEXT ('q'): - { - if (! q_str_valid) - { - build_q_value (q_str); - q_str_valid = true; - } - ret.append (q_str); - state = TEXT; - } - break; - - case LOG4CPLUS_TEXT ('Q'): - { - if (! uc_q_str_valid) - { - build_uc_q_value (uc_q_str); - uc_q_str_valid = true; - } - ret.append (uc_q_str); - state = TEXT; - } - break; - - // Windows do not support %s format specifier - // (seconds since epoch). - case LOG4CPLUS_TEXT ('s'): - { - if (! s_str_valid) - { - convertIntegerToString (s_str, tv_sec); - s_str_valid = true; - } - ret.append (s_str); - state = TEXT; - } - break; - - default: - { - ret.push_back (LOG4CPLUS_TEXT ('%')); - ret.push_back (*fmt_it); - state = TEXT; - } - } - } - break; - } - } - - // Finally call strftime/wcsftime to format the rest of the string. - - ret.swap (fmt); - size_t buffer_size = fmt.size () + 1; - std::vector buffer; - size_t len; - - // Limit how far can the buffer grow. This is necessary so that we - // catch bad format string. Some implementations of strftime() signal - // both too small buffer and invalid format string by returning 0 - // without changing errno. - size_t const buffer_size_max - = (std::max) (static_cast(1024), buffer_size * 16); - - do - { - buffer.resize (buffer_size); - errno = 0; -#ifdef UNICODE - len = helpers::wcsftime(&buffer[0], buffer_size, fmt.c_str(), &time); -#else - len = helpers::strftime(&buffer[0], buffer_size, fmt.c_str(), &time); -#endif - if (len == 0) - { - int const eno = errno; - buffer_size *= 2; - if (buffer_size > buffer_size_max) - { - log4cplus::tstring msg ( - LOG4CPLUS_TEXT ("Error in strftime(): ")); - msg += convertIntegerToString (eno); - LogLog::getLogLog ()->error (msg); - throw std::runtime_error (LOG4CPLUS_TSTRING_TO_STRING (msg)); - } - } - } - while (len == 0); - ret.assign (buffer.begin (), buffer.begin () + len); - - return ret; -} - - -Time& -Time::operator+=(const Time& rhs) -{ - tv_sec += rhs.tv_sec; - tv_usec += rhs.tv_usec; - - if(tv_usec > ONE_SEC_IN_USEC) { - ++tv_sec; - tv_usec -= ONE_SEC_IN_USEC; - } - - return *this; -} - - -Time& -Time::operator-=(const Time& rhs) -{ - tv_sec -= rhs.tv_sec; - tv_usec -= rhs.tv_usec; - - if(tv_usec < 0) { - --tv_sec; - tv_usec += ONE_SEC_IN_USEC; - } - - return *this; -} - - -Time& -Time::operator/=(long rhs) -{ - long rem_secs = static_cast(tv_sec % rhs); - tv_sec /= rhs; - - tv_usec /= rhs; - tv_usec += static_cast((rem_secs * ONE_SEC_IN_USEC) / rhs); - - return *this; -} - - -Time& -Time::operator*=(long rhs) -{ - long new_usec = tv_usec * rhs; - long overflow_sec = new_usec / ONE_SEC_IN_USEC; - tv_usec = new_usec % ONE_SEC_IN_USEC; - - tv_sec *= rhs; - tv_sec += overflow_sec; - - return *this; -} - - -////////////////////////////////////////////////////////////////////////////// -// Time globals -////////////////////////////////////////////////////////////////////////////// - - -const Time -operator+(const Time& lhs, const Time& rhs) -{ - return Time(lhs) += rhs; -} - - -const Time -operator-(const Time& lhs, const Time& rhs) -{ - return Time(lhs) -= rhs; -} - - -const Time -operator/(const Time& lhs, long rhs) -{ - return Time(lhs) /= rhs; -} - - -const Time -operator*(const Time& lhs, long rhs) -{ - return Time(lhs) *= rhs; -} - - -bool -operator<(const Time& lhs, const Time& rhs) -{ - return ( (lhs.sec() < rhs.sec()) - || ( (lhs.sec() == rhs.sec()) - && (lhs.usec() < rhs.usec())) ); -} - - -bool -operator<=(const Time& lhs, const Time& rhs) -{ - return ((lhs < rhs) || (lhs == rhs)); -} - - -bool -operator>(const Time& lhs, const Time& rhs) -{ - return ( (lhs.sec() > rhs.sec()) - || ( (lhs.sec() == rhs.sec()) - && (lhs.usec() > rhs.usec())) ); -} - - -bool -operator>=(const Time& lhs, const Time& rhs) -{ - return ((lhs > rhs) || (lhs == rhs)); -} - - -bool -operator==(const Time& lhs, const Time& rhs) -{ - return ( lhs.sec() == rhs.sec() - && lhs.usec() == rhs.usec()); -} - - -bool -operator!=(const Time& lhs, const Time& rhs) -{ - return !(lhs == rhs); -} - - -} } // namespace log4cplus { namespace helpers { diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/version.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/version.cxx deleted file mode 100644 index 504e39b4..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/version.cxx +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2010, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - -#include - - -namespace log4cplus -{ - -#if ! defined (LOG4CPLUS_VERSION_STR_SUFFIX) -#define LOG4CPLUS_VERSION_STR_SUFFIX /* empty */ -#endif - -unsigned const version = LOG4CPLUS_VERSION; -char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; - -} diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32consoleappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32consoleappender.cxx deleted file mode 100644 index e439e9bc..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32consoleappender.cxx +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (C) 2009-2010, Vaclav Haisman. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modifica- -// tion, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. 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. -// -// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE -// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- -// DING, 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. - - -#include -#include -#include - - -#if defined(_WIN32) && defined (LOG4CPLUS_HAVE_WIN32_CONSOLE) -namespace log4cplus -{ - - -Win32ConsoleAppender::Win32ConsoleAppender (bool allocConsole) - : alloc_console (allocConsole) -{ } - - -Win32ConsoleAppender::Win32ConsoleAppender ( - helpers::Properties const & properties) - : Appender (properties) - , alloc_console (true) -{ - tstring tmp = properties.getProperty (LOG4CPLUS_TEXT ("AllocConsole"), - LOG4CPLUS_TEXT ("true")); - alloc_console = helpers::toLower (tmp) == LOG4CPLUS_TEXT ("true"); -} - - -Win32ConsoleAppender::~Win32ConsoleAppender () -{ - destructorImpl(); -} - - -void -Win32ConsoleAppender::close () -{ - closed = true; -} - - -void -Win32ConsoleAppender::append (spi::InternalLoggingEvent const & event) -{ - if (alloc_console) - // We ignore the return value here. If we already have a console, - // it will fail. - AllocConsole (); - - HANDLE const console_out = GetStdHandle (STD_OUTPUT_HANDLE); - if (console_out == INVALID_HANDLE_VALUE) - { - getLogLog ().error ( - LOG4CPLUS_TEXT ("Win32ConsoleAppender::append") - LOG4CPLUS_TEXT ("- Unable to get STD_OUTPUT_HANDLE.")); - return; - } - - DWORD const handle_type = GetFileType (console_out); - if (handle_type == FILE_TYPE_UNKNOWN && GetLastError () != NO_ERROR) - { - getLogLog ().error ( - LOG4CPLUS_TEXT ("Win32ConsoleAppender::append") - LOG4CPLUS_TEXT ("- Error retrieving handle type.")); - return; - } - - tostringstream oss; - layout->formatAndAppend (oss, event); - tstring str = oss.str (); - size_t const str_len = str.size (); - tchar const * s = str.c_str (); - DWORD mode; - - if (handle_type == FILE_TYPE_CHAR && GetConsoleMode (console_out, &mode)) - // It seems that we have real console handle here. We can use - // WriteConsole() directly. - write_console (console_out, s, str_len); - else - // It seems that console is redirected. - write_handle (console_out, s, str_len); -} - - -void -Win32ConsoleAppender::write_handle (HANDLE out, tchar const * s, size_t str_len) -{ -#if defined (UNICODE) - std::wstring wstr (s, str_len); - std::string str (helpers::tostring (wstr)); - str_len = str.size (); - char const * const cstr = str.c_str (); - -#else - char const * const cstr = s; - -#endif - - DWORD const total_to_write = static_cast(str_len); - DWORD total_written = 0; - - do - { - DWORD const to_write = total_to_write - total_written; - DWORD written = 0; - - BOOL ret = WriteFile (out, cstr + total_written, to_write, &written, - 0); - if (! ret) - { - getLogLog ().error ( - LOG4CPLUS_TEXT ("Win32ConsoleAppender::write_handle") - LOG4CPLUS_TEXT ("- WriteFile has failed.")); - return; - } - - total_written += written; - } - while (total_written != total_to_write); -} - - -void -Win32ConsoleAppender::write_console (HANDLE console_out, tchar const * s, - size_t str_len) -{ - DWORD const total_to_write = static_cast(str_len); - DWORD total_written = 0; - - do - { - DWORD const to_write - = (std::min) (64*1024 - 1, total_to_write - total_written); - DWORD written = 0; - - BOOL ret = WriteConsole (console_out, s + total_written, to_write, - &written, 0); - if (! ret) - { - getLogLog ().error ( - LOG4CPLUS_TEXT ("Win32ConsoleAppender::write_console") - LOG4CPLUS_TEXT ("- WriteConsole has failed.")); - return; - } - - total_written += written; - } - while (total_written != total_to_write); -} - - - -} // namespace log4cplus - -#endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32debugappender.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32debugappender.cxx deleted file mode 100644 index 3b98c8ab..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/src/win32debugappender.cxx +++ /dev/null @@ -1,86 +0,0 @@ -// Module: Log4CPLUS -// File: win32debugappender.cxx -// Created: 12/2003 -// Author: Eduardo Francos, Odalio SARL -// -// -// Copyright 2003-2010 Odalio SARL -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -#include - - -#if defined (LOG4CPLUS_HAVE_OUTPUTDEBUGSTRING) - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::Win32DebugAppender ctors and dtor -/////////////////////////////////////////////////////////////////////////////// - -log4cplus::Win32DebugAppender::Win32DebugAppender() -{ -} - - -log4cplus::Win32DebugAppender::Win32DebugAppender( - const log4cplus::helpers::Properties& properties) - : Appender(properties) -{ -} - - - -log4cplus::Win32DebugAppender::~Win32DebugAppender() -{ - destructorImpl(); -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::Win32DebugAppender public methods -/////////////////////////////////////////////////////////////////////////////// - -void -log4cplus::Win32DebugAppender::close() -{ - closed = true; -} - - - -/////////////////////////////////////////////////////////////////////////////// -// log4cplus::Win32DebugAppender protected methods -/////////////////////////////////////////////////////////////////////////////// - -// This method does not need to be locked since it is called by -// doAppend() which performs the locking -void -log4cplus::Win32DebugAppender::append(const spi::InternalLoggingEvent& event) -{ - tostringstream buf; - layout->formatAndAppend(buf, event); - tstring sz = buf.str(); - const tchar * s = sz.c_str(); - ::OutputDebugString(s); -} - - -#endif // LOG4CPLUS_HAVE_OUTPUTDEBUGSTRING diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/CMakeLists.txt deleted file mode 100644 index 63175360..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -add_subdirectory (appender_test) -add_subdirectory (configandwatch_test) -add_subdirectory (customloglevel_test) -add_subdirectory (fileappender_test) -add_subdirectory (filter_test) -add_subdirectory (hierarchy_test) -add_subdirectory (loglog_test) -add_subdirectory (ndc_test) -add_subdirectory (ostream_test) -add_subdirectory (patternlayout_test) -add_subdirectory (performance_test) -add_subdirectory (priority_test) -add_subdirectory (propertyconfig_test) -add_subdirectory (socket_test) -add_subdirectory (thread_test) -add_subdirectory (timeformat_test) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.am deleted file mode 100644 index 889e3016..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -SINGLE_THREADED_TESTS = appender_test \ - customloglevel_test \ - fileappender_test \ - filter_test \ - hierarchy_test \ - loglog_test \ - ndc_test \ - ostream_test \ - patternlayout_test \ - performance_test \ - priority_test \ - propertyconfig_test \ - socket_test \ - timeformat_test - -if MULTI_THREADED -SUBDIRS = $(SINGLE_THREADED_TESTS) thread_test configandwatch_test -else -SUBDIRS = $(SINGLE_THREADED_TESTS) -endif diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.in deleted file mode 100644 index 36233187..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/Makefile.in +++ /dev/null @@ -1,601 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-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 uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = appender_test customloglevel_test fileappender_test \ - filter_test hierarchy_test loglog_test ndc_test ostream_test \ - patternlayout_test performance_test priority_test \ - propertyconfig_test socket_test timeformat_test thread_test \ - configandwatch_test -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@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -SINGLE_THREADED_TESTS = appender_test \ - customloglevel_test \ - fileappender_test \ - filter_test \ - hierarchy_test \ - loglog_test \ - ndc_test \ - ostream_test \ - patternlayout_test \ - performance_test \ - priority_test \ - propertyconfig_test \ - socket_test \ - timeformat_test - -@MULTI_THREADED_FALSE@SUBDIRS = $(SINGLE_THREADED_TESTS) -@MULTI_THREADED_TRUE@SUBDIRS = $(SINGLE_THREADED_TESTS) thread_test configandwatch_test -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 tests/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/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. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - 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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive 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-recursive \ - 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/CMakeLists.txt deleted file mode 100644 index 7389ed3d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "appender_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.am deleted file mode 100644 index f5bd3c34..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = appender_test - -appender_test_SOURCES = main.cxx - -appender_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.in deleted file mode 100644 index 54b7dfc6..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = appender_test$(EXEEXT) -subdir = tests/appender_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_appender_test_OBJECTS = main.$(OBJEXT) -appender_test_OBJECTS = $(am_appender_test_OBJECTS) -appender_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(appender_test_SOURCES) -DIST_SOURCES = $(appender_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -appender_test_SOURCES = main.cxx -appender_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/appender_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/appender_test/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 -appender_test$(EXEEXT): $(appender_test_OBJECTS) $(appender_test_DEPENDENCIES) - @rm -f appender_test$(EXEEXT) - $(CXXLINK) $(appender_test_OBJECTS) $(appender_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/main.cxx deleted file mode 100644 index 29b67f42..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/appender_test/main.cxx +++ /dev/null @@ -1,82 +0,0 @@ - - -#include -#include -#include -#include "log4cplus/logger.h" -#include "log4cplus/consoleappender.h" -#include "log4cplus/helpers/appenderattachableimpl.h" -#include "log4cplus/helpers/loglog.h" -#include "log4cplus/helpers/pointer.h" -#include "log4cplus/spi/loggingevent.h" - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::spi; - -void -printAppenderList(SharedAppenderPtrList list) -{ - cout << "List size: " << list.size() << endl; - for(SharedAppenderPtrList::iterator it=list.begin(); it!=list.end(); ++it) { - log4cplus::tcout << "Loop Body: Appender name = " << (*it)->getName() - << endl; - } -} - - -int -main() -{ - LogLog::getLogLog()->setInternalDebugging(true); - { - AppenderAttachableImpl aai; - try { - SharedObjectPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); - - SharedObjectPtr append_2(new ConsoleAppender()); - append_2->setName(LOG4CPLUS_TEXT("Second")); - - InternalLoggingEvent event( - Logger::getInstance(LOG4CPLUS_TEXT("test")).getName(), - DEBUG_LOG_LEVEL, LOG4CPLUS_TEXT("This is a test..."), NULL, 0); - - aai.addAppender(append_1); - aai.addAppender(append_2); - aai.addAppender(append_1); - aai.addAppender(append_2); - printAppenderList(aai.getAllAppenders()); - - aai.removeAppender(append_2); - printAppenderList(aai.getAllAppenders()); - - aai.removeAppender(LOG4CPLUS_TEXT("First")); - printAppenderList(aai.getAllAppenders()); - - aai.addAppender(append_1); - aai.addAppender(append_2); - aai.addAppender(append_1); - aai.addAppender(append_2); - log4cplus::tcout << "Should be First: " - << aai.getAppender(LOG4CPLUS_TEXT("First"))->getName() << endl; - log4cplus::tcout << "Should be Second: " - << aai.getAppender(LOG4CPLUS_TEXT("Second"))->getName() << endl - << endl; - append_1->doAppend(event); - append_2->doAppend(event); - } - catch(std::exception& e) { - log4cplus::tcout << "**** Exception occured: " << e.what() << endl; - } - -// log4cplus::tcout << "*** Calling close()..." << endl; -// append_2->close(); -// log4cplus::tcout << "*** Done calling close()..." << endl; - } - - log4cplus::tcout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/CMakeLists.txt deleted file mode 100644 index ee05e405..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "configandwatch_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.am deleted file mode 100644 index bdeda21b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = configandwatch_test - -configandwatch_test_SOURCES = main.cxx - -configandwatch_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.in deleted file mode 100644 index 1311dadd..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/Makefile.in +++ /dev/null @@ -1,497 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = configandwatch_test$(EXEEXT) -subdir = tests/configandwatch_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_configandwatch_test_OBJECTS = main.$(OBJEXT) -configandwatch_test_OBJECTS = $(am_configandwatch_test_OBJECTS) -configandwatch_test_DEPENDENCIES = \ - $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(configandwatch_test_SOURCES) -DIST_SOURCES = $(configandwatch_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -configandwatch_test_SOURCES = main.cxx -configandwatch_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/configandwatch_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/configandwatch_test/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 -configandwatch_test$(EXEEXT): $(configandwatch_test_OBJECTS) $(configandwatch_test_DEPENDENCIES) - @rm -f configandwatch_test$(EXEEXT) - $(CXXLINK) $(configandwatch_test_OBJECTS) $(configandwatch_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties deleted file mode 100644 index 552d9d25..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties +++ /dev/null @@ -1,25 +0,0 @@ - -log4cplus.rootLogger=INFO, STDOUT, R -log4cplus.logger.test=WARN -log4cplus.logger.test.log_1=FATAL -log4cplus.logger.test.log_2=FATAL -log4cplus.logger.test.log_3=WARN, R3 - -log4cplus.appender.STDOUT=log4cplus::ConsoleAppender -log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout -log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c{2} %%%x%% - %m [%l]%n - -log4cplus.appender.R=log4cplus::RollingFileAppender -log4cplus.appender.R.File=output.log -#log4cplus.appender.R.MaxFileSize=5MB -log4cplus.appender.R.MaxFileSize=500KB -log4cplus.appender.R.MaxBackupIndex=5 -log4cplus.appender.R.layout=log4cplus::TTCCLayout - -log4cplus.appender.R3=log4cplus::RollingFileAppender -log4cplus.appender.R3.File=log_3.log -log4cplus.appender.R3.MaxFileSize=500KB -log4cplus.appender.R3.MaxBackupIndex=5 -#log4cplus.appender.R3.layout=log4cplus::TTCCLayout -log4cplus.appender.R3.layout=log4cplus::PatternLayout -log4cplus.appender.R3.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S,%Q} [%t] %-5p %c{2} - %m%n diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.1 b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.1 deleted file mode 100644 index e2acbeda..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.1 +++ /dev/null @@ -1,17 +0,0 @@ - -log4cplus.rootLogger=INFO, STDOUT, R -log4cplus.logger.test=WARN -log4cplus.logger.test.log_1=FATAL -log4cplus.logger.test.log_2=FATAL -log4cplus.logger.test.log_3=WARN - -log4cplus.appender.STDOUT=log4cplus::ConsoleAppender -log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout -log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c{2} %%%x%% - %m [%l]%n - -log4cplus.appender.R=log4cplus::RollingFileAppender -log4cplus.appender.R.File=output.log -#log4cplus.appender.R.MaxFileSize=5MB -log4cplus.appender.R.MaxFileSize=500KB -log4cplus.appender.R.MaxBackupIndex=5 -log4cplus.appender.R.layout=log4cplus::TTCCLayout diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.2 b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.2 deleted file mode 100644 index 19dd7d5e..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/log4cplus.properties.2 +++ /dev/null @@ -1,23 +0,0 @@ - -log4cplus.rootLogger=INFO, STDOUT, R -log4cplus.logger.test=WARN -log4cplus.logger.test.log_1=FATAL -log4cplus.logger.test.log_2=FATAL -log4cplus.logger.test.log_3=WARN, R3 - -log4cplus.appender.STDOUT=log4cplus::ConsoleAppender -log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout -log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c{2} %%%x%% - %m [%l]%n - -log4cplus.appender.R=log4cplus::RollingFileAppender -log4cplus.appender.R.File=output.log -#log4cplus.appender.R.MaxFileSize=5MB -log4cplus.appender.R.MaxFileSize=500KB -log4cplus.appender.R.MaxBackupIndex=5 -log4cplus.appender.R.layout=log4cplus::TTCCLayout - -log4cplus.appender.R3=log4cplus::RollingFileAppender -log4cplus.appender.R3.File=log_3.log -log4cplus.appender.R3.MaxFileSize=500KB -log4cplus.appender.R3.MaxBackupIndex=5 -log4cplus.appender.R3.layout=log4cplus::TTCCLayout diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/main.cxx deleted file mode 100644 index 5c0c61f3..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/configandwatch_test/main.cxx +++ /dev/null @@ -1,56 +0,0 @@ - -#include -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - -void -printMsgs(Logger& logger) -{ - LOG4CPLUS_TRACE_METHOD(logger, LOG4CPLUS_TEXT("printMsgs()")); - LOG4CPLUS_DEBUG(logger, "printMsgs()"); - LOG4CPLUS_INFO(logger, "printMsgs()"); - LOG4CPLUS_WARN(logger, "printMsgs()"); - LOG4CPLUS_ERROR(logger, "printMsgs()"); -} - - - -int -main() -{ - cout << "Entering main()..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - Logger root = Logger::getRoot(); - Logger log_1 = Logger::getInstance(LOG4CPLUS_TEXT("test.log_1")); - Logger log_2 = Logger::getInstance(LOG4CPLUS_TEXT("test.log_2")); - Logger log_3 = Logger::getInstance(LOG4CPLUS_TEXT("test.log_3")); - try - { - ConfigureAndWatchThread configureThread( - LOG4CPLUS_TEXT("log4cplus.properties"), 5 * 1000); - - LOG4CPLUS_WARN(root, "Testing...."); - - for(int i=0; i<100; ++i) { - printMsgs(log_1); - printMsgs(log_2); - printMsgs(log_3); - log4cplus::helpers::sleep(1); - } - } - catch(...) { - cout << "Exception..." << endl; - LOG4CPLUS_FATAL(root, "Exception occured..."); - } - - cout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/CMakeLists.txt deleted file mode 100644 index 1db97e5d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set (test_name "customloglevel_test") -set (test_sources - main.cxx - func.cxx - customloglevel.h - customloglevel.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.am deleted file mode 100644 index 83082b9a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = customloglevel_test - -customloglevel_test_SOURCES = main.cxx func.cxx customloglevel.cxx - -customloglevel_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.in deleted file mode 100644 index e5aee02b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/Makefile.in +++ /dev/null @@ -1,500 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = customloglevel_test$(EXEEXT) -subdir = tests/customloglevel_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_customloglevel_test_OBJECTS = main.$(OBJEXT) func.$(OBJEXT) \ - customloglevel.$(OBJEXT) -customloglevel_test_OBJECTS = $(am_customloglevel_test_OBJECTS) -customloglevel_test_DEPENDENCIES = \ - $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(customloglevel_test_SOURCES) -DIST_SOURCES = $(customloglevel_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -customloglevel_test_SOURCES = main.cxx func.cxx customloglevel.cxx -customloglevel_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/customloglevel_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/customloglevel_test/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 -customloglevel_test$(EXEEXT): $(customloglevel_test_OBJECTS) $(customloglevel_test_DEPENDENCIES) - @rm -f customloglevel_test$(EXEEXT) - $(CXXLINK) $(customloglevel_test_OBJECTS) $(customloglevel_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/customloglevel.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/func.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.cxx deleted file mode 100644 index 8fbcdc19..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.cxx +++ /dev/null @@ -1,40 +0,0 @@ - -#include "customloglevel.h" - -#define _CRITICAL_STRING LOG4CPLUS_TEXT("CRITICAL") - - - -tstring -criticalToStringMethod(LogLevel ll) -{ - if(ll == CRITICAL_LOG_LEVEL) { - return _CRITICAL_STRING; - } - else { - return tstring(); - } -} - - - -LogLevel -criticalFromStringMethod(const tstring& s) -{ - if(s == _CRITICAL_STRING) return CRITICAL_LOG_LEVEL; - - return NOT_SET_LOG_LEVEL; -} - - - -class CriticalLogLevelInitializer { -public: - CriticalLogLevelInitializer() { - getLogLevelManager().pushToStringMethod(criticalToStringMethod); - getLogLevelManager().pushFromStringMethod(criticalFromStringMethod); - } -}; - -CriticalLogLevelInitializer criticalLogLevelInitializer_; - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.h b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.h deleted file mode 100644 index 1e47c2bb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/customloglevel.h +++ /dev/null @@ -1,17 +0,0 @@ - -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; - -const LogLevel CRITICAL_LOG_LEVEL = 45000; - -#define LOG4CPLUS_CRITICAL(logger, logEvent) \ - if(logger.isEnabledFor(CRITICAL_LOG_LEVEL)) { \ - log4cplus::tostringstream _log4cplus_buf; \ - _log4cplus_buf << logEvent; \ - logger.forcedLog(CRITICAL_LOG_LEVEL, _log4cplus_buf.str(), __FILE__, __LINE__); \ - } - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/func.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/func.cxx deleted file mode 100644 index e578176d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/func.cxx +++ /dev/null @@ -1,20 +0,0 @@ - -#include "customloglevel.h" - -using namespace log4cplus; -using namespace log4cplus::helpers; - -void -writeLogMessage() -{ - { - Logger subTest = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - subTest.log(FATAL_LOG_LEVEL, LOG4CPLUS_TEXT("Entering writeLogMessage()...")); - LOG4CPLUS_CRITICAL(subTest, - LOG4CPLUS_TEXT("writeLogMessage()- This is a message from a different file")); - subTest.log(FATAL_LOG_LEVEL, LOG4CPLUS_TEXT("Exiting writeLogMessage()...")); - } - LogLog::getLogLog()->warn(LOG4CPLUS_TEXT("REALLY exiting writeLogMessage()...")); -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/main.cxx deleted file mode 100644 index fa0c6c65..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/customloglevel_test/main.cxx +++ /dev/null @@ -1,61 +0,0 @@ - -#include "customloglevel.h" -#include -#include -#include - - -using namespace std; -using namespace log4cplus; - -// Forward Declarations -void writeLogMessage(); - - -int -main() -{ - cout << "Entering main()..." << endl; - { - SharedAppenderPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); -// append_1->setLayout( std::auto_ptr(new TTCCLayout()) ); - cout << "Getting root logger...DONE" << endl; - Logger::getRoot().addAppender(append_1); - - Logger root = Logger::getRoot(); - Logger test = Logger::getInstance(LOG4CPLUS_TEXT("test")); - Logger subTest = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - LogLevelManager& llm = getLogLevelManager(); - - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test.subtest to WARN"); - subTest.setLogLevel(WARN_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test to CRITICAL"); - test.setLogLevel(CRITICAL_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test.subtest to NOT_SET_LOG_LEVEL"); - subTest.setLogLevel(NOT_SET_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel()) << '\n'); - - writeLogMessage(); - cout << "Returned from writeLogMessage()..." << endl; - } - cout << "REALLY exiting main()..." << endl; - - return 0; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/CMakeLists.txt deleted file mode 100644 index 38242cb9..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "fileappender_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.am deleted file mode 100644 index 6db3bf41..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = fileappender_test - -fileappender_test_SOURCES = main.cxx - -fileappender_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.in deleted file mode 100644 index 0546f760..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = fileappender_test$(EXEEXT) -subdir = tests/fileappender_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_fileappender_test_OBJECTS = main.$(OBJEXT) -fileappender_test_OBJECTS = $(am_fileappender_test_OBJECTS) -fileappender_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(fileappender_test_SOURCES) -DIST_SOURCES = $(fileappender_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -fileappender_test_SOURCES = main.cxx -fileappender_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/fileappender_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/fileappender_test/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 -fileappender_test$(EXEEXT): $(fileappender_test_OBJECTS) $(fileappender_test_DEPENDENCIES) - @rm -f fileappender_test$(EXEEXT) - $(CXXLINK) $(fileappender_test_OBJECTS) $(fileappender_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/main.cxx deleted file mode 100644 index aae4de0a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/fileappender_test/main.cxx +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -#include -#include -#include - - -using namespace log4cplus; - -const int LOOP_COUNT = 20000; - - -int -main() -{ - helpers::LogLog::getLogLog()->setInternalDebugging(true); - SharedAppenderPtr append_1( - new RollingFileAppender(LOG4CPLUS_TEXT("Test.log"), 5*1024, 5)); - append_1->setName(LOG4CPLUS_TEXT("First")); - append_1->setLayout( std::auto_ptr(new TTCCLayout()) ); - Logger::getRoot().addAppender(append_1); - - Logger root = Logger::getRoot(); - Logger test = Logger::getInstance(LOG4CPLUS_TEXT("test")); - Logger subTest = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - - for(int i=0; i -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - -static Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("log")); - -void -printDebug() -{ - LOG4CPLUS_TRACE_METHOD(logger, LOG4CPLUS_TEXT("::printDebug()")); - LOG4CPLUS_DEBUG(logger, "This is a DEBUG message"); - LOG4CPLUS_INFO(logger, "This is a INFO message"); - LOG4CPLUS_WARN(logger, "This is a WARN message"); - LOG4CPLUS_ERROR(logger, "This is a ERROR message"); - LOG4CPLUS_FATAL(logger, "This is a FATAL message"); -} - - -int -main() -{ -#ifdef WIN32 - cout << "=-=-=-= NOTICE =-=-=-=" << endl - << "Make sure you copy the log4cplus\\tests\\filter_test\\log4cplus.properties" - << " file into the directory you run this test from" - << endl - << "=-=-=-=-=-=-=-=-=-=-=-=" - << endl << endl; -#endif - - cout << "Entering main()..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - Logger root = Logger::getRoot(); - try { - PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties")); - - LOG4CPLUS_WARN(root, "Testing...."); - printDebug(); - } - catch(...) { - cout << "Exception..." << endl; - LOG4CPLUS_FATAL(root, "Exception occured..."); - } - - cout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/CMakeLists.txt deleted file mode 100644 index c4518307..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "hierarchy_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.am deleted file mode 100644 index 2148a6e0..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = hierarchy_test - -hierarchy_test_SOURCES = main.cxx - -hierarchy_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.in deleted file mode 100644 index 7ef6526a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = hierarchy_test$(EXEEXT) -subdir = tests/hierarchy_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_hierarchy_test_OBJECTS = main.$(OBJEXT) -hierarchy_test_OBJECTS = $(am_hierarchy_test_OBJECTS) -hierarchy_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(hierarchy_test_SOURCES) -DIST_SOURCES = $(hierarchy_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -hierarchy_test_SOURCES = main.cxx -hierarchy_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/hierarchy_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/hierarchy_test/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 -hierarchy_test$(EXEEXT): $(hierarchy_test_OBJECTS) $(hierarchy_test_DEPENDENCIES) - @rm -f hierarchy_test$(EXEEXT) - $(CXXLINK) $(hierarchy_test_OBJECTS) $(hierarchy_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/main.cxx deleted file mode 100644 index 9e9a7721..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/hierarchy_test/main.cxx +++ /dev/null @@ -1,65 +0,0 @@ - -#include -#include -#include "log4cplus/hierarchy.h" -#include "log4cplus/helpers/loglog.h" - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - -int -main() -{ - { - - Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("test")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test2")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c.d")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a.b.c")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest.a")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - logger = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - log4cplus::tcout << "Logger name: " << logger.getName() - << " Parent = " << logger.getParent().getName() << endl; - - Logger::shutdown(); - } - log4cplus::tcout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/CMakeLists.txt deleted file mode 100644 index 7b9e61f7..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "loglog_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.am deleted file mode 100644 index d766ab3a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = loglog_test - -loglog_test_SOURCES = main.cxx - -loglog_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.in deleted file mode 100644 index 40e0f883..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = loglog_test$(EXEEXT) -subdir = tests/loglog_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_loglog_test_OBJECTS = main.$(OBJEXT) -loglog_test_OBJECTS = $(am_loglog_test_OBJECTS) -loglog_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(loglog_test_SOURCES) -DIST_SOURCES = $(loglog_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -loglog_test_SOURCES = main.cxx -loglog_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/loglog_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/loglog_test/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 -loglog_test$(EXEEXT): $(loglog_test_OBJECTS) $(loglog_test_DEPENDENCIES) - @rm -f loglog_test$(EXEEXT) - $(CXXLINK) $(loglog_test_OBJECTS) $(loglog_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/main.cxx deleted file mode 100644 index bed79115..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/loglog_test/main.cxx +++ /dev/null @@ -1,31 +0,0 @@ - -#include -#include - -using namespace std; -using namespace log4cplus::helpers; - -void printMsgs() { - cout << "Entering printMsgs()..." << endl; - LogLog::getLogLog()->debug(LOG4CPLUS_TEXT("This is a Debug statement...")); - LogLog::getLogLog()->warn(LOG4CPLUS_TEXT("This is a Warning...")); - LogLog::getLogLog()->error(LOG4CPLUS_TEXT("This is a Error...")); - cout << "Exiting printMsgs()..." << endl << endl; -} - - -int -main() { - printMsgs(); - - cout << "Turning on debug..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - printMsgs(); - - cout << "Turning on quiet mode..." << endl; - LogLog::getLogLog()->setQuietMode(true); - printMsgs(); - - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/CMakeLists.txt deleted file mode 100644 index fd47d543..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "ndc_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.am deleted file mode 100644 index ddbad38b..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = ndc_test - -ndc_test_SOURCES = main.cxx - -ndc_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.in deleted file mode 100644 index 1663d7fa..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = ndc_test$(EXEEXT) -subdir = tests/ndc_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_ndc_test_OBJECTS = main.$(OBJEXT) -ndc_test_OBJECTS = $(am_ndc_test_OBJECTS) -ndc_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(ndc_test_SOURCES) -DIST_SOURCES = $(ndc_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -ndc_test_SOURCES = main.cxx -ndc_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/ndc_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/ndc_test/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 -ndc_test$(EXEEXT): $(ndc_test_OBJECTS) $(ndc_test_DEPENDENCIES) - @rm -f ndc_test$(EXEEXT) - $(CXXLINK) $(ndc_test_OBJECTS) $(ndc_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/main.cxx deleted file mode 100644 index 7e456d39..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ndc_test/main.cxx +++ /dev/null @@ -1,53 +0,0 @@ - -#include -#include -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - -int -main() -{ - cout << "Entering main()..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - try { - SharedObjectPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); - append_1->setLayout( std::auto_ptr(new log4cplus::TTCCLayout()) ); - Logger::getRoot().addAppender(append_1); - - Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("test")); - log4cplus::tcout << "Logger: " << logger.getName() << endl; - getNDC().push(LOG4CPLUS_TEXT("tsmith")); - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("This is a short test...")); - - getNDC().push(LOG4CPLUS_TEXT("password")); - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("This should have my password now")); - - getNDC().pop(); - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("This should NOT have my password now")); - - getNDC().pop(); - cout << "Just returned from pop..." << endl; - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("There should be no NDC...")); - - getNDC().push(LOG4CPLUS_TEXT("tsmith")); - getNDC().push(LOG4CPLUS_TEXT("password")); - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("This should have my password now")); - getNDC().remove(); - LOG4CPLUS_DEBUG(logger, LOG4CPLUS_TEXT("There should be no NDC...")); - } - catch(...) { - cout << "Exception..." << endl; - Logger::getRoot().log(FATAL_LOG_LEVEL, LOG4CPLUS_TEXT("Exception occured...")); - } - - cout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/CMakeLists.txt deleted file mode 100644 index cffe6eb5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "ostream_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.am deleted file mode 100644 index 42558221..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = ostream_test - -ostream_test_SOURCES = main.cxx - -ostream_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.in deleted file mode 100644 index 651ec293..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = ostream_test$(EXEEXT) -subdir = tests/ostream_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_ostream_test_OBJECTS = main.$(OBJEXT) -ostream_test_OBJECTS = $(am_ostream_test_OBJECTS) -ostream_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(ostream_test_SOURCES) -DIST_SOURCES = $(ostream_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -ostream_test_SOURCES = main.cxx -ostream_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/ostream_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/ostream_test/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 -ostream_test$(EXEEXT): $(ostream_test_OBJECTS) $(ostream_test_DEPENDENCIES) - @rm -f ostream_test$(EXEEXT) - $(CXXLINK) $(ostream_test_OBJECTS) $(ostream_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/main.cxx deleted file mode 100644 index 5eb71a04..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/ostream_test/main.cxx +++ /dev/null @@ -1,50 +0,0 @@ - -#include "log4cplus/logger.h" -#include "log4cplus/consoleappender.h" -#include "log4cplus/loglevel.h" -#include - -using namespace std; -using namespace log4cplus; - -int -main() -{ - SharedAppenderPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); - Logger::getRoot().addAppender(append_1); - - Logger root = Logger::getRoot(); - Logger test = Logger::getInstance(LOG4CPLUS_TEXT("test")); - - LOG4CPLUS_DEBUG(root, - "This is" - << " a reall" - << "y long message." << endl - << "Just testing it out" << endl - << "What do you think?"); - test.setLogLevel(NOT_SET_LOG_LEVEL); - LOG4CPLUS_DEBUG(test, "This is a bool: " << true); - LOG4CPLUS_INFO(test, "This is a char: " << 'x'); - LOG4CPLUS_INFO(test, "This is a short: " << (short)-100); - LOG4CPLUS_INFO(test, "This is a unsigned short: " << (unsigned short)100); - LOG4CPLUS_INFO(test, "This is a int: " << (int)1000); - LOG4CPLUS_INFO(test, "This is a unsigned int: " << (unsigned int)1000); - LOG4CPLUS_INFO(test, "This is a long(hex): " << hex << (long)100000000); - LOG4CPLUS_INFO(test, "This is a unsigned long: " << (unsigned long)100000000); - LOG4CPLUS_WARN(test, "This is a float: " << (float)1.2345); - LOG4CPLUS_ERROR(test, - "This is a double: " - << setprecision(15) - << (double)1.2345234234); - LOG4CPLUS_FATAL(test, - "This is a long double: " - << setprecision(15) - << (long double)123452342342.342); - LOG4CPLUS_WARN(test, "The following message is empty:"); - LOG4CPLUS_WARN(test, ""); - - return 0; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/CMakeLists.txt deleted file mode 100644 index a8b6e471..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "patternlayout_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.am deleted file mode 100644 index 03ab68af..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = patternlayout_test - -patternlayout_test_SOURCES = main.cxx - -patternlayout_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.in deleted file mode 100644 index 2efe159a..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = patternlayout_test$(EXEEXT) -subdir = tests/patternlayout_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_patternlayout_test_OBJECTS = main.$(OBJEXT) -patternlayout_test_OBJECTS = $(am_patternlayout_test_OBJECTS) -patternlayout_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(patternlayout_test_SOURCES) -DIST_SOURCES = $(patternlayout_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -patternlayout_test_SOURCES = main.cxx -patternlayout_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/patternlayout_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/patternlayout_test/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 -patternlayout_test$(EXEEXT): $(patternlayout_test_OBJECTS) $(patternlayout_test_DEPENDENCIES) - @rm -f patternlayout_test$(EXEEXT) - $(CXXLINK) $(patternlayout_test_OBJECTS) $(patternlayout_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/main.cxx deleted file mode 100644 index 0cd17cbf..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/patternlayout_test/main.cxx +++ /dev/null @@ -1,56 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - -int -main() -{ - cout << "Entering main()..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - try { - SharedObjectPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); - - log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%m/%d/%y %H:%M:%S,%Q} [%t] %-5p %c{2} %%%x%% - %m [%l]%n"); - // std::tstring pattern = LOG4CPLUS_TEXT("%d{%c} [%t] %-5p [%.15c{3}] %%%x%% - %m [%l]%n"); - append_1->setLayout( std::auto_ptr(new PatternLayout(pattern)) ); - Logger::getRoot().addAppender(append_1); - - Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("test.a.long_logger_name.c.logger")); - LOG4CPLUS_DEBUG(logger, "This is the FIRST log message..."); - - sleep(1, 0); - { - NDCContextCreator ndc(LOG4CPLUS_TEXT("second")); - LOG4CPLUS_INFO(logger, "This is the SECOND log message..."); - } - - sleep(1, 0); - LOG4CPLUS_WARN(logger, "This is the THIRD log message..."); - - sleep(1, 0); - LOG4CPLUS_ERROR(logger, "This is the FOURTH log message..."); - - sleep(1, 0); - LOG4CPLUS_FATAL(logger, "This is the FOURTH log message..."); - } - catch(...) { - cout << "Exception..." << endl; - Logger::getRoot().log(FATAL_LOG_LEVEL, LOG4CPLUS_TEXT("Exception occured...")); - } - - cout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/CMakeLists.txt deleted file mode 100644 index 01ec68a5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "performance_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.am deleted file mode 100644 index 7592e436..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = performance_test - -performance_test_SOURCES = main.cxx - -performance_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.in deleted file mode 100644 index e63dad17..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = performance_test$(EXEEXT) -subdir = tests/performance_test -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_performance_test_OBJECTS = main.$(OBJEXT) -performance_test_OBJECTS = $(am_performance_test_OBJECTS) -performance_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(performance_test_SOURCES) -DIST_SOURCES = $(performance_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -performance_test_SOURCES = main.cxx -performance_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/performance_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/performance_test/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 -performance_test$(EXEEXT): $(performance_test_OBJECTS) $(performance_test_DEPENDENCIES) - @rm -f performance_test$(EXEEXT) - $(CXXLINK) $(performance_test_OBJECTS) $(performance_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/README b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/README deleted file mode 100644 index ebec5898..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/README +++ /dev/null @@ -1,6 +0,0 @@ -This test is used to get a basic idea how log4cplus will perform in "your" environment. -Customize the log4cplus.properties file to match your desired configuration. - -Note: -Set the "logger.testlogger" logger to FATAL to test the performace of the "no logging" -scenario. diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/log4cplus.properties b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/log4cplus.properties deleted file mode 100644 index 42da64e0..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/log4cplus.properties +++ /dev/null @@ -1,20 +0,0 @@ - -log4cplus.rootLogger=TRACE, STDOUT -log4cplus.logger.testlogger=TRACE, TEST -log4cplus.additivity.testlogger=FALSE - -log4cplus.appender.STDOUT=log4cplus::ConsoleAppender -log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout -log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c - %m %n - -#log4cplus.appender.TEST=log4cplus::NullAppender -log4cplus.appender.TEST=log4cplus::FileAppender -log4cplus.appender.TEST.File=test_output.log -#log4cplus.appender.TEST.layout=log4cplus::TTCCLayout -log4cplus.appender.TEST.layout=log4cplus::PatternLayout -log4cplus.appender.TEST.layout.ConversionPattern=%d{%y-%m-%d %H:%M:%S,%q} [%t] %-5p %c <%x> - %m%n -#log4cplus.appender.TEST.layout.ConversionPattern=%d{%y-%m-%d %H:%M:%S,%q} %-5p %c <%x> - %m%n -#log4cplus.appender.TEST.layout.ConversionPattern=%p - %m%n -#log4cplus.appender.TEST.layout.ConversionPattern=%-5p - %m%n -#log4cplus.appender.TEST.layout.ConversionPattern=%l - %m%n -#log4cplus.appender.TEST.layout.ConversionPattern=%C.%M.%L - %m%n diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/main.cxx deleted file mode 100644 index 9791e308..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/performance_test/main.cxx +++ /dev/null @@ -1,103 +0,0 @@ - -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - -log4cplus::tostream& operator <<(log4cplus::tostream& s, const Time& t) -{ - return s << t.sec() << "sec " << t.usec() << "usec"; -} - -#define LOOP_COUNT 100000 - -int -main() -{ - cout << "Entering main()..." << endl; - PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties")); - Logger root = Logger::getRoot(); - try { - Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("testlogger")); - - LOG4CPLUS_WARN(root, "Starting test loop...."); - Time start = Time::gettimeofday(); - tstring msg(LOG4CPLUS_TEXT("This is a WARNING...")); - int i = 0; - for(i=0; iwarn(LOG4CPLUS_TEXT("REALLY exiting writeLogMessage()...")); -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/priority_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/priority_test/main.cxx deleted file mode 100644 index 076ecbb5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/priority_test/main.cxx +++ /dev/null @@ -1,62 +0,0 @@ - -#include "log4cplus/logger.h" -#include "log4cplus/consoleappender.h" -#include "log4cplus/loglevel.h" -#include -#include - - -using namespace std; -using namespace log4cplus; - -// Forward Declarations -void writeLogMessage(); - - -int -main() -{ - cout << "Entering main()..." << endl; - { - SharedAppenderPtr append_1(new ConsoleAppender()); - append_1->setName(LOG4CPLUS_TEXT("First")); -// append_1->setLayout( std::auto_ptr(new TTCCLayout()) ); - cout << "Getting root logger...DONE" << endl; - Logger::getRoot().addAppender(append_1); - - Logger root = Logger::getRoot(); - Logger test = Logger::getInstance(LOG4CPLUS_TEXT("test")); - Logger subTest = Logger::getInstance(LOG4CPLUS_TEXT("test.subtest")); - LogLevelManager& llm = getLogLevelManager(); - - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test.subtest to WARN"); - subTest.setLogLevel(WARN_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test to ERROR"); - test.setLogLevel(ERROR_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel())); - - LOG4CPLUS_FATAL(root, "\nSetting test.subtest to NOT_SET_LOG_LEVEL"); - subTest.setLogLevel(NOT_SET_LOG_LEVEL); - LOG4CPLUS_FATAL(root, "root: " << llm.toString(root.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test: " << llm.toString(test.getChainedLogLevel())); - LOG4CPLUS_FATAL(root, "test.subtest: " << llm.toString(subTest.getChainedLogLevel()) << '\n'); - - writeLogMessage(); - cout << "Returned from writeLogMessage()..." << endl; - } - cout << "REALLY exiting main()..." << endl; - - return 0; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/CMakeLists.txt deleted file mode 100644 index b8e1e302..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "propertyconfig_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.am deleted file mode 100644 index f4e9fabc..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = propertyconfig_test - -propertyconfig_test_SOURCES = main.cxx - -propertyconfig_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.in deleted file mode 100644 index 5a7e54c6..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/Makefile.in +++ /dev/null @@ -1,497 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = propertyconfig_test$(EXEEXT) -subdir = tests/propertyconfig_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_propertyconfig_test_OBJECTS = main.$(OBJEXT) -propertyconfig_test_OBJECTS = $(am_propertyconfig_test_OBJECTS) -propertyconfig_test_DEPENDENCIES = \ - $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(propertyconfig_test_SOURCES) -DIST_SOURCES = $(propertyconfig_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -propertyconfig_test_SOURCES = main.cxx -propertyconfig_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/propertyconfig_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/propertyconfig_test/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 -propertyconfig_test$(EXEEXT): $(propertyconfig_test_OBJECTS) $(propertyconfig_test_DEPENDENCIES) - @rm -f propertyconfig_test$(EXEEXT) - $(CXXLINK) $(propertyconfig_test_OBJECTS) $(propertyconfig_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/log4cplus.properties b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/log4cplus.properties deleted file mode 100644 index fcfbfcdf..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/log4cplus.properties +++ /dev/null @@ -1,16 +0,0 @@ - -log4cplus.rootLogger=INFO, STDOUT, R -log4cplus.logger.test.a.b.c=WARN -log4cplus.logger.filelogger=WARN, R -log4cplus.additivity.filelogger=FALSE - -log4cplus.appender.STDOUT=log4cplus::ConsoleAppender -log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout -log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c{2} %%%x%% - %m [%l]%n - -log4cplus.appender.R=log4cplus::RollingFileAppender -log4cplus.appender.R.File=output_${ENV_VAR}.log -#log4cplus.appender.R.MaxFileSize=5MB -log4cplus.appender.R.MaxFileSize=500KB -log4cplus.appender.R.MaxBackupIndex=5 -log4cplus.appender.R.layout=log4cplus::TTCCLayout diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/main.cxx deleted file mode 100644 index cfbd9f03..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/propertyconfig_test/main.cxx +++ /dev/null @@ -1,38 +0,0 @@ - -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; - - - -int -main() -{ - cout << "Entering main()..." << endl; - LogLog::getLogLog()->setInternalDebugging(true); - Logger root = Logger::getRoot(); - try { - PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties")); - Logger fileCat = Logger::getInstance(LOG4CPLUS_TEXT("filelogger")); - - LOG4CPLUS_WARN(root, "Testing...."); - - LOG4CPLUS_WARN(root, "Writing messages to log...."); - for(int i=0; i<10000; ++i) { - LOG4CPLUS_WARN(fileCat, "This is a WARNING..." << i); - } - } - catch(...) { - cout << "Exception..." << endl; - LOG4CPLUS_FATAL(root, "Exception occured..."); - } - - cout << "Exiting main()..." << endl; - return 0; -} - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/CMakeLists.txt deleted file mode 100644 index 1c04ecc1..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "socket_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.am deleted file mode 100644 index 17eb8034..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = socket_test - -socket_test_SOURCES = main.cxx - -socket_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.in deleted file mode 100644 index c1d0a42d..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = socket_test$(EXEEXT) -subdir = tests/socket_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_socket_test_OBJECTS = main.$(OBJEXT) -socket_test_OBJECTS = $(am_socket_test_OBJECTS) -socket_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(socket_test_SOURCES) -DIST_SOURCES = $(socket_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -socket_test_SOURCES = main.cxx -socket_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/socket_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/socket_test/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 -socket_test$(EXEEXT): $(socket_test_OBJECTS) $(socket_test_DEPENDENCIES) - @rm -f socket_test$(EXEEXT) - $(CXXLINK) $(socket_test_OBJECTS) $(socket_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/main.cxx deleted file mode 100644 index c25df649..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/main.cxx +++ /dev/null @@ -1,56 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include - -using namespace std; -using namespace log4cplus; - -int -main(int argc, char **argv) -{ - log4cplus::helpers::sleep(1); - tstring serverName = (argc > 1 ? LOG4CPLUS_C_STR_TO_TSTRING(argv[1]) : tstring()); -// tstring host = LOG4CPLUS_TEXT("192.168.2.10"); - tstring host = LOG4CPLUS_TEXT("127.0.0.1"); - SharedAppenderPtr append_1(new SocketAppender(host, 9998, serverName)); - append_1->setName( LOG4CPLUS_TEXT("First") ); - Logger::getRoot().addAppender(append_1); - - Logger root = Logger::getRoot(); - Logger test = Logger::getInstance( LOG4CPLUS_TEXT("socket.test") ); - - LOG4CPLUS_DEBUG(root, - "This is" - << " a reall" - << "y long message." << endl - << "Just testing it out" << endl - << "What do you think?"); - test.setLogLevel(NOT_SET_LOG_LEVEL); - LOG4CPLUS_DEBUG(test, "This is a bool: " << true); - LOG4CPLUS_INFO(test, "This is a char: " << 'x'); - LOG4CPLUS_INFO(test, "This is a short: " << (short)-100); - LOG4CPLUS_INFO(test, "This is a unsigned short: " << (unsigned short)100); - log4cplus::helpers::sleep(0, 500000); - LOG4CPLUS_INFO(test, "This is a int: " << 1000); - LOG4CPLUS_INFO(test, "This is a unsigned int: " << 1000u); - LOG4CPLUS_INFO(test, "This is a long(hex): " << hex << 100000000l); - LOG4CPLUS_INFO(test, "This is a unsigned long: " << 100000000ul); - LOG4CPLUS_WARN(test, "This is a float: " << 1.2345f); - LOG4CPLUS_ERROR(test, - "This is a double: " - << setprecision(15) - << 1.2345234234); - LOG4CPLUS_FATAL(test, - "This is a long double: " - << setprecision(15) - << 123452342342.342L); - - return 0; -} - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/run_test b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/run_test deleted file mode 100755 index 5baa1bbb..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/socket_test/run_test +++ /dev/null @@ -1,8 +0,0 @@ - -for (( i=0; i<100; i=i+1 )) -do - ./socket_test test-$i & -done; - - - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/CMakeLists.txt deleted file mode 100644 index eca15db5..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "thread_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.am deleted file mode 100644 index b57a6e40..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = thread_test - -thread_test_SOURCES = main.cxx - -thread_test_LDADD = $(top_builddir)/src/liblog4cplus.la - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.in deleted file mode 100644 index fac512ff..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = thread_test$(EXEEXT) -subdir = tests/thread_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_thread_test_OBJECTS = main.$(OBJEXT) -thread_test_OBJECTS = $(am_thread_test_OBJECTS) -thread_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(thread_test_SOURCES) -DIST_SOURCES = $(thread_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -thread_test_SOURCES = main.cxx -thread_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/thread_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/thread_test/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 -thread_test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) - @rm -f thread_test$(EXEEXT) - $(CXXLINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/main.cxx deleted file mode 100644 index 499b7ab8..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/thread_test/main.cxx +++ /dev/null @@ -1,140 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -using namespace std; -using namespace log4cplus; -using namespace log4cplus::helpers; -using namespace log4cplus::thread; - - -#define MILLIS_TO_NANOS 1000 -#define NUM_THREADS 4 -#define NUM_LOOPS 10 - -class SlowObject { -public: - SlowObject() - : mutex( LOG4CPLUS_MUTEX_CREATE ), - logger(Logger::getInstance(LOG4CPLUS_TEXT("SlowObject"))) - { logger.setLogLevel(TRACE_LOG_LEVEL); } - - void doSomething() { - LOG4CPLUS_TRACE_METHOD(logger, LOG4CPLUS_TEXT("SlowObject::doSomething()")); - LOG4CPLUS_BEGIN_SYNCHRONIZE_ON_MUTEX( mutex ) - LOG4CPLUS_INFO(logger, LOG4CPLUS_TEXT("Actually doing something...")); - sleep(0, 75 * MILLIS_TO_NANOS); - LOG4CPLUS_INFO(logger, LOG4CPLUS_TEXT("Actually doing something...DONE")); - LOG4CPLUS_END_SYNCHRONIZE_ON_MUTEX; - log4cplus::thread::yield(); - } - -private: - LOG4CPLUS_MUTEX_PTR_DECLARE mutex; - Logger logger; -}; -SlowObject *global; - - -class TestThread : public AbstractThread { -public: - TestThread(tstring n) - : name(n), logger(Logger::getInstance(LOG4CPLUS_TEXT("test.TestThread"))) - { - } - - virtual void run(); - -private: - tstring name; - Logger logger; -}; - - -int -main() -{ - auto_ptr globalContainer(new SlowObject()); - global = globalContainer.get(); - - try { - log4cplus::helpers::LogLog::getLogLog()->setInternalDebugging(true); - Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("main")); - Logger::getRoot().setLogLevel(INFO_LOG_LEVEL); - LogLevel ll = logger.getLogLevel(); - tcout << "main Priority: " << getLogLevelManager().toString(ll) << endl; - - helpers::SharedObjectPtr append_1(new ConsoleAppender()); - append_1->setLayout( std::auto_ptr(new log4cplus::TTCCLayout()) ); - Logger::getRoot().addAppender(append_1); - append_1->setName(LOG4CPLUS_TEXT("cout")); - - append_1 = 0; - - log4cplus::helpers::SharedObjectPtr threads[NUM_THREADS]; - int i = 0; - for(i=0; istart(); - } - LOG4CPLUS_DEBUG(logger, "All Threads started..."); - - for(i=0; iisRunning()) { - sleep(0, 200 * MILLIS_TO_NANOS); - } - } - LOG4CPLUS_INFO(logger, "Exiting main()..."); - } - catch(std::exception &e) { - LOG4CPLUS_FATAL(Logger::getRoot(), "main()- Exception occured: " << e.what()); - } - catch(...) { - LOG4CPLUS_FATAL(Logger::getRoot(), "main()- Exception occured"); - } - - log4cplus::Logger::shutdown(); - return 0; -} - - -void -TestThread::run() -{ - try { - LOG4CPLUS_WARN(logger, name + LOG4CPLUS_TEXT(" TestThread.run()- Starting...")); - NDC& ndc = getNDC(); - NDCContextCreator _first_ndc(name); - LOG4CPLUS_DEBUG(logger, "Entering Run()..."); - for(int i=0; idoSomething(); - } - LOG4CPLUS_DEBUG(logger, "Exiting run()..."); - - ndc.remove(); - } - catch(exception& e) { - LOG4CPLUS_FATAL(logger, "TestThread.run()- Exception occurred: " << e.what()); - } - catch(...) { - LOG4CPLUS_FATAL(logger, "TestThread.run()- Exception occurred!!"); - } - LOG4CPLUS_WARN(logger, name << " TestThread.run()- Finished"); -} // end "run" - diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/CMakeLists.txt b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/CMakeLists.txt deleted file mode 100644 index ab47844c..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set (test_name "timeformat_test") -set (test_sources - main.cxx) - -project (${test_name} CXX C) -cmake_minimum_required (VERSION 2.6) -set (CMAKE_VERBOSE_MAKEFILE on) - -find_package (Threads) - -message (STATUS "${test_name} sources: ${test_sources}") - -include_directories ("${CMAKE_SOURCE_DIR}/include") -add_executable (${test_name} ${test_sources}) -target_link_libraries (${test_name} log4cplus) diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.am b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.am deleted file mode 100644 index 7a848bea..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = timeformat_test - -timeformat_test_SOURCES = main.cxx - -timeformat_test_LDADD = $(top_builddir)/src/liblog4cplus.la diff --git a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.in b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.in deleted file mode 100644 index e369917f..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/Makefile.in +++ /dev/null @@ -1,496 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ -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@ -target_triplet = @target@ -noinst_PROGRAMS = timeformat_test$(EXEEXT) -subdir = tests/timeformat_test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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)/m4/ax_c_ifdef.m4 \ - $(top_srcdir)/m4/type_socklen_t.m4 \ - $(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ - $(top_srcdir)/m4/ax_cflags_sun_option.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \ - $(top_srcdir)/m4/ax_gethostbyname_r.m4 \ - $(top_srcdir)/m4/ax_getaddrinfo.m4 \ - $(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/log4cplus/config.h \ - $(top_builddir)/include/log4cplus/config/defines.hxx -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_timeformat_test_OBJECTS = main.$(OBJEXT) -timeformat_test_OBJECTS = $(am_timeformat_test_OBJECTS) -timeformat_test_DEPENDENCIES = $(top_builddir)/src/liblog4cplus.la -DEFAULT_INCLUDES = -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(timeformat_test_SOURCES) -DIST_SOURCES = $(timeformat_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -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@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@ -LTLIBOBJS = @LTLIBOBJS@ -LT_VERSION = @LT_VERSION@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -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@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -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 = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -timeformat_test_SOURCES = main.cxx -timeformat_test_LDADD = $(top_builddir)/src/liblog4cplus.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .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 tests/timeformat_test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/timeformat_test/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 -timeformat_test$(EXEEXT): $(timeformat_test_OBJECTS) $(timeformat_test_DEPENDENCIES) - @rm -f timeformat_test$(EXEEXT) - $(CXXLINK) $(timeformat_test_OBJECTS) $(timeformat_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -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 $(PROGRAMS) -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: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -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-noinstPROGRAMS \ - 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 all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags 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 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/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/main.cxx b/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/main.cxx deleted file mode 100644 index 3cdfd4f8..00000000 --- a/src/3rd_party/log4cplus/log4cplus-1.0.4/tests/timeformat_test/main.cxx +++ /dev/null @@ -1,65 +0,0 @@ -#include -#include -#include - -using namespace log4cplus; -using namespace log4cplus::helpers; - - -log4cplus::tchar const fmtstr[] = - LOG4CPLUS_TEXT("%s, %Q%%q%q %%Q %%q=%%%q%%;%%q, %%Q=%Q"); - - -int -main() -{ - std::cout << "Entering main()..." << std::endl; - try - { - Time time; - log4cplus::tstring str; - - time = Time::gettimeofday (); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << LOG4CPLUS_TEXT ("now: ") << str << std::endl; - - time = Time (0, 7); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 17); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 123); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 1234); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 12345); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 123456); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - - time = Time (0, 0); - str = time.getFormattedTime (fmtstr); - log4cplus::tcout << str << std::endl; - } - catch(std::exception const & e) - { - std::cout << "Exception: " << e.what () << std::endl; - } - catch(...) - { - std::cout << "Exception..." << std::endl; - } - - std::cout << "Exiting main()..." << std::endl; - return 0; -} diff --git a/src/tools/copyrightcons/README.txt b/src/tools/copyrightcons/README.txt deleted file mode 100644 index 7ff81bdb..00000000 --- a/src/tools/copyrightcons/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -copyrightcons - console application for adding copyright comments to many files - -usage: - -copyrightcons -c license.txt -log logfile [-t] [-i] [-a] -mask mask.txt {dirs/files} - --t: enable test mode modified files will be placed in copies of original files with suffix .test --i: only report comments to be changed --a: only report unapproved licenses - - diff --git a/src/tools/copyrightcons/copyrightcons.pro b/src/tools/copyrightcons/copyrightcons.pro deleted file mode 100644 index f3f83ad8..00000000 --- a/src/tools/copyrightcons/copyrightcons.pro +++ /dev/null @@ -1,23 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-05-21T22:05:05 -# -#------------------------------------------------- - -QT += core - -QT -= gui - -TARGET = copyrightcons -CONFIG += console -CONFIG -= app_bundle - -TEMPLATE = app - - -SOURCES += main.cpp - -contains(MEEGO_EDITION,harmattan) { - target.path = /opt/copyrightcons/bin - INSTALLS += target -} diff --git a/src/tools/copyrightcons/license.txt b/src/tools/copyrightcons/license.txt deleted file mode 100644 index f7826853..00000000 --- a/src/tools/copyrightcons/license.txt +++ /dev/null @@ -1,20 +0,0 @@ - -iviLINK SDK, version 1.0 -http://www.ivilink.net -Cross Platform Application Communication Stack for In-Vehicle Applications - -Copyright (C) 2012, Luxoft Professional Corp., member of IBS group - -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; version 2.1. - -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 - diff --git a/src/tools/copyrightcons/main.cpp b/src/tools/copyrightcons/main.cpp deleted file mode 100644 index 5b468b52..00000000 --- a/src/tools/copyrightcons/main.cpp +++ /dev/null @@ -1,499 +0,0 @@ -/* - * - * iviLINK SDK, version 1.0.1 - * http://www.ivilink.net - * Cross Platform Application Communication Stack for In-Vehicle Applications - * - * Copyright (C) 2012, Luxoft Professional Corp., member of IBS group - * - * 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; version 2.1. - * - * 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 - * - * - */ - - - -#include -#include - -#include -#include -#include - -#include -#include - -bool infomode(false); -bool testmode(false); -QString copyright_header; -QStringList reject_copyrights;//blacklist -QStringList gray_copyrights;//graylist -QStringList skip_copyrights;//whitelist -QStringList alert_copyrights;//alert list -QStringList skip_paths; -QStringList our_paths; -QFile * log=0; -bool filereported(false); -bool onlyalerts(false); -QString fileToString(const QString& path) -{ - QFile file(path); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) - { - if(log) - { - log->write("READ ERROR: "); - log->write(file.errorString().toAscii()); - log->write("\n"); - } - return QString(); - } - QByteArray data=file.readAll(); - return QString(data); -} -void fileToStringList(const QString& path) -{ - QStringList *out=NULL; - QFile file(path); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) - return; - while(!file.atEnd()) - { - QByteArray data=file.readLine(); - if(data.length() && data.at(data.length()-1)=='\n') - data.resize(data.size()-1); - if(data.length() && data.at(data.length()-1)=='\r') - data.resize(data.size()-1); - - QString str(data); - if(str=="#*** FILTER ***") - { out=&gray_copyrights;} - else if(str=="#*** 3RD_PARTY COPYRIGHTS ***") - { out=&skip_copyrights;} - else if(str=="#*** OUR COPYRIGHTS ***") - { out=&reject_copyrights;} - else if(str=="#*** 3RD_PARTY PATHS ***") - { out=&skip_paths;} - else if(str=="#*** OUR PATHS ***") - { out=&our_paths;} - else if(str=="#*** ALERT LIST ***") - { out=&alert_copyrights;} - else if(out != NULL && str.length()){ - if(str.at(0)=='#')continue; - (*out)<write("==============================================\n"); - log->write("* FILE: "); - log->write(path.toAscii()); - log->write("\n"); - filereported=true; - } -} -bool inList(const QStringList& list, const QString& text) -{ - QStringListIterator iter(list); - while(iter.hasNext()) - { - const QString& str=iter.next(); - if(str.startsWith("+re:")) - { - QRegExp re(str.mid(4)); - if(re.isValid() && !re.isEmpty()) - { - re.setCaseSensitivity(Qt::CaseInsensitive); - re.setMinimal(true); - if(text.contains(re))return true; - } - }else - if(str.startsWith("-re:")) - { - QRegExp re(str.mid(4)); - if(re.isValid() && !re.isEmpty()) - { - re.setCaseSensitivity(Qt::CaseInsensitive); - re.setMinimal(true); - if(text.contains(re))return false; - } - }else - if(text.contains(str, Qt::CaseInsensitive)) return true; - } - return false; -} - -bool RemoveComment(const QString& path, const QString& text, int from, int to, bool& skip, bool& modify) -{ - bool commentprinted(false); - QString comment=text.mid(from, to-from); - if(inList(alert_copyrights, comment)) - { - reportFile(path); - log->write("**** COMMENT **********************************\n"); - log->write("\n\n ALERT!!!! FORBIDDEN LICENSE DETECTED!!!! \n\n"); - log->write(comment.toAscii()); - commentprinted=true; - } - bool flag=inList(gray_copyrights, comment); - if(!flag)return false; - bool comment_must_be_removed(inList(reject_copyrights, comment)); - bool comment_must_be_saved(inList(skip_copyrights, comment)); - skip|=comment_must_be_saved; - modify|=comment_must_be_removed; - if(infomode && log){ - if(!commentprinted && !onlyalerts) - { - reportFile(path); - - log->write("**** COMMENT **********************************\n"); - log->write(comment.toAscii()); - log->write("\n**** "); - } - if(comment_must_be_removed)log->write("[REJECT] "); - if(comment_must_be_saved)log->write("[KEEP] "); - log->write("\n**********************************************\n"); - } - if(comment_must_be_removed && !comment_must_be_saved)return true; - return false; -} - -void storeFile(const QString& orig, const QString& path, const QStringList& lines, bool skip, bool modify, bool bashcomment=false) -{ - - if(skip && modify) - { - reportFile(path); - if(log)log->write("PROBLEM: file contains both our and third-party copyrights"); - } - if(infomode)return; - - - QString outpath=path; - if(testmode)outpath+=".test"; - - QFile ofile(outpath); - if(ofile.open(QIODevice::WriteOnly | QIODevice::Text)) - { - if(!skip) - { - if(!copyright_header.isEmpty()) - { - QStringList lines=copyright_header.split('\n'); - QStringListIterator iter(lines); - if(!bashcomment)ofile.write("/* \n"); - while(iter.hasNext()) - { - if(bashcomment)ofile.write("# "); - else ofile.write(" * "); - ofile.write(iter.next().toAscii()); - ofile.write("\n"); - } - if(!bashcomment)ofile.write(" */\n\n"); - } - QStringListIterator iter(lines); - while(iter.hasNext()) - { - ofile.write(iter.next().toAscii()); - } - } - else{ - ofile.write(orig.toAscii()); - } - } - else if(log) - { - reportFile(path); - log->write("WRITE ERROR: "); - log->write(ofile.errorString().toAscii()); - log->write("\n"); - } -} - -void processCXXFile(const QFileInfo& file, bool assume_our) -{ - int offset(0); - bool skipfile(false), modify_file(assume_our); - QString text=fileToString(file.absoluteFilePath()); - QStringList output; - - while(offset=0 && moreNfilePath(); - - parseFile(*iter,force_update); - } - return; - } - if(file.isFile()) - { - filereported=false;//reset flag - QStringList exts; - exts<<"cpp"<<"c"<<"hpp"<<"h"<<"java"<<"qml"; - QString ext=file.completeSuffix().toLower(); - if(exts.contains(ext)) - { - qDebug()<<"Parsing "< // define sa_family_t type required by #include #include #include diff --git a/src/utils/json/Makefile b/utils/json/Makefile similarity index 100% rename from src/utils/json/Makefile rename to utils/json/Makefile diff --git a/src/utils/json/include/json/autolink.h b/utils/json/include/json/autolink.h similarity index 100% rename from src/utils/json/include/json/autolink.h rename to utils/json/include/json/autolink.h diff --git a/src/utils/json/include/json/config.h b/utils/json/include/json/config.h similarity index 100% rename from src/utils/json/include/json/config.h rename to utils/json/include/json/config.h diff --git a/src/utils/json/include/json/features.h b/utils/json/include/json/features.h similarity index 100% rename from src/utils/json/include/json/features.h rename to utils/json/include/json/features.h diff --git a/src/utils/json/include/json/forwards.h b/utils/json/include/json/forwards.h similarity index 100% rename from src/utils/json/include/json/forwards.h rename to utils/json/include/json/forwards.h diff --git a/src/utils/json/include/json/json.h b/utils/json/include/json/json.h similarity index 100% rename from src/utils/json/include/json/json.h rename to utils/json/include/json/json.h diff --git a/src/utils/json/include/json/reader.h b/utils/json/include/json/reader.h similarity index 100% rename from src/utils/json/include/json/reader.h rename to utils/json/include/json/reader.h diff --git a/src/utils/json/include/json/value.h b/utils/json/include/json/value.h similarity index 100% rename from src/utils/json/include/json/value.h rename to utils/json/include/json/value.h diff --git a/src/utils/json/include/json/writer.h b/utils/json/include/json/writer.h similarity index 100% rename from src/utils/json/include/json/writer.h rename to utils/json/include/json/writer.h diff --git a/src/utils/json/lib/libjson.a b/utils/json/lib/libjson.a similarity index 100% rename from src/utils/json/lib/libjson.a rename to utils/json/lib/libjson.a diff --git a/src/utils/json/src/lib_json/json_batchallocator.h b/utils/json/src/lib_json/json_batchallocator.h similarity index 100% rename from src/utils/json/src/lib_json/json_batchallocator.h rename to utils/json/src/lib_json/json_batchallocator.h diff --git a/src/utils/json/src/lib_json/json_internalarray.inl b/utils/json/src/lib_json/json_internalarray.inl similarity index 100% rename from src/utils/json/src/lib_json/json_internalarray.inl rename to utils/json/src/lib_json/json_internalarray.inl diff --git a/src/utils/json/src/lib_json/json_internalmap.inl b/utils/json/src/lib_json/json_internalmap.inl similarity index 100% rename from src/utils/json/src/lib_json/json_internalmap.inl rename to utils/json/src/lib_json/json_internalmap.inl diff --git a/src/utils/json/src/lib_json/json_reader.cpp b/utils/json/src/lib_json/json_reader.cpp similarity index 100% rename from src/utils/json/src/lib_json/json_reader.cpp rename to utils/json/src/lib_json/json_reader.cpp diff --git a/src/utils/json/src/lib_json/json_value.cpp b/utils/json/src/lib_json/json_value.cpp similarity index 100% rename from src/utils/json/src/lib_json/json_value.cpp rename to utils/json/src/lib_json/json_value.cpp diff --git a/src/utils/json/src/lib_json/json_valueiterator.inl b/utils/json/src/lib_json/json_valueiterator.inl similarity index 100% rename from src/utils/json/src/lib_json/json_valueiterator.inl rename to utils/json/src/lib_json/json_valueiterator.inl diff --git a/src/utils/json/src/lib_json/json_writer.cpp b/utils/json/src/lib_json/json_writer.cpp similarity index 100% rename from src/utils/json/src/lib_json/json_writer.cpp rename to utils/json/src/lib_json/json_writer.cpp diff --git a/src/utils/mf b/utils/mf similarity index 100% rename from src/utils/mf rename to utils/mf diff --git a/src/utils/misc/CError.hpp b/utils/misc/CError.hpp similarity index 100% rename from src/utils/misc/CError.hpp rename to utils/misc/CError.hpp diff --git a/src/utils/misc/CUid.hpp b/utils/misc/CUid.hpp similarity index 100% rename from src/utils/misc/CUid.hpp rename to utils/misc/CUid.hpp diff --git a/src/utils/misc/CUnixSocket.hpp b/utils/misc/CUnixSocket.hpp similarity index 100% rename from src/utils/misc/CUnixSocket.hpp rename to utils/misc/CUnixSocket.hpp diff --git a/src/utils/misc/IUnixSocketSubscriber.hpp b/utils/misc/IUnixSocketSubscriber.hpp similarity index 100% rename from src/utils/misc/IUnixSocketSubscriber.hpp rename to utils/misc/IUnixSocketSubscriber.hpp diff --git a/src/utils/misc/IVILinkLogger.hpp b/utils/misc/IVILinkLogger.hpp similarity index 100% rename from src/utils/misc/IVILinkLogger.hpp rename to utils/misc/IVILinkLogger.hpp diff --git a/src/utils/misc/Logger.hpp b/utils/misc/Logger.hpp similarity index 100% rename from src/utils/misc/Logger.hpp rename to utils/misc/Logger.hpp diff --git a/src/utils/misc/Makefile b/utils/misc/Makefile similarity index 100% rename from src/utils/misc/Makefile rename to utils/misc/Makefile diff --git a/src/utils/misc/Types.hpp b/utils/misc/Types.hpp similarity index 100% rename from src/utils/misc/Types.hpp rename to utils/misc/Types.hpp diff --git a/src/utils/misc/UID.hpp b/utils/misc/UID.hpp similarity index 100% rename from src/utils/misc/UID.hpp rename to utils/misc/UID.hpp diff --git a/src/utils/misc/byteOrder.hpp b/utils/misc/byteOrder.hpp similarity index 100% rename from src/utils/misc/byteOrder.hpp rename to utils/misc/byteOrder.hpp diff --git a/src/utils/misc/logging.hpp b/utils/misc/logging.hpp similarity index 100% rename from src/utils/misc/logging.hpp rename to utils/misc/logging.hpp diff --git a/src/utils/misc/private/CUid.cpp b/utils/misc/private/CUid.cpp similarity index 100% rename from src/utils/misc/private/CUid.cpp rename to utils/misc/private/CUid.cpp diff --git a/src/utils/misc/private/CUnixSocket.cpp b/utils/misc/private/CUnixSocket.cpp similarity index 100% rename from src/utils/misc/private/CUnixSocket.cpp rename to utils/misc/private/CUnixSocket.cpp diff --git a/src/utils/misc/private/IVILinkLogger.cpp b/utils/misc/private/IVILinkLogger.cpp similarity index 100% rename from src/utils/misc/private/IVILinkLogger.cpp rename to utils/misc/private/IVILinkLogger.cpp diff --git a/src/utils/misc/private/byteOrder.cpp b/utils/misc/private/byteOrder.cpp similarity index 85% rename from src/utils/misc/private/byteOrder.cpp rename to utils/misc/private/byteOrder.cpp index 45de1cc5..e27096a1 100644 --- a/src/utils/misc/private/byteOrder.cpp +++ b/utils/misc/private/byteOrder.cpp @@ -22,15 +22,20 @@ * */ - - - - +#include "byteOrder.hpp" // Here we are using non-standard set of functions for byte endianess conversion #include -#include "byteOrder.hpp" +// see issue http://code.google.com/p/android/issues/detail?id=24320 +#ifdef __BIONIC__ +# define be64toh betoh64 +# define be32toh betoh32 +# define be16toh betoh16 +# define le64toh letoh64 +# define le32toh letoh32 +# define le16toh letoh16 +#endif UInt16 ByteOrder::hton16(UInt16 data) { diff --git a/src/utils/misc/private/logging.cpp b/utils/misc/private/logging.cpp similarity index 100% rename from src/utils/misc/private/logging.cpp rename to utils/misc/private/logging.cpp diff --git a/src/utils/serialize/Makefile b/utils/serialize/Makefile similarity index 100% rename from src/utils/serialize/Makefile rename to utils/serialize/Makefile diff --git a/src/utils/serialize/Serialize.hpp b/utils/serialize/Serialize.hpp similarity index 100% rename from src/utils/serialize/Serialize.hpp rename to utils/serialize/Serialize.hpp diff --git a/src/utils/serialize/private/Serialize.cpp b/utils/serialize/private/Serialize.cpp similarity index 100% rename from src/utils/serialize/private/Serialize.cpp rename to utils/serialize/private/Serialize.cpp diff --git a/src/utils/shared_lib/Makefile b/utils/shared_lib/Makefile similarity index 100% rename from src/utils/shared_lib/Makefile rename to utils/shared_lib/Makefile diff --git a/src/utils/threads/CCondVar.hpp b/utils/threads/CCondVar.hpp similarity index 100% rename from src/utils/threads/CCondVar.hpp rename to utils/threads/CCondVar.hpp diff --git a/src/utils/threads/CMutex.hpp b/utils/threads/CMutex.hpp similarity index 100% rename from src/utils/threads/CMutex.hpp rename to utils/threads/CMutex.hpp diff --git a/src/utils/threads/CRWMutex.hpp b/utils/threads/CRWMutex.hpp similarity index 100% rename from src/utils/threads/CRWMutex.hpp rename to utils/threads/CRWMutex.hpp diff --git a/src/utils/threads/CSignalSemaphore.hpp b/utils/threads/CSignalSemaphore.hpp similarity index 100% rename from src/utils/threads/CSignalSemaphore.hpp rename to utils/threads/CSignalSemaphore.hpp diff --git a/src/utils/threads/CSignalSemaphoreInterproc.hpp b/utils/threads/CSignalSemaphoreInterproc.hpp similarity index 100% rename from src/utils/threads/CSignalSemaphoreInterproc.hpp rename to utils/threads/CSignalSemaphoreInterproc.hpp diff --git a/src/utils/threads/CThread.hpp b/utils/threads/CThread.hpp similarity index 100% rename from src/utils/threads/CThread.hpp rename to utils/threads/CThread.hpp diff --git a/src/utils/threads/CThreadPool.hpp b/utils/threads/CThreadPool.hpp similarity index 100% rename from src/utils/threads/CThreadPool.hpp rename to utils/threads/CThreadPool.hpp diff --git a/src/utils/threads/CThreadPoolJob.hpp b/utils/threads/CThreadPoolJob.hpp similarity index 100% rename from src/utils/threads/CThreadPoolJob.hpp rename to utils/threads/CThreadPoolJob.hpp diff --git a/src/utils/threads/CTimeoutManager.hpp b/utils/threads/CTimeoutManager.hpp similarity index 100% rename from src/utils/threads/CTimeoutManager.hpp rename to utils/threads/CTimeoutManager.hpp diff --git a/src/utils/threads/ITimeoutSubscriber.hpp b/utils/threads/ITimeoutSubscriber.hpp similarity index 100% rename from src/utils/threads/ITimeoutSubscriber.hpp rename to utils/threads/ITimeoutSubscriber.hpp diff --git a/src/utils/threads/Makefile b/utils/threads/Makefile similarity index 100% rename from src/utils/threads/Makefile rename to utils/threads/Makefile diff --git a/src/utils/threads/private/CCondVar.cpp b/utils/threads/private/CCondVar.cpp similarity index 100% rename from src/utils/threads/private/CCondVar.cpp rename to utils/threads/private/CCondVar.cpp diff --git a/src/utils/threads/private/CMutex.cpp b/utils/threads/private/CMutex.cpp similarity index 82% rename from src/utils/threads/private/CMutex.cpp rename to utils/threads/private/CMutex.cpp index 9485d0c8..3badd90b 100644 --- a/src/utils/threads/private/CMutex.cpp +++ b/utils/threads/private/CMutex.cpp @@ -30,11 +30,35 @@ #include #include +#include #include "CMutex.hpp" Logger CMutex::logger = Logger::getInstance(LOG4CPLUS_TEXT("utils.threads.CMutex")); +#ifdef __BIONIC__ +int pthread_mutex_timedlock (pthread_mutex_t *mutex, struct timespec *timeout) +{ + struct timeval timenow; + struct timespec sleepytime; + int retcode; + /* This is just to avoid a completely busy wait */ + sleepytime.tv_sec = 0; + sleepytime.tv_nsec = 10000000; /* 10ms */ + while ((retcode = pthread_mutex_trylock (mutex)) == EBUSY) + { + gettimeofday (&timenow, NULL); + if (timenow.tv_sec >= timeout->tv_sec && + (timenow.tv_usec * 1000) >= timeout->tv_nsec) + { + return ETIMEDOUT; + } + nanosleep (&sleepytime, NULL); + } + return retcode; +} +#endif + CMutex::CMutex() { int err = pthread_mutex_init(&mMutex, NULL); diff --git a/src/utils/threads/private/CRWMutex.cpp b/utils/threads/private/CRWMutex.cpp similarity index 100% rename from src/utils/threads/private/CRWMutex.cpp rename to utils/threads/private/CRWMutex.cpp diff --git a/src/utils/threads/private/CSignalSemaphore.cpp b/utils/threads/private/CSignalSemaphore.cpp similarity index 100% rename from src/utils/threads/private/CSignalSemaphore.cpp rename to utils/threads/private/CSignalSemaphore.cpp diff --git a/src/utils/threads/private/CSignalSemaphoreInterproc.cpp b/utils/threads/private/CSignalSemaphoreInterproc.cpp similarity index 100% rename from src/utils/threads/private/CSignalSemaphoreInterproc.cpp rename to utils/threads/private/CSignalSemaphoreInterproc.cpp diff --git a/src/utils/threads/private/CThread.cpp b/utils/threads/private/CThread.cpp similarity index 100% rename from src/utils/threads/private/CThread.cpp rename to utils/threads/private/CThread.cpp diff --git a/src/utils/threads/private/CThreadPool.cpp b/utils/threads/private/CThreadPool.cpp similarity index 100% rename from src/utils/threads/private/CThreadPool.cpp rename to utils/threads/private/CThreadPool.cpp diff --git a/src/utils/threads/private/CThreadPoolJob.cpp b/utils/threads/private/CThreadPoolJob.cpp similarity index 100% rename from src/utils/threads/private/CThreadPoolJob.cpp rename to utils/threads/private/CThreadPoolJob.cpp diff --git a/src/utils/threads/private/CTimeoutManager.cpp b/utils/threads/private/CTimeoutManager.cpp similarity index 100% rename from src/utils/threads/private/CTimeoutManager.cpp rename to utils/threads/private/CTimeoutManager.cpp diff --git a/src/utils/xml/Makefile b/utils/xml/Makefile similarity index 100% rename from src/utils/xml/Makefile rename to utils/xml/Makefile diff --git a/src/utils/xml/private/pugixml.cpp b/utils/xml/private/pugixml.cpp similarity index 100% rename from src/utils/xml/private/pugixml.cpp rename to utils/xml/private/pugixml.cpp diff --git a/src/utils/xml/pugiconfig.hpp b/utils/xml/pugiconfig.hpp similarity index 100% rename from src/utils/xml/pugiconfig.hpp rename to utils/xml/pugiconfig.hpp diff --git a/src/utils/xml/pugixml.hpp b/utils/xml/pugixml.hpp similarity index 100% rename from src/utils/xml/pugixml.hpp rename to utils/xml/pugixml.hpp diff --git a/www b/www new file mode 160000 index 00000000..f7af66ed --- /dev/null +++ b/www @@ -0,0 +1 @@ +Subproject commit f7af66edab5b0ce94eee7f7f9e43a675ff3eb130